Ros-diffs April 2016

ros-diffs@reactos.org

13 participants
133 discussions

[tfaber] 71100: [WS2_32_APITEST] - Add test for getservbyport CORE-10440

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Apr 5 12:20:47 2016 New Revision: 71100 URL: http://svn.reactos.org/svn/reactos?rev=71100&view=rev Log: [WS2_32_APITEST] - Add test for getservbyport CORE-10440 Added: trunk/rostests/apitests/ws2_32/getservbyport.c (with props) Modified: trunk/rostests/apitests/ws2_32/CMakeLists.txt trunk/rostests/apitests/ws2_32/testlist.c Modified: trunk/rostests/apitests/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/CMakeList… ============================================================================== --- trunk/rostests/apitests/ws2_32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/CMakeLists.txt [iso-8859-1] Tue Apr 5 12:20:47 2016 @@ -1,6 +1,7 @@ list(APPEND SOURCE getaddrinfo.c + getservbyport.c helpers.c ioctlsocket.c nostartup.c Added: trunk/rostests/apitests/ws2_32/getservbyport.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/getservby… ============================================================================== --- trunk/rostests/apitests/ws2_32/getservbyport.c (added) +++ trunk/rostests/apitests/ws2_32/getservbyport.c [iso-8859-1] Tue Apr 5 12:20:47 2016 @@ -0,0 +1,144 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for getservbyport + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <ws2tcpip.h> + +START_TEST(getservbyport) +{ + WSADATA WsaData; + struct servent *Serv; + const struct + { + int Port; + struct + { + PCSTR Proto; + PCSTR Name; + PCSTR Aliases[5+1]; + } Protos[3+1]; + } Tests[] = + { + { 0, }, + { -1, }, + { 80, { { "tcp", "http", { "www", "www-http" } }, + { "udp", NULL }, + { "xyz", NULL } } }, + { 65536 + 80, { { "tcp", "http", { "www", "www-http" } } } }, + { 0xffff0050, { { "tcp", "http", { "www", "www-http" } } } }, + { 25, { { "tcp", "smtp", { "mail" } } } }, + { 445, { { "tcp", "microsoft-ds" }, + { "udp", "microsoft-ds" } } }, + { 514, { { "tcp", "cmd", { "shell" } }, + { "udp", "syslog" } } }, + { 47624, { { "tcp", "directplaysrvr" }, + { "udp", "directplaysrvr" } } }, + }; + ULONG i, Proto, Alias; + int Error; + ULONG ExpectProto; + + /* not yet initialized */ + Serv = getservbyport(0, NULL); + Error = WSAGetLastError(); + ok(Serv == NULL, "Serv = %p\n", Serv); + ok(Error == WSANOTINITIALISED, "Error = %d\n", Error); + + Error = WSAStartup(MAKEWORD(2, 2), &WsaData); + ok_dec(Error, 0); + + for (i = 0; i < RTL_NUMBER_OF(Tests); i++) + { + Proto = 0; + do + { + Serv = getservbyport(htons(Tests[i].Port), Tests[i].Protos[Proto].Proto); + Error = WSAGetLastError(); + + /* For a NULL proto we expect the same as the first array entry */ + ExpectProto = Proto; + if (Tests[i].Protos[Proto].Proto == NULL) + { + ExpectProto = 0; + } + + if (Tests[i].Protos[ExpectProto].Name == NULL) + { + ok(Serv == NULL, "[%d, %s] getservbyport succeeded unexpectedly\n", + Tests[i].Port, Tests[i].Protos[Proto].Proto); + ok(Error == WSANO_DATA, "[%d, %s] getservbyport returned error %d\n", + Tests[i].Port, Tests[i].Protos[Proto].Proto, Error); + continue; + } + else + { + ok(Serv != NULL, "[%d, %s] getservbyport failed with %d\n", + Tests[i].Port, Tests[i].Protos[Proto].Proto, Error); + } + + if (Serv == NULL) + { + continue; + } + + /* Check name */ + ok(!strcmp(Serv->s_name, Tests[i].Protos[ExpectProto].Name), + "[%d, %s] s_name = '%s', expected '%s'\n", + Tests[i].Port, Tests[i].Protos[Proto].Proto, Serv->s_name, Tests[i].Protos[ExpectProto].Name); + + /* Check aliases */ + ok(Serv->s_aliases != NULL, "[%d, %s] s_aliases = NULL\n", + Tests[i].Port, Tests[i].Protos[Proto].Proto); + for (Alias = 0; Serv->s_aliases; Alias++) + { + if (Alias >= RTL_NUMBER_OF(Tests[i].Protos[ExpectProto].Aliases)) + { + ok(0, "[%d, %s] Too many aliases\n", + Tests[i].Port, Tests[i].Protos[Proto].Proto); + break; + } + if (Serv->s_aliases[Alias] == NULL) + { + ok(Tests[i].Protos[ExpectProto].Aliases[Alias] == NULL, + "[%d, %s] getservbyport did not return expected alias '%s'\n", + Tests[i].Port, Tests[i].Protos[Proto].Proto, Tests[i].Protos[ExpectProto].Aliases[Alias]); + break; + } + if (Tests[i].Protos[ExpectProto].Aliases[Alias] == NULL) + { + ok(Serv->s_aliases[Alias] == NULL, + "[%d, %s] getservbyport returned additional alias '%s'\n", + Tests[i].Port, Tests[i].Protos[Proto].Proto, Serv->s_aliases[Alias]); + break; + } + + ok(!strcmp(Serv->s_aliases[Alias], Tests[i].Protos[ExpectProto].Aliases[Alias]), + "[%d, %s] Got alias '%s', expected '%s'\n", + Tests[i].Port, Tests[i].Protos[Proto].Proto, Serv->s_aliases[Alias],Tests[i].Protos[ExpectProto].Aliases[Alias]); + } + + /* Port should be equal (upper bits are ignored) */ + ok(ntohs(Serv->s_port) == (Tests[i].Port & 0xffff), "[%d, %s] s_port = %d\n", + Tests[i].Port, Tests[i].Protos[Proto].Proto, ntohs(Serv->s_port)); + + /* Check proto */ + ok(Serv->s_proto != NULL, "[%d, %s] s_proto = NULL\n", + Tests[i].Port, Tests[i].Protos[Proto].Proto); + /* We want to include one NULL past the last proto in the array */ + } while (Tests[i].Protos[Proto++].Proto != NULL); + } + + Error = WSACleanup(); + ok_dec(Error, 0); +} Propchange: trunk/rostests/apitests/ws2_32/getservbyport.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ws2_32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/testlist.… ============================================================================== --- trunk/rostests/apitests/ws2_32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/testlist.c [iso-8859-1] Tue Apr 5 12:20:47 2016 @@ -4,6 +4,7 @@ #include <apitest.h> extern void func_getaddrinfo(void); +extern void func_getservbyport(void); extern void func_ioctlsocket(void); extern void func_recv(void); extern void func_send(void); @@ -13,6 +14,7 @@ const struct test winetest_testlist[] = { { "getaddrinfo", func_getaddrinfo }, + { "getservbyport", func_getservbyport }, { "ioctlsocket", func_ioctlsocket }, { "nostartup", func_nostartup }, { "recv", func_recv },

8 years, 5 months

[rnaumann] 71099: [EXPLORER] Add missing German translation. Patch by Joachim Henze. CORE-11075

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Mon Apr 4 18:10:01 2016 New Revision: 71099 URL: http://svn.reactos.org/svn/reactos?rev=71099&view=rev Log: [EXPLORER] Add missing German translation. Patch by Joachim Henze. CORE-11075 Modified: trunk/reactos/base/shell/explorer/lang/de-DE.rc Modified: trunk/reactos/base/shell/explorer/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/d… ============================================================================== --- trunk/reactos/base/shell/explorer/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/lang/de-DE.rc [iso-8859-1] Mon Apr 4 18:10:01 2016 @@ -100,37 +100,37 @@ IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP -CAPTION "Customize Notifications" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "ReactOS displays icons for active and urgent notifications, and hides inactive ones. You can change this behavior for items in the list below.", IDC_STATIC, 6, 6, 220, 30 - LTEXT "Select an item, then choose its notification behavior:", IDC_STATIC, 6, 40, 220, 10 +CAPTION "Infobereich anpassen" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS zeigt Symbole fÃ¼r aktive und dringende Benachrichtigungen an und blendet inaktive aus. Sie kÃ¶nnen dieses Verhalten fÃ¼r Elemente in der folgenden Liste Ã¤ndern.", IDC_STATIC, 6, 6, 220, 30 + LTEXT "Markieren Sie ein Element und wÃ¤hlen Sie dessen Verhalten:", IDC_STATIC, 6, 40, 220, 10 CONTROL "", IDC_NOTIFICATION_LIST, "SysListView32", WS_CLIPSIBLINGS | WS_BORDER | 0x00008005, 6, 50, 220, 128 COMBOBOX IDC_NOTIFICATION_BEHAVIOUR, 103, 178, 78, 200, CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_CLIPSIBLINGS - PUSHBUTTON "&Restore Defaults", IDC_TASKBARPROP_NOTIREST, 164, 188, 62, 14 + PUSHBUTTON "&Wiederherstellen", IDC_TASKBARPROP_NOTIREST, 164, 188, 62, 14 DEFPUSHBUTTON "OK", IDOK, 122, 220, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 176, 220, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 176, 220, 50, 14 END IDD_CLASSICSTART_CUSTOMIZE DIALOGEX 0, 0, 232, 240, 0 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME -CAPTION "Customize Classic Start Menu" -FONT 8, "MS Shell Dlg" -{ - GROUPBOX "Start menu", IDC_STATIC, 8, 7, 218, 114 +CAPTION "Klassisches StartmenÃ¼ anpassen" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "StartmenÃ¼", IDC_STATIC, 8, 7, 218, 114 ICON IDI_STARTMENU2, IDC_STATIC, 19, 17, 20, 20 - LTEXT "You can customize your Start menu by adding or removing items.", IDC_STATIC, 48, 17, 108, 39 - PUSHBUTTON "A&dd...", IDC_CLASSICSTART_ADD, 162, 18, 53, 14 - PUSHBUTTON "&Remove...", IDC_CLASSICSTART_REMOVE, 162, 33, 53, 14 - PUSHBUTTON "Ad&vanced", IDC_CLASSICSTART_ADVANCED, 162, 49, 53, 14 - PUSHBUTTON "&Sort", IDC_CLASSICSTART_SORT, 162, 65, 53, 14 + LTEXT "Sie kÃ¶nnen das StartmenÃ¼ anpassen, indem Sie Elemente hinzufÃ¼gen oder davon entfernen.", IDC_STATIC, 48, 17, 108, 39 + PUSHBUTTON "&HinzufÃ¼gen...", IDC_CLASSICSTART_ADD, 162, 18, 53, 14 + PUSHBUTTON "&Entfernen...", IDC_CLASSICSTART_REMOVE, 162, 33, 53, 14 + PUSHBUTTON "Er&weitert", IDC_CLASSICSTART_ADVANCED, 162, 49, 53, 14 + PUSHBUTTON "&Sortieren", IDC_CLASSICSTART_SORT, 162, 65, 53, 14 ICON IDI_RECYCLEBIN, IDC_STATIC, 20, 85, 20, 20 - LTEXT "To remove records of recently accessed documents, programs, and Web sites, click Clear.", IDC_STATIC, 49, 85, 108, 33 - PUSHBUTTON "&Clear", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14 - LTEXT "Advanced S&tart menu options:", IDC_STATIC, 8, 129, 150, 8 + LTEXT "LÃ¶schen Sie kÃ¼rzlich verwendete Dokumente, Programme und Webseiten.", IDC_STATIC, 49, 85, 108, 33 + PUSHBUTTON "&LÃ¶schen", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14 + LTEXT "Erweiterte StartmenÃ¼&optionen:", IDC_STATIC, 8, 129, 150, 8 CONTROL "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, "SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE DEFPUSHBUTTON "OK", IDOK, 122, 220, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 176, 220, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 176, 220, 50, 14 } IDD_FILENAME_WARNING DIALOGEX 0, 0, 272, 81, 0 @@ -148,40 +148,40 @@ IDD_MODERNSTART_ADVANCED DIALOGEX 0, 0, 251, 198, 0 STYLE DS_SETFONT | WS_CAPTION | WS_CHILD | WS_DISABLED -CAPTION "Advanced" -FONT 8, "MS Shell Dlg" -{ - GROUPBOX "Start menu settings ", IDC_STATIC, 7, 7, 238, 42 - AUTOCHECKBOX "&Open submenus when I pause on them with my mouse", IDC_AUTOOPEN, 14, 21, 224, 10 - AUTOCHECKBOX "Highlight &newly installed programs", IDC_HIGHLIGHT, 14, 35, 224, 10 - LTEXT "Start &menu items:", IDC_STATIC, 7, 53, 238, 8 - CONTROL "StartMenuSe&ttings", IDC_ITEMS, "SysTreeView32", WS_BORDER | 0x00000001, 7, 63, 238, 67, WS_EX_CLIENTEDGE - GROUPBOX "Recent documents ", IDC_STATIC, 7, 133, 238, 56 - LTEXT "Select this option to provide quick access to the documents you opened most recently. Clearing this list does not delete the documents.", IDC_STATIC, 14, 144, 224, 21 - AUTOCHECKBOX "List my most &recently opened documents", IDC_RECENTLY, 14, 168, 147, 10 - PUSHBUTTON "&Clear List", IDC_CLEAR, 182, 168, 55, 14 +CAPTION "Erweitert" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "StartmenÃ¼einstellungen ", IDC_STATIC, 7, 7, 238, 42 + AUTOCHECKBOX "&UntermenÃ¼s beim darauf Zeigen Ã¶ffnen", IDC_AUTOOPEN, 14, 21, 224, 10 + AUTOCHECKBOX "&Zuletzt installierte Programme hervorheben", IDC_HIGHLIGHT, 14, 35, 224, 10 + LTEXT "StartmenÃ¼einstellungen:", IDC_STATIC, 7, 53, 238, 8 + CONTROL "Start&menÃ¼elemente", IDC_ITEMS, "SysTreeView32", WS_BORDER | 0x00000001, 7, 63, 238, 67, WS_EX_CLIENTEDGE + GROUPBOX "Zuletzt verwendete Dokumente ", IDC_STATIC, 7, 133, 238, 56 + LTEXT "WÃ¤hlen Sie diese Option, um einen schnellen Zugriff auf zuletzt verwendete Dokumente zu haben. Durch das LÃ¶schen der Liste werden die Dokumente nicht gelÃ¶scht.", IDC_STATIC, 14, 144, 224, 25 + AUTOCHECKBOX "Zuletzt &verwendete Dokumente auflisten", IDC_RECENTLY, 14, 171, 147, 10 + PUSHBUTTON "&Liste lÃ¶schen", IDC_CLEAR, 182, 169, 55, 14 } IDD_MODERNSTART_GENERAL DIALOGEX 0, 0, 251, 198 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_DLGFRAME -CAPTION "General" -FONT 8, "MS Shell Dlg" -{ - GROUPBOX "Select an icon size for programs ", IDC_STATIC, 7, 7, 238, 37 +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "SymbolgrÃ¶Ãe fÃ¼r Programme ", IDC_STATIC, 7, 7, 238, 37 ICON IDC_LARGEICON, 17, 18, 20, 20, SS_CENTERIMAGE ICON IDC_SMALLICON, 151, 18, 20, 20, SS_CENTERIMAGE - AUTORADIOBUTTON "&Large icons", IDC_CHOOSELARGE, 43, 25, 53, 10 - AUTORADIOBUTTON "&Small icons", IDC_CHOOSESMALL, 177, 25, 51, 10, NOT WS_TABSTOP - GROUPBOX "Programs ", IDC_STATIC, 7, 49, 238, 70 - LTEXT "The Start menu contains shortcuts to the programs you use most often. Clearing the list of shortcuts does not delete the programs.", IDC_STATIC, 14, 63, 224, 20 - LTEXT "&Number of programs on Start menu:", IDC_STATIC, 14, 86, 112, 8 - EDITTEXT IDC_NUMBEROFPROGRAMS, 133, 84, 27, 12, ES_LEFT | ES_RIGHT | ES_NUMBER - CONTROL "", IDC_NUMBERUPDOWN, "msctls_updown32", WS_BORDER | 0x000000B6, 160, 84, 11, 12 - PUSHBUTTON "&Clear List", IDC_CLEARLIST, 182, 98, 57, 14 - GROUPBOX "Show on Start menu ", IDC_STATIC, 7, 126, 238, 63 + AUTORADIOBUTTON "&GroÃe Symbole", IDC_CHOOSELARGE, 43, 25, 60, 10 + AUTORADIOBUTTON "&Kleine Symbole", IDC_CHOOSESMALL, 166, 25, 75, 10, NOT WS_TABSTOP + GROUPBOX "Programme ", IDC_STATIC, 7, 49, 238, 70 + LTEXT "Das StartmenÃ¼ enthÃ¤lt VerknÃ¼pfungen zu den am hÃ¤ufigsten verwendeten Programmen. Durch das LÃ¶schen der VerknÃ¼pfungsliste werden die Programme nicht gelÃ¶scht.", IDC_STATIC, 14, 61, 224, 34 + LTEXT "&Anzahl der Programme im StartmenÃ¼:", IDC_STATIC, 14, 100, 120, 8 + EDITTEXT IDC_NUMBEROFPROGRAMS, 133, 98, 29, 12, ES_LEFT | ES_RIGHT | ES_NUMBER + CONTROL "", IDC_NUMBERUPDOWN, "msctls_updown32", WS_BORDER | 0x000000B6, 156, 98, 11, 12 + PUSHBUTTON "&Liste LÃ¶schen", IDC_CLEARLIST, 182, 98, 57, 14 + GROUPBOX "Im StartmenÃ¼ anzeigen ", IDC_STATIC, 7, 126, 238, 63 AUTOCHECKBOX "&Internet:", IDC_SHOWINTERNET, 14, 140, 42, 10 COMBOBOX IDC_INTERNETDEFAULTAPP, 98, 138, 140, 200, CBS_DROPDOWNLIST | WS_VSCROLL - AUTOCHECKBOX "&E-mail:", IDC_SHOWEMAIL, 14, 157, 37, 10 + AUTOCHECKBOX "&E-Mail:", IDC_SHOWEMAIL, 14, 157, 37, 10 COMBOBOX IDC_EMAILDEFAULTAPP, 98, 155, 140, 200, CBS_DROPDOWNLIST | WS_VSCROLL }

