Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 58747: [MSV1_0] Retrieve all information about the user.
by ekohl＠svn.reactos.org 13 Apr '13

13 Apr '13

Author: ekohl Date: Sat Apr 13 21:50:54 2013 New Revision: 58747 URL: http://svn.reactos.org/svn/reactos?rev=58747&view=rev Log: [MSV1_0] Retrieve all information about the user. Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c trunk/reactos/dll/win32/msv1_0/msv1_0.h Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.c?… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] Sat Apr 13 21:50:54 2013 @@ -206,10 +206,12 @@ SAMPR_HANDLE ServerHandle = NULL; SAMPR_HANDLE DomainHandle = NULL; + SAMPR_HANDLE UserHandle = NULL; PRPC_SID AccountDomainSid = NULL; RPC_UNICODE_STRING Names[1]; SAMPR_ULONG_ARRAY RelativeIds = {0, NULL}; SAMPR_ULONG_ARRAY Use = {0, NULL}; + PSAMPR_USER_INFO_BUFFER UserInfo = NULL; NTSTATUS Status; TRACE("()\n"); @@ -302,9 +304,38 @@ goto done; } + /* Open the user object */ + Status = SamrOpenUser(DomainHandle, + USER_READ_GENERAL | USER_READ_LOGON | + USER_READ_ACCOUNT | USER_READ_PREFERENCES, /* FIXME */ + RelativeIds.Element[0], + &UserHandle); + if (!NT_SUCCESS(Status)) + { + TRACE("SamrOpenUser failed (Status %08lx)\n", Status); + goto done; + } + + Status = SamrQueryInformationUser(UserHandle, + UserAllInformation, + &UserInfo); + if (!NT_SUCCESS(Status)) + { + TRACE("SamrQueryInformationUser failed (Status %08lx)\n", Status); + goto done; + } + + + TRACE("UserName: %S\n", UserInfo->All.UserName.Buffer); + done: + if (UserHandle != NULL) + SamrCloseHandle(&UserHandle); + + SamIFree_SAMPR_USER_INFO_BUFFER(UserInfo, + UserAllInformation); SamIFree_SAMPR_ULONG_ARRAY(&RelativeIds); SamIFree_SAMPR_ULONG_ARRAY(&Use); Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.h?… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.h [iso-8859-1] Sat Apr 13 21:50:54 2013 @@ -53,11 +53,111 @@ typedef wchar_t *PSAMPR_SERVER_NAME; typedef void *SAMPR_HANDLE; +typedef struct _OLD_LARGE_INTEGER +{ + unsigned long LowPart; + long HighPart; +} OLD_LARGE_INTEGER, *POLD_LARGE_INTEGER; + +typedef struct RPC_SHORT_BLOB +{ + unsigned short Length; + unsigned short MaximumLength; + unsigned short *Buffer; +} RPC_SHORT_BLOB, *PRPC_SHORT_BLOB; + +typedef struct _SAMPR_SR_SECURITY_DESCRIPTOR +{ + unsigned long Length; + unsigned char *SecurityDescriptor; +} SAMPR_SR_SECURITY_DESCRIPTOR, *PSAMPR_SR_SECURITY_DESCRIPTOR; + +typedef struct _ENCRYPTED_LM_OWF_PASSWORD +{ + char data[16]; +} ENCRYPTED_LM_OWF_PASSWORD, *PENCRYPTED_LM_OWF_PASSWORD, ENCRYPTED_NT_OWF_PASSWORD, *PENCRYPTED_NT_OWF_PASSWORD; + typedef struct _SAMPR_ULONG_ARRAY { ULONG Count; PULONG Element; } SAMPR_ULONG_ARRAY, *PSAMPR_ULONG_ARRAY; + +typedef struct _SAMPR_LOGON_HOURS +{ + unsigned short UnitsPerWeek; + unsigned char *LogonHours; +} SAMPR_LOGON_HOURS, *PSAMPR_LOGON_HOURS; + +typedef struct _SAMPR_USER_ALL_INFORMATION +{ + OLD_LARGE_INTEGER LastLogon; + OLD_LARGE_INTEGER LastLogoff; + OLD_LARGE_INTEGER PasswordLastSet; + OLD_LARGE_INTEGER AccountExpires; + OLD_LARGE_INTEGER PasswordCanChange; + OLD_LARGE_INTEGER PasswordMustChange; + RPC_UNICODE_STRING UserName; + RPC_UNICODE_STRING FullName; + RPC_UNICODE_STRING HomeDirectory; + RPC_UNICODE_STRING HomeDirectoryDrive; + RPC_UNICODE_STRING ScriptPath; + RPC_UNICODE_STRING ProfilePath; + RPC_UNICODE_STRING AdminComment; + RPC_UNICODE_STRING WorkStations; + RPC_UNICODE_STRING UserComment; + RPC_UNICODE_STRING Parameters; + RPC_SHORT_BLOB LmOwfPassword; + RPC_SHORT_BLOB NtOwfPassword; + RPC_UNICODE_STRING PrivateData; + SAMPR_SR_SECURITY_DESCRIPTOR SecurityDescriptor; + unsigned long UserId; + unsigned long PrimaryGroupId; + unsigned long UserAccountControl; + unsigned long WhichFields; + SAMPR_LOGON_HOURS LogonHours; + unsigned short BadPasswordCount; + unsigned short LogonCount; + unsigned short CountryCode; + unsigned short CodePage; + unsigned char LmPasswordPresent; + unsigned char NtPasswordPresent; + unsigned char PasswordExpired; + unsigned char PrivateDataSensitive; +} SAMPR_USER_ALL_INFORMATION, *PSAMPR_USER_ALL_INFORMATION; + +typedef union _SAMPR_USER_INFO_BUFFER +{ +#if 0 + SAMPR_USER_GENERAL_INFORMATION General; + SAMPR_USER_PREFERENCES_INFORMATION Preferences; + SAMPR_USER_LOGON_INFORMATION Logon; + SAMPR_USER_LOGON_HOURS_INFORMATION LogonHours; + SAMPR_USER_ACCOUNT_INFORMATION Account; + SAMPR_USER_NAME_INFORMATION Name; + SAMPR_USER_A_NAME_INFORMATION AccountName; + SAMPR_USER_F_NAME_INFORMATION FullName; + USER_PRIMARY_GROUP_INFORMATION PrimaryGroup; + SAMPR_USER_HOME_INFORMATION Home; + SAMPR_USER_SCRIPT_INFORMATION Script; + SAMPR_USER_PROFILE_INFORMATION Profile; + SAMPR_USER_ADMIN_COMMENT_INFORMATION AdminComment; + SAMPR_USER_WORKSTATIONS_INFORMATION WorkStations; + SAMPR_USER_SET_PASSWORD_INFORMATION SetPassword; + USER_CONTROL_INFORMATION Control; + USER_EXPIRES_INFORMATION Expires; + SAMPR_USER_INTERNAL1_INFORMATION Internal1; + SAMPR_USER_PARAMETERS_INFORMATION Parameters; +#endif + SAMPR_USER_ALL_INFORMATION All; +#if 0 + SAMPR_USER_INTERNAL4_INFORMATION Internal4; + SAMPR_USER_INTERNAL5_INFORMATION Internal5; + SAMPR_USER_INTERNAL4_INFORMATION_NEW Internal4New; + SAMPR_USER_INTERNAL5_INFORMATION_NEW Internal5New; +#endif +} SAMPR_USER_INFO_BUFFER, *PSAMPR_USER_INFO_BUFFER; + NTSTATUS NTAPI @@ -70,16 +170,14 @@ NTAPI SamIFree_SAMPR_ULONG_ARRAY(PSAMPR_ULONG_ARRAY Ptr); +VOID +NTAPI +SamIFree_SAMPR_USER_INFO_BUFFER(PSAMPR_USER_INFO_BUFFER Ptr, + USER_INFORMATION_CLASS InformationClass); + NTSTATUS NTAPI SamrCloseHandle(IN OUT SAMPR_HANDLE *SamHandle); - -NTSTATUS -NTAPI -SamrOpenDomain(IN SAMPR_HANDLE ServerHandle, - IN ACCESS_MASK DesiredAccess, - IN PRPC_SID DomainId, - OUT SAMPR_HANDLE *DomainHandle); NTSTATUS NTAPI @@ -88,6 +186,27 @@ IN RPC_UNICODE_STRING Names[], OUT PSAMPR_ULONG_ARRAY RelativeIds, OUT PSAMPR_ULONG_ARRAY Use); + +NTSTATUS +NTAPI +SamrOpenDomain(IN SAMPR_HANDLE ServerHandle, + IN ACCESS_MASK DesiredAccess, + IN PRPC_SID DomainId, + OUT SAMPR_HANDLE *DomainHandle); + +NTSTATUS +NTAPI +SamrOpenUser(IN SAMPR_HANDLE DomainHandle, + IN ACCESS_MASK DesiredAccess, + IN ULONG UserId, + OUT SAMPR_HANDLE *UserHandle); + +NTSTATUS +NTAPI +SamrQueryInformationUser(IN SAMPR_HANDLE UserHandle, + IN USER_INFORMATION_CLASS UserInformationClass, + OUT PSAMPR_USER_INFO_BUFFER *Buffer); + typedef PVOID LSAPR_HANDLE;

1 0

[hbelusca] 58746: [ROSAPPS] Correct spelling of "receive" throughout the codebase. Patch by andygui. CORE-7062 #resolve #comment Part for RosApps fixed in revision r58746.
by hbelusca＠svn.reactos.org 13 Apr '13

13 Apr '13

Author: hbelusca Date: Sat Apr 13 21:33:53 2013 New Revision: 58746 URL: http://svn.reactos.org/svn/reactos?rev=58746&view=rev Log: [ROSAPPS] Correct spelling of "receive" throughout the codebase. Patch by andygui. CORE-7062 #resolve #comment Part for RosApps fixed in revision r58746. Modified: trunk/rosapps/applications/net/tsclient/rdesktop/doc/seamlessrdp-channel.txt Modified: trunk/rosapps/applications/net/tsclient/rdesktop/doc/seamlessrdp-channel.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/tsclient/… ============================================================================== --- trunk/rosapps/applications/net/tsclient/rdesktop/doc/seamlessrdp-channel.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/net/tsclient/rdesktop/doc/seamlessrdp-channel.txt [iso-8859-1] Sat Apr 13 21:33:53 2013 @@ -280,5 +280,5 @@ Syntax: FOCUS,<SERIAL>,<ID>,<FLAGS> -Changes which window that will recieve the keyboard events. Note that this +Changes which window that will receive the keyboard events. Note that this might cause the window to change z order.

1 0

[hbelusca] 58745: [ROSTESTS] Correct spelling of "receive" throughout the codebase. Patch by andygui. CORE-7062 #resolve #comment Part for RosTests fixed in revision r58745.
by hbelusca＠svn.reactos.org 13 Apr '13

