Ros-diffs April 2008

ros-diffs@reactos.org

21 participants
395 discussions

[jimtabor] 32874: BroadcastSystemMessage: - Implement User half only. - Introduce example use for NtUserMessageCall. - IntBroadcastSystemMessage is based on Wine LGPL implementation http://www.winehq.org/pipermail/wine-cvs/2008-April/042051.html . - Wine testing needed to be change by adding message range parameter check. The range was from 0 to -1 and check for resulting errors that conformed to XP. - Need to move BROADCASTPARM to include/X/X/ntuser.h or other after Dr. Timo finishes header rea

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Apr 5 13:05:11 2008 New Revision: 32874 URL: http://svn.reactos.org/svn/reactos?rev=32874&view=rev Log: BroadcastSystemMessage: - Implement User half only. - Introduce example use for NtUserMessageCall. - IntBroadcastSystemMessage is based on Wine LGPL implementation http://www.winehq.org/pipermail/wine-cvs/2008-April/042051.html . - Wine testing needed to be change by adding message range parameter check. The range was from 0 to -1 and check for resulting errors that conformed to XP. - Need to move BROADCASTPARM to include/X/X/ntuser.h or other after Dr. Timo finishes header realignment. Modified: trunk/reactos/dll/win32/user32/misc/stubs.c trunk/reactos/dll/win32/user32/windows/message.c Modified: trunk/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] Sat Apr 5 13:05:11 2008 @@ -34,40 +34,6 @@ /* * @unimplemented */ -long -STDCALL -BroadcastSystemMessageA( - DWORD dwFlags, - LPDWORD lpdwRecipients, - UINT uiMessage, - WPARAM wParam, - LPARAM lParam) -{ - UNIMPLEMENTED; - return 0; -} - - -/* - * @unimplemented - */ -long -STDCALL -BroadcastSystemMessageW( - DWORD dwFlags, - LPDWORD lpdwRecipients, - UINT uiMessage, - WPARAM wParam, - LPARAM lParam) -{ - UNIMPLEMENTED; - return 0; -} - - -/* - * @unimplemented - */ int STDCALL GetMouseMovePointsEx( @@ -357,23 +323,6 @@ */ LONG STDCALL -BroadcastSystemMessageExW( - DWORD dwflags, - LPDWORD lpdwRecipients, - UINT uiMessage, - WPARAM wParam, - LPARAM lParam, - PBSMINFO pBSMInfo) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -LONG -STDCALL CsrBroadcastSystemMessageExW( DWORD dwflags, LPDWORD lpdwRecipients, @@ -404,23 +353,6 @@ /* * @unimplemented */ -LONG -STDCALL -BroadcastSystemMessageExA( - DWORD dwflags, - LPDWORD lpdwRecipients, - UINT uiMessage, - WPARAM wParam, - LPARAM lParam, - PBSMINFO pBSMInfo) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ BOOL STDCALL AlignRects(LPRECT rect, DWORD b, DWORD c, DWORD d) Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Sat Apr 5 13:05:11 2008 @@ -2559,3 +2559,136 @@ msg.wParam = map_wparam_AtoW( msg.message, msg.wParam ); return IsDialogMessageW( hwndDlg, &msg ); } + +typedef struct _BROADCASTPARM +{ + DWORD flags; + LPDWORD recipients; +} BROADCASTPARM, *PBROADCASTPARM; + +LONG +STDCALL +IntBroadcastSystemMessage( + DWORD dwflags, + LPDWORD lpdwRecipients, + UINT uiMessage, + WPARAM wParam, + LPARAM lParam, + PBSMINFO pBSMInfo, + BOOL Ansi) +{ + BROADCASTPARM parm; + DWORD recips = BSM_ALLCOMPONENTS; + BOOL ret = TRUE; + static const DWORD all_flags = ( BSF_QUERY | BSF_IGNORECURRENTTASK | BSF_FLUSHDISK | BSF_NOHANG + | BSF_POSTMESSAGE | BSF_FORCEIFHUNG | BSF_NOTIMEOUTIFNOTHUNG + | BSF_ALLOWSFW | BSF_SENDNOTIFYMESSAGE | BSF_RETURNHDESK | BSF_LUID ); + + if (dwflags & ~all_flags) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if(uiMessage >= WM_USER && uiMessage < 0xC000) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (!lpdwRecipients) + lpdwRecipients = &recips; + + if ( pBSMInfo && dwflags & BSF_QUERY ) + { + if (pBSMInfo->cbSize != sizeof(BSMINFO)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + FIXME("Not returning PBSMINFO information yet\n"); + } + + parm.flags = dwflags; + parm.recipients = lpdwRecipients; + + if (*lpdwRecipients & BSM_APPLICATIONS) + { + return NtUserMessageCall(GetDesktopWindow(), + uiMessage, + wParam, + lParam, + (ULONG_PTR)&parm, + NUMC_BROADCASTSYSTEMMESSAGE, + Ansi); + } + else + { + FIXME("Recipients %08x not supported!\n", *lpdwRecipients); + } + + return ret; +} + +/* + * @implemented + */ +LONG +STDCALL +BroadcastSystemMessageA( + DWORD dwFlags, + LPDWORD lpdwRecipients, + UINT uiMessage, + WPARAM wParam, + LPARAM lParam) +{ + return IntBroadcastSystemMessage( dwFlags, lpdwRecipients, uiMessage, wParam, lParam, NULL, TRUE ); +} + +/* + * @implemented + */ +LONG +STDCALL +BroadcastSystemMessageW( + DWORD dwFlags, + LPDWORD lpdwRecipients, + UINT uiMessage, + WPARAM wParam, + LPARAM lParam) +{ + return IntBroadcastSystemMessage( dwFlags, lpdwRecipients, uiMessage, wParam, lParam, NULL, FALSE ); +} + +/* + * @implemented + */ +LONG +STDCALL +BroadcastSystemMessageExA( + DWORD dwflags, + LPDWORD lpdwRecipients, + UINT uiMessage, + WPARAM wParam, + LPARAM lParam, + PBSMINFO pBSMInfo) +{ + return IntBroadcastSystemMessage( dwflags, lpdwRecipients, uiMessage, wParam, lParam , pBSMInfo, TRUE ); +} + +/* + * @implemented + */ +LONG +STDCALL +BroadcastSystemMessageExW( + DWORD dwflags, + LPDWORD lpdwRecipients, + UINT uiMessage, + WPARAM wParam, + LPARAM lParam, + PBSMINFO pBSMInfo) +{ + return IntBroadcastSystemMessage( dwflags, lpdwRecipients, uiMessage, wParam, lParam , pBSMInfo, FALSE ); +} +

