Ros-diffs June 2009

ros-diffs@reactos.org

21 participants
496 discussions

[gedmurphy] 41286: Only grow the input text box in resize

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Jun 4 20:05:48 2009 New Revision: 41286 URL: http://svn.reactos.org/svn/reactos?rev=41286&view=rev Log: Only grow the input text box in resize Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs [iso-8859-1] Thu Jun 4 20:05:48 2009 @@ -133,6 +133,7 @@ // splitContainer2 // this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; this.splitContainer2.Location = new System.Drawing.Point(0, 0); this.splitContainer2.Name = "splitContainer2"; // Modified: trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] Thu Jun 4 20:05:48 2009 @@ -39,5 +39,5 @@ // will be increased as well. MSI installers must not be generated with the same Build Number // otherwise they won't upgrade the old installation! -[assembly: AssemblyVersion("1.0.2.60")] -[assembly: AssemblyFileVersion("1.0.2.60")] +[assembly: AssemblyVersion("1.0.2.61")] +[assembly: AssemblyFileVersion("1.0.2.61")]

15 years, 5 months

[janderwald] 41285: - Revert 40694 as FIELD_OFFSET is perfectly working code and the new one might not work on some compilers - Add informal debug traces for bug 4354

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Jun 4 18:16:57 2009 New Revision: 41285 URL: http://svn.reactos.org/svn/reactos?rev=41285&view=rev Log: - Revert 40694 as FIELD_OFFSET is perfectly working code and the new one might not work on some compilers - Add informal debug traces for bug 4354 Modified: trunk/reactos/drivers/video/videoprt/dispatch.c trunk/reactos/drivers/video/videoprt/resource.c Modified: trunk/reactos/drivers/video/videoprt/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/dis… ============================================================================== --- trunk/reactos/drivers/video/videoprt/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/dispatch.c [iso-8859-1] Thu Jun 4 18:16:57 2009 @@ -340,11 +340,9 @@ /* Save the resource list */ ResourceCount = AllocatedResources->List[0].PartialResourceList.Count; - ResourceListSize = sizeof(CM_RESOURCE_LIST); - - if (ResourceCount > 1) - ResourceListSize += (ResourceCount-1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); - + ResourceListSize = + FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList. + PartialDescriptors[ResourceCount]); DeviceExtension->AllocatedResources = ExAllocatePool(PagedPool, ResourceListSize); if (DeviceExtension->AllocatedResources == NULL) { @@ -360,6 +358,9 @@ FullList < AllocatedResources->List + AllocatedResources->Count; FullList++) { + INFO_(VIDEOPRT, "InterfaceType %u BusNumber List %u Device BusNumber %u Version %u Revision %u\n", + FullList->InterfaceType, FullList->BusNumber, DeviceExtension->SystemIoBusNumber, FullList->PartialResourceList.Version, FullList->PartialResourceList.Revision); + /* FIXME: Is this ASSERT ok for resources from the PNP manager? */ ASSERT(FullList->InterfaceType == PCIBus && FullList->BusNumber == DeviceExtension->SystemIoBusNumber && Modified: trunk/reactos/drivers/video/videoprt/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/res… ============================================================================== --- trunk/reactos/drivers/video/videoprt/resource.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/resource.c [iso-8859-1] Thu Jun 4 18:16:57 2009 @@ -520,6 +520,9 @@ FullList < AllocatedResources->List + AllocatedResources->Count; FullList++) { + INFO_(VIDEOPRT, "InterfaceType %u BusNumber List %u Device BusNumber %u Version %u Revision %u\n", + FullList->InterfaceType, FullList->BusNumber, DeviceExtension->SystemIoBusNumber, FullList->PartialResourceList.Version, FullList->PartialResourceList.Revision); + ASSERT(FullList->InterfaceType == PCIBus && FullList->BusNumber == DeviceExtension->SystemIoBusNumber && 1 == FullList->PartialResourceList.Version &&

15 years, 5 months

[dgorbachev] 41284: Remove KeBugCheckWithTf() hack, fix VBEResetHw(). Stefan Ginsberg, bug #4581.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Thu Jun 4 17:54:27 2009 New Revision: 41284 URL: http://svn.reactos.org/svn/reactos?rev=41284&view=rev Log: Remove KeBugCheckWithTf() hack, fix VBEResetHw(). Stefan Ginsberg, bug #4581. Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c trunk/reactos/ntoskrnl/ke/bug.c Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vbe… ============================================================================== --- trunk/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] Thu Jun 4 17:54:27 2009 @@ -546,56 +546,8 @@ ULONG Columns, ULONG Rows) { - INT10_BIOS_ARGUMENTS BiosRegisters; - PVBE_DEVICE_EXTENSION VBEDeviceExtension = - (PVBE_DEVICE_EXTENSION)DeviceExtension; - - if (!VBEResetDevice(DeviceExtension, NULL)) - return FALSE; - - /* Change number of columns/rows */ - VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters)); - - if (Columns == 80 && Rows == 25) - { - /* Default text size, don't change anything. */ - return TRUE; - } - else if (Columns == 80 && Rows == 28) - { - /* Use 9x14 font (80x28) */ - BiosRegisters.Eax = 0x1111; - } - else if (Columns == 80 && Rows == 43) - { - /* Use 8x8 font in 350 scans mode (80x43) */ - BiosRegisters.Eax = 0x1201; - BiosRegisters.Ebx = 0x30; - VBEDeviceExtension->Int10Interface.Int10CallBios( - VBEDeviceExtension->Int10Interface.Context, - &BiosRegisters); - - BiosRegisters.Eax = 0x3; - BiosRegisters.Ebx = 0; - VBEDeviceExtension->Int10Interface.Int10CallBios( - VBEDeviceExtension->Int10Interface.Context, - &BiosRegisters); - - BiosRegisters.Eax = 0x1112; - } - else if (Columns == 80 && Rows == 50) - { - /* Use 8x8 font (80x50) */ - BiosRegisters.Eax = 0x1112; - } - else - return FALSE; - - VBEDeviceExtension->Int10Interface.Int10CallBios( - VBEDeviceExtension->Int10Interface.Context, - &BiosRegisters); - - return TRUE; + /* Return FALSE to let HAL reset the display with INT10 */ + return FALSE; } /* Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=4128… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Thu Jun 4 17:54:27 2009 @@ -1138,13 +1138,11 @@ #endif /* Display the BSOD */ - KeLowerIrql(APC_LEVEL); // This is a nastier hack than any ever before KiDisplayBlueScreen(MessageId, IsHardError, HardErrCaption, HardErrMessage, AnsiName); - KeRaiseIrql(HIGH_LEVEL, &OldIrql); /* Check if the debugger is disabled but we can enable it */ if (!(KdDebuggerEnabled) && !(KdPitchDebugger))

15 years, 5 months

[gedmurphy] 41283: Display the kdb prompt correctly

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Jun 4 17:38:29 2009 New Revision: 41283 URL: http://svn.reactos.org/svn/reactos?rev=41283&view=rev Log: Display the kdb prompt correctly Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs [iso-8859-1] Thu Jun 4 17:38:29 2009 @@ -26,6 +26,7 @@ PrintDocument printDoc; DebugConnection mConnection; List<string> textToAdd = new List<string>(); + string kdbPrompt = "\r\nkdb:> "; @@ -54,9 +55,17 @@ lock (textToAdd) { foreach (string s in textToAdd) - toAdd.Append(s); + { + if (s.EndsWith(kdbPrompt)) + { + toAdd.Append(s.Remove(s.Length - kdbPrompt.Length)); + } + else + { + toAdd.Append(s); + } + } textToAdd.Clear(); - //TODO: skip backspace signs } RawTrafficText.AppendText(toAdd.ToString()); } @@ -93,7 +102,7 @@ { if (RawTrafficTextBox.Text.Length > 0) { - //AddCommandToList(RawTrafficTextBox.Text); + RawTrafficText.AppendText(kdbPrompt); mConnection.Debugger.Write(RawTrafficTextBox.Text); } } Modified: trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] Thu Jun 4 17:38:29 2009 @@ -39,5 +39,5 @@ // will be increased as well. MSI installers must not be generated with the same Build Number // otherwise they won't upgrade the old installation! -[assembly: AssemblyVersion("1.0.2.59")] -[assembly: AssemblyFileVersion("1.0.2.59")] +[assembly: AssemblyVersion("1.0.2.60")] +[assembly: AssemblyFileVersion("1.0.2.60")]

