Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 27455: TrackMouseEvent remove some hard code value, thuse value are now in win32k, it is either full implement, or partly implement TrackMouseEventProc remove some hard code value, thuse value are now in win32k, it is either full implement, or partly implement
by greatlrd＠svn.reactos.org 07 Jul '07

07 Jul '07

Author: greatlrd Date: Sat Jul 7 22:23:09 2007 New Revision: 27455 URL: http://svn.reactos.org/svn/reactos?rev=27455&view=rev Log: TrackMouseEvent remove some hard code value, thuse value are now in win32k, it is either full implement, or partly implement TrackMouseEventProc remove some hard code value, thuse value are now in win32k, it is either full implement, or partly implement Modified: trunk/reactos/dll/win32/user32/windows/input.c Modified: trunk/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/input.c (original) +++ trunk/reactos/dll/win32/user32/windows/input.c Sat Jul 7 22:23:09 2007 @@ -686,16 +686,8 @@ GetCursorPos(&pos); hwnd = WindowFromPoint(pos); - /* FIXME WIN32k does not support SPI_GETMOUSEHOVERWIDTH and SPI_GETMOUSEHOVERHEIGHT - * SystemParametersInfoW(SPI_GETMOUSEHOVERWIDTH, 0, &hoverwidth, 0); - * SystemParametersInfoW(SPI_GETMOUSEHOVERHEIGHT, 0, &hoverheight, 0); - */ - - /* FIXME hack until win32k support SPI_GETMOUSEHOVERWIDTH and SPI_GETMOUSEHOVERHEIGHT - * it take care of some program that does not working - */ - hoverwidth = 4; - hoverheight = 4; + SystemParametersInfoW(SPI_GETMOUSEHOVERWIDTH, 0, &hoverwidth, 0); + SystemParametersInfoW(SPI_GETMOUSEHOVERHEIGHT, 0, &hoverheight, 0); /* see if this tracking event is looking for TME_LEAVE and that the */ /* mouse has left the window */ @@ -846,12 +838,7 @@ /* if HOVER_DEFAULT was specified replace this with the systems current value */ if (hover_time == HOVER_DEFAULT || hover_time == 0) { - /* FIXME SPI_GETMOUSEHOVERTIME are not implement in win32k - * SystemParametersInfoW(SPI_GETMOUSEHOVERTIME, 0, &hover_time, 0); - */ - - /* FIXME Hack until SPI_GETMOUSEHOVERTIME are implement some program need this being set to working */ - hover_time = 400; + SystemParametersInfoW(SPI_GETMOUSEHOVERTIME, 0, &hover_time, 0); } GetCursorPos(&pos);

1 0

[greatlrd] 27454: patch from Yaroslav Ponomarenko yarryp at gmail dot com implement pointers MouseSpeed, CursorAccelerationInfo.FirstThreshold , CursorAccelerationInfo.SecondThreshold, CursorAccelerationInfo.Acceleration, MouseHoverTime, MouseHoverWidth, MouseHoverHeight for SPI_SETMOUSEHOVERTIME, SPI_SETMOUSEHOVERWIDTH, SPI_SETMOUSEHOVERHEIGHT, SPI_SETMOUSE, SPI_SETMOUSESPEED. WARING : Some of them are not 100% support in win32k for they are need be fill in from the mouse drv and send them to t
by greatlrd＠svn.reactos.org 07 Jul '07

07 Jul '07