13 Apr '13

Author: hbelusca Date: Sat Apr 13 21:33:03 2013 New Revision: 58745 URL: http://svn.reactos.org/svn/reactos?rev=58745&view=rev Log: [ROSTESTS] Correct spelling of "receive" throughout the codebase. Patch by andygui. CORE-7062 #resolve #comment Part for RosTests fixed in revision r58745. Modified: trunk/rostests/tests/readconsole/main.c trunk/rostests/winetests/GUI/mainwnd.c Modified: trunk/rostests/tests/readconsole/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/readconsole/main.c?… ============================================================================== --- trunk/rostests/tests/readconsole/main.c [iso-8859-1] (original) +++ trunk/rostests/tests/readconsole/main.c [iso-8859-1] Sat Apr 13 21:33:03 2013 @@ -23,7 +23,7 @@ // _tprintf(TEXT("You printed %c :: "), Buffer); _tprintf(TEXT("With a value %d :: "), Buffer); - _tprintf(TEXT("Number of chars recieved %lu :: "), Count); + _tprintf(TEXT("Number of chars received %lu :: "), Count); _tprintf(TEXT("Char equal to backspace %d \n"), (Buffer == TEXT('\b'))); // Modified: trunk/rostests/winetests/GUI/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/mainwnd.c?r… ============================================================================== --- trunk/rostests/winetests/GUI/mainwnd.c [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/mainwnd.c [iso-8859-1] Sat Apr 13 21:33:03 2013 @@ -214,7 +214,7 @@ { // // Create a new thread to create the client process - // and recieve any ouput via stdout + // and receive any ouput via stdout // CreateThread(NULL, 0,

1 0

[hbelusca] 58744: [REACTOS] Correct spelling of "receive" throughout the codebase. Patch by andygui. CORE-7062 #resolve #comment Fixed in revision r58744. Thanks :)
by hbelusca＠svn.reactos.org 13 Apr '13

13 Apr '13