8 years, 5 months

[ekohl] 71098: [SERVMAN] Improved column ordering. Patch by Carlo Bramini. CORE-10674 #resolve #comment Thanks a lot!

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Apr 3 22:13:01 2016 New Revision: 71098 URL: http://svn.reactos.org/svn/reactos?rev=71098&view=rev Log: [SERVMAN] Improved column ordering. Patch by Carlo Bramini. CORE-10674 #resolve #comment Thanks a lot! Modified: trunk/reactos/base/applications/mscutils/servman/listview.c trunk/reactos/base/applications/mscutils/servman/mainwnd.c trunk/reactos/base/applications/mscutils/servman/precomp.h trunk/reactos/base/applications/mscutils/servman/servman.c Modified: trunk/reactos/base/applications/mscutils/servman/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/listview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/listview.c [iso-8859-1] Sun Apr 3 22:13:01 2016 @@ -8,6 +8,27 @@ */ #include "precomp.h" + +typedef struct _COLUMN_LIST +{ + int iSubItem; + int cx; + UINT idsText; +} COLUMN_LIST; + +static const COLUMN_LIST Columns[] = +{ + /* name */ + { LVNAME, 150, IDS_FIRSTCOLUMN }, + /* description */ + { LVDESC, 240, IDS_SECONDCOLUMN }, + /* status */ + { LVSTATUS, 55, IDS_THIRDCOLUMN }, + /* startup type */ + { LVSTARTUP, 80, IDS_FOURTHCOLUMN }, + /* logon as */ + { LVLOGONAS, 100, IDS_FITHCOLUMN }, +}; VOID SetListViewStyle(HWND hListView, @@ -336,6 +357,8 @@ { LVCOLUMNW lvc = { 0 }; WCHAR szTemp[256]; + HDITEM hdi; + int i, n; Info->hListView = CreateWindowExW(WS_EX_CLIENTEDGE, WC_LISTVIEWW, @@ -356,72 +379,32 @@ return FALSE; } + Info->hHeader = ListView_GetHeader(Info->hListView); + (void)ListView_SetExtendedListViewStyle(Info->hListView, LVS_EX_FULLROWSELECT | LVS_EX_HEADERDRAGDROP);/*LVS_EX_GRIDLINES |*/ lvc.mask = LVCF_TEXT | LVCF_SUBITEM | LVCF_WIDTH | LVCF_FMT; lvc.fmt = LVCFMT_LEFT; + lvc.pszText = szTemp; /* Add columns to the list-view */ - /* name */ - lvc.iSubItem = LVNAME; - lvc.cx = 150; - LoadStringW(hInstance, - IDS_FIRSTCOLUMN, - szTemp, - sizeof(szTemp) / sizeof(WCHAR)); - lvc.pszText = szTemp; - (void)ListView_InsertColumn(Info->hListView, - 0, - &lvc); - - /* description */ - lvc.iSubItem = LVDESC; - lvc.cx = 240; - LoadStringW(hInstance, - IDS_SECONDCOLUMN, - szTemp, - sizeof(szTemp) / sizeof(WCHAR)); - lvc.pszText = szTemp; - (void)ListView_InsertColumn(Info->hListView, - 1, - &lvc); - - /* status */ - lvc.iSubItem = LVSTATUS; - lvc.cx = 55; - LoadStringW(hInstance, - IDS_THIRDCOLUMN, - szTemp, - sizeof(szTemp) / sizeof(WCHAR)); - lvc.pszText = szTemp; - (void)ListView_InsertColumn(Info->hListView, - 2, - &lvc); - - /* startup type */ - lvc.iSubItem = LVSTARTUP; - lvc.cx = 80; - LoadStringW(hInstance, - IDS_FOURTHCOLUMN, - szTemp, - sizeof(szTemp) / sizeof(WCHAR)); - lvc.pszText = szTemp; - (void)ListView_InsertColumn(Info->hListView, - 3, - &lvc); - - /* logon as */ - lvc.iSubItem = LVLOGONAS; - lvc.cx = 100; - LoadStringW(hInstance, - IDS_FITHCOLUMN, - szTemp, - sizeof(szTemp) / sizeof(WCHAR)); - lvc.pszText = szTemp; - (void)ListView_InsertColumn(Info->hListView, - 4, - &lvc); + for (n = 0; n < sizeof(Columns) / sizeof(Columns[0]); n++) + { + lvc.iSubItem = Columns[n].iSubItem; + lvc.cx = Columns[n].cx; + + LoadStringW(hInstance, + Columns[n].idsText, + szTemp, + sizeof(szTemp) / sizeof(szTemp[0])); + + i = ListView_InsertColumn(Info->hListView, Columns[n].iSubItem, &lvc); + + hdi.mask = HDI_LPARAM; + hdi.lParam = ORD_ASCENDING; + (void)Header_SetItem(Info->hHeader, i, &hdi); + } InitListViewImage(Info); Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/mainwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/mainwnd.c [iso-8859-1] Sun Apr 3 22:13:01 2016 @@ -12,11 +12,6 @@ #include <windowsx.h> static const WCHAR szMainWndClass[] = L"ServManWndClass"; - -BOOL bSortAscending = TRUE; - -/* Temporary copy for access from list-view sort CompareFunc */ -HWND hListView; /* Toolbar buttons */ static const TBBUTTON Buttons [] = @@ -246,21 +241,13 @@ static INT CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort) { + PMAIN_WND_INFO Info = (PMAIN_WND_INFO)lParamSort; WCHAR Item1[256], Item2[256]; - LVFINDINFO IndexInfo; - INT Index; - - IndexInfo.flags = LVFI_PARAM; - - IndexInfo.lParam = lParam1; - Index = ListView_FindItem(hListView, -1, &IndexInfo); - ListView_GetItemText(hListView, Index, (INT)lParamSort, Item1, sizeof(Item1) / sizeof(WCHAR)); - - IndexInfo.lParam = lParam2; - Index = ListView_FindItem(hListView, -1, &IndexInfo); - ListView_GetItemText(hListView, Index, (INT)lParamSort, Item2, sizeof(Item2) / sizeof(WCHAR)); - - return bSortAscending ? wcscmp(Item1, Item2) : wcscmp(Item2, Item1); + + ListView_GetItemText(Info->hListView, lParam1, Info->SortSelection, Item1, sizeof(Item1) / sizeof(WCHAR)); + ListView_GetItemText(Info->hListView, lParam2, Info->SortSelection, Item2, sizeof(Item2) / sizeof(WCHAR)); + + return wcscmp(Item1, Item2) * Info->SortDirection; } @@ -737,23 +724,26 @@ case LVN_COLUMNCLICK: { - static int iLastSortColumn = 0; LPNMLISTVIEW pnmv = (LPNMLISTVIEW) lParam; + HDITEM hdi; + + /* get pending sort direction for clicked column */ + hdi.mask = HDI_LPARAM; + (void)Header_GetItem(Info->hHeader, pnmv->iSubItem, &hdi); /* get new sort parameters */ - if (pnmv->iSubItem == iLastSortColumn) - bSortAscending = !bSortAscending; - else - { - iLastSortColumn = pnmv->iSubItem; - bSortAscending = TRUE; - } - - /* store a copy to have access from callback */ - hListView = Info->hListView; - (void)ListView_SortItems(Info->hListView, - CompareFunc, - pnmv->iSubItem); + Info->SortSelection = pnmv->iSubItem; + Info->SortDirection = hdi.lParam; + + /* set new sort direction and save */ + hdi.lParam = (hdi.lParam == ORD_ASCENDING) ? + ORD_DESCENDING : ORD_ASCENDING; + + (void)Header_SetItem(Info->hHeader, pnmv->iSubItem, &hdi); + + (void)ListView_SortItemsEx(Info->hListView, + CompareFunc, + (LPARAM)Info); } break; case LVN_ITEMCHANGED: Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] Sun Apr 3 22:13:01 2016 @@ -46,12 +46,16 @@ #define ACTION_RESUME 4 #define ACTION_RESTART 5 +#define ORD_ASCENDING 1 +#define ORD_DESCENDING -1 + typedef struct _MAIN_WND_INFO { HWND hMainWnd; HWND hListView; HWND hStatus; HWND hTool; + HWND hHeader; HMENU hShortcutMenu; int nCmdShow; @@ -59,6 +63,9 @@ ENUM_SERVICE_STATUS_PROCESS *pCurrentService; INT SelectedItem;/* selection number in the list view */ + INT SortSelection; + INT SortDirection; + BOOL bDlgOpen; BOOL bInMenuLoop; BOOL bIsUserAnAdmin; Modified: trunk/reactos/base/applications/mscutils/servman/servman.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/servman.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/servman.c [iso-8859-1] Sun Apr 3 22:13:01 2016 @@ -41,7 +41,7 @@ ProcessHeap = GetProcessHeap(); icex.dwSize = sizeof(INITCOMMONCONTROLSEX); - icex.dwICC = ICC_BAR_CLASSES | ICC_COOL_CLASSES; + icex.dwICC = ICC_WIN95_CLASSES | ICC_COOL_CLASSES; InitCommonControlsEx(&icex); if (!AllocAndLoadString(&lpAppName,