Author: greatlrd Date: Sat Jul 7 22:17:03 2007 New Revision: 27454 URL: http://svn.reactos.org/svn/reactos?rev=27454&view=rev Log: patch from Yaroslav Ponomarenko yarryp at gmail dot com implement pointers MouseSpeed, CursorAccelerationInfo.FirstThreshold , CursorAccelerationInfo.SecondThreshold, CursorAccelerationInfo.Acceleration, MouseHoverTime, MouseHoverWidth, MouseHoverHeight for SPI_SETMOUSEHOVERTIME, SPI_SETMOUSEHOVERWIDTH, SPI_SETMOUSEHOVERHEIGHT, SPI_SETMOUSE, SPI_SETMOUSESPEED. WARING : Some of them are not 100% support in win32k for they are need be fill in from the mouse drv and send them to the mouse drv as well, this part are not done yet. Modified: trunk/reactos/subsystems/win32/win32k/include/cursoricon.h trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/subsystems/win32/win32k/include/cursoricon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/cursoricon.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/cursoricon.h Sat Jul 7 22:17:03 2007 @@ -31,6 +31,13 @@ UINT Bottom; } CURSORCLIP_INFO, *PCURSORCLIP_INFO; +typedef struct _CURSORACCELERATION_INFO +{ + UINT FirstThreshold; + UINT SecondThreshold; + UINT Acceleration; +} CURSORACCELERATION_INFO, *PCURSORACCELERATION_INFO; + typedef struct _SYSTEM_CURSORINFO { BOOL Enabled; @@ -44,6 +51,14 @@ UINT DblClickSpeed; UINT DblClickWidth; UINT DblClickHeight; + + UINT MouseHoverTime; + UINT MouseHoverWidth; + UINT MouseHoverHeight; + + UINT MouseSpeed; + CURSORACCELERATION_INFO CursorAccelerationInfo; + DWORD LastBtnDown; LONG LastBtnDownX; LONG LastBtnDownY; @@ -72,3 +87,4 @@ /* EOF */ + Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Sat Jul 7 22:17:03 2007 @@ -900,6 +900,7 @@ } } + ULONG FASTCALL IntSystemParametersInfo( UINT uiAction, @@ -961,6 +962,11 @@ case SPI_SETSCREENSAVERRUNNING: case SPI_SETSCREENSAVETIMEOUT: case SPI_SETFLATMENU: + case SPI_SETMOUSEHOVERTIME: + case SPI_SETMOUSEHOVERWIDTH: + case SPI_SETMOUSEHOVERHEIGHT: + case SPI_SETMOUSE: + case SPI_SETMOUSESPEED: /* We will change something, so set the flag here */ bChanged = TRUE; case SPI_GETDESKWALLPAPER: @@ -970,6 +976,11 @@ case SPI_GETSCREENSAVETIMEOUT: case SPI_GETSCREENSAVEACTIVE: case SPI_GETFLATMENU: + case SPI_GETMOUSEHOVERTIME: + case SPI_GETMOUSEHOVERWIDTH: + case SPI_GETMOUSEHOVERHEIGHT: + case SPI_GETMOUSE: + case SPI_GETMOUSESPEED: { PSYSTEM_CURSORINFO CurInfo; @@ -1041,6 +1052,60 @@ /* FIXME limit the maximum time to 1000 ms? */ CurInfo->DblClickSpeed = uiParam; break; + case SPI_GETMOUSEHOVERTIME: + CurInfo = IntGetSysCursorInfo(WinStaObject); + *((UINT*)pvParam) = CurInfo->MouseHoverTime; + break; + case SPI_SETMOUSEHOVERTIME: + CurInfo = IntGetSysCursorInfo(WinStaObject); + CurInfo->MouseHoverTime = uiParam; + if(CurInfo->MouseHoverTime < USER_TIMER_MINIMUM) + { + CurInfo->MouseHoverTime = USER_TIMER_MINIMUM; + } + /* FIXME limit the maximum time to 1000 ms? */ + break; + case SPI_GETMOUSEHOVERWIDTH: + CurInfo = IntGetSysCursorInfo(WinStaObject); + *(PUINT)pvParam = CurInfo->MouseHoverWidth; + break; + case SPI_GETMOUSEHOVERHEIGHT: + CurInfo = IntGetSysCursorInfo(WinStaObject); + *(PUINT)pvParam = CurInfo->MouseHoverHeight; + break; + case SPI_SETMOUSEHOVERWIDTH: + CurInfo = IntGetSysCursorInfo(WinStaObject); + CurInfo->MouseHoverWidth = uiParam; + break; + case SPI_SETMOUSEHOVERHEIGHT: + CurInfo = IntGetSysCursorInfo(WinStaObject); + CurInfo->MouseHoverHeight = uiParam; + break; + case SPI_SETMOUSE: + CurInfo = IntGetSysCursorInfo(WinStaObject); + CurInfo->CursorAccelerationInfo = *(PCURSORACCELERATION_INFO)pvParam; + break; + case SPI_GETMOUSE: + CurInfo = IntGetSysCursorInfo(WinStaObject); + *(PCURSORACCELERATION_INFO)pvParam = CurInfo->CursorAccelerationInfo; + break; + case SPI_SETMOUSESPEED: + CurInfo = IntGetSysCursorInfo(WinStaObject); + CurInfo->MouseSpeed = uiParam; + /* Limit value to 1...20 range */ + if(CurInfo->MouseSpeed < 1) + { + CurInfo->MouseSpeed = 1; + } + else if(CurInfo->MouseSpeed > 20) + { + CurInfo->MouseSpeed = 20; + } + break; + case SPI_GETMOUSESPEED: + CurInfo = IntGetSysCursorInfo(WinStaObject); + *(PUINT)pvParam = CurInfo->MouseSpeed; + break; case SPI_SETDESKWALLPAPER: { /* This function expects different parameters than the user mode version! @@ -1374,7 +1439,7 @@ PVOID pvParam, UINT fWinIni) { - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; switch(uiAction) { @@ -1385,9 +1450,57 @@ case SPI_SETFONTSMOOTHING: case SPI_SETFOCUSBORDERHEIGHT: case SPI_SETFOCUSBORDERWIDTH: + case SPI_SETMOUSEHOVERTIME: + case SPI_SETMOUSEHOVERWIDTH: + case SPI_SETMOUSEHOVERHEIGHT: + case SPI_SETMOUSESPEED: { return (DWORD)IntSystemParametersInfo(uiAction, uiParam, pvParam, fWinIni); } + case SPI_SETMOUSE: + { + CURSORACCELERATION_INFO CursorAccelerationInfo; + _SEH_TRY + { + ProbeForRead(pvParam, sizeof( CURSORACCELERATION_INFO ), 1); + RtlCopyMemory(&CursorAccelerationInfo,pvParam,sizeof(CURSORACCELERATION_INFO)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return( FALSE); + } + return IntSystemParametersInfo(uiAction, uiParam, &CursorAccelerationInfo, fWinIni); + } + case SPI_GETMOUSE: + { + CURSORACCELERATION_INFO CursorAccelerationInfo; + if(!IntSystemParametersInfo(uiAction, uiParam, &CursorAccelerationInfo, fWinIni)) + { + return( FALSE); + } + _SEH_TRY + { + ProbeForWrite(pvParam, sizeof( CURSORACCELERATION_INFO ), 1); + RtlCopyMemory(pvParam,&CursorAccelerationInfo,sizeof(CURSORACCELERATION_INFO)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return( FALSE); + } + return( TRUE); + } case SPI_SETWORKAREA: { RECT rc; @@ -1430,22 +1543,33 @@ case SPI_GETSCREENSAVEACTIVE: case SPI_GETFLATMENU: case SPI_SETFLATMENU: - { - BOOL Ret; - - if(!IntSystemParametersInfo(uiAction, uiParam, &Ret, fWinIni)) - { - return( FALSE); - } - - Status = MmCopyToCaller(pvParam, &Ret, sizeof(BOOL)); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return( FALSE); - } - return( TRUE); - } + case SPI_GETMOUSEHOVERHEIGHT: + case SPI_GETMOUSEHOVERWIDTH: + case SPI_GETMOUSEHOVERTIME: + case SPI_GETMOUSESPEED: + { + UINT Ret; + if(!IntSystemParametersInfo(uiAction, uiParam, &Ret, fWinIni)) + { + return( FALSE); + } + _SEH_TRY + { + ProbeForWrite(pvParam, sizeof(UINT ), 1); + *(PUINT)pvParam = Ret; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return( FALSE); + } + return( TRUE); + } case SPI_SETDESKWALLPAPER: { /* !!! As opposed to the user mode version this version accepts a handle Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Sat Jul 7 22:17:03 2007 @@ -521,17 +521,23 @@ CurInfo->WheelScroLines = 3; CurInfo->WheelScroChars = 3; - - /* FIXME: Obtain the following information from the registry */ CurInfo->SwapButtons = FALSE; CurInfo->DblClickSpeed = 500; CurInfo->DblClickWidth = 4; CurInfo->DblClickHeight = 4; - WindowStationObject->SystemCursor = CurInfo; - - + CurInfo->MouseSpeed = 10; + CurInfo->CursorAccelerationInfo.FirstThreshold = 6; + CurInfo->CursorAccelerationInfo.SecondThreshold = 10; + CurInfo->CursorAccelerationInfo.Acceleration = 1; + + CurInfo->MouseHoverTime = 80; + CurInfo->MouseHoverWidth = 4; + CurInfo->MouseHoverHeight = 4; + + WindowStationObject->SystemCursor = CurInfo; + if (!IntSetupClipboard(WindowStationObject)) { DPRINT1("WindowStation: Error Setting up the clipboard!!!\n");

1 0

[fireball] 27453: - Temporarily remove buslogic.sys from 1st stage too. It'll be reincluded once scsiport.sys is fixed.
by fireball＠svn.reactos.org 07 Jul '07

07 Jul '07

Author: fireball Date: Sat Jul 7 22:00:11 2007 New Revision: 27453 URL: http://svn.reactos.org/svn/reactos?rev=27453&view=rev Log: - Temporarily remove buslogic.sys from 1st stage too. It'll be reincluded once scsiport.sys is fixed. Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Sat Jul 7 22:00:11 2007 @@ -452,8 +452,8 @@ return; /* Load buslogic.sys (depends on hardware detection) */ - if (!LoadDriver(SourcePath, "buslogic.sys")) - return; + //if (!LoadDriver(SourcePath, "buslogic.sys")) + //return; /* Load class2.sys */ if (!LoadDriver(SourcePath, "class2.sys"))

1 0

[cfinck] 27452: Partly commit the patch from bug #2358
by cfinck＠svn.reactos.org 07 Jul '07

07 Jul '07

Author: cfinck Date: Sat Jul 7 18:50:10 2007 New Revision: 27452 URL: http://svn.reactos.org/svn/reactos?rev=27452&view=rev Log: Partly commit the patch from bug #2358 Modified: trunk/rosapps/downloader/translations/en.rc Modified: trunk/rosapps/downloader/translations/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/translations/en… ============================================================================== --- trunk/rosapps/downloader/translations/en.rc (original) +++ trunk/rosapps/downloader/translations/en.rc Sat Jul 7 18:50:10 2007 @@ -28,7 +28,7 @@ IDS_CHOOSE_BOTH "Please choose a subcategory or an application." IDS_XMLERROR_1 "Could not find the xml file !" IDS_XMLERROR_2 "Could not parse the xml file !" - IDS_DOWNLOAD_ERROR "Unable to download the file.\nPlease check you internet connection." + IDS_DOWNLOAD_ERROR "Unable to download the file.\nPlease check your internet connection." IDS_VERSION "Version: " IDS_LICENCE "Licence: " IDS_MAINTAINER "Maintainer: "

1 0

[cfinck] 27451: - Show the number of found files - Add and change some localization strings - Output error messages of "ajax-getfiles-provider.php" also as XML. This prevents syntax error messages in the XML interpreters of some browsers (like Firefox), which have no bad influence, but show up in the error log anyway - Replace the <button> tag with an <input> tag, this looks better in Konqueror and probably other browsers as well :-)
by cfinck＠svn.reactos.org 07 Jul '07

07 Jul '07