Author: hbelusca Date: Sat Apr 13 21:28:10 2013 New Revision: 58744 URL: http://svn.reactos.org/svn/reactos?rev=58744&view=rev Log: [REACTOS] Correct spelling of "receive" throughout the codebase. Patch by andygui. CORE-7062 #resolve #comment Fixed in revision r58744. Thanks :) Modified: trunk/reactos/base/applications/network/netstat/netstat.c trunk/reactos/base/applications/network/tracert/tracert.c trunk/reactos/base/applications/screensavers/3dtext/3dtext.c trunk/reactos/base/services/tcpsvcs/discard.c trunk/reactos/boot/freeldr/freeldr/include/comm.h trunk/reactos/dll/cpl/intl/date.c trunk/reactos/dll/cpl/intl/misc.c trunk/reactos/dll/cpl/intl/setupreg.c trunk/reactos/dll/cpl/timedate/ntpclient.c trunk/reactos/dll/win32/advapi32/service/sctrl.c trunk/reactos/drivers/base/kddll/kdserial.c trunk/reactos/drivers/bus/acpi/cmbatt/cmbpnp.c trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c trunk/reactos/include/ddk/ndiswan.h trunk/reactos/lib/sdk/crt/time/ftime.c trunk/reactos/lib/sdk/crt/time/futime.c trunk/reactos/media/doc/winsta and desktops.txt trunk/reactos/ntoskrnl/include/internal/kd.h trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/hotkey.c trunk/reactos/win32ss/user/ntuser/monitor.c Modified: trunk/reactos/base/applications/network/netstat/netstat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/netstat/netstat.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/netstat/netstat.c [iso-8859-1] Sat Apr 13 21:28:10 2013 @@ -259,13 +259,13 @@ if ((dwRetVal = GetIpStatistics(pIpStats)) == NO_ERROR) { _tprintf(_T("\nIPv4 Statistics\n\n")); - _tprintf(_T(" %-34s = %lu\n"), _T("Packets Recieved"), pIpStats->dwInReceives); + _tprintf(_T(" %-34s = %lu\n"), _T("Packets Received"), pIpStats->dwInReceives); _tprintf(_T(" %-34s = %lu\n"), _T("Received Header Errors"), pIpStats->dwInHdrErrors); _tprintf(_T(" %-34s = %lu\n"), _T("Received Address Errors"), pIpStats->dwInAddrErrors); _tprintf(_T(" %-34s = %lu\n"), _T("Datagrams Forwarded"), pIpStats->dwForwDatagrams); - _tprintf(_T(" %-34s = %lu\n"), _T("Unknown Protocols Recieved"), pIpStats->dwInUnknownProtos); + _tprintf(_T(" %-34s = %lu\n"), _T("Unknown Protocols Received"), pIpStats->dwInUnknownProtos); _tprintf(_T(" %-34s = %lu\n"), _T("Received Packets Discarded"), pIpStats->dwInDiscards); - _tprintf(_T(" %-34s = %lu\n"), _T("Recieved Packets Delivered"), pIpStats->dwInDelivers); + _tprintf(_T(" %-34s = %lu\n"), _T("Received Packets Delivered"), pIpStats->dwInDelivers); _tprintf(_T(" %-34s = %lu\n"), _T("Output Requests"), pIpStats->dwOutRequests); _tprintf(_T(" %-34s = %lu\n"), _T("Routing Discards"), pIpStats->dwRoutingDiscards); _tprintf(_T(" %-34s = %lu\n"), _T("Discarded Output Packets"), pIpStats->dwOutDiscards); @@ -343,7 +343,7 @@ _tprintf(_T(" %-35s = %lu\n"), _T("Failed Connection Attempts"), pTcpStats->dwAttemptFails); _tprintf(_T(" %-35s = %lu\n"), _T("Reset Connections"), pTcpStats->dwEstabResets); _tprintf(_T(" %-35s = %lu\n"), _T("Current Connections"), pTcpStats->dwCurrEstab); - _tprintf(_T(" %-35s = %lu\n"), _T("Segments Recieved"), pTcpStats->dwInSegs); + _tprintf(_T(" %-35s = %lu\n"), _T("Segments Received"), pTcpStats->dwInSegs); _tprintf(_T(" %-35s = %lu\n"), _T("Segments Sent"), pTcpStats->dwOutSegs); _tprintf(_T(" %-35s = %lu\n"), _T("Segments Retransmitted"), pTcpStats->dwRetransSegs); } @@ -363,9 +363,9 @@ if ((dwRetVal = GetUdpStatistics(pUdpStats)) == NO_ERROR) { _tprintf(_T("\nUDP Statistics for IPv4\n\n")); - _tprintf(_T(" %-21s = %lu\n"), _T("Datagrams Recieved"), pUdpStats->dwInDatagrams); + _tprintf(_T(" %-21s = %lu\n"), _T("Datagrams Received"), pUdpStats->dwInDatagrams); _tprintf(_T(" %-21s = %lu\n"), _T("No Ports"), pUdpStats->dwNoPorts); - _tprintf(_T(" %-21s = %lu\n"), _T("Recieve Errors"), pUdpStats->dwInErrors); + _tprintf(_T(" %-21s = %lu\n"), _T("Receive Errors"), pUdpStats->dwInErrors); _tprintf(_T(" %-21s = %lu\n"), _T("Datagrams Sent"), pUdpStats->dwOutDatagrams); } else Modified: trunk/reactos/base/applications/network/tracert/tracert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/tracert/tracert.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/tracert/tracert.c [iso-8859-1] Sat Apr 13 21:28:10 2013 @@ -343,7 +343,7 @@ if (iSockRet != SOCKET_ERROR) { - /* get time packet was recieved */ + /* get time packet was received */ pInfo->lTimeEnd = GetTime(pInfo); DebugPrint(_T("reveived %d bytes\n"), iSockRet); bRet = TRUE; @@ -362,7 +362,7 @@ { unsigned short header_len = pInfo->RecvPacket->h_len * 4; - /* cast the recieved packet into an ECHO reply and a TTL Exceed and check the ID*/ + /* cast the received packet into an ECHO reply and a TTL Exceed and check the ID*/ ECHO_REPLY_HEADER *IcmpHdr = (ECHO_REPLY_HEADER *)((char*)pInfo->RecvPacket + header_len); /* Make sure the reply is ok */ @@ -426,7 +426,7 @@ { INT iHopCount = 1; // hop counter. default max is 30 BOOL bFoundTarget = FALSE; // Have we reached our destination yet - INT iRecieveReturn; // RecieveReturn return value + INT iReceiveReturn; // ReceiveReturn return value PECHO_REPLY_HEADER icmphdr; INT iTTL = 1; @@ -470,14 +470,14 @@ if (SendPacket(pInfo) != SOCKET_ERROR) { - BOOL bAwaitPacket = FALSE; // indicates whether we have recieved a good packet + BOOL bAwaitPacket = FALSE; // indicates whether we have received a good packet do { /* Receive replies until we get a successful read, or a fatal error */ - if ((iRecieveReturn = ReceivePacket(pInfo)) < 0) + if ((iReceiveReturn = ReceivePacket(pInfo)) < 0) { - /* FIXME: consider moving this into RecievePacket */ + /* FIXME: consider moving this into ReceivePacket */ /* check the seq num in the packet, if it's bad wait for another */ WORD hdrLen = pInfo->RecvPacket->h_len * 4; icmphdr = (ECHO_REPLY_HEADER *)((char*)&pInfo->RecvPacket + hdrLen); @@ -488,7 +488,7 @@ } } - if (iRecieveReturn) + if (iReceiveReturn) { if (DecodeResponse(pInfo) < 0) bAwaitPacket = TRUE; Modified: trunk/reactos/base/applications/screensavers/3dtext/3dtext.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/3dtext.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/3dtext/3dtext.c [iso-8859-1] Sat Apr 13 21:28:10 2013 @@ -75,7 +75,7 @@ 0.0f, // Deviation From The True Outlines 0.2f, // Font Thickness In The Z Direction WGL_FONT_POLYGONS, // Use Polygons, Not Lines - gmf); // Address Of Buffer To Recieve Data + gmf); // Address Of Buffer To Receive Data // Calculate the string extent for (i = 0; i < _tcslen(m_Text); i++) Modified: trunk/reactos/base/services/tcpsvcs/discard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/disc… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/discard.c [iso-8859-1] (original) +++ trunk/reactos/base/services/tcpsvcs/discard.c [iso-8859-1] Sat Apr 13 21:28:10 2013 @@ -2,7 +2,7 @@ * PROJECT: ReactOS simple TCP/IP services * LICENSE: GPL - See COPYING in the top level directory * FILE: /base/services/tcpsvcs/discard.c - * PURPOSE: Recieves input from a client and discards it + * PURPOSE: Receives input from a client and discards it * COPYRIGHT: Copyright 2005 - 2008 Ged Murphy <gedmurphy(a)reactos.org> * */ @@ -12,7 +12,7 @@ #define BUFSIZE 1024 static BOOL -RecieveIncomingPackets(SOCKET sock) +ReceiveIncomingPackets(SOCKET sock) { CHAR readBuffer[BUFSIZE]; INT readBytes; @@ -46,9 +46,9 @@ DWORD retVal = 0; SOCKET sock = (SOCKET)sock_; - if (!RecieveIncomingPackets(sock)) + if (!ReceiveIncomingPackets(sock)) { - LogEvent(L"Discard: RecieveIncomingPackets failed", 0, 0, LOG_FILE); + LogEvent(L"Discard: ReceiveIncomingPackets failed", 0, 0, LOG_FILE); retVal = 1; } Modified: trunk/reactos/boot/freeldr/freeldr/include/comm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/comm.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/comm.h [iso-8859-1] Sat Apr 13 21:28:10 2013 @@ -22,7 +22,7 @@ #pragma once BOOLEAN Rs232PortInitialize(ULONG ComPort, ULONG BaudRate); -BOOLEAN Rs232PortGetByte(PUCHAR ByteRecieved); -// BOOLEAN Rs232PortPollByte(PUCHAR ByteRecieved); +BOOLEAN Rs232PortGetByte(PUCHAR ByteReceived); +// BOOLEAN Rs232PortPollByte(PUCHAR ByteReceived); VOID Rs232PortPutByte(UCHAR ByteToSend); BOOLEAN Rs232PortInUse(PUCHAR Base); Modified: trunk/reactos/dll/cpl/intl/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/date.c?rev=58… ============================================================================== --- trunk/reactos/dll/cpl/intl/date.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/date.c [iso-8859-1] Sat Apr 13 21:28:10 2013 @@ -79,7 +79,7 @@ return pszFoundSep; } -/* Replace given template in source string with string to replace and return recieved string */ +/* Replace given template in source string with string to replace and return received string */ /* Setted up short date separator to registry */ Modified: trunk/reactos/dll/cpl/intl/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/misc.c?rev=58… ============================================================================== --- trunk/reactos/dll/cpl/intl/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/misc.c [iso-8859-1] Sat Apr 13 21:28:10 2013 @@ -111,7 +111,7 @@ return pszDestStr; } -/* Replace given template in source string with string to replace and return recieved string */ +/* Replace given template in source string with string to replace and return received string */ LPTSTR ReplaceSubStr(LPCTSTR szSourceStr, LPCTSTR szStrToReplace, Modified: trunk/reactos/dll/cpl/intl/setupreg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/setupreg.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/setupreg.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/setupreg.c [iso-8859-1] Sat Apr 13 21:28:10 2013 @@ -125,7 +125,7 @@ return pszDestStr; } -/* Replace given template in source string with string to replace and return recieved string */ +/* Replace given template in source string with string to replace and return received string */ TCHAR* ReplaceSubStr(const TCHAR *szSourceStr, const TCHAR *szStrToReplace, Modified: trunk/reactos/dll/cpl/timedate/ntpclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/ntpclient… ============================================================================== --- trunk/reactos/dll/cpl/timedate/ntpclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/timedate/ntpclient.c [iso-8859-1] Sat Apr 13 21:28:10 2013 @@ -99,7 +99,7 @@ static ULONG -RecieveData(PINFO pInfo) +ReceiveData(PINFO pInfo) { TIMEVAL timeVal; FD_SET readFDS; @@ -164,7 +164,7 @@ { if (SendData(pInfo)) { - ulTime = RecieveData(pInfo); + ulTime = ReceiveData(pInfo); } } Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Sat Apr 13 21:28:10 2013 @@ -548,14 +548,14 @@ { case SERVICE_CONTROL_START_SHARE: case SERVICE_CONTROL_START_OWN: - TRACE("Start command - recieved SERVICE_CONTROL_START\n"); + TRACE("Start command - received SERVICE_CONTROL_START\n"); dwError = ScStartService(lpService, ControlPacket); if (dwError == ERROR_SUCCESS) dwRunningServices++; break; case SERVICE_CONTROL_STOP: - TRACE("Stop command - recieved SERVICE_CONTROL_STOP\n"); + TRACE("Stop command - received SERVICE_CONTROL_STOP\n"); dwError = ScControlService(lpService, ControlPacket); if (dwError == ERROR_SUCCESS) dwRunningServices--; Modified: trunk/reactos/drivers/base/kddll/kdserial.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/kdseria… ============================================================================== --- trunk/reactos/drivers/base/kddll/kdserial.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kddll/kdserial.c [iso-8859-1] Sat Apr 13 21:28:10 2013 @@ -31,7 +31,7 @@ /****************************************************************************** * \name KdpReceiveBuffer - * \brief Recieves data from the KD port and fills a buffer. + * \brief Receives data from the KD port and fills a buffer. * \param Buffer Pointer to a buffer that receives the data. * \param Size Size of data to receive in bytes. * \return KDP_PACKET_RECEIVED if successful. @@ -64,7 +64,7 @@ /****************************************************************************** * \name KdpReceivePacketLeader - * \brief Recieves a packet leadr from the KD port. + * \brief Receives a packet leadr from the KD port. * \param PacketLeader Pointer to an ULONG that receives the packet leader. * \return KDP_PACKET_RECEIVED if successful. * KDP_PACKET_TIMEOUT if the receive timed out. Modified: trunk/reactos/drivers/bus/acpi/cmbatt/cmbpnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/cmbatt/cm… ============================================================================== --- trunk/reactos/drivers/bus/acpi/cmbatt/cmbpnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/cmbatt/cmbpnp.c [iso-8859-1] Sat Apr 13 21:28:10 2013 @@ -369,7 +369,7 @@ /* Don't do anything, but this is strange since it's already removed */ Status = STATUS_SUCCESS; if (CmBattDebug & 4) - DbgPrint("CmBattPnpDispatch: Recieved two consecutive QUERY_REMOVE requests.\n"); + DbgPrint("CmBattPnpDispatch: Received two consecutive QUERY_REMOVE requests.\n"); } else { Modified: trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c [iso-8859-1] Sat Apr 13 21:28:10 2013 @@ -18,7 +18,7 @@ IN PIRP Irp) { PCOMPBATT_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; - if (CompBattDebug & 1) DbgPrint("CompBatt: PowerDispatch recieved power IRP.\n"); + if (CompBattDebug & 1) DbgPrint("CompBatt: PowerDispatch received power IRP.\n"); /* Start the next IRP */ PoStartNextPowerIrp(Irp); Modified: trunk/reactos/include/ddk/ndiswan.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndiswan.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ndiswan.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ndiswan.h [iso-8859-1] Sat Apr 13 21:28:10 2013 @@ -228,10 +228,10 @@ OUT ULONG BytesReceivedUncompressed; OUT ULONG BytesTransmittedCompressed; OUT ULONG BytesReceivedCompressed; - OUT ULONG TunnelPacketsRecieved; - OUT ULONG TunnelRecievePacketsPending; + OUT ULONG TunnelPacketsReceived; + OUT ULONG TunnelReceivePacketsPending; OUT ULONG TunnelPacketsIndicatedUp; - OUT ULONG TunnelRecievePacketsRejected; + OUT ULONG TunnelReceivePacketsRejected; OUT ULONG TunnelPacketsSent; OUT ULONG TunnelPacketsSentComplete; OUT ULONG TunnelTransmitPacketsPending; @@ -317,10 +317,10 @@ OUT ULONG BytesReceivedUncompressed; OUT ULONG BytesTransmittedCompressed; OUT ULONG BytesReceivedCompressed; - OUT ULONG TunnelPacketsRecieved; - OUT ULONG TunnelRecievePacketsPending; + OUT ULONG TunnelPacketsReceived; + OUT ULONG TunnelReceivePacketsPending; OUT ULONG TunnelPacketsIndicatedUp; - OUT ULONG TunnelRecievePacketsRejected; + OUT ULONG TunnelReceivePacketsRejected; OUT ULONG TunnelPacketsSent; OUT ULONG TunnelPacketsSentComplete; OUT ULONG TunnelTransmitPacketsPending; Modified: trunk/reactos/lib/sdk/crt/time/ftime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/ftime.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/time/ftime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time/ftime.c [iso-8859-1] Sat Apr 13 21:28:10 2013 @@ -13,7 +13,7 @@ * \name _ftime_s * \brief Get the current time. * \param [out] ptimeb Pointer to a structure of type struct _timeb that - * recieves the current time. + * receives the current time. * \sa http://msdn.microsoft.com/en-us/library/95e68951.aspx */ errno_t @@ -45,7 +45,7 @@ * \name _ftime * \brief Get the current time. * \param [out] ptimeb Pointer to a structure of type struct _timeb that - * recieves the current time. + * receives the current time. * \note This function is for compatability and simply calls the secure * version _ftime_s(). * \sa http://msdn.microsoft.com/en-us/library/z54t9z5f.aspx Modified: trunk/reactos/lib/sdk/crt/time/futime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/futime.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/time/futime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time/futime.c [iso-8859-1] Sat Apr 13 21:28:10 2013 @@ -46,7 +46,7 @@ * \name _futime * \brief Set a file's modification time. * \param [out] ptimeb Pointer to a structure of type struct _timeb that - * recieves the current time. + * receives the current time. * \sa http://msdn.microsoft.com/en-us/library/95e68951.aspx */ int Modified: trunk/reactos/media/doc/winsta and desktops.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/winsta%20and%20d… ============================================================================== --- trunk/reactos/media/doc/winsta and desktops.txt [iso-8859-1] (original) +++ trunk/reactos/media/doc/winsta and desktops.txt [iso-8859-1] Sat Apr 13 21:28:10 2013 @@ -32,7 +32,7 @@ -The one-and-only interactive WinSta. -No other winsta can be visible/active. --Only WinSta0 can recieve input. +-Only WinSta0 can receive input. -All other WinSta's are invisible/non-interactive WinStas. What good is a invisible WinSta? Its used for running services in thus services cant Modified: trunk/reactos/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/kd.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/kd.h [iso-8859-1] Sat Apr 13 21:28:10 2013 @@ -42,13 +42,13 @@ BOOLEAN NTAPI KdPortGetByte( - PUCHAR ByteRecieved); + PUCHAR ByteReceived); BOOLEAN NTAPI KdPortGetByteEx( PKD_PORT_INFORMATION PortInformation, - PUCHAR ByteRecieved); + PUCHAR ByteReceived); VOID NTAPI Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Sat Apr 13 21:28:10 2013 @@ -514,8 +514,8 @@ #define WNDS_HASPALETTE 0x00200000 #define WNDS_PAINTNOTPROCESSED 0x00400000 #define WNDS_SYNCPAINTPENDING 0x00800000 -#define WNDS_RECIEVEDQUERYSUSPENDMSG 0x01000000 -#define WNDS_RECIEVEDSUSPENDMSG 0x02000000 +#define WNDS_RECEIVEDQUERYSUSPENDMSG 0x01000000 +#define WNDS_RECEIVEDSUSPENDMSG 0x02000000 #define WNDS_TOGGLETOPMOST 0x04000000 #define WNDS_REDRAWIFHUNG 0x08000000 #define WNDS_REDRAWFRAMEIFHUNG 0x10000000 Modified: trunk/reactos/win32ss/user/ntuser/hotkey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hotkey… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hotkey.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hotkey.c [iso-8859-1] Sat Apr 13 21:28:10 2013 @@ -8,8 +8,8 @@ /* * FIXME: Hotkey notifications are triggered by keyboard input (physical or programatically) - * and since only desktops on WinSta0 can recieve input in seems very wrong to allow - * windows/threads on destops not belonging to WinSta0 to set hotkeys (recieve notifications). + * and since only desktops on WinSta0 can receive input in seems very wrong to allow + * windows/threads on destops not belonging to WinSta0 to set hotkeys (receive notifications). * -- Gunnar */ Modified: trunk/reactos/win32ss/user/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/monito… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/monitor.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/monitor.c [iso-8859-1] Sat Apr 13 21:28:10 2013 @@ -673,7 +673,7 @@ * from MONITORINFO will be filled. * * pDevice - * Pointer to a UNICODE_STRING which will recieve the device's name. The + * Pointer to a UNICODE_STRING which will receive the device's name. The * length should be CCHDEVICENAME * Can be NULL *