16 years, 8 months

[janderwald] 32873: - use GetTickCount64 over GetSystemTime as the time reported has more reasonable values :)

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Apr 5 08:46:41 2008 New Revision: 32873 URL: http://svn.reactos.org/svn/reactos?rev=32873&view=rev Log: - use GetTickCount64 over GetSystemTime as the time reported has more reasonable values :) Modified: trunk/reactos/dll/cpl/ncpa/ncpa.c Modified: trunk/reactos/dll/cpl/ncpa/ncpa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.c?rev=32… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/ncpa.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/ncpa.c [iso-8859-1] Sat Apr 5 08:46:41 2008 @@ -551,9 +551,7 @@ if (pIfRow->dwIndex == pGlobalData->pCurrentAdapterInfo->Index) { DWORD DurationSeconds; - SYSTEMTIME SystemTime; - FILETIME SystemFileTime; - ULARGE_INTEGER LargeSystemTime; + ULONGLONG Ticks; PktsOut = pIfRow->dwOutOctets; PktsIn = pIfRow->dwInOctets; @@ -561,11 +559,8 @@ OperStatus = pIfRow->dwOperStatus; /* TODO: For some unknown reason, this doesn't correspond to the Windows duration */ - GetSystemTime(&SystemTime); - SystemTimeToFileTime(&SystemTime, &SystemFileTime); - LargeSystemTime = *(ULARGE_INTEGER *)&SystemFileTime; - LargeSystemTime.QuadPart /= 100000ULL; - DurationSeconds = ((LargeSystemTime.LowPart - pIfRow->dwLastChange) / 100); + Ticks = GetTickCount64(); + DurationSeconds = Ticks / 1000; TimeConnected.wSecond = (DurationSeconds % 60); TimeConnected.wMinute = (DurationSeconds / 60) % 60; TimeConnected.wHour = (DurationSeconds / (60 * 60)) % 24;

16 years, 8 months

[cfinck] 32872: - Prepend $IP, when including RosCMS files, so we always have the correct directory path - Comment out the settings for locally testing the Wiki in "LocalSettings.php", I accidentally enabled them

by cfinck＠svn.reactos.org

Author: cfinck Date: Sat Apr 5 08:08:30 2008 New Revision: 32872 URL: http://svn.reactos.org/svn/reactos?rev=32872&view=rev Log: - Prepend $IP, when including RosCMS files, so we always have the correct directory path - Comment out the settings for locally testing the Wiki in "LocalSettings.php", I accidentally enabled them Modified: trunk/web/reactos.org/htdocs/wiki/LocalSettings.php trunk/web/reactos.org/htdocs/wiki/includes/SpecialUserlogin.php trunk/web/reactos.org/htdocs/wiki/includes/User.php Modified: trunk/web/reactos.org/htdocs/wiki/LocalSettings.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/wiki/LocalS… ============================================================================== --- trunk/web/reactos.org/htdocs/wiki/LocalSettings.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/wiki/LocalSettings.php [iso-8859-1] Sat Apr 5 08:08:30 2008 @@ -67,14 +67,17 @@ $wgEnotifWatchlist = true; # UPO $wgEmailAuthentication = false; -//require_once("/web/reactos.org/config/wiki-connect.php"); -$wgDBserver = "localhost"; +// For the server +require_once("/web/reactos.org/config/wiki-connect.php"); + +// For local testing +/*$wgDBserver = "localhost"; $wgDBname = "roswiki"; $wgDBuser = "rosuser"; $wgDBpassword = "roscms"; $wgDBprefix = ""; $wgDBtype = "mysql"; -$wgDBport = "5432"; +$wgDBport = "5432";*/ # Experimental charset support for MySQL 4.1/5.0. $wgDBmysql5 = false; Modified: trunk/web/reactos.org/htdocs/wiki/includes/SpecialUserlogin.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/wiki/includ… ============================================================================== --- trunk/web/reactos.org/htdocs/wiki/includes/SpecialUserlogin.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/wiki/includes/SpecialUserlogin.php [iso-8859-1] Sat Apr 5 08:08:30 2008 @@ -4,7 +4,7 @@ * @addtogroup SpecialPage */ -require_once( '../roscms/inc/subsys_login.php' ); +require_once("$IP/../roscms/inc/subsys_login.php"); /** * constructor Modified: trunk/web/reactos.org/htdocs/wiki/includes/User.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/wiki/includ… ============================================================================== --- trunk/web/reactos.org/htdocs/wiki/includes/User.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/wiki/includes/User.php [iso-8859-1] Sat Apr 5 08:08:30 2008 @@ -4,7 +4,7 @@ * */ -require_once( "../roscms/inc/subsys_login.php" ); +require_once("$IP/../roscms/inc/subsys_login.php"); # Number of characters in user_token field define( 'USER_TOKEN_LENGTH', 32 );

16 years, 8 months