Author: cfinck Date: Sat Jul 7 16:43:00 2007 New Revision: 27451 URL: http://svn.reactos.org/svn/reactos?rev=27451&view=rev Log: - Show the number of found files - Add and change some localization strings - Output error messages of "ajax-getfiles-provider.php" also as XML. This prevents syntax error messages in the XML interpreters of some browsers (like Firefox), which have no bad influence, but show up in the error log anyway - Replace the <button> tag with an <input> tag, this looks better in Konqueror and probably other browsers as well :-) Modified: trunk/web/reactos.org/htdocs/getbuilds/ajax-getfiles-provider.php trunk/web/reactos.org/htdocs/getbuilds/getbuilds.css trunk/web/reactos.org/htdocs/getbuilds/getbuilds.js.php trunk/web/reactos.org/htdocs/getbuilds/index.php trunk/web/reactos.org/htdocs/getbuilds/lang/de.inc.php trunk/web/reactos.org/htdocs/getbuilds/lang/en.inc.php Modified: trunk/web/reactos.org/htdocs/getbuilds/ajax-getfiles-provider.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/a… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/ajax-getfiles-provider.php (original) +++ trunk/web/reactos.org/htdocs/getbuilds/ajax-getfiles-provider.php Sat Jul 7 16:43:00 2007 @@ -36,11 +36,13 @@ // Entry point + header("Content-type: text/xml"); + if( !isset( $_GET["get"] ) || !isset( $_GET["startrev"] ) ) - die("Necessary information not specified!"); + die("<error><message>Necessary information not specified!</message></error>"); if( $_GET["endrev"] - $_GET["startrev"] > $REV_RANGE_LIMIT ) - die("Maximum revision range limit of $REV_RANGE_LIMIT exceeded!"); + die( "<error><message>LIMIT</message><limit>$REV_RANGE_LIMIT</limit></error>" ); switch( $_GET["get"] ) { @@ -58,7 +60,7 @@ break; default: - die("Wrong input for parameter 'get'!"); + die("<error><message>Wrong input for parameter 'get'!</message></error>"); } $file_patterns = array(); @@ -71,16 +73,15 @@ if( $_GET["livecd-rel"] == 1 ) $file_patterns[] = "#livecd-[0-9]+-rel#"; - header("Content-type: text/xml"); - echo "<fileinformation>"; - $exitloop = false; $filenum = 0; $firstrev = 0; $lastrev = 0; $morefiles = 0; - $dir = opendir( $ISO_DIR ) or die("opendir failed!"); + $dir = opendir( $ISO_DIR ) or die("<error><message>opendir failed!</message></error>"); + echo "<fileinformation>"; + while( $fname = readdir($dir) ) if( preg_match( "#-([0-9]+)-#", $fname, $matches ) ) $fnames[ $matches[1] ][] = $fname; Modified: trunk/web/reactos.org/htdocs/getbuilds/getbuilds.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/g… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/getbuilds.css (original) +++ trunk/web/reactos.org/htdocs/getbuilds/getbuilds.css Sat Jul 7 16:43:00 2007 @@ -75,13 +75,17 @@ margin-bottom: 2em; } -#controlbox button { +#controlbox input { font-weight: bold; } #ajaxloadinginfo { font-weight: bold; margin-left: 20px; +} + +#infotable { + width: 100%; } #pagesbox { Modified: trunk/web/reactos.org/htdocs/getbuilds/getbuilds.js.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/g… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/getbuilds.js.php (original) +++ trunk/web/reactos.org/htdocs/getbuilds/getbuilds.js.php Sat Jul 7 16:43:00 2007 @@ -10,6 +10,7 @@ var currentpage; var endrev; +var filenum; var fullrange; var inputbox_startrev; var inputbox_endrev; @@ -85,20 +86,37 @@ function getfilesCallback(http_request, data) { - // "ajax-getfiles.php" always outputs text/xml data, so we have to check here if it's really XML or just an error message - if( http_request.responseText.substr(0, 1) != "<" ) - { - alert( http_request.responseText ); + // Check for an error + if( http_request.responseXML.getElementsByTagName("error").length > 0 ) + { + // For some errors, we show a localized error message + if( http_request.responseXML.getElementsByTagName("message")[0].firstChild.data == "LIMIT" ) + alert( '<?php printf( $getbuilds_langres["rangelimitexceeded"], "' + http_request.responseXML.getElementsByTagName(\"limit\")[0].firstChild.data + '" ); ?>' ); + else + alert( http_request.responseXML.getElementsByTagName("message")[0].firstChild.data ); + loadingsplash(0); return; } var html = ""; - + if( data["requesttype"] == "FirstPageFullLoad" || data["requesttype"] == "PageSwitch" ) { + html += '<table id="infotable" cellspacing="0" cellpadding="0"><tr><td id="infobox">'; + + if( data["requesttype"] == "FirstPageFullLoad" ) + { + filenum = parseInt( http_request.responseXML.getElementsByTagName("filenum")[0].firstChild.data ); + html += '<?php printf( $getbuilds_langres["foundfiles"], "<span id=\"filenum\">' + filenum + '</span>" ); ?>'; + } + else + html += document.getElementById("infobox").innerHTML; + + html += '</td>'; + // Page number boxes - html += '<div id="pagesbox">'; + html += '<td id="pagesbox">'; if( currentpage == 1 ) { @@ -123,9 +141,7 @@ html += ' - ' + http_request.responseXML.getElementsByTagName("firstrev")[0].firstChild.data + ' ... ' + http_request.responseXML.getElementsByTagName("lastrev")[0].firstChild.data + '</option>'; } else - { html += document.getElementById("pagesel").innerHTML; - } html += '</select> '; @@ -140,7 +156,7 @@ html += '<a href="javascript:lastPage()" title="<?php echo $getbuilds_langres["lastpage_title"]; ?>">»</a>'; } - html += '</div>'; + html += '</td></tr></table>'; // File table html += '<table class="datatable" cellspacing="0" cellpadding="1">'; @@ -150,7 +166,7 @@ var files = http_request.responseXML.getElementsByTagName("file"); if( files.length == 0 ) - html += '<tr class="odd"><td><?php echo $getbuilds_langres["nofiles1"]; ?>' + fullrange + '<?php echo $getbuilds_langres["nofiles2"]; ?></td><td> </td><td> </td></tr>'; + html += '<tr class="odd"><td><?php printf( $getbuilds_langres["nofiles"], "' + fullrange + '" ); ?></td><td> </td><td> </td></tr>'; else { var oddeven = false; @@ -192,6 +208,9 @@ else if( data["requesttype"] == "FirstPageAddPage" ) { pagecount++; + filenum += parseInt( http_request.responseXML.getElementsByTagName("filenum")[0].firstChild.data ); + + document.getElementById("filenum").firstChild.data = filenum; // As always, we have to work around an IE bug // If I use "innerHTML" here, the first <OPTION> start tag gets dropped in the IE... Modified: trunk/web/reactos.org/htdocs/getbuilds/index.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/i… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/index.php (original) +++ trunk/web/reactos.org/htdocs/getbuilds/index.php Sat Jul 7 16:43:00 2007 @@ -111,7 +111,7 @@ '</table>' + '<div id="controlbox">' + - '<button type="button" onclick="showRev();"><?php echo $getbuilds_langres["showrev"]; ?></button>' + + '<input type="button" onclick="showRev();" value="<?php echo $getbuilds_langres["showrev"]; ?>" />' + '<span id="ajaxloadinginfo">' + '<img src="images/ajax_loading.gif"> <?php echo $getbuilds_langres["gettinglist"]; ?>...' + Modified: trunk/web/reactos.org/htdocs/getbuilds/lang/de.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/l… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/lang/de.inc.php (original) +++ trunk/web/reactos.org/htdocs/getbuilds/lang/de.inc.php Sat Jul 7 16:43:00 2007 @@ -28,6 +28,8 @@ $getbuilds_langres["rangeinfo"] = "Sie kÃ¶nnen eine Revisionsnummer (z.B. <i>27154</i>) oder einen Revisionsbereich (z.B. <i>27000-27154</i>) eingeben."; $getbuilds_langres["isotype"] = "CD-Image-Typen anzeigen"; + $getbuilds_langres["foundfiles"] = "%s Dateien gefunden!"; + $getbuilds_langres["firstpage_title"] = "Gehe zur ersten Seite"; $getbuilds_langres["prevpage_title"] = "Vorherige Seite"; $getbuilds_langres["prevpage"] = "ZurÃ¼ck"; @@ -41,7 +43,8 @@ $getbuilds_langres["filedate"] = "Zuletzt geÃ¤ndert"; $getbuilds_langres["pleasewait"] = "Bitte warten"; - $getbuilds_langres["nofiles1"] = "FÃ¼r Revision "; - $getbuilds_langres["nofiles2"] = "gibt es keine vorkompilierten Dateien!"; + $getbuilds_langres["nofiles"] = "FÃ¼r Revision %s gibt es keine vorkompilierten Dateien!"; $getbuilds_langres["invalidrev"] = "UngÃ¼ltige Revisionsnummer!"; + + $getbuilds_langres["rangelimitexceeded"] = "Der Revisionsbereich darf maximal %s Revisionen umfassen!"; ?> Modified: trunk/web/reactos.org/htdocs/getbuilds/lang/en.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/l… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/lang/en.inc.php (original) +++ trunk/web/reactos.org/htdocs/getbuilds/lang/en.inc.php Sat Jul 7 16:43:00 2007 @@ -28,6 +28,8 @@ $getbuilds_langres["rangeinfo"] = "You can enter a revision number (e.g. <i>27154</i>) or a revision range (e.g. <i>27000-27154</i>)."; $getbuilds_langres["isotype"] = "Show CD Image types"; + $getbuilds_langres["foundfiles"] = "Found %s files!"; + $getbuilds_langres["firstpage_title"] = "Go to the first page"; $getbuilds_langres["prevpage_title"] = "Previous page"; $getbuilds_langres["prevpage"] = "Previous"; @@ -41,7 +43,8 @@ $getbuilds_langres["filedate"] = "Last changed"; $getbuilds_langres["pleasewait"] = "Please wait"; - $getbuilds_langres["nofiles1"] = "There are no prebuilt files for revision "; - $getbuilds_langres["nofiles2"] = "!"; + $getbuilds_langres["nofiles"] = "There are no prebuilt files for revision %s!"; $getbuilds_langres["invalidrev"] = "Invalid revision number!"; + + $getbuilds_langres["rangelimitexceeded"] = "The revision range can only comprise a maximum of %s revisions!"; ?>