1 0

[hbelusca] 58743: [CONSRV] Fix the TUI window procedure. [SAMSRV] Add Eric's revision r58742 in the meantime.
by hbelusca＠svn.reactos.org 13 Apr '13

13 Apr '13

Author: hbelusca Date: Sat Apr 13 21:09:49 2013 New Revision: 58743 URL: http://svn.reactos.org/svn/reactos?rev=58743&view=rev Log: [CONSRV] Fix the TUI window procedure. [SAMSRV] Add Eric's revision r58742 in the meantime. Modified: branches/ros-csrss/ (props changed) branches/ros-csrss/dll/win32/samsrv/samsrv.c branches/ros-csrss/dll/win32/samsrv/samsrv.spec branches/ros-csrss/win32ss/user/consrv/frontends/tui/tuiterm.c Propchange: branches/ros-csrss/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Apr 13 21:09:49 2013 @@ -13,4 +13,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:57561-58740 +/trunk/reactos:57561-58742 Modified: branches/ros-csrss/dll/win32/samsrv/samsrv.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samsrv/sams… ============================================================================== --- branches/ros-csrss/dll/win32/samsrv/samsrv.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/samsrv/samsrv.c [iso-8859-1] Sat Apr 13 21:09:49 2013 @@ -131,7 +131,7 @@ { if (Ptr != NULL) { - if (Ptr->Sids !=0) + if (Ptr->Sids != NULL) { MIDL_user_free(Ptr->Sids); } @@ -176,7 +176,222 @@ Ptr->Count = 0; } } - +} + + +VOID +NTAPI +SamIFree_SAMPR_USER_INFO_BUFFER(PSAMPR_USER_INFO_BUFFER Ptr, + USER_INFORMATION_CLASS InformationClass) +{ + if (Ptr == NULL) + return; + + switch (InformationClass) + { + case UserGeneralInformation: + if (Ptr->General.UserName.Buffer != NULL) + MIDL_user_free(Ptr->General.UserName.Buffer); + + if (Ptr->General.FullName.Buffer != NULL) + MIDL_user_free(Ptr->General.FullName.Buffer); + + if (Ptr->General.AdminComment.Buffer != NULL) + MIDL_user_free(Ptr->General.AdminComment.Buffer); + + if (Ptr->General.UserComment.Buffer != NULL) + MIDL_user_free(Ptr->General.UserComment.Buffer); + break; + + case UserPreferencesInformation: + if (Ptr->Preferences.UserComment.Buffer != NULL) + MIDL_user_free(Ptr->Preferences.UserComment.Buffer); + + if (Ptr->Preferences.Reserved1.Buffer != NULL) + MIDL_user_free(Ptr->Preferences.Reserved1.Buffer); + break; + + case UserLogonInformation: + if (Ptr->Logon.UserName.Buffer != NULL) + MIDL_user_free(Ptr->Logon.UserName.Buffer); + + if (Ptr->Logon.FullName.Buffer != NULL) + MIDL_user_free(Ptr->Logon.FullName.Buffer); + + if (Ptr->Logon.HomeDirectory.Buffer != NULL) + MIDL_user_free(Ptr->Logon.HomeDirectory.Buffer); + + if (Ptr->Logon.HomeDirectoryDrive.Buffer != NULL) + MIDL_user_free(Ptr->Logon.HomeDirectoryDrive.Buffer); + + if (Ptr->Logon.ScriptPath.Buffer != NULL) + MIDL_user_free(Ptr->Logon.ScriptPath.Buffer); + + if (Ptr->Logon.ProfilePath.Buffer != NULL) + MIDL_user_free(Ptr->Logon.ProfilePath.Buffer); + + if (Ptr->Logon.WorkStations.Buffer != NULL) + MIDL_user_free(Ptr->Logon.WorkStations.Buffer); + + if (Ptr->Logon.LogonHours.LogonHours != NULL) + MIDL_user_free(Ptr->Logon.LogonHours.LogonHours); + break; + + case UserLogonHoursInformation: + if (Ptr->LogonHours.LogonHours.LogonHours != NULL) + MIDL_user_free(Ptr->LogonHours.LogonHours.LogonHours); + break; + + case UserAccountInformation: + if (Ptr->Account.UserName.Buffer != NULL) + MIDL_user_free(Ptr->Account.UserName.Buffer); + + if (Ptr->Account.FullName.Buffer != NULL) + MIDL_user_free(Ptr->Account.FullName.Buffer); + + if (Ptr->Account.HomeDirectory.Buffer != NULL) + MIDL_user_free(Ptr->Account.HomeDirectory.Buffer); + + if (Ptr->Account.HomeDirectoryDrive.Buffer != NULL) + MIDL_user_free(Ptr->Account.HomeDirectoryDrive.Buffer); + + if (Ptr->Account.ScriptPath.Buffer != NULL) + MIDL_user_free(Ptr->Account.ScriptPath.Buffer); + + if (Ptr->Account.ProfilePath.Buffer != NULL) + MIDL_user_free(Ptr->Account.ProfilePath.Buffer); + + if (Ptr->Account.AdminComment.Buffer != NULL) + MIDL_user_free(Ptr->Account.AdminComment.Buffer); + + if (Ptr->Account.WorkStations.Buffer != NULL) + MIDL_user_free(Ptr->Account.WorkStations.Buffer); + + if (Ptr->Account.LogonHours.LogonHours != NULL) + MIDL_user_free(Ptr->Account.LogonHours.LogonHours); + break; + + case UserNameInformation: + if (Ptr->Name.UserName.Buffer != NULL) + MIDL_user_free(Ptr->Name.UserName.Buffer); + + if (Ptr->Name.FullName.Buffer != NULL) + MIDL_user_free(Ptr->Name.FullName.Buffer); + break; + + case UserAccountNameInformation: + if (Ptr->AccountName.UserName.Buffer != NULL) + MIDL_user_free(Ptr->AccountName.UserName.Buffer); + break; + + case UserFullNameInformation: + if (Ptr->FullName.FullName.Buffer != NULL) + MIDL_user_free(Ptr->FullName.FullName.Buffer); + break; + + case UserPrimaryGroupInformation: + break; + + case UserHomeInformation: + if (Ptr->Home.HomeDirectory.Buffer != NULL) + MIDL_user_free(Ptr->Home.HomeDirectory.Buffer); + + if (Ptr->Home.HomeDirectoryDrive.Buffer != NULL) + MIDL_user_free(Ptr->Home.HomeDirectoryDrive.Buffer); + break; + + case UserScriptInformation: + if (Ptr->Script.ScriptPath.Buffer != NULL) + MIDL_user_free(Ptr->Script.ScriptPath.Buffer); + + case UserProfileInformation: + if (Ptr->Profile.ProfilePath.Buffer != NULL) + MIDL_user_free(Ptr->Profile.ProfilePath.Buffer); + + case UserAdminCommentInformation: + if (Ptr->AdminComment.AdminComment.Buffer != NULL) + MIDL_user_free(Ptr->AdminComment.AdminComment.Buffer); + break; + + case UserWorkStationsInformation: + if (Ptr->WorkStations.WorkStations.Buffer != NULL) + MIDL_user_free(Ptr->WorkStations.WorkStations.Buffer); + break; + + case UserSetPasswordInformation: + ERR("Information class UserSetPasswordInformation cannot be queried!\n"); + break; + + case UserControlInformation: + break; + + case UserExpiresInformation: + break; + + case UserInternal1Information: + break; + + case UserInternal2Information: + break; + + case UserParametersInformation: + if (Ptr->Parameters.Parameters.Buffer != NULL) + MIDL_user_free(Ptr->Parameters.Parameters.Buffer); + break; + + case UserAllInformation: + if (Ptr->All.UserName.Buffer != NULL) + MIDL_user_free(Ptr->All.UserName.Buffer); + + if (Ptr->All.FullName.Buffer != NULL) + MIDL_user_free(Ptr->All.FullName.Buffer); + + if (Ptr->All.HomeDirectory.Buffer != NULL) + MIDL_user_free(Ptr->All.HomeDirectory.Buffer); + + if (Ptr->All.HomeDirectoryDrive.Buffer != NULL) + MIDL_user_free(Ptr->All.HomeDirectoryDrive.Buffer); + + if (Ptr->All.ScriptPath.Buffer != NULL) + MIDL_user_free(Ptr->All.ScriptPath.Buffer); + + if (Ptr->All.ProfilePath.Buffer != NULL) + MIDL_user_free(Ptr->All.ProfilePath.Buffer); + + if (Ptr->All.AdminComment.Buffer != NULL) + MIDL_user_free(Ptr->All.AdminComment.Buffer); + + if (Ptr->All.WorkStations.Buffer != NULL) + MIDL_user_free(Ptr->All.WorkStations.Buffer); + + if (Ptr->All.UserComment.Buffer != NULL) + MIDL_user_free(Ptr->All.UserComment.Buffer); + + if (Ptr->All.Parameters.Buffer != NULL) + MIDL_user_free(Ptr->All.Parameters.Buffer); + + if (Ptr->All.LmOwfPassword.Buffer != NULL) + MIDL_user_free(Ptr->All.LmOwfPassword.Buffer); + + if (Ptr->All.NtOwfPassword.Buffer != NULL) + MIDL_user_free(Ptr->All.NtOwfPassword.Buffer); + + if (Ptr->All.PrivateData.Buffer != NULL) + MIDL_user_free(Ptr->All.PrivateData.Buffer); + + if (Ptr->All.SecurityDescriptor.SecurityDescriptor != NULL) + MIDL_user_free(Ptr->All.SecurityDescriptor.SecurityDescriptor); + + if (Ptr->All.LogonHours.LogonHours != NULL) + MIDL_user_free(Ptr->All.LogonHours.LogonHours); + break; + + default: + FIXME("Unsupported information class: %lu\n", InformationClass); + break; + } + + MIDL_user_free(Ptr); } /* EOF */ Modified: branches/ros-csrss/dll/win32/samsrv/samsrv.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samsrv/sams… ============================================================================== --- branches/ros-csrss/dll/win32/samsrv/samsrv.spec [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/samsrv/samsrv.spec [iso-8859-1] Sat Apr 13 21:09:49 2013 @@ -28,7 +28,7 @@ @ stdcall SamIFree_SAMPR_RETURNED_USTRING_ARRAY(ptr) @ stub SamIFree_SAMPR_SR_SECURITY_DESCRIPTOR @ stdcall SamIFree_SAMPR_ULONG_ARRAY(ptr) -@ stub SamIFree_SAMPR_USER_INFO_BUFFER +@ stdcall SamIFree_SAMPR_USER_INFO_BUFFER(ptr long) @ stub SamIFree_UserInternal6Information @ stub SamIGCLookupNames @ stub SamIGCLookupSids Modified: branches/ros-csrss/win32ss/user/consrv/frontends/tui/tuiterm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/tui/tuiterm.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/tui/tuiterm.c [iso-8859-1] Sat Apr 13 21:09:49 2013 @@ -11,7 +11,7 @@ #include "consrv.h" #include "include/conio.h" -// #include "include/console.h" +#include "include/console.h" #include "include/settings.h" #include "tuiterm.h" #include <drivers/blue/ntddblue.h> @@ -258,14 +258,55 @@ static LRESULT CALLBACK TuiConsoleWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { - if (msg == WM_ACTIVATE) - { - if (LOWORD(wParam) != WA_INACTIVE) +/* + PTUI_CONSOLE_DATA TuiData = NULL; + PCONSOLE Console = NULL; + + TuiData = TuiGetGuiData(hWnd); + if (TuiData == NULL) return 0; +*/ + + switch (msg) + { + case WM_CHAR: + case WM_SYSCHAR: + case WM_KEYDOWN: + case WM_SYSKEYDOWN: + case WM_KEYUP: + case WM_SYSKEYUP: { - SetFocus(hWnd); - ConioDrawConsole(ActiveConsole->Console); + if (ConSrvValidateConsoleUnsafe(ActiveConsole->Console, CONSOLE_RUNNING, TRUE)) + { + MSG Message; + Message.hwnd = hWnd; + Message.message = msg; + Message.wParam = wParam; + Message.lParam = lParam; + + ConioProcessKey(ActiveConsole->Console, &Message); + LeaveCriticalSection(&ActiveConsole->Console->Lock); + } + break; } - } + + case WM_ACTIVATE: + { + if (ConSrvValidateConsoleUnsafe(ActiveConsole->Console, CONSOLE_RUNNING, TRUE)) + { + if (LOWORD(wParam) != WA_INACTIVE) + { + SetFocus(hWnd); + ConioDrawConsole(ActiveConsole->Console); + } + LeaveCriticalSection(&ActiveConsole->Console->Lock); + } + break; + } + + default: + break; + } + return DefWindowProcW(hWnd, msg, wParam, lParam); } @@ -298,13 +339,6 @@ { TranslateMessage(&msg); DispatchMessageW(&msg); - - if (msg.message == WM_CHAR || msg.message == WM_SYSCHAR || - msg.message == WM_KEYDOWN || msg.message == WM_SYSKEYDOWN || - msg.message == WM_KEYUP || msg.message == WM_SYSKEYUP) - { - ConioProcessKey(Console, &msg); - } } return 0;