8 years, 5 months

[tfaber] 71097: [KERNEL32] - Correctly calculate the buffer size if the PATH variable is set but empty in BasepComputeProcessPath. Yes, this is a bug in Windows. CORE-11080 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Apr 3 20:48:51 2016 New Revision: 71097 URL: http://svn.reactos.org/svn/reactos?rev=71097&view=rev Log: [KERNEL32] - Correctly calculate the buffer size if the PATH variable is set but empty in BasepComputeProcessPath. Yes, this is a bug in Windows. CORE-11080 #resolve Modified: trunk/reactos/dll/win32/kernel32/client/path.c Modified: trunk/reactos/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] Sun Apr 3 20:48:51 2016 @@ -210,9 +210,13 @@ } else { - /* Add the length of the PATH variable */ + /* Add the length of the PATH variable unless it's empty */ ASSERT(!(EnvPath.Length & 1)); - PathLengthInBytes += (EnvPath.Length + sizeof(L';')); + if (EnvPath.Length) + { + /* Reserve space for the variable and a semicolon */ + PathLengthInBytes += (EnvPath.Length + sizeof(L';')); + } } break;

8 years, 5 months

[pschweitzer] 71096: [NTOSKRNL] Rework debug prints in Mcb, this is what helped bringing the infamous r71091. NFC. CORE-11002

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Apr 3 20:17:09 2016 New Revision: 71096 URL: http://svn.reactos.org/svn/reactos?rev=71096&view=rev Log: [NTOSKRNL] Rework debug prints in Mcb, this is what helped bringing the infamous r71091. NFC. CORE-11002 Modified: trunk/reactos/ntoskrnl/fsrtl/largemcb.c Modified: trunk/reactos/ntoskrnl/fsrtl/largemcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/largemcb.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] Sun Apr 3 20:17:09 2016 @@ -134,13 +134,25 @@ IN LONGLONG Lbn, IN LONGLONG SectorCount) { + BOOLEAN Result = TRUE; PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; LARGE_MCB_MAPPING_ENTRY Node, NeedleRun; PLARGE_MCB_MAPPING_ENTRY LowerRun, HigherRun; BOOLEAN NewElement; - if (Vbn < 0) return FALSE; - if (SectorCount <= 0) return FALSE; + DPRINT("FsRtlAddBaseMcbEntry(%p, %I64d, %I64d, %I64d)\n", OpaqueMcb, Vbn, Lbn, SectorCount); + + if (Vbn < 0) + { + Result = FALSE; + goto quit; + } + + if (SectorCount <= 0) + { + Result = FALSE; + goto quit; + } /* clean any possible previous entries in our range */ FsRtlRemoveBaseMcbEntry(OpaqueMcb, Vbn, SectorCount); @@ -239,7 +251,10 @@ Overwriting existing mapping is not possible and results in FALSE being returned */ - return TRUE; + +quit: + DPRINT("FsRtlAddBaseMcbEntry(%p, %I64d, %I64d, %I64d) = %d\n", Mcb, Vbn, Lbn, SectorCount, Result); + return Result; } /* @@ -254,7 +269,7 @@ { BOOLEAN Result; - DPRINT("Mcb %p Vbn %I64d Lbn %I64d SectorCount %I64d\n", Mcb, Vbn, Lbn, SectorCount); + DPRINT("FsRtlAddLargeMcbEntry(%p, %I64d, %I64d, %I64d)\n", Mcb, Vbn, Lbn, SectorCount); KeAcquireGuardedMutex(Mcb->GuardedMutex); Result = FsRtlAddBaseMcbEntry(&(Mcb->BaseMcb), @@ -263,7 +278,7 @@ SectorCount); KeReleaseGuardedMutex(Mcb->GuardedMutex); - DPRINT("Done %u\n", Result); + DPRINT("FsRtlAddLargeMcbEntry(%p, %I64d, %I64d, %I64d) = %d\n", Mcb, Vbn, Lbn, SectorCount, Result); return Result; } @@ -297,10 +312,13 @@ OUT PLONGLONG Lbn, OUT PLONGLONG SectorCount) { + BOOLEAN Result = FALSE; PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; ULONG RunIndexRemaining; PLARGE_MCB_MAPPING_ENTRY Run, RunFound = NULL, RunFoundLower = NULL, RunFoundHigher = NULL; BOOLEAN First = TRUE; + + DPRINT("FsRtlGetNextBaseMcbEntry(%p, %d, %p, %p, %p)\n", OpaqueMcb, RunIndex, Vbn, Lbn, SectorCount); RunIndexRemaining = RunIndex; @@ -366,7 +384,8 @@ if (SectorCount) *SectorCount = RunFound->RunEndVbn.QuadPart - RunFound->RunStartVbn.QuadPart; - return TRUE; + Result = TRUE; + goto quit; } if (RunFoundLower && RunFoundHigher) @@ -380,11 +399,15 @@ if (SectorCount) *SectorCount = RunFoundHigher->RunStartVbn.QuadPart - RunFoundLower->RunEndVbn.QuadPart; - return TRUE; + Result = TRUE; + goto quit; } ASSERT(RunFoundHigher == NULL); - return FALSE; + +quit: + DPRINT("FsRtlGetNextBaseMcbEntry(%p, %d, %p, %p, %p) = %d (%I64d, %I64d, %I64d)\n", Mcb, RunIndex, Vbn, Lbn, SectorCount, Result, *Vbn, *Lbn, *SectorCount); + return Result; } /* @@ -400,7 +423,7 @@ { BOOLEAN Result; - DPRINT("FsRtlGetNextLargeMcbEntry Mcb %p RunIndex %lu\n", Mcb, RunIndex); + DPRINT("FsRtlGetNextLargeMcbEntry(%p, %d, %p, %p, %p)\n", Mcb, RunIndex, Vbn, Lbn, SectorCount); KeAcquireGuardedMutex(Mcb->GuardedMutex); Result = FsRtlGetNextBaseMcbEntry(&(Mcb->BaseMcb), @@ -410,7 +433,7 @@ SectorCount); KeReleaseGuardedMutex(Mcb->GuardedMutex); - DPRINT("Done %u\n", Result); + DPRINT("FsRtlGetNextLargeMcbEntry(%p, %d, %p, %p, %p) = %d (%I64d, %I64d, %I64d)\n", Mcb, RunIndex, Vbn, Lbn, SectorCount, Result, *Vbn, *Lbn, *SectorCount); return Result; } @@ -454,6 +477,8 @@ FsRtlInitializeLargeMcb(IN PLARGE_MCB Mcb, IN POOL_TYPE PoolType) { + DPRINT("FsRtlInitializeLargeMcb(%p, %d)\n", Mcb, PoolType); + Mcb->GuardedMutex = ExAllocateFromNPagedLookasideList(&FsRtlFastMutexLookasideList); KeInitializeGuardedMutex(Mcb->GuardedMutex); @@ -511,12 +536,14 @@ OUT PLONGLONG SectorCountFromStartingLbn OPTIONAL, OUT PULONG Index OPTIONAL) { + BOOLEAN Result = FALSE; PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; - ULONG RunIndex = 0; PLARGE_MCB_MAPPING_ENTRY Run, RunFound = NULL, RunFoundLower = NULL, RunFoundHigher = NULL; BOOLEAN First = TRUE; + + DPRINT("FsRtlLookupBaseMcbEntry(%p, %I64d, %p, %p, %p, %p, %p)\n", OpaqueMcb, Vbn, Lbn, SectorCountFromLbn, StartingLbn, SectorCountFromStartingLbn, Index); /* Traverse the tree */ for (Run = (PLARGE_MCB_MAPPING_ENTRY)RtlEnumerateGenericTable(&Mcb->Mapping->Table, TRUE); @@ -583,7 +610,8 @@ if (Index) *Index = RunIndex; - return TRUE; + Result = TRUE; + goto quit; } if (RunFoundHigher) @@ -602,11 +630,19 @@ if (Index) *Index = RunIndex - 2; - return TRUE; + Result = TRUE; + goto quit; } /* We may have some 'RunFoundLower'. */ - return FALSE; + +quit: + DPRINT("FsRtlLookupBaseMcbEntry(%p, %I64d, %p, %p, %p, %p, %p) = %d (%I64d, %I64d, %I64d, %I64d, %d)\n", + OpaqueMcb, Vbn, Lbn, SectorCountFromLbn, StartingLbn, SectorCountFromStartingLbn, Index, Result, + (Lbn ? *Lbn : (ULONGLONG)-1), (SectorCountFromLbn ? *SectorCountFromLbn : (ULONGLONG)-1), (StartingLbn ? *StartingLbn : (ULONGLONG)-1), + (SectorCountFromStartingLbn ? *SectorCountFromStartingLbn : (ULONGLONG)-1), (Index ? *Index : (ULONG)-1)); + + return Result; } /* @@ -624,7 +660,7 @@ { BOOLEAN Result; - DPRINT("FsRtlLookupLargeMcbEntry Mcb %p Vbn %I64d\n", Mcb, Vbn); + DPRINT("FsRtlLookupLargeMcbEntry(%p, %I64d, %p, %p, %p, %p, %p)\n", Mcb, Vbn, Lbn, SectorCountFromLbn, StartingLbn, SectorCountFromStartingLbn, Index); KeAcquireGuardedMutex(Mcb->GuardedMutex); Result = FsRtlLookupBaseMcbEntry(&(Mcb->BaseMcb), @@ -636,7 +672,10 @@ Index); KeReleaseGuardedMutex(Mcb->GuardedMutex); - DPRINT("Done %u\n", Result); + DPRINT("FsRtlLookupLargeMcbEntry(%p, %I64d, %p, %p, %p, %p, %p) = %d (%I64d, %I64d, %I64d, %I64d, %d)\n", + Mcb, Vbn, Lbn, SectorCountFromLbn, StartingLbn, SectorCountFromStartingLbn, Index, Result, + (Lbn ? *Lbn : (ULONGLONG)-1), (SectorCountFromLbn ? *SectorCountFromLbn : (ULONGLONG)-1), (StartingLbn ? *StartingLbn : (ULONGLONG)-1), + (SectorCountFromStartingLbn ? *SectorCountFromStartingLbn : (ULONGLONG)-1), (Index ? *Index : (ULONG)-1)); return Result; } @@ -705,9 +744,16 @@ IN OUT PLONGLONG LargeLbn, IN OUT PULONG Index) { + BOOLEAN Result; PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; - return FsRtlLookupLastLargeMcbEntryAndIndex_internal(Mcb, LargeVbn, LargeLbn, Index); + DPRINT("FsRtlLookupLastBaseMcbEntryAndIndex(%p, %p, %p, %p)\n", OpaqueMcb, LargeVbn, LargeLbn, Index); + + Result = FsRtlLookupLastLargeMcbEntryAndIndex_internal(Mcb, LargeVbn, LargeLbn, Index); + + DPRINT("FsRtlLookupLastBaseMcbEntryAndIndex(%p, %p, %p, %p) = %d (%I64d, %I64d, %d)\n", OpaqueMcb, LargeVbn, LargeLbn, Index, Result, *LargeVbn, *LargeLbn, *Index); + + return Result; } /* @@ -722,7 +768,7 @@ { BOOLEAN Result; - DPRINT("FsRtlLookupLastLargeMcbEntryAndIndex %p\n", OpaqueMcb); + DPRINT("FsRtlLookupLastLargeMcbEntryAndIndex(%p, %p, %p, %p)\n", OpaqueMcb, LargeVbn, LargeLbn, Index); KeAcquireGuardedMutex(OpaqueMcb->GuardedMutex); Result = FsRtlLookupLastBaseMcbEntryAndIndex(&(OpaqueMcb->BaseMcb), @@ -731,7 +777,7 @@ Index); KeReleaseGuardedMutex(OpaqueMcb->GuardedMutex); - DPRINT("Done %u\n", Result); + DPRINT("FsRtlLookupLastLargeMcbEntryAndIndex(%p, %p, %p, %p) = %d (%I64d, %I64d, %d)\n", OpaqueMcb, LargeVbn, LargeLbn, Index, Result, *LargeVbn, *LargeLbn, *Index); return Result; } @@ -745,9 +791,16 @@ OUT PLONGLONG Vbn, OUT PLONGLONG Lbn) { + BOOLEAN Result; PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; - return FsRtlLookupLastLargeMcbEntryAndIndex_internal(Mcb, Vbn, Lbn, NULL); /* Index */ + DPRINT("FsRtlLookupLastBaseMcbEntry(%p, %p, %p)\n", OpaqueMcb, Vbn, Lbn); + + Result = FsRtlLookupLastLargeMcbEntryAndIndex_internal(Mcb, Vbn, Lbn, NULL); /* Index */ + + DPRINT("FsRtlLookupLastBaseMcbEntry(%p, %p, %p) = %d (%I64d, %I64d)\n", Mcb, Vbn, Lbn, Result, *Vbn, *Lbn); + + return Result; } /* @@ -761,7 +814,7 @@ { BOOLEAN Result; - DPRINT("FsRtlLookupLastLargeMcbEntry Mcb %p\n", Mcb); + DPRINT("FsRtlLookupLastLargeMcbEntry(%p, %p, %p)\n", Mcb, Vbn, Lbn); KeAcquireGuardedMutex(Mcb->GuardedMutex); Result = FsRtlLookupLastBaseMcbEntry(&(Mcb->BaseMcb), @@ -769,7 +822,7 @@ Lbn); KeReleaseGuardedMutex(Mcb->GuardedMutex); - DPRINT("Done %u\n", Result); + DPRINT("FsRtlLookupLastLargeMcbEntry(%p, %p, %p) = %d (%I64d, %I64d)\n", Mcb, Vbn, Lbn, Result, *Vbn, *Lbn); return Result; } @@ -784,8 +837,11 @@ PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; LONGLONG LbnAtVbn0 = -1; ULONG Nodes = RtlNumberGenericTableElements(&Mcb->Mapping->Table); - - if (Nodes == 0) return 0; + ULONG NumberOfRuns = 0; + + DPRINT("FsRtlNumberOfRunsInBaseMcb(%p)\n", OpaqueMcb); + + if (Nodes == 0) goto quit; FsRtlLookupBaseMcbEntry(OpaqueMcb, 0, /* Vbn */ @@ -798,7 +854,11 @@ /* Return the number of 'real' and 'hole' runs. * If we do not have sector 0 as 'real' emulate a 'hole' there. */ - return Nodes * 2 - (LbnAtVbn0 != -1 ? 1 : 0); /* include holes as runs */ + NumberOfRuns = Nodes * 2 - (LbnAtVbn0 != -1 ? 1 : 0); /* include holes as runs */ + +quit: + DPRINT("FsRtlNumberOfRunsInBaseMcb(%p) = %d\n", OpaqueMcb, NumberOfRuns); + return NumberOfRuns; } /* @@ -810,14 +870,14 @@ { ULONG NumberOfRuns; - DPRINT("FsRtlNumberOfRunsInLargeMcb Mcb %p\n", Mcb); + DPRINT("FsRtlNumberOfRunsInLargeMcb(%p)\n", Mcb); /* Read the number of runs while holding the MCB lock */ KeAcquireGuardedMutex(Mcb->GuardedMutex); NumberOfRuns = FsRtlNumberOfRunsInBaseMcb(&(Mcb->BaseMcb)); KeReleaseGuardedMutex(Mcb->GuardedMutex); - DPRINT("Done %lu\n", NumberOfRuns); + DPRINT("FsRtlNumberOfRunsInLargeMcb(%p) = %d\n", Mcb, NumberOfRuns); /* Return the count */ return NumberOfRuns; @@ -843,9 +903,21 @@ PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; LARGE_MCB_MAPPING_ENTRY NeedleRun; PLARGE_MCB_MAPPING_ENTRY HaystackRun; - - if (Vbn < 0 || SectorCount <= 0) return FALSE; - if (Vbn + SectorCount <= Vbn) return FALSE; + BOOLEAN Result = TRUE; + + DPRINT("FsRtlRemoveBaseMcbEntry(%p, %I64d, %I64d)\n", OpaqueMcb, Vbn, SectorCount); + + if (Vbn < 0 || SectorCount <= 0) + { + Result = FALSE; + goto quit; + } + + if (Vbn + SectorCount <= Vbn) + { + Result = FALSE; + goto quit; + } NeedleRun.RunStartVbn.QuadPart = Vbn; NeedleRun.RunEndVbn.QuadPart = Vbn + SectorCount; @@ -876,7 +948,9 @@ } Mcb->Mapping->Table.CompareRoutine = McbMappingCompare; - return TRUE; +quit: + DPRINT("FsRtlRemoveBaseMcbEntry(%p, %I64d, %I64d) = %d\n", OpaqueMcb, Vbn, SectorCount, Result); + return Result; } /* @@ -888,13 +962,11 @@ IN LONGLONG Vbn, IN LONGLONG SectorCount) { - DPRINT("FsRtlRemoveLargeMcbEntry Mcb %p, Vbn %I64d, SectorCount %I64d\n", Mcb, Vbn, SectorCount); + DPRINT("FsRtlRemoveLargeMcbEntry(%p, %I64d, %I64d)\n", Mcb, Vbn, SectorCount); KeAcquireGuardedMutex(Mcb->GuardedMutex); FsRtlRemoveBaseMcbEntry(&(Mcb->BaseMcb), Vbn, SectorCount); KeReleaseGuardedMutex(Mcb->GuardedMutex); - - DPRINT("Done\n"); } /* @@ -907,6 +979,8 @@ PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; PLARGE_MCB_MAPPING_ENTRY Element; + DPRINT("FsRtlResetBaseMcb(%p)\n", OpaqueMcb); + while (RtlNumberGenericTableElements(&Mcb->Mapping->Table) && (Element = (PLARGE_MCB_MAPPING_ENTRY)RtlGetElementGenericTable(&Mcb->Mapping->Table, 0))) { @@ -925,6 +999,8 @@ FsRtlResetLargeMcb(IN PLARGE_MCB Mcb, IN BOOLEAN SelfSynchronized) { + DPRINT("FsRtlResetLargeMcb(%p, %d)\n", Mcb, SelfSynchronized); + if (!SelfSynchronized) KeAcquireGuardedMutex(Mcb->GuardedMutex); @@ -946,6 +1022,8 @@ PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; PLARGE_MCB_MAPPING_ENTRY Run, InsertLowerRun = NULL, ExistingRun = NULL; BOOLEAN NewElement; + + DPRINT("FsRtlSplitBaseMcb(%p, %I64d, %I64d)\n", OpaqueMcb, Vbn, Amount); /* Traverse the tree */ for (Run = (PLARGE_MCB_MAPPING_ENTRY)RtlEnumerateGenericTable(&Mcb->Mapping->Table, TRUE); @@ -984,6 +1062,8 @@ ASSERT(ExistingRun == NULL); + DPRINT("FsRtlSplitBaseMcb(%p, %I64d, %I64d) = %d\n", OpaqueMcb, Vbn, Amount, TRUE); + return TRUE; } @@ -998,7 +1078,7 @@ { BOOLEAN Result; - DPRINT("FsRtlSplitLargeMcb %p, Vbn %I64d, Amount %I64d\n", Mcb, Vbn, Amount); + DPRINT("FsRtlSplitLargeMcb(%p, %I64d, %I64d)\n", Mcb, Vbn, Amount); KeAcquireGuardedMutex(Mcb->GuardedMutex); Result = FsRtlSplitBaseMcb(&(Mcb->BaseMcb), @@ -1006,7 +1086,7 @@ Amount); KeReleaseGuardedMutex(Mcb->GuardedMutex); - DPRINT("Done %u\n", Result); + DPRINT("FsRtlSplitLargeMcb(%p, %I64d, %I64d) = %d\n", Mcb, Vbn, Amount, Result); return Result; } @@ -1019,7 +1099,8 @@ FsRtlTruncateBaseMcb(IN PBASE_MCB OpaqueMcb, IN LONGLONG Vbn) { - DPRINT("Mcb=%p, Vbn=%I64d\n", OpaqueMcb, Vbn); + DPRINT("FsRtlTruncateBaseMcb(%p, %I64d)\n", OpaqueMcb, Vbn); + FsRtlRemoveBaseMcbEntry(OpaqueMcb, Vbn, MAXLONG - Vbn + 1); } @@ -1031,11 +1112,11 @@ FsRtlTruncateLargeMcb(IN PLARGE_MCB Mcb, IN LONGLONG Vbn) { - DPRINT("FsRtlTruncateLargeMcb %p Vbn %I64d\n", Mcb, Vbn); + DPRINT("FsRtlTruncateLargeMcb(%p, %I64d)\n", Mcb, Vbn); + KeAcquireGuardedMutex(Mcb->GuardedMutex); FsRtlTruncateBaseMcb(&(Mcb->BaseMcb), Vbn); KeReleaseGuardedMutex(Mcb->GuardedMutex); - DPRINT("Done\n"); } /* @@ -1045,6 +1126,8 @@ NTAPI FsRtlUninitializeBaseMcb(IN PBASE_MCB Mcb) { + DPRINT("FsRtlUninitializeBaseMcb(%p)\n", Mcb); + FsRtlResetBaseMcb(Mcb); if ((Mcb->PoolType == PagedPool)/* && (Mcb->MaximumPairCount == MAXIMUM_PAIR_COUNT)*/) @@ -1065,6 +1148,8 @@ NTAPI FsRtlUninitializeLargeMcb(IN PLARGE_MCB Mcb) { + DPRINT("FsRtlUninitializeLargeMcb(%p)\n", Mcb); + if (Mcb->GuardedMutex) { ExFreeToNPagedLookasideList(&FsRtlFastMutexLookasideList,