1 0

[gedmurphy] 27450: set the address bar font to the default GUI font
by gedmurphy＠svn.reactos.org 07 Jul '07

07 Jul '07

Author: gedmurphy Date: Sat Jul 7 14:28:53 2007 New Revision: 27450 URL: http://svn.reactos.org/svn/reactos?rev=27450&view=rev Log: set the address bar font to the default GUI font Modified: trunk/reactos/base/applications/regedit/childwnd.c Modified: trunk/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/childwnd.c (original) +++ trunk/reactos/base/applications/regedit/childwnd.c Sat Jul 7 14:28:53 2007 @@ -313,6 +313,7 @@ case WM_CREATE: { WNDPROC oldproc; + HFONT hFont; TCHAR buffer[MAX_PATH]; /* load "My Computer" string */ LoadString(hInst, IDS_MY_COMPUTER, buffer, sizeof(buffer)/sizeof(TCHAR)); @@ -329,6 +330,16 @@ pChildWnd->hTreeWnd = CreateTreeView(hWnd, pChildWnd->szPath, (HMENU) TREE_WINDOW); pChildWnd->hListWnd = CreateListView(hWnd, (HMENU) LIST_WINDOW/*, pChildWnd->szPath*/); SetFocus(pChildWnd->hTreeWnd); + + /* set the address bar font */ + if (pChildWnd->hAddressBarWnd) + { + hFont = (HFONT)GetStockObject(DEFAULT_GUI_FONT); + SendMessage(pChildWnd->hAddressBarWnd, + WM_SETFONT, + (WPARAM)hFont, + 0); + } /* Subclass the AddressBar */ oldproc = (WNDPROC)(LONG_PTR)GetWindowLongPtr(pChildWnd->hAddressBarWnd, GWL_WNDPROC);

1 0

[cwittich] 27449: -check for already defined NDEBUG to be able to build the driver with PREfast
by cwittich＠svn.reactos.org 07 Jul '07

07 Jul '07

Author: cwittich Date: Sat Jul 7 14:23:09 2007 New Revision: 27449 URL: http://svn.reactos.org/svn/reactos?rev=27449&view=rev Log: -check for already defined NDEBUG to be able to build the driver with PREfast Modified: trunk/reactos/drivers/base/beep/beep.c Modified: trunk/reactos/drivers/base/beep/beep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/beep/beep.c?r… ============================================================================== --- trunk/reactos/drivers/base/beep/beep.c (original) +++ trunk/reactos/drivers/base/beep/beep.c Sat Jul 7 14:23:09 2007 @@ -11,7 +11,9 @@ #include <ntddk.h> #include <ntddbeep.h> +#ifndef NDEBUG #define NDEBUG +#endif #include <debug.h> /* TYPES *********************************************************************/

1 0

[fireball] 27448: - Disable BusLogic driver until scsiport fully supports it. - Do NOT keep VMWare Tools CD mounted after 2nd stage, or you'll get vmscsi.sys installed, which is not supported yet either!
by fireball＠svn.reactos.org 07 Jul '07

07 Jul '07

Author: fireball Date: Sat Jul 7 14:13:04 2007 New Revision: 27448 URL: http://svn.reactos.org/svn/reactos?rev=27448&view=rev Log: - Disable BusLogic driver until scsiport fully supports it. - Do NOT keep VMWare Tools CD mounted after 2nd stage, or you'll get vmscsi.sys installed, which is not supported yet either! Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Sat Jul 7 14:13:04 2007 @@ -489,7 +489,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Group",0x00000000,"SCSI Miniport" HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","ImagePath",0x00020000,"system32\drivers\buslogic.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Start",0x00010001,0x00000004 HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Type",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Tag",0x00010001,0x00000020

1 0

[gedmurphy] 27447: - fixes / improvements to regedit, see bug 2356 for details - patch by carlo bramix (carlo.bramix at libero it) - it should be noted that import_registry_file needs more work to support unicode files
by gedmurphy＠svn.reactos.org 07 Jul '07

07 Jul '07