1 0

[ekohl] 58742: [SAMSRV] Implement SamIFree_SAMPR_USER_INFO_BUFFER.
by ekohl＠svn.reactos.org 13 Apr '13

13 Apr '13

Author: ekohl Date: Sat Apr 13 21:04:54 2013 New Revision: 58742 URL: http://svn.reactos.org/svn/reactos?rev=58742&view=rev Log: [SAMSRV] Implement SamIFree_SAMPR_USER_INFO_BUFFER. Modified: trunk/reactos/dll/win32/samsrv/samsrv.c trunk/reactos/dll/win32/samsrv/samsrv.spec Modified: trunk/reactos/dll/win32/samsrv/samsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] Sat Apr 13 21:04:54 2013 @@ -131,7 +131,7 @@ { if (Ptr != NULL) { - if (Ptr->Sids !=0) + if (Ptr->Sids != NULL) { MIDL_user_free(Ptr->Sids); } @@ -176,7 +176,222 @@ Ptr->Count = 0; } } - +} + + +VOID +NTAPI +SamIFree_SAMPR_USER_INFO_BUFFER(PSAMPR_USER_INFO_BUFFER Ptr, + USER_INFORMATION_CLASS InformationClass) +{ + if (Ptr == NULL) + return; + + switch (InformationClass) + { + case UserGeneralInformation: + if (Ptr->General.UserName.Buffer != NULL) + MIDL_user_free(Ptr->General.UserName.Buffer); + + if (Ptr->General.FullName.Buffer != NULL) + MIDL_user_free(Ptr->General.FullName.Buffer); + + if (Ptr->General.AdminComment.Buffer != NULL) + MIDL_user_free(Ptr->General.AdminComment.Buffer); + + if (Ptr->General.UserComment.Buffer != NULL) + MIDL_user_free(Ptr->General.UserComment.Buffer); + break; + + case UserPreferencesInformation: + if (Ptr->Preferences.UserComment.Buffer != NULL) + MIDL_user_free(Ptr->Preferences.UserComment.Buffer); + + if (Ptr->Preferences.Reserved1.Buffer != NULL) + MIDL_user_free(Ptr->Preferences.Reserved1.Buffer); + break; + + case UserLogonInformation: + if (Ptr->Logon.UserName.Buffer != NULL) + MIDL_user_free(Ptr->Logon.UserName.Buffer); + + if (Ptr->Logon.FullName.Buffer != NULL) + MIDL_user_free(Ptr->Logon.FullName.Buffer); + + if (Ptr->Logon.HomeDirectory.Buffer != NULL) + MIDL_user_free(Ptr->Logon.HomeDirectory.Buffer); + + if (Ptr->Logon.HomeDirectoryDrive.Buffer != NULL) + MIDL_user_free(Ptr->Logon.HomeDirectoryDrive.Buffer); + + if (Ptr->Logon.ScriptPath.Buffer != NULL) + MIDL_user_free(Ptr->Logon.ScriptPath.Buffer); + + if (Ptr->Logon.ProfilePath.Buffer != NULL) + MIDL_user_free(Ptr->Logon.ProfilePath.Buffer); + + if (Ptr->Logon.WorkStations.Buffer != NULL) + MIDL_user_free(Ptr->Logon.WorkStations.Buffer); + + if (Ptr->Logon.LogonHours.LogonHours != NULL) + MIDL_user_free(Ptr->Logon.LogonHours.LogonHours); + break; + + case UserLogonHoursInformation: + if (Ptr->LogonHours.LogonHours.LogonHours != NULL) + MIDL_user_free(Ptr->LogonHours.LogonHours.LogonHours); + break; + + case UserAccountInformation: + if (Ptr->Account.UserName.Buffer != NULL) + MIDL_user_free(Ptr->Account.UserName.Buffer); + + if (Ptr->Account.FullName.Buffer != NULL) + MIDL_user_free(Ptr->Account.FullName.Buffer); + + if (Ptr->Account.HomeDirectory.Buffer != NULL) + MIDL_user_free(Ptr->Account.HomeDirectory.Buffer); + + if (Ptr->Account.HomeDirectoryDrive.Buffer != NULL) + MIDL_user_free(Ptr->Account.HomeDirectoryDrive.Buffer); + + if (Ptr->Account.ScriptPath.Buffer != NULL) + MIDL_user_free(Ptr->Account.ScriptPath.Buffer); + + if (Ptr->Account.ProfilePath.Buffer != NULL) + MIDL_user_free(Ptr->Account.ProfilePath.Buffer); + + if (Ptr->Account.AdminComment.Buffer != NULL) + MIDL_user_free(Ptr->Account.AdminComment.Buffer); + + if (Ptr->Account.WorkStations.Buffer != NULL) + MIDL_user_free(Ptr->Account.WorkStations.Buffer); + + if (Ptr->Account.LogonHours.LogonHours != NULL) + MIDL_user_free(Ptr->Account.LogonHours.LogonHours); + break; + + case UserNameInformation: + if (Ptr->Name.UserName.Buffer != NULL) + MIDL_user_free(Ptr->Name.UserName.Buffer); + + if (Ptr->Name.FullName.Buffer != NULL) + MIDL_user_free(Ptr->Name.FullName.Buffer); + break; + + case UserAccountNameInformation: + if (Ptr->AccountName.UserName.Buffer != NULL) + MIDL_user_free(Ptr->AccountName.UserName.Buffer); + break; + + case UserFullNameInformation: + if (Ptr->FullName.FullName.Buffer != NULL) + MIDL_user_free(Ptr->FullName.FullName.Buffer); + break; + + case UserPrimaryGroupInformation: + break; + + case UserHomeInformation: + if (Ptr->Home.HomeDirectory.Buffer != NULL) + MIDL_user_free(Ptr->Home.HomeDirectory.Buffer); + + if (Ptr->Home.HomeDirectoryDrive.Buffer != NULL) + MIDL_user_free(Ptr->Home.HomeDirectoryDrive.Buffer); + break; + + case UserScriptInformation: + if (Ptr->Script.ScriptPath.Buffer != NULL) + MIDL_user_free(Ptr->Script.ScriptPath.Buffer); + + case UserProfileInformation: + if (Ptr->Profile.ProfilePath.Buffer != NULL) + MIDL_user_free(Ptr->Profile.ProfilePath.Buffer); + + case UserAdminCommentInformation: + if (Ptr->AdminComment.AdminComment.Buffer != NULL) + MIDL_user_free(Ptr->AdminComment.AdminComment.Buffer); + break; + + case UserWorkStationsInformation: + if (Ptr->WorkStations.WorkStations.Buffer != NULL) + MIDL_user_free(Ptr->WorkStations.WorkStations.Buffer); + break; + + case UserSetPasswordInformation: + ERR("Information class UserSetPasswordInformation cannot be queried!\n"); + break; + + case UserControlInformation: + break; + + case UserExpiresInformation: + break; + + case UserInternal1Information: + break; + + case UserInternal2Information: + break; + + case UserParametersInformation: + if (Ptr->Parameters.Parameters.Buffer != NULL) + MIDL_user_free(Ptr->Parameters.Parameters.Buffer); + break; + + case UserAllInformation: + if (Ptr->All.UserName.Buffer != NULL) + MIDL_user_free(Ptr->All.UserName.Buffer); + + if (Ptr->All.FullName.Buffer != NULL) + MIDL_user_free(Ptr->All.FullName.Buffer); + + if (Ptr->All.HomeDirectory.Buffer != NULL) + MIDL_user_free(Ptr->All.HomeDirectory.Buffer); + + if (Ptr->All.HomeDirectoryDrive.Buffer != NULL) + MIDL_user_free(Ptr->All.HomeDirectoryDrive.Buffer); + + if (Ptr->All.ScriptPath.Buffer != NULL) + MIDL_user_free(Ptr->All.ScriptPath.Buffer); + + if (Ptr->All.ProfilePath.Buffer != NULL) + MIDL_user_free(Ptr->All.ProfilePath.Buffer); + + if (Ptr->All.AdminComment.Buffer != NULL) + MIDL_user_free(Ptr->All.AdminComment.Buffer); + + if (Ptr->All.WorkStations.Buffer != NULL) + MIDL_user_free(Ptr->All.WorkStations.Buffer); + + if (Ptr->All.UserComment.Buffer != NULL) + MIDL_user_free(Ptr->All.UserComment.Buffer); + + if (Ptr->All.Parameters.Buffer != NULL) + MIDL_user_free(Ptr->All.Parameters.Buffer); + + if (Ptr->All.LmOwfPassword.Buffer != NULL) + MIDL_user_free(Ptr->All.LmOwfPassword.Buffer); + + if (Ptr->All.NtOwfPassword.Buffer != NULL) + MIDL_user_free(Ptr->All.NtOwfPassword.Buffer); + + if (Ptr->All.PrivateData.Buffer != NULL) + MIDL_user_free(Ptr->All.PrivateData.Buffer); + + if (Ptr->All.SecurityDescriptor.SecurityDescriptor != NULL) + MIDL_user_free(Ptr->All.SecurityDescriptor.SecurityDescriptor); + + if (Ptr->All.LogonHours.LogonHours != NULL) + MIDL_user_free(Ptr->All.LogonHours.LogonHours); + break; + + default: + FIXME("Unsupported information class: %lu\n", InformationClass); + break; + } + + MIDL_user_free(Ptr); } /* EOF */ Modified: trunk/reactos/dll/win32/samsrv/samsrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.sp… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] Sat Apr 13 21:04:54 2013 @@ -28,7 +28,7 @@ @ stdcall SamIFree_SAMPR_RETURNED_USTRING_ARRAY(ptr) @ stub SamIFree_SAMPR_SR_SECURITY_DESCRIPTOR @ stdcall SamIFree_SAMPR_ULONG_ARRAY(ptr) -@ stub SamIFree_SAMPR_USER_INFO_BUFFER +@ stdcall SamIFree_SAMPR_USER_INFO_BUFFER(ptr long) @ stub SamIFree_UserInternal6Information @ stub SamIGCLookupNames @ stub SamIGCLookupSids