8 years, 5 months

[ekohl] 71095: [NETSTAT] - Fix parsing of the -p option and enable / as option indicator. - Display foreign address of a listening TCP port as '<host>:0'.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Apr 3 14:10:31 2016 New Revision: 71095 URL: http://svn.reactos.org/svn/reactos?rev=71095&view=rev Log: [NETSTAT] - Fix parsing of the -p option and enable / as option indicator. - Display foreign address of a listening TCP port as '<host>:0'. Modified: trunk/reactos/base/applications/network/netstat/netstat.c Modified: trunk/reactos/base/applications/network/netstat/netstat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/netstat/netstat.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/netstat/netstat.c [iso-8859-1] Sun Apr 3 14:10:31 2016 @@ -83,9 +83,9 @@ */ BOOL ParseCmdline(int argc, char* argv[]) { + LPSTR Proto; + CHAR c; INT i; - - TCHAR Proto[5]; if ((argc == 1) || (_istdigit(*argv[1]))) bNoOptions = TRUE; @@ -93,10 +93,8 @@ /* Parse command line for options we have been given. */ for (i = 1; i < argc; i++) { - if ( (argc > 1)&&(argv[i][0] == '-') ) + if ((argc > 1) && (argv[i][0] == '-' || argv[i][0] == '/')) { - TCHAR c; - while ((c = *++argv[i]) != '\0') { switch (tolower(c)) @@ -113,30 +111,28 @@ case 'n' : bDoShowNumbers = TRUE; break; - case 's' : - bDoShowProtoStats = TRUE; - break; case 'p' : bDoShowProtoCons = TRUE; - - strncpy(Proto, (++argv)[i], sizeof(Proto)); - if (!_tcsicmp( "IP", Proto )) + Proto = argv[i+1]; + if (!_stricmp("IP", Proto)) Protocol = IP; - else if (!_tcsicmp( "ICMP", Proto )) + else if (!_stricmp("ICMP", Proto)) Protocol = ICMP; - else if (!_tcsicmp( "TCP", Proto )) + else if (!_stricmp("TCP", Proto)) Protocol = TCP; - else if (!_tcsicmp( "UDP", Proto )) + else if (!_stricmp("UDP", Proto)) Protocol = UDP; else { Usage(); return EXIT_FAILURE; } - --i; /* move pointer back down to previous argv */ break; case 'r' : bDoShowRouteTable = TRUE; + break; + case 's' : + bDoShowProtoStats = TRUE; break; case 'v' : _tprintf(_T("got v\n")); @@ -243,7 +239,7 @@ _tprintf(_T("\nActive Connections\n")); _tprintf(_T("\n Proto Local Address Foreign Address State\n")); ShowTcpTable(); - if (bDoShowAllCons) + if (bDoShowAllCons) ShowUdpTable(); } return EXIT_SUCCESS; @@ -452,11 +448,18 @@ /* I've split this up so it's easier to follow */ GetIpHostName(TRUE, tcpTable->table[i].dwLocalAddr, HostIp, HOSTNAMELEN); GetPortName(tcpTable->table[i].dwLocalPort, "tcp", HostPort, PORTNAMELEN); - GetIpHostName(FALSE, tcpTable->table[i].dwRemoteAddr, RemoteIp, HOSTNAMELEN); - GetPortName(tcpTable->table[i].dwRemotePort, "tcp", RemotePort, PORTNAMELEN); - sprintf(Host, "%s:%s", HostIp, HostPort); - sprintf(Remote, "%s:%s", RemoteIp, RemotePort); + + if (tcpTable->table[i].dwState == MIB_TCP_STATE_LISTEN) + { + sprintf(Remote, "%s:0", HostIp); + } + else + { + GetIpHostName(FALSE, tcpTable->table[i].dwRemoteAddr, RemoteIp, HOSTNAMELEN); + GetPortName(tcpTable->table[i].dwRemotePort, "tcp", RemotePort, PORTNAMELEN); + sprintf(Remote, "%s:%s", RemoteIp, RemotePort); + } _tprintf(_T(" %-6s %-22s %-22s %s\n"), _T("TCP"), Host, Remote, TcpState[tcpTable->table[i].dwState]); @@ -585,7 +588,7 @@ VOID Usage() { _tprintf(_T("\nDisplays current TCP/IP protocol statistics and network connections.\n\n" - "NETSTAT [-a] [-e] [-n] [-s] [-p proto] [-r] [interval]\n\n" + "NETSTAT [-a] [-e] [-n] [-p proto] [-r] [-s] [interval]\n\n" " -a Displays all connections and listening ports.\n" " -e Displays Ethernet statistics. May be combined with -s\n" " option\n"