15 years, 5 months

[fireball] 41282: - Add ReactOS Device Detection Tool - RosDDT. It's a command line tool for checking PC's hardware configuration for compatibility with ReactOS, and for reporting working hardware configurations to ReactOS hardware compatibility database. The tool is able of autoupdating its hardware compatibility database. * Web part is stubbed for now (hw.php) and needs to be developed. * Actual hardware database file (rosddt.ini) has only sample information. * Readme file is in Russian langua

by fireball＠svn.reactos.org

Author: fireball Date: Thu Jun 4 16:38:30 2009 New Revision: 41282 URL: http://svn.reactos.org/svn/reactos?rev=41282&view=rev Log: - Add ReactOS Device Detection Tool - RosDDT. It's a command line tool for checking PC's hardware configuration for compatibility with ReactOS, and for reporting working hardware configurations to ReactOS hardware compatibility database. The tool is able of autoupdating its hardware compatibility database. * Web part is stubbed for now (hw.php) and needs to be developed. * Actual hardware database file (rosddt.ini) has only sample information. * Readme file is in Russian language, however running rosddt.exe without parameters provides a built-in English usage help. Added: trunk/rosapps/applications/sysutils/rosddt/ (with props) trunk/rosapps/applications/sysutils/rosddt/http.c (with props) trunk/rosapps/applications/sysutils/rosddt/http.h (with props) trunk/rosapps/applications/sysutils/rosddt/hw.php trunk/rosapps/applications/sysutils/rosddt/readme.txt (with props) trunk/rosapps/applications/sysutils/rosddt/rosddt.c (with props) trunk/rosapps/applications/sysutils/rosddt/rosddt.ini (with props) trunk/rosapps/applications/sysutils/rosddt/rosddt.rbuild (with props) trunk/rosapps/applications/sysutils/rosddt/rosddt.rc (with props) Modified: trunk/rosapps/applications/sysutils/sysutils.rbuild Propchange: trunk/rosapps/applications/sysutils/rosddt/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Jun 4 16:38:30 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/rosapps/applications/sysutils/rosddt/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/rosapps/applications/sysutils/rosddt/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/rosapps/applications/sysutils/rosddt/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/rosapps/applications/sysutils/rosddt/http.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rosd… ============================================================================== --- trunk/rosapps/applications/sysutils/rosddt/http.c (added) +++ trunk/rosapps/applications/sysutils/rosddt/http.c [iso-8859-1] Thu Jun 4 16:38:30 2009 @@ -1,0 +1,131 @@ +#include <windows.h> +#include <wininet.h> +#include <urlmon.h> +#include <stdio.h> +#include "http.h" + +#define INTERNET_FLAGS (INTERNET_FLAG_NO_CACHE_WRITE | INTERNET_FLAG_NO_UI | INTERNET_FLAG_NO_COOKIES ) + +static char *http_receive(HINTERNET h_req, u_long *d_size) +{ + u_long bytes = sizeof(u_long); + u_long qsize = 0; + u_long readed = 0; + char *data = NULL; + char buff[4096]; + + if (HttpQueryInfo(h_req, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &qsize, &bytes, NULL) != 0) { + data = malloc(qsize + 1); + } + + do + { + if (InternetReadFile(h_req, buff, sizeof(buff), &bytes) == 0) { + break; + } + if ( (readed + bytes) > qsize) { + data = realloc(data, readed + bytes + 1); + if (data == NULL) break; + qsize += bytes; + } + memcpy(data + readed, buff, bytes); readed += bytes; + } while (bytes != 0); + + if ( (data != NULL) && (readed != qsize) ) { + free(data); data = NULL; + } else { + if (d_size != NULL) *d_size = readed; + data[readed] = 0; + } + return data; +} + +void *http_get(wchar_t *url, u_long *d_size) +{ + HINTERNET h_inet = NULL; + HINTERNET h_req = NULL; + char *replay = NULL; + + do + { + h_inet = InternetOpen(NULL, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); + if (h_inet == NULL) break; + + h_req = InternetOpenUrl(h_inet, url, NULL, 0, INTERNET_FLAGS, 0); + if (h_req == NULL) break; + + replay = http_receive(h_req, d_size); + } while (0); + + if (h_req != NULL) { + InternetCloseHandle(h_req); + } + if (h_inet != NULL) { + InternetCloseHandle(h_inet); + } + return replay; +} + +void *http_post(wchar_t *url, void *data, int size, u_long *d_size) +{ + URL_COMPONENTS url_cm = {0}; + HINTERNET h_inet = NULL; + HINTERNET h_conn = NULL; + HINTERNET h_req = NULL; + char *q_data = NULL; + char *replay = NULL; + wchar_t host[MAX_PATH]; + wchar_t path[MAX_PATH]; + unsigned char *p, *d = data; + + do + { + if ( (q_data = malloc(size * 3 + 10)) == NULL ) { + break; + } + strcpy(q_data, "data="); p = q_data + 5; + + while (size--) { + p += sprintf(p, "%%%0.2x", (u_long)*d++); + } + + url_cm.dwStructSize = sizeof(url_cm); + url_cm.lpszHostName = host; + url_cm.dwHostNameLength = sizeof(host); + url_cm.lpszUrlPath = path; + url_cm.dwUrlPathLength = sizeof(path); + + if (InternetCrackUrl(url, 0, 0, &url_cm) == 0) { + break; + } + + h_inet = InternetOpen(NULL, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); + if (h_inet == NULL) break; + + h_conn = InternetConnect(h_inet, host, url_cm.nPort, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + if (h_conn == NULL) break; + + h_req = HttpOpenRequest(h_conn, L"POST", path, NULL, NULL, NULL, INTERNET_FLAGS, 0); + if (h_req == NULL) break; + + HttpAddRequestHeaders( + h_req, L"Content-Type: application/x-www-form-urlencoded", 47*2, HTTP_ADDREQ_FLAG_ADD); + + if (HttpSendRequest(h_req, NULL, 0, q_data, strlen(q_data)) == 0) { + break; + } + replay = http_receive(h_req, d_size); + } while (0); + + if (h_req != NULL) { + InternetCloseHandle(h_req); + } + if (h_conn != NULL) { + InternetCloseHandle(h_conn); + } + if (h_inet != NULL) { + InternetCloseHandle(h_inet); + } + if (q_data != NULL) free(q_data); + return replay; +} Propchange: trunk/rosapps/applications/sysutils/rosddt/http.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/sysutils/rosddt/http.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rosd… ============================================================================== --- trunk/rosapps/applications/sysutils/rosddt/http.h (added) +++ trunk/rosapps/applications/sysutils/rosddt/http.h [iso-8859-1] Thu Jun 4 16:38:30 2009 @@ -1,0 +1,7 @@ +#ifndef _HTTP_H_ +#define _HTTP_H_ + +void *http_get(wchar_t *url, u_long *d_size); +void *http_post(wchar_t *url, void *data, int size, u_long *d_size); + +#endif Propchange: trunk/rosapps/applications/sysutils/rosddt/http.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/sysutils/rosddt/hw.php URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rosd… ============================================================================== --- trunk/rosapps/applications/sysutils/rosddt/hw.php (added) +++ trunk/rosapps/applications/sysutils/rosddt/hw.php [iso-8859-1] Thu Jun 4 16:38:30 2009 @@ -1,0 +1,10 @@ +<?php +$file = fopen ("hw.txt", "a"); +if (!$file) { + echo "<p>Unable to open file for writing.\n"; + exit; +} +fputs ($file, $_POST['data']. "\n"); +fclose ($file); +echo "_ok_"; +?> Added: trunk/rosapps/applications/sysutils/rosddt/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rosd… ============================================================================== --- trunk/rosapps/applications/sysutils/rosddt/readme.txt (added) +++ trunk/rosapps/applications/sysutils/rosddt/readme.txt [iso-8859-1] Thu Jun 4 16:38:30 2009 @@ -1,0 +1,17 @@ +=========== rosddt - ReactOS device detection tool =========== + +Èñïîëüçîâàíèå: +rosddt -enum - âûâåñòè ñïèñîê âñåãî óñòàíîâëåííîãî æåëåçà +rosddt -check - ïðîâåðèòü ñîâìåñòèìîñòü ReactOS ñ âàøåé ñèñòåìîé +rosddt -update - îáíîâèòü áàçó ñîâìåñòèìîñòè äî ïîñëåäíåé âåðñèè +rosddt -report - îòïðàâèòü îò÷åò îá àïïàðàòíîé êîíôèãóðàöèè ðàçðàáîò÷èêàì ReactOS. Ýòà èíôîðìàöèÿ áóäåò èñïîëüçîâàíà äëÿ âåäåíèÿ ñòàòèñòèêè è ïîääåðæêè áàçû ñîâìåñòèìîñòè. + +=== ôîðìàò ôàéëà rosddt.ini === +Ñåêöèÿ "URL" ñîäåðæèò äâå ññûëêè: udpate - ññûëêà íà rosddt.ini, èñïîëüçóåòñÿ ïðè îáíîâëåíèè, report - ññûëêà íà ñêðèïò ïðèíèìàþùèé îò÷åòû. Âñ¸ ñîäåðæèìîå îò÷åòà ïåðåäà¸òñÿ â ïîëå "data" POST çàïðîñà â êîäèðîâêå UTF-8. Ïðèìåð ïðè¸ìà îò÷åòîâ ñìîòðèòå â hw.php. + +Ñåêöèÿ "HW" ñîäåðæèò áàçó ñîâìåñòèìîñòè ReactOS ñ æåëåçîì. Êàæäîå çàíåñ¸ííîå â áàçó óñòðîéñòâî ìîæåò èìåòü òðè ñòàòóñà ñîâìåñòèìîñòè: ok - óñòðîéñòâî ðàáîòàåò â ReactOS, notwork - óñòðîéñòâî íå ðàáîòàåò â ReactOS è crash - ReactOS íå çàïóñêàåòñÿ íà ñèñòåìå ñ ýòèì óñòðîéñòâîì. +Óñòðîéñòâà ìîãóò îáîçíà÷àòüñÿ ñëåäóþùèìè ñïîñîáàìè: +1 - Ïî ïîëíîìó ÷èòàåìîìó èìåíè óñòðîéñòâà. Íàïðèìåð "Intel(R) 82371AB/EB PCI Bus Master IDE Controller". +2 - Ïî ïîëíîìó PNP ID óñòðîéñòâà. Íàïðèìåð "PCI\VEN_8086&DEV_1237&SUBSYS_00000000&REV_02". +3 - Äëÿ PCI óñòðîéñòâ ìîæíî óêàçûâàòü òàêæå ñîêðàùåííûå ñîêðàùåííûå pnp id, òàêèå êàê "PCI\VEN_8086&DEV_1237" èëè "PCI\VEN_8086&DEV_1237&REV_02". Ðåêîìåíäóåòñÿ ïîëüçîâàòüñÿ èìåííî òàêîé ôîðìîé çàïèñè, ïîñêîëüêó ïîëíûé id ïðèâÿçàí ê íîìåðó pci ñëîòà â êîòîðûé âñòàâëåíî óñòðîéñòâî. Ðåâèçèþ óêàçûâàòü ïî íåîáõîäèìîñòè, ëó÷øå îáîéòèñü áåç íå¸. +4 - Äëÿ USB óñòðîéñòâ ìîæíî ïîëüçîâàòüñÿ ñîêðàùåííîé ôîðìîé çàïèñè. Íàïðèìåð "USB\ROOT_HUB&VID8086&PID3A34&REV0000" ìîæíî çàïèñàòü êàê "USB\VID8086&PID3A34" èëè "USB\VID8086&PID3A34&REV0000" Propchange: trunk/rosapps/applications/sysutils/rosddt/readme.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/sysutils/rosddt/rosddt.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rosd… ============================================================================== --- trunk/rosapps/applications/sysutils/rosddt/rosddt.c (added) +++ trunk/rosapps/applications/sysutils/rosddt/rosddt.c [iso-8859-1] Thu Jun 4 16:38:30 2009 @@ -1,0 +1,263 @@ +#include <stdio.h> +#include <windows.h> +#include <setupapi.h> +#include "http.h" + +#define ST_NEUTRAL 0 +#define ST_ROS_CRASH 1 +#define ST_DEV_NOTWORK 2 +#define ST_DEV_OK 3 +#define ST_ERROR 4 +#define ST_LAST_STATUS ST_ERROR + +static int is_show_hw; +static int is_check_hw; +static wchar_t gl_ini_file[MAX_PATH]; +static wchar_t *gl_report; + +static int hw_check_ini(wchar_t *name) +{ + wchar_t buff[MAX_PATH]; + + if (GetPrivateProfileString(L"HW", name, NULL, buff, MAX_PATH, gl_ini_file) == 0) { + return ST_NEUTRAL; + } + if (_wcsicmp(buff, L"ok") == 0) return ST_DEV_OK; + if (_wcsicmp(buff, L"notwork") == 0) return ST_DEV_NOTWORK; + if (_wcsicmp(buff, L"crash") == 0) return ST_ROS_CRASH; + return ST_NEUTRAL; +} + +static int hw_check_base(wchar_t *hw_id, wchar_t *hw_name) +{ + wchar_t buff[MAX_PATH], *p; + int status; + + if ( (status = hw_check_ini(hw_id)) != ST_NEUTRAL ) { + return status; + } + if ( (status = hw_check_ini(hw_name)) != ST_NEUTRAL ) { + return status; + } + + if (wcsncmp(hw_id, L"PCI\\VEN_", 8) == 0) + { + wcsncpy(buff, hw_id, 21); buff[21] = 0; + + if ( (status = hw_check_ini(buff)) != ST_NEUTRAL ) { + return status; + } + + if (p = wcsstr(hw_id, L"&REV_")) { + wcscat(buff, p); status = hw_check_ini(buff); + } + } else if ( (wcsncmp(hw_id, L"USB\\", 4) == 0) && (p = wcsstr(hw_id, L"&VID")) ) + { + wsprintf(buff, L"USB\\%s", p+1); + + if ( (status = hw_check_ini(buff)) != ST_NEUTRAL ) { + return status; + } + + if (p = wcsstr(buff, L"&REV")) { + *p = 0; status = hw_check_ini(buff); + } + } + return status; +} + +static void trim(wchar_t *s) +{ + wchar_t *p; + for (p = s + wcslen(s) - 1; (p > s) && (*p == L' '); *p-- = 0); +} + +static int hw_check_device(HDEVINFO h_info, SP_DEVINFO_DATA *d_inf) +{ + wchar_t *hw_id = NULL; + wchar_t *hw_name = NULL; + u_long type, bytes; + int status; + char name[MAX_PATH]; + wchar_t w_name[MAX_PATH]; + + do + { + if ( (hw_id = malloc(4096)) == NULL ) { + status = ST_ERROR; break; + } + if ( (hw_name = malloc(4096)) == NULL ) { + status = ST_ERROR; break; + } + hw_id[0] = 0, hw_name[0] = 0; + + SetupDiGetDeviceRegistryProperty(h_info, d_inf, SPDRP_HARDWAREID, &type, (void*)hw_id, 4096, &bytes); + SetupDiGetDeviceRegistryProperty(h_info, d_inf, SPDRP_DEVICEDESC, &type, (void*)hw_name, 4096, &bytes); + + if (hw_id[0] == 0 || hw_name[0] == 0) { + status = ST_NEUTRAL; break; + } + /* trim strings */ + trim(hw_id); trim(hw_name); + + if ( (wcschr(hw_id, L'\\') == NULL) || (_wcsnicmp(hw_id, L"ROOT\\", 5) == 0) || + (_wcsicmp(hw_id, L"STORAGE\\Volume") == 0) || (_wcsicmp(hw_id, L"UMB\\UMBUS") == 0) || + (_wcsnicmp(hw_id, L"SW\\", 3) == 0) ) + { + status = ST_NEUTRAL; break; + } + + if (is_show_hw != 0) { + CharToOem(hw_name, name); + wprintf(L"%s - [%S]\n", hw_id, name); + } + + if (gl_report != NULL) { + wsprintf(w_name, L"%s - [%s]\n", hw_id, hw_name); + wcscat(gl_report, w_name); + } + + if (is_check_hw != 0) + { + status = hw_check_base(hw_id, hw_name); + + if (status == ST_DEV_NOTWORK) { + CharToOem(hw_name, name); + wprintf(L"Device \"%S\" does not work in ReactOS\n", name); + } + if (status == ST_ROS_CRASH) { + CharToOem(hw_name, name); + wprintf(L"ReactOS does not work with device \"%S\"\n", name); + } + } else { + status = ST_NEUTRAL; + } + } while (0); + + if (hw_id != NULL) free(hw_id); + if (hw_name != NULL) free(hw_name); + + return status; +} + +static void do_update_base() +{ + wchar_t up_url[MAX_PATH]; + void *data; + u_long size; + FILE *f; + + if (GetPrivateProfileString(L"URL", L"udpate", NULL, up_url, MAX_PATH, gl_ini_file) == 0) { + wprintf(L"Update URL not found in rosddt.ini\n"); return; + } + + wprintf(L"Downloading new rosddt.ini...\n"); + + if (data = http_get(up_url, &size)) + { + if (f = _wfopen(gl_ini_file, L"wb")) { + fwrite(data, 1, size, f); + fclose(f); + wprintf(L"Update completed\n"); + } else { + wprintf(L"Can not open rosddt.ini for writing\n"); + } + free(data); + } else { + wprintf(L"Error, rosddt.ini can not be loaded\n"); + } +} + +static void do_send_report(wchar_t *report) +{ + wchar_t up_url[MAX_PATH]; + int utf_sz; + char *utf, *p; + + if (GetPrivateProfileString(L"URL", L"report", NULL, up_url, MAX_PATH, gl_ini_file) == 0) { + wprintf(L"Report URL not found in rosddt.ini\n"); return; + } + + utf_sz = WideCharToMultiByte(CP_UTF8, 0, report, -1, NULL, 0, NULL, NULL); + utf = malloc(utf_sz); + utf_sz = WideCharToMultiByte(CP_UTF8, 0, report, -1, utf, utf_sz, NULL, NULL); + + wprintf(L"Sending report...\n"); + + if (p = http_post(up_url, utf, utf_sz-1, NULL)) { + wprintf(L"%S\n", p); free(p); + } else { + wprintf(L"Report can not be sended, connection error\n"); + } +} + +int wmain(int argc, wchar_t *argv[]) +{ + HDEVINFO h_info; + SP_DEVINFO_DATA d_inf; + int codes[ST_LAST_STATUS + 1] = {0}; + int i; + wchar_t *p; + + if (argc != 2) + { + wprintf( + L"rosddt [parameters]\n" + L" -enum enumerate all installed hardware\n" + L" -check check hardware compatibility with ReactOS\n" + L" -update update hardware compatibility database\n" + L" -report send your hardware configuration to ReactOS team\n" + ); + return 0; + } + + /* get path to ini file */ + GetModuleFileName(NULL, gl_ini_file, MAX_PATH); + for (p = gl_ini_file + wcslen(gl_ini_file); *p != L'\\'; *p-- = 0); + wcscat(gl_ini_file, L"rosddt.ini"); + + if (_wcsicmp(argv[1], L"-update") == 0) { + do_update_base(); return 0; + } + if (_wcsicmp(argv[1], L"-enum") == 0) { + is_show_hw = 1; is_check_hw = 0; + } + if (_wcsicmp(argv[1], L"-check") == 0) { + is_show_hw = 0; is_check_hw = 1; + } + if (_wcsicmp(argv[1], L"-report") == 0) { + is_show_hw = 0; is_check_hw = 0; + gl_report = malloc(65536); gl_report[0] = 0; + } + + h_info = SetupDiGetClassDevs(NULL, 0, 0, DIGCF_PRESENT | DIGCF_ALLCLASSES); + + if (h_info == INVALID_HANDLE_VALUE) { + wprintf(L"SetupDiGetClassDevs error\n"); return 1; + } + + d_inf.cbSize = sizeof(d_inf); i = 0; + + while (SetupDiEnumDeviceInfo(h_info, i++, &d_inf) != 0) { + codes[hw_check_device(h_info, &d_inf)]++; + } + + if (is_check_hw != 0) + { + wprintf( + L"Checking completed.\nFound %d supported devices, %d unsupported devices and %d incompatible devices\n", + codes[ST_DEV_OK], codes[ST_DEV_NOTWORK], codes[ST_ROS_CRASH]); + + if (codes[ST_ROS_CRASH] == 0) { + wprintf(L"ReactOS can be installed on your computer\n"); + } else { + wprintf(L"ReactOS can not be installed on your computer\n"); + } + } + + if (gl_report != NULL) { + do_send_report(gl_report); + } + + return 0; +} Propchange: trunk/rosapps/applications/sysutils/rosddt/rosddt.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/sysutils/rosddt/rosddt.ini URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rosd… ============================================================================== --- trunk/rosapps/applications/sysutils/rosddt/rosddt.ini (added) +++ trunk/rosapps/applications/sysutils/rosddt/rosddt.ini [iso-8859-1] Thu Jun 4 16:38:30 2009 @@ -1,0 +1,8 @@ +[URL] +udpate = http://iso.reactos.org/_tools/rosddt.ini +report = http://iso.reactos.org/_tools/hw.php + +[HW] +PCI\VEN_8086&DEV_7000&SUBSYS_00000000&REV_00 = ok +ACPI Fixed Feature Button = notwork +Intel(R) 82371AB/EB PCI Bus Master IDE Controller = crash Propchange: trunk/rosapps/applications/sysutils/rosddt/rosddt.ini ------------------------------------------------------------------------------ svn:eol-style = CRLF Added: trunk/rosapps/applications/sysutils/rosddt/rosddt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rosd… ============================================================================== --- trunk/rosapps/applications/sysutils/rosddt/rosddt.rbuild (added) +++ trunk/rosapps/applications/sysutils/rosddt/rosddt.rbuild [iso-8859-1] Thu Jun 4 16:38:30 2009 @@ -1,0 +1,11 @@ +<module name="rosddt" type="win32cui" installbase="system32" installname="rosddt.exe" unicode="yes" allowwarnings="true"> + + <library>setupapi</library> + <library>wininet</library> + <library>kernel32</library> + <library>user32</library> + + <file>http.c</file> + <file>rosddt.c</file> + <file>rosddt.rc</file> +</module> Propchange: trunk/rosapps/applications/sysutils/rosddt/rosddt.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/sysutils/rosddt/rosddt.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rosd… ============================================================================== --- trunk/rosapps/applications/sysutils/rosddt/rosddt.rc (added) +++ trunk/rosapps/applications/sysutils/rosddt/rosddt.rc [iso-8859-1] Thu Jun 4 16:38:30 2009 @@ -1,0 +1,7 @@ +#include <windows.h> + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Device Detection Tool\0" +#define REACTOS_STR_INTERNAL_NAME "rosddt\0" +#define REACTOS_STR_ORIGINAL_FILENAME "rosddt.exe\0" +#define REACTOS_STR_ORIGINAL_COPYRIGHT "2009, ReactOS Development Team\0" +#include <reactos/version.rc> Propchange: trunk/rosapps/applications/sysutils/rosddt/rosddt.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/sysutils/sysutils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/sysu… ============================================================================== --- trunk/rosapps/applications/sysutils/sysutils.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/sysutils.rbuild [iso-8859-1] Thu Jun 4 16:38:30 2009 @@ -40,6 +40,10 @@ <xi:include href="regexpl/regexpl.rbuild" /> </directory> + <directory name="rosddt"> + <xi:include href="rosddt/rosddt.rbuild" /> + </directory> + <directory name="screenshot"> <xi:include href="screenshot/screenshot.rbuild" /> </directory>