1 0

[hbelusca] 58741: Sync with trunk r58740.
by hbelusca＠svn.reactos.org 13 Apr '13

13 Apr '13

Author: hbelusca Date: Sat Apr 13 18:49:50 2013 New Revision: 58741 URL: http://svn.reactos.org/svn/reactos?rev=58741&view=rev Log: Sync with trunk r58740. Added: branches/ros-csrss/dll/directx/dmusic/dmusic.idl - copied unchanged from r58739, trunk/reactos/dll/directx/dmusic/dmusic.idl branches/ros-csrss/dll/directx/dmusic/dmusic.rgs - copied unchanged from r58739, trunk/reactos/dll/directx/dmusic/dmusic.rgs branches/ros-csrss/dll/directx/dplayx/dplayx.idl - copied unchanged from r58739, trunk/reactos/dll/directx/dplayx/dplayx.idl branches/ros-csrss/dll/directx/dplayx/dplayx.rgs - copied unchanged from r58739, trunk/reactos/dll/directx/dplayx/dplayx.rgs branches/ros-csrss/dll/win32/hhctrl.ocx/hhctrl_tlb.idl - copied unchanged from r58739, trunk/reactos/dll/win32/hhctrl.ocx/hhctrl_tlb.idl branches/ros-csrss/dll/win32/hhctrl.ocx/hhtoolbar.bmp - copied unchanged from r58739, trunk/reactos/dll/win32/hhctrl.ocx/hhtoolbar.bmp branches/ros-csrss/dll/win32/hhctrl.ocx/hhtreeview.bmp - copied unchanged from r58739, trunk/reactos/dll/win32/hhctrl.ocx/hhtreeview.bmp branches/ros-csrss/drivers/network/dd/rtl8139/ (props changed) - copied from r58739, trunk/reactos/drivers/network/dd/rtl8139/ branches/ros-csrss/include/reactos/wine/dplaysp.h - copied unchanged from r58739, trunk/reactos/include/reactos/wine/dplaysp.h Removed: branches/ros-csrss/dll/directx/dmusic/downloadedinstrument.c branches/ros-csrss/dll/directx/dplayx/dplaysp.h branches/ros-csrss/dll/directx/dplayx/regsvr.c branches/ros-csrss/dll/win32/hhctrl.ocx/version.rc branches/ros-csrss/drivers/wdm/audio/backpln/portcls/guids.cpp Modified: branches/ros-csrss/ (props changed) branches/ros-csrss/base/applications/mscutils/devmgmt/enumdevices.c branches/ros-csrss/base/applications/network/telnet/src/tnmisc.cpp branches/ros-csrss/base/shell/cmd/for.c branches/ros-csrss/base/shell/cmd/path.c branches/ros-csrss/base/shell/cmd/start.c branches/ros-csrss/cmake/Platform/Windows-MSVC.cmake branches/ros-csrss/dll/directx/dmusic/CMakeLists.txt branches/ros-csrss/dll/directx/dmusic/buffer.c branches/ros-csrss/dll/directx/dmusic/clock.c branches/ros-csrss/dll/directx/dmusic/collection.c branches/ros-csrss/dll/directx/dmusic/dmusic.c branches/ros-csrss/dll/directx/dmusic/dmusic_main.c branches/ros-csrss/dll/directx/dmusic/dmusic_private.h branches/ros-csrss/dll/directx/dmusic/download.c branches/ros-csrss/dll/directx/dmusic/instrument.c branches/ros-csrss/dll/directx/dmusic/port.c branches/ros-csrss/dll/directx/dmusic/version.rc branches/ros-csrss/dll/directx/dplay/CMakeLists.txt branches/ros-csrss/dll/directx/dplay/version.rc branches/ros-csrss/dll/directx/dplayx/CMakeLists.txt branches/ros-csrss/dll/directx/dplayx/dpclassfactory.c branches/ros-csrss/dll/directx/dplayx/dpinit.h branches/ros-csrss/dll/directx/dplayx/dplay.c branches/ros-csrss/dll/directx/dplayx/dplay_global.h branches/ros-csrss/dll/directx/dplayx/dplaysp.c branches/ros-csrss/dll/directx/dplayx/dplayx_global.c branches/ros-csrss/dll/directx/dplayx/dplayx_global.h branches/ros-csrss/dll/directx/dplayx/dplayx_main.c branches/ros-csrss/dll/directx/dplayx/dplayx_messages.c branches/ros-csrss/dll/directx/dplayx/dplayx_messages.h branches/ros-csrss/dll/directx/dplayx/dplayx_queue.h branches/ros-csrss/dll/directx/dplayx/dplobby.c branches/ros-csrss/dll/directx/dplayx/lobbysp.c branches/ros-csrss/dll/directx/dplayx/lobbysp.h branches/ros-csrss/dll/directx/dplayx/name_server.c branches/ros-csrss/dll/directx/dplayx/name_server.h branches/ros-csrss/dll/directx/dplayx/version.rc branches/ros-csrss/dll/opengl/mesa/src/mesa/CMakeLists.txt branches/ros-csrss/dll/win32/cryptdlg/main.c branches/ros-csrss/dll/win32/cryptdll/cryptdll.c branches/ros-csrss/dll/win32/cryptnet/cryptnet_main.c branches/ros-csrss/dll/win32/cryptui/main.c branches/ros-csrss/dll/win32/hhctrl.ocx/CMakeLists.txt branches/ros-csrss/dll/win32/hhctrl.ocx/chm.c branches/ros-csrss/dll/win32/hhctrl.ocx/content.c branches/ros-csrss/dll/win32/hhctrl.ocx/help.c branches/ros-csrss/dll/win32/hhctrl.ocx/hhctrl.c branches/ros-csrss/dll/win32/hhctrl.ocx/hhctrl.h branches/ros-csrss/dll/win32/hhctrl.ocx/hhctrl.rc branches/ros-csrss/dll/win32/hhctrl.ocx/index.c branches/ros-csrss/dll/win32/hhctrl.ocx/resource.h branches/ros-csrss/dll/win32/hhctrl.ocx/search.c branches/ros-csrss/dll/win32/hhctrl.ocx/stream.c branches/ros-csrss/dll/win32/hhctrl.ocx/stream.h branches/ros-csrss/dll/win32/hhctrl.ocx/webbrowser.c branches/ros-csrss/dll/win32/kernel32/client/dllmain.c branches/ros-csrss/dll/win32/samsrv/samrpc.c branches/ros-csrss/dll/win32/samsrv/samsrv.c branches/ros-csrss/dll/win32/samsrv/samsrv.h branches/ros-csrss/dll/win32/samsrv/samsrv.spec branches/ros-csrss/dll/win32/samsrv/user.c branches/ros-csrss/drivers/ksfilter/ks/event.c branches/ros-csrss/drivers/ksfilter/ks/irp.c branches/ros-csrss/drivers/network/dd/rtl8139/include/ (props changed) branches/ros-csrss/drivers/wdm/audio/backpln/portcls/CMakeLists.txt branches/ros-csrss/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp branches/ros-csrss/drivers/wdm/audio/backpln/portcls/port.cpp branches/ros-csrss/include/crt/xmmintrin.h branches/ros-csrss/include/ddk/wdm.h branches/ros-csrss/include/dxsdk/dmusicc.h branches/ros-csrss/include/dxsdk/dmusics.h branches/ros-csrss/include/psdk/dmksctrl.h branches/ros-csrss/include/psdk/dplay.h branches/ros-csrss/include/psdk/ks.h branches/ros-csrss/include/xdk/mmfuncs.h branches/ros-csrss/lib/rtl/actctx.c branches/ros-csrss/lib/sdk/crt/locale/locale.c branches/ros-csrss/lib/sdk/crt/misc/assert.c branches/ros-csrss/lib/sdk/crt/startup/crtexe.c branches/ros-csrss/media/doc/README.WINE branches/ros-csrss/ntoskrnl/ke/i386/traphdlr.c branches/ros-csrss/ntoskrnl/mm/ARM3/virtual.c branches/ros-csrss/win32ss/user/ntuser/scrollbar.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/base/applications/mscutils/devmgmt/enumdevices.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/msc… Modified: branches/ros-csrss/base/applications/network/telnet/src/tnmisc.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/net… Modified: branches/ros-csrss/base/shell/cmd/for.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/cmd/for.c?… Modified: branches/ros-csrss/base/shell/cmd/path.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/cmd/path.c… Modified: branches/ros-csrss/base/shell/cmd/start.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/cmd/start.… Modified: branches/ros-csrss/cmake/Platform/Windows-MSVC.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/cmake/Platform/Window… Modified: branches/ros-csrss/dll/directx/dmusic/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dmusic/CM… Modified: branches/ros-csrss/dll/directx/dmusic/buffer.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dmusic/bu… Modified: branches/ros-csrss/dll/directx/dmusic/clock.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dmusic/cl… Modified: branches/ros-csrss/dll/directx/dmusic/collection.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dmusic/co… Modified: branches/ros-csrss/dll/directx/dmusic/dmusic.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dmusic/dm… Modified: branches/ros-csrss/dll/directx/dmusic/dmusic_main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dmusic/dm… Modified: branches/ros-csrss/dll/directx/dmusic/dmusic_private.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dmusic/dm… Modified: branches/ros-csrss/dll/directx/dmusic/download.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dmusic/do… Removed: branches/ros-csrss/dll/directx/dmusic/downloadedinstrument.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dmusic/do… Modified: branches/ros-csrss/dll/directx/dmusic/instrument.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dmusic/in… Modified: branches/ros-csrss/dll/directx/dmusic/port.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dmusic/po… Modified: branches/ros-csrss/dll/directx/dmusic/version.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dmusic/ve… Modified: branches/ros-csrss/dll/directx/dplay/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dplay/CMa… Modified: branches/ros-csrss/dll/directx/dplay/version.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dplay/ver… Modified: branches/ros-csrss/dll/directx/dplayx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dplayx/CM… Modified: branches/ros-csrss/dll/directx/dplayx/dpclassfactory.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dplayx/dp… Modified: branches/ros-csrss/dll/directx/dplayx/dpinit.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dplayx/dp… Modified: branches/ros-csrss/dll/directx/dplayx/dplay.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dplayx/dp… Modified: branches/ros-csrss/dll/directx/dplayx/dplay_global.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dplayx/dp… Modified: branches/ros-csrss/dll/directx/dplayx/dplaysp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dplayx/dp… Removed: branches/ros-csrss/dll/directx/dplayx/dplaysp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dplayx/dp… Modified: branches/ros-csrss/dll/directx/dplayx/dplayx_global.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dplayx/dp… Modified: branches/ros-csrss/dll/directx/dplayx/dplayx_global.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dplayx/dp… Modified: branches/ros-csrss/dll/directx/dplayx/dplayx_main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dplayx/dp… Modified: branches/ros-csrss/dll/directx/dplayx/dplayx_messages.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dplayx/dp… Modified: branches/ros-csrss/dll/directx/dplayx/dplayx_messages.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dplayx/dp… Modified: branches/ros-csrss/dll/directx/dplayx/dplayx_queue.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dplayx/dp… Modified: branches/ros-csrss/dll/directx/dplayx/dplobby.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dplayx/dp… Modified: branches/ros-csrss/dll/directx/dplayx/lobbysp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dplayx/lo… Modified: branches/ros-csrss/dll/directx/dplayx/lobbysp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dplayx/lo… Modified: branches/ros-csrss/dll/directx/dplayx/name_server.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dplayx/na… Modified: branches/ros-csrss/dll/directx/dplayx/name_server.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dplayx/na… Removed: branches/ros-csrss/dll/directx/dplayx/regsvr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dplayx/re… Modified: branches/ros-csrss/dll/directx/dplayx/version.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/dplayx/ve… Modified: branches/ros-csrss/dll/opengl/mesa/src/mesa/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/opengl/mesa/src/m… Modified: branches/ros-csrss/dll/win32/cryptdlg/main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/cryptdlg/ma… Modified: branches/ros-csrss/dll/win32/cryptdll/cryptdll.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/cryptdll/cr… Modified: branches/ros-csrss/dll/win32/cryptnet/cryptnet_main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/cryptnet/cr… Modified: branches/ros-csrss/dll/win32/cryptui/main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/cryptui/mai… Modified: branches/ros-csrss/dll/win32/hhctrl.ocx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/hhctrl.ocx/… Modified: branches/ros-csrss/dll/win32/hhctrl.ocx/chm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/hhctrl.ocx/… Modified: branches/ros-csrss/dll/win32/hhctrl.ocx/content.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/hhctrl.ocx/… Modified: branches/ros-csrss/dll/win32/hhctrl.ocx/help.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/hhctrl.ocx/… Modified: branches/ros-csrss/dll/win32/hhctrl.ocx/hhctrl.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/hhctrl.ocx/… Modified: branches/ros-csrss/dll/win32/hhctrl.ocx/hhctrl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/hhctrl.ocx/… Modified: branches/ros-csrss/dll/win32/hhctrl.ocx/hhctrl.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/hhctrl.ocx/… Modified: branches/ros-csrss/dll/win32/hhctrl.ocx/index.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/hhctrl.ocx/… Modified: branches/ros-csrss/dll/win32/hhctrl.ocx/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/hhctrl.ocx/… Modified: branches/ros-csrss/dll/win32/hhctrl.ocx/search.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/hhctrl.ocx/… Modified: branches/ros-csrss/dll/win32/hhctrl.ocx/stream.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/hhctrl.ocx/… Modified: branches/ros-csrss/dll/win32/hhctrl.ocx/stream.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/hhctrl.ocx/… Removed: branches/ros-csrss/dll/win32/hhctrl.ocx/version.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/hhctrl.ocx/… Modified: branches/ros-csrss/dll/win32/hhctrl.ocx/webbrowser.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/hhctrl.ocx/… Modified: branches/ros-csrss/dll/win32/kernel32/client/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… Modified: branches/ros-csrss/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samsrv/samr… Modified: branches/ros-csrss/dll/win32/samsrv/samsrv.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samsrv/sams… Modified: branches/ros-csrss/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samsrv/sams… Modified: branches/ros-csrss/dll/win32/samsrv/samsrv.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samsrv/sams… Modified: branches/ros-csrss/dll/win32/samsrv/user.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samsrv/user… Modified: branches/ros-csrss/drivers/ksfilter/ks/event.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/ksfilter/ks/e… Modified: branches/ros-csrss/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/ksfilter/ks/i… Modified: branches/ros-csrss/drivers/wdm/audio/backpln/portcls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/bac… Removed: branches/ros-csrss/drivers/wdm/audio/backpln/portcls/guids.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/bac… Modified: branches/ros-csrss/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/bac… Modified: branches/ros-csrss/drivers/wdm/audio/backpln/portcls/port.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/bac… Modified: branches/ros-csrss/include/crt/xmmintrin.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/crt/xmmintrin… Modified: branches/ros-csrss/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/ddk/wdm.h?rev… Modified: branches/ros-csrss/include/dxsdk/dmusicc.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/dxsdk/dmusicc… Modified: branches/ros-csrss/include/dxsdk/dmusics.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/dxsdk/dmusics… Modified: branches/ros-csrss/include/psdk/dmksctrl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/dmksctrl… Modified: branches/ros-csrss/include/psdk/dplay.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/dplay.h?… Modified: branches/ros-csrss/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/ks.h?rev… Modified: branches/ros-csrss/include/xdk/mmfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/xdk/mmfuncs.h… Modified: branches/ros-csrss/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/rtl/actctx.c?rev=… Modified: branches/ros-csrss/lib/sdk/crt/locale/locale.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/locale/lo… Modified: branches/ros-csrss/lib/sdk/crt/misc/assert.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/misc/asse… Modified: branches/ros-csrss/lib/sdk/crt/startup/crtexe.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/startup/c… Modified: branches/ros-csrss/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/media/doc/README.WINE… Modified: branches/ros-csrss/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/ke/i386/trap… Modified: branches/ros-csrss/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/mm/ARM3/virt… Modified: branches/ros-csrss/win32ss/user/ntuser/scrollbar.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/s…

