Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 33704: Last minute fixes for phpBB: - Update the session expiration time if the user enabled a session with timeout - Change the DB name for "subsys_phpbb.php"
by cfinck＠svn.reactos.org 25 May '08

25 May '08

Author: cfinck Date: Sun May 25 17:08:12 2008 New Revision: 33704 URL: http://svn.reactos.org/svn/reactos?rev=33704&view=rev Log: Last minute fixes for phpBB: - Update the session expiration time if the user enabled a session with timeout - Change the DB name for "subsys_phpbb.php" Modified: trunk/web/reactos.org/htdocs/forum/includes/auth/auth_roscms.php trunk/web/reactos.org/htdocs/roscms/inc/subsys_phpbb.php Modified: trunk/web/reactos.org/htdocs/forum/includes/auth/auth_roscms.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/inclu… ============================================================================== --- trunk/web/reactos.org/htdocs/forum/includes/auth/auth_roscms.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/forum/includes/auth/auth_roscms.php [iso-8859-1] Sun May 25 17:08:12 2008 @@ -91,10 +91,24 @@ function validate_session_roscms(&$user) { - if($user["user_id"] == ANONYMOUS && $_COOKIE["roscmsusrkey"] != "") + global $db; + + if($_COOKIE["roscmsusrkey"]) { - // The user is logged in in RosCMS, but not yet in phpBB. Do that now - login_box(); + if($user["user_id"] == ANONYMOUS) + { + // The user is logged in in RosCMS, but not yet in phpBB. Do that now + login_box(); + } + else + { + // Update the session expiration time + $sql = "UPDATE " . ROSCMS_DB_NAME . ".user_sessions " . + "SET usersession_expires = DATE_ADD(NOW(), INTERVAL 30 MINUTE) " . + "WHERE usersession_id = '" . $db->sql_escape($_COOKIE["roscmsusrkey"]) . "' " . + "AND usersession_expires IS NOT NULL"; + $db->sql_query($sql); + } } return true; Modified: trunk/web/reactos.org/htdocs/roscms/inc/subsys_phpbb.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/subsys_phpbb.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/subsys_phpbb.php [iso-8859-1] Sun May 25 17:08:12 2008 @@ -34,7 +34,7 @@ require_once("subsys_utils.php"); -define('SUBSYS_PHPBB_DBNAME', "publish"); +define('SUBSYS_PHPBB_DBNAME', "forum"); function subsys_phpbb_info_check() {

1 0

[hyperion] 33703: modified include/psdk/winnls.h Added definitions for NormalizeString and IsNormalizedString (Vista and later) Correct an embarassing bug (some macros were terminated with "; ", shame shame) added nls added nls/3rdparty added nls/3rdparty/icu We officially welcome IBM's excellent ICU4C library for Unicode support to our humble source tree. May our marriage be long, happy and fertile. added nls/3rdparty/icu4ros.rbuild added nls/dll added nls/dll/normaliz_redist added nls/dll/norm
by hyperion＠svn.reactos.org 25 May '08

25 May '08

Author: hyperion Date: Sun May 25 16:00:08 2008 New Revision: 33703 URL: http://svn.reactos.org/svn/reactos?rev=33703&view=rev Log: modified include/psdk/winnls.h Added definitions for NormalizeString and IsNormalizedString (Vista and later) Correct an embarassing bug (some macros were terminated with ";", shame shame) added nls added nls/3rdparty added nls/3rdparty/icu We officially welcome IBM's excellent ICU4C library for Unicode support to our humble source tree. May our marriage be long, happy and fertile. added nls/3rdparty/icu4ros.rbuild added nls/dll added nls/dll/normaliz_redist added nls/dll/normaliz_redist/normaliz.cpp added nls/dll/normaliz_redist/normaliz.def added nls/dll/normaliz_redist/normaliz_redist.rbuild added nls/lib added nls/lib/normalize added nls/lib/normalize/normalize.cpp added nls/lib/normalize/normalize.rbuild added nls/nls.rbuild modified ReactOS-generic.rbuild Incomplete implementation of the redistributable normaliz.dll DLL for Unicode normalization, as a technical preview of what's to come from the use of ICU4C - namely, straightforward, painless implementation of complex algorithms and several megabytes worth of data, with a Win32-compatible interface on top. Currently disabled in the build until basic testing is over. Watch this space for more of the same. Added: trunk/reactos/nls/ trunk/reactos/nls/3rdparty/ trunk/reactos/nls/3rdparty/icu/ - copied from r33686, vendor/icu4c/current/icu/ trunk/reactos/nls/3rdparty/icu4ros.rbuild (with props) trunk/reactos/nls/dll/ trunk/reactos/nls/dll/normaliz_redist/ trunk/reactos/nls/dll/normaliz_redist/normaliz.cpp (with props) trunk/reactos/nls/dll/normaliz_redist/normaliz.def (with props) trunk/reactos/nls/dll/normaliz_redist/normaliz_redist.rbuild (with props) trunk/reactos/nls/lib/ trunk/reactos/nls/lib/normalize/ trunk/reactos/nls/lib/normalize/normalize.cpp (with props) trunk/reactos/nls/lib/normalize/normalize.rbuild (with props) trunk/reactos/nls/nls.rbuild (with props) Modified: trunk/reactos/ReactOS-generic.rbuild trunk/reactos/include/psdk/winnls.h Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Sun May 25 16:00:08 2008 @@ -58,6 +58,9 @@ <directory name="modules"> <xi:include href="modules/directory.rbuild" /> </directory> +  <directory name="ntoskrnl"> <xi:include href="ntoskrnl/ntoskrnl.rbuild" />  Modified: trunk/reactos/include/psdk/winnls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnls.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winnls.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnls.h [iso-8859-1] Sun May 25 16:00:08 2008 @@ -543,6 +543,15 @@ LPWSTR lpThousandSep; UINT NegativeOrder; } NUMBERFMTW,*LPNUMBERFMTW; +#if (WINVER >= 0x0600) +typedef enum _NORM_FORM { + NormalizationOther = 0, + NormalizationC = 0x1, + NormalizationD = 0x2, + NormalizationKC = 0x5, + NormalizationKD = 0x6 +} NORM_FORM; +#endif /* (WINVER >= 0x0600) */ int WINAPI CompareStringA(LCID,DWORD,LPCSTR,int,LPCSTR,int); int WINAPI CompareStringW(LCID,DWORD,LPCWSTR,int,LPCWSTR,int); @@ -623,6 +632,10 @@ LANGID WINAPI GetUserDefaultUILanguage(void); BOOL WINAPI IsValidLanguageGroup(LGRPID,DWORD); #endif /* (WINVER >= 0x0500) */ +#if (WINVER >= 0x0600) +int WINAPI NormalizeString(NORM_FORM,LPCWSTR,int,LPWSTR,int); +BOOL WINAPI IsNormalizedString(NORM_FORM,LPCWSTR,int); +#endif /* (WINVER >= 0x0600) */ #ifdef UNICODE #define CALINFO_ENUMPROC CALINFO_ENUMPROCW @@ -661,11 +674,11 @@ #define SetCalendarInfo SetCalendarInfoW #define SetLocaleInfo SetLocaleInfoW #if (WINVER >= 0x0500) -#define EnumCalendarInfoEx EnumCalendarInfoExW; -#define EnumDateFormatsEx EnumDateFormatsExW; -#define EnumSystemLanguageGroups EnumSystemLanguageGroupsW; -#define EnumLanguageGroupLocales EnumLanguageGroupLocalesW; -#define EnumUILanguages EnumUILanguagesW; +#define EnumCalendarInfoEx EnumCalendarInfoExW +#define EnumDateFormatsEx EnumDateFormatsExW +#define EnumSystemLanguageGroups EnumSystemLanguageGroupsW +#define EnumLanguageGroupLocales EnumLanguageGroupLocalesW +#define EnumUILanguages EnumUILanguagesW #endif /* (WINVER >= 0x0500) */ #else #define CALINFO_ENUMPROC CALINFO_ENUMPROCA @@ -704,11 +717,11 @@ #define SetCalendarInfo SetCalendarInfoA #define SetLocaleInfo SetLocaleInfoA #if (WINVER >= 0x0500) -#define EnumCalendarInfoEx EnumCalendarInfoExA; -#define EnumDateFormatsEx EnumDateFormatsExA; -#define EnumSystemLanguageGroups EnumSystemLanguageGroupsA; -#define EnumLanguageGroupLocales EnumLanguageGroupLocalesA; -#define EnumUILanguages EnumUILanguagesA; +#define EnumCalendarInfoEx EnumCalendarInfoExA +#define EnumDateFormatsEx EnumDateFormatsExA +#define EnumSystemLanguageGroups EnumSystemLanguageGroupsA +#define EnumLanguageGroupLocales EnumLanguageGroupLocalesA +#define EnumUILanguages EnumUILanguagesA #endif /* (WINVER >= 0x0500) */ #endif /* UNICODE */ #endif /* RC_INVOKED */ Added: trunk/reactos/nls/3rdparty/icu4ros.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/3rdparty/icu4ros.rbuil… ============================================================================== --- trunk/reactos/nls/3rdparty/icu4ros.rbuild (added) +++ trunk/reactos/nls/3rdparty/icu4ros.rbuild [iso-8859-1] Sun May 25 16:00:08 2008 @@ -1,0 +1,41 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<module name="icu4ros" type="staticlibrary" allowwarnings="true"> + <define name="U_STATIC_IMPLEMENTATION" /> + <define name="U_HAVE_INTTYPES_H" /> + <compilerflag>-fno-exceptions</compilerflag> + <compilerflag>-fno-rtti</compilerflag> + <include base="icu4ros">icu/source/common</include> + <directory name="icu"> + <directory name="source"> + <directory name="common"> + <file>bmpset.cpp</file> + <file>uhash_us.cpp</file> + <file>uiter.cpp</file> + <file>unifilt.cpp</file> + <file>unifunct.cpp</file> + <file>uniset.cpp</file> + <file>unisetspan.cpp</file> + <file>unistr.cpp</file> + <file>unorm.cpp</file> + <file>uobject.cpp</file> + <file>uset.cpp</file> + <file>util.cpp</file> + <file>uvector.cpp</file> + <file>cmemory.c</file> + <file>cstring.c</file> + <file>ucln_cmn.c</file> + <file>udata.c</file> + <file>udataswp.c</file> + <file>uhash.c</file> + <file>uinvchar.c</file> + <file>umath.c</file> + <file>umutex.c</file> + <file>ustring.c</file> + <file>ustrtrns.c</file> + <file>utf_impl.c</file> + <file>utrie.c</file> + </directory> + </directory> + </directory> +</module> Propchange: trunk/reactos/nls/3rdparty/icu4ros.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/nls/dll/normaliz_redist/normaliz.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/dll/normaliz_redist/no… ============================================================================== --- trunk/reactos/nls/dll/normaliz_redist/normaliz.cpp (added) +++ trunk/reactos/nls/dll/normaliz_redist/normaliz.cpp [iso-8859-1] Sun May 25 16:00:08 2008 @@ -1,0 +1,40 @@ +// FIXME: clean up this mess + +#ifndef _DEBUG +#include <stdlib.h> + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +void free(void * memory) +{ + HeapFree(GetProcessHeap(), 0, memory); +} + +void * malloc(size_t size) +{ + return HeapAlloc(GetProcessHeap(), 0, size); +} + +void * realloc(void * memory, size_t size) +{ + return HeapReAlloc(GetProcessHeap(), 0, memory, size); +} + +void operator delete(void * memory) +{ + free(memory); +} + +extern "C" int __cdecl _purecall() +{ + FatalAppExitW(0, L"pure virtual call"); + FatalExit(0); + return 0; +} + +extern "C" void __cxa_pure_virtual() { _purecall(); } + +#endif + +// EOF Propchange: trunk/reactos/nls/dll/normaliz_redist/normaliz.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/nls/dll/normaliz_redist/normaliz.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/dll/normaliz_redist/no… ============================================================================== --- trunk/reactos/nls/dll/normaliz_redist/normaliz.def (added) +++ trunk/reactos/nls/dll/normaliz_redist/normaliz.def [iso-8859-1] Sun May 25 16:00:08 2008 @@ -1,0 +1,5 @@ +LIBRARY "normaliz" + +EXPORTS + NormalizeString=NormalizeString@20 + IsNormalizedString=IsNormalizedString@12 Propchange: trunk/reactos/nls/dll/normaliz_redist/normaliz.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/nls/dll/normaliz_redist/normaliz_redist.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/dll/normaliz_redist/no… ============================================================================== --- trunk/reactos/nls/dll/normaliz_redist/normaliz_redist.rbuild (added) +++ trunk/reactos/nls/dll/normaliz_redist/normaliz_redist.rbuild [iso-8859-1] Sun May 25 16:00:08 2008 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="normaliz_redist" type="win32dll" installname="normaliz.dll"> + <library>normalize</library> + <library>icu4ros</library> + <compilerflag>-fno-exceptions</compilerflag> + <compilerflag>-fno-rtti</compilerflag> + <importlibrary definition="normaliz.def" /> + <file>normaliz.cpp</file> +</module> Propchange: trunk/reactos/nls/dll/normaliz_redist/normaliz_redist.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/nls/lib/normalize/normalize.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/lib/normalize/normaliz… ============================================================================== --- trunk/reactos/nls/lib/normalize/normalize.cpp (added) +++ trunk/reactos/nls/lib/normalize/normalize.cpp [iso-8859-1] Sun May 25 16:00:08 2008 @@ -1,0 +1,89 @@ +#define WIN32_LEAN_AND_MEAN +#define STRICT + +#define WINVER 0x0600 + +#include <windows.h> +#include <winnls.h> + +#include <unicode/unorm.h> + +static +UNormalizationMode +NORMALIZE_ModeToICU +( + NORM_FORM NormForm +) +{ + switch(NormForm) + { + case NormalizationC: return UNORM_NFC; + case NormalizationD: return UNORM_NFD; + case NormalizationKC: return UNORM_NFKC; + case NormalizationKD: return UNORM_NFKD; + case NormalizationOther: break; + } + + return UNORM_NONE; +} + +static +DWORD +NLS_ErrorFromICU +( + UErrorCode ErrorCode +) +{ + // TODO + return ERROR_GEN_FAILURE; +} + +int +WINAPI +NormalizeString +( + NORM_FORM NormForm, + LPCWSTR lpSrcString, + int cwSrcLength, + LPWSTR lpDstString, + int cwDstLength +) +{ + UErrorCode ErrorCode = U_ZERO_ERROR; + + int retval = unorm_normalize + ( + lpSrcString, + cwSrcLength, + NORMALIZE_ModeToICU(NormForm), + 0, + lpDstString, + cwDstLength, + &ErrorCode + ); + + if(U_FAILURE(ErrorCode)) + SetLastError(NLS_ErrorFromICU(ErrorCode)); + + return retval; +} + +BOOL +WINAPI +IsNormalizedString +( + NORM_FORM NormForm, + LPCWSTR lpString, + int cwLength +) +{ + UErrorCode ErrorCode = U_ZERO_ERROR; + BOOL retval = !!unorm_isNormalized(lpString, cwLength, NORMALIZE_ModeToICU(NormForm), &ErrorCode); + + if(U_FAILURE(ErrorCode)) + SetLastError(NLS_ErrorFromICU(ErrorCode)); + + return retval; +} + +// EOF Propchange: trunk/reactos/nls/lib/normalize/normalize.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/nls/lib/normalize/normalize.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/lib/normalize/normaliz… ============================================================================== --- trunk/reactos/nls/lib/normalize/normalize.rbuild (added) +++ trunk/reactos/nls/lib/normalize/normalize.rbuild [iso-8859-1] Sun May 25 16:00:08 2008 @@ -1,0 +1,9 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="normalize" type="staticlibrary"> + <library>icu4ros</library> + <compilerflag>-fno-exceptions</compilerflag> + <compilerflag>-fno-rtti</compilerflag> + <include base="icu4ros">icu/source/common</include> + <file>normalize.cpp</file> +</module> Propchange: trunk/reactos/nls/lib/normalize/normalize.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/nls/nls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/nls/nls.rbuild?rev=33703&v… ============================================================================== --- trunk/reactos/nls/nls.rbuild (added) +++ trunk/reactos/nls/nls.rbuild [iso-8859-1] Sun May 25 16:00:08 2008 @@ -1,0 +1,13 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="3rdparty"><xi:include href="3rdparty/icu4ros.rbuild" /></directory> + + <directory name="lib"> + <directory name="normalize"><xi:include href="lib/normalize/normalize.rbuild" /></directory> + </directory> + + <directory name="dll"> + <directory name="normaliz_redist"><xi:include href="dll/normaliz_redist/normaliz_redist.rbuild" /></directory> + </directory> +</group> Propchange: trunk/reactos/nls/nls.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[silverblade] 33702: Stub IRP handlers, implement device name construction (eg: \Device\WaveOut0) and creation of device and symbolic DOS device link. Also moved old sndblst out of the way since ultimately we will be known as sndblst.
by silverblade＠svn.reactos.org 25 May '08