15 years, 5 months

[gedmurphy] 41281: - Early stages of improving the console to make behave more like windbg... - Add a separate command line for entering commands - Keep a list of previous commands and traverse through them with up/down keys - Clean the command line with esc

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Jun 4 16:35:12 2009 New Revision: 41281 URL: http://svn.reactos.org/svn/reactos?rev=41281&view=rev Log: - Early stages of improving the console to make behave more like windbg... - Add a separate command line for entering commands - Keep a list of previous commands and traverse through them with up/down keys - Clean the command line with esc Modified: trunk/tools/reactosdbg/Pipe/namedpipe.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs Modified: trunk/tools/reactosdbg/Pipe/namedpipe.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/Pipe/namedpipe.cs… ============================================================================== --- trunk/tools/reactosdbg/Pipe/namedpipe.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/Pipe/namedpipe.cs [iso-8859-1] Thu Jun 4 16:35:12 2009 @@ -229,7 +229,7 @@ /* only forward a complete line */ wCommand += str; - if (str[str.Length-1] == '\r') + if (str[str.Length-1] == '\r') //FIXME: remove this { cmdList.Add(wCommand); wCommand = null; Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs [iso-8859-1] Thu Jun 4 16:35:12 2009 @@ -30,13 +30,22 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RawTraffic)); this.RawTrafficText = new System.Windows.Forms.TextBox(); - this.InputLabel = new System.Windows.Forms.Label(); this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); this.selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.splitContainer2 = new System.Windows.Forms.SplitContainer(); + this.label1 = new System.Windows.Forms.Label(); + this.RawTrafficTextBox = new System.Windows.Forms.TextBox(); this.menuStrip1.SuspendLayout(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + this.splitContainer2.Panel1.SuspendLayout(); + this.splitContainer2.Panel2.SuspendLayout(); + this.splitContainer2.SuspendLayout(); this.SuspendLayout(); // // RawTrafficText @@ -48,19 +57,12 @@ this.RawTrafficText.Multiline = true; this.RawTrafficText.Name = "RawTrafficText"; this.RawTrafficText.ReadOnly = true; - this.RawTrafficText.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.RawTrafficText.Size = new System.Drawing.Size(397, 253); + this.RawTrafficText.ScrollBars = System.Windows.Forms.ScrollBars.Both; + this.RawTrafficText.Size = new System.Drawing.Size(425, 268); this.RawTrafficText.TabIndex = 0; + this.RawTrafficText.WordWrap = false; this.RawTrafficText.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.RawTrafficText_KeyPress); this.RawTrafficText.MouseUp += new System.Windows.Forms.MouseEventHandler(this.RawTrafficText_MouseUp); - // - // InputLabel - // - this.InputLabel.AutoSize = true; - this.InputLabel.Location = new System.Drawing.Point(91, 236); - this.InputLabel.Name = "InputLabel"; - this.InputLabel.Size = new System.Drawing.Size(0, 13); - this.InputLabel.TabIndex = 1; // // menuStrip1 // @@ -107,15 +109,73 @@ this.selectAllToolStripMenuItem.Text = "&Select all"; this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click); // + // splitContainer1 + // + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.splitContainer1.Location = new System.Drawing.Point(0, 0); + this.splitContainer1.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.splitContainer1.Name = "splitContainer1"; + this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.RawTrafficText); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.splitContainer2); + this.splitContainer1.Size = new System.Drawing.Size(425, 294); + this.splitContainer1.SplitterDistance = 268; + this.splitContainer1.SplitterWidth = 1; + this.splitContainer1.TabIndex = 5; + // + // splitContainer2 + // + this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer2.Location = new System.Drawing.Point(0, 0); + this.splitContainer2.Name = "splitContainer2"; + // + // splitContainer2.Panel1 + // + this.splitContainer2.Panel1.Controls.Add(this.label1); + // + // splitContainer2.Panel2 + // + this.splitContainer2.Panel2.Controls.Add(this.RawTrafficTextBox); + this.splitContainer2.Size = new System.Drawing.Size(425, 25); + this.splitContainer2.SplitterDistance = 39; + this.splitContainer2.SplitterWidth = 1; + this.splitContainer2.TabIndex = 0; + // + // label1 + // + this.label1.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(2, 3); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(34, 13); + this.label1.TabIndex = 0; + this.label1.Text = "kdb:>"; + // + // RawTrafficTextBox + // + this.RawTrafficTextBox.Dock = System.Windows.Forms.DockStyle.Fill; + this.RawTrafficTextBox.Location = new System.Drawing.Point(0, 0); + this.RawTrafficTextBox.Name = "RawTrafficTextBox"; + this.RawTrafficTextBox.Size = new System.Drawing.Size(385, 20); + this.RawTrafficTextBox.TabIndex = 0; + this.RawTrafficTextBox.Tag = "0"; + this.RawTrafficTextBox.KeyUp += new System.Windows.Forms.KeyEventHandler(this.RawTrafficTextBox_KeyUp); + // // RawTraffic // this.AllowEndUserDocking = false; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(397, 253); + this.ClientSize = new System.Drawing.Size(425, 294); + this.Controls.Add(this.splitContainer1); this.Controls.Add(this.menuStrip1); - this.Controls.Add(this.InputLabel); - this.Controls.Add(this.RawTrafficText); this.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.HideOnClose = true; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); @@ -123,6 +183,15 @@ this.Text = "Console"; this.menuStrip1.ResumeLayout(false); this.menuStrip1.PerformLayout(); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel1.PerformLayout(); + this.splitContainer1.Panel2.ResumeLayout(false); + this.splitContainer1.ResumeLayout(false); + this.splitContainer2.Panel1.ResumeLayout(false); + this.splitContainer2.Panel1.PerformLayout(); + this.splitContainer2.Panel2.ResumeLayout(false); + this.splitContainer2.Panel2.PerformLayout(); + this.splitContainer2.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -131,11 +200,14 @@ #endregion private System.Windows.Forms.TextBox RawTrafficText; - private System.Windows.Forms.Label InputLabel; private System.Windows.Forms.MenuStrip menuStrip1; private System.Windows.Forms.ToolStripMenuItem editToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem copyToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem selectAllToolStripMenuItem; + private System.Windows.Forms.SplitContainer splitContainer1; + private System.Windows.Forms.SplitContainer splitContainer2; + private System.Windows.Forms.TextBox RawTrafficTextBox; + private System.Windows.Forms.Label label1; } } Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs [iso-8859-1] Thu Jun 4 16:35:12 2009 @@ -20,11 +20,22 @@ private int totalPages; private int pageNumber; private string strPrintText; + private List<string> prevCommand; + private int maxCommands = 10; PrintDialog pd; PrintDocument printDoc; - DebugConnection mConnection; List<string> textToAdd = new List<string>(); + + + + public RawTraffic() + { + InitializeComponent(); + + prevCommand = new List<string>(maxCommands); + RawTrafficTextBox.Tag = 0; + } protected override void OnLoad(EventArgs e) { @@ -48,11 +59,8 @@ //TODO: skip backspace signs } RawTrafficText.AppendText(toAdd.ToString()); - InputLabel.Location = RawTrafficText.GetPositionFromCharIndex(RawTrafficText.Text.Length -1); - InputLabel.Top += 2; - InputLabel.Left += 2; - } - + } + void DebugRawTrafficEvent(object sender, DebugRawTrafficEventArgs args) { lock (textToAdd) @@ -62,57 +70,36 @@ Invoke(Delegate.CreateDelegate(typeof(NoParamsDelegate), this, "UpdateText")); } - public RawTraffic() - { - InitializeComponent(); - InputLabel.Location = new Point(2, 2); - } - - private void RawTrafficText_KeyPress(object sender, KeyPressEventArgs e) - { - if ((mConnection.ConnectionMode != DebugConnection.Mode.ClosedMode) && (!mConnection.Running)) - { - switch ((int)e.KeyChar) + private void AddCommandToList(string cmd) + { + if (prevCommand.Count == maxCommands) + { + for (int i = 0; i < prevCommand.Count; i++) { - case 8: /* Backspace */ - if (InputLabel.Text.Length > 0) - InputLabel.Text = InputLabel.Text.Substring(0, InputLabel.Text.Length - 1); - break; - case 13: /* Return */ - if (InputLabel.Text.ToLower().CompareTo("cont") == 0) - mConnection.Running = true; - InputLabel.Text = ""; - break; - default: - InputLabel.Text += e.KeyChar; - break; + if (i < prevCommand.Count - 1) + prevCommand[i] = prevCommand[i + 1]; } - mConnection.Debugger.Write("" + e.KeyChar); - } - } - - private void RawTrafficText_MouseUp(object sender, MouseEventArgs e) - { - copyToolStripMenuItem.Enabled = (RawTrafficText.SelectionLength > 0); - } - - private void copyToolStripMenuItem_Click(object sender, EventArgs e) - { - if (RawTrafficText.SelectionLength != 0) - Clipboard.SetText(RawTrafficText.SelectedText); - } - - private void selectAllToolStripMenuItem_Click(object sender, EventArgs e) - { - RawTrafficText.SelectAll(); - } - - private void editToolStripMenuItem_Click(object sender, EventArgs e) - { - selectAllToolStripMenuItem.Enabled = (RawTrafficText.Text.Length != 0); - } - + prevCommand.RemoveAt(prevCommand.Count - 1); + } + + prevCommand.Add(cmd); + + RawTrafficTextBox.Tag = prevCommand.Count; + } + + + private void SendCommandToDebugger() + { + if (RawTrafficTextBox.Text.Length > 0) + { + //AddCommandToList(RawTrafficTextBox.Text); + mConnection.Debugger.Write(RawTrafficTextBox.Text); + } + } + + + #region override methods public override bool IsCmdEnabled(Commands Cmd) { switch (Cmd) @@ -171,71 +158,154 @@ printDoc.Print(); } } + #endregion + + #region events + private void RawTrafficTextBox_KeyUp(object sender, KeyEventArgs e) + { + switch (e.KeyCode) + { + case Keys.Enter: + AddCommandToList(RawTrafficTextBox.Text); + RawTrafficTextBox.Text += '\r'; //FIXME: remove this + SendCommandToDebugger(); + RawTrafficTextBox.Text = string.Empty; + break; + + case Keys.Up: + case Keys.Down: + int prevCmd = (int)RawTrafficTextBox.Tag; + + if (e.KeyCode == Keys.Up) + prevCmd--; + else + prevCmd++; + + if (prevCmd >= 0 && prevCmd < prevCommand.Count) + { + RawTrafficTextBox.Text = prevCommand[prevCmd]; + RawTrafficTextBox.Tag = prevCmd; + RawTrafficTextBox.SelectionStart = RawTrafficTextBox.Text.Length; + } + break; + + case Keys.Escape: + RawTrafficTextBox.Text = string.Empty; + RawTrafficTextBox.Tag = prevCommand.Count; + break; + } + + } + + private void RawTrafficText_KeyPress(object sender, KeyPressEventArgs e) + { + if ((mConnection.ConnectionMode != DebugConnection.Mode.ClosedMode) && (!mConnection.Running)) + { + switch ((int)e.KeyChar) + { + case 8: /* Backspace */ + if (RawTrafficTextBox.Text.Length > 0) + RawTrafficTextBox.Text = RawTrafficTextBox.Text.Substring(0, RawTrafficTextBox.Text.Length - 1); + break; + case 13: /* Return */ + if (RawTrafficTextBox.Text.ToLower().CompareTo("cont") == 0) + mConnection.Running = true; + RawTrafficTextBox.Text += e.KeyChar; + SendCommandToDebugger(); + break; + default: + RawTrafficTextBox.Text += e.KeyChar; + break; + } + } + } + + private void RawTrafficText_MouseUp(object sender, MouseEventArgs e) + { + copyToolStripMenuItem.Enabled = (RawTrafficText.SelectionLength > 0); + } + + private void copyToolStripMenuItem_Click(object sender, EventArgs e) + { + if (RawTrafficText.SelectionLength != 0) + Clipboard.SetText(RawTrafficText.SelectedText); + } + + private void selectAllToolStripMenuItem_Click(object sender, EventArgs e) + { + RawTrafficText.SelectAll(); + } + + private void editToolStripMenuItem_Click(object sender, EventArgs e) + { + selectAllToolStripMenuItem.Enabled = (RawTrafficText.Text.Length != 0); + } private void printDoc_PrintPage(object sender, PrintPageEventArgs e) { - StringFormat stringFormat = new StringFormat(); - RectangleF rectFPaper, rectFText; - int intChars, intLines; - - rectFPaper = e.MarginBounds; - rectFText = RectangleF.Inflate(rectFPaper, 0, - -2 * RawTrafficText.Font.GetHeight(e.Graphics)); - int totalLines = (int)Math.Floor(rectFText.Height / - RawTrafficText.Font.GetHeight(e.Graphics)); - rectFText.Height = totalLines * - RawTrafficText.Font.GetHeight(e.Graphics); - stringFormat.Trimming = StringTrimming.Word; - - while ((pageNumber < startPage) && (strPrintText.Length > 0)) - { - e.Graphics.MeasureString(strPrintText, RawTrafficText.Font, - rectFText.Size, stringFormat, - out intChars, out intLines); - strPrintText = strPrintText.Substring(intChars); - pageNumber++; - } - - // Cancel job when nothing to print is left - if (strPrintText.Length == 0) - { - e.Cancel = true; - return; - } - - e.Graphics.DrawString(strPrintText, RawTrafficText.Font, Brushes.Black, rectFText, stringFormat); + StringFormat stringFormat = new StringFormat(); + RectangleF rectFPaper, rectFText; + int intChars, intLines; + + rectFPaper = e.MarginBounds; + rectFText = RectangleF.Inflate(rectFPaper, 0, + -2 * RawTrafficText.Font.GetHeight(e.Graphics)); + int totalLines = (int)Math.Floor(rectFText.Height / + RawTrafficText.Font.GetHeight(e.Graphics)); + rectFText.Height = totalLines * + RawTrafficText.Font.GetHeight(e.Graphics); + stringFormat.Trimming = StringTrimming.Word; + + while ((pageNumber < startPage) && (strPrintText.Length > 0)) + { e.Graphics.MeasureString(strPrintText, RawTrafficText.Font, - rectFText.Size, stringFormat, - out intChars, out intLines); + rectFText.Size, stringFormat, + out intChars, out intLines); strPrintText = strPrintText.Substring(intChars); - stringFormat = new StringFormat(); - - // show filename in header - stringFormat.Alignment = StringAlignment.Center; - - e.Graphics.DrawString(printDoc.DocumentName, RawTrafficText.Font, - Brushes.Black, rectFPaper, stringFormat); - - // show page number in footer - stringFormat.LineAlignment = StringAlignment.Far; - - e.Graphics.DrawString("Page " + pageNumber, RawTrafficText.Font, - Brushes.Black, rectFPaper, stringFormat); - pageNumber++; - e.HasMorePages = (strPrintText.Length > 0) && - (pageNumber < startPage + totalPages); - - //re-init - if (!e.HasMorePages) - { - strPrintText = RawTrafficText.Text; - startPage = 1; - totalPages = pd.PrinterSettings.MaximumPage; - pageNumber = 1; - } - - } + } + + // Cancel job when nothing to print is left + if (strPrintText.Length == 0) + { + e.Cancel = true; + return; + } + + e.Graphics.DrawString(strPrintText, RawTrafficText.Font, Brushes.Black, rectFText, stringFormat); + e.Graphics.MeasureString(strPrintText, RawTrafficText.Font, + rectFText.Size, stringFormat, + out intChars, out intLines); + strPrintText = strPrintText.Substring(intChars); + stringFormat = new StringFormat(); + + // show filename in header + stringFormat.Alignment = StringAlignment.Center; + + e.Graphics.DrawString(printDoc.DocumentName, RawTrafficText.Font, + Brushes.Black, rectFPaper, stringFormat); + + // show page number in footer + stringFormat.LineAlignment = StringAlignment.Far; + + e.Graphics.DrawString("Page " + pageNumber, RawTrafficText.Font, + Brushes.Black, rectFPaper, stringFormat); + + pageNumber++; + e.HasMorePages = (strPrintText.Length > 0) && + (pageNumber < startPage + totalPages); + + //re-init + if (!e.HasMorePages) + { + strPrintText = RawTrafficText.Text; + startPage = 1; + totalPages = pd.PrinterSettings.MaximumPage; + pageNumber = 1; + } + + } + #endregion } } Modified: trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] Thu Jun 4 16:35:12 2009 @@ -39,5 +39,5 @@ // will be increased as well. MSI installers must not be generated with the same Build Number // otherwise they won't upgrade the old installation! -[assembly: AssemblyVersion("1.0.2.56")] -[assembly: AssemblyFileVersion("1.0.2.56")] +[assembly: AssemblyVersion("1.0.2.59")] +[assembly: AssemblyFileVersion("1.0.2.59")]