8 years, 5 months

[tkreuzer] 71094: [KMTEST] Improve test output

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Apr 3 14:05:58 2016 New Revision: 71094 URL: http://svn.reactos.org/svn/reactos?rev=71094&view=rev Log: [KMTEST] Improve test output Modified: trunk/rostests/kmtests/rtl/RtlSplayTree.c Modified: trunk/rostests/kmtests/rtl/RtlSplayTree.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/rtl/RtlSplayTree.… ============================================================================== --- trunk/rostests/kmtests/rtl/RtlSplayTree.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/rtl/RtlSplayTree.c [iso-8859-1] Sun Apr 3 14:05:58 2016 @@ -60,7 +60,9 @@ sizeof(Text[i]), &WasNew); ok(Ch && *Ch == Text[i], "Copy character into node\n"); - ok(WasNew == (NewE[i] == '1'), "Character newness didn't match\n"); + ok(WasNew == (NewE[i] == '1'), + "Character newness didn't match for char %u: '%c'\n", + i, Text[i]); } for (Ch = (PCHAR)RtlEnumerateGenericTable(&Table, TRUE), i = 0; Ch;

8 years, 5 months

[dreimer] 71093: [RAPPS] Automatic Fixup of the whole RAPPS DB with a Python sync script from Christopher Reimer (based on the script from Ismael Ferreras Morezuelas): https://dl.dropboxusercontent...

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Apr 3 13:38:29 2016 New Revision: 71093 URL: http://svn.reactos.org/svn/reactos?rev=71093&view=rev Log: [RAPPS] Automatic Fixup of the whole RAPPS DB with a Python sync script from Christopher Reimer (based on the script from Ismael Ferreras Morezuelas): https://dl.dropboxusercontent.com/u/30053674/shaonificator.py - Fixed ANY INI parsing errors like double language sections, missing braces, missing variable descriptions, typos... - Fixed ANY sizes of downloads + all language specific alterations. - Fixed ANY dead links. - Fixed ANY SHA1 hashes. - Comments are no more. All ppl who contributed and left their names in the comments of the files are now found in CONTRIBUTORS. ++ Removed offbyone.txt. The Browser is no more. Added: trunk/reactos/media/rapps/CONTRIBUTORS (with props) Removed: trunk/reactos/media/rapps/offbyone.txt Modified: trunk/reactos/media/rapps/7zip.txt trunk/reactos/media/rapps/abiword.txt trunk/reactos/media/rapps/abiword26.txt trunk/reactos/media/rapps/abyss.txt trunk/reactos/media/rapps/ac97forvirtualbox.txt trunk/reactos/media/rapps/agatemulator.txt trunk/reactos/media/rapps/air.txt trunk/reactos/media/rapps/akelpad.txt trunk/reactos/media/rapps/alreader.txt trunk/reactos/media/rapps/audacity.txt trunk/reactos/media/rapps/audiograbber.txt trunk/reactos/media/rapps/bittorrent.txt trunk/reactos/media/rapps/bochs.txt trunk/reactos/media/rapps/boswars.txt trunk/reactos/media/rapps/boundaround.txt trunk/reactos/media/rapps/burnawarefree.txt trunk/reactos/media/rapps/ccleaner.txt trunk/reactos/media/rapps/christmasbound.txt trunk/reactos/media/rapps/chromium.txt trunk/reactos/media/rapps/cnt.txt trunk/reactos/media/rapps/codeblocks.txt trunk/reactos/media/rapps/codeblocks_gcc.txt trunk/reactos/media/rapps/comctl32ocx.txt trunk/reactos/media/rapps/cstalin.txt trunk/reactos/media/rapps/devcpp_tdm_gcc_x64.txt trunk/reactos/media/rapps/diablo2.txt trunk/reactos/media/rapps/dilinuxreader.txt trunk/reactos/media/rapps/dosblaster.txt trunk/reactos/media/rapps/dosbox.txt trunk/reactos/media/rapps/doublecommander.txt trunk/reactos/media/rapps/dplus.txt trunk/reactos/media/rapps/dvdwritenow.txt trunk/reactos/media/rapps/efsearch.txt trunk/reactos/media/rapps/everythingse.txt trunk/reactos/media/rapps/excelview.txt trunk/reactos/media/rapps/fall.txt trunk/reactos/media/rapps/famitracker.txt trunk/reactos/media/rapps/fap.txt trunk/reactos/media/rapps/fira.txt trunk/reactos/media/rapps/firefox.txt trunk/reactos/media/rapps/firefox28.txt trunk/reactos/media/rapps/firefox36.txt trunk/reactos/media/rapps/foxit.txt trunk/reactos/media/rapps/freebasic.txt trunk/reactos/media/rapps/freestopwatch.txt trunk/reactos/media/rapps/gensemulator.txt trunk/reactos/media/rapps/ghostscript.txt trunk/reactos/media/rapps/ghostview.txt trunk/reactos/media/rapps/gimp.txt trunk/reactos/media/rapps/glidewrapzbag.txt trunk/reactos/media/rapps/globulation2.txt trunk/reactos/media/rapps/gnucash.txt trunk/reactos/media/rapps/hexedit.txt trunk/reactos/media/rapps/hiawatha.txt trunk/reactos/media/rapps/hover.txt trunk/reactos/media/rapps/hxd.txt trunk/reactos/media/rapps/indiftpd.txt trunk/reactos/media/rapps/inkscape.txt trunk/reactos/media/rapps/irfanview.txt trunk/reactos/media/rapps/irfanviewplugins.txt trunk/reactos/media/rapps/jre.txt trunk/reactos/media/rapps/kdewin.txt trunk/reactos/media/rapps/kindlepc.txt trunk/reactos/media/rapps/kmeleon.txt trunk/reactos/media/rapps/kompozer.txt trunk/reactos/media/rapps/kyodai.txt trunk/reactos/media/rapps/lazaruside.txt trunk/reactos/media/rapps/lbreakout2.txt trunk/reactos/media/rapps/lgeneral.txt trunk/reactos/media/rapps/librecad.txt trunk/reactos/media/rapps/libreoffice.txt trunk/reactos/media/rapps/libreofficehelp.txt trunk/reactos/media/rapps/libreofficestill.txt trunk/reactos/media/rapps/lmarbles.txt trunk/reactos/media/rapps/mcwin32.txt trunk/reactos/media/rapps/md5summer.txt trunk/reactos/media/rapps/mfc40.txt trunk/reactos/media/rapps/miktex.txt trunk/reactos/media/rapps/mirandaim.txt trunk/reactos/media/rapps/mirc.txt trunk/reactos/media/rapps/mirc6.txt trunk/reactos/media/rapps/mkvtoolnix.txt trunk/reactos/media/rapps/mono2.txt trunk/reactos/media/rapps/mpc.txt trunk/reactos/media/rapps/mpxplay.txt trunk/reactos/media/rapps/msxml3.txt trunk/reactos/media/rapps/msxml6.txt trunk/reactos/media/rapps/net11.txt trunk/reactos/media/rapps/net20.txt trunk/reactos/media/rapps/net20sp2.txt trunk/reactos/media/rapps/neverball.txt trunk/reactos/media/rapps/nginx.txt trunk/reactos/media/rapps/nirlauncher.txt trunk/reactos/media/rapps/npp.txt trunk/reactos/media/rapps/nvdisp.txt trunk/reactos/media/rapps/officeformatpack.txt trunk/reactos/media/rapps/openarena.txt trunk/reactos/media/rapps/opencodecs.txt trunk/reactos/media/rapps/openoffice.txt trunk/reactos/media/rapps/openttd.txt trunk/reactos/media/rapps/opera.txt trunk/reactos/media/rapps/opera9.txt trunk/reactos/media/rapps/pdfsam.txt trunk/reactos/media/rapps/peazip.txt trunk/reactos/media/rapps/pengupop.txt trunk/reactos/media/rapps/photofiltre.txt trunk/reactos/media/rapps/pidgin.txt trunk/reactos/media/rapps/pingus.txt trunk/reactos/media/rapps/pptview.txt trunk/reactos/media/rapps/precisecalc.txt trunk/reactos/media/rapps/pspad.txt trunk/reactos/media/rapps/ptanks.txt trunk/reactos/media/rapps/putty.txt trunk/reactos/media/rapps/python.txt trunk/reactos/media/rapps/python2.txt trunk/reactos/media/rapps/qb64sdl.txt trunk/reactos/media/rapps/qmmp.txt trunk/reactos/media/rapps/remood.txt trunk/reactos/media/rapps/reshack.txt trunk/reactos/media/rapps/revo.txt trunk/reactos/media/rapps/rfstools.txt trunk/reactos/media/rapps/rocks.txt trunk/reactos/media/rapps/rosbe.txt trunk/reactos/media/rapps/sambatng.txt trunk/reactos/media/rapps/sbforvmware.txt trunk/reactos/media/rapps/scite.txt trunk/reactos/media/rapps/scratch.txt trunk/reactos/media/rapps/scribus.txt trunk/reactos/media/rapps/scummvm.txt trunk/reactos/media/rapps/sdl_mixer.txt trunk/reactos/media/rapps/sdl_runtime.txt trunk/reactos/media/rapps/shed.txt trunk/reactos/media/rapps/smplayer.txt trunk/reactos/media/rapps/snoopy.txt trunk/reactos/media/rapps/stamina.txt trunk/reactos/media/rapps/steam.txt trunk/reactos/media/rapps/sumatrapdf.txt trunk/reactos/media/rapps/summerbound.txt trunk/reactos/media/rapps/superdxb.txt trunk/reactos/media/rapps/superfinder.txt trunk/reactos/media/rapps/supertux.txt trunk/reactos/media/rapps/tahoma.txt trunk/reactos/media/rapps/thunderbird.txt trunk/reactos/media/rapps/thunderbird3.txt trunk/reactos/media/rapps/tightvnc.txt trunk/reactos/media/rapps/tileworld.txt trunk/reactos/media/rapps/totalcommander.txt trunk/reactos/media/rapps/tuxpaint.txt trunk/reactos/media/rapps/ultraiso.txt trunk/reactos/media/rapps/ultravnc.txt trunk/reactos/media/rapps/utorrent.txt trunk/reactos/media/rapps/vb5run.txt trunk/reactos/media/rapps/vb6run.txt trunk/reactos/media/rapps/vbasdl.txt trunk/reactos/media/rapps/vc2005sp1run.txt trunk/reactos/media/rapps/vc2008sp1run.txt trunk/reactos/media/rapps/vc2010sp1run.txt trunk/reactos/media/rapps/vc2012run.txt trunk/reactos/media/rapps/vc2013run.txt trunk/reactos/media/rapps/vc6run.txt trunk/reactos/media/rapps/vlc.txt trunk/reactos/media/rapps/watercolor.txt trunk/reactos/media/rapps/winamp.txt trunk/reactos/media/rapps/winboard.txt trunk/reactos/media/rapps/windirstat.txt trunk/reactos/media/rapps/winemono.txt trunk/reactos/media/rapps/winmerge.txt trunk/reactos/media/rapps/winspypp.txt trunk/reactos/media/rapps/wme9.txt trunk/reactos/media/rapps/wordview.txt trunk/reactos/media/rapps/zaz.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/7zip.txt?rev=7… Added: trunk/reactos/media/rapps/CONTRIBUTORS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/CONTRIBUTORS?r… Modified: trunk/reactos/media/rapps/abiword.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/abiword.txt?re… Modified: trunk/reactos/media/rapps/abiword26.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/abiword26.txt?… Modified: trunk/reactos/media/rapps/abyss.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/abyss.txt?rev=… Modified: trunk/reactos/media/rapps/ac97forvirtualbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ac97forvirtual… Modified: trunk/reactos/media/rapps/agatemulator.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/agatemulator.t… Modified: trunk/reactos/media/rapps/air.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/air.txt?rev=71… Modified: trunk/reactos/media/rapps/akelpad.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/akelpad.txt?re… Modified: trunk/reactos/media/rapps/alreader.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/alreader.txt?r… Modified: trunk/reactos/media/rapps/audacity.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/audacity.txt?r… Modified: trunk/reactos/media/rapps/audiograbber.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/audiograbber.t… Modified: trunk/reactos/media/rapps/bittorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/bittorrent.txt… Modified: trunk/reactos/media/rapps/bochs.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/bochs.txt?rev=… Modified: trunk/reactos/media/rapps/boswars.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/boswars.txt?re… Modified: trunk/reactos/media/rapps/boundaround.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/boundaround.tx… Modified: trunk/reactos/media/rapps/burnawarefree.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/burnawarefree.… Modified: trunk/reactos/media/rapps/ccleaner.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ccleaner.txt?r… Modified: trunk/reactos/media/rapps/christmasbound.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/christmasbound… Modified: trunk/reactos/media/rapps/chromium.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/chromium.txt?r… Modified: trunk/reactos/media/rapps/cnt.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/cnt.txt?rev=71… Modified: trunk/reactos/media/rapps/codeblocks.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/codeblocks.txt… Modified: trunk/reactos/media/rapps/codeblocks_gcc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/codeblocks_gcc… Modified: trunk/reactos/media/rapps/comctl32ocx.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/comctl32ocx.tx… Modified: trunk/reactos/media/rapps/cstalin.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/cstalin.txt?re… Modified: trunk/reactos/media/rapps/devcpp_tdm_gcc_x64.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/devcpp_tdm_gcc… Modified: trunk/reactos/media/rapps/diablo2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/diablo2.txt?re… Modified: trunk/reactos/media/rapps/dilinuxreader.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/dilinuxreader.… Modified: trunk/reactos/media/rapps/dosblaster.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/dosblaster.txt… Modified: trunk/reactos/media/rapps/dosbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/dosbox.txt?rev… Modified: trunk/reactos/media/rapps/doublecommander.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/doublecommande… Modified: trunk/reactos/media/rapps/dplus.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/dplus.txt?rev=… Modified: trunk/reactos/media/rapps/dvdwritenow.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/dvdwritenow.tx… Modified: trunk/reactos/media/rapps/efsearch.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/efsearch.txt?r… Modified: trunk/reactos/media/rapps/everythingse.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/everythingse.t… Modified: trunk/reactos/media/rapps/excelview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/excelview.txt?… Modified: trunk/reactos/media/rapps/fall.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/fall.txt?rev=7… Modified: trunk/reactos/media/rapps/famitracker.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/famitracker.tx… Modified: trunk/reactos/media/rapps/fap.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/fap.txt?rev=71… Modified: trunk/reactos/media/rapps/fira.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/fira.txt?rev=7… Modified: trunk/reactos/media/rapps/firefox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/firefox.txt?re… Modified: trunk/reactos/media/rapps/firefox28.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/firefox28.txt?… Modified: trunk/reactos/media/rapps/firefox36.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/firefox36.txt?… Modified: trunk/reactos/media/rapps/foxit.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/foxit.txt?rev=… Modified: trunk/reactos/media/rapps/freebasic.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/freebasic.txt?… Modified: trunk/reactos/media/rapps/freestopwatch.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/freestopwatch.… Modified: trunk/reactos/media/rapps/gensemulator.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/gensemulator.t… Modified: trunk/reactos/media/rapps/ghostscript.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ghostscript.tx… Modified: trunk/reactos/media/rapps/ghostview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ghostview.txt?… Modified: trunk/reactos/media/rapps/gimp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/gimp.txt?rev=7… Modified: trunk/reactos/media/rapps/glidewrapzbag.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/glidewrapzbag.… Modified: trunk/reactos/media/rapps/globulation2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/globulation2.t… Modified: trunk/reactos/media/rapps/gnucash.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/gnucash.txt?re… Modified: trunk/reactos/media/rapps/hexedit.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/hexedit.txt?re… Modified: trunk/reactos/media/rapps/hiawatha.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/hiawatha.txt?r… Modified: trunk/reactos/media/rapps/hover.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/hover.txt?rev=… Modified: trunk/reactos/media/rapps/hxd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/hxd.txt?rev=71… Modified: trunk/reactos/media/rapps/indiftpd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/indiftpd.txt?r… Modified: trunk/reactos/media/rapps/inkscape.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/inkscape.txt?r… Modified: trunk/reactos/media/rapps/irfanview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/irfanview.txt?… Modified: trunk/reactos/media/rapps/irfanviewplugins.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/irfanviewplugi… Modified: trunk/reactos/media/rapps/jre.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/jre.txt?rev=71… Modified: trunk/reactos/media/rapps/kdewin.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/kdewin.txt?rev… Modified: trunk/reactos/media/rapps/kindlepc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/kindlepc.txt?r… Modified: trunk/reactos/media/rapps/kmeleon.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/kmeleon.txt?re… Modified: trunk/reactos/media/rapps/kompozer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/kompozer.txt?r… Modified: trunk/reactos/media/rapps/kyodai.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/kyodai.txt?rev… Modified: trunk/reactos/media/rapps/lazaruside.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/lazaruside.txt… Modified: trunk/reactos/media/rapps/lbreakout2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/lbreakout2.txt… Modified: trunk/reactos/media/rapps/lgeneral.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/lgeneral.txt?r… Modified: trunk/reactos/media/rapps/librecad.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/librecad.txt?r… Modified: trunk/reactos/media/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/libreoffice.tx… Modified: trunk/reactos/media/rapps/libreofficehelp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/libreofficehel… Modified: trunk/reactos/media/rapps/libreofficestill.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/libreofficesti… Modified: trunk/reactos/media/rapps/lmarbles.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/lmarbles.txt?r… Modified: trunk/reactos/media/rapps/mcwin32.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mcwin32.txt?re… Modified: trunk/reactos/media/rapps/md5summer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/md5summer.txt?… Modified: trunk/reactos/media/rapps/mfc40.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mfc40.txt?rev=… Modified: trunk/reactos/media/rapps/miktex.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/miktex.txt?rev… Modified: trunk/reactos/media/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mirandaim.txt?… Modified: trunk/reactos/media/rapps/mirc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mirc.txt?rev=7… Modified: trunk/reactos/media/rapps/mirc6.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mirc6.txt?rev=… Modified: trunk/reactos/media/rapps/mkvtoolnix.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mkvtoolnix.txt… Modified: trunk/reactos/media/rapps/mono2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mono2.txt?rev=… Modified: trunk/reactos/media/rapps/mpc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mpc.txt?rev=71… Modified: trunk/reactos/media/rapps/mpxplay.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mpxplay.txt?re… Modified: trunk/reactos/media/rapps/msxml3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/msxml3.txt?rev… Modified: trunk/reactos/media/rapps/msxml6.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/msxml6.txt?rev… Modified: trunk/reactos/media/rapps/net11.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/net11.txt?rev=… Modified: trunk/reactos/media/rapps/net20.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/net20.txt?rev=… Modified: trunk/reactos/media/rapps/net20sp2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/net20sp2.txt?r… Modified: trunk/reactos/media/rapps/neverball.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/neverball.txt?… Modified: trunk/reactos/media/rapps/nginx.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/nginx.txt?rev=… Modified: trunk/reactos/media/rapps/nirlauncher.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/nirlauncher.tx… Modified: trunk/reactos/media/rapps/npp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/npp.txt?rev=71… Modified: trunk/reactos/media/rapps/nvdisp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/nvdisp.txt?rev… Removed: trunk/reactos/media/rapps/offbyone.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/offbyone.txt?r… Modified: trunk/reactos/media/rapps/officeformatpack.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/officeformatpa… Modified: trunk/reactos/media/rapps/openarena.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/openarena.txt?… Modified: trunk/reactos/media/rapps/opencodecs.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/opencodecs.txt… Modified: trunk/reactos/media/rapps/openoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/openoffice.txt… Modified: trunk/reactos/media/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/openttd.txt?re… Modified: trunk/reactos/media/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/opera.txt?rev=… Modified: trunk/reactos/media/rapps/opera9.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/opera9.txt?rev… Modified: trunk/reactos/media/rapps/pdfsam.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/pdfsam.txt?rev… Modified: trunk/reactos/media/rapps/peazip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/peazip.txt?rev… Modified: trunk/reactos/media/rapps/pengupop.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/pengupop.txt?r… Modified: trunk/reactos/media/rapps/photofiltre.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/photofiltre.tx… Modified: trunk/reactos/media/rapps/pidgin.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/pidgin.txt?rev… Modified: trunk/reactos/media/rapps/pingus.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/pingus.txt?rev… Modified: trunk/reactos/media/rapps/pptview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/pptview.txt?re… Modified: trunk/reactos/media/rapps/precisecalc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/precisecalc.tx… Modified: trunk/reactos/media/rapps/pspad.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/pspad.txt?rev=… Modified: trunk/reactos/media/rapps/ptanks.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ptanks.txt?rev… Modified: trunk/reactos/media/rapps/putty.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/putty.txt?rev=… Modified: trunk/reactos/media/rapps/python.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/python.txt?rev… Modified: trunk/reactos/media/rapps/python2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/python2.txt?re… Modified: trunk/reactos/media/rapps/qb64sdl.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/qb64sdl.txt?re… Modified: trunk/reactos/media/rapps/qmmp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/qmmp.txt?rev=7… Modified: trunk/reactos/media/rapps/remood.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/remood.txt?rev… Modified: trunk/reactos/media/rapps/reshack.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/reshack.txt?re… Modified: trunk/reactos/media/rapps/revo.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/revo.txt?rev=7… Modified: trunk/reactos/media/rapps/rfstools.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/rfstools.txt?r… Modified: trunk/reactos/media/rapps/rocks.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/rocks.txt?rev=… Modified: trunk/reactos/media/rapps/rosbe.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/rosbe.txt?rev=… Modified: trunk/reactos/media/rapps/sambatng.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/sambatng.txt?r… Modified: trunk/reactos/media/rapps/sbforvmware.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/sbforvmware.tx… Modified: trunk/reactos/media/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/scite.txt?rev=… Modified: trunk/reactos/media/rapps/scratch.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/scratch.txt?re… Modified: trunk/reactos/media/rapps/scribus.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/scribus.txt?re… Modified: trunk/reactos/media/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/scummvm.txt?re… Modified: trunk/reactos/media/rapps/sdl_mixer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/sdl_mixer.txt?… Modified: trunk/reactos/media/rapps/sdl_runtime.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/sdl_runtime.tx… Modified: trunk/reactos/media/rapps/shed.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/shed.txt?rev=7… Modified: trunk/reactos/media/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/smplayer.txt?r… Modified: trunk/reactos/media/rapps/snoopy.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/snoopy.txt?rev… Modified: trunk/reactos/media/rapps/stamina.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/stamina.txt?re… Modified: trunk/reactos/media/rapps/steam.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/steam.txt?rev=… Modified: trunk/reactos/media/rapps/sumatrapdf.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/sumatrapdf.txt… Modified: trunk/reactos/media/rapps/summerbound.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/summerbound.tx… Modified: trunk/reactos/media/rapps/superdxb.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/superdxb.txt?r… Modified: trunk/reactos/media/rapps/superfinder.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/superfinder.tx… Modified: trunk/reactos/media/rapps/supertux.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/supertux.txt?r… Modified: trunk/reactos/media/rapps/tahoma.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/tahoma.txt?rev… Modified: trunk/reactos/media/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/thunderbird.tx… Modified: trunk/reactos/media/rapps/thunderbird3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/thunderbird3.t… Modified: trunk/reactos/media/rapps/tightvnc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/tightvnc.txt?r… Modified: trunk/reactos/media/rapps/tileworld.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/tileworld.txt?… Modified: trunk/reactos/media/rapps/totalcommander.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/totalcommander… Modified: trunk/reactos/media/rapps/tuxpaint.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/tuxpaint.txt?r… Modified: trunk/reactos/media/rapps/ultraiso.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ultraiso.txt?r… Modified: trunk/reactos/media/rapps/ultravnc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ultravnc.txt?r… Modified: trunk/reactos/media/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/utorrent.txt?r… Modified: trunk/reactos/media/rapps/vb5run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vb5run.txt?rev… Modified: trunk/reactos/media/rapps/vb6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vb6run.txt?rev… Modified: trunk/reactos/media/rapps/vbasdl.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vbasdl.txt?rev… Modified: trunk/reactos/media/rapps/vc2005sp1run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vc2005sp1run.t… Modified: trunk/reactos/media/rapps/vc2008sp1run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vc2008sp1run.t… Modified: trunk/reactos/media/rapps/vc2010sp1run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vc2010sp1run.t… Modified: trunk/reactos/media/rapps/vc2012run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vc2012run.txt?… Modified: trunk/reactos/media/rapps/vc2013run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vc2013run.txt?… Modified: trunk/reactos/media/rapps/vc6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vc6run.txt?rev… Modified: trunk/reactos/media/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vlc.txt?rev=71… Modified: trunk/reactos/media/rapps/watercolor.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/watercolor.txt… Modified: trunk/reactos/media/rapps/winamp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/winamp.txt?rev… Modified: trunk/reactos/media/rapps/winboard.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/winboard.txt?r… Modified: trunk/reactos/media/rapps/windirstat.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/windirstat.txt… Modified: trunk/reactos/media/rapps/winemono.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/winemono.txt?r… Modified: trunk/reactos/media/rapps/winmerge.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/winmerge.txt?r… Modified: trunk/reactos/media/rapps/winspypp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/winspypp.txt?r… Modified: trunk/reactos/media/rapps/wme9.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/wme9.txt?rev=7… Modified: trunk/reactos/media/rapps/wordview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/wordview.txt?r… Modified: trunk/reactos/media/rapps/zaz.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/zaz.txt?rev=71…