25 May '08

Author: silverblade Date: Sun May 25 15:30:47 2008 New Revision: 33702 URL: http://svn.reactos.org/svn/reactos?rev=33702&view=rev Log: Stub IRP handlers, implement device name construction (eg: \Device\WaveOut0) and creation of device and symbolic DOS device link. Also moved old sndblst out of the way since ultimately we will be known as sndblst. Added: branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/devname.c (with props) branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/main.c (with props) branches/silverblade-audio/drivers/multimedia/audio/sndblst.old/ - copied from r33692, branches/silverblade-audio/drivers/multimedia/audio/sndblst/ Removed: branches/silverblade-audio/drivers/multimedia/audio/sndblst/ Modified: branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/sb16_nt4.rbuild branches/silverblade-audio/include/ddk/ntddsnd.h Added: branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/devname.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/drivers/multi… ============================================================================== --- branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/devname.c (added) +++ branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/devname.c [iso-8859-1] Sun May 25 15:30:47 2008 @@ -1,0 +1,384 @@ +/* + ReactOS Sound System + Device naming & creation helper routines + + Author: + Andrew Greenwood (andrew.greenwood(a)silverblade.co.uk) + + History: + 25 May 2008 - Created +*/ + +#include <ntddk.h> +#include <ntddsnd.h> +#include <debug.h> + +/* + Default device names + + Just to keep things tidy, we define a structure to hold both the \\Device + and \\DosDevices names, and then fill this structure with the default + device names that can be found in NTDDSND.H +*/ + +typedef struct _DEVICE_NAME_GROUP +{ + PCWSTR DeviceName; + PCWSTR DosDeviceName; +} DEVICE_NAME_GROUP; + +DEVICE_NAME_GROUP SoundDeviceNameBodies[6] = +{ + { + DD_WAVE_IN_DEVICE_NAME_U, + DD_WAVE_IN_DOS_DEVICE_NAME_U + }, + { + DD_WAVE_OUT_DEVICE_NAME_U, + DD_WAVE_OUT_DOS_DEVICE_NAME_U + }, + { + DD_MIDI_IN_DEVICE_NAME_U, + DD_MIDI_IN_DOS_DEVICE_NAME_U + }, + { + DD_MIDI_OUT_DEVICE_NAME_U, + DD_MIDI_OUT_DOS_DEVICE_NAME_U + }, + { + DD_MIX_DEVICE_NAME_U, + DD_MIX_DOS_DEVICE_NAME_U + }, + { + DD_AUX_DEVICE_NAME_U, + DD_AUX_DOS_DEVICE_NAME_U + } +}; + + +/* + ConstructDeviceName + + This takes a wide-character string containing the device name body (for + example, "\\Device\\WaveOut") and appends the device index, forming a + string like "\\Device\\WaveOut0", and so on. + + The resulting device name is a unicode string. +*/ + +NTSTATUS +ConstructDeviceName( + IN PCWSTR Path, + IN UCHAR Index, + OUT PUNICODE_STRING DeviceName) +{ + UNICODE_STRING UnicodePath; + UNICODE_STRING UnicodeIndex; + WCHAR IndexStringBuffer[5]; + USHORT Size; + USHORT LastCharacterIndex; + + /* Check for NULL parameters */ + if ( ( ! Path ) || ( ! DeviceName ) ) + { + ERR_(IHVAUDIO, "Unexpected NULL parameter"); + return STATUS_INVALID_PARAMETER; + } + + /* Range-check */ + if ( Index >= SOUND_MAX_DEVICES ) + { + ERR_(IHVAUDIO, "Device index %d out of range", Index); + return STATUS_INVALID_PARAMETER; + } + + /* Initialise the unicode path string */ + RtlInitUnicodeString(&UnicodePath, Path); + + /* Calculate the length to hold the full string */ + Size = UnicodePath.Length + + sizeof(IndexStringBuffer) + + sizeof(UNICODE_NULL); + + /* Allocate memory for DeviceName */ + DeviceName->Buffer = ExAllocatePool(PagedPool, Size); + DeviceName->MaximumLength = Size; + + if ( ! DeviceName->Buffer ) + { + ERR_(IHVAUDIO, "Couldn't allocate memory for device name string"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Copy the path */ + RtlCopyUnicodeString(DeviceName, &UnicodePath); + + /* Convert Index to string and append */ + UnicodeIndex.Buffer = IndexStringBuffer; + UnicodeIndex.MaximumLength = sizeof(IndexStringBuffer); + + RtlIntegerToUnicodeString((ULONG)Index, 10, &UnicodeIndex); + RtlAppendUnicodeStringToString(DeviceName, &UnicodeIndex); + + /* Terminate the string */ + LastCharacterIndex = DeviceName->Length / sizeof(UNICODE_NULL); + DeviceName->Buffer[LastCharacterIndex] = UNICODE_NULL; + + return STATUS_SUCCESS; +} + + +/* + FreeUnicodeStringBuffer + + A small helper routine to free a unicode string buffer, nullify the + buffer and reset the lengths to zero. +*/ + +VOID +FreeUnicodeStringBuffer(IN PUNICODE_STRING String) +{ + ASSERT(String != NULL); + ASSERT(String->Buffer != NULL); + + ExFreePool(String->Buffer); + + String->Buffer = NULL; + String->Length = 0; + String->MaximumLength = 0; +} + + +/* + GetDefaultSoundDeviceNameBodies + + Simply accesses the SoundDeviceNameBodies struct defined earlier and + fills the DeviceNameBody and DosDeviceNameBody parameters accordingly. + + Basically a "safe" way to access the array and perform two assignments + with one call, as this will assign the name and DOS name if a valid + DeviceType is passed, otherwise it will fail with STATUS_INVALID_PARAMETER. +*/ + +NTSTATUS +GetDefaultSoundDeviceNameBodies( + IN UCHAR DeviceType, + OUT PCWSTR* DeviceNameBody, + OUT PCWSTR* DosDeviceNameBody) +{ + ASSERT(DeviceNameBody != NULL); + ASSERT(DosDeviceNameBody != NULL); + + if ( DeviceType > MAX_DEVICE_TYPE ) + { + ERR_(IHVAUDIO, "Invalid device type"); + return STATUS_INVALID_PARAMETER; + } + + *DeviceNameBody = SoundDeviceNameBodies[DeviceType].DeviceName; + *DosDeviceNameBody = SoundDeviceNameBodies[DeviceType].DosDeviceName; + + return STATUS_SUCCESS; +} + + +/* + ConstructSoundDeviceNames + + Given two wide-character strings and a device index, convert these into + two unicode strings with the index appended to the end. + + This is intended for converting a device name and a DOS device name at + the same time. +*/ + +NTSTATUS +ConstructSoundDeviceNames( + IN PCWSTR DeviceNameBody, + IN PCWSTR DosDeviceNameBody, + IN UCHAR Index, + OUT PUNICODE_STRING FullDeviceName, + OUT PUNICODE_STRING FullDosDeviceName) +{ + NTSTATUS Status; + + /* Check for NULL parameters */ + if ( ( ! DeviceNameBody ) || ( ! DosDeviceNameBody ) || + ( ! FullDeviceName ) || ( ! FullDosDeviceName ) ) + { + ERR_(IHVAUDIO, "Unexpected NULL parameter"); + return STATUS_INVALID_PARAMETER; + } + + /* Range-check */ + if ( Index >= SOUND_MAX_DEVICES ) + { + ERR_(IHVAUDIO, "Device %d exceeds maximum", Index); + return STATUS_INVALID_PARAMETER; + } + + Status = ConstructDeviceName(DeviceNameBody, Index, FullDeviceName); + + if ( ! NT_SUCCESS(Status) ) + { + /* No need to clean up on failure here */ + return Status; + } + + Status = ConstructDeviceName(DosDeviceNameBody, Index, FullDosDeviceName); + + if ( ! NT_SUCCESS(Status) ) + { + /* We need to free the string we successfully got earlier */ + FreeUnicodeStringBuffer(FullDeviceName); + return Status; + } + + return STATUS_SUCCESS; +} + + +/* + CreateSoundDevice + + Creates a device and symbolically-links a DOS device to this. Use this + when you want to specify alternative device names to the defaults + (eg: "\\Device\\MySoundDev" rather than "\\Device\\WaveOut") +*/ + +NTSTATUS +CreateSoundDevice( + IN PDRIVER_OBJECT DriverObject, + IN PCWSTR WideDeviceName, + IN PCWSTR WideDosDeviceName, + IN UCHAR Index, + IN ULONG ExtensionSize, + OUT PDEVICE_OBJECT DeviceObject) +{ + NTSTATUS Status; + + UNICODE_STRING DeviceName; + UNICODE_STRING DosDeviceName; + + /* Check for NULL parameters */ + if ( ( ! DriverObject ) || ( ! DeviceObject ) || + ( ! WideDeviceName ) || ( ! WideDosDeviceName ) ) + { + ERR_(IHVAUDIO, "Unexpected NULL parameter"); + return STATUS_INVALID_PARAMETER; + } + + /* Range-check */ + if ( Index >= SOUND_MAX_DEVICES ) + { + ERR_(IHVAUDIO, "Device index %d exceeds maximum", Index); + return STATUS_INVALID_PARAMETER; + } + + /* Construct the device and DOS device names */ + Status = ConstructSoundDeviceNames(WideDeviceName, + WideDosDeviceName, + Index, + &DeviceName, + &DosDeviceName); + + if ( ! NT_SUCCESS(Status) ) + { + return Status; + } + + /* Now create the device */ + Status = IoCreateDevice(DriverObject, + ExtensionSize, + &DeviceName, + FILE_DEVICE_SOUND, + 0, + FALSE, + &DeviceObject); + + if ( ! NT_SUCCESS(Status) ) + { + /* These will have been allocated by ConstructSoundDeviceNames */ + FreeUnicodeStringBuffer(&DeviceName); + FreeUnicodeStringBuffer(&DosDeviceName); + + return Status; + } + + /* Create a symbolic link for the DOS deviec name */ + Status = IoCreateSymbolicLink(&DosDeviceName, &DeviceName); + + if ( ! NT_SUCCESS(Status) ) + { + /* IoDeleteDevice( --- What are we deleting? */ + + /* These will have been allocated by ConstructSoundDeviceNames */ + FreeUnicodeStringBuffer(&DeviceName); + FreeUnicodeStringBuffer(&DosDeviceName); + + return Status; + } + + return STATUS_SUCCESS; +} + + +/* + CreateSoundDeviceWithDefaultName + + Similar to CreateSoundDevice, except this uses the default device names + ("\\Device\\WaveOut" etc.) based on the DeviceType parameter. +*/ + +NTSTATUS +CreateSoundDeviceWithDefaultName( + IN PDRIVER_OBJECT DriverObject, + IN UCHAR DeviceType, + IN UCHAR Index, + IN ULONG ExtensionSize, + OUT PDEVICE_OBJECT DeviceObject) +{ + NTSTATUS Status; + PCWSTR WideDeviceName = NULL; + PCWSTR WideDosDeviceName = NULL; + + /* Check for NULL parameters */ + if ( ( ! DriverObject ) || ( ! DeviceObject ) ) + { + ERR_(IHVAUDIO, "Unexpected NULL parameter"); + return STATUS_INVALID_PARAMETER; + } + + /* Range-check */ + if ( Index >= SOUND_MAX_DEVICES ) + { + ERR_(IHVAUDIO, "Device index %d exceeds maximum", Index); + return STATUS_INVALID_PARAMETER; + } + + /* Look-up the default name based on the device type */ + Status = GetDefaultSoundDeviceNameBodies(DeviceType, + &WideDeviceName, + &WideDosDeviceName); + + if ( ! NT_SUCCESS(Status) ) + { + return Status; + } + + /* Go create the device! */ + Status = CreateSoundDevice(DriverObject, + WideDeviceName, + WideDosDeviceName, + Index, + ExtensionSize, + DeviceObject); + + if ( ! NT_SUCCESS(Status) ) + { + /* No clean-up to do */ + return Status; + } + + return STATUS_SUCCESS; +} Propchange: branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/devname.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/main.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/drivers/multi… ============================================================================== --- branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/main.c (added) +++ branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/main.c [iso-8859-1] Sun May 25 15:30:47 2008 @@ -1,0 +1,113 @@ +/* + ReactOS Sound System + Sound Blaster / SB Pro / SB 16 driver + NT4 driver model + + Author: + Andrew Greenwood (andrew.greenwood(a)silverblade.co.uk) + + History: + 25 May 2008 - Created +*/ + +#include <ntddk.h> +#include <ntddsnd.h> +#include <debug.h> + +typedef struct _SOUND_BLASTER_EXTENSION +{ + ULONG NothingHereYet; +} SOUND_BLASTER_EXTENSION, *PSOUND_BLASTER_EXTENSION; + + +NTSTATUS STDCALL +CreateSoundBlaster( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + +NTSTATUS STDCALL +CloseSoundBlaster( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + +NTSTATUS STDCALL +CleanupSoundBlaster( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + +NTSTATUS STDCALL +ControlSoundBlaster( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS;} + +NTSTATUS STDCALL +WriteSoundBlaster( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS;} + +VOID STDCALL +UnloadSoundBlaster( + IN PDRIVER_OBJECT DriverObject) +{ + INFO_(IHVAUDIO, "Sound Blaster driver being unloaded"); +} + +NTSTATUS STDCALL +DriverEntry( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath) +{ + NTSTATUS status; + + INFO_(IHVAUDIO, "Sound Blaster driver (NT4 model) by Silver Blade"); + + DriverObject->Flags = 0; + + DriverObject->MajorFunction[IRP_MJ_CREATE] = CreateSoundBlaster; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = CloseSoundBlaster; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = CleanupSoundBlaster; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = ControlSoundBlaster; + DriverObject->MajorFunction[IRP_MJ_WRITE] = WriteSoundBlaster; + DriverObject->DriverUnload = UnloadSoundBlaster; + + return STATUS_SUCCESS; +} + Propchange: branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/main.c ------------------------------------------------------------------------------ eol-style = native Propchange: branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/main.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/sb16_nt4.rbuild URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/drivers/multi… ============================================================================== --- branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/sb16_nt4.rbuild [iso-8859-1] (original) +++ branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/sb16_nt4.rbuild [iso-8859-1] Sun May 25 15:30:47 2008 @@ -7,4 +7,5 @@ <library>ntoskrnl</library> <library>hal</library> <file>test.c</file> + <file>devname.c</file> </module> Modified: branches/silverblade-audio/include/ddk/ntddsnd.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/ddk/n… ============================================================================== --- branches/silverblade-audio/include/ddk/ntddsnd.h [iso-8859-1] (original) +++ branches/silverblade-audio/include/ddk/ntddsnd.h [iso-8859-1] Sun May 25 15:30:47 2008 @@ -15,6 +15,10 @@ Should you have an unstoppable urge to build an NT4 multimedia driver against these headers, just create the other files listed above and make them #include this one. + + There are also a number of additional enhancements within this file + not found in the originals (such as DOS device name strings and device + type IDs). */ #ifndef NTDDWAVE @@ -24,6 +28,20 @@ /* + Device types + (not part of the original DDK header) +*/ + +#define WAVE_IN_DEVICE_TYPE 0 +#define WAVE_OUT_DEVICE_TYPE 1 +#define MIDI_IN_DEVICE_TYPE 2 +#define MIDI_OUT_DEVICE_TYPE 3 +#define MIXER_DEVICE_TYPE 4 +#define AUX_DEVICE_TYPE 5 +#define MAX_DEVICE_TYPE AUX_DEVICE_TYPE + + +/* Base device names Each device name should be given a numerical suffix identifying that @@ -33,25 +51,37 @@ \Device\WaveOut1 - Second wave output device */ -#define SOUND_MAX_DEVICE_NAME 80 - -#define DD_WAVE_IN_DEVICE_NAME "\\Device\\WaveIn" -#define DD_WAVE_IN_DEVICE_NAME_U L"\\Device\\WaveIn" - -#define DD_WAVE_OUT_DEVICE_NAME "\\Device\\WaveOut" -#define DD_WAVE_OUT_DEVICE_NAME_U L"\\Device\\WaveOut" - -#define DD_MIDI_IN_DEVICE_NAME "\\Device\\MidiIn" -#define DD_MIDI_IN_DEVICE_NAME_U L"\\Device\\MidiIn" - -#define DD_MIDI_OUT_DEVICE_NAME "\\Device\\MidiOut" -#define DD_MIDI_OUT_DEVICE_NAME_U L"\\Device\\MidiOut" - -#define DD_MIX_DEVICE_NAME "\\Device\\MMMix" -#define DD_MIX_DEVICE_NAME_U L"\\Device\\MMMix" - -#define DD_AUX_DEVICE_NAME "\\Device\\MMAux" -#define DD_AUX_DEVICE_NAME_U L"\\Device\\MMAux" +#define SOUND_MAX_DEVICE_NAME 80 + +#define DD_WAVE_IN_DEVICE_NAME "\\Device\\WaveIn" +#define DD_WAVE_IN_DEVICE_NAME_U L"\\Device\\WaveIn" +#define DD_WAVE_IN_DOS_DEVICE_NAME "\\DosDevices\\WaveIn" +#define DD_WAVE_IN_DOS_DEVICE_NAME_U L"\\DosDevices\\WaveIn" + +#define DD_WAVE_OUT_DEVICE_NAME "\\Device\\WaveOut" +#define DD_WAVE_OUT_DEVICE_NAME_U L"\\Device\\WaveOut" +#define DD_WAVE_OUT_DOS_DEVICE_NAME "\\DosDevices\\WaveOut" +#define DD_WAVE_OUT_DOS_DEVICE_NAME_U L"\\DosDevices\\WaveOut" + +#define DD_MIDI_IN_DEVICE_NAME "\\Device\\MidiIn" +#define DD_MIDI_IN_DEVICE_NAME_U L"\\Device\\MidiIn" +#define DD_MIDI_IN_DOS_DEVICE_NAME "\\DosDevices\\MidiIn" +#define DD_MIDI_IN_DOS_DEVICE_NAME_U L"\\DosDevices\\MidiIn" + +#define DD_MIDI_OUT_DEVICE_NAME "\\Device\\MidiOut" +#define DD_MIDI_OUT_DEVICE_NAME_U L"\\Device\\MidiOut" +#define DD_MIDI_OUT_DOS_DEVICE_NAME "\\DosDevices\\MidiOut" +#define DD_MIDI_OUT_DOS_DEVICE_NAME_U L"\\DosDevices\\MidiOut" + +#define DD_MIX_DEVICE_NAME "\\Device\\MMMix" +#define DD_MIX_DEVICE_NAME_U L"\\Device\\MMMix" +#define DD_MIX_DOS_DEVICE_NAME "\\DosDevices\\MMMix" +#define DD_MIX_DOS_DEVICE_NAME_U L"\\DosDevices\\MMMix" + +#define DD_AUX_DEVICE_NAME "\\Device\\MMAux" +#define DD_AUX_DEVICE_NAME_U L"\\Device\\MMAux" +#define DD_AUX_DOS_DEVICE_NAME "\\DosDevices\\MMAux" +#define DD_AUX_DOS_DEVICE_NAME_U L"\\DosDevices\\MMAux" /* Base control codes