15 years, 5 months

[janderwald] 41280: - Remove a few bad (PLIST_ENTRY) casts

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Jun 4 13:37:57 2009 New Revision: 41280 URL: http://svn.reactos.org/svn/reactos?rev=41280&view=rev Log: - Remove a few bad (PLIST_ENTRY) casts Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c trunk/reactos/drivers/usb/nt4compat/usbdriver/etd.c trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] Thu Jun 4 13:37:57 2009 @@ -630,7 +630,7 @@ if (can_submit == STATUS_NO_MORE_ENTRIES) { //no enough bandwidth or tds - InsertHeadList(&pendp->urb_list, (PLIST_ENTRY) purb); + InsertHeadList(&pendp->urb_list, &purb->urb_link); InsertTailList(&temp_list, pthis); } else @@ -788,7 +788,7 @@ } pending_endp->pendp = purb->pendp; - InsertTailList(&ehci->pending_endp_list, (PLIST_ENTRY) pending_endp); + InsertTailList(&ehci->pending_endp_list, &pending_endp->endp_link); unlock_dev(pdev, TRUE); unlock_pending_endp_list(&ehci->pending_endp_list_lock); @@ -1198,7 +1198,7 @@ purb->flags &= ~URB_FLAG_STATE_MASK; purb->flags |= URB_FLAG_STATE_PENDING; - InsertHeadList(&pendp->urb_list, (PLIST_ENTRY) purb); + InsertHeadList(&pendp->urb_list, &purb->urb_link); } pending_endp = alloc_pending_endp(&ehci->pending_endp_pool, 1); @@ -1382,7 +1382,7 @@ purb->flags &= ~URB_FLAG_STATE_MASK; purb->flags |= URB_FLAG_STATE_IN_PROCESS | URB_FLAG_IN_SCHEDULE; - InsertTailList(&ehci->urb_list, (PLIST_ENTRY) purb); + InsertTailList(&ehci->urb_list, &purb->urb_link); return TRUE; } Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/etd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/etd.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/etd.c [iso-8859-1] Thu Jun 4 13:37:57 2009 @@ -451,7 +451,7 @@ lh = elem_link->list_link->get_list_head(elem_link->list_link); if (lh == NULL) return; - InsertHeadList(lh, (PLIST_ENTRY) elem_link); + InsertHeadList(lh, &elem_link->elem_link); ref = elem_link->list_link->release_ref(elem_link->list_link); pool->free_count++; if (ref == 0) Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c [iso-8859-1] Thu Jun 4 13:37:57 2009 @@ -122,7 +122,7 @@ } RtlZeroMemory(pevent, sizeof(USB_EVENT)); - InsertTailList(&pool->free_que, (PLIST_ENTRY) pevent); + InsertTailList(&pool->free_que, &pevent->event_link); pool->free_count++; usb_dbg_print(DBGLVL_MAXIMUM + 1, ("free_event(): alloced=0x%x, addr=0x%x\n", MAX_EVENTS - pool->free_count, pevent)); @@ -204,7 +204,7 @@ return FALSE; RtlZeroMemory(ptimer, sizeof(TIMER_SVC)); - InsertTailList(&pool->free_que, (PLIST_ENTRY) & ptimer->timer_svc_link); + InsertTailList(&pool->free_que, &ptimer->timer_svc_link); pool->free_count++; return TRUE; Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c [iso-8859-1] Thu Jun 4 13:37:57 2009 @@ -927,7 +927,7 @@ if (can_submit == STATUS_NO_MORE_ENTRIES) { //no enough bandwidth or tds - InsertHeadList(&pendp->urb_list, (PLIST_ENTRY) purb); + InsertHeadList(&pendp->urb_list, &purb->urb_link); InsertTailList(&temp_list, pthis); } else @@ -1332,7 +1332,7 @@ } pending_endp->pendp = purb->pendp; - InsertTailList(&ehci->pending_endp_list, (PLIST_ENTRY) pending_endp); + InsertTailList(&ehci->pending_endp_list, &pending_endp->endp_link); unlock_dev(pdev, TRUE); unlock_pending_endp_list(&ehci->pending_endp_list_lock); Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] Thu Jun 4 13:37:57 2009 @@ -180,7 +180,7 @@ } RtlZeroMemory(pending_endp, sizeof(UHCI_PENDING_ENDP)); - InsertTailList(&pool->free_que, (PLIST_ENTRY) & pending_endp->endp_link); + InsertTailList(&pool->free_que, &pending_endp->endp_link); pool->free_count++; return TRUE; @@ -1273,7 +1273,7 @@ if (can_submit == STATUS_NO_MORE_ENTRIES) { //no enough bandwidth or tds - InsertHeadList(&pendp->urb_list, (PLIST_ENTRY) purb); + InsertHeadList(&pendp->urb_list, &purb->urb_link); InsertTailList(&temp_list, pthis); } else @@ -1313,7 +1313,7 @@ RemoveEntryList(&abort_list); InsertTailList(pthis, cancel_list); - pwork_item = (PWORK_QUEUE_ITEM) & cancel_list[1]; + pwork_item = (PWORK_QUEUE_ITEM) (cancel_list + 1); // we do not need to worry the uhci_cancel_pending_endp_urb running when the // driver is unloading since it will prevent the dev_mgr to quit till all the @@ -1426,7 +1426,7 @@ } pending_endp->pendp = purb->pendp; - InsertTailList(&uhci->pending_endp_list, (PLIST_ENTRY) pending_endp); + InsertTailList(&uhci->pending_endp_list, &pending_endp->endp_link ); unlock_dev(pdev, TRUE); unlock_pending_endp_list(&uhci->pending_endp_list_lock); @@ -1742,7 +1742,7 @@ purb->flags &= ~URB_FLAG_STATE_MASK; purb->flags |= URB_FLAG_STATE_PENDING; - InsertHeadList(&pendp->urb_list, (PLIST_ENTRY) purb); + InsertHeadList(&pendp->urb_list, &purb->urb_link); } pending_endp = alloc_pending_endp(&uhci->pending_endp_pool, 1); @@ -2722,7 +2722,7 @@ if (pthis == NULL) return FALSE; - InsertTailList(&uhci->urb_list, (PLIST_ENTRY) urb); + InsertTailList(&uhci->urb_list, &urb->urb_link); urb->flags &= ~URB_FLAG_STATE_MASK; urb->flags |= URB_FLAG_STATE_IN_PROCESS | URB_FLAG_IN_SCHEDULE;