8 years, 5 months

[tkreuzer] 71092: [CREATESPEC] Some cleanup and fixes

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Apr 3 13:36:00 2016 New Revision: 71092 URL: http://svn.reactos.org/svn/reactos?rev=71092&view=rev Log: [CREATESPEC] Some cleanup and fixes Modified: trunk/rosapps/applications/devutils/createspec/createspec.c Modified: trunk/rosapps/applications/devutils/createspec/createspec.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/crea… ============================================================================== --- trunk/rosapps/applications/devutils/createspec/createspec.c [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/createspec/createspec.c [iso-8859-1] Sun Apr 3 13:36:00 2016 @@ -64,18 +64,6 @@ #endif // __REACTOS__ -#define MAX_SYMBOL_NAME 1024 -typedef struct _SYMINFO_EX -{ - SYMBOL_INFO si; - CHAR achName[MAX_SYMBOL_NAME]; -} SYMINFO_EX; - -typedef struct _SYMBOL64_EX -{ - IMAGEHLP_SYMBOL64 sym64; - CHAR achName[MAX_SYMBOL_NAME]; -} SYMBOL64_EX, *PSYMBOL64_EX; typedef enum _PARAM_TYPES { @@ -290,7 +278,7 @@ } /* Try system32 */ - strcpy_s(szFullFileName, sizeof(szFullFileName), "%systemroot%\\system32"); + strcpy_s(szFullFileName, sizeof(szFullFileName), "%systemroot%\\system32\\"); strcat_s(szFullFileName, sizeof(szFullFileName), pszModuleName); hmod = LoadModuleWithSymbolsFullPath(szFullFileName); if (hmod != NULL) @@ -299,8 +287,8 @@ } #ifdef _WIN64 - /* Try SysWoW64 */ - strcpy_s(szFullFileName, sizeof(szFullFileName), "%systemroot%\\system32"); + /* Try SysWOW64 */ + strcpy_s(szFullFileName, sizeof(szFullFileName), "%systemroot%\\SysWOW64\\"); strcat_s(szFullFileName, sizeof(szFullFileName), pszModuleName); hmod = LoadModuleWithSymbolsFullPath(szFullFileName); if (hmod != NULL) @@ -500,7 +488,7 @@ GetFunctionFromForwarder( _In_ PCSTR pszForwarder) { - CHAR szDllName[MAX_SYMBOL_NAME]; + CHAR szDllName[MAX_SYM_NAME]; PCH pchDot, pszName; ULONG64 ullFunction; HMODULE hmod; @@ -560,7 +548,7 @@ DWORD64 dwModuleBase; ULONG i; IMAGEHLP_STACK_FRAME StackFrame; - SYMINFO_EX sym; + SYMBOL_INFO_PACKAGE sym; dwModuleBase = (DWORD_PTR)hmod; @@ -585,7 +573,7 @@ RtlZeroMemory(&sym, sizeof(sym)); sym.si.SizeOfStruct = sizeof(SYMBOL_INFO); - sym.si.MaxNameLen = MAX_SYMBOL_NAME; + sym.si.MaxNameLen = MAX_SYM_NAME; /* Try to find the symbol */ if (!SymFromAddr(ghProcess, ullFunction, &ullDisplacement, &sym.si))