1 0

[greatlrd] 33701: implement LpkDllInitialize for lpk
by greatlrd＠svn.reactos.org 25 May '08

25 May '08

Author: greatlrd Date: Sun May 25 12:52:28 2008 New Revision: 33701 URL: http://svn.reactos.org/svn/reactos?rev=33701&view=rev Log: implement LpkDllInitialize for lpk Modified: trunk/reactos/dll/win32/lpk/dllmain.c trunk/reactos/dll/win32/lpk/ros_lpk.h Modified: trunk/reactos/dll/win32/lpk/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lpk/dllmain.c?re… ============================================================================== --- trunk/reactos/dll/win32/lpk/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lpk/dllmain.c [iso-8859-1] Sun May 25 12:52:28 2008 @@ -21,7 +21,7 @@ LPVOID lpReserved) { - return TRUE; + return LpkDllInitialize(hDll,dwReason,lpReserved); } BOOL @@ -31,5 +31,18 @@ DWORD dwReason, LPVOID lpReserved) { - return DllMain(hDll,dwReason,lpReserved); + switch(dwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hDll); + /* Tell usp10 it is activated usp10 */ + LpkPresent(); + break; + + default: + break; + } + + return TRUE; } + Modified: trunk/reactos/dll/win32/lpk/ros_lpk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lpk/ros_lpk.h?re… ============================================================================== --- trunk/reactos/dll/win32/lpk/ros_lpk.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lpk/ros_lpk.h [iso-8859-1] Sun May 25 12:52:28 2008 @@ -10,6 +10,9 @@ #include <windows.h> #include <ndk/ntndk.h> + +/* FIXME USP10 api that does not have prototype in any include file */ +VOID WINAPI LpkPresent(); /* FIXME move _LPK_LPEDITCONTROL_LIST to global place so user32 can access it */ typedef struct _LPK_LPEDITCONTROL_LIST

1 0

[greatlrd] 33700: fix right export prefix for LpkPresent.
by greatlrd＠svn.reactos.org 25 May '08

25 May '08

Author: greatlrd Date: Sun May 25 12:51:15 2008 New Revision: 33700 URL: http://svn.reactos.org/svn/reactos?rev=33700&view=rev Log: fix right export prefix for LpkPresent. Modified: trunk/reactos/dll/win32/usp10/usp10.c trunk/reactos/dll/win32/usp10/usp10.spec Modified: trunk/reactos/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] Sun May 25 12:51:15 2008 @@ -1731,3 +1731,11 @@ for (i = 0; i < nbchars; i++) widths[i] = glyph_width[i]; return S_OK; } + + +VOID WINAPI LpkPresent() +{ + /* FIXME */ + DbgPrint("LPK: %s is unimplemented, please try again later.\n", __FUNCTION__); +} + Modified: trunk/reactos/dll/win32/usp10/usp10.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.spec… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.spec [iso-8859-1] Sun May 25 12:51:15 2008 @@ -1,4 +1,4 @@ -@ stub LpkPresent +@ stdcall LpkPresent() @ stdcall ScriptApplyDigitSubstitution(ptr ptr ptr) @ stub ScriptApplyLogicalWidth @ stdcall ScriptBreak(ptr long ptr ptr)

1 0

[greatlrd] 33699: add dll lpk it is stub for now. it will be use of gdi32 and user32 later
by greatlrd＠svn.reactos.org 25 May '08

25 May '08