Author: gedmurphy Date: Sat Jul 7 14:09:24 2007 New Revision: 27447 URL: http://svn.reactos.org/svn/reactos?rev=27447&view=rev Log: - fixes / improvements to regedit, see bug 2356 for details - patch by carlo bramix (carlo.bramix at libero it) - it should be noted that import_registry_file needs more work to support unicode files Modified: trunk/reactos/base/applications/regedit/childwnd.c trunk/reactos/base/applications/regedit/lang/en-US.rc trunk/reactos/base/applications/regedit/lang/it-IT.rc trunk/reactos/base/applications/regedit/lang/pt-PT.rc trunk/reactos/base/applications/regedit/listview.c trunk/reactos/base/applications/regedit/regproc.c trunk/reactos/base/applications/regedit/security.c Modified: trunk/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/childwnd.c (original) +++ trunk/reactos/base/applications/regedit/childwnd.c Sat Jul 7 14:09:24 2007 @@ -67,13 +67,18 @@ static void ResizeWnd(ChildWnd* pChildWnd, int cx, int cy) { HDWP hdwp = BeginDeferWindowPos(2); - RECT rt; + RECT rt, rs; + SetRect(&rt, 0, 0, cx, cy); - + cy = 0; + if (hStatusBar != NULL) { + GetWindowRect(hStatusBar, &rs); + cy = rs.bottom - rs.top + 8; + } cx = pChildWnd->nSplitPos + SPLIT_WIDTH/2; DeferWindowPos(hdwp, pChildWnd->hAddressBarWnd, 0, rt.left, rt.top, rt.right-rt.left, 23, SWP_NOZORDER|SWP_NOACTIVATE); - DeferWindowPos(hdwp, pChildWnd->hTreeWnd, 0, rt.left, rt.top + 25, pChildWnd->nSplitPos-SPLIT_WIDTH/2-rt.left, rt.bottom-rt.top - 30, SWP_NOZORDER|SWP_NOACTIVATE); - DeferWindowPos(hdwp, pChildWnd->hListWnd, 0, rt.left+cx , rt.top + 25, rt.right-cx, rt.bottom-rt.top, SWP_NOZORDER|SWP_NOACTIVATE); + DeferWindowPos(hdwp, pChildWnd->hTreeWnd, 0, rt.left, rt.top + 25, pChildWnd->nSplitPos-SPLIT_WIDTH/2-rt.left, rt.bottom-rt.top-cy, SWP_NOZORDER|SWP_NOACTIVATE); + DeferWindowPos(hdwp, pChildWnd->hListWnd, 0, rt.left+cx , rt.top + 25, rt.right-cx, rt.bottom-rt.top-cy, SWP_NOZORDER|SWP_NOACTIVATE); EndDeferWindowPos(hdwp); } @@ -274,6 +279,17 @@ break; } return CallWindowProc(oldwndproc, hwnd, uMsg, wParam, lParam); +} + +/* fix coords to top-left when SHIFT-F10 is pressed */ +void FixPointIfContext(POINTS *pt, HWND hWnd) +{ + if (pt->x == -1 && pt->y == -1) { + POINT p = { 0, 0 }; + ClientToScreen(hWnd, &p); + pt->x = (WORD)(p.x); + pt->y = (WORD)(p.y); + } } /******************************************************************************* @@ -527,6 +543,7 @@ pt = MAKEPOINTS(lParam); cnt = ListView_GetSelectedCount(pChildWnd->hListWnd); i = ListView_GetNextItem(pChildWnd->hListWnd, -1, LVNI_FOCUSED | LVNI_SELECTED); + FixPointIfContext(&pt, pChildWnd->hListWnd); if(i == -1) { TrackPopupMenu(GetSubMenu(hPopupMenus, PM_NEW), TPM_RIGHTBUTTON, pt.x, pt.y, 0, hFrameWnd, NULL); @@ -566,7 +583,7 @@ ScreenToClient(pChildWnd->hTreeWnd, &hti.pt); (void)TreeView_HitTest(pChildWnd->hTreeWnd, &hti); - if ((hti.flags & TVHT_ONITEM) != 0) + if ((hti.flags & TVHT_ONITEM) != 0 || (pt.x == -1 && pt.y == -1)) { hContextMenu = GetSubMenu(hPopupMenus, PM_TREECONTEXT); (void)TreeView_SelectItem(pChildWnd->hTreeWnd, hti.hItem); @@ -627,7 +644,7 @@ s += _tcslen(s) + 1; } } - + FixPointIfContext(&pt, pChildWnd->hTreeWnd); TrackPopupMenu(hContextMenu, TPM_RIGHTBUTTON, pt.x, pt.y, 0, pChildWnd->hWnd, NULL); } } Modified: trunk/reactos/base/applications/regedit/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/en-US.rc (original) +++ trunk/reactos/base/applications/regedit/lang/en-US.rc Sat Jul 7 14:09:24 2007 @@ -135,6 +135,8 @@ MENUITEM "&String Value", ID_EDIT_NEW_STRINGVALUE MENUITEM "&Binary Value", ID_EDIT_NEW_BINARYVALUE MENUITEM "&DWORD Value", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Multi-String Value", ID_EDIT_NEW_MULTISTRINGVALUE + MENUITEM "&Expandable String Value", ID_EDIT_NEW_EXPANDABLESTRINGVALUE END END POPUP "" @@ -147,6 +149,8 @@ MENUITEM "&String Value", ID_EDIT_NEW_STRINGVALUE MENUITEM "&Binary Value", ID_EDIT_NEW_BINARYVALUE MENUITEM "&DWORD Value", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Multi-String Value", ID_EDIT_NEW_MULTISTRINGVALUE + MENUITEM "&Expandable String Value", ID_EDIT_NEW_EXPANDABLESTRINGVALUE END MENUITEM "&Find", ID_EDIT_FIND MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/regedit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/regedit/lang/it-IT.rc Sat Jul 7 14:09:24 2007 @@ -131,13 +131,17 @@ END POPUP "" BEGIN - POPUP "&Nuova" + POPUP "&Nuovo" BEGIN MENUITEM "&Chiave", ID_EDIT_NEW_KEY MENUITEM SEPARATOR - MENUITEM "&Stringa", ID_EDIT_NEW_STRINGVALUE - MENUITEM "Valore &binario", ID_EDIT_NEW_BINARYVALUE - MENUITEM "Valore &DWORD", ID_EDIT_NEW_DWORDVALUE + MENUITEM "Valore &stringa", ID_EDIT_NEW_STRINGVALUE + MENUITEM "Valore &binario", ID_EDIT_NEW_BINARYVALUE + MENUITEM "Valore &DWORD", ID_EDIT_NEW_DWORDVALUE + MENUITEM "Valore &multi-stringa", ID_EDIT_NEW_MULTISTRINGVALUE + + MENUITEM "Valore stringa &espandibile", ID_EDIT_NEW_EXPANDABLESTRINGVALUE + END END POPUP "" @@ -147,9 +151,13 @@ BEGIN MENUITEM "&Chiave", ID_EDIT_NEW_KEY MENUITEM SEPARATOR - MENUITEM "&Stringa", ID_EDIT_NEW_STRINGVALUE - MENUITEM "Valore &binario", ID_EDIT_NEW_BINARYVALUE - MENUITEM "Valore &DWORD", ID_EDIT_NEW_DWORDVALUE + MENUITEM "Valore &stringa", ID_EDIT_NEW_STRINGVALUE + MENUITEM "Valore &binario", ID_EDIT_NEW_BINARYVALUE + MENUITEM "Valore &DWORD", ID_EDIT_NEW_DWORDVALUE + MENUITEM "Valore &multi-stringa", ID_EDIT_NEW_MULTISTRINGVALUE + + MENUITEM "Valore stringa &espandibile", ID_EDIT_NEW_EXPANDABLESTRINGVALUE + END MENUITEM "&Trova", ID_EDIT_FIND MENUITEM SEPARATOR @@ -175,11 +183,11 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Nome:",IDC_STATIC,5,5,119,8 - EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | WS_DISABLED + EDITTEXT IDC_VALUE_NAME,5,15,239,12,ES_AUTOHSCROLL | ES_READONLY LTEXT "Dati:",IDC_STATIC,5,30,119,8 - EDITTEXT IDC_VALUE_DATA,5,40,200,12, WS_BORDER | WS_TABSTOP - DEFPUSHBUTTON "OK",IDOK,140,60,30,11,WS_GROUP - DEFPUSHBUTTON "Annulla",IDCANCEL,175,60,30,11,WS_GROUP + EDITTEXT IDC_VALUE_DATA,5,40,239,12 + DEFPUSHBUTTON "OK",IDOK,142,64,50,14,WS_GROUP + PUSHBUTTON "Annulla",IDCANCEL,196,64,50,14,WS_GROUP END IDD_EDIT_MULTI_STRING DIALOG 32, 24, 252, 174 @@ -191,7 +199,9 @@ LTEXT "&Name:",IDC_STATIC,6,6,134,8 EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY LTEXT "&Dati:",IDC_STATIC,6,35,161,8 - EDITTEXT IDC_VALUE_DATA,6,46,240,102,ES_AUTOHSCROLL | ES_MULTILINE | ES_WANTRETURN | ES_AUTOVSCROLL | WS_VSCROLL + EDITTEXT IDC_VALUE_DATA,6,46,240,102,ES_MULTILINE | + ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN | + WS_VSCROLL DEFPUSHBUTTON "OK",IDOK,142,154,50,14 PUSHBUTTON "Annulla",IDCANCEL,196,154,50,14 END Modified: trunk/reactos/base/applications/regedit/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pt-PT.rc (original) +++ trunk/reactos/base/applications/regedit/lang/pt-PT.rc Sat Jul 7 14:09:24 2007 @@ -137,7 +137,7 @@ LTEXT "Dados do valor:",IDC_STATIC,5,30,119,8 EDITTEXT IDC_VALUE_DATA,5,40,200,12, WS_BORDER | WS_TABSTOP DEFPUSHBUTTON "OK",IDOK,140,60,30,11,WS_GROUP - DEFPUSHBUTTON "Cancelar",IDCANCEL,175,60,30,11,WS_GROUP + PUSHBUTTON "Cancelar",IDCANCEL,175,60,30,11,WS_GROUP END /* Modified: trunk/reactos/base/applications/regedit/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/listview.c (original) +++ trunk/reactos/base/applications/regedit/listview.c Sat Jul 7 14:09:24 2007 @@ -42,52 +42,38 @@ static DWORD g_columnToSort = ~0UL; static BOOL g_invertSort = FALSE; -static LPTSTR g_valueName; #define MAX_LIST_COLUMNS (IDS_LIST_COLUMN_LAST - IDS_LIST_COLUMN_FIRST + 1) -static int default_column_widths[MAX_LIST_COLUMNS] = { 200, 175, 400 }; -static int column_alignment[MAX_LIST_COLUMNS] = { LVCFMT_LEFT, LVCFMT_LEFT, LVCFMT_LEFT }; +static const int default_column_widths[MAX_LIST_COLUMNS] = { 200, 175, 400 }; +static const int column_alignment[MAX_LIST_COLUMNS] = { LVCFMT_LEFT, LVCFMT_LEFT, LVCFMT_LEFT }; LPCTSTR GetValueName(HWND hwndLV, int iStartAt) { int item; - size_t len, maxLen; - LPTSTR newStr; LVITEM LVItem; PLINE_INFO lineinfo; - if (!g_valueName) g_valueName = HeapAlloc(GetProcessHeap(), 0, 1024); - if (!g_valueName) return NULL; - *g_valueName = 0; - maxLen = HeapSize(GetProcessHeap(), 0, g_valueName); - if (maxLen == -1) return NULL; - + /* + if a new item is inserted, then no allocation, + otherwise the heap block will be lost! + */ item = ListView_GetNextItem(hwndLV, iStartAt, LVNI_SELECTED); if (item == -1) return NULL; + + /* + Should be always TRUE anyways + */ + LVItem.iItem = item; + LVItem.iSubItem = 0; LVItem.mask = LVIF_PARAM; - LVItem.iItem = item; - for(;;) - { - if(ListView_GetItem(hwndLV, &LVItem)) - { - lineinfo = (PLINE_INFO)LVItem.lParam; - if(!lineinfo->name) - { - *g_valueName = 0; - return g_valueName; - } - len = _tcslen(lineinfo->name); - if (len < maxLen - 1) break; - newStr = HeapReAlloc(GetProcessHeap(), 0, g_valueName, maxLen * 2); - if (!newStr) return NULL; - g_valueName = newStr; - maxLen *= 2; - } - else + if (ListView_GetItem(hwndLV, &LVItem) == FALSE) + return NULL; + + lineinfo = (PLINE_INFO)LVItem.lParam; + if (lineinfo == NULL) return NULL; - } - memcpy(g_valueName, lineinfo->name, sizeof(TCHAR) * (len + 1)); - return g_valueName; + + return lineinfo->name; } BOOL IsDefaultValue(HWND hwndLV, int i) @@ -110,11 +96,11 @@ */ static void AddEntryToList(HWND hwndLV, LPTSTR Name, DWORD dwValType, void* ValBuf, DWORD dwCount, int Position, BOOL ValExists) { - LINE_INFO* linfo; + PLINE_INFO linfo; LVITEM item; int index; - linfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LINE_INFO) + dwCount); + linfo = (PLINE_INFO)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LINE_INFO) + dwCount); linfo->dwValType = dwValType; linfo->val_len = dwCount; if(dwCount > 0) @@ -402,69 +388,63 @@ g_pChildWnd->nFocusPanel = 0; break; case LVN_BEGINLABELEDIT: - { - PLINE_INFO lineinfo; - Info = (NMLVDISPINFO*)lParam; - if(Info) - { - lineinfo = (PLINE_INFO)Info->item.lParam; + Info = (NMLVDISPINFO*)lParam; + if(Info) + { + PLINE_INFO lineinfo = (PLINE_INFO)Info->item.lParam; if(!lineinfo->name || !_tcscmp(lineinfo->name, _T(""))) { - *Result = TRUE; + *Result = TRUE; } else { - *Result = FALSE; - } - } - else + *Result = FALSE; + } + } + else *Result = TRUE; - return TRUE; - } + return TRUE; case LVN_ENDLABELEDIT: - { - PLINE_INFO lineinfo; - Info = (NMLVDISPINFO*)lParam; - if(Info && Info->item.pszText) - { - lineinfo = (PLINE_INFO)Info->item.lParam; + Info = (NMLVDISPINFO*)lParam; + if(Info && Info->item.pszText) + { + PLINE_INFO lineinfo = (PLINE_INFO)Info->item.lParam; if(!lineinfo->name || !_tcscmp(lineinfo->name, _T(""))) { - *Result = FALSE; + *Result = FALSE; } else { - //if((ret = RenameValue(lineinfo->name, Info->item.pszText)) != ERROR_SUCCESS) - { - TCHAR msg[128], caption[128]; - - LoadString(hInst, IDS_ERR_RENVAL_CAPTION, caption, sizeof(caption)/sizeof(TCHAR)); - if(_tcslen(Info->item.pszText) == 0) - { - LoadString(hInst, IDS_ERR_RENVAL_TOEMPTY, msg, sizeof(msg)/sizeof(TCHAR)); - MessageBox(0, msg, NULL, 0); - *Result = TRUE; - } - else - { - HKEY hKeyRoot; - LPCTSTR keyPath; - LONG lResult; - keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); - lResult = RegRenameValue(hKeyRoot, keyPath, Info->item.pszText, lineinfo->name); - if (lineinfo->name) - LocalFree(lineinfo->name); - lineinfo->name = _tcsdup(Info->item.pszText); - *Result = TRUE; - return (lResult == ERROR_SUCCESS); - } - } - } - } - else + if(_tcslen(Info->item.pszText) == 0) + { + TCHAR msg[128], caption[128]; + + LoadString(hInst, IDS_ERR_RENVAL_TOEMPTY, msg, sizeof(msg)/sizeof(TCHAR)); + LoadString(hInst, IDS_ERR_RENVAL_CAPTION, caption, sizeof(caption)/sizeof(TCHAR)); + MessageBox(0, msg, caption, 0); + *Result = TRUE; + } + else + { + HKEY hKeyRoot; + LPCTSTR keyPath; + LONG lResult; + + keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); + lResult = RegRenameValue(hKeyRoot, keyPath, Info->item.pszText, lineinfo->name); + lineinfo->name = realloc(lineinfo->name, (_tcslen(Info->item.pszText)+1)*sizeof(TCHAR)); + if (lineinfo->name != NULL) + _tcscpy(lineinfo->name, Info->item.pszText); + + *Result = TRUE; + return (lResult == ERROR_SUCCESS); + } + } + } + else *Result = TRUE; - return TRUE; - } + + return TRUE; } return FALSE; } @@ -493,12 +473,10 @@ return NULL; } -void DestroyListView(HWND hwndLV) { +void DestroyListView(HWND hwndLV) +{ INT count, i; LVITEM item; - - if (g_valueName) - HeapFree(GetProcessHeap(), 0, g_valueName); count = ListView_GetItemCount(hwndLV); for (i = 0; i < count; i++) { @@ -519,8 +497,6 @@ DWORD val_count; HKEY hNewKey; LONG errCode; - INT count, i; - LVITEM item; BOOL AddedDefault = FALSE; if (!hwndLV) return FALSE; @@ -528,14 +504,8 @@ (void)ListView_EditLabel(hwndLV, -1); SendMessage(hwndLV, WM_SETREDRAW, FALSE, 0); - count = ListView_GetItemCount(hwndLV); - for (i = 0; i < count; i++) { - item.mask = LVIF_PARAM; - item.iItem = i; - (void)ListView_GetItem(hwndLV, &item); - free(((LINE_INFO*)item.lParam)->name); - HeapFree(GetProcessHeap(), 0, (void*)item.lParam); - } + DestroyListView(hwndLV); + g_columnToSort = ~0UL; (void)ListView_DeleteAllItems(hwndLV); @@ -560,9 +530,12 @@ /* } */ /* dwValSize = max_val_size; */ while (RegEnumValue(hNewKey, dwIndex, ValName, &dwValNameLen, NULL, &dwValType, ValBuf, &dwValSize) == ERROR_SUCCESS) { + /* Remove unwanted path from key name */ + TCHAR *pLastBl = _tcsrchr(ValName, TEXT('\\')); + if (pLastBl != NULL) ++pLastBl; else pLastBl = ValName; /* Add a terminating 0 character. Usually this is only necessary for strings. */ ((TCHAR*)ValBuf)[dwValSize/sizeof(TCHAR)] = 0; - AddEntryToList(hwndLV, ValName, dwValType, ValBuf, dwValSize, -1, TRUE); + AddEntryToList(hwndLV, pLastBl, dwValType, ValBuf, dwValSize, -1, TRUE); dwValNameLen = max_val_name_len; dwValSize = max_val_size; dwValType = 0L; Modified: trunk/reactos/base/applications/regedit/regproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regproc.c (original) +++ trunk/reactos/base/applications/regedit/regproc.c Sat Jul 7 14:09:24 2007 @@ -696,6 +696,11 @@ line_idx++; val_name = line + line_idx; while (TRUE) { + /* check if the line is unterminated (otherwise it may loop forever!) */ + if (line[line_idx] == '\0') { + fprintf(stderr,"Warning! unrecognized line:\n%s\n", line); + return; + } else if (line[line_idx] == '\\') /* skip escaped character */ { line_idx += 2; @@ -1391,7 +1396,19 @@ FILE* reg_file = _tfopen(filename, _T("r")); if (reg_file) { - processRegLines(reg_file, doSetValue); + unsigned char ch1 = fgetc(reg_file); + unsigned char ch2 = fgetc(reg_file); + + /* detect UTF-16.LE or UTF-16.BE format */ + if ((ch1 == 0xff && ch2 == 0xfe) || + (ch1 == 0xfe && ch2 == 0xff)) { + /* TODO: implement support for UNICODE files! */ + } else { + /* restore read point to the first line */ + fseek(reg_file, 0L, SEEK_SET); + processRegLines(reg_file, doSetValue); + } + fclose(reg_file); return TRUE; } return FALSE; @@ -1850,3 +1867,4 @@ return TRUE; } + Modified: trunk/reactos/base/applications/regedit/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/security.c (original) +++ trunk/reactos/base/applications/regedit/security.c Sat Jul 7 14:09:24 2007 @@ -30,8 +30,10 @@ #endif /* FIXME: already defined in aclui.h - causing problems when compiling with MSVC/PSDK*/ +#ifndef _MSC_VER DEFINE_GUID(IID_IEffectivePermission, 0x3853dc76, 0x9f35, 0x407c, 0x0088, 0xa1,0xd1,0x93,0x44,0x36,0x5f,0xbc); DEFINE_GUID(IID_ISecurityObjectTypeInfo, 0xfc3066eb, 0x79ef, 0x444b, 0x0091, 0x11,0xd1,0x8a,0x75,0xeb,0xf2,0xfa); +#endif /****************************************************************************** Implementation of the IUnknown methods of CRegKeySecurity