[cfinck] 32871: - Replace the absolute path to the config file by a relative one (the absolute one doesn't work anymore) - Remove a broken link to the Bugzilla docs from the index page.

by cfinck＠svn.reactos.org

Author: cfinck Date: Sat Apr 5 06:29:24 2008 New Revision: 32871 URL: http://svn.reactos.org/svn/reactos?rev=32871&view=rev Log: - Replace the absolute path to the config file by a relative one (the absolute one doesn't work anymore) - Remove a broken link to the Bugzilla docs from the index page. Modified: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Constants.pm trunk/web/reactos.org/htdocs/bugzilla/template/en/default/index.html.tmpl Modified: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Constants.pm URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/Bu… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Constants.pm [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Constants.pm [iso-8859-1] Sat Apr 5 06:29:24 2008 @@ -413,7 +413,7 @@ } # Set this to "localconfig" if you want to run the Bugzilla locally - $localconfig = "/web/reactos.org/config/bugzilla-config"; + $localconfig = "../../config/bugzilla-config"; # We have to return absolute paths for mod_perl. # That means that if you modify these paths, they must be absolute paths. Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/index.html.tmpl URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/te… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/template/en/default/index.html.tmpl [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/bugzilla/template/en/default/index.html.tmpl [iso-8859-1] Sat Apr 5 06:29:24 2008 @@ -105,11 +105,7 @@ Welcome to [% terms.Bugzilla %]. To see what's new in this version of [% terms.Bugzilla %], see the - <a href="page.cgi?id=release-notes.html">release notes</a>! - You may also want to read the - <a href="[% Param('docs_urlbase') FILTER html %]using.html"> - [%- terms.Bugzilla %] User's Guide</a> to find out more about - [%+ terms.Bugzilla %] and how to use it. + <a href="page.cgi?id=release-notes.html">release notes</a>! Most common actions: <ul>

16 years, 8 months

[janderwald] 32870: - sorry again...

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Apr 5 06:03:55 2008 New Revision: 32870 URL: http://svn.reactos.org/svn/reactos?rev=32870&view=rev Log: - sorry again... Modified: trunk/reactos/dll/cpl/ncpa/tcpip_properties.c Modified: trunk/reactos/dll/cpl/ncpa/tcpip_properties.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/tcpip_propert… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/tcpip_properties.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/tcpip_properties.c [iso-8859-1] Sat Apr 5 06:03:55 2008 @@ -26,7 +26,7 @@ #include "resource.h" #include "ncpa.h" -#define NDEBUG + #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(ncpa); @@ -163,7 +163,7 @@ DlgData->DhcpEnabled = (BST_CHECKED == IsDlgButtonChecked(Dlg, IDC_USEDHCP)); if (! DlgData->DhcpEnabled) { -// DhcpReleaseIpAddressLease( DlgData->AdapterIndex ); + DhcpReleaseIpAddressLease( DlgData->AdapterIndex ); if (4 != SendMessageW(GetDlgItem(Dlg, IDC_IPADDR), IPM_GETADDRESS, 0, (LPARAM) &IpAddress)) { @@ -185,8 +185,8 @@ } else { DlgData->Gateway = htonl(IpAddress); } -// DhcpStaticRefreshParams -// ( DlgData->AdapterIndex, DlgData->IpAddress, DlgData->SubnetMask ); + DhcpStaticRefreshParams + ( DlgData->AdapterIndex, DlgData->IpAddress, DlgData->SubnetMask ); RowToRem.dwForwardMask = 0; RowToRem.dwForwardMetric1 = 1; @@ -204,7 +204,7 @@ DlgData->IpAddress = INADDR_NONE; DlgData->SubnetMask = INADDR_NONE; DlgData->Gateway = INADDR_NONE; -// DhcpLeaseIpAddress( DlgData->AdapterIndex ); + DhcpLeaseIpAddress( DlgData->AdapterIndex ); } if (BST_CHECKED == IsDlgButtonChecked(Dlg, IDC_FIXEDDNS)) {

16 years, 8 months

[janderwald] 32869: - change statistics to display number of bytes received / send instead of number of packets - dont show a decimal seperator

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Apr 5 06:00:29 2008 New Revision: 32869 URL: http://svn.reactos.org/svn/reactos?rev=32869&view=rev Log: - change statistics to display number of bytes received / send instead of number of packets - dont show a decimal seperator Modified: trunk/reactos/dll/cpl/ncpa/lang/bg-BG.rc trunk/reactos/dll/cpl/ncpa/lang/cs-CZ.rc trunk/reactos/dll/cpl/ncpa/lang/da-DK.rc trunk/reactos/dll/cpl/ncpa/lang/de-DE.rc trunk/reactos/dll/cpl/ncpa/lang/el-GR.rc trunk/reactos/dll/cpl/ncpa/lang/en-US.rc trunk/reactos/dll/cpl/ncpa/lang/fr-FR.rc trunk/reactos/dll/cpl/ncpa/lang/hu-HU.rc trunk/reactos/dll/cpl/ncpa/lang/id-ID.rc trunk/reactos/dll/cpl/ncpa/lang/it-IT.rc trunk/reactos/dll/cpl/ncpa/lang/ja-JP.rc trunk/reactos/dll/cpl/ncpa/lang/nb-NO.rc trunk/reactos/dll/cpl/ncpa/lang/nl-NL.rc trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc trunk/reactos/dll/cpl/ncpa/lang/ru-RU.rc trunk/reactos/dll/cpl/ncpa/lang/sv-SE.rc trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc trunk/reactos/dll/cpl/ncpa/ncpa.c trunk/reactos/dll/cpl/ncpa/tcpip_properties.c Modified: trunk/reactos/dll/cpl/ncpa/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/bg-BG.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/bg-BG.rc [iso-8859-1] Sat Apr 5 06:00:29 2008 @@ -46,7 +46,7 @@ ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "Ïîëó÷åíî", -1, 149, 90, 37, 8 - LTEXT "Ïàêåòè:", -1, 17, 115, 32, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 Modified: trunk/reactos/dll/cpl/ncpa/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/cs-CZ.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/cs-CZ.rc [iso-8859-1] Sat Apr 5 06:00:29 2008 @@ -46,7 +46,7 @@ ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "Pøijato", -1, 149, 90, 37, 8 - LTEXT "Paketù:", -1, 17, 115, 32, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 Modified: trunk/reactos/dll/cpl/ncpa/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/da-DK.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/da-DK.rc [iso-8859-1] Sat Apr 5 06:00:29 2008 @@ -46,7 +46,7 @@ ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT " Modtaget", -1, 149, 90, 37, 8 - LTEXT "Netværks pakker:", -1, 73, 115, 44, 8 + LTEXT "Bytes:", -1, 73, 115, 44, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 117, 108, 21, 20 RTEXT "000.000.000", IDC_RECEIVED, 134, 115, 44, 8 Modified: trunk/reactos/dll/cpl/ncpa/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/de-DE.rc [iso-8859-1] Sat Apr 5 06:00:29 2008 @@ -46,7 +46,7 @@ ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "Empfangen", -1, 149, 90, 37, 8 - LTEXT "Pakete:", -1, 17, 115, 32, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 Modified: trunk/reactos/dll/cpl/ncpa/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/el-GR.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/el-GR.rc [iso-8859-1] Sat Apr 5 06:00:29 2008 @@ -46,7 +46,7 @@ ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "ÅëÞöèçóáí", -1, 149, 90, 37, 8 - LTEXT "ÐáêÝôá:", -1, 17, 115, 32, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 Modified: trunk/reactos/dll/cpl/ncpa/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/en-US.rc [iso-8859-1] Sat Apr 5 06:00:29 2008 @@ -46,7 +46,7 @@ ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "Received", -1, 149, 90, 37, 8 - LTEXT "Packets:", -1, 17, 115, 32, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 Modified: trunk/reactos/dll/cpl/ncpa/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/fr-FR.rc [iso-8859-1] Sat Apr 5 06:00:29 2008 @@ -46,7 +46,7 @@ ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "Reçus", -1, 149, 90, 37, 8 - LTEXT "Paquets :", -1, 17, 115, 32, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 Modified: trunk/reactos/dll/cpl/ncpa/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/hu-HU.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/hu-HU.rc [iso-8859-1] Sat Apr 5 06:00:29 2008 @@ -47,7 +47,7 @@ ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "Beérkezett", -1, 149, 90, 37, 8 - LTEXT "Csomagok:", -1, 17, 115, 32, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 Modified: trunk/reactos/dll/cpl/ncpa/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/id-ID.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/id-ID.rc [iso-8859-1] Sat Apr 5 06:00:29 2008 @@ -46,7 +46,7 @@ ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "Diterima", -1, 149, 90, 37, 8 - LTEXT "Paket:", -1, 17, 115, 32, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 Modified: trunk/reactos/dll/cpl/ncpa/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/it-IT.rc [iso-8859-1] Sat Apr 5 06:00:29 2008 @@ -46,7 +46,7 @@ ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "Ricevuti", -1, 149, 90, 37, 8 - LTEXT "Pacchetti:", -1, 17, 115, 32, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 Modified: trunk/reactos/dll/cpl/ncpa/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/ja-JP.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/ja-JP.rc [iso-8859-1] Sat Apr 5 06:00:29 2008 @@ -46,7 +46,7 @@ ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "óM", -1, 149, 90, 37, 8 - LTEXT "pPbg:", -1, 17, 115, 32, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 Modified: trunk/reactos/dll/cpl/ncpa/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/nb-NO.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/nb-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/nb-NO.rc [iso-8859-1] Sat Apr 5 06:00:29 2008 @@ -46,7 +46,7 @@ ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "Received", -1, 149, 90, 37, 8 - LTEXT "Packets:", -1, 17, 115, 32, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 Modified: trunk/reactos/dll/cpl/ncpa/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/nl-NL.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/nl-NL.rc [iso-8859-1] Sat Apr 5 06:00:29 2008 @@ -46,7 +46,7 @@ ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "Ontvangen", -1, 149, 90, 37, 8 - LTEXT "Pakketten:", -1, 17, 115, 32, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 Modified: trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc [iso-8859-1] Sat Apr 5 06:00:29 2008 @@ -55,7 +55,7 @@ ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "Odebrano", -1, 149, 90, 37, 8 - LTEXT "Pakietów:", -1, 17, 115, 32, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 Modified: trunk/reactos/dll/cpl/ncpa/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/ru-RU.rc [iso-8859-1] Sat Apr 5 06:00:29 2008 @@ -46,7 +46,7 @@ ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "Ïðèíÿòî", -1, 149, 90, 37, 8 - LTEXT "Ïàêåòîâ:", -1, 17, 115, 32, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 Modified: trunk/reactos/dll/cpl/ncpa/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/sv-SE.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/sv-SE.rc [iso-8859-1] Sat Apr 5 06:00:29 2008 @@ -48,7 +48,7 @@ ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "Mottaget", -1, 149, 90, 37, 8 - LTEXT "Paket:", -1, 17, 115, 32, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 Modified: trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc [iso-8859-1] Sat Apr 5 06:00:29 2008 @@ -54,7 +54,7 @@ ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "Îòðèìàíî", -1, 149, 90, 37, 8 - LTEXT "Ïàêåò³â:", -1, 17, 115, 32, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 Modified: trunk/reactos/dll/cpl/ncpa/ncpa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.c?rev=32… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/ncpa.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/ncpa.c [iso-8859-1] Sat Apr 5 06:00:29 2008 @@ -534,8 +534,9 @@ DWORD Mbps = 0; DWORD OperStatus = IF_OPER_STATUS_DISCONNECTED; PMIB_IFROW pIfRow = NULL; - TCHAR Buffer[256], LocBuffer[256]; + TCHAR Buffer[256], LocBuffer[256], szDecimalSep[3]; SYSTEMTIME TimeConnected; + NUMBERFMT fmt; memset(&TimeConnected, 0, sizeof(TimeConnected)); @@ -554,8 +555,8 @@ FILETIME SystemFileTime; ULARGE_INTEGER LargeSystemTime; - PktsOut = pIfRow->dwOutUcastPkts; - PktsIn = pIfRow->dwInUcastPkts; + PktsOut = pIfRow->dwOutOctets; + PktsIn = pIfRow->dwInOctets; Mbps = pIfRow->dwSpeed; OperStatus = pIfRow->dwOperStatus; @@ -575,12 +576,18 @@ } } + memset(&fmt, 0x0, sizeof(fmt)); + if (GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, szDecimalSep, sizeof(szDecimalSep) / sizeof(szDecimalSep[0]))) + fmt.lpThousandSep = szDecimalSep; + fmt.Grouping = 3; + fmt.lpDecimalSep = _T(""); + _stprintf(Buffer, L"%u", PktsOut); - GetNumberFormat(LOCALE_USER_DEFAULT, 0, Buffer, NULL, LocBuffer, sizeof(LocBuffer) / sizeof(LocBuffer[0])); + GetNumberFormat(LOCALE_USER_DEFAULT, 0, Buffer, &fmt, LocBuffer, sizeof(LocBuffer) / sizeof(LocBuffer[0])); SendDlgItemMessage(hwndDlg, IDC_SEND, WM_SETTEXT, 0, (LPARAM)LocBuffer); _stprintf(Buffer, L"%u", PktsIn); - GetNumberFormat(LOCALE_USER_DEFAULT, 0, Buffer, NULL, LocBuffer, sizeof(LocBuffer) / sizeof(LocBuffer[0])); + GetNumberFormat(LOCALE_USER_DEFAULT, 0, Buffer, &fmt, LocBuffer, sizeof(LocBuffer) / sizeof(LocBuffer[0])); SendDlgItemMessage(hwndDlg, IDC_RECEIVED, WM_SETTEXT, 0, (LPARAM)LocBuffer); switch (OperStatus) Modified: trunk/reactos/dll/cpl/ncpa/tcpip_properties.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/tcpip_propert… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/tcpip_properties.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/ncpa/tcpip_properties.c [iso-8859-1] Sat Apr 5 06:00:29 2008 @@ -26,7 +26,7 @@ #include "resource.h" #include "ncpa.h" - +#define NDEBUG #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(ncpa); @@ -163,7 +163,7 @@ DlgData->DhcpEnabled = (BST_CHECKED == IsDlgButtonChecked(Dlg, IDC_USEDHCP)); if (! DlgData->DhcpEnabled) { - DhcpReleaseIpAddressLease( DlgData->AdapterIndex ); +// DhcpReleaseIpAddressLease( DlgData->AdapterIndex ); if (4 != SendMessageW(GetDlgItem(Dlg, IDC_IPADDR), IPM_GETADDRESS, 0, (LPARAM) &IpAddress)) { @@ -185,8 +185,8 @@ } else { DlgData->Gateway = htonl(IpAddress); } - DhcpStaticRefreshParams - ( DlgData->AdapterIndex, DlgData->IpAddress, DlgData->SubnetMask ); +// DhcpStaticRefreshParams +// ( DlgData->AdapterIndex, DlgData->IpAddress, DlgData->SubnetMask ); RowToRem.dwForwardMask = 0; RowToRem.dwForwardMetric1 = 1; @@ -204,7 +204,7 @@ DlgData->IpAddress = INADDR_NONE; DlgData->SubnetMask = INADDR_NONE; DlgData->Gateway = INADDR_NONE; - DhcpLeaseIpAddress( DlgData->AdapterIndex ); +// DhcpLeaseIpAddress( DlgData->AdapterIndex ); } if (BST_CHECKED == IsDlgButtonChecked(Dlg, IDC_FIXEDDNS)) {

16 years, 8 months

[cfinck] 32868: Add a new "resources" directory containing source files, which don't belong to "htdocs" (all files in "htdocs" are uploaded to the Web Server) - Add SVG graphics of the icons I used for the People Map. Some were composed out of graphics of the Tango Icon Project 0.8.1. (see the Document Metadata for more details) All these graphics are licensed under CC-BY-SA 3.0. - Move the "wiki-images" directory to "resources/wiki".

by cfinck＠svn.reactos.org

16 years, 8 months

[jimtabor] 32867: Update NtUserMessageCall prototype. Used Wine message tests to track down types.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Apr 5 00:44:45 2008 New Revision: 32867 URL: http://svn.reactos.org/svn/reactos?rev=32867&view=rev Log: Update NtUserMessageCall prototype. Used Wine message tests to track down types. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sat Apr 5 00:44:45 2008 @@ -1584,16 +1584,23 @@ DWORD keyboardId, HKL dwhkl ); -DWORD +#define NUMC_SENDMESSAGE 0x02B0 +// Kernel has option to use TO or normal msg send, based on type of msg. +#define NUMC_SENDMESSAGEWTOOPTION 0x02B1 +#define NUMC_SENDMESSAGETIMEOUT 0x02B2 +#define NUMC_BROADCASTSYSTEMMESSAGE 0x02B4 +#define NUMC_SENDNOTIFYMESSAGE 0x02B7 +#define NUMC_SENDMESSAGECALLBACK 0x02B8 +LRESULT NTAPI NtUserMessageCall( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5, - DWORD Unknown6); + HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam, + ULONG_PTR ResultInfo, + DWORD dwType, // NUMC_XX types + BOOL Ansi); DWORD NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sat Apr 5 00:44:45 2008 @@ -1053,16 +1053,15 @@ END_CLEANUP; } -DWORD -STDCALL +LRESULT STDCALL NtUserMessageCall( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5, - DWORD Unknown6) + HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam, + ULONG_PTR ResultInfo, + DWORD dwType, + BOOL Ansi) { UNIMPLEMENTED

16 years, 8 months

[tkreuzer] 32866: Patch by Vytis Girdzijauskas (cman[at]cman[dot]us): make mazescr show fullscreen

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Apr 4 19:25:22 2008 New Revision: 32866 URL: http://svn.reactos.org/svn/reactos?rev=32866&view=rev Log: Patch by Vytis Girdzijauskas (cman[at]cman[dot]us): make mazescr show fullscreen Modified: trunk/rosapps/applications/screensavers/mazescr/scrnsave.c Modified: trunk/rosapps/applications/screensavers/mazescr/scrnsave.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/scrnsave.c [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/mazescr/scrnsave.c [iso-8859-1] Fri Apr 4 19:25:22 2008 @@ -118,13 +118,27 @@ } else { - hwnd = CreateWindow(APPNAME, APPNAME, - WS_VISIBLE | WS_POPUP | WS_EX_TOPMOST, - 0, 0, - GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), - HWND_DESKTOP, 0, - hInstance, NULL); - ShowWindow(hwnd, SW_SHOWMAXIMIZED); + hwnd = CreateWindowEx(WS_EX_TOPMOST, + APPNAME, + APPNAME, + WS_VISIBLE | WS_POPUP, + 0, + 0, + GetSystemMetrics(SM_CXSCREEN), + GetSystemMetrics(SM_CYSCREEN), + HWND_DESKTOP, + 0, + hInstance, + NULL); + + SetWindowPos(hwnd, + 0, + 0, + 0, + 0, + 0, + SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOSIZE | SWP_SHOWWINDOW); + ShowCursor(FALSE); fullscreen = TRUE; }

16 years, 8 months

[tkreuzer] 32865: cleanup gdiobj.c: - use small header - reorder code - replace some #if GDI_DEBUG code with macros - remove old GdiHdrXxx macros - replace some pointless inline functions with the real code - NtGdiExtGetObjectW: NTAPI -> W32KAPI APIENTRY

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Apr 4 18:35:43 2008 New Revision: 32865 URL: http://svn.reactos.org/svn/reactos?rev=32865&view=rev Log: cleanup gdiobj.c: - use small header - reorder code - replace some #if GDI_DEBUG code with macros - remove old GdiHdrXxx macros - replace some pointless inline functions with the real code - NtGdiExtGetObjectW: NTAPI -> W32KAPI APIENTRY Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Fri Apr 4 18:35:43 2008 @@ -1,26 +1,12 @@ /* - * ReactOS W32 Subsystem - * Copyright (C) 1998 - 2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * PROJECT: ReactOS win32 kernel mode subsystem + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/objects/gdiobj.c + * PURPOSE: General GDI object manipulation routines + * PROGRAMMERS: ... */ -/* - * GDIOBJ.C - GDI object manipulation routines - * - * $Id$ - */ + +/** INCLUDES ******************************************************************/ #include <w32k.h> @@ -42,22 +28,16 @@ #define GDI_HANDLE_GET_ENTRY(HandleTable, h) \ (&(HandleTable)->Entries[GDI_HANDLE_GET_INDEX((h))]) -#define GDIBdyToHdr(body) \ - ((PGDIOBJHDR)(body) - 1) -#define GDIHdrToBdy(hdr) \ - (PGDIOBJ)((PGDIOBJHDR)(hdr) + 1) - /* apparently the first 10 entries are never used in windows as they are empty */ #define RESERVE_ENTRIES_COUNT 10 -/* - * Dummy GDI Cleanup Callback - */ -static BOOL INTERNAL_CALL -GDI_CleanupDummy(PVOID ObjectBody) -{ - return TRUE; -} +#define DelayExecution() \ + DPRINT("%s:%i: Delay\n", __FILE__, __LINE__); \ + KeDelayExecutionThread(KernelMode, FALSE, &ShortDelay) + +static BOOL INTERNAL_CALL GDI_CleanupDummy(PVOID ObjectBody); + +/** GLOBALS *******************************************************************/ typedef struct { @@ -107,101 +87,7 @@ static LARGE_INTEGER ShortDelay; -#define DelayExecution() \ - DPRINT("%s:%i: Delay\n", __FILE__, __LINE__); \ - KeDelayExecutionThread(KernelMode, FALSE, &ShortDelay) - -/*! - * Allocate GDI object table. - * \param Size - number of entries in the object table. -*/ -PGDI_HANDLE_TABLE INTERNAL_CALL -GDIOBJ_iAllocHandleTable(OUT PSECTION_OBJECT *SectionObject) -{ - PGDI_HANDLE_TABLE HandleTable = NULL; - LARGE_INTEGER htSize; - UINT ObjType; - ULONG ViewSize = 0; - NTSTATUS Status; - - ASSERT(SectionObject != NULL); - - htSize.QuadPart = sizeof(GDI_HANDLE_TABLE); - - Status = MmCreateSection((PVOID*)SectionObject, - SECTION_ALL_ACCESS, - NULL, - &htSize, - PAGE_READWRITE, - SEC_COMMIT, - NULL, - NULL); - if (!NT_SUCCESS(Status)) - return NULL; - - /* FIXME - use MmMapViewInSessionSpace once available! */ - Status = MmMapViewInSystemSpace(*SectionObject, - (PVOID*)&HandleTable, - &ViewSize); - if (!NT_SUCCESS(Status)) - { - ObDereferenceObject(*SectionObject); - *SectionObject = NULL; - return NULL; - } - - RtlZeroMemory(HandleTable, sizeof(GDI_HANDLE_TABLE)); - - HandleTable->LookasideLists = ExAllocatePoolWithTag(NonPagedPool, - BASE_OBJTYPE_COUNT * sizeof(PAGED_LOOKASIDE_LIST), - TAG_GDIHNDTBLE); - if (HandleTable->LookasideLists == NULL) - { - MmUnmapViewInSystemSpace(HandleTable); - ObDereferenceObject(*SectionObject); - *SectionObject = NULL; - return NULL; - } - - for (ObjType = 0; ObjType < BASE_OBJTYPE_COUNT; ObjType++) - { - if (ObjTypeInfo[ObjType].bUseLookaside) - { - ExInitializePagedLookasideList(HandleTable->LookasideLists + ObjType, - NULL, - NULL, - 0, - ObjTypeInfo[ObjType].ulBodySize, - ObjTypeInfo[ObjType].Tag, - 0); - } - } - - ShortDelay.QuadPart = -5000LL; /* FIXME - 0.5 ms? */ - - HandleTable->FirstFree = 0; - HandleTable->FirstUnused = RESERVE_ENTRIES_COUNT; - - return HandleTable; -} - -static __inline PPAGED_LOOKASIDE_LIST -FindLookasideList(ULONG TypeIndex) -{ - return GdiHandleTable->LookasideLists + TypeIndex; -} - -static __inline BOOL -RunCleanupCallback(PGDIOBJ pObj, ULONG TypeIndex) -{ - return ((GDICLEANUPPROC)ObjTypeInfo[TypeIndex].CleanupProc)(pObj); -} - -static __inline ULONG -GetObjectSize(ULONG TypeIndex) -{ - return ObjTypeInfo[TypeIndex].ulBodySize; -} +/** DEBUGGING *****************************************************************/ #ifdef GDI_DEBUG @@ -325,9 +211,15 @@ CaptureStackBackTace((PVOID*)GDIHandleAllocator[index], GDI_STACK_LEVELS); #define GDIDBG_CAPTURELOCKER(index) \ CaptureStackBackTace((PVOID*)GDIHandleLocker[index], GDI_STACK_LEVELS); - #define GDIDBG_DUMPHANDLETABLE() \ IntDumpHandleTable(GdiHandleTable) +#define GDIDBG_INITLOOPTRACE() \ + ULONG Attempts = 0; +#define GDIDBG_TRACELOOP(Handle, PrevThread, Thread) \ + if ((++Attempts % 20) == 0) \ + { \ + DPRINT1("[%d] Handle 0x%p Locked by 0x%x (we're 0x%x)\n", Attempts, Handle, PrevThread, Thread); \ + } #else @@ -337,9 +229,96 @@ #define GDIDBG_CAPTUREALLOCATOR(index) #define GDIDBG_CAPTURELOCKER(index) #define GDIDBG_DUMPHANDLETABLE() +#define GDIDBG_INITLOOPTRACE() +#define GDIDBG_TRACELOOP(Handle, PrevThread, Thread) #endif /* GDI_DEBUG */ + +/** INTERNAL FUNCTIONS ********************************************************/ + +/* + * Dummy GDI Cleanup Callback + */ +static BOOL INTERNAL_CALL +GDI_CleanupDummy(PVOID ObjectBody) +{ + return TRUE; +} + +/*! + * Allocate GDI object table. + * \param Size - number of entries in the object table. +*/ +PGDI_HANDLE_TABLE INTERNAL_CALL +GDIOBJ_iAllocHandleTable(OUT PSECTION_OBJECT *SectionObject) +{ + PGDI_HANDLE_TABLE HandleTable = NULL; + LARGE_INTEGER htSize; + UINT ObjType; + ULONG ViewSize = 0; + NTSTATUS Status; + + ASSERT(SectionObject != NULL); + + htSize.QuadPart = sizeof(GDI_HANDLE_TABLE); + + Status = MmCreateSection((PVOID*)SectionObject, + SECTION_ALL_ACCESS, + NULL, + &htSize, + PAGE_READWRITE, + SEC_COMMIT, + NULL, + NULL); + if (!NT_SUCCESS(Status)) + return NULL; + + /* FIXME - use MmMapViewInSessionSpace once available! */ + Status = MmMapViewInSystemSpace(*SectionObject, + (PVOID*)&HandleTable, + &ViewSize); + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(*SectionObject); + *SectionObject = NULL; + return NULL; + } + + RtlZeroMemory(HandleTable, sizeof(GDI_HANDLE_TABLE)); + + HandleTable->LookasideLists = ExAllocatePoolWithTag(NonPagedPool, + BASE_OBJTYPE_COUNT * sizeof(PAGED_LOOKASIDE_LIST), + TAG_GDIHNDTBLE); + if (HandleTable->LookasideLists == NULL) + { + MmUnmapViewInSystemSpace(HandleTable); + ObDereferenceObject(*SectionObject); + *SectionObject = NULL; + return NULL; + } + + for (ObjType = 0; ObjType < BASE_OBJTYPE_COUNT; ObjType++) + { + if (ObjTypeInfo[ObjType].bUseLookaside) + { + ExInitializePagedLookasideList(HandleTable->LookasideLists + ObjType, + NULL, + NULL, + 0, + ObjTypeInfo[ObjType].ulBodySize, + ObjTypeInfo[ObjType].Tag, + 0); + } + } + + ShortDelay.QuadPart = -5000LL; /* FIXME - 0.5 ms? */ + + HandleTable->FirstFree = 0; + HandleTable->FirstUnused = RESERVE_ENTRIES_COUNT; + + return HandleTable; +} static void FASTCALL LockErrorDebugOutput(HGDIOBJ hObj, PGDI_TABLE_ENTRY Entry, LPSTR Function) @@ -491,9 +470,8 @@ POBJ newObject = NULL; HANDLE CurrentProcessId, LockedProcessId; UCHAR TypeIndex; -#ifdef GDI_DEBUG - ULONG Attempts = 0; -#endif + + GDIDBG_INITLOOPTRACE(); W32Process = PsGetCurrentProcessWin32Process(); /* HACK HACK HACK: simplest-possible quota implementation - don't allow a process @@ -519,7 +497,7 @@ CurrentProcessId = PsGetCurrentProcessId(); LockedProcessId = (HANDLE)((ULONG_PTR)CurrentProcessId | 0x1); -// RtlZeroMemory(newObject, GetObjectSize(TypeIndex)); +// RtlZeroMemory(newObject, ObjTypeInfo[TypeIndex].ulBodySize); /* On Windows the higher 16 bit of the type field don't contain the full type from the handle, but the base type. @@ -573,12 +551,7 @@ } else { -#ifdef GDI_DEBUG - if (++Attempts > 20) - { - DPRINT1("[%d]Waiting on handle in index 0x%x\n", Attempts, Index); - } -#endif + GDIDBG_TRACELOOP(Index, PrevProcId, CurrentProcessId); /* damn, someone is trying to lock the object even though it doesn't even exist anymore, wait a little and try again! FIXME - we shouldn't loop forever! Give up after some time! */ @@ -647,9 +620,8 @@ HANDLE ProcessId, LockedProcessId, PrevProcId; ULONG HandleType, HandleUpper, TypeIndex; BOOL Silent; -#ifdef GDI_DEBUG - ULONG Attempts = 0; -#endif + + GDIDBG_INITLOOPTRACE(); DPRINT("GDIOBJ_FreeObj: hObj: 0x%08x\n", hObj); @@ -719,7 +691,7 @@ /* call the cleanup routine. */ TypeIndex = GDI_OBJECT_GET_TYPE_INDEX(HandleType); - Ret = RunCleanupCallback(Object, TypeIndex); + Ret = ObjTypeInfo[TypeIndex].CleanupProc(Object); /* Now it's time to free the memory */ GDIOBJ_FreeObj(Object, TypeIndex); @@ -745,12 +717,8 @@ } else if (PrevProcId == LockedProcessId) { -#ifdef GDI_DEBUG - if (++Attempts > 20) - { - DPRINT1("[%d]Waiting on 0x%x\n", Attempts, hObj); - } -#endif + GDIDBG_TRACELOOP(hObj, PrevProcId, ProcessId); + /* the object is currently locked, wait some time and try again. FIXME - we shouldn't loop forever! Give up after some time! */ DelayExecution(); @@ -1201,9 +1169,8 @@ HANDLE ProcessId, LockedProcessId, PrevProcId; PW32THREAD Thread; HGDIOBJ hObj; -#ifdef GDI_DEBUG - ULONG Attempts = 0; -#endif + + GDIDBG_INITLOOPTRACE(); ASSERT(phObj); hObj = *phObj; @@ -1287,12 +1254,8 @@ } else { -#ifdef GDI_DEBUG - if (++Attempts > 20) - { - DPRINT1("[%d]Locked by 0x%x (we're 0x%x)\n", Attempts, PrevThread, Thread); - } -#endif + GDIDBG_TRACELOOP(hObj, PrevThread, Thread); + /* WTF?! The object is already locked by a different thread! Release the lock, wait a bit and try again! FIXME - we should give up after some time unless we want to wait forever! */ @@ -1310,12 +1273,8 @@ } else if (PrevProcId == LockedProcessId) { -#ifdef GDI_DEBUG - if (++Attempts > 20) - { - DPRINT1("[%d]Waiting on 0x%x\n", Attempts, hObj); - } -#endif + GDIDBG_TRACELOOP(hObj, PrevProcId, ProcessId); + /* the object is currently locked, wait some time and try again. FIXME - we shouldn't loop forever! Give up after some time! */ DelayExecution(); @@ -1337,9 +1296,8 @@ PGDI_TABLE_ENTRY Entry; HANDLE ProcessId, LockedProcessId, PrevProcId; PW32THREAD Thread; -#ifdef GDI_DEBUG - ULONG Attempts = 0; -#endif + + GDIDBG_INITLOOPTRACE(); DPRINT("GDIOBJ_SetOwnership: hObj: 0x%x, NewProcess: 0x%x\n", ObjectHandle, (NewOwner ? PsGetProcessId(NewOwner) : 0)); @@ -1408,12 +1366,8 @@ } else { -#ifdef GDI_DEBUG - if (++Attempts > 20) - { - DPRINT1("[%d]Locked by 0x%x (we're 0x%x)\n", Attempts, PrevThread, Thread); - } -#endif + GDIDBG_TRACELOOP(ObjectHandle, PrevThread, Thread); + /* WTF?! The object is already locked by a different thread! Release the lock, wait a bit and try again! DO reset the pid lock so we make sure we don't access invalid memory in case the object is @@ -1434,12 +1388,8 @@ } else if (PrevProcId == LockedProcessId) { -#ifdef GDI_DEBUG - if (++Attempts > 20) - { - DPRINT1("[%d]Waiting on 0x%x\n", Attempts, ObjectHandle); - } -#endif + GDIDBG_TRACELOOP(ObjectHandle, PrevProcId, ProcessId); + /* the object is currently locked, wait some time and try again. FIXME - we shouldn't loop forever! Give up after some time! */ DelayExecution(); @@ -1470,9 +1420,8 @@ PGDI_TABLE_ENTRY FromEntry; PW32THREAD Thread; HANDLE FromProcessId, FromLockedProcessId, FromPrevProcId; -#ifdef GDI_DEBUG - ULONG Attempts = 0; -#endif + + GDIDBG_INITLOOPTRACE(); DPRINT("GDIOBJ_CopyOwnership: from: 0x%x, to: 0x%x\n", CopyFrom, CopyTo); @@ -1524,12 +1473,8 @@ } else { -#ifdef GDI_DEBUG - if (++Attempts > 20) - { - DPRINT1("[%d]Locked by 0x%x (we're 0x%x)\n", Attempts, PrevThread, Thread); - } -#endif + GDIDBG_TRACELOOP(CopyFrom, PrevThread, Thread); + /* WTF?! The object is already locked by a different thread! Release the lock, wait a bit and try again! DO reset the pid lock so we make sure we don't access invalid memory in case the object is @@ -1549,12 +1494,8 @@ } else if (FromPrevProcId == FromLockedProcessId) { -#ifdef GDI_DEBUG - if (++Attempts > 20) - { - DPRINT1("[%d]Waiting on 0x%x\n", Attempts, CopyFrom); - } -#endif + GDIDBG_TRACELOOP(CopyFrom, FromPrevProcId, FromProcessId); + /* the object is currently locked, wait some time and try again. FIXME - we shouldn't loop forever! Give up after some time! */ DelayExecution(); @@ -1605,6 +1546,8 @@ return MappedView; } + +/** PUBLIC FUNCTIONS **********************************************************/ W32KAPI HANDLE @@ -1716,8 +1659,9 @@ return Result; } +W32KAPI INT -NTAPI +APIENTRY NtGdiExtGetObjectW(IN HANDLE hGdiObj, IN INT cbCount, OUT LPVOID lpBuffer)

16 years, 8 months

← Newer
1
...
30
31
32
33
34
35
36
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2008