1 0

[ekohl] 58740: [SAMSRV] SamrCreateUserInDomain: Set default logon hours.
by ekohl＠svn.reactos.org 13 Apr '13

13 Apr '13

Author: ekohl Date: Sat Apr 13 17:59:40 2013 New Revision: 58740 URL: http://svn.reactos.org/svn/reactos?rev=58740&view=rev Log: [SAMSRV] SamrCreateUserInDomain: Set default logon hours. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sat Apr 13 17:59:40 2013 @@ -2096,6 +2096,7 @@ SAM_USER_FIXED_DATA FixedUserData; PSAM_DB_OBJECT DomainObject; PSAM_DB_OBJECT UserObject; + UCHAR LogonHours[23]; ULONG ulSize; ULONG ulRid; WCHAR szRid[9]; @@ -2350,11 +2351,14 @@ } /* Set LogonHours attribute*/ + *((PUSHORT)LogonHours) = 168; + memset(&(LogonHours[2]), 0xff, 21); + Status = SampSetObjectAttribute(UserObject, L"LogonHours", REG_BINARY, - NULL, - 0); + &LogonHours, + sizeof(LogonHours)); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status);

1 0

[akhaldi] 58739: [DMUSIC] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 13 Apr '13

13 Apr '13

Author: akhaldi Date: Sat Apr 13 17:29:01 2013 New Revision: 58739 URL: http://svn.reactos.org/svn/reactos?rev=58739&view=rev Log: [DMUSIC] * Sync with Wine 1.5.26. Added: trunk/reactos/dll/directx/dmusic/dmusic.idl (with props) trunk/reactos/dll/directx/dmusic/dmusic.rgs (with props) Removed: trunk/reactos/dll/directx/dmusic/downloadedinstrument.c Modified: trunk/reactos/dll/directx/dmusic/CMakeLists.txt trunk/reactos/dll/directx/dmusic/buffer.c trunk/reactos/dll/directx/dmusic/clock.c trunk/reactos/dll/directx/dmusic/collection.c trunk/reactos/dll/directx/dmusic/dmusic.c trunk/reactos/dll/directx/dmusic/dmusic_main.c trunk/reactos/dll/directx/dmusic/dmusic_private.h trunk/reactos/dll/directx/dmusic/download.c trunk/reactos/dll/directx/dmusic/instrument.c trunk/reactos/dll/directx/dmusic/port.c trunk/reactos/dll/directx/dmusic/version.rc trunk/reactos/include/dxsdk/dmusicc.h trunk/reactos/include/dxsdk/dmusics.h trunk/reactos/include/psdk/dmksctrl.h trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/dmusic/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dmusic/CMakeLi… Modified: trunk/reactos/dll/directx/dmusic/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dmusic/buffer.… Modified: trunk/reactos/dll/directx/dmusic/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dmusic/clock.c… Modified: trunk/reactos/dll/directx/dmusic/collection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dmusic/collect… Modified: trunk/reactos/dll/directx/dmusic/dmusic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dmusic/dmusic.… Added: trunk/reactos/dll/directx/dmusic/dmusic.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dmusic/dmusic.… Added: trunk/reactos/dll/directx/dmusic/dmusic.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dmusic/dmusic.… Modified: trunk/reactos/dll/directx/dmusic/dmusic_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dmusic/dmusic_… Modified: trunk/reactos/dll/directx/dmusic/dmusic_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dmusic/dmusic_… Modified: trunk/reactos/dll/directx/dmusic/download.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dmusic/downloa… Removed: trunk/reactos/dll/directx/dmusic/downloadedinstrument.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dmusic/downloa… Modified: trunk/reactos/dll/directx/dmusic/instrument.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dmusic/instrum… Modified: trunk/reactos/dll/directx/dmusic/port.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dmusic/port.c?… Modified: trunk/reactos/dll/directx/dmusic/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dmusic/version… Modified: trunk/reactos/include/dxsdk/dmusicc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dmusicc.h?re… Modified: trunk/reactos/include/dxsdk/dmusics.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dmusics.h?re… Modified: trunk/reactos/include/psdk/dmksctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dmksctrl.h?re… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[tkreuzer] 58738: [DDK] Fix the definition of BYTES_TO_PAGES. While the macro might look overcomplicated, it actually needs to be this way to prevent integer overflows.
by tkreuzer＠svn.reactos.org 13 Apr '13