Author: greatlrd Date: Sun May 25 10:22:09 2008 New Revision: 33699 URL: http://svn.reactos.org/svn/reactos?rev=33699&view=rev Log: add dll lpk it is stub for now. it will be use of gdi32 and user32 later Added: trunk/reactos/dll/win32/lpk/ trunk/reactos/dll/win32/lpk/dllmain.c (with props) trunk/reactos/dll/win32/lpk/lpk.def (with props) trunk/reactos/dll/win32/lpk/lpk.rbuild (with props) trunk/reactos/dll/win32/lpk/lpk.rc (with props) trunk/reactos/dll/win32/lpk/ros_lpk.h (with props) trunk/reactos/dll/win32/lpk/stub.c (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=336… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Sun May 25 10:22:09 2008 @@ -7,6 +7,7 @@ <property name="BASEADDRESS_DEVENUM" value="0x35680000" /> <property name="BASEADDRESS_RSABASE" value="0x35700000" /> <property name="BASEADDRESS_RSAENH" value="0x35780000" /> + <property name="BASEADDRESS_LPK" value="0x516C0000" /> <property name="BASEADDRESS_TELEPHON" value="0x58750000" /> <property name="BASEADDRESS_PWRCFG" value="0x587e0000" /> <property name="BASEADDRESS_MMSYS" value="0x588a0000" /> Added: trunk/reactos/dll/win32/lpk/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lpk/dllmain.c?re… ============================================================================== --- trunk/reactos/dll/win32/lpk/dllmain.c (added) +++ trunk/reactos/dll/win32/lpk/dllmain.c [iso-8859-1] Sun May 25 10:22:09 2008 @@ -1,0 +1,35 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS + * PURPOSE: LPK Library + * PROGRAMMER: Magnus Olsen (greatlrd) + * + */ + +#include "ros_lpk.h" + +LPK_LPEDITCONTROL_LIST LpkEditControl = {EditCreate, EditIchToXY, EditMouseToIch, EditCchInWidth, + EditGetLineWidth, EditDrawText, EditHScroll, EditMoveSelection, + EditVerifyText, EditNextWord, EditSetMenu, EditProcessMenu, + EditCreateCaret, EditAdjustCaret}; + +BOOL +WINAPI +DllMain ( + HANDLE hDll, + DWORD dwReason, + LPVOID lpReserved) +{ + + return TRUE; +} + +BOOL +WINAPI +LpkDllInitialize ( + HANDLE hDll, + DWORD dwReason, + LPVOID lpReserved) +{ + return DllMain(hDll,dwReason,lpReserved); +} Propchange: trunk/reactos/dll/win32/lpk/dllmain.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/lpk/lpk.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lpk/lpk.def?rev=… ============================================================================== --- trunk/reactos/dll/win32/lpk/lpk.def (added) +++ trunk/reactos/dll/win32/lpk/lpk.def [iso-8859-1] Sun May 25 10:22:09 2008 @@ -1,0 +1,20 @@ +; $Id: gdi32.def 33598 2008-05-19 10:20:39Z greatlrd $ +; +; lpk.def +; +; ReactOS Operating System +; +LIBRARY lpk.dll +EXPORTS +LpkInitialize@4 +LpkTabbedTextOut@48 +LpkDllInitialize@12 +LpkDrawTextEx@40 +LpkEditControl@0 +LpkExtTextOut@36 +LpkGetCharacterPlacement@28 +LpkGetTextExtentExPoint@36 +LpkPSMTextOut@24 +LpkUseGDIWidthCache@20 +ftsWordBreak@20 + Propchange: trunk/reactos/dll/win32/lpk/lpk.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/lpk/lpk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lpk/lpk.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/lpk/lpk.rbuild (added) +++ trunk/reactos/dll/win32/lpk/lpk.rbuild [iso-8859-1] Sun May 25 10:22:09 2008 @@ -1,0 +1,20 @@ +<module name="lpk" type="win32dll" baseaddress="${BASEADDRESS_LPK}" installbase="system32" installname="lpk.dll" unicode="yes"> + <importlibrary definition="lpk.def" /> + <include base="lpk">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="WINVER">0x0600</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="LANGPACK" /> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>usp10</library> + + <file>dllmain.c</file> + <file>stub.c</file> + + <linkerflag>-lgcc</linkerflag> + <linkerflag>-nostartfiles</linkerflag> + <linkerflag>-nostdlib</linkerflag> + <file>lpk.rc</file> +</module> Propchange: trunk/reactos/dll/win32/lpk/lpk.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/lpk/lpk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lpk/lpk.rc?rev=3… ============================================================================== --- trunk/reactos/dll/win32/lpk/lpk.rc (added) +++ trunk/reactos/dll/win32/lpk/lpk.rc [iso-8859-1] Sun May 25 10:22:09 2008 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Language Pack\0" +#define REACTOS_STR_INTERNAL_NAME "lpk\0" +#define REACTOS_STR_ORIGINAL_FILENAME "lpk.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/win32/lpk/lpk.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/lpk/ros_lpk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lpk/ros_lpk.h?re… ============================================================================== --- trunk/reactos/dll/win32/lpk/ros_lpk.h (added) +++ trunk/reactos/dll/win32/lpk/ros_lpk.h [iso-8859-1] Sun May 25 10:22:09 2008 @@ -1,0 +1,63 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS + * PURPOSE: LPK Library + * PROGRAMMER: Magnus Olsen (greatlrd) + * + */ +#define WIN32_NO_STATUS +#define NTOS_MODE_USER + +#include <windows.h> +#include <ndk/ntndk.h> + +/* FIXME move _LPK_LPEDITCONTROL_LIST to global place so user32 can access it */ +typedef struct _LPK_LPEDITCONTROL_LIST +{ + PVOID EditCreate; + PVOID EditIchToXY; + PVOID EditMouseToIch; + PVOID EditCchInWidth; + PVOID EditGetLineWidth; + PVOID EditDrawText; + PVOID EditHScroll; + PVOID EditMoveSelection; + PVOID EditVerifyText; + PVOID EditNextWord; + PVOID EditSetMenu; + PVOID EditProcessMenu; + PVOID EditCreateCaret; + PVOID EditAdjustCaret; +} LPK_LPEDITCONTROL_LIST, *PLPK_LPEDITCONTROL_LIST; + +/* This List are exported */ + + +DWORD WINAPI EditCreate( DWORD x1, DWORD x2); +DWORD WINAPI EditIchToXY( DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5); +DWORD WINAPI EditMouseToIch( DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5); +DWORD WINAPI EditCchInWidth( DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5); + +DWORD WINAPI EditGetLineWidth( DWORD x1, DWORD x2, DWORD x3, DWORD x4); +DWORD WINAPI EditDrawText( DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5, DWORD x6, DWORD x7); +DWORD WINAPI EditHScroll( DWORD x1, DWORD x2, DWORD x3); +DWORD WINAPI EditMoveSelection( DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5); + +DWORD WINAPI EditVerifyText( DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5, DWORD x6); +DWORD WINAPI EditNextWord(DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5, DWORD x6, DWORD x7); +DWORD WINAPI EditSetMenu(DWORD x1, DWORD x2); +DWORD WINAPI EditProcessMenu(DWORD x1, DWORD x2); +DWORD WINAPI EditCreateCaret(DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5); +DWORD WINAPI EditAdjustCaret(DWORD x1, DWORD x2, DWORD x3, DWORD x5); + +DWORD WINAPI LpkInitialize(DWORD x1); +DWORD WINAPI LpkTabbedTextOut(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6,DWORD x7,DWORD x8,DWORD x9,DWORD x10,DWORD x11,DWORD x12); +BOOL WINAPI LpkDllInitialize (HANDLE hDll, DWORD dwReason, LPVOID lpReserved); +DWORD WINAPI LpkDrawTextEx(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6,DWORD x7,DWORD x8,DWORD x9, DWORD x10); +DWORD WINAPI LpkExtTextOut(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6,DWORD x7,DWORD x8,DWORD x9); +DWORD WINAPI LpkGetCharacterPlacement(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6, DWORD x7); +DWORD WINAPI LpkGetTextExtentExPoint(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6,DWORD x7,DWORD x8,DWORD x9); +DWORD WINAPI LpkPSMTextOut(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6); +DWORD WINAPI LpkUseGDIWidthCache(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5); +DWORD WINAPI ftsWordBreak(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5); + Propchange: trunk/reactos/dll/win32/lpk/ros_lpk.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/lpk/stub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lpk/stub.c?rev=3… ============================================================================== --- trunk/reactos/dll/win32/lpk/stub.c (added) +++ trunk/reactos/dll/win32/lpk/stub.c [iso-8859-1] Sun May 25 10:22:09 2008 @@ -1,0 +1,178 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS + * PURPOSE: LPK Library + * PROGRAMMER: Magnus Olsen (greatlrd) + * + */ + +#include "ros_lpk.h" + +#define UNIMPLEMENTED DbgPrint("LPK: %s is unimplemented, please try again later.\n", __FUNCTION__); + +/* + * @unimplemented + */ +DWORD WINAPI LpkInitialize(DWORD x1) +{ + UNIMPLEMENTED + return 0; +} + +/* + * @unimplemented + */ +DWORD WINAPI LpkTabbedTextOut(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6,DWORD x7,DWORD x8,DWORD x9,DWORD x10,DWORD x11,DWORD x12) +{ + UNIMPLEMENTED + return 0; +} + +/* + * @unimplemented + */ +DWORD WINAPI LpkDrawTextEx(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6,DWORD x7,DWORD x8,DWORD x9, DWORD x10) +{ + UNIMPLEMENTED + return 0; +} + +/* + * @unimplemented + */ +DWORD WINAPI LpkExtTextOut(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6,DWORD x7,DWORD x8,DWORD x9) +{ + UNIMPLEMENTED + return 0; +} + +/* + * @unimplemented + */ +DWORD WINAPI LpkGetCharacterPlacement(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6, DWORD x7) +{ + UNIMPLEMENTED + return 0; +} + +/* + * @unimplemented + */ +DWORD WINAPI LpkGetTextExtentExPoint(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6,DWORD x7,DWORD x8,DWORD x9) +{ + UNIMPLEMENTED + return 0; +} + +/* + * @unimplemented + */ +DWORD WINAPI LpkPSMTextOut(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6) +{ + UNIMPLEMENTED + return 0; +} + +/* + * @unimplemented + */ +DWORD WINAPI LpkUseGDIWidthCache(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5) +{ + UNIMPLEMENTED + return 0; +} + +/* + * @unimplemented + */ +DWORD WINAPI ftsWordBreak(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5) +{ + UNIMPLEMENTED + return 0; +} + +DWORD WINAPI EditCreate( DWORD x1, DWORD x2) +{ + UNIMPLEMENTED + return 0; +} + +DWORD WINAPI EditIchToXY( DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5) +{ + UNIMPLEMENTED + return 0; +} + +DWORD WINAPI EditMouseToIch( DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5) +{ + UNIMPLEMENTED + return 0; +} + +DWORD WINAPI EditCchInWidth( DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5) +{ + UNIMPLEMENTED + return 0; +} + + +DWORD WINAPI EditGetLineWidth( DWORD x1, DWORD x2, DWORD x3, DWORD x4) +{ + UNIMPLEMENTED + return 0; +} + +DWORD WINAPI EditDrawText( DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5, DWORD x6, DWORD x7) +{ + UNIMPLEMENTED + return 0; +} + +DWORD WINAPI EditHScroll( DWORD x1, DWORD x2, DWORD x3) +{ + UNIMPLEMENTED + return 0; +} + +DWORD WINAPI EditMoveSelection( DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5) +{ + UNIMPLEMENTED + return 0; +} + +DWORD WINAPI EditVerifyText( DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5, DWORD x6) +{ + UNIMPLEMENTED + return 0; +} + +DWORD WINAPI EditNextWord(DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5, DWORD x6, DWORD x7) +{ + UNIMPLEMENTED + return 0; +} + +DWORD WINAPI EditSetMenu(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED + return 0; +} + +DWORD WINAPI EditProcessMenu(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED + return 0; +} + +DWORD WINAPI EditCreateCaret(DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5) +{ + UNIMPLEMENTED + return 0; +} + +DWORD WINAPI EditAdjustCaret(DWORD x1, DWORD x2, DWORD x3, DWORD x5) +{ + UNIMPLEMENTED + return 0; +} + Propchange: trunk/reactos/dll/win32/lpk/stub.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Sun May 25 10:22:09 2008 @@ -121,6 +121,9 @@ <directory name="kernel32"> <xi:include href="kernel32/kernel32.rbuild" /> </directory> +<directory name="lpk"> + <xi:include href="lpk/lpk.rbuild" /> +</directory> <directory name="lsasrv"> <xi:include href="lsasrv/lsasrv.rbuild" /> </directory>

1 0

[cfinck] 33698: Update README.WINE about the crypt32 sync
by cfinck＠svn.reactos.org 25 May '08

25 May '08

Author: cfinck Date: Sun May 25 09:16:14 2008 New Revision: 33698 URL: http://svn.reactos.org/svn/reactos?rev=33698&view=rev Log: Update README.WINE about the crypt32 sync Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun May 25 09:16:14 2008 @@ -40,7 +40,7 @@ reactos/dll/win32/comctl32 # Autosync reactos/dll/win32/comdlg32 # Autosync reactos/dll/win32/compstui # Autosync -reactos/dll/win32/crypt32 # Out of sync +reactos/dll/win32/crypt32 # Synced to Wine-1_0-rc1 reactos/dll/win32/cryptdll # Autosync reactos/dll/win32/cryptnet # Autosync reactos/dll/win32/dbghelp # Synced to Wine-20080106

1 0

[greatlrd] 33697: started added test for InitializeLpkHooks this tests are not completed more will follow. this is the frame work for testing InitializeLpkHooks
by greatlrd＠svn.reactos.org 25 May '08

25 May '08

Author: greatlrd Date: Sun May 25 07:04:06 2008 New Revision: 33697 URL: http://svn.reactos.org/svn/reactos?rev=33697&view=rev Log: started added test for InitializeLpkHooks this tests are not completed more will follow. this is the frame work for testing InitializeLpkHooks Added: trunk/rostests/apitests/user32api/tests/InitializeLpkHooks.c (with props) Modified: trunk/rostests/apitests/user32api/testlist.c Modified: trunk/rostests/apitests/user32api/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32api/testli… ============================================================================== --- trunk/rostests/apitests/user32api/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32api/testlist.c [iso-8859-1] Sun May 25 07:04:06 2008 @@ -6,6 +6,7 @@ #include "user32api.h" /* include the tests */ +#include "tests/InitializeLpkHooks.c" #include "tests/ScrollDC.c" #include "tests/ScrollWindowEx.c" #include "tests/RealGetWindowClass.c" @@ -13,6 +14,7 @@ /* The List of tests */ TESTENTRY TestList[] = { + { L"InitializeLpkHooks", Test_InitializeLpkHooks }, { L"ScrollDC", Test_ScrollDC }, { L"ScrollWindowEx", Test_ScrollWindowEx }, { L"RealGetWindowClass", Test_RealGetWindowClass }, Added: trunk/rostests/apitests/user32api/tests/InitializeLpkHooks.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32api/tests/… ============================================================================== --- trunk/rostests/apitests/user32api/tests/InitializeLpkHooks.c (added) +++ trunk/rostests/apitests/user32api/tests/InitializeLpkHooks.c [iso-8859-1] Sun May 25 07:04:06 2008 @@ -1,0 +1,96 @@ + +typedef struct _LPK_LPEDITCONTROL_LIST +{ + PVOID EditCreate; + PVOID EditIchToXY; + PVOID EditMouseToIch; + PVOID EditCchInWidth; + PVOID EditGetLineWidth; + PVOID EditDrawText; + PVOID EditHScroll; + PVOID EditMoveSelection; + PVOID EditVerifyText; + PVOID EditNextWord; + PVOID EditSetMenu; + PVOID EditProcessMenu; + PVOID EditCreateCaret; + PVOID EditAdjustCaret; +} LPK_LPEDITCONTROL_LIST, *PLPK_LPEDITCONTROL_LIST; + + +DWORD (APIENTRY *fpLpkTabbedTextOut) (LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID); +DWORD (APIENTRY *fpLpkPSMTextOut) (LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID); +DWORD (APIENTRY *fpLpkDrawTextEx) (LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID); +PLPK_LPEDITCONTROL_LIST (APIENTRY *fpLpkEditControl) (); + +int Count_myLpkTabbedTextOut = 0; +int Count_myLpkPSMTextOut = 0; +int Count_myLpkDrawTextEx = 0; + +DWORD STDCALL myLpkTabbedTextOut (LPVOID x1,LPVOID x2,LPVOID x3, LPVOID x4, LPVOID x5, LPVOID x6, LPVOID x7, LPVOID x8, + LPVOID x9, LPVOID x10, LPVOID x11, LPVOID x12) +{ + Count_myLpkTabbedTextOut++; + return fpLpkTabbedTextOut(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12); +} + +DWORD myLpkPSMTextOut (LPVOID x1,LPVOID x2,LPVOID x3,LPVOID x4,LPVOID x5,LPVOID x6) +{ + Count_myLpkPSMTextOut++; + return fpLpkPSMTextOut ( x1, x2, x3, x4, x5, x6); +} + +DWORD myLpkDrawTextEx(LPVOID x1,LPVOID x2,LPVOID x3,LPVOID x4,LPVOID x5, LPVOID x6, LPVOID x7, LPVOID x8, LPVOID x9,LPVOID x10) +{ + Count_myLpkDrawTextEx++; + return fpLpkDrawTextEx(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10); +} + + +typedef struct _USER32_INTERN_INITALIZEHOOKS +{ + PVOID fpLpkTabbedTextOut; + PVOID fpLpkPSMTextOut; + PVOID fpLpkDrawTextEx; + PLPK_LPEDITCONTROL_LIST fpListLpkEditControl; +} USER32_INTERN_INITALIZEHOOKS, *PUSER32_INTERN_INITALIZEHOOKS; + +VOID STDCALL InitializeLpkHooks (PUSER32_INTERN_INITALIZEHOOKS); + +INT +Test_InitializeLpkHooks(PTESTINFO pti) +{ + USER32_INTERN_INITALIZEHOOKS setup; + HMODULE lib = LoadLibrary("LPK.DLL"); + + TEST(lib != NULL); + if (lib != NULL) + { + fpLpkTabbedTextOut = (DWORD (APIENTRY *) (LPVOID,LPVOID,LPVOID,LPVOID,LPVOID, LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID)) GetProcAddress(lib, "LpkTabbedTextOut"); + fpLpkPSMTextOut = (DWORD (APIENTRY *) (LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID)) GetProcAddress(lib, "fpLpkPSMTextOut"); + fpLpkDrawTextEx = (DWORD (APIENTRY *) (LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID)) GetProcAddress(lib, "LpkDrawTextEx"); + fpLpkEditControl = (PLPK_LPEDITCONTROL_LIST (APIENTRY *) (VOID)) GetProcAddress(lib, "LpkEditControl"); + + setup.fpLpkTabbedTextOut = myLpkTabbedTextOut; + setup.fpLpkPSMTextOut = myLpkPSMTextOut; + setup.fpLpkDrawTextEx = myLpkDrawTextEx; + + /* we have not add any test to this api */ + setup.fpListLpkEditControl = (PLPK_LPEDITCONTROL_LIST)fpLpkEditControl; + + /* use our own api that we just made */ + InitializeLpkHooks(&setup); + + /* FIXME add test now */ + + /* restore */ + setup.fpLpkTabbedTextOut = fpLpkTabbedTextOut; + setup.fpLpkPSMTextOut = fpLpkPSMTextOut; + setup.fpLpkDrawTextEx = fpLpkDrawTextEx; + setup.fpListLpkEditControl = (PLPK_LPEDITCONTROL_LIST)fpLpkEditControl; + InitializeLpkHooks(&setup); + } + + return APISTATUS_NORMAL; +} + Propchange: trunk/rostests/apitests/user32api/tests/InitializeLpkHooks.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ekohl] 33696: Add the general user properties page. Settings are visible but cannot be changed yet.
by ekohl＠svn.reactos.org 25 May '08

25 May '08