8 years, 5 months

[pschweitzer] 71091: [KMTESTS:FSRTL] Add more tests for LargeMcb functions. These are not invented but real cases: they are extracted from Ext2Fsd driver attempting to read a file from disk. The re...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Apr 3 10:25:32 2016 New Revision: 71091 URL: http://svn.reactos.org/svn/reactos?rev=71091&view=rev Log: [KMTESTS:FSRTL] Add more tests for LargeMcb functions. These are not invented but real cases: they are extracted from Ext2Fsd driver attempting to read a file from disk. The read file in ReactOS is totally corrupted. This shows how broken our current MCB implementation is. And unfortunately confirms CORE-11002. I recommend not to import any other FSDs relying on MCB as long as this is not fixed (eg. CORE-11040); it makes them pretty pointless. CORE-11002 Modified: trunk/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c Modified: trunk/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_fsrtl/FsRtlM… ============================================================================== --- trunk/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c [iso-8859-1] Sun Apr 3 10:25:32 2016 @@ -278,8 +278,330 @@ FsRtlUninitializeLargeMcb(&LargeMcb); } +static VOID FsRtlLargeMcbTestsExt2() +{ + LARGE_MCB FirstMcb, SecondMcb; + LONGLONG Lbn, SectorCountFromLbn, StartingLbn, SectorCountFromStartingLbn, Vbn, SectorCount; + ULONG Index, NbRuns; + BOOLEAN Result; + + FsRtlInitializeLargeMcb(&FirstMcb, PagedPool); + FsRtlInitializeLargeMcb(&SecondMcb, PagedPool); + + FsRtlTruncateLargeMcb(&FirstMcb, 0); + FsRtlTruncateLargeMcb(&SecondMcb, 0); + + Result = FsRtlLookupLargeMcbEntry(&FirstMcb, 1, &Lbn, &SectorCountFromLbn, NULL, NULL, NULL); + ok(Result == FALSE, "Expected FALSE, got TRUE\n"); + + Result = FsRtlAddLargeMcbEntry(&FirstMcb, 1, 198657, 1); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + + DumpAllRuns(&FirstMcb); + + NbRuns = FsRtlNumberOfRunsInLargeMcb(&FirstMcb); + ok(NbRuns == 2, "Expected 2 runs, got: %lu\n", NbRuns); + + Result = FsRtlLookupLargeMcbEntry(&FirstMcb, 1, &Lbn, &SectorCountFromLbn, &StartingLbn, &SectorCountFromStartingLbn, &Index); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + ok(Lbn == 198657LL, "Expected Lbn 198657, got: %I64d\n", Lbn); + ok(SectorCountFromLbn == 1LL, "Expected SectorCountFromLbn 1, got: %I64d\n", SectorCountFromLbn); + ok(StartingLbn == 198657LL, "Expected StartingLbn 198657, got: %I64d\n", StartingLbn); + ok(SectorCountFromStartingLbn == 1LL, "Expected SectorCountFromStartingLbn 1, got: %I64d\n", SectorCountFromStartingLbn); + ok(Index == 1, "Expected Index 1, got: %d\n", Index); + + Result = FsRtlLookupLargeMcbEntry(&FirstMcb, 2, &Lbn, &SectorCountFromLbn, NULL, NULL, NULL); + ok(Result == FALSE, "Expected FALSE, got TRUE\n"); + + Result = FsRtlAddLargeMcbEntry(&FirstMcb, 2, 199169, 11); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + + DumpAllRuns(&FirstMcb); + + NbRuns = FsRtlNumberOfRunsInLargeMcb(&FirstMcb); + ok(NbRuns == 3, "Expected 3 runs, got: %lu\n", NbRuns); + + Result = FsRtlLookupLargeMcbEntry(&FirstMcb, 2, &Lbn, &SectorCountFromLbn, &StartingLbn, &SectorCountFromStartingLbn, &Index); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + ok(Lbn == 199169LL, "Expected Lbn 199169, got: %I64d\n", Lbn); + ok(SectorCountFromLbn == 11LL, "Expected SectorCountFromLbn 11, got: %I64d\n", SectorCountFromLbn); + ok(StartingLbn == 199169LL, "Expected StartingLbn 199169, got: %I64d\n", StartingLbn); + ok(SectorCountFromStartingLbn == 11LL, "Expected SectorCountFromStartingLbn 11, got: %I64d\n", SectorCountFromStartingLbn); + ok(Index == 2, "Expected Index 2, got: %d\n", Index); + + Result = FsRtlGetNextLargeMcbEntry(&FirstMcb, 0, &Vbn, &Lbn, &SectorCount); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + ok(Vbn == 0LL, "Expected Vbn 0, got: %I64d\n", Vbn); + ok(Lbn == -1LL, "Expected Lbn -1, got: %I64d\n", Lbn); + ok(SectorCount == 1LL, "Expected SectorCount 1, got: %I64d\n", SectorCount); + + Result = FsRtlGetNextLargeMcbEntry(&FirstMcb, 1, &Vbn, &Lbn, &SectorCount); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + ok(Vbn == 1LL, "Expected Vbn 1, got: %I64d\n", Vbn); + ok(Lbn == 198657LL, "Expected Lbn 198657, got: %I64d\n", Lbn); + ok(SectorCount == 1LL, "Expected SectorCount 1, got: %I64d\n", SectorCount); + + Result = FsRtlGetNextLargeMcbEntry(&FirstMcb, 2, &Vbn, &Lbn, &SectorCount); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + ok(Vbn == 2LL, "Expected Vbn 2, got: %I64d\n", Vbn); + ok(Lbn == 199169LL, "Expected Lbn 199169, got: %I64d\n", Lbn); + ok(SectorCount == 11LL, "Expected SectorCount 11, got: %I64d\n", SectorCount); + + Result = FsRtlGetNextLargeMcbEntry(&FirstMcb, 3, &Vbn, &Lbn, &SectorCount); + ok(Result == FALSE, "Expected FALSE, got TRUE\n"); + + Result = FsRtlAddLargeMcbEntry(&SecondMcb, 197128, 197128, 1); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + + Result = FsRtlLookupLargeMcbEntry(&SecondMcb, 197128, &Lbn, &SectorCountFromLbn, &StartingLbn, &SectorCountFromStartingLbn, &Index); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + ok(Lbn == 197128LL, "Expected Lbn 197128, got: %I64d\n", Lbn); + ok(SectorCountFromLbn == 1LL, "Expected SectorCountFromLbn 1, got: %I64d\n", SectorCountFromLbn); + ok(StartingLbn == 197128LL, "Expected StartingLbn 197128, got: %I64d\n", StartingLbn); + ok(SectorCountFromStartingLbn == 1LL, "Expected SectorCountFromStartingLbn 1, got: %I64d\n", SectorCountFromStartingLbn); + ok(Index == 1, "Expected Index 1, got: %d\n", Index); + + Result = FsRtlLookupLargeMcbEntry(&FirstMcb, 13, &Lbn, &SectorCountFromLbn, NULL, NULL, NULL); + ok(Result == FALSE, "Expected FALSE, got TRUE\n"); + + Result = FsRtlAddLargeMcbEntry(&FirstMcb, 13, 199180, 4); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + + DumpAllRuns(&FirstMcb); + + NbRuns = FsRtlNumberOfRunsInLargeMcb(&FirstMcb); + ok(NbRuns == 3, "Expected 3 runs, got: %lu\n", NbRuns); + + Result = FsRtlLookupLargeMcbEntry(&FirstMcb, 13, &Lbn, &SectorCountFromLbn, &StartingLbn, &SectorCountFromStartingLbn, &Index); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + ok(Lbn == 199180LL, "Expected Lbn 199180, got: %I64d\n", Lbn); + ok(SectorCountFromLbn == 4LL, "Expected SectorCountFromLbn 4, got: %I64d\n", SectorCountFromLbn); + ok(StartingLbn == 199169LL, "Expected StartingLbn 199169, got: %I64d\n", StartingLbn); + ok(SectorCountFromStartingLbn == 15LL, "Expected SectorCountFromStartingLbn 15, got: %I64d\n", SectorCountFromStartingLbn); + ok(Index == 2, "Expected Index 2, got: %d\n", Index); + + Result = FsRtlGetNextLargeMcbEntry(&FirstMcb, 0, &Vbn, &Lbn, &SectorCount); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + ok(Vbn == 0LL, "Expected Vbn 0, got: %I64d\n", Vbn); + ok(Lbn == -1LL, "Expected Lbn -1, got: %I64d\n", Lbn); + ok(SectorCount == 1LL, "Expected SectorCount 1, got: %I64d\n", SectorCount); + + Result = FsRtlGetNextLargeMcbEntry(&FirstMcb, 1, &Vbn, &Lbn, &SectorCount); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + ok(Vbn == 1LL, "Expected Vbn 1, got: %I64d\n", Vbn); + ok(Lbn == 198657LL, "Expected Lbn 198657, got: %I64d\n", Lbn); + ok(SectorCount == 1LL, "Expected SectorCount 1, got: %I64d\n", SectorCount); + + Result = FsRtlGetNextLargeMcbEntry(&FirstMcb, 2, &Vbn, &Lbn, &SectorCount); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + ok(Vbn == 2LL, "Expected Vbn 2, got: %I64d\n", Vbn); + ok(Lbn == 199169LL, "Expected Lbn 199169, got: %I64d\n", Lbn); + ok(SectorCount == 15LL, "Expected SectorCount 15, got: %I64d\n", SectorCount); + + Result = FsRtlGetNextLargeMcbEntry(&FirstMcb, 3, &Vbn, &Lbn, &SectorCount); + ok(Result == FALSE, "Expected FALSE, got TRUE\n"); + + Result = FsRtlAddLargeMcbEntry(&SecondMcb, 197128, 197128, 1); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + + Result = FsRtlLookupLargeMcbEntry(&SecondMcb, 197128, &Lbn, &SectorCountFromLbn, &StartingLbn, &SectorCountFromStartingLbn, &Index); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + ok(Lbn == 197128LL, "Expected Lbn 197128, got: %I64d\n", Lbn); + ok(SectorCountFromLbn == 1LL, "Expected SectorCountFromLbn 1, got: %I64d\n", SectorCountFromLbn); + ok(StartingLbn == 197128LL, "Expected StartingLbn 197128, got: %I64d\n", StartingLbn); + ok(SectorCountFromStartingLbn == 1LL, "Expected SectorCountFromStartingLbn 1, got: %I64d\n", SectorCountFromStartingLbn); + ok(Index == 1, "Expected Index 1, got: %d\n", Index); + + Result = FsRtlLookupLargeMcbEntry(&FirstMcb, 17, &Lbn, &SectorCountFromLbn, NULL, NULL, NULL); + ok(Result == FALSE, "Expected FALSE, got TRUE\n"); + + Result = FsRtlAddLargeMcbEntry(&FirstMcb, 17, 1105, 16); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + + DumpAllRuns(&FirstMcb); + + NbRuns = FsRtlNumberOfRunsInLargeMcb(&FirstMcb); + ok(NbRuns == 4, "Expected 4 runs, got: %lu\n", NbRuns); + + Result = FsRtlLookupLargeMcbEntry(&FirstMcb, 17, &Lbn, &SectorCountFromLbn, &StartingLbn, &SectorCountFromStartingLbn, &Index); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + ok(Lbn == 1105LL, "Expected Lbn 1105, got: %I64d\n", Lbn); + ok(SectorCountFromLbn == 16LL, "Expected SectorCountFromLbn 16, got: %I64d\n", SectorCountFromLbn); + ok(StartingLbn == 1105LL, "Expected StartingLbn 1105, got: %I64d\n", StartingLbn); + ok(SectorCountFromStartingLbn == 16LL, "Expected SectorCountFromStartingLbn 16, got: %I64d\n", SectorCountFromStartingLbn); + ok(Index == 3, "Expected Index 3, got: %d\n", Index); + + Result = FsRtlGetNextLargeMcbEntry(&FirstMcb, 0, &Vbn, &Lbn, &SectorCount); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + ok(Vbn == 0LL, "Expected Vbn 0, got: %I64d\n", Vbn); + ok(Lbn == -1LL, "Expected Lbn -1, got: %I64d\n", Lbn); + ok(SectorCount == 1LL, "Expected SectorCount 1, got: %I64d\n", SectorCount); + + Result = FsRtlGetNextLargeMcbEntry(&FirstMcb, 1, &Vbn, &Lbn, &SectorCount); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + ok(Vbn == 1LL, "Expected Vbn 1, got: %I64d\n", Vbn); + ok(Lbn == 198657LL, "Expected Lbn 198657, got: %I64d\n", Lbn); + ok(SectorCount == 1LL, "Expected SectorCount 1, got: %I64d\n", SectorCount); + + Result = FsRtlGetNextLargeMcbEntry(&FirstMcb, 2, &Vbn, &Lbn, &SectorCount); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + ok(Vbn == 2LL, "Expected Vbn 2, got: %I64d\n", Vbn); + ok(Lbn == 199169LL, "Expected Lbn 199169, got: %I64d\n", Lbn); + ok(SectorCount == 15LL, "Expected SectorCount 15, got: %I64d\n", SectorCount); + + Result = FsRtlGetNextLargeMcbEntry(&FirstMcb, 3, &Vbn, &Lbn, &SectorCount); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + ok(Vbn == 17LL, "Expected Vbn 17, got: %I64d\n", Vbn); + ok(Lbn == 1105LL, "Expected Lbn 1105, got: %I64d\n", Lbn); + ok(SectorCount == 16LL, "Expected SectorCount 16, got: %I64d\n", SectorCount); + + Result = FsRtlGetNextLargeMcbEntry(&FirstMcb, 4, &Vbn, &Lbn, &SectorCount); + ok(Result == FALSE, "Expected FALSE, got TRUE\n"); + + Result = FsRtlAddLargeMcbEntry(&SecondMcb, 197128, 197128, 1); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + + Result = FsRtlLookupLargeMcbEntry(&SecondMcb, 197128, &Lbn, &SectorCountFromLbn, &StartingLbn, &SectorCountFromStartingLbn, &Index); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + ok(Lbn == 197128LL, "Expected Lbn 197128, got: %I64d\n", Lbn); + ok(SectorCountFromLbn == 1LL, "Expected SectorCountFromLbn 1, got: %I64d\n", SectorCountFromLbn); + ok(StartingLbn == 197128LL, "Expected StartingLbn 197128, got: %I64d\n", StartingLbn); + ok(SectorCountFromStartingLbn == 1LL, "Expected SectorCountFromStartingLbn 1, got: %I64d\n", SectorCountFromStartingLbn); + ok(Index == 1, "Expected Index 1, got: %d\n", Index); + + Result = FsRtlLookupLargeMcbEntry(&FirstMcb, 33, &Lbn, &SectorCountFromLbn, NULL, NULL, NULL); + ok(Result == FALSE, "Expected FALSE, got TRUE\n"); + + Result = FsRtlAddLargeMcbEntry(&FirstMcb, 33, 1185, 32); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + + DumpAllRuns(&FirstMcb); + + NbRuns = FsRtlNumberOfRunsInLargeMcb(&FirstMcb); + ok(NbRuns == 5, "Expected 5 runs, got: %lu\n", NbRuns); + + Result = FsRtlLookupLargeMcbEntry(&FirstMcb, 33, &Lbn, &SectorCountFromLbn, &StartingLbn, &SectorCountFromStartingLbn, &Index); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + ok(Lbn == 1185LL, "Expected Lbn 1185, got: %I64d\n", Lbn); + ok(SectorCountFromLbn == 32LL, "Expected SectorCountFromLbn 32, got: %I64d\n", SectorCountFromLbn); + ok(StartingLbn == 1185LL, "Expected StartingLbn 1185, got: %I64d\n", StartingLbn); + ok(SectorCountFromStartingLbn == 32LL, "Expected SectorCountFromStartingLbn 32, got: %I64d\n", SectorCountFromStartingLbn); + ok(Index == 4, "Expected Index 4, got: %d\n", Index); + + Result = FsRtlGetNextLargeMcbEntry(&FirstMcb, 0, &Vbn, &Lbn, &SectorCount); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + ok(Vbn == 0LL, "Expected Vbn 0, got: %I64d\n", Vbn); + ok(Lbn == -1LL, "Expected Lbn -1, got: %I64d\n", Lbn); + ok(SectorCount == 1LL, "Expected SectorCount 1, got: %I64d\n", SectorCount); + + Result = FsRtlGetNextLargeMcbEntry(&FirstMcb, 1, &Vbn, &Lbn, &SectorCount); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + ok(Vbn == 1LL, "Expected Vbn 1, got: %I64d\n", Vbn); + ok(Lbn == 198657LL, "Expected Lbn 198657, got: %I64d\n", Lbn); + ok(SectorCount == 1LL, "Expected SectorCount 1, got: %I64d\n", SectorCount); + + Result = FsRtlGetNextLargeMcbEntry(&FirstMcb, 2, &Vbn, &Lbn, &SectorCount); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + ok(Vbn == 2LL, "Expected Vbn 2, got: %I64d\n", Vbn); + ok(Lbn == 199169LL, "Expected Lbn 199169, got: %I64d\n", Lbn); + ok(SectorCount == 15LL, "Expected SectorCount 15, got: %I64d\n", SectorCount); + + Result = FsRtlGetNextLargeMcbEntry(&FirstMcb, 3, &Vbn, &Lbn, &SectorCount); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + ok(Vbn == 17LL, "Expected Vbn 17, got: %I64d\n", Vbn); + ok(Lbn == 1105LL, "Expected Lbn 1105, got: %I64d\n", Lbn); + ok(SectorCount == 16LL, "Expected SectorCount 16, got: %I64d\n", SectorCount); + + Result = FsRtlGetNextLargeMcbEntry(&FirstMcb, 4, &Vbn, &Lbn, &SectorCount); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + ok(Vbn == 33LL, "Expected Vbn 33, got: %I64d\n", Vbn); + ok(Lbn == 1185LL, "Expected Lbn 1185, got: %I64d\n", Lbn); + ok(SectorCount == 32LL, "Expected SectorCount 32, got: %I64d\n", SectorCount); + + Result = FsRtlGetNextLargeMcbEntry(&FirstMcb, 5, &Vbn, &Lbn, &SectorCount); + ok(Result == FALSE, "Expected FALSE, got TRUE\n"); + + Result = FsRtlAddLargeMcbEntry(&SecondMcb, 197128, 197128, 1); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + + Result = FsRtlLookupLargeMcbEntry(&SecondMcb, 197128, &Lbn, &SectorCountFromLbn, &StartingLbn, &SectorCountFromStartingLbn, &Index); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + ok(Lbn == 197128LL, "Expected Lbn 197128, got: %I64d\n", Lbn); + ok(SectorCountFromLbn == 1LL, "Expected SectorCountFromLbn 1, got: %I64d\n", SectorCountFromLbn); + ok(StartingLbn == 197128LL, "Expected StartingLbn 197128, got: %I64d\n", StartingLbn); + ok(SectorCountFromStartingLbn == 1LL, "Expected SectorCountFromStartingLbn 1, got: %I64d\n", SectorCountFromStartingLbn); + ok(Index == 1, "Expected Index 1, got: %d\n", Index); + + Result = FsRtlLookupLargeMcbEntry(&FirstMcb, 65, &Lbn, &SectorCountFromLbn, NULL, NULL, NULL); + ok(Result == FALSE, "Expected FALSE, got TRUE\n"); + + Result = FsRtlAddLargeMcbEntry(&FirstMcb, 65, 1249, 44); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + + DumpAllRuns(&FirstMcb); + + NbRuns = FsRtlNumberOfRunsInLargeMcb(&FirstMcb); + ok(NbRuns == 6, "Expected 6 runs, got: %lu\n", NbRuns); + + Result = FsRtlLookupLargeMcbEntry(&FirstMcb, 65, &Lbn, &SectorCountFromLbn, &StartingLbn, &SectorCountFromStartingLbn, &Index); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + ok(Lbn == 1249LL, "Expected Lbn 1249, got: %I64d\n", Lbn); + ok(SectorCountFromLbn == 44LL, "Expected SectorCountFromLbn 44, got: %I64d\n", SectorCountFromLbn); + ok(StartingLbn == 1249LL, "Expected StartingLbn 1249, got: %I64d\n", StartingLbn); + ok(SectorCountFromStartingLbn == 44LL, "Expected SectorCountFromStartingLbn 44, got: %I64d\n", SectorCountFromStartingLbn); + ok(Index == 5, "Expected Index 1, got: %d\n", Index); + + Result = FsRtlGetNextLargeMcbEntry(&FirstMcb, 0, &Vbn, &Lbn, &SectorCount); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + ok(Vbn == 0LL, "Expected Vbn 0, got: %I64d\n", Vbn); + ok(Lbn == -1LL, "Expected Lbn -1, got: %I64d\n", Lbn); + ok(SectorCount == 1LL, "Expected SectorCount 1, got: %I64d\n", SectorCount); + + Result = FsRtlGetNextLargeMcbEntry(&FirstMcb, 1, &Vbn, &Lbn, &SectorCount); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + ok(Vbn == 1LL, "Expected Vbn 1, got: %I64d\n", Vbn); + ok(Lbn == 198657LL, "Expected Lbn 198657, got: %I64d\n", Lbn); + ok(SectorCount == 1LL, "Expected SectorCount 1, got: %I64d\n", SectorCount); + + Result = FsRtlGetNextLargeMcbEntry(&FirstMcb, 2, &Vbn, &Lbn, &SectorCount); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + ok(Vbn == 2LL, "Expected Vbn 2, got: %I64d\n", Vbn); + ok(Lbn == 199169LL, "Expected Lbn 199169, got: %I64d\n", Lbn); + ok(SectorCount == 15LL, "Expected SectorCount 15, got: %I64d\n", SectorCount); + + Result = FsRtlGetNextLargeMcbEntry(&FirstMcb, 3, &Vbn, &Lbn, &SectorCount); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + ok(Vbn == 17LL, "Expected Vbn 17, got: %I64d\n", Vbn); + ok(Lbn == 1105LL, "Expected Lbn 1105, got: %I64d\n", Lbn); + ok(SectorCount == 16LL, "Expected SectorCount 16, got: %I64d\n", SectorCount); + + Result = FsRtlGetNextLargeMcbEntry(&FirstMcb, 4, &Vbn, &Lbn, &SectorCount); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + ok(Vbn == 33LL, "Expected Vbn 33, got: %I64d\n", Vbn); + ok(Lbn == 1185LL, "Expected Lbn 1185, got: %I64d\n", Lbn); + ok(SectorCount == 32LL, "Expected SectorCount 32, got: %I64d\n", SectorCount); + + Result = FsRtlGetNextLargeMcbEntry(&FirstMcb, 5, &Vbn, &Lbn, &SectorCount); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + ok(Vbn == 65LL, "Expected Vbn 65, got: %I64d\n", Vbn); + ok(Lbn == 1249LL, "Expected Lbn 1249, got: %I64d\n", Lbn); + ok(SectorCount == 44LL, "Expected SectorCount 44, got: %I64d\n", SectorCount); + + Result = FsRtlGetNextLargeMcbEntry(&FirstMcb, 6, &Vbn, &Lbn, &SectorCount); + ok(Result == FALSE, "Expected FALSE, got TRUE\n"); + + Result = FsRtlLookupLargeMcbEntry(&FirstMcb, 1, &Lbn, &SectorCountFromLbn, NULL, NULL, NULL); + ok(Result == TRUE, "Expected TRUE, got FALSE\n"); + ok(Lbn == 198657LL, "Expected Lbn 198657, got: %I64d\n", Lbn); + ok(SectorCountFromLbn == 1LL, "Expected SectorCountFromLbn 108, got: %I64d\n", SectorCountFromLbn); + + FsRtlUninitializeLargeMcb(&SecondMcb); + FsRtlUninitializeLargeMcb(&FirstMcb); +} + START_TEST(FsRtlMcb) { FsRtlMcbTest(); FsRtlLargeMcbTest(); + FsRtlLargeMcbTestsExt2(); }

8 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2016