13 Apr '13

Author: tkreuzer Date: Sat Apr 13 16:10:09 2013 New Revision: 58738 URL: http://svn.reactos.org/svn/reactos?rev=58738&view=rev Log: [DDK] Fix the definition of BYTES_TO_PAGES. While the macro might look overcomplicated, it actually needs to be this way to prevent integer overflows. Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/include/xdk/mmfuncs.h Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=5873… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sat Apr 13 16:10:09 2013 @@ -11248,36 +11248,38 @@ /* ULONG * BYTE_OFFSET( - * IN PVOID Va) + * _In_ PVOID Va) */ #define BYTE_OFFSET(Va) \ ((ULONG) ((ULONG_PTR) (Va) & (PAGE_SIZE - 1))) /* ULONG * BYTES_TO_PAGES( - * IN ULONG Size) + * _In_ ULONG Size) + * + * Note: This needs to be like this to avoid overflows! */ #define BYTES_TO_PAGES(Size) \ - (((Size) + PAGE_SIZE - 1) >> PAGE_SHIFT) + (((Size) >> PAGE_SHIFT) + (((Size) & (PAGE_SIZE - 1)) != 0)) /* PVOID * PAGE_ALIGN( - * IN PVOID Va) + * _In_ PVOID Va) */ #define PAGE_ALIGN(Va) \ ((PVOID) ((ULONG_PTR)(Va) & ~(PAGE_SIZE - 1))) /* ULONG_PTR * ROUND_TO_PAGES( - * IN ULONG_PTR Size) + * _In_ ULONG_PTR Size) */ #define ROUND_TO_PAGES(Size) \ (((ULONG_PTR) (Size) + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1)) /* ULONG * ADDRESS_AND_SIZE_TO_SPAN_PAGES( - * IN PVOID Va, - * IN ULONG Size) + * _In_ PVOID Va, + * _In_ ULONG Size) */ #define ADDRESS_AND_SIZE_TO_SPAN_PAGES(_Va, _Size) \ ((ULONG) ((((ULONG_PTR) (_Va) & (PAGE_SIZE - 1)) \ @@ -11289,7 +11291,7 @@ /* * ULONG * MmGetMdlByteCount( - * IN PMDL Mdl) + * _In_ PMDL Mdl) */ #define MmGetMdlByteCount(_Mdl) \ ((_Mdl)->ByteCount) @@ -11307,7 +11309,7 @@ /* * PPFN_NUMBER * MmGetMdlPfnArray( - * IN PMDL Mdl) + * _In_ PMDL Mdl) */ #define MmGetMdlPfnArray(_Mdl) \ ((PPFN_NUMBER) ((_Mdl) + 1)) @@ -11315,7 +11317,7 @@ /* * PVOID * MmGetMdlVirtualAddress( - * IN PMDL Mdl) + * _In_ PMDL Mdl) */ #define MmGetMdlVirtualAddress(_Mdl) \ ((PVOID) ((PCHAR) ((_Mdl)->StartVa) + (_Mdl)->ByteOffset)) @@ -11324,7 +11326,7 @@ #define MmLockPagableCodeSection(Address) MmLockPagableDataSection(Address) /* PVOID MmGetSystemAddressForMdl( - * IN PMDL Mdl); + * _In_ PMDL Mdl); */ #define MmGetSystemAddressForMdl(Mdl) \ (((Mdl)->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA | \ @@ -11334,8 +11336,8 @@ /* PVOID * MmGetSystemAddressForMdlSafe( - * IN PMDL Mdl, - * IN MM_PAGE_PRIORITY Priority) + * _In_ PMDL Mdl, + * _In_ MM_PAGE_PRIORITY Priority) */ #define MmGetSystemAddressForMdlSafe(_Mdl, _Priority) \ (((_Mdl)->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA \ @@ -11347,9 +11349,9 @@ /* * VOID * MmInitializeMdl( - * IN PMDL MemoryDescriptorList, - * IN PVOID BaseVa, - * IN SIZE_T Length) + * _In_ PMDL MemoryDescriptorList, + * _In_ PVOID BaseVa, + * _In_ SIZE_T Length) */ #define MmInitializeMdl(_MemoryDescriptorList, \ _BaseVa, \ @@ -11367,7 +11369,7 @@ /* * VOID * MmPrepareMdlForReuse( - * IN PMDL Mdl) + * _In_ PMDL Mdl) */ #define MmPrepareMdlForReuse(_Mdl) \ { \ Modified: trunk/reactos/include/xdk/mmfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/mmfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/mmfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/mmfuncs.h [iso-8859-1] Sat Apr 13 16:10:09 2013 @@ -45,36 +45,38 @@ /* ULONG * BYTE_OFFSET( - * IN PVOID Va) + * _In_ PVOID Va) */ #define BYTE_OFFSET(Va) \ ((ULONG) ((ULONG_PTR) (Va) & (PAGE_SIZE - 1))) /* ULONG * BYTES_TO_PAGES( - * IN ULONG Size) + * _In_ ULONG Size) + * + * Note: This needs to be like this to avoid overflows! */ #define BYTES_TO_PAGES(Size) \ - (((Size) + PAGE_SIZE - 1) >> PAGE_SHIFT) + (((Size) >> PAGE_SHIFT) + (((Size) & (PAGE_SIZE - 1)) != 0)) /* PVOID * PAGE_ALIGN( - * IN PVOID Va) + * _In_ PVOID Va) */ #define PAGE_ALIGN(Va) \ ((PVOID) ((ULONG_PTR)(Va) & ~(PAGE_SIZE - 1))) /* ULONG_PTR * ROUND_TO_PAGES( - * IN ULONG_PTR Size) + * _In_ ULONG_PTR Size) */ #define ROUND_TO_PAGES(Size) \ (((ULONG_PTR) (Size) + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1)) /* ULONG * ADDRESS_AND_SIZE_TO_SPAN_PAGES( - * IN PVOID Va, - * IN ULONG Size) + * _In_ PVOID Va, + * _In_ ULONG Size) */ #define ADDRESS_AND_SIZE_TO_SPAN_PAGES(_Va, _Size) \ ((ULONG) ((((ULONG_PTR) (_Va) & (PAGE_SIZE - 1)) \ @@ -86,7 +88,7 @@ /* * ULONG * MmGetMdlByteCount( - * IN PMDL Mdl) + * _In_ PMDL Mdl) */ #define MmGetMdlByteCount(_Mdl) \ ((_Mdl)->ByteCount) @@ -104,7 +106,7 @@ /* * PPFN_NUMBER * MmGetMdlPfnArray( - * IN PMDL Mdl) + * _In_ PMDL Mdl) */ #define MmGetMdlPfnArray(_Mdl) \ ((PPFN_NUMBER) ((_Mdl) + 1)) @@ -112,7 +114,7 @@ /* * PVOID * MmGetMdlVirtualAddress( - * IN PMDL Mdl) + * _In_ PMDL Mdl) */ #define MmGetMdlVirtualAddress(_Mdl) \ ((PVOID) ((PCHAR) ((_Mdl)->StartVa) + (_Mdl)->ByteOffset)) @@ -121,7 +123,7 @@ #define MmLockPagableCodeSection(Address) MmLockPagableDataSection(Address) /* PVOID MmGetSystemAddressForMdl( - * IN PMDL Mdl); + * _In_ PMDL Mdl); */ #define MmGetSystemAddressForMdl(Mdl) \ (((Mdl)->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA | \ @@ -131,8 +133,8 @@ /* PVOID * MmGetSystemAddressForMdlSafe( - * IN PMDL Mdl, - * IN MM_PAGE_PRIORITY Priority) + * _In_ PMDL Mdl, + * _In_ MM_PAGE_PRIORITY Priority) */ #define MmGetSystemAddressForMdlSafe(_Mdl, _Priority) \ (((_Mdl)->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA \ @@ -144,9 +146,9 @@ /* * VOID * MmInitializeMdl( - * IN PMDL MemoryDescriptorList, - * IN PVOID BaseVa, - * IN SIZE_T Length) + * _In_ PMDL MemoryDescriptorList, + * _In_ PVOID BaseVa, + * _In_ SIZE_T Length) */ #define MmInitializeMdl(_MemoryDescriptorList, \ _BaseVa, \ @@ -164,7 +166,7 @@ /* * VOID * MmPrepareMdlForReuse( - * IN PMDL Mdl) + * _In_ PMDL Mdl) */ #define MmPrepareMdlForReuse(_Mdl) \ { \

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