Author: ekohl Date: Sun May 25 06:50:56 2008 New Revision: 33696 URL: http://svn.reactos.org/svn/reactos?rev=33696&view=rev Log: Add the general user properties page. Settings are visible but cannot be changed yet. Added: trunk/reactos/dll/cpl/usrmgr/userprops.c (with props) Modified: trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc trunk/reactos/dll/cpl/usrmgr/resource.h (contents, props changed) trunk/reactos/dll/cpl/usrmgr/users.c (contents, props changed) trunk/reactos/dll/cpl/usrmgr/usrmgr.h (contents, props changed) trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild (contents, props changed) Modified: trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc [iso-8859-1] Sun May 25 06:50:56 2008 @@ -41,8 +41,16 @@ CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_USER_NAME, 7, 7, 112, 8 - + LTEXT "", IDC_USER_GENERAL_NAME, 7, 7, 112, 8 + LTEXT "Full name:", -1, 7, 46, 63, 8 + EDITTEXT IDC_USER_GENERAL_FULL_NAME,77,43,168,13,ES_AUTOHSCROLL + LTEXT "Description:", -1, 7, 64, 63, 8 + EDITTEXT IDC_USER_GENERAL_DESCRIPTION,77,61,168,13,ES_AUTOHSCROLL + AUTOCHECKBOX "User must change the password upon first logon",IDC_USER_GENERAL_FORCE_CHANGE,7,82,210,10 + AUTOCHECKBOX "User cannot change the password",IDC_USER_GENERAL_CANNOT_CHANGE,7,95,210,10 + AUTOCHECKBOX "Password never expires",IDC_USER_GENERAL_NEVER_EXPIRES,7,108,210,10 + AUTOCHECKBOX "Account is disabled",IDC_USER_GENERAL_DISABLED,7,121,210,10 + AUTOCHECKBOX "Account is locked",IDC_USER_GENERAL_LOCKED,7,134,210,10,WS_DISABLED END @@ -131,7 +139,7 @@ MENUITEM "Delete", IDM_USER_DELETE MENUITEM "Rename", IDM_USER_RENAME MENUITEM SEPARATOR - MENUITEM "Properties", IDM_USER_PROPERTIES, GRAYED + MENUITEM "Properties", IDM_USER_PROPERTIES END END Modified: trunk/reactos/dll/cpl/usrmgr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/resource.h?… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/resource.h [iso-8859-1] Sun May 25 06:50:56 2008 @@ -1,98 +1,98 @@ -#ifndef __CPL_USRMGR_RESOURCE_H__ -#define __CPL_USRMGR_RESOURCE_H__ - -#include <commctrl.h> - -/* metrics */ -#define PROPSHEETWIDTH 246 -#define PROPSHEETHEIGHT 228 -#define PROPSHEETPADDING 6 - -#define SYSTEM_COLUMN (18 * PROPSHEETPADDING) -#define LABELLINE(x) (((PROPSHEETPADDING + 2) * x) + (x + 2)) - -#define ICONSIZE 16 - - -/* Icons */ -#define IDI_USRMGR_ICON 40 -#define IDI_USRMGR_ICON2 100 // Needed for theme compatibility with Windows. -#define IDI_USER 41 -#define IDI_LOCKED_USER 42 -#define IDI_GROUP 43 - - -#define IDD_USERS 100 -#define IDD_GROUPS 101 -#define IDD_EXTRA 102 - -#define IDC_USERS_LIST 200 - -#define IDC_GROUPS_LIST 300 - -#define IDC_STATIC -1 - - -/* Dialogs */ - -#define IDD_USER_GENERAL 310 -#define IDC_USER_NAME 311 -#define IDC_USER_FULLNAME 312 -#define IDC_USER_DESCRIPTION 313 -#define IDC_USER_PW_CHANGE 314 -#define IDC_USER_PW_NOCHANGE 315 -#define IDC_USER_PW_EXPIRE 316 -#define IDC_USER_DEACTIVATE 317 -#define IDC_USER_LOCK 318 - - -#define IDD_CHANGE_PASSWORD 350 -#define IDC_EDIT_PASSWORD1 351 -#define IDC_EDIT_PASSWORD2 352 - - -#define IDD_USER_NEW 360 -#define IDC_USER_NEW_NAME 361 -#define IDC_USER_NEW_FULL_NAME 362 -#define IDC_USER_NEW_DESCRIPTION 363 -#define IDC_USER_NEW_PASSWORD1 364 -#define IDC_USER_NEW_PASSWORD2 365 -#define IDC_USER_NEW_FORCE_CHANGE 366 -#define IDC_USER_NEW_CANNOT_CHANGE 367 -#define IDC_USER_NEW_NEVER_EXPIRES 368 -#define IDC_USER_NEW_DISABLED 369 - - -#define IDD_GROUP_NEW 370 -#define IDC_GROUP_NEW_NAME 371 -#define IDC_GROUP_NEW_DESCRIPTION 372 - - -/* Strings */ - -#define IDS_CPLNAME 2000 -#define IDS_CPLDESCRIPTION 2001 - -#define IDS_NAME 2100 -#define IDS_FULLNAME 2101 -#define IDS_DESCRIPTION 2102 - - -/* Menus */ - -#define IDM_POPUP_GROUP 120 -#define IDM_GROUP_ADD_MEMBER 121 -#define IDM_GROUP_NEW 122 -#define IDM_GROUP_DELETE 123 -#define IDM_GROUP_RENAME 124 -#define IDM_GROUP_PROPERTIES 125 - -#define IDM_POPUP_USER 130 -#define IDM_USER_CHANGE_PASSWORD 131 -#define IDM_USER_NEW 132 -#define IDM_USER_DELETE 133 -#define IDM_USER_RENAME 134 -#define IDM_USER_PROPERTIES 135 - -#endif /* __CPL_USRMGR_RESOURCE_H__ */ - +#ifndef __CPL_USRMGR_RESOURCE_H__ +#define __CPL_USRMGR_RESOURCE_H__ + +#include <commctrl.h> + +/* metrics */ +#define PROPSHEETWIDTH 246 +#define PROPSHEETHEIGHT 228 +#define PROPSHEETPADDING 6 + +#define SYSTEM_COLUMN (18 * PROPSHEETPADDING) +#define LABELLINE(x) (((PROPSHEETPADDING + 2) * x) + (x + 2)) + +#define ICONSIZE 16 + + +/* Icons */ +#define IDI_USRMGR_ICON 40 +#define IDI_USRMGR_ICON2 100 // Needed for theme compatibility with Windows. +#define IDI_USER 41 +#define IDI_LOCKED_USER 42 +#define IDI_GROUP 43 + + +#define IDD_USERS 100 +#define IDD_GROUPS 101 +#define IDD_EXTRA 102 + +#define IDC_USERS_LIST 200 + +#define IDC_GROUPS_LIST 300 + +#define IDC_STATIC -1 + + +/* Dialogs */ + +#define IDD_USER_GENERAL 310 +#define IDC_USER_GENERAL_NAME 311 +#define IDC_USER_GENERAL_FULL_NAME 312 +#define IDC_USER_GENERAL_DESCRIPTION 313 +#define IDC_USER_GENERAL_FORCE_CHANGE 314 +#define IDC_USER_GENERAL_CANNOT_CHANGE 315 +#define IDC_USER_GENERAL_NEVER_EXPIRES 316 +#define IDC_USER_GENERAL_DISABLED 317 +#define IDC_USER_GENERAL_LOCKED 318 + + +#define IDD_CHANGE_PASSWORD 350 +#define IDC_EDIT_PASSWORD1 351 +#define IDC_EDIT_PASSWORD2 352 + + +#define IDD_USER_NEW 360 +#define IDC_USER_NEW_NAME 361 +#define IDC_USER_NEW_FULL_NAME 362 +#define IDC_USER_NEW_DESCRIPTION 363 +#define IDC_USER_NEW_PASSWORD1 364 +#define IDC_USER_NEW_PASSWORD2 365 +#define IDC_USER_NEW_FORCE_CHANGE 366 +#define IDC_USER_NEW_CANNOT_CHANGE 367 +#define IDC_USER_NEW_NEVER_EXPIRES 368 +#define IDC_USER_NEW_DISABLED 369 + + +#define IDD_GROUP_NEW 370 +#define IDC_GROUP_NEW_NAME 371 +#define IDC_GROUP_NEW_DESCRIPTION 372 + + +/* Strings */ + +#define IDS_CPLNAME 2000 +#define IDS_CPLDESCRIPTION 2001 + +#define IDS_NAME 2100 +#define IDS_FULLNAME 2101 +#define IDS_DESCRIPTION 2102 + + +/* Menus */ + +#define IDM_POPUP_GROUP 120 +#define IDM_GROUP_ADD_MEMBER 121 +#define IDM_GROUP_NEW 122 +#define IDM_GROUP_DELETE 123 +#define IDM_GROUP_RENAME 124 +#define IDM_GROUP_PROPERTIES 125 + +#define IDM_POPUP_USER 130 +#define IDM_USER_CHANGE_PASSWORD 131 +#define IDM_USER_NEW 132 +#define IDM_USER_DELETE 133 +#define IDM_USER_RENAME 134 +#define IDM_USER_PROPERTIES 135 + +#endif /* __CPL_USRMGR_RESOURCE_H__ */ + Propchange: trunk/reactos/dll/cpl/usrmgr/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/usrmgr/userprops.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/userprops.c… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/userprops.c (added) +++ trunk/reactos/dll/cpl/usrmgr/userprops.c [iso-8859-1] Sun May 25 06:50:56 2008 @@ -1,0 +1,167 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS User Manager Control Panel + * FILE: dll/cpl/usrmgr/users.c + * PURPOSE: Users property page + * + * PROGRAMMERS: Eric Kohl + */ + +#include "usrmgr.h" + +static VOID +UpdateUserOptions(HWND hwndDlg, + PUSER_INFO_3 userInfo, + BOOL bInit) +{ + EnableWindow(GetDlgItem(hwndDlg, IDC_USER_GENERAL_CANNOT_CHANGE), + !userInfo->usri3_password_expired); + EnableWindow(GetDlgItem(hwndDlg, IDC_USER_GENERAL_NEVER_EXPIRES), + !userInfo->usri3_password_expired); + EnableWindow(GetDlgItem(hwndDlg, IDC_USER_GENERAL_FORCE_CHANGE), + (userInfo->usri3_flags & (UF_PASSWD_CANT_CHANGE | UF_DONT_EXPIRE_PASSWD)) == 0); + + if (bInit) + { + CheckDlgButton(hwndDlg, IDC_USER_GENERAL_FORCE_CHANGE, + userInfo->usri3_password_expired ? BST_CHECKED : BST_UNCHECKED); + + CheckDlgButton(hwndDlg, IDC_USER_GENERAL_CANNOT_CHANGE, + (userInfo->usri3_flags & UF_PASSWD_CANT_CHANGE) ? BST_CHECKED : BST_UNCHECKED); + + CheckDlgButton(hwndDlg, IDC_USER_GENERAL_NEVER_EXPIRES, + (userInfo->usri3_flags & UF_DONT_EXPIRE_PASSWD) ? BST_CHECKED : BST_UNCHECKED); + + CheckDlgButton(hwndDlg, IDC_USER_GENERAL_DISABLED, + (userInfo->usri3_flags & UF_ACCOUNTDISABLE) ? BST_CHECKED : BST_UNCHECKED); + } +} + + +static VOID +GetUserData(HWND hwndDlg, LPTSTR lpUserName, PUSER_INFO_3 *usrInfo) +{ + PUSER_INFO_3 userInfo = NULL; + + SetDlgItemText(hwndDlg, IDC_USER_GENERAL_NAME, lpUserName); + + NetUserGetInfo(NULL, lpUserName, 3, (LPBYTE*)&userInfo); + + SetDlgItemText(hwndDlg, IDC_USER_GENERAL_FULL_NAME, userInfo->usri3_full_name); + SetDlgItemText(hwndDlg, IDC_USER_GENERAL_DESCRIPTION, userInfo->usri3_comment); + + UpdateUserOptions(hwndDlg, userInfo, TRUE); + + *usrInfo = userInfo; +} + + +INT_PTR CALLBACK +UserGeneralPageProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PUSER_INFO_3 userInfo; + + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(hwndDlg); + + userInfo = (PUSER_INFO_3)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) + { + case WM_INITDIALOG: + GetUserData(hwndDlg, + (LPTSTR)((PROPSHEETPAGE *)lParam)->lParam, + &userInfo); + SetWindowLongPtr(hwndDlg, DWLP_USER, (INT_PTR)userInfo); + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_USER_GENERAL_FORCE_CHANGE: + userInfo->usri3_password_expired = !userInfo->usri3_password_expired; + UpdateUserOptions(hwndDlg, userInfo, FALSE); + break; + + case IDC_USER_GENERAL_CANNOT_CHANGE: + userInfo->usri3_flags ^= UF_PASSWD_CANT_CHANGE; + UpdateUserOptions(hwndDlg, userInfo, FALSE); + break; + + case IDC_USER_GENERAL_NEVER_EXPIRES: + userInfo->usri3_flags ^= UF_DONT_EXPIRE_PASSWD; + UpdateUserOptions(hwndDlg, userInfo, FALSE); + break; + + case IDC_USER_GENERAL_DISABLED: + userInfo->usri3_flags ^= UF_ACCOUNTDISABLE; + break; + + case IDC_USER_GENERAL_LOCKED: + break; + } + break; + + case WM_DESTROY: + NetApiBufferFree(userInfo); + break; + } + + return FALSE; +} + + +static VOID +InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc, LPTSTR pszUser) +{ + ZeroMemory(psp, sizeof(PROPSHEETPAGE)); + psp->dwSize = sizeof(PROPSHEETPAGE); + psp->dwFlags = PSP_DEFAULT; + psp->hInstance = hApplet; + psp->pszTemplate = MAKEINTRESOURCE(idDlg); + psp->pfnDlgProc = DlgProc; + psp->lParam = (LPARAM)pszUser; +} + + +VOID +UserProperties(HWND hwndDlg) +{ + PROPSHEETPAGE psp[1]; + PROPSHEETHEADER psh; + TCHAR szUserName[UNLEN]; + INT nItem; + HWND hwndLV; + + hwndLV = GetDlgItem(hwndDlg, IDC_USERS_LIST); + nItem = ListView_GetNextItem(hwndLV, -1, LVNI_SELECTED); + if (nItem == -1) + return; + + /* Get the new user name */ + ListView_GetItemText(hwndLV, + nItem, 0, + szUserName, + UNLEN); + + ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_PROPSHEETPAGE | PSH_PROPTITLE; + psh.hwndParent = hwndDlg; + psh.hInstance = hApplet; + psh.hIcon = NULL; + psh.pszCaption = szUserName; + psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); + psh.nStartPage = 0; + psh.ppsp = psp; + + InitPropSheetPage(&psp[0], IDD_USER_GENERAL, (DLGPROC)UserGeneralPageProc, szUserName); +// InitPropSheetPage(&psp[1], IDD_USER_MEMBERSHIP, (DLGPROC)UserMembershipPageProc); +// InitPropSheetPage(&psp[2], IDD_USER_PROFILE, (DLGPROC)UserProfilePageProc); + + PropertySheet(&psh); +} Propchange: trunk/reactos/dll/cpl/usrmgr/userprops.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 25 06:50:56 2008 @@ -1,659 +1,664 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS User Manager Control Panel - * FILE: dll/cpl/usrmgr/users.c - * PURPOSE: Users property page - * - * PROGRAMMERS: Eric Kohl - */ - -/* - * TODO: - * - Add new user to the users group. - * - Remove a user from all groups. - * - Implement user property pages. - * - Use localized messages. - */ - -#include "usrmgr.h" - - -typedef struct _USER_DATA -{ - HMENU hPopupMenu; - - INT iCurrentItem; - -} USER_DATA, *PUSER_DATA; - - - -static BOOL -CheckPasswords(HWND hwndDlg, - INT nIdDlgItem1, - INT nIdDlgItem2) -{ - TCHAR szPassword1[256]; - TCHAR szPassword2[256]; - UINT uLen1; - UINT uLen2; - - uLen1 = GetDlgItemText(hwndDlg, nIdDlgItem1, szPassword1, 256); - uLen2 = GetDlgItemText(hwndDlg, nIdDlgItem2, szPassword2, 256); - - /* Check the passwords */ - if (uLen1 != uLen2 || _tcscmp(szPassword1, szPassword2) != 0) - { - MessageBox(hwndDlg, - TEXT("The passwords you entered are not the same!"), - TEXT("ERROR"), - MB_OK | MB_ICONERROR); - return FALSE; - } - - - return TRUE; -} - - -INT_PTR CALLBACK -ChangePasswordDlgProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - UNREFERENCED_PARAMETER(wParam); - - switch (uMsg) - { - case WM_INITDIALOG: - break; - - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDOK: - if (CheckPasswords(hwndDlg, IDC_EDIT_PASSWORD1, IDC_EDIT_PASSWORD2)) - EndDialog(hwndDlg, 0); - break; - - case IDCANCEL: - EndDialog(hwndDlg, 0); - break; - } - break; - - default: - return FALSE; - } - - return TRUE; -} - - -static VOID -UpdateUserOptions(HWND hwndDlg, - PUSER_INFO_3 userInfo, - BOOL bInit) -{ - EnableWindow(GetDlgItem(hwndDlg, IDC_USER_NEW_CANNOT_CHANGE), - !userInfo->usri3_password_expired); - EnableWindow(GetDlgItem(hwndDlg, IDC_USER_NEW_NEVER_EXPIRES), - !userInfo->usri3_password_expired); - - EnableWindow(GetDlgItem(hwndDlg, IDC_USER_NEW_FORCE_CHANGE), - (userInfo->usri3_flags & (UF_PASSWD_CANT_CHANGE | UF_DONT_EXPIRE_PASSWD)) == 0); - - if (bInit) - { - CheckDlgButton(hwndDlg, IDC_USER_NEW_FORCE_CHANGE, - userInfo->usri3_password_expired ? BST_CHECKED : BST_UNCHECKED); - - CheckDlgButton(hwndDlg, IDC_USER_NEW_CANNOT_CHANGE, - (userInfo->usri3_flags & UF_PASSWD_CANT_CHANGE) ? BST_CHECKED : BST_UNCHECKED); - - CheckDlgButton(hwndDlg, IDC_USER_NEW_NEVER_EXPIRES, - (userInfo->usri3_flags & UF_DONT_EXPIRE_PASSWD) ? BST_CHECKED : BST_UNCHECKED); - - CheckDlgButton(hwndDlg, IDC_USER_NEW_DISABLED, - (userInfo->usri3_flags & UF_ACCOUNTDISABLE) ? BST_CHECKED : BST_UNCHECKED); - } -} - - -INT_PTR CALLBACK -NewUserDlgProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - PUSER_INFO_3 userInfo; - INT nLength; - - UNREFERENCED_PARAMETER(wParam); - - userInfo = (PUSER_INFO_3)GetWindowLongPtr(hwndDlg, DWLP_USER); - - switch (uMsg) - { - case WM_INITDIALOG: - userInfo = (PUSER_INFO_3)lParam; - SetWindowLongPtr(hwndDlg, DWLP_USER, lParam); - SendDlgItemMessage(hwndDlg, IDC_USER_NEW_NAME, EM_SETLIMITTEXT, 20, 0); - UpdateUserOptions(hwndDlg, userInfo, TRUE); - break; - - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDC_USER_NEW_NAME: - if (HIWORD(wParam) == EN_CHANGE) - { - nLength = SendDlgItemMessage(hwndDlg, IDC_USER_NEW_NAME, WM_GETTEXTLENGTH, 0, 0); - EnableWindow(GetDlgItem(hwndDlg, IDOK), (nLength > 0)); - } - break; - - case IDC_USER_NEW_FORCE_CHANGE: - userInfo->usri3_password_expired = !userInfo->usri3_password_expired; - UpdateUserOptions(hwndDlg, userInfo, FALSE); - break; - - case IDC_USER_NEW_CANNOT_CHANGE: - userInfo->usri3_flags ^= UF_PASSWD_CANT_CHANGE; - UpdateUserOptions(hwndDlg, userInfo, FALSE); - break; - - case IDC_USER_NEW_NEVER_EXPIRES: - userInfo->usri3_flags ^= UF_DONT_EXPIRE_PASSWD; - UpdateUserOptions(hwndDlg, userInfo, FALSE); - break; - - case IDC_USER_NEW_DISABLED: - userInfo->usri3_flags ^= UF_ACCOUNTDISABLE; - break; - - case IDOK: - 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); - break; - } - - if (!CheckPasswords(hwndDlg, IDC_USER_NEW_PASSWORD1, IDC_USER_NEW_PASSWORD2)) - { - SetDlgItemText(hwndDlg, IDC_USER_NEW_PASSWORD1, TEXT("")); - SetDlgItemText(hwndDlg, IDC_USER_NEW_PASSWORD2, TEXT("")); - break; - } - - /* Store the user name */ - nLength = SendDlgItemMessage(hwndDlg, IDC_USER_NEW_NAME, WM_GETTEXTLENGTH, 0, 0); - if (nLength > 0) - { - userInfo->usri3_name = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (nLength + 1) * sizeof(WCHAR)); - GetDlgItemText(hwndDlg, IDC_USER_NEW_NAME, userInfo->usri3_name, nLength + 1); - } - - /* Store the full user name */ - nLength = SendDlgItemMessage(hwndDlg, IDC_USER_NEW_FULL_NAME, WM_GETTEXTLENGTH, 0, 0); - if (nLength > 0) - { - userInfo->usri3_full_name = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (nLength + 1) * sizeof(WCHAR)); - GetDlgItemText(hwndDlg, IDC_USER_NEW_FULL_NAME, userInfo->usri3_full_name, nLength + 1); - } - - /* Store the description */ - nLength = SendDlgItemMessage(hwndDlg, IDC_USER_NEW_DESCRIPTION, WM_GETTEXTLENGTH, 0, 0); - if (nLength > 0) - { - userInfo->usri3_comment = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (nLength + 1) * sizeof(WCHAR)); - GetDlgItemText(hwndDlg, IDC_USER_NEW_DESCRIPTION, userInfo->usri3_comment, nLength + 1); - } - - /* Store the password */ - nLength = SendDlgItemMessage(hwndDlg, IDC_USER_NEW_PASSWORD1, WM_GETTEXTLENGTH, 0, 0); - if (nLength > 0) - { - userInfo->usri3_password = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (nLength + 1) * sizeof(WCHAR)); - GetDlgItemText(hwndDlg, IDC_USER_NEW_PASSWORD1, userInfo->usri3_password, nLength + 1); - } - - EndDialog(hwndDlg, IDOK); - break; - - case IDCANCEL: - EndDialog(hwndDlg, IDCANCEL); - break; - } - break; - - default: - return FALSE; - } - - return TRUE; -} - - -static VOID -UserNew(HWND hwndDlg) -{ - USER_INFO_3 user; - NET_API_STATUS status; - LV_ITEM lvi; - INT iItem; - HWND hwndLV; - - ZeroMemory(&user, sizeof(USER_INFO_3)); - - user.usri3_priv = USER_PRIV_USER; - user.usri3_flags = UF_SCRIPT; - user.usri3_acct_expires = TIMEQ_FOREVER; - user.usri3_max_storage = USER_MAXSTORAGE_UNLIMITED; - user.usri3_primary_group_id = DOMAIN_GROUP_RID_USERS; - - user.usri3_password_expired = TRUE; - - if (DialogBoxParam(hApplet, - MAKEINTRESOURCE(IDD_USER_NEW), - hwndDlg, - NewUserDlgProc, - (LPARAM)&user) == IDOK) - { -#if 0 - status = NetUserAdd(NULL, - 3, - (LPBYTE)&user, - NULL); -#else - status = NERR_Success; -#endif - if (status != NERR_Success) - { - TCHAR szText[256]; - wsprintf(szText, TEXT("Error: %u"), status); - MessageBox(NULL, szText, TEXT("NetUserAdd"), MB_ICONERROR | MB_OK); - return; - } - - hwndLV = GetDlgItem(hwndDlg, IDC_USERS_LIST); - - ZeroMemory(&lvi, sizeof(lvi)); - lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_IMAGE; - lvi.pszText = user.usri3_name; - lvi.state = 0; - lvi.iImage = (user.usri3_flags & UF_ACCOUNTDISABLE) ? 1 : 0; - iItem = ListView_InsertItem(hwndLV, &lvi); - - ListView_SetItemText(hwndLV, iItem, 1, - user.usri3_full_name); - - ListView_SetItemText(hwndLV, iItem, 2, - user.usri3_comment); - } - - if (user.usri3_name) - HeapFree(GetProcessHeap, 0, user.usri3_name); - - if (user.usri3_full_name) - HeapFree(GetProcessHeap, 0, user.usri3_full_name); - - if (user.usri3_comment) - HeapFree(GetProcessHeap, 0, user.usri3_comment); - - if (user.usri3_password) - HeapFree(GetProcessHeap, 0, user.usri3_password); -} - - -static VOID -UserRename(HWND hwndDlg) -{ - HWND hwndLV; - INT nItem; - - hwndLV = GetDlgItem(hwndDlg, IDC_USERS_LIST); - if (hwndLV == NULL) - return; - - nItem = ListView_GetNextItem(hwndLV, -1, LVNI_SELECTED); - if (nItem != -1) - { - (void)ListView_EditLabel(hwndLV, nItem); - } -} - - -static BOOL -UserDelete(HWND hwndDlg) -{ - TCHAR szUserName[UNLEN]; - TCHAR szText[256]; - INT nItem; - HWND hwndLV; - NET_API_STATUS status; - - hwndLV = GetDlgItem(hwndDlg, IDC_USERS_LIST); - nItem = ListView_GetNextItem(hwndLV, -1, LVNI_SELECTED); - if (nItem == -1) - return FALSE; - - /* Get the new user name */ - ListView_GetItemText(hwndLV, - nItem, 0, - szUserName, - UNLEN); - - /* Display a warning message because the delete operation cannot be reverted */ - wsprintf(szText, TEXT("Dou you really want to delete the user \"%s\"?"), szUserName); - if (MessageBox(NULL, szText, TEXT("User Accounts"), MB_ICONWARNING | MB_YESNO) == IDNO) - return FALSE; - - /* Delete the user */ -#if 0 - status = NetUserDel(NULL, szUserName); -#else - status = NERR_Success; -#endif - if (status != NERR_Success) - { - TCHAR szText[256]; - wsprintf(szText, TEXT("Error: %u"), status); - MessageBox(NULL, szText, TEXT("NetUserDel"), MB_ICONERROR | MB_OK); - return FALSE; - } - - /* Delete the user from the list */ - (void)ListView_DeleteItem(hwndLV, nItem); - - return TRUE; -} - - -static VOID -SetUsersListColumns(HWND hwndListView) -{ - LV_COLUMN column; - RECT rect; - TCHAR szStr[32]; - - GetClientRect(hwndListView, &rect); - - memset(&column, 0x00, sizeof(column)); - column.mask=LVCF_FMT | LVCF_WIDTH | LVCF_SUBITEM | LVCF_TEXT; - column.fmt=LVCFMT_LEFT; - column.cx = (INT)((rect.right - rect.left) * 0.25); - column.iSubItem = 0; - LoadString(hApplet, IDS_NAME, szStr, sizeof(szStr) / sizeof(szStr[0])); - column.pszText = szStr; - (void)ListView_InsertColumn(hwndListView, 0, &column); - - column.cx = (INT)((rect.right - rect.left) * 0.50); - column.iSubItem = 1; - LoadString(hApplet, IDS_FULLNAME, szStr, sizeof(szStr) / sizeof(szStr[0])); - column.pszText = szStr; - (void)ListView_InsertColumn(hwndListView, 1, &column); - - column.cx = (INT)((rect.right - rect.left) * 0.25); - column.iSubItem = 2; - LoadString(hApplet, IDS_DESCRIPTION, szStr, sizeof(szStr) / sizeof(szStr[0])); - column.pszText = szStr; - (void)ListView_InsertColumn(hwndListView, 2, &column); -} - - -static VOID -UpdateUsersList(HWND hwndListView) -{ - NET_API_STATUS netStatus; - PUSER_INFO_20 pBuffer; - DWORD entriesread; - DWORD totalentries; - DWORD resume_handle = 0; - DWORD i; - LV_ITEM lvi; - INT iItem; - - - for (;;) - { - netStatus = NetUserEnum(NULL, 20, FILTER_NORMAL_ACCOUNT, - (LPBYTE*)&pBuffer, - 1024, &entriesread, - &totalentries, &resume_handle); - if (netStatus != NERR_Success && netStatus != ERROR_MORE_DATA) - break; - - for (i = 0; i < entriesread; i++) - { - memset(&lvi, 0x00, sizeof(lvi)); - lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_IMAGE; - lvi.pszText = pBuffer[i].usri20_name; - lvi.state = 0; - lvi.iImage = (pBuffer[i].usri20_flags & UF_ACCOUNTDISABLE) ? 1 : 0; - iItem = ListView_InsertItem(hwndListView, &lvi); - - ListView_SetItemText(hwndListView, iItem, 1, - pBuffer[i].usri20_full_name); - - ListView_SetItemText(hwndListView, iItem, 2, - pBuffer[i].usri20_comment); - } - - NetApiBufferFree(&pBuffer); - - /* No more data left */ - if (netStatus != ERROR_MORE_DATA) - break; - } - -} - - -static VOID -OnInitDialog(HWND hwndDlg) -{ - HWND hwndListView; - HIMAGELIST hImgList; - HICON hIcon; - - /* Create the image list */ - hImgList = ImageList_Create(16, 16, ILC_COLOR8 | ILC_MASK, 5, 5); - hIcon = LoadImage(hApplet, MAKEINTRESOURCE(IDI_USER), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); - ImageList_AddIcon(hImgList, hIcon); - hIcon = LoadImage(hApplet, MAKEINTRESOURCE(IDI_LOCKED_USER), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); - ImageList_AddIcon(hImgList, hIcon); - DestroyIcon(hIcon); - - hwndListView = GetDlgItem(hwndDlg, IDC_USERS_LIST); - - (VOID)ListView_SetImageList(hwndListView, hImgList, LVSIL_SMALL); - - (void)ListView_SetExtendedListViewStyle(hwndListView, LVS_EX_FULLROWSELECT); - - SetUsersListColumns(hwndListView); - - UpdateUsersList(hwndListView); -} - - -static BOOL -OnBeginLabelEdit(LPNMLVDISPINFO pnmv) -{ - HWND hwndEdit; - - hwndEdit = ListView_GetEditControl(pnmv->hdr.hwndFrom); - if (hwndEdit == NULL) - return TRUE; - - SendMessage(hwndEdit, EM_SETLIMITTEXT, 20, 0); - - return FALSE; -} - - -static BOOL -OnEndLabelEdit(LPNMLVDISPINFO pnmv) -{ - TCHAR szOldUserName[UNLEN]; - TCHAR szNewUserName[UNLEN]; - USER_INFO_0 useri0; - NET_API_STATUS status; - - /* Leave, if there is no valid listview item */ - if (pnmv->item.iItem == -1) - return FALSE; - - /* Get the new user name */ - ListView_GetItemText(pnmv->hdr.hwndFrom, - pnmv->item.iItem, 0, - szOldUserName, - UNLEN); - - /* Leave, if the user canceled the edit action */ - if (pnmv->item.pszText == NULL) - return FALSE; - - /* Get the new user name */ - lstrcpy(szNewUserName, pnmv->item.pszText); - - /* Leave, if the user name was not changed */ - if (lstrcmp(szOldUserName, szNewUserName) == 0) - return FALSE; - - /* Check the user name for illegal characters */ - if (!CheckAccountName(NULL, 0, szNewUserName)) - return FALSE; - - /* Change the user name */ - useri0.usri0_name = szNewUserName; - -#if 0 - status = NetUserSetInfo(NULL, szOldUserName, 0, (LPBYTE)&useri0, NULL); -#else - status = NERR_Success; -#endif - if (status != NERR_Success) - { - TCHAR szText[256]; - wsprintf(szText, TEXT("Error: %u"), status); - MessageBox(NULL, szText, TEXT("NetUserSetInfo"), MB_ICONERROR | MB_OK); - return FALSE; - } - - /* Update the listview item */ - ListView_SetItemText(pnmv->hdr.hwndFrom, - pnmv->item.iItem, 0, - szNewUserName); - - return TRUE; -} - - -static BOOL -OnNotify(HWND hwndDlg, PUSER_DATA pUserData, NMHDR *phdr) -{ - LPNMLISTVIEW lpnmlv = (LPNMLISTVIEW)phdr; - - switch (phdr->idFrom) - { - case IDC_USERS_LIST: - switch(phdr->code) - { - case NM_CLICK: - pUserData->iCurrentItem = lpnmlv->iItem; - if (lpnmlv->iItem == -1) - { - } - else - { - } - break; - - case NM_DBLCLK: - break; - - case NM_RCLICK: - ClientToScreen(GetDlgItem(hwndDlg, IDC_USERS_LIST), &lpnmlv->ptAction); - TrackPopupMenu(GetSubMenu(pUserData->hPopupMenu, (lpnmlv->iItem == -1) ? 0 : 1), - TPM_LEFTALIGN, lpnmlv->ptAction.x, lpnmlv->ptAction.y, 0, hwndDlg, NULL); - break; - - case LVN_BEGINLABELEDIT: - return OnBeginLabelEdit((LPNMLVDISPINFO)phdr); - - case LVN_ENDLABELEDIT: - return OnEndLabelEdit((LPNMLVDISPINFO)phdr); - } - break; - } - - return FALSE; -} - - -INT_PTR CALLBACK -UsersPageProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - PUSER_DATA pUserData; - - UNREFERENCED_PARAMETER(wParam); - - pUserData = (PUSER_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); - - switch (uMsg) - { - case WM_INITDIALOG: - pUserData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(USER_DATA)); - SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pUserData); - - pUserData->hPopupMenu = LoadMenu(hApplet, MAKEINTRESOURCE(IDM_POPUP_USER)); - - OnInitDialog(hwndDlg); - break; - - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDM_USER_CHANGE_PASSWORD: - DialogBoxParam(hApplet, - MAKEINTRESOURCE(IDD_CHANGE_PASSWORD), - hwndDlg, - ChangePasswordDlgProc, - (LPARAM)NULL); - break; - - case IDM_USER_RENAME: - UserRename(hwndDlg); - break; - - case IDM_USER_NEW: - UserNew(hwndDlg); - break; - - case IDM_USER_DELETE: - UserDelete(hwndDlg); - break; - - case IDM_USER_PROPERTIES: - MessageBeep(-1); - break; - } - break; - - case WM_NOTIFY: - return OnNotify(hwndDlg, pUserData, (NMHDR *)lParam); - - case WM_DESTROY: - DestroyMenu(pUserData->hPopupMenu); - HeapFree(GetProcessHeap(), 0, pUserData); - break; - } - - return FALSE; -} +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS User Manager Control Panel + * FILE: dll/cpl/usrmgr/users.c + * PURPOSE: Users property page + * + * PROGRAMMERS: Eric Kohl + */ + +/* + * TODO: + * - Add new user to the users group. + * - Remove a user from all groups. + * - Use localized messages. + */ + +#include "usrmgr.h" + + +typedef struct _USER_DATA +{ + HMENU hPopupMenu; + + INT iCurrentItem; + +} USER_DATA, *PUSER_DATA; + + + +static BOOL +CheckPasswords(HWND hwndDlg, + INT nIdDlgItem1, + INT nIdDlgItem2) +{ + TCHAR szPassword1[256]; + TCHAR szPassword2[256]; + UINT uLen1; + UINT uLen2; + + uLen1 = GetDlgItemText(hwndDlg, nIdDlgItem1, szPassword1, 256); + uLen2 = GetDlgItemText(hwndDlg, nIdDlgItem2, szPassword2, 256); + + /* Check the passwords */ + if (uLen1 != uLen2 || _tcscmp(szPassword1, szPassword2) != 0) + { + MessageBox(hwndDlg, + TEXT("The passwords you entered are not the same!"), + TEXT("ERROR"), + MB_OK | MB_ICONERROR); + return FALSE; + } + + + return TRUE; +} + + +INT_PTR CALLBACK +ChangePasswordDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + UNREFERENCED_PARAMETER(wParam); + + switch (uMsg) + { + case WM_INITDIALOG: + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + if (CheckPasswords(hwndDlg, IDC_EDIT_PASSWORD1, IDC_EDIT_PASSWORD2)) + EndDialog(hwndDlg, 0); + break; + + case IDCANCEL: + EndDialog(hwndDlg, 0); + break; + } + break; + + default: + return FALSE; + } + + return TRUE; +} + + +static VOID +UpdateUserOptions(HWND hwndDlg, + PUSER_INFO_3 userInfo, + BOOL bInit) +{ + EnableWindow(GetDlgItem(hwndDlg, IDC_USER_NEW_CANNOT_CHANGE), + !userInfo->usri3_password_expired); + EnableWindow(GetDlgItem(hwndDlg, IDC_USER_NEW_NEVER_EXPIRES), + !userInfo->usri3_password_expired); + + EnableWindow(GetDlgItem(hwndDlg, IDC_USER_NEW_FORCE_CHANGE), + (userInfo->usri3_flags & (UF_PASSWD_CANT_CHANGE | UF_DONT_EXPIRE_PASSWD)) == 0); + + if (bInit) + { + CheckDlgButton(hwndDlg, IDC_USER_NEW_FORCE_CHANGE, + userInfo->usri3_password_expired ? BST_CHECKED : BST_UNCHECKED); + + CheckDlgButton(hwndDlg, IDC_USER_NEW_CANNOT_CHANGE, + (userInfo->usri3_flags & UF_PASSWD_CANT_CHANGE) ? BST_CHECKED : BST_UNCHECKED); + + CheckDlgButton(hwndDlg, IDC_USER_NEW_NEVER_EXPIRES, + (userInfo->usri3_flags & UF_DONT_EXPIRE_PASSWD) ? BST_CHECKED : BST_UNCHECKED); + + CheckDlgButton(hwndDlg, IDC_USER_NEW_DISABLED, + (userInfo->usri3_flags & UF_ACCOUNTDISABLE) ? BST_CHECKED : BST_UNCHECKED); + } +} + + +INT_PTR CALLBACK +NewUserDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PUSER_INFO_3 userInfo; + INT nLength; + + UNREFERENCED_PARAMETER(wParam); + + userInfo = (PUSER_INFO_3)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) + { + case WM_INITDIALOG: + userInfo = (PUSER_INFO_3)lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, lParam); + SendDlgItemMessage(hwndDlg, IDC_USER_NEW_NAME, EM_SETLIMITTEXT, 20, 0); + UpdateUserOptions(hwndDlg, userInfo, TRUE); + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_USER_NEW_NAME: + if (HIWORD(wParam) == EN_CHANGE) + { + nLength = SendDlgItemMessage(hwndDlg, IDC_USER_NEW_NAME, WM_GETTEXTLENGTH, 0, 0); + EnableWindow(GetDlgItem(hwndDlg, IDOK), (nLength > 0)); + } + break; + + case IDC_USER_NEW_FORCE_CHANGE: + userInfo->usri3_password_expired = !userInfo->usri3_password_expired; + UpdateUserOptions(hwndDlg, userInfo, FALSE); + break; + + case IDC_USER_NEW_CANNOT_CHANGE: + userInfo->usri3_flags ^= UF_PASSWD_CANT_CHANGE; + UpdateUserOptions(hwndDlg, userInfo, FALSE); + break; + + case IDC_USER_NEW_NEVER_EXPIRES: + userInfo->usri3_flags ^= UF_DONT_EXPIRE_PASSWD; + UpdateUserOptions(hwndDlg, userInfo, FALSE); + break; + + case IDC_USER_NEW_DISABLED: + userInfo->usri3_flags ^= UF_ACCOUNTDISABLE; + break; + + case IDOK: + 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); + break; + } + + if (!CheckPasswords(hwndDlg, IDC_USER_NEW_PASSWORD1, IDC_USER_NEW_PASSWORD2)) + { + SetDlgItemText(hwndDlg, IDC_USER_NEW_PASSWORD1, TEXT("")); + SetDlgItemText(hwndDlg, IDC_USER_NEW_PASSWORD2, TEXT("")); + break; + } + + /* Store the user name */ + nLength = SendDlgItemMessage(hwndDlg, IDC_USER_NEW_NAME, WM_GETTEXTLENGTH, 0, 0); + if (nLength > 0) + { + userInfo->usri3_name = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (nLength + 1) * sizeof(WCHAR)); + GetDlgItemText(hwndDlg, IDC_USER_NEW_NAME, userInfo->usri3_name, nLength + 1); + } + + /* Store the full user name */ + nLength = SendDlgItemMessage(hwndDlg, IDC_USER_NEW_FULL_NAME, WM_GETTEXTLENGTH, 0, 0); + if (nLength > 0) + { + userInfo->usri3_full_name = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (nLength + 1) * sizeof(WCHAR)); + GetDlgItemText(hwndDlg, IDC_USER_NEW_FULL_NAME, userInfo->usri3_full_name, nLength + 1); + } + + /* Store the description */ + nLength = SendDlgItemMessage(hwndDlg, IDC_USER_NEW_DESCRIPTION, WM_GETTEXTLENGTH, 0, 0); + if (nLength > 0) + { + userInfo->usri3_comment = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (nLength + 1) * sizeof(WCHAR)); + GetDlgItemText(hwndDlg, IDC_USER_NEW_DESCRIPTION, userInfo->usri3_comment, nLength + 1); + } + + /* Store the password */ + nLength = SendDlgItemMessage(hwndDlg, IDC_USER_NEW_PASSWORD1, WM_GETTEXTLENGTH, 0, 0); + if (nLength > 0) + { + userInfo->usri3_password = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (nLength + 1) * sizeof(WCHAR)); + GetDlgItemText(hwndDlg, IDC_USER_NEW_PASSWORD1, userInfo->usri3_password, nLength + 1); + } + + EndDialog(hwndDlg, IDOK); + break; + + case IDCANCEL: + EndDialog(hwndDlg, IDCANCEL); + break; + } + break; + + default: + return FALSE; + } + + return TRUE; +} + + +static VOID +UserNew(HWND hwndDlg) +{ + USER_INFO_3 user; + NET_API_STATUS status; + LV_ITEM lvi; + INT iItem; + HWND hwndLV; + + ZeroMemory(&user, sizeof(USER_INFO_3)); + + user.usri3_priv = USER_PRIV_USER; + user.usri3_flags = UF_SCRIPT; + user.usri3_acct_expires = TIMEQ_FOREVER; + user.usri3_max_storage = USER_MAXSTORAGE_UNLIMITED; + user.usri3_primary_group_id = DOMAIN_GROUP_RID_USERS; + + user.usri3_password_expired = TRUE; + + if (DialogBoxParam(hApplet, + MAKEINTRESOURCE(IDD_USER_NEW), + hwndDlg, + NewUserDlgProc, + (LPARAM)&user) == IDOK) + { +#if 0 + status = NetUserAdd(NULL, + 3, + (LPBYTE)&user, + NULL); +#else + status = NERR_Success; +#endif + if (status != NERR_Success) + { + TCHAR szText[256]; + wsprintf(szText, TEXT("Error: %u"), status); + MessageBox(NULL, szText, TEXT("NetUserAdd"), MB_ICONERROR | MB_OK); + return; + } + + hwndLV = GetDlgItem(hwndDlg, IDC_USERS_LIST); + + ZeroMemory(&lvi, sizeof(lvi)); + lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_IMAGE; + lvi.pszText = user.usri3_name; + lvi.state = 0; + lvi.iImage = (user.usri3_flags & UF_ACCOUNTDISABLE) ? 1 : 0; + iItem = ListView_InsertItem(hwndLV, &lvi); + + ListView_SetItemText(hwndLV, iItem, 1, + user.usri3_full_name); + + ListView_SetItemText(hwndLV, iItem, 2, + user.usri3_comment); + } + + if (user.usri3_name) + HeapFree(GetProcessHeap, 0, user.usri3_name); + + if (user.usri3_full_name) + HeapFree(GetProcessHeap, 0, user.usri3_full_name); + + if (user.usri3_comment) + HeapFree(GetProcessHeap, 0, user.usri3_comment); + + if (user.usri3_password) + HeapFree(GetProcessHeap, 0, user.usri3_password); +} + + +static VOID +UserRename(HWND hwndDlg) +{ + HWND hwndLV; + INT nItem; + + hwndLV = GetDlgItem(hwndDlg, IDC_USERS_LIST); + if (hwndLV == NULL) + return; + + nItem = ListView_GetNextItem(hwndLV, -1, LVNI_SELECTED); + if (nItem != -1) + { + (void)ListView_EditLabel(hwndLV, nItem); + } +} + + +static BOOL +UserDelete(HWND hwndDlg) +{ + TCHAR szUserName[UNLEN]; + TCHAR szText[256]; + INT nItem; + HWND hwndLV; + NET_API_STATUS status; + + hwndLV = GetDlgItem(hwndDlg, IDC_USERS_LIST); + nItem = ListView_GetNextItem(hwndLV, -1, LVNI_SELECTED); + if (nItem == -1) + return FALSE; + + /* Get the new user name */ + ListView_GetItemText(hwndLV, + nItem, 0, + szUserName, + UNLEN); + + /* Display a warning message because the delete operation cannot be reverted */ + wsprintf(szText, TEXT("Dou you really want to delete the user \"%s\"?"), szUserName); + if (MessageBox(NULL, szText, TEXT("User Accounts"), MB_ICONWARNING | MB_YESNO) == IDNO) + return FALSE; + + /* Delete the user */ +#if 0 + status = NetUserDel(NULL, szUserName); +#else + status = NERR_Success; +#endif + if (status != NERR_Success) + { + TCHAR szText[256]; + wsprintf(szText, TEXT("Error: %u"), status); + MessageBox(NULL, szText, TEXT("NetUserDel"), MB_ICONERROR | MB_OK); + return FALSE; + } + + /* Delete the user from the list */ + (void)ListView_DeleteItem(hwndLV, nItem); + + return TRUE; +} + + +static VOID +SetUsersListColumns(HWND hwndListView) +{ + LV_COLUMN column; + RECT rect; + TCHAR szStr[32]; + + GetClientRect(hwndListView, &rect); + + memset(&column, 0x00, sizeof(column)); + column.mask=LVCF_FMT | LVCF_WIDTH | LVCF_SUBITEM | LVCF_TEXT; + column.fmt=LVCFMT_LEFT; + column.cx = (INT)((rect.right - rect.left) * 0.25); + column.iSubItem = 0; + LoadString(hApplet, IDS_NAME, szStr, sizeof(szStr) / sizeof(szStr[0])); + column.pszText = szStr; + (void)ListView_InsertColumn(hwndListView, 0, &column); + + column.cx = (INT)((rect.right - rect.left) * 0.50); + column.iSubItem = 1; + LoadString(hApplet, IDS_FULLNAME, szStr, sizeof(szStr) / sizeof(szStr[0])); + column.pszText = szStr; + (void)ListView_InsertColumn(hwndListView, 1, &column); + + column.cx = (INT)((rect.right - rect.left) * 0.25); + column.iSubItem = 2; + LoadString(hApplet, IDS_DESCRIPTION, szStr, sizeof(szStr) / sizeof(szStr[0])); + column.pszText = szStr; + (void)ListView_InsertColumn(hwndListView, 2, &column); +} + + +static VOID +UpdateUsersList(HWND hwndListView) +{ + NET_API_STATUS netStatus; + PUSER_INFO_20 pBuffer; + DWORD entriesread; + DWORD totalentries; + DWORD resume_handle = 0; + DWORD i; + LV_ITEM lvi; + INT iItem; + + + for (;;) + { + netStatus = NetUserEnum(NULL, 20, FILTER_NORMAL_ACCOUNT, + (LPBYTE*)&pBuffer, + 1024, &entriesread, + &totalentries, &resume_handle); + if (netStatus != NERR_Success && netStatus != ERROR_MORE_DATA) + break; + + for (i = 0; i < entriesread; i++) + { + memset(&lvi, 0x00, sizeof(lvi)); + lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_IMAGE; + lvi.pszText = pBuffer[i].usri20_name; + lvi.state = 0; + lvi.iImage = (pBuffer[i].usri20_flags & UF_ACCOUNTDISABLE) ? 1 : 0; + iItem = ListView_InsertItem(hwndListView, &lvi); + + ListView_SetItemText(hwndListView, iItem, 1, + pBuffer[i].usri20_full_name); + + ListView_SetItemText(hwndListView, iItem, 2, + pBuffer[i].usri20_comment); + } + + NetApiBufferFree(&pBuffer); + + /* No more data left */ + if (netStatus != ERROR_MORE_DATA) + break; + } + +} + + +static VOID +OnInitDialog(HWND hwndDlg) +{ + HWND hwndListView; + HIMAGELIST hImgList; + HICON hIcon; + + /* Create the image list */ + hImgList = ImageList_Create(16, 16, ILC_COLOR8 | ILC_MASK, 5, 5); + hIcon = LoadImage(hApplet, MAKEINTRESOURCE(IDI_USER), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); + ImageList_AddIcon(hImgList, hIcon); + hIcon = LoadImage(hApplet, MAKEINTRESOURCE(IDI_LOCKED_USER), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); + ImageList_AddIcon(hImgList, hIcon); + DestroyIcon(hIcon); + + hwndListView = GetDlgItem(hwndDlg, IDC_USERS_LIST); + + (VOID)ListView_SetImageList(hwndListView, hImgList, LVSIL_SMALL); + + (void)ListView_SetExtendedListViewStyle(hwndListView, LVS_EX_FULLROWSELECT); + + SetUsersListColumns(hwndListView); + + UpdateUsersList(hwndListView); +} + + +static BOOL +OnBeginLabelEdit(LPNMLVDISPINFO pnmv) +{ + HWND hwndEdit; + + hwndEdit = ListView_GetEditControl(pnmv->hdr.hwndFrom); + if (hwndEdit == NULL) + return TRUE; + + SendMessage(hwndEdit, EM_SETLIMITTEXT, 20, 0); + + return FALSE; +} + + +static BOOL +OnEndLabelEdit(LPNMLVDISPINFO pnmv) +{ + TCHAR szOldUserName[UNLEN]; + TCHAR szNewUserName[UNLEN]; + USER_INFO_0 useri0; + NET_API_STATUS status; + + /* Leave, if there is no valid listview item */ + if (pnmv->item.iItem == -1) + return FALSE; + + /* Get the new user name */ + ListView_GetItemText(pnmv->hdr.hwndFrom, + pnmv->item.iItem, 0, + szOldUserName, + UNLEN); + + /* Leave, if the user canceled the edit action */ + if (pnmv->item.pszText == NULL) + return FALSE; + + /* Get the new user name */ + lstrcpy(szNewUserName, pnmv->item.pszText); + + /* Leave, if the user name was not changed */ + if (lstrcmp(szOldUserName, szNewUserName) == 0) + return FALSE; + + /* Check the user name for illegal characters */ + if (!CheckAccountName(NULL, 0, szNewUserName)) + return FALSE; + + /* Change the user name */ + useri0.usri0_name = szNewUserName; + +#if 0 + status = NetUserSetInfo(NULL, szOldUserName, 0, (LPBYTE)&useri0, NULL); +#else + status = NERR_Success; +#endif + if (status != NERR_Success) + { + TCHAR szText[256]; + wsprintf(szText, TEXT("Error: %u"), status); + MessageBox(NULL, szText, TEXT("NetUserSetInfo"), MB_ICONERROR | MB_OK); + return FALSE; + } + + /* Update the listview item */ + ListView_SetItemText(pnmv->hdr.hwndFrom, + pnmv->item.iItem, 0, + szNewUserName); + + return TRUE; +} + + +static BOOL +OnNotify(HWND hwndDlg, PUSER_DATA pUserData, NMHDR *phdr) +{ + LPNMLISTVIEW lpnmlv = (LPNMLISTVIEW)phdr; + + switch (phdr->idFrom) + { + case IDC_USERS_LIST: + switch(phdr->code) + { + case NM_CLICK: + pUserData->iCurrentItem = lpnmlv->iItem; + break; + + case NM_DBLCLK: + if (lpnmlv->iItem != -1) + { + UINT uItem; + + uItem = GetMenuDefaultItem(GetSubMenu(pUserData->hPopupMenu, 1), + FALSE, 0); + if (uItem != (UINT)-1) + SendMessage(hwndDlg, WM_COMMAND, MAKEWPARAM(uItem, 0), 0); + } + break; + + case NM_RCLICK: + ClientToScreen(GetDlgItem(hwndDlg, IDC_USERS_LIST), &lpnmlv->ptAction); + TrackPopupMenu(GetSubMenu(pUserData->hPopupMenu, (lpnmlv->iItem == -1) ? 0 : 1), + TPM_LEFTALIGN, lpnmlv->ptAction.x, lpnmlv->ptAction.y, 0, hwndDlg, NULL); + break; + + case LVN_BEGINLABELEDIT: + return OnBeginLabelEdit((LPNMLVDISPINFO)phdr); + + case LVN_ENDLABELEDIT: + return OnEndLabelEdit((LPNMLVDISPINFO)phdr); + } + break; + } + + return FALSE; +} + + +INT_PTR CALLBACK +UsersPageProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PUSER_DATA pUserData; + + UNREFERENCED_PARAMETER(wParam); + + pUserData = (PUSER_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) + { + case WM_INITDIALOG: + pUserData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(USER_DATA)); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pUserData); + + pUserData->hPopupMenu = LoadMenu(hApplet, MAKEINTRESOURCE(IDM_POPUP_USER)); + + OnInitDialog(hwndDlg); + SetMenuDefaultItem(GetSubMenu(pUserData->hPopupMenu, 1), + IDM_USER_PROPERTIES, + FALSE); + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDM_USER_CHANGE_PASSWORD: + DialogBoxParam(hApplet, + MAKEINTRESOURCE(IDD_CHANGE_PASSWORD), + hwndDlg, + ChangePasswordDlgProc, + (LPARAM)NULL); + break; + + case IDM_USER_RENAME: + UserRename(hwndDlg); + break; + + case IDM_USER_NEW: + UserNew(hwndDlg); + break; + + case IDM_USER_DELETE: + UserDelete(hwndDlg); + break; + + case IDM_USER_PROPERTIES: + UserProperties(hwndDlg); + break; + } + break; + + case WM_NOTIFY: + return OnNotify(hwndDlg, pUserData, (NMHDR *)lParam); + + case WM_DESTROY: + DestroyMenu(pUserData->hPopupMenu); + HeapFree(GetProcessHeap(), 0, pUserData); + break; + } + + return FALSE; +} Propchange: trunk/reactos/dll/cpl/usrmgr/users.c ------------------------------------------------------------------------------ svn:eol-style = native 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 25 06:50:56 2008 @@ -1,39 +1,43 @@ -#ifndef __CPL_DESK_H__ -#define __CPL_DESK_H__ - -#include <windows.h> -#include <commctrl.h> -#include <commdlg.h> -#include <cpl.h> -#include <tchar.h> -#include <setupapi.h> -#include <lmaccess.h> -#include <lmapibuf.h> -#include <lmerr.h> -#include <stdio.h> - -#include "resource.h" - -typedef struct _APPLET -{ - int idIcon; - int idName; - int idDescription; - APPLET_PROC AppletProc; -} APPLET, *PAPPLET; - -extern HINSTANCE hApplet; - - -INT_PTR CALLBACK UsersPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); -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__ */ - +#ifndef __CPL_DESK_H__ +#define __CPL_DESK_H__ + +#include <windows.h> +#include <commctrl.h> +#include <commdlg.h> +#include <cpl.h> +#include <tchar.h> +#include <setupapi.h> +#include <lmaccess.h> +#include <lmapibuf.h> +#include <lmerr.h> +#include <stdio.h> + +#include "resource.h" + +typedef struct _APPLET +{ + int idIcon; + int idName; + int idDescription; + APPLET_PROC AppletProc; +} APPLET, *PAPPLET; + +extern HINSTANCE hApplet; + + +INT_PTR CALLBACK UsersPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +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); + +/* userprops.c */ +VOID +UserProperties(HWND hwndDlg); + +#endif /* __CPL_DESK_H__ */ + Propchange: trunk/reactos/dll/cpl/usrmgr/usrmgr.h ------------------------------------------------------------------------------ svn:eol-style = native 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 25 06:50:56 2008 @@ -1,22 +1,23 @@ -<?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="usrmgr" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_USRMGR}" installbase="system32" installname="usrmgr.cpl" unicode="yes"> - <importlibrary definition="usrmgr.def" /> - <include base="usrmgr">.</include> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x609</define> - <library>kernel32</library> - <library>user32</library> - <library>gdi32</library> - <library>comctl32</library> - <library>ntdll</library> - <library>netapi32</library> - <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> -</module> +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="usrmgr" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_USRMGR}" installbase="system32" installname="usrmgr.cpl" unicode="yes"> + <importlibrary definition="usrmgr.def" /> + <include base="usrmgr">.</include> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x609</define> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>comctl32</library> + <library>ntdll</library> + <library>netapi32</library> + <library>msvcrt</library> + <file>extra.c</file> + <file>groups.c</file> + <file>misc.c</file> + <file>userprops.c</file> + <file>users.c</file> + <file>usrmgr.c</file> + <file>usrmgr.rc</file> +</module> Propchange: trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gbrunmar] 33695: Reinstated DIALOG_get_info() based of Wine's implementation, but with some modifications. This makes us pass the last 6 failed dialog wine tests.
by gbrunmar＠svn.reactos.org 25 May '08