15 years, 5 months

[fireball] 41279: Mikhail Denisenko <denisenkom@gmail.com> - Split the PIDL into current and parent folder, and call GetFolderAttributes only for current folder PIDL. This fixes tons of "ERR: HCR_GetFolderAttributes should be called for simple PIDL's only!" debug log spam messages. See issue #4494 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Jun 4 13:01:10 2009 New Revision: 41279 URL: http://svn.reactos.org/svn/reactos?rev=41279&view=rev Log: Mikhail Denisenko <denisenkom(a)gmail.com> - Split the PIDL into current and parent folder, and call GetFolderAttributes only for current folder PIDL. This fixes tons of "ERR: HCR_GetFolderAttributes should be called for simple PIDL's only!" debug log spam messages. See issue #4494 for more details. Modified: trunk/reactos/base/shell/explorer/shell/shellfs.cpp Modified: trunk/reactos/base/shell/explorer/shell/shellfs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/shellfs.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/shellfs.cpp [iso-8859-1] Thu Jun 4 13:01:10 2009 @@ -172,7 +172,11 @@ SFGAOF attribs = SFGAO_FILESYSTEM; - if (FAILED(const_cast<ShellFolder&>(_folder)->GetAttributesOf(1, (LPCITEMIDLIST*)&_pidl, &attribs))) + // Split pidl into current and parent folder PIDLs + ShellPath pidlParent, pidlFolder; + _pidl.split(pidlParent, pidlFolder); + + if (FAILED(const_cast<ShellFolder&>(_folder)->GetAttributesOf(1, (LPCITEMIDLIST*)&pidlFolder, &attribs))) return false; if (!(attribs & SFGAO_FILESYSTEM))