1 0

[fireball] 27446: - Separate common buffer allocation routine from ScsiPortGetUncachedExtension() into SpiAllocateCommonBuffer(), along with a code reformat. - Use this function in ScsiPortInitialize() and in ScsiPortGetUncachedExtension().
by fireball＠svn.reactos.org 07 Jul '07

07 Jul '07

Author: fireball Date: Sat Jul 7 13:56:55 2007 New Revision: 27446 URL: http://svn.reactos.org/svn/reactos?rev=27446&view=rev Log: - Separate common buffer allocation routine from ScsiPortGetUncachedExtension() into SpiAllocateCommonBuffer(), along with a code reformat. - Use this function in ScsiPortInitialize() and in ScsiPortGetUncachedExtension(). Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c Sat Jul 7 13:56:55 2007 @@ -204,6 +204,10 @@ SpiHandleAttachRelease(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, PIRP Irp); +static NTSTATUS +SpiAllocateCommonBuffer(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, ULONG NonCachedSize); + + /* FUNCTIONS *****************************************************************/ @@ -599,70 +603,178 @@ IN PPORT_CONFIGURATION_INFORMATION ConfigInfo, IN ULONG NumberOfBytes) { - PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; - DEVICE_DESCRIPTION DeviceDescription; - - DPRINT("ScsiPortGetUncachedExtension(%p %p %lu)\n", - HwDeviceExtension, ConfigInfo, NumberOfBytes); - - DeviceExtension = CONTAINING_RECORD(HwDeviceExtension, - SCSI_PORT_DEVICE_EXTENSION, - MiniPortDeviceExtension); - - /* Check for allocated common DMA buffer */ - if (DeviceExtension->VirtualAddress != NULL) - { - DPRINT1("The HBA has already got a common DMA buffer!\n"); - return NULL; - } - - /* Check for DMA adapter object */ - if (DeviceExtension->AdapterObject == NULL) - { - /* Initialize DMA adapter description */ - RtlZeroMemory(&DeviceDescription, - sizeof(DEVICE_DESCRIPTION)); - DeviceDescription.Version = DEVICE_DESCRIPTION_VERSION; - DeviceDescription.Master = ConfigInfo->Master; - DeviceDescription.ScatterGather = ConfigInfo->ScatterGather; - DeviceDescription.DemandMode = ConfigInfo->DemandMode; - DeviceDescription.Dma32BitAddresses = ConfigInfo->Dma32BitAddresses; - DeviceDescription.BusNumber = ConfigInfo->SystemIoBusNumber; - DeviceDescription.DmaChannel = ConfigInfo->DmaChannel; - DeviceDescription.InterfaceType = ConfigInfo->AdapterInterfaceType; - DeviceDescription.DmaWidth = ConfigInfo->DmaWidth; - DeviceDescription.DmaSpeed = ConfigInfo->DmaSpeed; - DeviceDescription.MaximumLength = ConfigInfo->MaximumTransferLength; - DeviceDescription.DmaPort = ConfigInfo->DmaPort; - - /* Get a DMA adapter object */ - DeviceExtension->AdapterObject = HalGetAdapter(&DeviceDescription, - &DeviceExtension->MapRegisterCount); - if (DeviceExtension->AdapterObject == NULL) - { - DPRINT1("HalGetAdapter() failed\n"); - return NULL; - } - } - - /* Allocate a common DMA buffer */ - DeviceExtension->CommonBufferLength = - NumberOfBytes + DeviceExtension->SrbExtensionSize; - DeviceExtension->VirtualAddress = - HalAllocateCommonBuffer(DeviceExtension->AdapterObject, - DeviceExtension->CommonBufferLength, - &DeviceExtension->PhysicalAddress, - FALSE); - if (DeviceExtension->VirtualAddress == NULL) - { - DPRINT1("HalAllocateCommonBuffer() failed!\n"); - DeviceExtension->CommonBufferLength = 0; - return NULL; - } - - return (PVOID)((ULONG_PTR)DeviceExtension->VirtualAddress + - DeviceExtension->SrbExtensionSize); + PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; + DEVICE_DESCRIPTION DeviceDescription; + ULONG MapRegistersCount; + NTSTATUS Status; + + DPRINT("ScsiPortGetUncachedExtension(%p %p %lu)\n", + HwDeviceExtension, ConfigInfo, NumberOfBytes); + + DeviceExtension = CONTAINING_RECORD(HwDeviceExtension, + SCSI_PORT_DEVICE_EXTENSION, + MiniPortDeviceExtension); + + /* Check for allocated common DMA buffer */ + if (DeviceExtension->SrbExtensionBuffer != NULL) + { + DPRINT1("The HBA has already got a common DMA buffer!\n"); + return NULL; + } + + /* Check for DMA adapter object */ + if (DeviceExtension->AdapterObject == NULL) + { + /* Initialize DMA adapter description */ + RtlZeroMemory(&DeviceDescription, sizeof(DEVICE_DESCRIPTION)); + + DeviceDescription.Version = DEVICE_DESCRIPTION_VERSION; + DeviceDescription.Master = ConfigInfo->Master; + DeviceDescription.ScatterGather = ConfigInfo->ScatterGather; + DeviceDescription.DemandMode = ConfigInfo->DemandMode; + DeviceDescription.Dma32BitAddresses = ConfigInfo->Dma32BitAddresses; + DeviceDescription.BusNumber = ConfigInfo->SystemIoBusNumber; + DeviceDescription.DmaChannel = ConfigInfo->DmaChannel; + DeviceDescription.InterfaceType = ConfigInfo->AdapterInterfaceType; + DeviceDescription.DmaWidth = ConfigInfo->DmaWidth; + DeviceDescription.DmaSpeed = ConfigInfo->DmaSpeed; + DeviceDescription.MaximumLength = ConfigInfo->MaximumTransferLength; + DeviceDescription.DmaPort = ConfigInfo->DmaPort; + + /* Get a DMA adapter object */ + DeviceExtension->AdapterObject = + HalGetAdapter(&DeviceDescription, &MapRegistersCount); + + /* Fail in case of error */ + if (DeviceExtension->AdapterObject == NULL) + { + DPRINT1("HalGetAdapter() failed\n"); + return NULL; + } + + /* Set number of physical breaks */ + if (ConfigInfo->NumberOfPhysicalBreaks != 0 && + MapRegistersCount > ConfigInfo->NumberOfPhysicalBreaks) + { + DeviceExtension->PortCapabilities.MaximumPhysicalPages = + ConfigInfo->NumberOfPhysicalBreaks; + } + else + { + DeviceExtension->PortCapabilities.MaximumPhysicalPages = MapRegistersCount; + } + } + + /* Update auto request sense feature */ + DeviceExtension->SupportsAutoSense = ConfigInfo->AutoRequestSense; + + /* Update Srb extension size */ + if (DeviceExtension->SrbExtensionSize != ConfigInfo->SrbExtensionSize) + DeviceExtension->SrbExtensionSize = ConfigInfo->SrbExtensionSize; + + /* Update Srb extension alloc flag */ + if (ConfigInfo->AutoRequestSense || DeviceExtension->SrbExtensionSize) + DeviceExtension->NeedSrbExtensionAlloc = TRUE; + + /* Allocate a common DMA buffer */ + Status = SpiAllocateCommonBuffer(DeviceExtension, NumberOfBytes); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("SpiAllocateCommonBuffer() failed with Status = 0x%08X!\n", Status); + return NULL; + } + + return DeviceExtension->NonCachedExtension; } + +static NTSTATUS +SpiAllocateCommonBuffer(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, ULONG NonCachedSize) +{ + PVOID *SrbExtension, CommonBuffer; + ULONG CommonBufferLength, BufSize; + + /* If size is 0, set it to 16 */ + if (!DeviceExtension->SrbExtensionSize) + DeviceExtension->SrbExtensionSize = 16; + + /* Calculate size */ + BufSize = DeviceExtension->SrbExtensionSize; + + /* Add autosense data size if needed */ + if (DeviceExtension->SupportsAutoSense) + BufSize += sizeof(SENSE_DATA); + + + /* Round it */ + BufSize = (BufSize + sizeof(LONGLONG) - 1) & ~(sizeof(LONGLONG) - 1); + + /* Sum up into the total common buffer length, and round it to page size */ + CommonBufferLength = + ROUND_TO_PAGES(NonCachedSize + BufSize * DeviceExtension->RequestsNumber); + + /* Allocate it */ + if (!DeviceExtension->AdapterObject) + { + /* From nonpaged pool if there is no DMA */ + CommonBuffer = ExAllocatePool(NonPagedPool, CommonBufferLength); + } + else + { + /* Perform a full request since we have a DMA adapter*/ + CommonBuffer = HalAllocateCommonBuffer(DeviceExtension->AdapterObject, + CommonBufferLength, + &DeviceExtension->PhysicalAddress, + FALSE ); + } + + /* Fail in case of error */ + if (!CommonBuffer) + return STATUS_INSUFFICIENT_RESOURCES; + + /* Zero it */ + RtlZeroMemory(CommonBuffer, CommonBufferLength); + + /* Store its size in Device Extension */ + DeviceExtension->CommonBufferLength = CommonBufferLength; + + /* SrbExtension buffer is located at the beginning of the buffer */ + DeviceExtension->SrbExtensionBuffer = CommonBuffer; + + /* Non-cached extension buffer is located at the end of + the common buffer */ + if (NonCachedSize) + { + CommonBufferLength -= NonCachedSize; + DeviceExtension->NonCachedExtension = (PUCHAR)CommonBuffer + CommonBufferLength; + } + else + { + DeviceExtension->NonCachedExtension = NULL; + } + + if (DeviceExtension->NeedSrbExtensionAlloc) + { + /* Look up how many SRB data structures we need */ + DeviceExtension->SrbDataCount = CommonBufferLength / BufSize; + + /* Initialize the free SRB extensions list */ + SrbExtension = (PVOID *)CommonBuffer; + DeviceExtension->FreeSrbExtensions = SrbExtension; + + /* Fill the remainding pointers (if we have more than 1 SRB) */ + while (CommonBufferLength >= 2 * BufSize) + { + *SrbExtension = (PVOID*)((PCHAR)SrbExtension + BufSize); + SrbExtension = *SrbExtension; + + CommonBufferLength -= BufSize; + } + } + + return STATUS_SUCCESS; +} + /* @@ -1204,9 +1316,8 @@ DeviceExtension->SupportsAutoSense = PortConfig->AutoRequestSense; DeviceExtension->NeedSrbExtensionAlloc = TRUE; - //Status = STATUS_UNSUCCESFUL; - /* TODO: Allocate common buffer */ - ASSERT(FALSE); + /* Allocate common buffer */ + Status = SpiAllocateCommonBuffer(DeviceExtension, 0); /* Check for failure */ if (!NT_SUCCESS(Status))

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