25 May '08

Author: gbrunmar Date: Sun May 25 06:12:42 2008 New Revision: 33695 URL: http://svn.reactos.org/svn/reactos?rev=33695&view=rev Log: Reinstated DIALOG_get_info() based of Wine's implementation, but with some modifications. This makes us pass the last 6 failed dialog wine tests. 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 25 06:12:42 2008 @@ -42,7 +42,7 @@ #define DF_OWNERENABLED 0x0002 #define CW_USEDEFAULT16 ((short)0x8000) #define DWLP_ROS_DIALOGINFO (DWLP_USER+sizeof(ULONG_PTR)) -#define GETDLGINFO(hwnd) (DIALOGINFO*)GetWindowLongPtrW((hwnd),DWLP_ROS_DIALOGINFO) +#define GETDLGINFO(hwnd) DIALOG_get_info(hwnd, FALSE) #define SETDLGINFO(hwnd, info) SetWindowLongPtrW((hwnd), DWLP_ROS_DIALOGINFO, (LONG_PTR)(info)) #define GET_WORD(ptr) (*(WORD *)(ptr)) #define GET_DWORD(ptr) (*(DWORD *)(ptr)) @@ -138,7 +138,38 @@ /* INTERNAL FUNCTIONS ********************************************************/ - /*********************************************************************** +/*********************************************************************** +* DIALOG_get_info +* +* Get the DIALOGINFO structure of a window, allocating it if needed +* and 'create' is TRUE. +*/ +DIALOGINFO * DIALOG_get_info( HWND hWnd, BOOL create ) +{ + PWINDOW pWindow; + DIALOGINFO* dlgInfo = (DIALOGINFO *)GetWindowLongPtrW( hWnd, DWLP_ROS_DIALOGINFO ); + + if(!dlgInfo && create) + { + pWindow = ValidateHwnd( hWnd ); + + if (pWindow && pWindow->ExtraDataSize >= DLGWINDOWEXTRA && hWnd != GetDesktopWindow()) + { + if (!(dlgInfo = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*dlgInfo) ))) + return NULL; + + SETDLGINFO( hWnd, dlgInfo ); + } + else + { + HeapFree( GetProcessHeap(), 0, dlgInfo ); + return NULL; + } + } + return dlgInfo; +} + +/*********************************************************************** * DIALOG_EnableOwner * * Helper function for modal dialogs to enable again the @@ -802,17 +833,21 @@ will be valid only after WM_CREATE message has been handled in DefDlgProc All the members of the structure get filled here using temp variables */ -// dlgInfo = DIALOG_get_info( hwnd, TRUE ); - - if (!(dlgInfo = HeapAlloc( GetProcessHeap(), 0, sizeof(*dlgInfo) ))) return 0; - SETDLGINFO(hwnd, dlgInfo); - - dlgInfo->hwndFocus = 0; + dlgInfo = DIALOG_get_info( hwnd, TRUE ); + if (dlgInfo == NULL) + { + if (hUserFont) DeleteObject( hUserFont ); + if (hMenu) DestroyMenu( hMenu ); + if (modal && (flags & DF_OWNERENABLED)) DIALOG_EnableOwner(owner); + return 0; + } + +// dlgInfo->hwndFocus = 0; dlgInfo->hUserFont = hUserFont; dlgInfo->hMenu = hMenu; dlgInfo->xBaseUnit = xBaseUnit; dlgInfo->yBaseUnit = yBaseUnit; - dlgInfo->idResult = 0; +// dlgInfo->idResult = 0; dlgInfo->flags = flags; // dlgInfo->hDialogHeap = 0; @@ -1500,7 +1535,7 @@ DIALOGINFO * dlgInfo; /* if there's no dialog info property then call default windows proc?? */ - if (!(dlgInfo = GETDLGINFO(hDlg))) + if (!(dlgInfo = DIALOG_get_info(hDlg, TRUE))) return DefWindowProcA( hDlg, Msg, wParam, lParam ); SetWindowLongPtrW( hDlg, DWLP_MSGRESULT, 0 ); @@ -1561,7 +1596,7 @@ DIALOGINFO * dlgInfo; /* if there's no dialog info property then call default windows proc?? */ - if (!(dlgInfo = GETDLGINFO(hDlg))) + if (!(dlgInfo = DIALOG_get_info(hDlg, TRUE))) return DefWindowProcW( hDlg, Msg, wParam, lParam ); SetWindowLongPtrW( hDlg, DWLP_MSGRESULT, 0 );

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