15 years, 5 months

[dreimer] 41278: Bug 4567: Italian translation updates by Paolo Devoti

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Jun 4 12:47:44 2009 New Revision: 41278 URL: http://svn.reactos.org/svn/reactos?rev=41278&view=rev Log: Bug 4567: Italian translation updates by Paolo Devoti Modified: trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc trunk/reactos/base/applications/paint/lang/it-IT.rc trunk/reactos/dll/win32/syssetup/lang/it-IT.rc Modified: trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc [iso-8859-1] Thu Jun 4 12:47:44 2009 @@ -205,6 +205,7 @@ BEGIN IDS_NUM_SERVICES "Numero Servizi: %d" IDS_STOP_DEPENDS "Quando %s si ferma, Questi altri sevizi si fermeranno" + IDS_NO_DEPENDS "<Nessuna dipendenza>" IDS_LICENSE "Questo programma è software libero; puoi distribuirlo e/o modificarlo nei termini di licenza di 'GNU General Public License' come pubblicata dalla 'Free Software Foundation'; entrambe le versioni 2 della Licenza, o (a vostra scelta) qualunque versione successiva.\r\n\r\nQuesto programma è distribuito con l'augurio che sia utile, ma PRIVO DI OGNI GARANZIA; privo anche della garanzia implicita di COMMERCIABILITÀ o UTILIZZABILITÀ PER UNO SPECIFICO USO. Vedi la 'GNU General Public License' per ulteriori dettagli.\r\n\r\nVoi dovreste aver ricevuto una copia della 'GNU General Public License' assieme a questo programma; se non è cosi' scrivete a 'Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA'." END Modified: trunk/reactos/base/applications/paint/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/it-IT.rc [iso-8859-1] Thu Jun 4 12:47:44 2009 @@ -168,26 +168,26 @@ BEGIN IDS_PROGRAMNAME, "Paint" IDS_WINDOWTITLE, "%s - Paint" - IDS_INFOTITLE, "Paint for ReactOS" - IDS_INFOTEXT, "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL) version 3 (see www.gnu.org)" - IDS_SAVEPROMPTTEXT, "Do you want to save the changes to %s?" - IDS_DEFAULTFILENAME, "Unnamed.bmp" - IDS_TOOLTIP1, "Free selection" - IDS_TOOLTIP2, "Selection" - IDS_TOOLTIP3, "Rubber" - IDS_TOOLTIP4, "Fill with color" - IDS_TOOLTIP5, "Select color" + IDS_INFOTITLE, "Paint per ReactOS" + IDS_INFOTEXT, "Paint per ReactOS is available under the GNU Lesser General Public License (LGPL) version 3 (see www.gnu.org)" + IDS_SAVEPROMPTTEXT, "Volete salvare le modifiche a %s?" + IDS_DEFAULTFILENAME, "SenzaNome.bmp" + IDS_TOOLTIP1, "Selezione libera" + IDS_TOOLTIP2, "Selezione" + IDS_TOOLTIP3, "Gomma" + IDS_TOOLTIP4, "Riempimento con colore" + IDS_TOOLTIP5, "Selezione colore" IDS_TOOLTIP6, "Zoom" - IDS_TOOLTIP7, "Pencil" - IDS_TOOLTIP8, "Brush" - IDS_TOOLTIP9, "Airbrush" - IDS_TOOLTIP10, "Text" - IDS_TOOLTIP11, "Line" - IDS_TOOLTIP12, "Bezier curve" - IDS_TOOLTIP13, "Rectangle" - IDS_TOOLTIP14, "Polygon" - IDS_TOOLTIP15, "Ellipse" - IDS_TOOLTIP16, "Rounded rectangle" + IDS_TOOLTIP7, "Matita" + IDS_TOOLTIP8, "Pennello" + IDS_TOOLTIP9, "Aerografo" + IDS_TOOLTIP10, "Testo" + IDS_TOOLTIP11, "Linea" + IDS_TOOLTIP12, "Curva Bezier" + IDS_TOOLTIP13, "Rettangolo" + IDS_TOOLTIP14, "Poligono" + IDS_TOOLTIP15, "Ellisse" + IDS_TOOLTIP16, "Rettangolo arrotondato" IDS_OPENFILTER, "Bitmap files (*.bmp;*.dib)\1*.bmp;*.dib\1All files (*.*)\1*.*\1" IDS_SAVEFILTER, "24 bit bitmap (*.bmp;*.dib)\1*.bmp;*.dib\1" END Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/it… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] Thu Jun 4 12:47:44 2009 @@ -205,7 +205,7 @@ IDS_CMT_RDESKTOP "Avvia il Desktop remoto" IDS_CMT_EVENTVIEW "Lancia il visualizzatore degli eventi" IDS_CMT_MSCONFIG "Lancia il programma di configurazione del sistema" - IDS_CMT_PAINT "Launch Paint" + IDS_CMT_PAINT "Lancia Paint" END STRINGTABLE

15 years, 5 months

[mjmartin] 41277: - MiFindExportedRoutineByNam: Correct an typo in assert that caused MmGetSystemRoutineAddress to assert after finding a valid non forwarder function.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Thu Jun 4 12:18:12 2009 New Revision: 41277 URL: http://svn.reactos.org/svn/reactos?rev=41277&view=rev Log: - MiFindExportedRoutineByNam: Correct an typo in assert that caused MmGetSystemRoutineAddress to assert after finding a valid non forwarder function. Modified: trunk/reactos/ntoskrnl/mm/sysldr.c Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] Thu Jun 4 12:18:12 2009 @@ -281,7 +281,7 @@ Function = (PVOID)((ULONG_PTR)DllBase + ExportTable[Ordinal]); /* We found it! */ - ASSERT((Function > (PVOID)ExportDirectory) && + ASSERT(!(Function > (PVOID)ExportDirectory) && (Function < (PVOID)((ULONG_PTR)ExportDirectory + ExportSize))); return Function; }

15 years, 5 months

← Newer
1
...
42
43
44
45
46
47
48
49
50
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 June 2009