Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 37568: Make the event viewer unicode-enabled and build the unicode version.
by ekohl＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: ekohl Date: Sat Nov 22 15:14:51 2008 New Revision: 37568 URL: http://svn.reactos.org/svn/reactos?rev=37568&view=rev Log: Make the event viewer unicode-enabled and build the unicode version. Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Sat Nov 22 15:14:51 2008 @@ -35,18 +35,18 @@ #define _CRT_SECURE_NO_DEPRECATE // all deprecated 'unsafe string functions #endif -static const LPSTR EVENT_SOURCE_APPLICATION = "Application"; -static const LPSTR EVENT_SOURCE_SECURITY = "Security"; -static const LPSTR EVENT_SOURCE_SYSTEM = "System"; -static const TCHAR szWindowClass[] = _T("EVENTVWR"); // the main window class name +static const LPTSTR EVENT_SOURCE_APPLICATION = _TEXT("Application"); +static const LPTSTR EVENT_SOURCE_SECURITY = _TEXT("Security"); +static const LPTSTR EVENT_SOURCE_SYSTEM = _TEXT("System"); +static const TCHAR szWindowClass[] = _TEXT("EVENTVWR"); // the main window class name //MessageFile message buffer size #define EVENT_MESSAGE_EVENTTEXT_BUFFER 1024*10 #define EVENT_MESSAGE_FILE_BUFFER 1024*10 -#define EVENT_DLL_SEPARATOR ";" -#define EVENT_MESSAGE_FILE "EventMessageFile" -#define EVENT_CATEGORY_MESSAGE_FILE "CategoryMessageFile" -#define EVENT_PARAMETER_MESSAGE_FILE "ParameterMessageFile" +#define EVENT_DLL_SEPARATOR _TEXT(";") +#define EVENT_MESSAGE_FILE _TEXT("EventMessageFile") +#define EVENT_CATEGORY_MESSAGE_FILE _TEXT("CategoryMessageFile") +#define EVENT_PARAMETER_MESSAGE_FILE _TEXT("ParameterMessageFile") #define MAX_LOADSTRING 255 @@ -139,16 +139,16 @@ void -TrimNulls(LPSTR s) -{ - char *c; - - if ( s != (char *) NULL ) - { - c = s + strlen ( s ) - 1; - while ( c >= s && isspace ( *c ) ) +TrimNulls(LPTSTR s) +{ + TCHAR *c; + + if (s != NULL) + { + c = s + _tcslen(s) - 1; + while (c >= s && _istspace(*c)) --c; - *++c = '\0'; + *++c = _TEXT('\0'); } } @@ -157,7 +157,7 @@ GetEventMessageFileDLL(IN LPCTSTR lpLogName, IN LPCTSTR SourceName, IN LPCTSTR EntryName, - OUT LPSTR ExpandedName) + OUT LPTSTR ExpandedName) { DWORD dwSize; BYTE szModuleName[MAX_PATH]; @@ -166,8 +166,8 @@ HKEY hSourceKey = NULL; BOOL bReturn = FALSE; // Return - _tcscpy(szKeyName, TEXT("SYSTEM\\CurrentControlSet\\Services\\EventLog")); - _tcscat(szKeyName, _T("\\")); + _tcscpy(szKeyName, _TEXT("SYSTEM\\CurrentControlSet\\Services\\EventLog")); + _tcscat(szKeyName, _TEXT("\\")); _tcscat(szKeyName, lpLogName); if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, @@ -191,7 +191,7 @@ &dwSize) == ERROR_SUCCESS) { // Returns a string containing the requested substituted environment variable. - ExpandEnvironmentStrings ((LPCTSTR)szModuleName, ExpandedName, MAX_PATH); + ExpandEnvironmentStrings((LPCTSTR)szModuleName, ExpandedName, MAX_PATH); // Succesfull bReturn = TRUE; @@ -245,19 +245,19 @@ if (lpMsgBuf) { // Trim the string - TrimNulls((LPSTR)lpMsgBuf); + TrimNulls((LPTSTR)lpMsgBuf); // Copy the category name - strcpy(CategoryName, (LPCTSTR)lpMsgBuf); + _tcscpy(CategoryName, (LPCTSTR)lpMsgBuf); } else { - strcpy(CategoryName, (LPCTSTR)lpMsgBuf); + _tcscpy(CategoryName, (LPCTSTR)lpMsgBuf); } } else { - strcpy(CategoryName, "None"); + _tcscpy(CategoryName, _TEXT("None")); } if (hLibrary != NULL) @@ -271,7 +271,7 @@ } } - strcpy(CategoryName, "None"); + _tcscpy(CategoryName, _TEXT("None")); return FALSE; } @@ -285,8 +285,8 @@ { DWORD i; HANDLE hLibrary = NULL; - char SourceModuleName[1000]; - char ParameterModuleName[1000]; + TCHAR SourceModuleName[1000]; + TCHAR ParameterModuleName[1000]; LPTSTR lpMsgBuf = NULL; TCHAR szStringIDNotFound[MAX_LOADSTRING]; LPTSTR szDll; @@ -301,7 +301,7 @@ szMessage = (LPTSTR)((LPBYTE)pevlr + pevlr->StringOffset); // Allocate space for parameters - szArguments = (LPTSTR*)malloc(sizeof(LPVOID)* pevlr->NumStrings); + szArguments = (LPTSTR*)malloc(sizeof(LPVOID) * pevlr->NumStrings); if (!szArguments) { return FALSE; @@ -309,7 +309,7 @@ for (i = 0; i < pevlr->NumStrings ; i++) { - if (strstr(szMessage , "%%")) + if (_tcsstr(szMessage , _TEXT("%%"))) { if (GetEventMessageFileDLL(KeyName , SourceName, EVENT_PARAMETER_MESSAGE_FILE, ParameterModuleName)) { @@ -317,16 +317,16 @@ } szArguments[i] = szMessage; - szMessage += strlen(szMessage) + 1; + szMessage += _tcslen(szMessage) + 1; } else { szArguments[i] = szMessage; - szMessage += strlen(szMessage) + 1; + szMessage += _tcslen(szMessage) + 1; } } - szDll = strtok(SourceModuleName, EVENT_DLL_SEPARATOR); + szDll = _tcstok(SourceModuleName, EVENT_DLL_SEPARATOR); while ((szDll != NULL) && (!bDone)) { hLibrary = LoadLibraryEx(szDll, @@ -335,7 +335,7 @@ if (hLibrary == NULL) { // The DLL could not be loaded try the next one (if any) - szDll = strtok(NULL, EVENT_DLL_SEPARATOR); + szDll = _tcstok(NULL, EVENT_DLL_SEPARATOR); } else { @@ -349,10 +349,10 @@ MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)&lpMsgBuf, 0, - szArguments) == 0) + (va_list*)szArguments) == 0) { // We haven't found the string , get next DLL (if any) - szDll = strtok (NULL, EVENT_DLL_SEPARATOR); + szDll = _tcstok(NULL, EVENT_DLL_SEPARATOR); } else { @@ -362,10 +362,10 @@ bDone = TRUE; // Trim the string - TrimNulls((LPSTR)lpMsgBuf); + TrimNulls((LPTSTR)lpMsgBuf); // Copy the event text - strcpy(EventText ,lpMsgBuf); + _tcscpy(EventText ,lpMsgBuf); } } @@ -394,7 +394,7 @@ VOID GetEventType(IN WORD dwEventType, - OUT LPSTR eventTypeText) + OUT LPTSTR eventTypeText) { switch (dwEventType) { @@ -423,11 +423,12 @@ } BOOL -GetEventUserName(EVENTLOGRECORD *pelr, OUT LPSTR pszUser) +GetEventUserName(EVENTLOGRECORD *pelr, + OUT LPTSTR pszUser) { PSID lpSid; - char szName[1024]; - char szDomain[1024]; + TCHAR szName[1024]; + TCHAR szDomain[1024]; SID_NAME_USE peUse; DWORD cbName = 1024; DWORD cbDomain = 1024; @@ -446,7 +447,7 @@ &cbDomain, &peUse)) { - strcpy(pszUser, szName); + _tcscpy(pszUser, szName); return TRUE; } } @@ -494,22 +495,22 @@ EVENTLOGRECORD *pevlr; BYTE bBuffer[MAX_PATH]; DWORD dwRead, dwNeeded, dwThisRecord, dwTotalRecords, dwCurrentRecord = 1, dwRecordsToRead = 0, dwFlags; - LPSTR lpSourceName; - LPSTR lpComputerName; - LPSTR lpEventStr; - LPSTR lpData; + LPTSTR lpSourceName; + LPTSTR lpComputerName; + LPTSTR lpEventStr; + LPTSTR lpData; BOOL bResult = TRUE; // Read succeeded. - char szWindowTitle[MAX_PATH]; - char szStatusText[MAX_PATH]; - char szLocalDate[MAX_PATH]; - char szLocalTime[MAX_PATH]; - char szEventID[MAX_PATH]; - char szEventTypeText[MAX_PATH]; - char szCategoryID[MAX_PATH]; - char szUsername[MAX_PATH]; - char szEventText[EVENT_MESSAGE_FILE_BUFFER]; - char szCategory[MAX_PATH]; + TCHAR szWindowTitle[MAX_PATH]; + TCHAR szStatusText[MAX_PATH]; + TCHAR szLocalDate[MAX_PATH]; + TCHAR szLocalTime[MAX_PATH]; + TCHAR szEventID[MAX_PATH]; + TCHAR szEventTypeText[MAX_PATH]; + TCHAR szCategoryID[MAX_PATH]; + TCHAR szUsername[MAX_PATH]; + TCHAR szEventText[EVENT_MESSAGE_FILE_BUFFER]; + TCHAR szCategory[MAX_PATH]; SYSTEMTIME time; LVITEM lviEventItem; @@ -583,21 +584,21 @@ while (dwRead > 0) { - strcpy(szUsername , "N/A"); - strcpy(szEventText , "N/A"); - strcpy(szCategory , "None"); + _tcscpy(szUsername , _TEXT("N/A")); + _tcscpy(szEventText , _TEXT("N/A")); + _tcscpy(szCategory , _TEXT("None")); // Get the event source name. - lpSourceName = (LPSTR)((LPBYTE)pevlr + sizeof(EVENTLOGRECORD)); + lpSourceName = (LPTSTR)((LPBYTE)pevlr + sizeof(EVENTLOGRECORD)); // Get the computer name - lpComputerName = (LPSTR)((LPBYTE)pevlr + sizeof(EVENTLOGRECORD) + lstrlen(lpSourceName) + 1); + lpComputerName = (LPTSTR)((LPBYTE)pevlr + sizeof(EVENTLOGRECORD) + (_tcslen(lpSourceName) + 1) * sizeof(TCHAR)); // This ist the data section of the current event - lpData = (LPSTR)((LPBYTE)pevlr + pevlr->DataOffset); + lpData = (LPTSTR)((LPBYTE)pevlr + pevlr->DataOffset); // This is the text of the current event - lpEventStr = (LPSTR)((LPBYTE) pevlr + pevlr->StringOffset); + lpEventStr = (LPTSTR)((LPBYTE)pevlr + pevlr->StringOffset); // Compute the event type EventTimeToSystemTime(pevlr->TimeWritten, &time); @@ -611,8 +612,8 @@ GetEventType(pevlr->EventType, szEventTypeText); GetEventCategory(lpLogName, lpSourceName, pevlr, szCategory); - wsprintf(szEventID, "%u", (DWORD)(pevlr->EventID & 0xFFFF)); - wsprintf(szCategoryID, "%u", (DWORD)(pevlr->EventCategory)); + wsprintf(szEventID, _TEXT("%u"), (DWORD)(pevlr->EventID & 0xFFFF)); + wsprintf(szCategoryID, _TEXT("%u"), (DWORD)(pevlr->EventCategory)); lviEventItem.mask = LVIF_IMAGE | LVIF_TEXT | LVIF_PARAM; lviEventItem.iItem = 0; @@ -671,8 +672,8 @@ // All events loaded EndDialog(hwndDlg, 0); - wsprintf(szWindowTitle, "%s - %s Log on \\\\%s", szTitle , lpLogName , lpComputerName); - wsprintf(szStatusText, "%s has %d event(s)", lpLogName , dwTotalRecords); + wsprintf(szWindowTitle, _TEXT("%s - %s Log on \\\\%s"), szTitle, lpLogName, lpComputerName); + wsprintf(szStatusText, _TEXT("%s has %d event(s)"), lpLogName, dwTotalRecords); // Update the status bar SendMessage(hwndStatus, SB_SETTEXT, (WPARAM)0, (LPARAM)szStatusText); @@ -766,7 +767,7 @@ hwndStatus = CreateWindowEx(0, // no extended styles STATUSCLASSNAME, // status bar - "Done.", // no text + _TEXT("Done."), // no text WS_CHILD | WS_BORDER | WS_VISIBLE, // styles 0, 0, 0, 0, // x, y, cx, cy hwndMainWindow, // parent window @@ -779,7 +780,7 @@ // LVS_EX_ styles cannot be set in CreateWindowEx(). hwndListView = CreateWindowEx(WS_EX_CLIENTEDGE, WC_LISTVIEW, - _T(""), + _TEXT(""), LVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | LVS_REPORT, 0, 0, @@ -1013,23 +1014,23 @@ VOID DisplayEvent(HWND hDlg) { - char szEventType[MAX_PATH]; - char szTime[MAX_PATH]; - char szDate[MAX_PATH]; - char szUser[MAX_PATH]; - char szComputer[MAX_PATH]; - char szSource[MAX_PATH]; - char szCategory[MAX_PATH]; - char szEventID[MAX_PATH]; - char szEventText[EVENT_MESSAGE_EVENTTEXT_BUFFER]; - char szEventData[MAX_PATH]; + TCHAR szEventType[MAX_PATH]; + TCHAR szTime[MAX_PATH]; + TCHAR szDate[MAX_PATH]; + TCHAR szUser[MAX_PATH]; + TCHAR szComputer[MAX_PATH]; + TCHAR szSource[MAX_PATH]; + TCHAR szCategory[MAX_PATH]; + TCHAR szEventID[MAX_PATH]; + TCHAR szEventText[EVENT_MESSAGE_EVENTTEXT_BUFFER]; + TCHAR szEventData[MAX_PATH]; BOOL bEventData = FALSE; LVITEM li; EVENTLOGRECORD* pevlr; int iIndex; // Get index of selected item - iIndex = (int)SendMessage (hwndListView ,LVM_GETNEXTITEM, -1 , LVNI_SELECTED | LVNI_FOCUSED); + iIndex = (int)SendMessage (hwndListView, LVM_GETNEXTITEM, -1, LVNI_SELECTED | LVNI_FOCUSED); li.mask = LVIF_PARAM; li.iItem = iIndex; @@ -1049,9 +1050,18 @@ ListView_GetItemText(hwndListView, iIndex, 5, szEventID, sizeof(szEventID)); ListView_GetItemText(hwndListView, iIndex, 6, szUser, sizeof(szUser)); ListView_GetItemText(hwndListView, iIndex, 7, szComputer, sizeof(szComputer)); - ListView_GetItemText(hwndListView, iIndex, 8, szEventData, sizeof(szEventData)); - - bEventData = !(strlen(szEventData) == 0); + + bEventData = !(pevlr->DataLength == 0); + + if (pevlr->DataLength > 0) + { + MultiByteToWideChar(CP_ACP, + 0, + (LPCSTR)((LPBYTE)pevlr + pevlr->DataOffset), + pevlr->DataLength, + szEventData, + MAX_PATH); + } GetEventMessage(lpSourceLogName, szSource, pevlr, szEventText); @@ -1072,8 +1082,8 @@ else { MessageBox(NULL, - "No Items in ListView", - "Error", + _TEXT("No Items in ListView"), + _TEXT("Error"), MB_OK | MB_ICONINFORMATION); } } @@ -1113,47 +1123,42 @@ return (INT_PTR)TRUE; case WM_COMMAND: - if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) - { - EndDialog(hDlg, LOWORD(wParam)); - return (INT_PTR)TRUE; - } - - if (LOWORD(wParam) == IDPREVIOUS) - { - SendMessage(hwndListView, WM_KEYDOWN, VK_UP, 0); - - // Show event info on dialog box - DisplayEvent(hDlg); - return (INT_PTR)TRUE; - } - - if (LOWORD(wParam) == IDNEXT) - { - SendMessage(hwndListView, WM_KEYDOWN, VK_DOWN, 0); - - // Show event info on dialog box - DisplayEvent(hDlg); - return (INT_PTR)TRUE; - } - - if (LOWORD(wParam) == IDC_BYTESRADIO) - { - return (INT_PTR)TRUE; - } - - if (LOWORD(wParam) == IDC_WORDRADIO) - { - return (INT_PTR)TRUE; - } - - if (LOWORD(wParam) == IDHELP) - { - MessageBox(NULL, - _TEXT("Help not implemented yet!"), - _TEXT("Event Log"), - MB_OK | MB_ICONINFORMATION); - return (INT_PTR)TRUE; + switch (LOWORD(wParam)) + { + case IDOK: + case IDCANCEL: + EndDialog(hDlg, LOWORD(wParam)); + return (INT_PTR)TRUE; + + case IDPREVIOUS: + SendMessage(hwndListView, WM_KEYDOWN, VK_UP, 0); + + // Show event info on dialog box + DisplayEvent(hDlg); + return (INT_PTR)TRUE; + + case IDNEXT: + SendMessage(hwndListView, WM_KEYDOWN, VK_DOWN, 0); + + // Show event info on dialog box + DisplayEvent(hDlg); + return (INT_PTR)TRUE; + + case IDC_BYTESRADIO: + return (INT_PTR)TRUE; + + case IDC_WORDRADIO: + return (INT_PTR)TRUE; + + case IDHELP: + MessageBox(NULL, + _TEXT("Help not implemented yet!"), + _TEXT("Event Log"), + MB_OK | MB_ICONINFORMATION); + return (INT_PTR)TRUE; + + default: + break; } break; } Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild [iso-8859-1] Sat Nov 22 15:14:51 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> -<module name="eventvwr" type="win32gui" installbase="system32" installname="eventvwr.exe" allowwarnings="true"> +<module name="eventvwr" type="win32gui" installbase="system32" installname="eventvwr.exe" unicode="yes"> <include base="eventvwr">.</include> <library>kernel32</library> <library>user32</library>

1 0

[dgoette] 37567: if stable entries of type 'page' or dynamic 'content' are deleted -> delete them also from hdd and not only in our Database
by dgoette＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: dgoette Date: Sat Nov 22 14:49:00 2008 New Revision: 37567 URL: http://svn.reactos.org/svn/reactos?rev=37567&view=rev Log: if stable entries of type 'page' or dynamic 'content' are deleted -> delete them also from hdd and not only in our Database Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Data.class.php Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Data.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Data.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Data.class.php [iso-8859-1] Sat Nov 22 14:49:00 2008 @@ -229,6 +229,69 @@ } } } // end of member function getCookieDomain + + + /** + * deletes files from generated entries + * + * @param int rev_id + * @access public + */ + public static function deleteFile( $rev_id ) + { + global $roscms_security_level; + // only for admins + if ($roscms_security_level < 3) { + return; + } + + $stmt=DBConnection::getInstance()->prepare("SELECT d.data_id, d.data_name, d.data_type, r.rev_id, r.rev_language FROM data_ d JOIN data_revision r ON r.data_id=d.data_id WHERE r.rev_id = :rev_id LIMIT 1"); + $stmt->bindParam('rev_id',$rev_id,PDO::PARAM_INT); + $stmt->execute(); + $page = $stmt->fetchOnce(PDO::FETCH_ASSOC); + + // only for entries of type page + if ($page === false) { + return; + } + + //if data_type is page -> delete file in all languages + if ($page['data_type'] == 'page'){ + $stmt=DBConnection::getInstance()->prepare("SELECT lang_id FROM languages"); + } + + //if data_type is content (only for dynamic) -> delete only selected one + elseif ($page['data_type'] == ''){ + $dynamic_num = Tag::getValueByUser($page['data_id'],$page['rev_id'],'number',-1); + if ($dynamic_num > 0) { + $stmt=DBConnection::getInstance()->prepare("SELECT lang_id FROM languages WHERE lang_id = :lang_id LIMIT 1"); + $stmt->bindParam('lang_id',$page['rev_language'],PDO::PARAM_STR); + } + // entry is not dynamic + else { + return; + } + } + + // neither page or content -> nothing to do + else { + return; + } + + // get file name + $file_extension = Tag::getValueByUser($page['data_id'], $page['rev_id'], 'extension', -1); + $file_name = $page['data_name'].(isset($dynamic_num) ? '_'.$dynamic_num : '').'.'.$file_extension; + + // delete entries for selected language packs + $stmt->execute(); + while ($lang = $stmt->fetch(PDO::FETCH_ASSOC)) { + + // delete file if it exists + if ( file_exists('../'.$lang['lang_id'].'/'.$file_name)) { + unlink('../'.$lang['lang_id'].'/'.$file_name); + } + } + } /** @@ -846,6 +909,7 @@ if ($roscms_security_level < 3) { Data::copy($revision['data_id'], $revision['rev_id'], 0, $lang); } + Data::deleteFile($revision['rev_id']); Data::deleteRevision($revision['rev_id']); } else { @@ -856,6 +920,7 @@ // move to archiv case 'va': Data::copy($revision['data_id'], $revision['rev_id'], 0, $lang); + Data::deleteFile($revision['rev_id']); Data::deleteRevision($revision['rev_id']); break; } // switch

1 0

[dgoette] 37566: implement [#wiki_ABC] to wiki page 'ABC'
by dgoette＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: dgoette Date: Sat Nov 22 14:00:43 2008 New Revision: 37566 URL: http://svn.reactos.org/svn/reactos?rev=37566&view=rev Log: implement [#wiki_ABC] to wiki page 'ABC' Modified: branches/danny-web/reactos.org/htdocs/roscms/custom.php branches/danny-web/reactos.org/htdocs/roscms/lib/Export_HTML.class.php Modified: branches/danny-web/reactos.org/htdocs/roscms/custom.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/custom.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/custom.php [iso-8859-1] Sat Nov 22 14:00:43 2008 @@ -32,5 +32,6 @@ $roscms_standard_language_full="English"; // English/German/... $roscms_standard_language_trans="de"; // en/de/fr/... + $roscms_subsystem_wiki_path = '/reactos/wiki/index.php/'; // base adress for wiki pages ?> Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Export_HTML.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Export_HTML.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Export_HTML.class.php [iso-8859-1] Sat Nov 22 14:00:43 2008 @@ -335,6 +335,7 @@ global $roscms_intern_webserver_pages; global $roscms_intern_webserver_roscms; global $roscms_standard_language; + global $roscms_subsystem_wiki_path; // try to force unlimited script runtime @set_time_limit(0); @@ -405,7 +406,10 @@ $content = str_replace('[#roscms_page_version]', $page['rev_version'], $content); // page edit link - $content = str_replace('[#roscms_page_edit]', $roscms_intern_webserver_roscms.'?page=data_out&d_f=page&d_u=show&d_val='.$this->page_name.'&d_val2='.$this->lang.'&d_val3='.$this->dynamic_num.'&d_val4=edit', $content); + $content = str_replace('[#roscms_page_edit]', $roscms_intern_webserver_roscms.'?page=data_out&d_f=page&d_u=show&d_val='.$this->page_name.'&d_val2='.$this->lang.'&d_val3='.$this->dynamic_num.'&d_val4=edit', $content); + + // Subsystem Links + $content = preg_replace('/\[#wiki_([^]]+)\]/', $roscms_subsystem_wiki_path.'$1', $content); // translation info if ($this->lang == $roscms_standard_language) {

1 0

[dgoette] 37565: implement account disabling / enabling(if already activated)
by dgoette＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: dgoette Date: Sat Nov 22 13:37:14 2008 New Revision: 37565 URL: http://svn.reactos.org/svn/reactos?rev=37565&view=rev Log: implement account disabling / enabling(if already activated) Modified: branches/danny-web/reactos.org/htdocs/roscms/js/cms_user.js branches/danny-web/reactos.org/htdocs/roscms/lib/Export_User.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Login.class.php Modified: branches/danny-web/reactos.org/htdocs/roscms/js/cms_user.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/js/cms_user.js [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/js/cms_user.js [iso-8859-1] Sat Nov 22 13:37:14 2008 @@ -91,4 +91,12 @@ // to prevent memory leak http_request = null; } - + +// enables or disables useraccounts +function setaccount(userid, enable) { + var uf_check = confirm("Do you want to "+enable+" this membership?"); + + if (uf_check == true) { + makeRequest('?page=data_out&d_f=user&d_u=usrtbl&d_fl=account'+enable+'&d_val='+encodeURIComponent(userid), 'usrtbl', 'userarea'); + } +} Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Export_User.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Export_User.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Export_User.class.php [iso-8859-1] Sat Nov 22 13:37:14 2008 @@ -117,6 +117,29 @@ $flag = 'detail'; break; + case 'accountdisable': + // only with admin rights + if ($roscms_security_level == 3) { + $stmt=DBConnection::getInstance()->prepare("UPDATE users SET user_account_enabled = 'no' WHERE user_id = :user_id"); + $stmt->bindParam('user_id',$user_id,PDO::PARAM_INT); + $stmt->execute(); + } + // preselect displayed content + $flag = 'detail'; + break; + + case 'accountenable': + // enable account only with admin rights + if ($roscms_security_level == 3) { + // enable account only, if he has already activated his account + $stmt=DBConnection::getInstance()->prepare("UPDATE users SET user_account_enabled = 'yes' WHERE user_register_activation = '' AND user_id = :user_id"); + $stmt->bindParam('user_id',$user_id,PDO::PARAM_INT); + $stmt->execute(); + } + // preselect displayed content + $flag = 'detail'; + break; + case 'upateusrlang': $stmt=DBConnection::getInstance()->prepare("UPDATE users SET user_timestamp_touch2 = NOW(), user_language = :lang WHERE user_id = :user_id LIMIT 1"); $stmt->bindParam('lang',$group_id); @@ -184,7 +207,7 @@ break; case 'detail': - $stmt=DBConnection::getInstance()->prepare("SELECT user_id, user_name, user_timestamp_touch2 AS visit, user_login_counter AS visitcount, user_register, user_fullname, user_email, user_language FROM users WHERE user_id = :user_id LIMIT 1"); + $stmt=DBConnection::getInstance()->prepare("SELECT user_id, user_name, user_timestamp_touch2 AS visit, user_login_counter AS visitcount, user_register, user_fullname, user_email, user_language, user_account_enabled FROM users WHERE user_id = :user_id LIMIT 1"); $stmt->bindParam('user_id',$user_id,PDO::PARAM_INT); $stmt->execute(); $user = $stmt->fetchOnce(); @@ -198,7 +221,12 @@ echo_strip(' E-Mail: '.$user['user_email'].' Latest Login: '.$user['visit'].'; '.$user['visitcount'].' logins - Registered: '.$user['user_register'].''); + Registered: '.$user['user_register'].' + Account is '.($user['user_account_enabled']=='yes'?'enabled':'disabled').' +  ( +  '.($user['user_account_enabled']=='yes'?'disable':'enable').' + it) + '); } echo_strip(' <fieldset> Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Login.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Login.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Login.class.php [iso-8859-1] Sat Nov 22 13:37:14 2008 @@ -71,10 +71,10 @@ // Now, see if we have a valid login session if ($subsys == '') { - $stmt=DBConnection::getInstance()->prepare("SELECT u.user_id, s.usersession_expires AS session_expires FROM user_sessions s JOIN users u ON u.user_id = s.usersession_user_id WHERE s.usersession_id = :session_id AND (u.user_setting_ipaddress = 'false' OR s.usersession_ipaddress=:ip ) AND (u.user_setting_browseragent = 'false' OR s.usersession_browseragent = :agent)"); + $stmt=DBConnection::getInstance()->prepare("SELECT u.user_id, s.usersession_expires AS session_expires FROM user_sessions s JOIN users u ON u.user_id = s.usersession_user_id WHERE s.usersession_id = :session_id AND (u.user_setting_ipaddress = 'false' OR s.usersession_ipaddress=:ip ) AND (u.user_setting_browseragent = 'false' OR s.usersession_browseragent = :agent) AND u.user_account_enabled = 'yes' LIMIT 1"); } else{ - $stmt=DBConnection::getInstance()->prepare("SELECT m.map_subsys_userid AS user_id, s.usersession_expires AS session_expires FROM user_sessions s JOIN users u ON u.user_id = s.usersession_user_id JOIN subsys_mappings m ON m.map_roscms_userid = s.usersession_user_id WHERE s.usersession_id = :session_id AND (u.user_setting_ipaddress = 'false' OR s.usersession_ipaddress = :ip) AND (u.user_setting_browseragent = 'false' OR s.usersession_browseragent = :agent) AND m.map_subsys_name = :subsys"); + $stmt=DBConnection::getInstance()->prepare("SELECT m.map_subsys_userid AS user_id, s.usersession_expires AS session_expires FROM user_sessions s JOIN users u ON u.user_id = s.usersession_user_id JOIN subsys_mappings m ON m.map_roscms_userid = s.usersession_user_id WHERE s.usersession_id = :session_id AND (u.user_setting_ipaddress = 'false' OR s.usersession_ipaddress = :ip) AND (u.user_setting_browseragent = 'false' OR s.usersession_browseragent = :agent) AND m.map_subsys_name = :subsys AND u.user_account_enabled = 'yes' LIMIT 1"); $stmt->bindParam('subsys',$subsys,PDO::PARAM_STR); } $stmt->bindParam('session_id',$session_id_clean,PDO::PARAM_INT);

1 0

[ekohl] 37564: Replace TABs by Spaces. No code changes!
by ekohl＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: ekohl Date: Sat Nov 22 13:25:48 2008 New Revision: 37564 URL: http://svn.reactos.org/svn/reactos?rev=37564&view=rev Log: Replace TABs by Spaces. No code changes! Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c trunk/reactos/base/applications/mscutils/eventvwr/resource.h Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Sat Nov 22 13:25:48 2008 @@ -24,63 +24,65 @@ */ #include "eventvwr.h" -#include <windows.h> // Standard windows include file -#include <commctrl.h> // For ListView control APIs -#include <tchar.h> // For TCHAR and string functions. +#include <windows.h> // Standard windows include file +#include <commctrl.h> // For ListView control APIs +#include <tchar.h> // For TCHAR and string functions. #include <stdio.h> #include <time.h> #if _MSC_VER - #pragma warning(disable: 4996) // 'strdup' was declared deprecated - #define _CRT_SECURE_NO_DEPRECATE // all deprecated 'unsafe string functions + #pragma warning(disable: 4996) // 'strdup' was declared deprecated + #define _CRT_SECURE_NO_DEPRECATE // all deprecated 'unsafe string functions #endif -static const LPSTR EVENT_SOURCE_APPLICATION = "Application"; -static const LPSTR EVENT_SOURCE_SECURITY = "Security"; -static const LPSTR EVENT_SOURCE_SYSTEM = "System"; -static const TCHAR szWindowClass[] = _T("EVENTVWR"); // the main window class name +static const LPSTR EVENT_SOURCE_APPLICATION = "Application"; +static const LPSTR EVENT_SOURCE_SECURITY = "Security"; +static const LPSTR EVENT_SOURCE_SYSTEM = "System"; +static const TCHAR szWindowClass[] = _T("EVENTVWR"); // the main window class name //MessageFile message buffer size -#define EVENT_MESSAGE_EVENTTEXT_BUFFER 1024*10 -#define EVENT_MESSAGE_FILE_BUFFER 1024*10 -#define EVENT_DLL_SEPARATOR ";" -#define EVENT_MESSAGE_FILE "EventMessageFile" -#define EVENT_CATEGORY_MESSAGE_FILE "CategoryMessageFile" -#define EVENT_PARAMETER_MESSAGE_FILE "ParameterMessageFile" +#define EVENT_MESSAGE_EVENTTEXT_BUFFER 1024*10 +#define EVENT_MESSAGE_FILE_BUFFER 1024*10 +#define EVENT_DLL_SEPARATOR ";" +#define EVENT_MESSAGE_FILE "EventMessageFile" +#define EVENT_CATEGORY_MESSAGE_FILE "CategoryMessageFile" +#define EVENT_PARAMETER_MESSAGE_FILE "ParameterMessageFile" #define MAX_LOADSTRING 255 // Global Variables: -HINSTANCE hInst; // current instance -TCHAR szTitle[MAX_LOADSTRING]; // The title bar text +HINSTANCE hInst; // current instance +TCHAR szTitle[MAX_LOADSTRING]; // The title bar text // Globals HWND hwndMainWindow; // Main window HWND hwndListView; // ListView control -HWND hwndStatus; // Status bar - -LPTSTR lpSourceLogName = NULL; -LPTSTR lpComputerName = NULL; +HWND hwndStatus; // Status bar + +LPTSTR lpSourceLogName = NULL; +LPTSTR lpComputerName = NULL; // Forward declarations of functions included in this code module: -ATOM MyRegisterClass(HINSTANCE hInstance); -BOOL InitInstance(HINSTANCE, int); -LRESULT CALLBACK WndProc (HWND, UINT, WPARAM, LPARAM); -INT_PTR CALLBACK About (HWND, UINT, WPARAM, LPARAM); -INT_PTR CALLBACK EventDetails (HWND, UINT, WPARAM, LPARAM); +ATOM MyRegisterClass(HINSTANCE hInstance); +BOOL InitInstance(HINSTANCE, int); +LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM); +INT_PTR CALLBACK About(HWND, UINT, WPARAM, LPARAM); +INT_PTR CALLBACK EventDetails(HWND, UINT, WPARAM, LPARAM); static INT_PTR CALLBACK StatusMessageWindowProc (HWND, UINT, WPARAM, LPARAM); -int APIENTRY _tWinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPTSTR lpCmdLine, - int nCmdShow) -{ - MSG msg; - HACCEL hAccelTable; - INITCOMMONCONTROLSEX iccx; - - UNREFERENCED_PARAMETER(hPrevInstance); - UNREFERENCED_PARAMETER(lpCmdLine); + +int APIENTRY +_tWinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPTSTR lpCmdLine, + int nCmdShow) +{ + MSG msg; + HACCEL hAccelTable; + INITCOMMONCONTROLSEX iccx; + + UNREFERENCED_PARAMETER(hPrevInstance); + UNREFERENCED_PARAMETER(lpCmdLine); // Whenever any of the common controls are used in your app, // you must call InitCommonControlsEx() to register the classes @@ -89,50 +91,55 @@ iccx.dwICC = ICC_LISTVIEW_CLASSES; InitCommonControlsEx(&iccx); - // Initialize global strings - LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING); - MyRegisterClass(hInstance); - - // Perform application initialization: - if (!InitInstance (hInstance, nCmdShow)) - { - return FALSE; - } - - hAccelTable = LoadAccelerators(hInstance, MAKEINTRESOURCE(IDC_EVENTVWR)); - - // Main message loop: - while (GetMessage(&msg, NULL, 0, 0)) - { - if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) - { - TranslateMessage(&msg); - DispatchMessage(&msg); - } - } - - return (int) msg.wParam; -} - -VOID EventTimeToSystemTime (DWORD EventTime, SYSTEMTIME *pSystemTime) -{ - SYSTEMTIME st1970 = { 1970, 1, 0, 1, 0, 0, 0, 0 }; - FILETIME ftLocal; - union { - FILETIME ft; - ULONGLONG ll; - } u1970, uUCT; - - uUCT.ft.dwHighDateTime = 0; - uUCT.ft.dwLowDateTime = EventTime; - SystemTimeToFileTime(&st1970, &u1970.ft); - uUCT.ll = uUCT.ll * 10000000 + u1970.ll; - FileTimeToLocalFileTime(&uUCT.ft, &ftLocal); - FileTimeToSystemTime(&ftLocal, pSystemTime); -} + // Initialize global strings + LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING); + MyRegisterClass(hInstance); + + // Perform application initialization: + if (!InitInstance(hInstance, nCmdShow)) + { + return FALSE; + } + + hAccelTable = LoadAccelerators(hInstance, MAKEINTRESOURCE(IDC_EVENTVWR)); + + // Main message loop: + while (GetMessage(&msg, NULL, 0, 0)) + { + if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } + + return (int)msg.wParam; +} + + +VOID +EventTimeToSystemTime(DWORD EventTime, + SYSTEMTIME *pSystemTime) +{ + SYSTEMTIME st1970 = { 1970, 1, 0, 1, 0, 0, 0, 0 }; + FILETIME ftLocal; + union + { + FILETIME ft; + ULONGLONG ll; + } u1970, uUCT; + + uUCT.ft.dwHighDateTime = 0; + uUCT.ft.dwLowDateTime = EventTime; + SystemTimeToFileTime(&st1970, &u1970.ft); + uUCT.ll = uUCT.ll * 10000000 + u1970.ll; + FileTimeToLocalFileTime(&uUCT.ft, &ftLocal); + FileTimeToSystemTime(&ftLocal, pSystemTime); +} + void -TrimNulls ( LPSTR s ) +TrimNulls(LPSTR s) { char *c; @@ -145,253 +152,251 @@ } } -BOOL GetEventMessageFileDLL( - IN LPCTSTR lpLogName, - IN LPCTSTR SourceName, - IN LPCTSTR EntryName, - OUT LPSTR ExpandedName) -{ - DWORD dwSize; - BYTE szModuleName[MAX_PATH]; - TCHAR szKeyName[MAX_PATH]; - HKEY hAppKey = NULL; - HKEY hSourceKey = NULL; - BOOL bReturn = FALSE; // Return + +BOOL +GetEventMessageFileDLL(IN LPCTSTR lpLogName, + IN LPCTSTR SourceName, + IN LPCTSTR EntryName, + OUT LPSTR ExpandedName) +{ + DWORD dwSize; + BYTE szModuleName[MAX_PATH]; + TCHAR szKeyName[MAX_PATH]; + HKEY hAppKey = NULL; + HKEY hSourceKey = NULL; + BOOL bReturn = FALSE; // Return _tcscpy(szKeyName, TEXT("SYSTEM\\CurrentControlSet\\Services\\EventLog")); _tcscat(szKeyName, _T("\\")); _tcscat(szKeyName, lpLogName); - if (RegOpenKeyEx( - HKEY_LOCAL_MACHINE, - szKeyName, - 0, - KEY_READ, - &hAppKey) == ERROR_SUCCESS) - { - if (RegOpenKeyEx( - hAppKey, - SourceName, - 0, - KEY_READ, - &hSourceKey) == ERROR_SUCCESS) - { - dwSize = MAX_PATH; - if (RegQueryValueEx( - hSourceKey, - EntryName, - NULL, - NULL, - (LPBYTE)szModuleName, - &dwSize) == ERROR_SUCCESS) - { - // Returns a string containing the requested substituted environment variable. - ExpandEnvironmentStrings ((LPCTSTR)szModuleName, ExpandedName, MAX_PATH); - - // Succesfull - bReturn = TRUE; - } - } - } - else - { - MessageBox (NULL , - _TEXT("Registry access failed!") , - _TEXT("Event Log") , - MB_OK | MB_ICONINFORMATION); - } - - if (hSourceKey != NULL) - RegCloseKey(hSourceKey); - - if (hAppKey != NULL) - RegCloseKey(hAppKey); - - return bReturn; -} - -BOOL GetEventCategory( - IN LPCTSTR KeyName, - IN LPCTSTR SourceName, - IN EVENTLOGRECORD *pevlr, - OUT LPTSTR CategoryName) -{ - HANDLE hLibrary = NULL; - TCHAR szMessageDLL[MAX_PATH]; - LPVOID lpMsgBuf = NULL; - - if(GetEventMessageFileDLL (KeyName, SourceName, EVENT_CATEGORY_MESSAGE_FILE , szMessageDLL)) - { - hLibrary = LoadLibraryEx( - szMessageDLL, - NULL, - DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE); - - if(hLibrary != NULL) - { - // Retrieve the message string. - if(FormatMessage( - FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_ARGUMENT_ARRAY, - hLibrary, - pevlr->EventCategory, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR)&lpMsgBuf, - EVENT_MESSAGE_FILE_BUFFER, - NULL) != 0) - { - if (lpMsgBuf) - { - //Trim the string - TrimNulls ((LPSTR)lpMsgBuf); - - // Copy the category name - strcpy (CategoryName, (LPCTSTR)lpMsgBuf); - } - else - { - strcpy (CategoryName, (LPCTSTR)lpMsgBuf); - } - }else{ - strcpy (CategoryName, "None"); - } - - if(hLibrary != NULL) - FreeLibrary(hLibrary); - - // Free the buffer allocated by FormatMessage - if (lpMsgBuf) - LocalFree(lpMsgBuf); - - return TRUE; - } - } - - strcpy (CategoryName, "None"); - - return FALSE; -} - -BOOL GetEventMessage( - IN LPCTSTR KeyName, - IN LPCTSTR SourceName, - IN EVENTLOGRECORD *pevlr, - OUT LPTSTR EventText) -{ - DWORD i; - HANDLE hLibrary = NULL; - char SourceModuleName[1000]; - char ParameterModuleName[1000]; - LPTSTR lpMsgBuf = NULL; - TCHAR szStringIDNotFound[MAX_LOADSTRING]; - LPTSTR szDll; - LPTSTR szMessage; - LPTSTR *szArguments; - BOOL bDone = FALSE; - - /* TODO : GetEventMessageFileDLL can return a comma separated list of DLLs */ - if (GetEventMessageFileDLL (KeyName , SourceName, EVENT_MESSAGE_FILE , SourceModuleName)) - { - // Get the event message - szMessage = (LPTSTR)((LPBYTE)pevlr + pevlr->StringOffset); - - // Allocate space for parameters - szArguments = (LPTSTR*)malloc(sizeof(LPVOID)* pevlr->NumStrings); - if (!szArguments) - { - return FALSE; - } - - for (i = 0; i < pevlr->NumStrings ; i++) - { - if (strstr(szMessage , "%%")) - { - if (GetEventMessageFileDLL (KeyName , SourceName, EVENT_PARAMETER_MESSAGE_FILE , ParameterModuleName)) - { - //Not yet support for reading messages from parameter message DLL - } - - szArguments[i] = szMessage; - szMessage += strlen(szMessage) + 1; - } - else - { - szArguments[i] = szMessage; - szMessage += strlen(szMessage) + 1; - } - } - - szDll = strtok(SourceModuleName, EVENT_DLL_SEPARATOR); - while ((szDll != NULL) && (!bDone)) - { - hLibrary = LoadLibraryEx( - szDll, - NULL, - DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE); - - if (hLibrary == NULL) - { - // The DLL could not be loaded try the next one (if any) - szDll = strtok (NULL, EVENT_DLL_SEPARATOR); - } - else - { - // Retrieve the message string. - if(FormatMessage( - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_HMODULE | - FORMAT_MESSAGE_ARGUMENT_ARRAY, - hLibrary, - pevlr->EventID, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR)&lpMsgBuf, - 0, - szArguments) == 0) - { - // We haven't found the string , get next DLL (if any) - szDll = strtok (NULL, EVENT_DLL_SEPARATOR); - } - else - { - if (lpMsgBuf) - { - // The ID was found and the message was formated - bDone = TRUE; - - //Trim the string - TrimNulls ((LPSTR)lpMsgBuf); - - // Copy the event text - strcpy (EventText ,lpMsgBuf); - } - } - - FreeLibrary (hLibrary); - } - } - - if (!bDone) - { - LoadString(hInst, IDC_EVENTSTRINGIDNOTFOUND, szStringIDNotFound, MAX_LOADSTRING); - wsprintf (EventText, szStringIDNotFound , (DWORD)(pevlr->EventID & 0xFFFF) , SourceName ); - } - - free(szArguments); - - // No more dlls to try , return result - return bDone; - } - - LoadString(hInst, IDC_EVENTSTRINGIDNOTFOUND, szStringIDNotFound, MAX_LOADSTRING); - wsprintf (EventText, szStringIDNotFound , (DWORD)(pevlr->EventID & 0xFFFF) , SourceName ); - - return FALSE; -} + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + szKeyName, + 0, + KEY_READ, + &hAppKey) == ERROR_SUCCESS) + { + if (RegOpenKeyEx(hAppKey, + SourceName, + 0, + KEY_READ, + &hSourceKey) == ERROR_SUCCESS) + { + dwSize = MAX_PATH; + if (RegQueryValueEx(hSourceKey, + EntryName, + NULL, + NULL, + (LPBYTE)szModuleName, + &dwSize) == ERROR_SUCCESS) + { + // Returns a string containing the requested substituted environment variable. + ExpandEnvironmentStrings ((LPCTSTR)szModuleName, ExpandedName, MAX_PATH); + + // Succesfull + bReturn = TRUE; + } + } + } + else + { + MessageBox(NULL, + _TEXT("Registry access failed!"), + _TEXT("Event Log"), + MB_OK | MB_ICONINFORMATION); + } + + if (hSourceKey != NULL) + RegCloseKey(hSourceKey); + + if (hAppKey != NULL) + RegCloseKey(hAppKey); + + return bReturn; +} + + +BOOL +GetEventCategory(IN LPCTSTR KeyName, + IN LPCTSTR SourceName, + IN EVENTLOGRECORD *pevlr, + OUT LPTSTR CategoryName) +{ + HANDLE hLibrary = NULL; + TCHAR szMessageDLL[MAX_PATH]; + LPVOID lpMsgBuf = NULL; + + if (GetEventMessageFileDLL (KeyName, SourceName, EVENT_CATEGORY_MESSAGE_FILE , szMessageDLL)) + { + hLibrary = LoadLibraryEx(szMessageDLL, + NULL, + DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE); + if (hLibrary != NULL) + { + // Retrieve the message string. + if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_ARGUMENT_ARRAY, + hLibrary, + pevlr->EventCategory, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR)&lpMsgBuf, + EVENT_MESSAGE_FILE_BUFFER, + NULL) != 0) + { + if (lpMsgBuf) + { + // Trim the string + TrimNulls((LPSTR)lpMsgBuf); + + // Copy the category name + strcpy(CategoryName, (LPCTSTR)lpMsgBuf); + } + else + { + strcpy(CategoryName, (LPCTSTR)lpMsgBuf); + } + } + else + { + strcpy(CategoryName, "None"); + } + + if (hLibrary != NULL) + FreeLibrary(hLibrary); + + // Free the buffer allocated by FormatMessage + if (lpMsgBuf) + LocalFree(lpMsgBuf); + + return TRUE; + } + } + + strcpy(CategoryName, "None"); + + return FALSE; +} + + +BOOL +GetEventMessage(IN LPCTSTR KeyName, + IN LPCTSTR SourceName, + IN EVENTLOGRECORD *pevlr, + OUT LPTSTR EventText) +{ + DWORD i; + HANDLE hLibrary = NULL; + char SourceModuleName[1000]; + char ParameterModuleName[1000]; + LPTSTR lpMsgBuf = NULL; + TCHAR szStringIDNotFound[MAX_LOADSTRING]; + LPTSTR szDll; + LPTSTR szMessage; + LPTSTR *szArguments; + BOOL bDone = FALSE; + + /* TODO : GetEventMessageFileDLL can return a comma separated list of DLLs */ + if (GetEventMessageFileDLL (KeyName , SourceName, EVENT_MESSAGE_FILE , SourceModuleName)) + { + // Get the event message + szMessage = (LPTSTR)((LPBYTE)pevlr + pevlr->StringOffset); + + // Allocate space for parameters + szArguments = (LPTSTR*)malloc(sizeof(LPVOID)* pevlr->NumStrings); + if (!szArguments) + { + return FALSE; + } + + for (i = 0; i < pevlr->NumStrings ; i++) + { + if (strstr(szMessage , "%%")) + { + if (GetEventMessageFileDLL(KeyName , SourceName, EVENT_PARAMETER_MESSAGE_FILE, ParameterModuleName)) + { + // Not yet support for reading messages from parameter message DLL + } + + szArguments[i] = szMessage; + szMessage += strlen(szMessage) + 1; + } + else + { + szArguments[i] = szMessage; + szMessage += strlen(szMessage) + 1; + } + } + + szDll = strtok(SourceModuleName, EVENT_DLL_SEPARATOR); + while ((szDll != NULL) && (!bDone)) + { + hLibrary = LoadLibraryEx(szDll, + NULL, + DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE); + if (hLibrary == NULL) + { + // The DLL could not be loaded try the next one (if any) + szDll = strtok(NULL, EVENT_DLL_SEPARATOR); + } + else + { + // Retrieve the message string. + if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_HMODULE | + FORMAT_MESSAGE_ARGUMENT_ARRAY, + hLibrary, + pevlr->EventID, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR)&lpMsgBuf, + 0, + szArguments) == 0) + { + // We haven't found the string , get next DLL (if any) + szDll = strtok (NULL, EVENT_DLL_SEPARATOR); + } + else + { + if (lpMsgBuf) + { + // The ID was found and the message was formated + bDone = TRUE; + + // Trim the string + TrimNulls((LPSTR)lpMsgBuf); + + // Copy the event text + strcpy(EventText ,lpMsgBuf); + } + } + + FreeLibrary(hLibrary); + } + } + + if (!bDone) + { + LoadString(hInst, IDC_EVENTSTRINGIDNOTFOUND, szStringIDNotFound, MAX_LOADSTRING); + wsprintf(EventText, szStringIDNotFound, (DWORD)(pevlr->EventID & 0xFFFF), SourceName); + } + + free(szArguments); + + // No more dlls to try , return result + return bDone; + } + + LoadString(hInst, IDC_EVENTSTRINGIDNOTFOUND, szStringIDNotFound, MAX_LOADSTRING); + wsprintf(EventText, szStringIDNotFound, (DWORD)(pevlr->EventID & 0xFFFF), SourceName); + + return FALSE; +} + VOID -GetEventType (WORD dwEventType, OUT LPSTR eventTypeText) -{ - switch(dwEventType) +GetEventType(IN WORD dwEventType, + OUT LPSTR eventTypeText) +{ + switch (dwEventType) { case EVENTLOG_ERROR_TYPE: LoadString(hInst, IDC_EVENTLOG_ERROR_TYPE, eventTypeText, MAX_LOADSTRING); @@ -418,54 +423,53 @@ } BOOL -GetEventUserName (EVENTLOGRECORD *pelr, OUT LPSTR pszUser) +GetEventUserName(EVENTLOGRECORD *pelr, OUT LPSTR pszUser) { PSID lpSid; - char szName[1024]; - char szDomain[1024]; + char szName[1024]; + char szDomain[1024]; SID_NAME_USE peUse; DWORD cbName = 1024; DWORD cbDomain = 1024; // Point to the SID. - lpSid = (PSID)((LPBYTE) pelr + pelr->UserSidOffset); - - // User SID - if(pelr->UserSidLength > 0) - { - if (LookupAccountSid( - NULL, - lpSid, - szName, - &cbName, - szDomain, - &cbDomain, - &peUse)) - { - strcpy (pszUser , szName); - return TRUE; - } - } + lpSid = (PSID)((LPBYTE)pelr + pelr->UserSidOffset); + + // User SID + if (pelr->UserSidLength > 0) + { + if (LookupAccountSid(NULL, + lpSid, + szName, + &cbName, + szDomain, + &cbDomain, + &peUse)) + { + strcpy(pszUser, szName); + return TRUE; + } + } return FALSE; } + static DWORD WINAPI -ShowStatusMessageThread( - IN LPVOID lpParameter) +ShowStatusMessageThread(IN LPVOID lpParameter) { HWND *phWnd = (HWND *)lpParameter; HWND hWnd; MSG Msg; - hWnd = CreateDialogParam( - hInst, - MAKEINTRESOURCE(IDD_PROGRESSBOX), - GetDesktopWindow(), - StatusMessageWindowProc, - (LPARAM)NULL); + hWnd = CreateDialogParam(hInst, + MAKEINTRESOURCE(IDD_PROGRESSBOX), + GetDesktopWindow(), + StatusMessageWindowProc, + (LPARAM)NULL); if (!hWnd) return 0; + *phWnd = hWnd; ShowWindow(hWnd, SW_SHOW); @@ -480,59 +484,58 @@ return 0; } -VOID QueryEventMessages ( - LPTSTR lpMachineName , - LPTSTR lpLogName) -{ - HWND hwndDlg; + +VOID +QueryEventMessages(LPTSTR lpMachineName, + LPTSTR lpLogName) +{ + HWND hwndDlg; HANDLE hEventLog; EVENTLOGRECORD *pevlr; BYTE bBuffer[MAX_PATH]; - DWORD dwRead, dwNeeded, dwThisRecord , dwTotalRecords , dwCurrentRecord = 1 , dwRecordsToRead = 0 , dwFlags; + DWORD dwRead, dwNeeded, dwThisRecord, dwTotalRecords, dwCurrentRecord = 1, dwRecordsToRead = 0, dwFlags; LPSTR lpSourceName; - LPSTR lpComputerName; - LPSTR lpEventStr; - LPSTR lpData; - BOOL bResult = TRUE; // Read succeeded. - - char szWindowTitle[MAX_PATH]; - char szStatusText[MAX_PATH]; - char szLocalDate[MAX_PATH]; - char szLocalTime[MAX_PATH]; - char szEventID[MAX_PATH]; - char szEventTypeText[MAX_PATH]; - char szCategoryID[MAX_PATH]; - char szUsername[MAX_PATH]; - char szEventText[EVENT_MESSAGE_FILE_BUFFER]; - char szCategory[MAX_PATH]; - - SYSTEMTIME time; - LVITEM lviEventItem; - - dwFlags = EVENTLOG_FORWARDS_READ | EVENTLOG_SEQUENTIAL_READ; - - lpSourceLogName = lpLogName; - lpComputerName = lpMachineName; + LPSTR lpComputerName; + LPSTR lpEventStr; + LPSTR lpData; + BOOL bResult = TRUE; // Read succeeded. + + char szWindowTitle[MAX_PATH]; + char szStatusText[MAX_PATH]; + char szLocalDate[MAX_PATH]; + char szLocalTime[MAX_PATH]; + char szEventID[MAX_PATH]; + char szEventTypeText[MAX_PATH]; + char szCategoryID[MAX_PATH]; + char szUsername[MAX_PATH]; + char szEventText[EVENT_MESSAGE_FILE_BUFFER]; + char szCategory[MAX_PATH]; + + SYSTEMTIME time; + LVITEM lviEventItem; + + dwFlags = EVENTLOG_FORWARDS_READ | EVENTLOG_SEQUENTIAL_READ; + + lpSourceLogName = lpLogName; + lpComputerName = lpMachineName; // Open the event log. - hEventLog = OpenEventLog( - lpMachineName, - lpLogName); - + hEventLog = OpenEventLog(lpMachineName, + lpLogName); if (hEventLog == NULL) { - MessageBox (NULL , - _TEXT("Could not open the event log.") , - _TEXT("Event Log") , - MB_OK | MB_ICONINFORMATION); + MessageBox(NULL, + _TEXT("Could not open the event log."), + _TEXT("Event Log"), + MB_OK | MB_ICONINFORMATION); return; } - //Disable listview redraw - SendMessage(hwndListView, WM_SETREDRAW, FALSE, 0); - - // Clear the list view - (void)ListView_DeleteAllItems (hwndListView); + // Disable listview redraw + SendMessage(hwndListView, WM_SETREDRAW, FALSE, 0); + + // Clear the list view + (void)ListView_DeleteAllItems (hwndListView); // Initialize the event record buffer. pevlr = (EVENTLOGRECORD *)&bBuffer; @@ -540,156 +543,158 @@ // Get the record number of the oldest event log record. GetOldestEventLogRecord(hEventLog, &dwThisRecord); - // Get the total number of event log records. - GetNumberOfEventLogRecords (hEventLog , &dwTotalRecords); - - //If we have at least 1000 records show the waiting dialog - if (dwTotalRecords > 1000) - { - CreateThread( - NULL, - 0, - ShowStatusMessageThread, - (LPVOID)&hwndDlg, - 0, - NULL); - } + // Get the total number of event log records. + GetNumberOfEventLogRecords (hEventLog , &dwTotalRecords); + + //If we have at least 1000 records show the waiting dialog + if (dwTotalRecords > 1000) + { + CreateThread(NULL, + 0, + ShowStatusMessageThread, + (LPVOID)&hwndDlg, + 0, + NULL); + } while (dwCurrentRecord < dwTotalRecords) { - pevlr = (EVENTLOGRECORD*)malloc(MAX_PATH); - - bResult = ReadEventLog( - hEventLog, // Event log handle - dwFlags, // Sequential read - 0, // Ignored for sequential read - pevlr, // Pointer to buffer - MAX_PATH, // Size of buffer - &dwRead, // Number of bytes read - &dwNeeded); // Bytes in the next record - - if((!bResult) && (GetLastError () == ERROR_INSUFFICIENT_BUFFER)) - { - pevlr = (EVENTLOGRECORD*)malloc (dwNeeded); - - ReadEventLog( - hEventLog, // event log handle - dwFlags, // read flags - 0, // offset; default is 0 - pevlr, // pointer to buffer - dwNeeded, // size of buffer - &dwRead, // number of bytes read - &dwNeeded); // bytes in next record - } + pevlr = (EVENTLOGRECORD*)malloc(MAX_PATH); + + bResult = ReadEventLog(hEventLog, // Event log handle + dwFlags, // Sequential read + 0, // Ignored for sequential read + pevlr, // Pointer to buffer + MAX_PATH, // Size of buffer + &dwRead, // Number of bytes read + &dwNeeded); // Bytes in the next record + if((!bResult) && (GetLastError () == ERROR_INSUFFICIENT_BUFFER)) + { + pevlr = (EVENTLOGRECORD*)malloc (dwNeeded); + + ReadEventLog(hEventLog, // event log handle + dwFlags, // read flags + 0, // offset; default is 0 + pevlr, // pointer to buffer + dwNeeded, // size of buffer + &dwRead, // number of bytes read + &dwNeeded); // bytes in next record + } while (dwRead > 0) { - strcpy (szUsername , "N/A"); - strcpy (szEventText , "N/A"); - strcpy (szCategory , "None"); + strcpy(szUsername , "N/A"); + strcpy(szEventText , "N/A"); + strcpy(szCategory , "None"); // Get the event source name. - lpSourceName = (LPSTR) ((LPBYTE) pevlr + sizeof(EVENTLOGRECORD)); - - // Get the computer name - lpComputerName = (LPSTR) ((LPBYTE) pevlr + sizeof(EVENTLOGRECORD) + lstrlen(lpSourceName) + 1); - - // This ist the data section of the current event - lpData = (LPSTR) ((LPBYTE)pevlr + pevlr->DataOffset); - - // This is the text of the current event - lpEventStr = (LPSTR) ((LPBYTE) pevlr + pevlr->StringOffset); - - // Compute the event type - EventTimeToSystemTime(pevlr->TimeWritten, &time); - - // Get the username that generated the event - GetEventUserName (pevlr , szUsername); - - GetDateFormat( LOCALE_USER_DEFAULT, DATE_SHORTDATE, &time, NULL, szLocalDate, MAX_PATH ); - GetTimeFormat( LOCALE_USER_DEFAULT, TIME_NOSECONDS, &time, NULL, szLocalTime, MAX_PATH ); - - GetEventType (pevlr->EventType , szEventTypeText); - GetEventCategory (lpLogName , lpSourceName , pevlr , szCategory); - - wsprintf (szEventID, "%u", (DWORD)(pevlr->EventID & 0xFFFF)); - wsprintf (szCategoryID, "%u", (DWORD)(pevlr->EventCategory)); - - lviEventItem.mask = LVIF_IMAGE | LVIF_TEXT | LVIF_PARAM; - lviEventItem.iItem = 0; - lviEventItem.iSubItem = 0; - lviEventItem.lParam = (LPARAM)pevlr; - lviEventItem.pszText = szEventTypeText; - - switch(pevlr->EventType) - { - case EVENTLOG_ERROR_TYPE: - lviEventItem.iImage = 2; - break; - case EVENTLOG_AUDIT_FAILURE: - lviEventItem.iImage = 2; - break; - case EVENTLOG_WARNING_TYPE: - lviEventItem.iImage = 1; - break; - case EVENTLOG_INFORMATION_TYPE: - lviEventItem.iImage = 0; - break; - case EVENTLOG_AUDIT_SUCCESS: - lviEventItem.iImage = 0; - break; - case EVENTLOG_SUCCESS: - lviEventItem.iImage = 0; - break; - } - - lviEventItem.iItem = ListView_InsertItem(hwndListView, &lviEventItem); - - ListView_SetItemText(hwndListView, lviEventItem.iItem, 1, szLocalDate); - ListView_SetItemText(hwndListView, lviEventItem.iItem, 2, szLocalTime); - ListView_SetItemText(hwndListView, lviEventItem.iItem, 3, lpSourceName); - ListView_SetItemText(hwndListView, lviEventItem.iItem, 4, szCategory); - ListView_SetItemText(hwndListView, lviEventItem.iItem, 5, szEventID); - ListView_SetItemText(hwndListView, lviEventItem.iItem, 6, szUsername); //User - ListView_SetItemText(hwndListView, lviEventItem.iItem, 7, lpComputerName); //Computer - ListView_SetItemText(hwndListView, lviEventItem.iItem, 8, lpData); //Event Text + lpSourceName = (LPSTR)((LPBYTE)pevlr + sizeof(EVENTLOGRECORD)); + + // Get the computer name + lpComputerName = (LPSTR)((LPBYTE)pevlr + sizeof(EVENTLOGRECORD) + lstrlen(lpSourceName) + 1); + + // This ist the data section of the current event + lpData = (LPSTR)((LPBYTE)pevlr + pevlr->DataOffset); + + // This is the text of the current event + lpEventStr = (LPSTR)((LPBYTE) pevlr + pevlr->StringOffset); + + // Compute the event type + EventTimeToSystemTime(pevlr->TimeWritten, &time); + + // Get the username that generated the event + GetEventUserName(pevlr, szUsername); + + GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &time, NULL, szLocalDate, MAX_PATH); + GetTimeFormat(LOCALE_USER_DEFAULT, TIME_NOSECONDS, &time, NULL, szLocalTime, MAX_PATH); + + GetEventType(pevlr->EventType, szEventTypeText); + GetEventCategory(lpLogName, lpSourceName, pevlr, szCategory); + + wsprintf(szEventID, "%u", (DWORD)(pevlr->EventID & 0xFFFF)); + wsprintf(szCategoryID, "%u", (DWORD)(pevlr->EventCategory)); + + lviEventItem.mask = LVIF_IMAGE | LVIF_TEXT | LVIF_PARAM; + lviEventItem.iItem = 0; + lviEventItem.iSubItem = 0; + lviEventItem.lParam = (LPARAM)pevlr; + lviEventItem.pszText = szEventTypeText; + + switch (pevlr->EventType) + { + case EVENTLOG_ERROR_TYPE: + lviEventItem.iImage = 2; + break; + + case EVENTLOG_AUDIT_FAILURE: + lviEventItem.iImage = 2; + break; + + case EVENTLOG_WARNING_TYPE: + lviEventItem.iImage = 1; + break; + + case EVENTLOG_INFORMATION_TYPE: + lviEventItem.iImage = 0; + break; + + case EVENTLOG_AUDIT_SUCCESS: + lviEventItem.iImage = 0; + break; + + case EVENTLOG_SUCCESS: + lviEventItem.iImage = 0; + break; + } + + lviEventItem.iItem = ListView_InsertItem(hwndListView, &lviEventItem); + + ListView_SetItemText(hwndListView, lviEventItem.iItem, 1, szLocalDate); + ListView_SetItemText(hwndListView, lviEventItem.iItem, 2, szLocalTime); + ListView_SetItemText(hwndListView, lviEventItem.iItem, 3, lpSourceName); + ListView_SetItemText(hwndListView, lviEventItem.iItem, 4, szCategory); + ListView_SetItemText(hwndListView, lviEventItem.iItem, 5, szEventID); + ListView_SetItemText(hwndListView, lviEventItem.iItem, 6, szUsername); //User + ListView_SetItemText(hwndListView, lviEventItem.iItem, 7, lpComputerName); //Computer + ListView_SetItemText(hwndListView, lviEventItem.iItem, 8, lpData); //Event Text dwRead -= pevlr->Length; - pevlr = (EVENTLOGRECORD *) ((LPBYTE) pevlr + pevlr->Length); + pevlr = (EVENTLOGRECORD *)((LPBYTE) pevlr + pevlr->Length); } - dwRecordsToRead--; - dwCurrentRecord++; - - pevlr = (EVENTLOGRECORD *) &bBuffer; - } - - //All events loaded - EndDialog(hwndDlg, 0); - - wsprintf (szWindowTitle, "%s - %s Log on \\\\%s", szTitle , lpLogName , lpComputerName); - wsprintf (szStatusText, "%s has %d event(s)", lpLogName , dwTotalRecords); - - //Update the status bar - SendMessage (hwndStatus, SB_SETTEXT, (WPARAM)0, (LPARAM)szStatusText); - - //Set the window title - SetWindowText ( hwndMainWindow , szWindowTitle); - - //Resume list view redraw - SendMessage(hwndListView, WM_SETREDRAW, TRUE, 0); + dwRecordsToRead--; + dwCurrentRecord++; + + pevlr = (EVENTLOGRECORD *)&bBuffer; + } + + // All events loaded + EndDialog(hwndDlg, 0); + + wsprintf(szWindowTitle, "%s - %s Log on \\\\%s", szTitle , lpLogName , lpComputerName); + wsprintf(szStatusText, "%s has %d event(s)", lpLogName , dwTotalRecords); + + // Update the status bar + SendMessage(hwndStatus, SB_SETTEXT, (WPARAM)0, (LPARAM)szStatusText); + + // Set the window title + SetWindowText(hwndMainWindow, szWindowTitle); + + // Resume list view redraw + SendMessage(hwndListView, WM_SETREDRAW, TRUE, 0); // Close the event log. CloseEventLog(hEventLog); } + VOID -Refresh (VOID) -{ - QueryEventMessages( - lpComputerName , - lpSourceLogName); -} +Refresh(VOID) +{ + QueryEventMessages(lpComputerName, + lpSourceLogName); +} + // // FUNCTION: MyRegisterClass() @@ -704,26 +709,28 @@ // so that the application will get 'well formed' small icons associated // with it. // -ATOM MyRegisterClass(HINSTANCE hInstance) -{ - WNDCLASSEX wcex; - - wcex.cbSize = sizeof(WNDCLASSEX); - - wcex.style = CS_HREDRAW | CS_VREDRAW; - wcex.lpfnWndProc = WndProc; - wcex.cbClsExtra = 0; - wcex.cbWndExtra = 0; - wcex.hInstance = hInstance; - wcex.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_EVENTVWR)); - wcex.hCursor = LoadCursor(NULL, IDC_ARROW); - wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); - wcex.lpszMenuName = MAKEINTRESOURCE(IDC_EVENTVWR); - wcex.lpszClassName = szWindowClass; - wcex.hIconSm = LoadIcon(wcex.hInstance, MAKEINTRESOURCE(IDI_SMALL)); - - return RegisterClassEx(&wcex); -} +ATOM +MyRegisterClass(HINSTANCE hInstance) +{ + WNDCLASSEX wcex; + + wcex.cbSize = sizeof(WNDCLASSEX); + + wcex.style = CS_HREDRAW | CS_VREDRAW; + wcex.lpfnWndProc = WndProc; + wcex.cbClsExtra = 0; + wcex.cbWndExtra = 0; + wcex.hInstance = hInstance; + wcex.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_EVENTVWR)); + wcex.hCursor = LoadCursor(NULL, IDC_ARROW); + wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + wcex.lpszMenuName = MAKEINTRESOURCE(IDC_EVENTVWR); + wcex.lpszClassName = szWindowClass; + wcex.hIconSm = LoadIcon(wcex.hInstance, MAKEINTRESOURCE(IDI_SMALL)); + + return RegisterClassEx(&wcex); +} + // // FUNCTION: InitInstance(HINSTANCE, int) @@ -735,122 +742,119 @@ // In this function, we save the instance handle in a global variable and // create and display the main program window. // -BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) -{ - HIMAGELIST hSmall; - LVCOLUMN lvc = {0}; - - hInst = hInstance; // Store instance handle in our global variable - - hwndMainWindow = CreateWindow( - szWindowClass, - szTitle, - WS_OVERLAPPEDWINDOW, - CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, - NULL, - NULL, - hInstance, - NULL); - - if (!hwndMainWindow) - { - return FALSE; - } - - hwndStatus = CreateWindowEx( - 0, // no extended styles - STATUSCLASSNAME, // status bar - "Done.", // no text - WS_CHILD | WS_BORDER | WS_VISIBLE, // styles - 0, 0, 0, 0, // x, y, cx, cy - hwndMainWindow, // parent window - (HMENU)100, // window ID - hInstance, // instance - NULL); // window data +BOOL +InitInstance(HINSTANCE hInstance, + int nCmdShow) +{ + HIMAGELIST hSmall; + LVCOLUMN lvc = {0}; + + hInst = hInstance; // Store instance handle in our global variable + + hwndMainWindow = CreateWindow(szWindowClass, + szTitle, + WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, + NULL, + NULL, + hInstance, + NULL); + if (!hwndMainWindow) + { + return FALSE; + } + + hwndStatus = CreateWindowEx(0, // no extended styles + STATUSCLASSNAME, // status bar + "Done.", // no text + WS_CHILD | WS_BORDER | WS_VISIBLE, // styles + 0, 0, 0, 0, // x, y, cx, cy + hwndMainWindow, // parent window + (HMENU)100, // window ID + hInstance, // instance + NULL); // window data // Create our listview child window. Note that I use WS_EX_CLIENTEDGE // and WS_BORDER to create the normal "sunken" look. Also note that // LVS_EX_ styles cannot be set in CreateWindowEx(). - hwndListView = CreateWindowEx( - WS_EX_CLIENTEDGE, - WC_LISTVIEW, - _T(""), - LVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | LVS_REPORT, - 0, - 0, - 243, - 200, - hwndMainWindow, - NULL, - hInstance, - NULL); + hwndListView = CreateWindowEx(WS_EX_CLIENTEDGE, + WC_LISTVIEW, + _T(""), + LVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | LVS_REPORT, + 0, + 0, + 243, + 200, + hwndMainWindow, + NULL, + hInstance, + NULL); // After the ListView is created, we can add extended list view styles. (void)ListView_SetExtendedListViewStyle (hwndListView, LVS_EX_FULLROWSELECT); - // Create the ImageList - hSmall = ImageList_Create( - GetSystemMetrics(SM_CXSMICON), - GetSystemMetrics(SM_CYSMICON), - ILC_MASK, - 1, - 1); - - // Add event type icons to ImageList - ImageList_AddIcon (hSmall, LoadIcon(hInstance, MAKEINTRESOURCE(IDI_INFORMATIONICON))); - ImageList_AddIcon (hSmall, LoadIcon(hInstance, MAKEINTRESOURCE(IDI_WARNINGICON))); - ImageList_AddIcon (hSmall, LoadIcon(hInstance, MAKEINTRESOURCE(IDI_ERRORICON))); - - // Assign ImageList to List View - (void)ListView_SetImageList (hwndListView, hSmall, LVSIL_SMALL); + // Create the ImageList + hSmall = ImageList_Create(GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), + ILC_MASK, + 1, + 1); + + // Add event type icons to ImageList + ImageList_AddIcon (hSmall, LoadIcon(hInstance, MAKEINTRESOURCE(IDI_INFORMATIONICON))); + ImageList_AddIcon (hSmall, LoadIcon(hInstance, MAKEINTRESOURCE(IDI_WARNINGICON))); + ImageList_AddIcon (hSmall, LoadIcon(hInstance, MAKEINTRESOURCE(IDI_ERRORICON))); + + // Assign ImageList to List View + (void)ListView_SetImageList (hwndListView, hSmall, LVSIL_SMALL); // Now set up the listview with its columns. lvc.mask = LVCF_TEXT | LVCF_WIDTH; - lvc.cx = 90; - lvc.pszText = _T("Type"); + lvc.cx = 90; + lvc.pszText = _T("Type"); (void)ListView_InsertColumn(hwndListView, 0, &lvc); - lvc.cx = 70; - lvc.pszText = _T("Date"); + lvc.cx = 70; + lvc.pszText = _T("Date"); (void)ListView_InsertColumn(hwndListView, 1, &lvc); - lvc.cx = 70; + lvc.cx = 70; lvc.pszText = _T("Time"); (void)ListView_InsertColumn(hwndListView, 2, &lvc); - lvc.cx = 150; - lvc.pszText = _T("Source"); + lvc.cx = 150; + lvc.pszText = _T("Source"); (void)ListView_InsertColumn(hwndListView, 3, &lvc); - lvc.cx = 100; - lvc.pszText = _T("Category"); + lvc.cx = 100; + lvc.pszText = _T("Category"); (void)ListView_InsertColumn(hwndListView, 4, &lvc); - lvc.cx = 60; - lvc.pszText = _T("Event"); + lvc.cx = 60; + lvc.pszText = _T("Event"); (void)ListView_InsertColumn(hwndListView, 5, &lvc); - lvc.cx = 120; - lvc.pszText = _T("User"); + lvc.cx = 120; + lvc.pszText = _T("User"); (void)ListView_InsertColumn(hwndListView, 6, &lvc); - lvc.cx = 100; - lvc.pszText = _T("Computer"); + lvc.cx = 100; + lvc.pszText = _T("Computer"); (void)ListView_InsertColumn(hwndListView, 7, &lvc); - lvc.cx = 0; - lvc.pszText = _T("Event Data"); + lvc.cx = 0; + lvc.pszText = _T("Event Data"); (void)ListView_InsertColumn(hwndListView, 8, &lvc); - ShowWindow(hwndMainWindow, nCmdShow); - UpdateWindow(hwndMainWindow); - - QueryEventMessages ( - lpComputerName, // Use the local computer. - EVENT_SOURCE_APPLICATION); // The event log category - - return TRUE; -} + ShowWindow(hwndMainWindow, nCmdShow); + UpdateWindow(hwndMainWindow); + + QueryEventMessages(lpComputerName, // Use the local computer. + EVENT_SOURCE_APPLICATION); // The event log category + + return TRUE; +} + // // FUNCTION: WndProc(HWND, UINT, WPARAM, LPARAM) @@ -862,213 +866,225 @@ // WM_DESTROY - post a quit message and return // // -LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) -{ - int wmId, wmEvent; - RECT rect; - NMHDR *hdr; - HMENU hMenu ; - - switch (message) - { - case WM_NOTIFY : - switch(((LPNMHDR)lParam)->code) - { - case NM_DBLCLK : - hdr = (NMHDR FAR*)lParam; - if(hdr->hwndFrom == hwndListView) - { - LPNMITEMACTIVATE lpnmitem = (LPNMITEMACTIVATE)lParam; - - if(lpnmitem->iItem != -1) - { - DialogBox (hInst, MAKEINTRESOURCE(IDD_EVENTDETAILDIALOG), hWnd, EventDetails); - } - } - break; - } - break; - case WM_COMMAND: - wmId = LOWORD(wParam); - wmEvent = HIWORD(wParam); - - if ((wmId == ID_LOG_APPLICATION) || - (wmId == ID_LOG_SYSTEM) || - (wmId == ID_LOG_SECURITY)) - { - hMenu = GetMenu (hWnd) ; // get the menu handle. Use it below - - CheckMenuItem (hMenu, ID_LOG_APPLICATION , MF_UNCHECKED) ; - CheckMenuItem (hMenu, ID_LOG_SYSTEM , MF_UNCHECKED) ; - CheckMenuItem (hMenu, ID_LOG_SECURITY , MF_UNCHECKED) ; - - if (hMenu) - { - CheckMenuItem (hMenu, wmId , MF_CHECKED) ; - } - } - - // Parse the menu selections: - switch (wmId) - { - case ID_LOG_APPLICATION: - QueryEventMessages ( - lpComputerName, // Use the local computer. - EVENT_SOURCE_APPLICATION); // The event log category - break; - case ID_LOG_SYSTEM: - QueryEventMessages ( - lpComputerName, // Use the local computer. - EVENT_SOURCE_SYSTEM); // The event log category - break; - case ID_LOG_SECURITY: - QueryEventMessages ( - lpComputerName, // Use the local computer. - EVENT_SOURCE_SECURITY); // The event log category - break; - case IDM_REFRESH: - Refresh (); - break; - case IDM_ABOUT: - DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, About); - break; - case IDM_HELP: - MessageBox ( - NULL , - _TEXT("Help not implemented yet!") , - _TEXT("Event Log") , - MB_OK | MB_ICONINFORMATION); - break; - case IDM_EXIT: - DestroyWindow(hWnd); - break; - default: - return DefWindowProc(hWnd, message, wParam, lParam); - } - break; - case WM_SIZE: - { - //Gets the window rectangle - GetClientRect(hWnd, &rect); - - //Relocate the listview - MoveWindow( - hwndListView, - 0, - 0, - rect.right, - rect.bottom - 20, - 1); - - // Resize the statusbar; - SendMessage (hwndStatus, message, wParam, lParam); - } - break; - case WM_DESTROY: - PostQuitMessage(0); - break; - default: - return DefWindowProc(hWnd, message, wParam, lParam); - } - return 0; -} +LRESULT CALLBACK +WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + int wmId, wmEvent; + RECT rect; + NMHDR *hdr; + HMENU hMenu; + + switch (message) + { + case WM_NOTIFY: + switch (((LPNMHDR)lParam)->code) + { + case NM_DBLCLK : + hdr = (NMHDR FAR*)lParam; + if (hdr->hwndFrom == hwndListView) + { + LPNMITEMACTIVATE lpnmitem = (LPNMITEMACTIVATE)lParam; + + if (lpnmitem->iItem != -1) + { + DialogBox(hInst, MAKEINTRESOURCE(IDD_EVENTDETAILDIALOG), hWnd, EventDetails); + } + } + break; + } + break; + + case WM_COMMAND: + wmId = LOWORD(wParam); + wmEvent = HIWORD(wParam); + + if ((wmId == ID_LOG_APPLICATION) || + (wmId == ID_LOG_SYSTEM) || + (wmId == ID_LOG_SECURITY)) + { + hMenu = GetMenu(hWnd); // get the menu handle. Use it below + + CheckMenuItem(hMenu, ID_LOG_APPLICATION, MF_UNCHECKED); + CheckMenuItem(hMenu, ID_LOG_SYSTEM, MF_UNCHECKED); + CheckMenuItem (hMenu, ID_LOG_SECURITY, MF_UNCHECKED); + + if (hMenu) + { + CheckMenuItem(hMenu, wmId, MF_CHECKED); + } + } + + // Parse the menu selections: + switch (wmId) + { + case ID_LOG_APPLICATION: + QueryEventMessages(lpComputerName, // Use the local computer. + EVENT_SOURCE_APPLICATION); // The event log category + break; + + case ID_LOG_SYSTEM: + QueryEventMessages(lpComputerName, // Use the local computer. + EVENT_SOURCE_SYSTEM); // The event log category + break; + + case ID_LOG_SECURITY: + QueryEventMessages(lpComputerName, // Use the local computer. + EVENT_SOURCE_SECURITY); // The event log category + break; + + case IDM_REFRESH: + Refresh(); + break; + + case IDM_ABOUT: + DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, About); + break; + + case IDM_HELP: + MessageBox(NULL, + _TEXT("Help not implemented yet!"), + _TEXT("Event Log"), + MB_OK | MB_ICONINFORMATION); + break; + + case IDM_EXIT: + DestroyWindow(hWnd); + break; + + default: + return DefWindowProc(hWnd, message, wParam, lParam); + } + break; + + case WM_SIZE: + { + // Gets the window rectangle + GetClientRect(hWnd, &rect); + + // Relocate the listview + MoveWindow(hwndListView, + 0, + 0, + rect.right, + rect.bottom - 20, + 1); + + // Resize the statusbar; + SendMessage(hwndStatus, message, wParam, lParam); + } + break; + + case WM_DESTROY: + PostQuitMessage(0); + break; + + default: + return DefWindowProc(hWnd, message, wParam, lParam); + } + + return 0; +} + // Message handler for about box. -INT_PTR CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) -{ - UNREFERENCED_PARAMETER(lParam); - switch (message) - { - case WM_INITDIALOG: - { - return (INT_PTR)TRUE; - } - case WM_COMMAND: - if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) - { - EndDialog(hDlg, LOWORD(wParam)); - return (INT_PTR)TRUE; - } - - break; - } - return (INT_PTR)FALSE; +INT_PTR CALLBACK +About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + switch (message) + { + case WM_INITDIALOG: + { + return (INT_PTR)TRUE; + } + + case WM_COMMAND: + if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) + { + EndDialog(hDlg, LOWORD(wParam)); + return (INT_PTR)TRUE; + } + break; + } + + return (INT_PTR)FALSE; } VOID -DisplayEvent (HWND hDlg) -{ - char szEventType[MAX_PATH]; - char szTime[MAX_PATH]; - char szDate[MAX_PATH]; - char szUser[MAX_PATH]; - char szComputer[MAX_PATH]; - char szSource[MAX_PATH]; - char szCategory[MAX_PATH]; - char szEventID[MAX_PATH]; - char szEventText[EVENT_MESSAGE_EVENTTEXT_BUFFER]; - char szEventData[MAX_PATH]; - BOOL bEventData = FALSE; - LVITEM li; - EVENTLOGRECORD* pevlr; - - // Get index of selected item - int iIndex = (int)SendMessage (hwndListView ,LVM_GETNEXTITEM, -1 , LVNI_SELECTED | LVNI_FOCUSED); +DisplayEvent(HWND hDlg) +{ + char szEventType[MAX_PATH]; + char szTime[MAX_PATH]; + char szDate[MAX_PATH]; + char szUser[MAX_PATH]; + char szComputer[MAX_PATH]; + char szSource[MAX_PATH]; + char szCategory[MAX_PATH]; + char szEventID[MAX_PATH]; + char szEventText[EVENT_MESSAGE_EVENTTEXT_BUFFER]; + char szEventData[MAX_PATH]; + BOOL bEventData = FALSE; + LVITEM li; + EVENTLOGRECORD* pevlr; + int iIndex; + + // Get index of selected item + iIndex = (int)SendMessage (hwndListView ,LVM_GETNEXTITEM, -1 , LVNI_SELECTED | LVNI_FOCUSED); li.mask = LVIF_PARAM; li.iItem = iIndex; li.iSubItem = 0; - (void)ListView_GetItem(hwndListView, &li); - - pevlr = (EVENTLOGRECORD*)li.lParam; - - if (iIndex != -1) - { - ListView_GetItemText (hwndListView , iIndex , 0 , szEventType , sizeof( szEventType )); - ListView_GetItemText (hwndListView , iIndex , 1 , szDate , sizeof( szDate )); - ListView_GetItemText (hwndListView , iIndex , 2 , szTime , sizeof( szTime )); - ListView_GetItemText (hwndListView , iIndex , 3 , szSource , sizeof( szSource )); - ListView_GetItemText (hwndListView , iIndex , 4 , szCategory , sizeof( szCategory )); - ListView_GetItemText (hwndListView , iIndex , 5 , szEventID , sizeof( szEventID )); - ListView_GetItemText (hwndListView , iIndex , 6 , szUser , sizeof( szUser )); - ListView_GetItemText (hwndListView , iIndex , 7 , szComputer , sizeof( szComputer )); - ListView_GetItemText (hwndListView , iIndex , 8 , szEventData , sizeof( szEventData )); - - bEventData = !(strlen(szEventData) == 0); - - GetEventMessage (lpSourceLogName , szSource , pevlr , szEventText); - - EnableWindow(GetDlgItem(hDlg , IDC_BYTESRADIO) , bEventData); - EnableWindow(GetDlgItem(hDlg , IDC_WORDRADIO) , bEventData); - - SetDlgItemText (hDlg, IDC_EVENTDATESTATIC , szDate); - SetDlgItemText (hDlg, IDC_EVENTTIMESTATIC , szTime); - SetDlgItemText (hDlg, IDC_EVENTUSERSTATIC , szUser); - SetDlgItemText (hDlg, IDC_EVENTSOURCESTATIC , szSource); - SetDlgItemText (hDlg, IDC_EVENTCOMPUTERSTATIC , szComputer); - SetDlgItemText (hDlg, IDC_EVENTCATEGORYSTATIC , szCategory); - SetDlgItemText (hDlg, IDC_EVENTIDSTATIC , szEventID); - SetDlgItemText (hDlg, IDC_EVENTTYPESTATIC , szEventType); - SetDlgItemText (hDlg, IDC_EVENTTEXTEDIT , szEventText); - SetDlgItemText (hDlg, IDC_EVENTDATAEDIT , szEventData); - } - else - { - MessageBox( - NULL, - "No Items in ListView", - "Error", - MB_OK | MB_ICONINFORMATION); - } -} + (void)ListView_GetItem(hwndListView, &li); + + pevlr = (EVENTLOGRECORD*)li.lParam; + + if (iIndex != -1) + { + ListView_GetItemText(hwndListView, iIndex, 0, szEventType, sizeof(szEventType)); + ListView_GetItemText(hwndListView, iIndex, 1, szDate, sizeof(szDate)); + ListView_GetItemText(hwndListView, iIndex, 2, szTime, sizeof(szTime)); + ListView_GetItemText(hwndListView, iIndex, 3, szSource, sizeof(szSource)); + ListView_GetItemText(hwndListView, iIndex, 4, szCategory, sizeof(szCategory)); + ListView_GetItemText(hwndListView, iIndex, 5, szEventID, sizeof(szEventID)); + ListView_GetItemText(hwndListView, iIndex, 6, szUser, sizeof(szUser)); + ListView_GetItemText(hwndListView, iIndex, 7, szComputer, sizeof(szComputer)); + ListView_GetItemText(hwndListView, iIndex, 8, szEventData, sizeof(szEventData)); + + bEventData = !(strlen(szEventData) == 0); + + GetEventMessage(lpSourceLogName, szSource, pevlr, szEventText); + + EnableWindow(GetDlgItem(hDlg, IDC_BYTESRADIO), bEventData); + EnableWindow(GetDlgItem(hDlg, IDC_WORDRADIO), bEventData); + + SetDlgItemText(hDlg, IDC_EVENTDATESTATIC, szDate); + SetDlgItemText(hDlg, IDC_EVENTTIMESTATIC, szTime); + SetDlgItemText(hDlg, IDC_EVENTUSERSTATIC, szUser); + SetDlgItemText(hDlg, IDC_EVENTSOURCESTATIC, szSource); + SetDlgItemText(hDlg, IDC_EVENTCOMPUTERSTATIC, szComputer); + SetDlgItemText(hDlg, IDC_EVENTCATEGORYSTATIC, szCategory); + SetDlgItemText(hDlg, IDC_EVENTIDSTATIC, szEventID); + SetDlgItemText(hDlg, IDC_EVENTTYPESTATIC, szEventType); + SetDlgItemText(hDlg, IDC_EVENTTEXTEDIT, szEventText); + SetDlgItemText(hDlg, IDC_EVENTDATAEDIT, szEventData); + } + else + { + MessageBox(NULL, + "No Items in ListView", + "Error", + MB_OK | MB_ICONINFORMATION); + } +} + static -INT_PTR CALLBACK StatusMessageWindowProc( - IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam) +INT_PTR CALLBACK +StatusMessageWindowProc(IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) { UNREFERENCED_PARAMETER(wParam); @@ -1082,62 +1098,65 @@ return FALSE; } + // Message handler for event details box. -INT_PTR CALLBACK EventDetails(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) -{ - UNREFERENCED_PARAMETER(lParam); - switch (message) - { - case WM_INITDIALOG: - { - // Show event info on dialog box - DisplayEvent (hDlg); - return (INT_PTR)TRUE; - } - - case WM_COMMAND: - if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) - { - EndDialog(hDlg, LOWORD(wParam)); - return (INT_PTR)TRUE; - } - if (LOWORD(wParam) == IDPREVIOUS) - { - SendMessage (hwndListView, WM_KEYDOWN, VK_UP, 0); - - // Show event info on dialog box - DisplayEvent (hDlg); - return (INT_PTR)TRUE; - } - - if (LOWORD(wParam) == IDNEXT) - { - SendMessage (hwndListView, WM_KEYDOWN, VK_DOWN, 0); - - // Show event info on dialog box - DisplayEvent (hDlg); - return (INT_PTR)TRUE; - } - - if (LOWORD(wParam) == IDC_BYTESRADIO) - { - return (INT_PTR)TRUE; - } - - if (LOWORD(wParam) == IDC_WORDRADIO) - { - return (INT_PTR)TRUE; - } - - if (LOWORD(wParam) == IDHELP) - { - MessageBox (NULL , - _TEXT("Help not implemented yet!") , - _TEXT("Event Log") , - MB_OK | MB_ICONINFORMATION); - return (INT_PTR)TRUE; - } - break; - } - return (INT_PTR)FALSE; -} +INT_PTR CALLBACK +EventDetails(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + + switch (message) + { + case WM_INITDIALOG: + // Show event info on dialog box + DisplayEvent(hDlg); + return (INT_PTR)TRUE; + + case WM_COMMAND: + if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) + { + EndDialog(hDlg, LOWORD(wParam)); + return (INT_PTR)TRUE; + } + + if (LOWORD(wParam) == IDPREVIOUS) + { + SendMessage(hwndListView, WM_KEYDOWN, VK_UP, 0); + + // Show event info on dialog box + DisplayEvent(hDlg); + return (INT_PTR)TRUE; + } + + if (LOWORD(wParam) == IDNEXT) + { + SendMessage(hwndListView, WM_KEYDOWN, VK_DOWN, 0); + + // Show event info on dialog box + DisplayEvent(hDlg); + return (INT_PTR)TRUE; + } + + if (LOWORD(wParam) == IDC_BYTESRADIO) + { + return (INT_PTR)TRUE; + } + + if (LOWORD(wParam) == IDC_WORDRADIO) + { + return (INT_PTR)TRUE; + } + + if (LOWORD(wParam) == IDHELP) + { + MessageBox(NULL, + _TEXT("Help not implemented yet!"), + _TEXT("Event Log"), + MB_OK | MB_ICONINFORMATION); + return (INT_PTR)TRUE; + } + break; + } + + return (INT_PTR)FALSE; +} Modified: trunk/reactos/base/applications/mscutils/eventvwr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/resource.h [iso-8859-1] Sat Nov 22 13:25:48 2008 @@ -5,7 +5,7 @@ #define IDC_MYICON 2 #define IDNEXT 3 #define IDD_EVENTVWR_DIALOG 102 -#define IDD_PROGRESSBOX 150 +#define IDD_PROGRESSBOX 150 #define IDS_APP_TITLE 103 #define IDD_ABOUTBOX 103 #define IDM_ABOUT 104 @@ -14,14 +14,14 @@ #define IDI_SMALL 108 #define IDC_EVENTVWR 109 #define IDC_EVENTSTRINGIDNOTFOUND 209 -#define IDC_PROCESSPROGRESS 250 -#define IDC_EVENTLOG_ERROR_TYPE 251 -#define IDC_EVENTLOG_WARNING_TYPE 252 -#define IDC_EVENTLOG_INFORMATION_TYPE 253 -#define IDC_EVENTLOG_AUDIT_SUCCESS 254 -#define IDC_EVENTLOG_AUDIT_FAILURE 255 -#define IDC_EVENTLOG_SUCCESS 256 -#define IDC_EVENTLOG_UNKNOWN_TYPE 257 +#define IDC_PROCESSPROGRESS 250 +#define IDC_EVENTLOG_ERROR_TYPE 251 +#define IDC_EVENTLOG_WARNING_TYPE 252 +#define IDC_EVENTLOG_INFORMATION_TYPE 253 +#define IDC_EVENTLOG_AUDIT_SUCCESS 254 +#define IDC_EVENTLOG_AUDIT_FAILURE 255 +#define IDC_EVENTLOG_SUCCESS 256 +#define IDC_EVENTLOG_UNKNOWN_TYPE 257 #define IDR_MAINFRAME 128 #define IDI_WARNINGICON 129 #define IDI_INFORMATIONICON 130 @@ -40,7 +40,7 @@ #define IDC_EVENTTEXTEDIT2 1010 #define IDC_BYTESRADIO 1011 #define IDC_WORDRADIO 1013 -#define IDC_EVENTDATAEDIT 1014 +#define IDC_EVENTDATAEDIT 1014 #define ID_LOG_APLICATION 32771 #define ID_LOG_SECURITY 32772 #define ID_LOG_SYSTEM 32773

1 0

[dgoette] 37563: only add a user membership once to a group
by dgoette＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: dgoette Date: Sat Nov 22 12:56:48 2008 New Revision: 37563 URL: http://svn.reactos.org/svn/reactos?rev=37563&view=rev Log: only add a user membership once to a group Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Export_User.class.php Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Export_User.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Export_User.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Export_User.class.php [iso-8859-1] Sat Nov 22 12:56:48 2008 @@ -84,16 +84,23 @@ $user_lang = false; } + // do some actions switch ($flag) { case 'addmembership': - $stmt=DBConnection::getInstance()->prepare("INSERT INTO usergroup_members ( usergroupmember_userid , usergroupmember_usergroupid ) VALUES ( :user_id, :group_id )"); - $stmt->bindParam('user_id',$user_id,PDO::PARAM_INT); - $stmt->bindParam('group_id',$group_id,PDO::PARAM_INT); - $stmt->execute(); - if ($user_lang !== false) { - Log::writeLangMedium("add user account membership: user-id=".$user_id.", group-id=".$RosCMS_GET_d_value2." done by ".$roscms_intern_account_id." {data_user_out}", $user_lang); - } - Log::writeMedium('add user account membership: user-id='.$user_id.', group-id='.$group_id.' done by '.$roscms_intern_account_id.' {data_user_out}'); + // check if user is already member, so we don't add him twice + if (!ROSUser::isMemberOfGroup($user_id,$group_id)) { + + // insert new membership + $stmt=DBConnection::getInstance()->prepare("INSERT INTO usergroup_members ( usergroupmember_userid , usergroupmember_usergroupid ) VALUES ( :user_id, :group_id )"); + $stmt->bindParam('user_id',$user_id,PDO::PARAM_INT); + $stmt->bindParam('group_id',$group_id,PDO::PARAM_INT); + $stmt->execute(); + if ($user_lang !== false) { + Log::writeLangMedium("add user account membership: user-id=".$user_id.", group-id=".$RosCMS_GET_d_value2." done by ".$roscms_intern_account_id." {data_user_out}", $user_lang); + } + Log::writeMedium('add user account membership: user-id='.$user_id.', group-id='.$group_id.' done by '.$roscms_intern_account_id.' {data_user_out}'); + } + // preselect displayed content $flag = 'detail'; break; @@ -106,6 +113,7 @@ Log::writeLangMedium('delete user account membership: user-id='.$user_id.', group-id='.$group_id.' done by '.$roscms_intern_account_id.' {data_user_out}', $user_lang); } Log::writeMedium('delete user account membership: user-id='.$user_id.', group-id='.$group_id.' done by '.$roscms_intern_account_id.' {data_user_out}'); + // preselect displayed content $flag = 'detail'; break; @@ -118,7 +126,8 @@ Log::writeLangMedium('change user account language: user-id='.$user_id.', lang-id='.$group_id.' done by '.$roscms_intern_account_id.' {data_user_out}', $user_lang); } Log::writeMedium('change user account language: user-id='.$user_id.', lang-id='.$group_id.' done by '.$roscms_intern_account_id.' {data_user_out}'); - $flag = "detail"; + // preselect displayed content + $flag = 'detail'; break; }

1 0

[jimtabor] 37562: - Add tag for path objects. Set DC handle when selecting bitmap.
by jimtabor＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: jimtabor Date: Sat Nov 22 12:26:32 2008 New Revision: 37562 URL: http://svn.reactos.org/svn/reactos?rev=37562&view=rev Log: - Add tag for path objects. Set DC handle when selecting bitmap. Modified: trunk/reactos/subsystems/win32/win32k/include/tags.h trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/include/tags.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/tags.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/tags.h [iso-8859-1] Sat Nov 22 12:26:32 2008 @@ -77,6 +77,7 @@ #define TAG_CLIPOBJ TAG('C', 'L', 'P', 'O') /* clip object */ #define TAG_DRIVEROBJ TAG('D', 'R', 'V', 'O') /* driver object */ #define TAG_DFSM TAG('D', 'f', 's', 'm') /* Eng event allocation */ +#define TAG_EPATH TAG('G', 'p', 'a', 't') /* path object */ #define TAG_FONT TAG('F', 'N', 'T', 'E') /* font entry */ #define TAG_FONTOBJ TAG('G', 'f', 'n', 't') /* font object */ #define TAG_WNDOBJ TAG('W', 'N', 'D', 'O') /* window object */ Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Sat Nov 22 12:26:32 2008 @@ -2099,6 +2099,10 @@ /* Release the old bitmap, lock the new one and convert it to a SURF */ pDC->w.hBitmap = hBmp; + // If Info DC this is zero and pSurface is moved to DC->pSurfInfo. + pDC->DcLevel.pSurface = pBmp; + pBmp->hDC = hDC; + // if we're working with a DIB, get the palette [fixme: only create if the selected palette is null] if(pBmp->dib) {

1 0

[dchapyshev] 37561: - Fix CompareStringA/W. +7 passed wine tests
by dchapyshev＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: dchapyshev Date: Sat Nov 22 11:41:52 2008 New Revision: 37561 URL: http://svn.reactos.org/svn/reactos?rev=37561&view=rev Log: - Fix CompareStringA/W. +7 passed wine tests Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/la… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/lang.c [iso-8859-1] Sat Nov 22 11:41:52 2008 @@ -1910,7 +1910,7 @@ /* * @implemented */ -/* Synced to Wine-20102004 */ +/* Synced to Wine-22112008 */ int STDCALL CompareStringA ( @@ -1926,7 +1926,7 @@ WCHAR *buf2W = buf1W + 130; LPWSTR str1W, str2W; INT len1W, len2W, ret; - UINT locale_cp; + UINT locale_cp = CP_ACP; if (!lpString1 || !lpString2) { @@ -1936,7 +1936,7 @@ if (cchCount1 < 0) cchCount1 = strlen(lpString1); if (cchCount2 < 0) cchCount2 = strlen(lpString2); - locale_cp = get_lcid_codepage(Locale); + if (!(dwCmpFlags & LOCALE_USE_CP_ACP)) locale_cp = get_lcid_codepage(Locale); len1W = MultiByteToWideChar(locale_cp, 0, lpString1, cchCount1, buf1W, 130); if (len1W) @@ -1976,85 +1976,84 @@ } -static int compare_unicode_string( - PUNICODE_STRING String1, - PUNICODE_STRING String2, +static int +LANG_CompareUnicodeString( + LPCWSTR s1, + ULONG len1, + LPCWSTR s2, + ULONG len2, DWORD Flags ) { - ULONG len1, len2; - PWCHAR s1, s2; WCHAR c1, c2; - if (String1 && String2) - { - len1 = String1->Length / sizeof(WCHAR); - len2 = String2->Length / sizeof(WCHAR); - s1 = String1->Buffer; - s2 = String2->Buffer; - - while (len1 > 0 && len2 > 0) - { - if (Flags & NORM_IGNORESYMBOLS) + while (len1 > 0 && len2 > 0) + { + if (Flags & NORM_IGNORESYMBOLS) + { + int skip = 0; + /* FIXME: not tested */ + if (iswctype(*s1, _SPACE | _PUNCT)) { - int skip = 0; - /* FIXME: not tested */ - if (iswctype(*s1, _SPACE | _PUNCT)) + s1++; + len1--; + skip = 1; + } + if (iswctype(*s2, _SPACE | _PUNCT)) + { + s2++; + len2--; + skip = 1; + } + if (skip) continue; + } + + /* hyphen and apostrophe are treated differently depending on + * whether SORT_STRINGSORT specified or not + */ + if (!(Flags & SORT_STRINGSORT)) + { + if (*s1 == '-' || *s1 == '\'') + { + if (*s2 != '-' && *s2 != '\'') { s1++; len1--; - skip = 1; - } - if (iswctype(*s2, _SPACE | _PUNCT)) - { - s2++; - len2--; - skip = 1; - } - if (skip) continue; - } - - /* hyphen and apostrophe are treated differently depending on - * whether SORT_STRINGSORT specified or not - */ - if (!(Flags & SORT_STRINGSORT)) - { - if (*s1 == '-' || *s1 == '\'') - { - if (*s2 != '-' && *s2 != '\'') - { - s1++; - len1--; - continue; - } - } - else if (*s2 == '-' || *s2 == '\'') - { - s2++; - len2--; continue; } } - if (Flags & NORM_IGNORECASE) + else if (*s2 == '-' || *s2 == '\'') { - c1 = len1-- ? RtlUpcaseUnicodeChar(*s1++) : 0; - c2 = len2-- ? RtlUpcaseUnicodeChar(*s2++) : 0; - if (!c1 || !c2 || c1 != c2) + s2++; + len2--; + continue; + } + } + if (Flags & NORM_IGNORECASE) + { + c1 = len1-- ? RtlUpcaseUnicodeChar(*s1++) : 0; + c2 = len2-- ? RtlUpcaseUnicodeChar(*s2++) : 0; + if (!c1 || !c2 || c1 != c2) return c1 - c2; - } - else - { - c1 = len1-- ? *s1++ : 0; - c2 = len2-- ? *s2++ : 0; - if (!c1 || !c2 || c1 != c2) + } + else + { + c1 = len1-- ? *s1++ : 0; + c2 = len2-- ? *s2++ : 0; + if (!c1 || !c2 || c1 != c2) return c1 - c2; - } - } - return (int) len1 - (int) len2; - } - return 0; -} - + } + } + + return (int) (len1 - len2); +} + +static int +LANG_GetRealLength(const WCHAR *str, int len) +{ + while (len && !str[len - 1]) len--; + return len; +} /* * @unimplemented @@ -2071,7 +2070,6 @@ ) { INT Result; - UNICODE_STRING String1, String2; if (!lpString1 || !lpString2) { @@ -2081,30 +2079,23 @@ if (dwCmpFlags & ~(NORM_IGNORECASE | NORM_IGNORENONSPACE | NORM_IGNORESYMBOLS | SORT_STRINGSORT | NORM_IGNOREKANATYPE | - NORM_IGNOREWIDTH | 0x10000000)) + NORM_IGNOREWIDTH | LOCALE_USE_CP_ACP | 0x10000000)) { SetLastError(ERROR_INVALID_FLAGS); return 0; } - if (cchCount1 < 0) cchCount1 = lstrlenW(lpString1); - if (cchCount2 < 0) cchCount2 = lstrlenW(lpString2); - - String1.Length = String1.MaximumLength = cchCount1 * sizeof(WCHAR); - String1.Buffer = (LPWSTR)lpString1; - String2.Length = String2.MaximumLength = cchCount2 * sizeof(WCHAR); - String2.Buffer = (LPWSTR)lpString2; - - - if (dwCmpFlags & ~NORM_IGNORECASE) - { - DPRINT("CompareString: STUB flags - 0x%x\n", dwCmpFlags); - Result = compare_unicode_string(&String1, &String2, dwCmpFlags); - } - else - Result = RtlCompareUnicodeString( - &String1, &String2, (BOOLEAN)(dwCmpFlags & NORM_IGNORECASE)); - + /* this style is related to diacritics in Arabic, Japanese, and Hebrew */ + if (dwCmpFlags & 0x10000000) + DPRINT1("Ignoring unknown style 0x10000000\n"); + + if (cchCount1 < 0) cchCount1 = wcslen(lpString1); + if (cchCount2 < 0) cchCount2 = wcslen(lpString2); + + cchCount1 = LANG_GetRealLength(lpString1, cchCount1); + cchCount2 = LANG_GetRealLength(lpString2, cchCount2); + + Result = LANG_CompareUnicodeString(lpString1, cchCount1, lpString2, cchCount2, dwCmpFlags); if (Result) /* need to translate result */ return (Result < 0) ? CSTR_LESS_THAN : CSTR_GREATER_THAN;

1 0

[greatlrd] 37560: implement bit more of DCICreatePrimary, it is not finish or tested yet, and comment up the code.
by greatlrd＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: greatlrd Date: Sat Nov 22 11:08:55 2008 New Revision: 37560 URL: http://svn.reactos.org/svn/reactos?rev=37560&view=rev Log: implement bit more of DCICreatePrimary, it is not finish or tested yet, and comment up the code. Modified: branches/reactx/reactos/dll/win32/dciman32/dciman_main.c Modified: branches/reactx/reactos/dll/win32/dciman32/dciman_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/dciman… ============================================================================== --- branches/reactx/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] Sat Nov 22 11:08:55 2008 @@ -112,8 +112,10 @@ DDHALINFO HalInfo; DDHAL_DDPALETTECALLBACKS DDPaletteCallbacks; + /* Alloc memory for the internal struct, rember this internal struct are not compatible with windows xp */ if ( (pDciSurface_int = (LPDCISURFACE_INT) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DCISURFACE_INT) )) == NULL ) { + /* Fail alloc memmory */ retvalue = DCI_ERR_OUTOFMEMORY; } else @@ -135,15 +137,51 @@ NULL, NULL) == FALSE) ) { + /* Fail to get importment Directx informations */ retvalue = DCI_FAIL_UNSUPPORTED; } else { + /* We got all informations to start create our primary surface */ + + /* Will be use later, it check see if we lost the surface or not */ pDciSurface_int->DciSurface_lcl.LostSurface = FALSE; /* FIXME Add the real code now to create the primary surface after we create the dx hal interface */ + /* Fill in the size of DCISURFACEINFO struct */ pDciSurface_int->DciSurfaceInfo.dwSize = sizeof(DCISURFACEINFO); + + /* Fill in the surface is visible, for it always are the primary surface and it is visible */ + pDciSurface_int->DciSurfaceInfo.dwDCICaps = DCI_VISIBLE; + + /* for primary screen res lower that 256Color, ms dciman.dll set this value to BI_RGB + * old note I found in ddk header comment follow dwMask is type for BI_BITMASK surfaces + * and for dwCompression it was which format the surface was create in, I also tested with older graphic card like S3 + * that support 16Color or lower for the primary display. and saw this member change betwin 0 (BI_RGB) and 3 (BI_BITFIELDS). + */ + if (HalInfo.vmiData.ddpfDisplay.dwRGBBitCount >= 8) + { + pDciSurface_int->DciSurfaceInfo.dwCompression = BI_BITFIELDS; + } + else + { + pDciSurface_int->DciSurfaceInfo.dwCompression = BI_RGB; + } + + /* Fill in the RGB mask */ + pDciSurface_int->DciSurfaceInfo.dwMask[0] = HalInfo.vmiData.ddpfDisplay.dwRBitMask; + pDciSurface_int->DciSurfaceInfo.dwMask[1] = HalInfo.vmiData.ddpfDisplay.dwGBitMask; + pDciSurface_int->DciSurfaceInfo.dwMask[2] = HalInfo.vmiData.ddpfDisplay.dwBBitMask; + + /* Fill in the width and height of the primary surface */ + pDciSurface_int->DciSurfaceInfo.dwWidth = HalInfo.vmiData.dwDisplayWidth; + pDciSurface_int->DciSurfaceInfo.dwHeight = HalInfo.vmiData.dwDisplayHeight; + + /* Fill in the color deep and stride of the primary surface */ + pDciSurface_int->DciSurfaceInfo.dwBitCount = HalInfo.vmiData.ddpfDisplay.dwRGBBitCount; + pDciSurface_int->DciSurfaceInfo.lStride = HalInfo.vmiData.lDisplayPitch; + *pDciSurfaceInfo = (LPDCISURFACEINFO) &pDciSurface_int->DciSurfaceInfo; } }

1 0

[cgutman] 37559: - Merge aicom-network-fixes up to r37556
by cgutman＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: cgutman Date: Sat Nov 22 11:02:56 2008 New Revision: 37559 URL: http://svn.reactos.org/svn/reactos?rev=37559&view=rev Log: - Merge aicom-network-fixes up to r37556 Modified: trunk/reactos/drivers/network/afd/afd/info.c trunk/reactos/drivers/network/dd/pcnet/requests.c trunk/reactos/drivers/network/ndis/include/miniport.h trunk/reactos/drivers/network/ndis/ndis/config.c trunk/reactos/drivers/network/ndis/ndis/io.c trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/ndis/ndis/protocol.c trunk/reactos/drivers/network/ndis/ndis/stubs.c trunk/reactos/lib/drivers/ip/network/loopback.c trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] Sat Nov 22 11:02:56 2008 @@ -110,7 +110,7 @@ TDI_QUERY_ADDRESS_INFO, Mdl ); } else { - if( FCB->Connection.Object == NULL ) { + if( FCB->Connection.Object == NULL || (FCB->State != SOCKET_STATE_BOUND && FCB->State != SOCKET_STATE_CONNECTED) ) { return UnlockAndMaybeComplete( FCB, STATUS_INVALID_PARAMETER, Irp, 0, NULL ); } Modified: trunk/reactos/drivers/network/dd/pcnet/requests.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/r… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/requests.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/requests.c [iso-8859-1] Sat Nov 22 11:02:56 2008 @@ -352,9 +352,9 @@ { if (CopySize > InformationBufferLength) { - *BytesNeeded = (CopySize - InformationBufferLength); + *BytesNeeded = CopySize; *BytesWritten = 0; - Status = NDIS_STATUS_BUFFER_TOO_SHORT; + Status = NDIS_STATUS_INVALID_LENGTH; } else { @@ -362,6 +362,11 @@ *BytesWritten = CopySize; *BytesNeeded = CopySize; } + } + else + { + *BytesWritten = 0; + *BytesNeeded = 0; } NdisDprReleaseSpinLock(&Adapter->Lock); @@ -417,7 +422,7 @@ if (InformationBufferLength < sizeof(ULONG)) { *BytesRead = 0; - *BytesNeeded = sizeof(ULONG) - InformationBufferLength; + *BytesNeeded = sizeof(ULONG); Status = NDIS_STATUS_INVALID_LENGTH; break; } @@ -434,7 +439,7 @@ NDIS_PACKET_TYPE_SOURCE_ROUTING) ) { - *BytesRead = 4; + *BytesRead = sizeof(ULONG); *BytesNeeded = 0; Status = NDIS_STATUS_NOT_SUPPORTED; break; @@ -453,7 +458,7 @@ if (InformationBufferLength < sizeof(ULONG)) { *BytesRead = 0; - *BytesNeeded = sizeof(ULONG) - InformationBufferLength; + *BytesNeeded = sizeof(ULONG); Status = NDIS_STATUS_INVALID_LENGTH; break; } @@ -461,7 +466,7 @@ NdisMoveMemory(&GenericULONG, InformationBuffer, sizeof(ULONG)); if (GenericULONG > 1500) - Status = NDIS_STATUS_INVALID_LENGTH; + Status = NDIS_STATUS_INVALID_DATA; else Adapter->CurrentLookaheadSize = GenericULONG; @@ -474,7 +479,7 @@ if ((InformationBufferLength % 6) != 0) { *BytesRead = 0; - *BytesNeeded = 0; + *BytesNeeded = InformationBufferLength + (InformationBufferLength % 6); Status = NDIS_STATUS_INVALID_LENGTH; break; } Modified: trunk/reactos/drivers/network/ndis/include/miniport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] Sat Nov 22 11:02:56 2008 @@ -75,7 +75,6 @@ typedef struct _LOGICAL_ADAPTER { NDIS_MINIPORT_BLOCK NdisMiniportBlock; /* NDIS defined fields */ - BOOLEAN MiniportBusy; /* A MiniportXxx routine is executing */ PNDIS_MINIPORT_WORK_ITEM WorkQueueHead; /* Head of work queue */ PNDIS_MINIPORT_WORK_ITEM WorkQueueTail; /* Tail of work queue */ LIST_ENTRY ListEntry; /* Entry on global list */ @@ -84,8 +83,6 @@ ULONG MediumHeaderSize; /* Size of medium header */ HARDWARE_ADDRESS Address; /* Hardware address of adapter */ ULONG AddressLength; /* Length of hardware address */ - PUCHAR LookaheadBuffer; /* Pointer to lookahead buffer */ - ULONG LookaheadLength; /* Length of lookahead buffer */ PMINIPORT_BUGCHECK_CONTEXT BugcheckContext; /* Adapter's shutdown handler */ } LOGICAL_ADAPTER, *PLOGICAL_ADAPTER; @@ -130,12 +127,13 @@ PVOID Buffer, PULONG BytesWritten); -NDIS_STATUS +VOID FASTCALL MiniQueueWorkItem( PLOGICAL_ADAPTER Adapter, NDIS_WORK_ITEM_TYPE WorkItemType, - PVOID WorkItemContext); + PVOID WorkItemContext, + BOOLEAN Top); NDIS_STATUS FASTCALL @@ -161,7 +159,9 @@ VOID NTAPI -MiniportWorker(IN PVOID WorkItem); +MiniportWorker( + IN PDEVICE_OBJECT DeviceObject, + IN PVOID WorkItem); VOID NTAPI MiniSendComplete( Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Sat Nov 22 11:02:56 2008 @@ -139,7 +139,7 @@ while(!IsListEmpty(&ConfigurationContext->ResourceListHead)) { - Resource = (PMINIPORT_RESOURCE)RemoveTailList(&ConfigurationContext->ResourceListHead); + Resource = (PMINIPORT_RESOURCE)ExInterlockedRemoveHeadList(&ConfigurationContext->ResourceListHead, &ConfigurationContext->ResourceLock); if(Resource->ResourceType == MINIPORT_RESOURCE_TYPE_MEMORY) { NDIS_DbgPrint(MAX_TRACE,("freeing 0x%x\n", Resource->Resource)); Modified: trunk/reactos/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] Sat Nov 22 11:02:56 2008 @@ -55,26 +55,27 @@ * FUNCTION: Interrupt service routine * ARGUMENTS: * Interrupt = Pointer to interrupt object - * ServiceContext = Pointer to context information (LOGICAL_ADAPTER) + * ServiceContext = Pointer to context information (PNDIS_MINIPORT_INTERRUPT) * RETURNS * TRUE if a miniport controlled device generated the interrupt */ { BOOLEAN InterruptRecognized = FALSE; BOOLEAN QueueMiniportHandleInterrupt = FALSE; - PLOGICAL_ADAPTER Adapter = ServiceContext; - - NDIS_DbgPrint(MAX_TRACE, ("Called. Adapter (0x%X)\n", Adapter)); - - if (Adapter->NdisMiniportBlock.Interrupt->IsrRequested) { - (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ISRHandler)( + PNDIS_MINIPORT_INTERRUPT NdisInterrupt = ServiceContext; + PNDIS_MINIPORT_BLOCK NdisMiniportBlock = NdisInterrupt->Miniport; + + NDIS_DbgPrint(MAX_TRACE, ("Called. Interrupt (0x%X)\n", NdisInterrupt)); + + if (NdisInterrupt->IsrRequested) { + (*NdisMiniportBlock->DriverHandle->MiniportCharacteristics.ISRHandler)( &InterruptRecognized, &QueueMiniportHandleInterrupt, - Adapter->NdisMiniportBlock.MiniportAdapterContext); - - } else if (Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.DisableInterruptHandler) { - (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.DisableInterruptHandler)( - Adapter->NdisMiniportBlock.MiniportAdapterContext); + NdisMiniportBlock->MiniportAdapterContext); + + } else if (NdisMiniportBlock->DriverHandle->MiniportCharacteristics.DisableInterruptHandler) { + (*NdisMiniportBlock->DriverHandle->MiniportCharacteristics.DisableInterruptHandler)( + NdisMiniportBlock->MiniportAdapterContext); QueueMiniportHandleInterrupt = TRUE; InterruptRecognized = TRUE; } @@ -83,7 +84,7 @@ if (QueueMiniportHandleInterrupt) { NDIS_DbgPrint(MAX_TRACE, ("Queuing DPC.\n")); - KeInsertQueueDpc(&Adapter->NdisMiniportBlock.Interrupt->InterruptDpc, NULL, NULL); + KeInsertQueueDpc(&NdisInterrupt->InterruptDpc, NULL, NULL); } NDIS_DbgPrint(MAX_TRACE, ("Leaving.\n")); @@ -550,6 +551,10 @@ { NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); IoDisconnectInterrupt(Interrupt->InterruptObject); + Interrupt->Miniport->RegisteredInterrupts--; + + if (Interrupt->Miniport->Interrupt == Interrupt) + Interrupt->Miniport->Interrupt = NULL; } @@ -777,8 +782,7 @@ Interrupt->SharedInterrupt = SharedInterrupt; Interrupt->IsrRequested = RequestIsr; - - Adapter->NdisMiniportBlock.Interrupt = Interrupt; + Interrupt->Miniport = &Adapter->NdisMiniportBlock; MappedIRQ = HalGetInterruptVector(Adapter->NdisMiniportBlock.BusType, Adapter->NdisMiniportBlock.BusNumber, InterruptLevel, InterruptVector, &DIrql, @@ -786,13 +790,16 @@ NDIS_DbgPrint(MAX_TRACE, ("Connecting to interrupt vector (0x%X) Affinity (0x%X).\n", MappedIRQ, Affinity)); - Status = IoConnectInterrupt(&Interrupt->InterruptObject, ServiceRoutine, Adapter, &Interrupt->DpcCountLock, MappedIRQ, + Status = IoConnectInterrupt(&Interrupt->InterruptObject, ServiceRoutine, Interrupt, &Interrupt->DpcCountLock, MappedIRQ, DIrql, DIrql, InterruptMode, SharedInterrupt, Affinity, FALSE); NDIS_DbgPrint(MAX_TRACE, ("Leaving. Status (0x%X).\n", Status)); - if (NT_SUCCESS(Status)) - return NDIS_STATUS_SUCCESS; + if (NT_SUCCESS(Status)) { + Adapter->NdisMiniportBlock.Interrupt = Interrupt; + Adapter->NdisMiniportBlock.RegisteredInterrupts++; + return NDIS_STATUS_SUCCESS; + } if (Status == STATUS_INSUFFICIENT_RESOURCES) { Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sat Nov 22 11:02:56 2008 @@ -286,8 +286,6 @@ CurrentEntry = CurrentEntry->Flink; } - Adapter->MiniportBusy = FALSE; - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); } @@ -299,7 +297,6 @@ IN PNDIS_REQUEST Request, IN NDIS_STATUS Status) { - PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; PNDIS_REQUEST_MAC_BLOCK MacBlock = (PNDIS_REQUEST_MAC_BLOCK)Request->MacReserved; KIRQL OldIrql; @@ -312,9 +309,6 @@ Request, Status); } - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); - Adapter->MiniportBusy = FALSE; - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); KeLowerIrql(OldIrql); } @@ -332,7 +326,6 @@ * Status = Status of send operation */ { - PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; PADAPTER_BINDING AdapterBinding; KIRQL OldIrql; @@ -345,9 +338,6 @@ AdapterBinding->NdisOpenBlock.ProtocolBindingContext, Packet, Status); - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); - Adapter->MiniportBusy = FALSE; - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); KeLowerIrql(OldIrql); } @@ -369,7 +359,6 @@ IN NDIS_STATUS Status, IN UINT BytesTransferred) { - PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; PADAPTER_BINDING AdapterBinding; KIRQL OldIrql; @@ -382,9 +371,6 @@ AdapterBinding->NdisOpenBlock.ProtocolBindingContext, Packet, Status); - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); - Adapter->MiniportBusy = FALSE; - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); KeLowerIrql(OldIrql); } @@ -614,13 +600,6 @@ NDIS_STATUS Status; KIRQL OldIrql; - if (Adapter->MiniportBusy) { - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); - MiniQueueWorkItem(Adapter, NdisWorkItemResetRequested, NULL); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); - return NDIS_STATUS_PENDING; - } - NdisMIndicateStatus(Adapter, NDIS_STATUS_RESET_START, NULL, 0); NdisMIndicateStatusComplete(Adapter); @@ -633,10 +612,6 @@ if (Status != NDIS_STATUS_PENDING) { NdisMIndicateStatus(Adapter, NDIS_STATUS_RESET_END, NULL, 0); NdisMIndicateStatusComplete(Adapter); - } else { - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); - Adapter->MiniportBusy = TRUE; - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); } return Status; @@ -662,72 +637,76 @@ } -NDIS_STATUS +VOID FASTCALL MiniQueueWorkItem( PLOGICAL_ADAPTER Adapter, NDIS_WORK_ITEM_TYPE WorkItemType, - PVOID WorkItemContext) + PVOID WorkItemContext, + BOOLEAN Top) /* * FUNCTION: Queues a work item for execution at a later time * ARGUMENTS: * Adapter = Pointer to the logical adapter object to queue work item on * WorkItemType = Type of work item to queue * WorkItemContext = Pointer to context information for work item - * NOTES: - * Adapter lock must be held when called * RETURNS: * Status of operation */ { PNDIS_MINIPORT_WORK_ITEM MiniportWorkItem; - PNDIS_WORK_ITEM NdisWorkItem; - PWORK_QUEUE_ITEM WorkQueueItem; + PIO_WORKITEM IoWorkItem; + KIRQL OldIrql; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); ASSERT(Adapter); - ASSERT(KeGetCurrentIrql() >= DISPATCH_LEVEL); - - MiniportWorkItem = ExAllocatePool(NonPagedPool, sizeof(NDIS_MINIPORT_WORK_ITEM)); - if (!MiniportWorkItem) - { - NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - return NDIS_STATUS_RESOURCES; - } - - NdisWorkItem = ExAllocatePool(NonPagedPool, sizeof(NDIS_WORK_ITEM)); - if (!NdisWorkItem) - { - ExFreePool(MiniportWorkItem); - return NDIS_STATUS_RESOURCES; - } - - MiniportWorkItem->WorkItemType = WorkItemType; - MiniportWorkItem->WorkItemContext = WorkItemContext; - - /* safe due to adapter lock held */ - MiniportWorkItem->Link.Next = NULL; - if (!Adapter->WorkQueueHead) - { - Adapter->WorkQueueHead = MiniportWorkItem; - Adapter->WorkQueueTail = MiniportWorkItem; + + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + if (Top) + { + if (WorkItemType == NdisWorkItemSend) + { + Adapter->NdisMiniportBlock.FirstPendingPacket = WorkItemContext; + } + else + { + //This should never happen + ASSERT(FALSE); + } } else { - Adapter->WorkQueueTail->Link.Next = (PSINGLE_LIST_ENTRY)MiniportWorkItem; - Adapter->WorkQueueTail = MiniportWorkItem; - } - - WorkQueueItem = (PWORK_QUEUE_ITEM)NdisWorkItem->WrapperReserved; - - NdisWorkItem->Context = Adapter; - - ExInitializeWorkItem(WorkQueueItem, MiniportWorker, NdisWorkItem); - - ExQueueWorkItem(WorkQueueItem, CriticalWorkQueue); - - return NDIS_STATUS_SUCCESS; + MiniportWorkItem = ExAllocatePool(NonPagedPool, sizeof(NDIS_MINIPORT_WORK_ITEM)); + if (!MiniportWorkItem) + { + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + return; + } + + MiniportWorkItem->WorkItemType = WorkItemType; + MiniportWorkItem->WorkItemContext = WorkItemContext; + + /* safe due to adapter lock held */ + MiniportWorkItem->Link.Next = NULL; + if (!Adapter->WorkQueueHead) + { + Adapter->WorkQueueHead = MiniportWorkItem; + Adapter->WorkQueueTail = MiniportWorkItem; + } + else + { + Adapter->WorkQueueTail->Link.Next = (PSINGLE_LIST_ENTRY)MiniportWorkItem; + Adapter->WorkQueueTail = MiniportWorkItem; + } + } + + IoWorkItem = IoAllocateWorkItem(Adapter->NdisMiniportBlock.DeviceObject); + if (IoWorkItem) + IoQueueWorkItem(IoWorkItem, MiniportWorker, CriticalWorkQueue, IoWorkItem); + + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); } @@ -751,26 +730,22 @@ */ { PNDIS_MINIPORT_WORK_ITEM MiniportWorkItem; - PNDIS_WORK_ITEM NdisWorkItem; - PWORK_QUEUE_ITEM WorkQueueItem; - + PNDIS_PACKET Packet; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - if (Adapter->MiniportBusy) { - NDIS_DbgPrint(MID_TRACE, ("Waiting for miniport to become free.\n")); - NdisWorkItem = ExAllocatePool(NonPagedPool, sizeof(NDIS_WORK_ITEM)); - if (!NdisWorkItem) return NDIS_STATUS_RESOURCES; - WorkQueueItem = (PWORK_QUEUE_ITEM)NdisWorkItem->WrapperReserved; - NdisWorkItem->Context = Adapter; - ExInitializeWorkItem(WorkQueueItem, MiniportWorker, NdisWorkItem); - ExQueueWorkItem(WorkQueueItem, CriticalWorkQueue); - return NDIS_STATUS_FAILURE; - } - MiniportWorkItem = Adapter->WorkQueueHead; - if (MiniportWorkItem) + if ((Packet = Adapter->NdisMiniportBlock.FirstPendingPacket)) + { + Adapter->NdisMiniportBlock.FirstPendingPacket = NULL; + + *WorkItemType = NdisWorkItemSend; + *WorkItemContext = Packet; + + return NDIS_STATUS_SUCCESS; + } + else if (MiniportWorkItem) { /* safe due to adapter lock held */ Adapter->WorkQueueHead = (PNDIS_MINIPORT_WORK_ITEM)MiniportWorkItem->Link.Next; @@ -783,12 +758,12 @@ ExFreePool(MiniportWorkItem); - Adapter->MiniportBusy = TRUE; - return NDIS_STATUS_SUCCESS; } - - return NDIS_STATUS_FAILURE; + else + { + return NDIS_STATUS_FAILURE; + } } @@ -808,8 +783,6 @@ NDIS_STATUS Status; KIRQL OldIrql; NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); - - Adapter->NdisMiniportBlock.MediaRequest = NdisRequest; KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); switch (NdisRequest->RequestType) @@ -838,14 +811,29 @@ Status = NDIS_STATUS_FAILURE; } - if (Status == NDIS_STATUS_PENDING) { - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); - Adapter->MiniportBusy = TRUE; - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); - } - KeLowerIrql(OldIrql); return Status; +} + + +/* + * @implemented + */ +#undef NdisMSetInformationComplete +VOID +EXPORT +NdisMSetInformationComplete( + IN NDIS_HANDLE MiniportAdapterHandle, + IN NDIS_STATUS Status) +{ + PLOGICAL_ADAPTER Adapter = + (PLOGICAL_ADAPTER)MiniportAdapterHandle; + KIRQL OldIrql; + ASSERT(Adapter); + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + if (Adapter->NdisMiniportBlock.SetCompleteHandler) + (Adapter->NdisMiniportBlock.SetCompleteHandler)(MiniportAdapterHandle, Status); + KeLowerIrql(OldIrql); } @@ -866,21 +854,21 @@ KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); if( Adapter->NdisMiniportBlock.QueryCompleteHandler ) (Adapter->NdisMiniportBlock.QueryCompleteHandler)(MiniportAdapterHandle, Status); - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); - Adapter->MiniportBusy = FALSE; - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); KeLowerIrql(OldIrql); } -VOID NTAPI MiniportWorker(IN PVOID WorkItem) -{ - PNDIS_WORK_ITEM NdisWorkItem = WorkItem; - PLOGICAL_ADAPTER Adapter = GET_LOGICAL_ADAPTER(NdisWorkItem->Context); +VOID +NTAPI +MiniportWorker(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context) +{ + PLOGICAL_ADAPTER Adapter = DeviceObject->DeviceExtension; KIRQL OldIrql, RaiseOldIrql; NDIS_STATUS NdisStatus; PVOID WorkItemContext; NDIS_WORK_ITEM_TYPE WorkItemType; BOOLEAN AddressingReset; + + IoFreeWorkItem((PIO_WORKITEM)Context); KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); @@ -898,9 +886,7 @@ /* * called by ProSend when protocols want to send packets to the miniport */ -#ifdef DBG - MiniDisplayPacket((PNDIS_PACKET)WorkItemContext); -#endif + if(Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler) { if(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_DESERIALIZE) @@ -923,9 +909,7 @@ NdisStatus = NDIS_GET_PACKET_STATUS((PNDIS_PACKET)WorkItemContext); if( NdisStatus == NDIS_STATUS_RESOURCES ) { - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); - MiniQueueWorkItem(Adapter, WorkItemType, WorkItemContext); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + MiniQueueWorkItem(Adapter, WorkItemType, WorkItemContext, TRUE); break; } } @@ -949,9 +933,7 @@ NDIS_DbgPrint(MAX_TRACE, ("back from miniport's send handler\n")); KeLowerIrql(RaiseOldIrql); if( NdisStatus == NDIS_STATUS_RESOURCES ) { - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); - MiniQueueWorkItem(Adapter, WorkItemType, WorkItemContext); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + MiniQueueWorkItem(Adapter, WorkItemType, WorkItemContext, TRUE); break; } } @@ -1028,14 +1010,6 @@ break; } } - - if( NdisStatus != NDIS_STATUS_PENDING ) { - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); - Adapter->MiniportBusy = FALSE; - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); - } - - ExFreePool(WorkItem); } @@ -1433,15 +1407,6 @@ } NDIS_DbgPrint(DEBUG_MINIPORT, ("CurLookaheadLength (0x%X).\n", Adapter->NdisMiniportBlock.CurrentLookahead)); - - if (Adapter->NdisMiniportBlock.MaximumLookahead != 0) - { - Adapter->LookaheadLength = Adapter->NdisMiniportBlock.MaximumLookahead + Adapter->MediumHeaderSize; - Adapter->LookaheadBuffer = ExAllocatePool(NonPagedPool, Adapter->LookaheadLength); - - if (!Adapter->LookaheadBuffer) - return NDIS_STATUS_RESOURCES; - } return STATUS_SUCCESS; } @@ -1721,12 +1686,6 @@ if (NdisStatus != NDIS_STATUS_SUCCESS) { NDIS_DbgPrint(MAX_TRACE, ("couldn't create filter (%x)\n", NdisStatus)); - if (Adapter->LookaheadBuffer) - { - ExFreePool(Adapter->LookaheadBuffer); - Adapter->LookaheadBuffer = NULL; - } - ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); return NdisStatus; } @@ -1764,27 +1723,17 @@ */ { PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)DeviceObject->DeviceExtension; - KIRQL OldIrql; /* Remove adapter from adapter list for this miniport */ - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.DriverHandle->Lock, &OldIrql); - RemoveEntryList(&Adapter->MiniportListEntry); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.DriverHandle->Lock, OldIrql); + ExInterlockedRemoveEntryList(&Adapter->MiniportListEntry, &Adapter->NdisMiniportBlock.DriverHandle->Lock); /* Remove adapter from global adapter list */ - KeAcquireSpinLock(&AdapterListLock, &OldIrql); - RemoveEntryList(&Adapter->ListEntry); - KeReleaseSpinLock(&AdapterListLock, OldIrql); + ExInterlockedRemoveEntryList(&Adapter->ListEntry, &AdapterListLock); KeCancelTimer(&Adapter->NdisMiniportBlock.WakeUpDpcTimer.Timer); (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.HaltHandler)(Adapter); - if (Adapter->LookaheadBuffer) - { - ExFreePool(Adapter->LookaheadBuffer); - Adapter->LookaheadBuffer = NULL; - } if (Adapter->NdisMiniportBlock.AllocatedResources) { ExFreePool(Adapter->NdisMiniportBlock.AllocatedResources); @@ -2188,29 +2137,6 @@ IN UINT BytesTransferred) { MiniTransferDataComplete(MiniportAdapterHandle, Packet, Status, BytesTransferred); -} - - -/* - * @implemented - */ -#undef NdisMSetInformationComplete -VOID -EXPORT -NdisMSetInformationComplete( - IN NDIS_HANDLE MiniportAdapterHandle, - IN NDIS_STATUS Status) -{ - PLOGICAL_ADAPTER Adapter = - (PLOGICAL_ADAPTER)MiniportAdapterHandle; - KIRQL OldIrql; - ASSERT(Adapter); - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - (Adapter->NdisMiniportBlock.SetCompleteHandler)(MiniportAdapterHandle, Status); - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); - Adapter->MiniportBusy = FALSE; - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); - KeLowerIrql(OldIrql); } @@ -2385,6 +2311,7 @@ ExFreePool(Miniport->RegistryPath->Buffer); ExFreePool(Miniport->RegistryPath); + ExInterlockedRemoveEntryList(&Miniport->ListEntry, &MiniportListLock); ExFreePool(Miniport); } Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Sat Nov 22 11:02:56 2008 @@ -20,6 +20,8 @@ LIST_ENTRY ProtocolListHead; KSPIN_LOCK ProtocolListLock; +#define WORKER_TEST 0 + /* * @implemented @@ -68,6 +70,7 @@ UINT BufferedLength; UINT PacketLength; KIRQL OldIrql; + PUCHAR LookaheadBuffer; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); @@ -75,36 +78,34 @@ MiniDisplayPacket(Packet); #endif + LookaheadBuffer = ExAllocatePool(NonPagedPool, Adapter->NdisMiniportBlock.CurrentLookahead + Adapter->MediumHeaderSize); + if (!LookaheadBuffer) + return NDIS_STATUS_RESOURCES; + NdisQueryPacket(Packet, NULL, NULL, NULL, &PacketLength); NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n")); KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); { - Adapter->NdisMiniportBlock.IndicatedPacket[KeGetCurrentProcessorNumber()] = Packet; - BufferedLength = CopyPacketToBuffer(Adapter->LookaheadBuffer, Packet, 0, Adapter->NdisMiniportBlock.CurrentLookahead); + BufferedLength = CopyPacketToBuffer(LookaheadBuffer, Packet, 0, Adapter->NdisMiniportBlock.CurrentLookahead); } KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); if (BufferedLength > Adapter->MediumHeaderSize) { /* XXX Change this to call SendPackets so we don't have to duplicate this wacky logic */ - MiniIndicateData(Adapter, NULL, Adapter->LookaheadBuffer, Adapter->MediumHeaderSize, - &Adapter->LookaheadBuffer[Adapter->MediumHeaderSize], BufferedLength - Adapter->MediumHeaderSize, + MiniIndicateData(Adapter, NULL, LookaheadBuffer, Adapter->MediumHeaderSize, + &LookaheadBuffer[Adapter->MediumHeaderSize], BufferedLength - Adapter->MediumHeaderSize, PacketLength - Adapter->MediumHeaderSize); } else { - MiniIndicateData(Adapter, NULL, Adapter->LookaheadBuffer, Adapter->MediumHeaderSize, NULL, 0, 0); - } - - NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n")); - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); - { - Adapter->NdisMiniportBlock.IndicatedPacket[KeGetCurrentProcessorNumber()] = NULL; - } - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); - - return STATUS_SUCCESS; + MiniIndicateData(Adapter, NULL, LookaheadBuffer, Adapter->MediumHeaderSize, NULL, 0, 0); + } + + ExFreePool(LookaheadBuffer); + + return NDIS_STATUS_SUCCESS; } @@ -121,7 +122,6 @@ * Status of operation */ { - KIRQL OldIrql; PADAPTER_BINDING AdapterBinding; PLOGICAL_ADAPTER Adapter; PNDIS_REQUEST_MAC_BLOCK MacBlock = (PNDIS_REQUEST_MAC_BLOCK)NdisRequest->MacReserved; @@ -136,21 +136,12 @@ MacBlock->Binding = &AdapterBinding->NdisOpenBlock; - /* - * If the miniport is already busy, queue a workitem - */ - NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n")); - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); - { - if (Adapter->MiniportBusy) { - MiniQueueWorkItem(Adapter, NdisWorkItemRequest, (PVOID)NdisRequest); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); - return NDIS_STATUS_PENDING; - } - } - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); - +#if WORKER_TEST + MiniQueueWorkItem(Adapter, NdisWorkItemRequest, NdisRequest, FALSE); + return NDIS_STATUS_PENDING; +#else return MiniDoRequest(Adapter, NdisRequest); +#endif } @@ -161,6 +152,74 @@ UNIMPLEMENTED return NDIS_STATUS_FAILURE; +} + +NDIS_STATUS +proSendPacketToMiniport(PLOGICAL_ADAPTER Adapter, PNDIS_PACKET Packet) +{ +#if WORKER_TEST + MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet, FALSE); + return NDIS_STATUS_PENDING; +#else + KIRQL RaiseOldIrql; + NDIS_STATUS NdisStatus; + + if(Adapter->NdisMiniportBlock.FirstPendingPacket) { + MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet, FALSE); + return NDIS_STATUS_PENDING; + } + + if(Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler) + { + if(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_DESERIALIZE) + { + NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's SendPackets handler\n")); + (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext, &Packet, 1); + NdisStatus = NDIS_GET_PACKET_STATUS(Packet); + } else { + /* SendPackets is called at DISPATCH_LEVEL for all serialized miniports */ + KeRaiseIrql(DISPATCH_LEVEL, &RaiseOldIrql); + { + NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's SendPackets handler\n")); + (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext, &Packet, 1); + } + KeLowerIrql(RaiseOldIrql); + + NdisStatus = NDIS_GET_PACKET_STATUS(Packet); + if (NdisStatus == NDIS_STATUS_RESOURCES) { + MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet, TRUE); + NdisStatus = NDIS_STATUS_PENDING; + } + } + + return NdisStatus; + } else { + if(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_DESERIALIZE) + { + NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's Send handler\n")); + NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext, Packet, 0); + NDIS_DbgPrint(MAX_TRACE, ("back from miniport's send handler\n")); + } else { + /* Send is called at DISPATCH_LEVEL for all serialized miniports */ + KeRaiseIrql(DISPATCH_LEVEL, &RaiseOldIrql); + NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's Send handler\n")); + NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext, Packet, 0); + NDIS_DbgPrint(MAX_TRACE, ("back from miniport's send handler\n")); + KeLowerIrql(RaiseOldIrql); + + if (NdisStatus == NDIS_STATUS_RESOURCES) { + MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet, TRUE); + NdisStatus = NDIS_STATUS_PENDING; + } + } + + return NdisStatus; + } +#endif } @@ -176,15 +235,10 @@ * RETURNS: * NDIS_STATUS_SUCCESS if the packet was successfully sent * NDIS_STATUS_PENDING if the miniport was busy or a serialized miniport returned NDIS_STATUS_RESOURCES - * NOTES: - * TODO: - * - Break this up - */ -{ - KIRQL SpinOldIrql, RaiseOldIrql; + */ +{ PADAPTER_BINDING AdapterBinding; PLOGICAL_ADAPTER Adapter; - NDIS_STATUS NdisStatus; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); @@ -210,83 +264,18 @@ * this is a loopback frame. */ - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &SpinOldIrql); - if ((Adapter->NdisMiniportBlock.MacOptions & NDIS_MAC_OPTION_NO_LOOPBACK) && MiniAdapterHasAddress(Adapter, Packet)) { - if(Adapter->MiniportBusy) { - MiniQueueWorkItem(Adapter, NdisWorkItemSendLoopback, Packet); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); - return NDIS_STATUS_PENDING; - } - - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); - +#if WORKER_TEST + MiniQueueWorkItem(Adapter, NdisWorkItemSendLoopback, Packet, FALSE); + return NDIS_STATUS_PENDING; +#else return ProIndicatePacket(Adapter, Packet); +#endif } else { - if(Adapter->MiniportBusy) { - MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); - return NDIS_STATUS_PENDING; - } - - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); - - if(Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler) - { - if(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_DESERIALIZE) - { - NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's SendPackets handler\n")); - (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler)( - Adapter->NdisMiniportBlock.MiniportAdapterContext, &Packet, 1); - NdisStatus = NDIS_GET_PACKET_STATUS(Packet); - } else { - /* SendPackets is called at DISPATCH_LEVEL for all serialized miniports */ - KeRaiseIrql(DISPATCH_LEVEL, &RaiseOldIrql); - { - NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's SendPackets handler\n")); - (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler)( - Adapter->NdisMiniportBlock.MiniportAdapterContext, &Packet, 1); - } - KeLowerIrql(RaiseOldIrql); - - NdisStatus = NDIS_GET_PACKET_STATUS(Packet); - if( NdisStatus == NDIS_STATUS_RESOURCES ) { - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &SpinOldIrql); - MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); - NdisStatus = NDIS_STATUS_PENDING; - } - } - - return NdisStatus; - } else { - if(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_DESERIALIZE) - { - NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's Send handler\n")); - NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendHandler)( - Adapter->NdisMiniportBlock.MiniportAdapterContext, Packet, 0); - NDIS_DbgPrint(MAX_TRACE, ("back from miniport's send handler\n")); - } else { - /* Send is called at DISPATCH_LEVEL for all serialized miniports */ - KeRaiseIrql(DISPATCH_LEVEL, &RaiseOldIrql); - NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's Send handler\n")); - NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendHandler)( - Adapter->NdisMiniportBlock.MiniportAdapterContext, Packet, 0); - NDIS_DbgPrint(MAX_TRACE, ("back from miniport's send handler\n")); - KeLowerIrql(RaiseOldIrql); - if( NdisStatus == NDIS_STATUS_RESOURCES ) { - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &SpinOldIrql); - MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); - NdisStatus = NDIS_STATUS_PENDING; - } - } - - return NdisStatus; - } - } + return proSendPacketToMiniport(Adapter, Packet); + } } @@ -432,21 +421,15 @@ * NdisBindingHandle = Handle returned by NdisOpenAdapter */ { - KIRQL OldIrql; PADAPTER_BINDING AdapterBinding = GET_ADAPTER_BINDING(NdisBindingHandle); NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); /* Remove from protocol's bound adapters list */ - KeAcquireSpinLock(&AdapterBinding->ProtocolBinding->Lock, &OldIrql); - RemoveEntryList(&AdapterBinding->ProtocolListEntry); - KeReleaseSpinLock(&AdapterBinding->ProtocolBinding->Lock, OldIrql); + ExInterlockedRemoveEntryList(&AdapterBinding->ProtocolListEntry, &AdapterBinding->ProtocolBinding->Lock); /* Remove protocol from adapter's bound protocols list */ - NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n")); - KeAcquireSpinLock(&AdapterBinding->Adapter->NdisMiniportBlock.Lock, &OldIrql); - RemoveEntryList(&AdapterBinding->AdapterListEntry); - KeReleaseSpinLock(&AdapterBinding->Adapter->NdisMiniportBlock.Lock, OldIrql); + ExInterlockedRemoveEntryList(&AdapterBinding->AdapterListEntry, &AdapterBinding->Adapter->NdisMiniportBlock.Lock); ExFreePool(AdapterBinding); @@ -469,7 +452,6 @@ * NdisProtocolHandle = Handle returned by NdisRegisterProtocol */ { - KIRQL OldIrql; PPROTOCOL_BINDING Protocol = GET_PROTOCOL_BINDING(NdisProtocolHandle); NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); @@ -477,9 +459,7 @@ /* FIXME: Make sure no adapter bindings exist */ /* Remove protocol from global list */ - KeAcquireSpinLock(&ProtocolListLock, &OldIrql); - RemoveEntryList(&Protocol->ListEntry); - KeReleaseSpinLock(&ProtocolListLock, OldIrql); + ExInterlockedRemoveEntryList(&Protocol->ListEntry, &ProtocolListLock); ExFreePool(Protocol); @@ -592,14 +572,9 @@ AdapterBinding->NdisOpenBlock.RequestCompleteHandler = Protocol->Chars.RequestCompleteHandler; -#if 0 - /* XXX this looks fishy */ - /* OK, this really *is* fishy - it bugchecks */ /* Put on protocol's bound adapters list */ ExInterlockedInsertTailList(&Protocol->AdapterListHead, &AdapterBinding->ProtocolListEntry, &Protocol->Lock); -#endif - - /* XXX so does this */ + /* Put protocol on adapter's bound protocols list */ NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n")); ExInterlockedInsertTailList(&Adapter->ProtocolListHead, &AdapterBinding->AdapterListEntry, &Adapter->NdisMiniportBlock.Lock); @@ -609,6 +584,152 @@ *Status = NDIS_STATUS_SUCCESS; } +VOID +NTAPI +ndisBindMiniportsToProtocol(OUT PNDIS_STATUS Status, IN PNDIS_PROTOCOL_CHARACTERISTICS ProtocolCharacteristics) +{ + /* + * bind the protocol to all of its miniports + * + * open registry path + * get list of devices from Bind key + * call BindAdapterHandler for each + */ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING RegistryPath; + WCHAR *RegistryPathStr; + NTSTATUS NtStatus; + WCHAR *DataPtr; + HANDLE DriverKeyHandle = NULL; + PKEY_VALUE_PARTIAL_INFORMATION KeyInformation = NULL; + + RegistryPathStr = ExAllocatePoolWithTag(PagedPool, sizeof(SERVICES_KEY) + ProtocolCharacteristics->Name.Length + sizeof(LINKAGE_KEY), NDIS_TAG + __LINE__); + if(!RegistryPathStr) + { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + *Status = NDIS_STATUS_RESOURCES; + return; + } + + wcscpy(RegistryPathStr, SERVICES_KEY); + wcsncat(RegistryPathStr, ((WCHAR *)ProtocolCharacteristics->Name.Buffer), ProtocolCharacteristics->Name.Length / sizeof(WCHAR)); + RegistryPathStr[wcslen(SERVICES_KEY)+ProtocolCharacteristics->Name.Length/sizeof(WCHAR)] = 0; + wcscat(RegistryPathStr, LINKAGE_KEY); + + RtlInitUnicodeString(&RegistryPath, RegistryPathStr); + NDIS_DbgPrint(MAX_TRACE, ("Opening configuration key: %wZ\n", &RegistryPath)); + + InitializeObjectAttributes(&ObjectAttributes, &RegistryPath, OBJ_CASE_INSENSITIVE, NULL, NULL); + NtStatus = ZwOpenKey(&DriverKeyHandle, KEY_READ, &ObjectAttributes); + + ExFreePool(RegistryPathStr); + + if(!NT_SUCCESS(NtStatus)) + { + NDIS_DbgPrint(MIN_TRACE, ("Unable to open protocol configuration\n")); + *Status = NDIS_STATUS_FAILURE; + return; + } + + NDIS_DbgPrint(MAX_TRACE, ("Successfully opened the registry configuration\n")); + + { + UNICODE_STRING ValueName; + ULONG ResultLength; + + RtlInitUnicodeString(&ValueName, L"Bind"); + + NtStatus = ZwQueryValueKey(DriverKeyHandle, &ValueName, KeyValuePartialInformation, NULL, 0, &ResultLength); + if(NtStatus != STATUS_BUFFER_OVERFLOW && NtStatus != STATUS_BUFFER_TOO_SMALL && NtStatus != STATUS_SUCCESS) + { + NDIS_DbgPrint(MIN_TRACE, ("Unable to query the Bind value for size\n")); + ZwClose(DriverKeyHandle); + *Status = NDIS_STATUS_FAILURE; + return; + } + + KeyInformation = ExAllocatePoolWithTag(PagedPool, sizeof(KEY_VALUE_PARTIAL_INFORMATION) + ResultLength, NDIS_TAG + __LINE__); + if(!KeyInformation) + { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + ZwClose(DriverKeyHandle); + *Status = NDIS_STATUS_FAILURE; + return; + } + + NtStatus = ZwQueryValueKey(DriverKeyHandle, &ValueName, KeyValuePartialInformation, KeyInformation, + sizeof(KEY_VALUE_PARTIAL_INFORMATION) + ResultLength, &ResultLength); + + ZwClose(DriverKeyHandle); + + if(!NT_SUCCESS(NtStatus)) + { + NDIS_DbgPrint(MIN_TRACE, ("Unable to query the Bind value\n")); + ExFreePool(KeyInformation); + *Status = NDIS_STATUS_FAILURE; + return; + } + } + + for (DataPtr = (WCHAR *)KeyInformation->Data; + *DataPtr != 0; + DataPtr += wcslen(DataPtr) + 1) + { + /* BindContext is for tracking pending binding operations */ + VOID *BindContext = 0; + NDIS_STRING DeviceName; + NDIS_STRING RegistryPath; + WCHAR *RegistryPathStr = NULL; + ULONG PathLength = 0; + + RtlInitUnicodeString(&DeviceName, DataPtr); /* we know this is 0-term */ + + /* + * RegistryPath should be: + * \Registry\Machine\System\CurrentControlSet\Services\Nic1\Parameters\Tcpip + * + * This is constructed as follows: + * SERVICES_KEY + extracted device name + Protocol name from characteristics + */ + + PathLength = sizeof(SERVICES_KEY) + /* \Registry\Machine\System\CurrentControlSet\Services\ */ + wcslen( DataPtr + 8 ) * sizeof(WCHAR) + /* Adapter1 (extracted from \Device\Adapter1) */ + sizeof(PARAMETERS_KEY) + /* \Parameters\ */ + ProtocolCharacteristics->Name.Length + sizeof(WCHAR); /* Tcpip */ + + RegistryPathStr = ExAllocatePool(PagedPool, PathLength); + if(!RegistryPathStr) + { + NDIS_DbgPrint(MIN_TRACE, ("insufficient resources.\n")); + ExFreePool(KeyInformation); + *Status = NDIS_STATUS_RESOURCES; + return; + } + + wcscpy(RegistryPathStr, SERVICES_KEY); + wcscat(RegistryPathStr, DataPtr + 8 ); + wcscat(RegistryPathStr, PARAMETERS_KEY); + wcsncat(RegistryPathStr, ProtocolCharacteristics->Name.Buffer, ProtocolCharacteristics->Name.Length / sizeof(WCHAR) ); + + RegistryPathStr[PathLength/sizeof(WCHAR) - 1] = 0; + + RtlInitUnicodeString(&RegistryPath, RegistryPathStr); + + NDIS_DbgPrint(MAX_TRACE, ("Calling protocol's BindAdapter handler with DeviceName %wZ and RegistryPath %wZ\n", + &DeviceName, &RegistryPath)); + + { + BIND_HANDLER BindHandler = ProtocolCharacteristics->BindAdapterHandler; + if(BindHandler) + BindHandler(Status, BindContext, &DeviceName, &RegistryPath, 0); + else + NDIS_DbgPrint(MID_TRACE, ("No protocol bind handler specified\n")); + } + } + + *Status = NDIS_STATUS_SUCCESS; + ExFreePool(KeyInformation); +} /* * @implemented @@ -640,9 +761,6 @@ PPROTOCOL_BINDING Protocol; NTSTATUS NtStatus; UINT MinSize; - HANDLE DriverKeyHandle = NULL; - PKEY_VALUE_PARTIAL_INFORMATION KeyInformation = NULL; - WCHAR *DataPtr; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); @@ -703,172 +821,19 @@ InitializeListHead(&Protocol->AdapterListHead); - /* - * bind the protocol to all of its miniports - * - * open registry path - * get list of devices from Bind key - * call BindAdapterHandler for each - */ - { - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING RegistryPath; - WCHAR *RegistryPathStr; - - RegistryPathStr = ExAllocatePoolWithTag(PagedPool, sizeof(SERVICES_KEY) + ProtocolCharacteristics->Name.Length + sizeof(LINKAGE_KEY), NDIS_TAG + __LINE__); - if(!RegistryPathStr) - { - NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - ExFreePool(Protocol); - *Status = NDIS_STATUS_RESOURCES; - return; - } - - wcscpy(RegistryPathStr, SERVICES_KEY); - wcsncat(RegistryPathStr, ((WCHAR *)ProtocolCharacteristics->Name.Buffer), ProtocolCharacteristics->Name.Length / sizeof(WCHAR)); - RegistryPathStr[wcslen(SERVICES_KEY)+ProtocolCharacteristics->Name.Length/sizeof(WCHAR)] = 0; - wcscat(RegistryPathStr, LINKAGE_KEY); - - RtlInitUnicodeString(&RegistryPath, RegistryPathStr); - NDIS_DbgPrint(MAX_TRACE, ("Opening configuration key: %wZ\n", &RegistryPath)); - - InitializeObjectAttributes(&ObjectAttributes, &RegistryPath, OBJ_CASE_INSENSITIVE, NULL, NULL); - NtStatus = ZwOpenKey(&DriverKeyHandle, KEY_READ, &ObjectAttributes); - - ExFreePool(RegistryPathStr); - - if(!NT_SUCCESS(NtStatus)) - { - NDIS_DbgPrint(MIN_TRACE, ("Unable to open protocol configuration\n")); - ExFreePool(Protocol); - *Status = NDIS_STATUS_FAILURE; - return; - } + /* We must set this before the call to ndisBindMiniportsToProtocol because the protocol's + * BindAdapter handler might need it */ + + *NdisProtocolHandle = Protocol; + + ndisBindMiniportsToProtocol(Status, &Protocol->Chars); + + if (*Status == NDIS_STATUS_SUCCESS) { + ExInterlockedInsertTailList(&ProtocolListHead, &Protocol->ListEntry, &ProtocolListLock); + } else { + ExFreePool(Protocol); + *NdisProtocolHandle = NULL; } - - NDIS_DbgPrint(MAX_TRACE, ("Successfully opened the registry configuration\n")); - - { - UNICODE_STRING ValueName; - ULONG ResultLength; - - RtlInitUnicodeString(&ValueName, L"Bind"); - - NtStatus = ZwQueryValueKey(DriverKeyHandle, &ValueName, KeyValuePartialInformation, NULL, 0, &ResultLength); - if(NtStatus != STATUS_BUFFER_OVERFLOW && NtStatus != STATUS_BUFFER_TOO_SMALL && NtStatus != STATUS_SUCCESS) - { - NDIS_DbgPrint(MIN_TRACE, ("Unable to query the Bind value for size\n")); - ZwClose(DriverKeyHandle); - ExFreePool(Protocol); - *Status = NDIS_STATUS_FAILURE; - return; - } - - KeyInformation = ExAllocatePoolWithTag(PagedPool, sizeof(KEY_VALUE_PARTIAL_INFORMATION) + ResultLength, NDIS_TAG + __LINE__); - if(!KeyInformation) - { - NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - ZwClose(DriverKeyHandle); - ExFreePool(Protocol); - *Status = NDIS_STATUS_FAILURE; - return; - } - - NtStatus = ZwQueryValueKey(DriverKeyHandle, &ValueName, KeyValuePartialInformation, KeyInformation, - sizeof(KEY_VALUE_PARTIAL_INFORMATION) + ResultLength, &ResultLength); - - ZwClose(DriverKeyHandle); - - if(!NT_SUCCESS(NtStatus)) - { - NDIS_DbgPrint(MIN_TRACE, ("Unable to query the Bind value\n")); - ExFreePool(KeyInformation); - ExFreePool(Protocol); - *Status = NDIS_STATUS_FAILURE; - return; - } - } - - for (DataPtr = (WCHAR *)KeyInformation->Data; - *DataPtr != 0; - DataPtr += wcslen(DataPtr) + 1) - { - /* BindContext is for tracking pending binding operations */ - VOID *BindContext = 0; - NDIS_STRING DeviceName; - NDIS_STRING RegistryPath; - WCHAR *RegistryPathStr = NULL; - ULONG PathLength = 0; - - RtlInitUnicodeString(&DeviceName, DataPtr); /* we know this is 0-term */ - - /* - * RegistryPath should be: - * \Registry\Machine\System\CurrentControlSet\Services\Nic1\Parameters\Tcpip - * - * This is constructed as follows: - * SERVICES_KEY + extracted device name + Protocol name from characteristics - */ - - PathLength = sizeof(SERVICES_KEY) + /* \Registry\Machine\System\CurrentControlSet\Services\ */ - wcslen( DataPtr + 8 ) * sizeof(WCHAR) + /* Adapter1 (extracted from \Device\Adapter1) */ - sizeof(PARAMETERS_KEY) + /* \Parameters\ */ - ProtocolCharacteristics->Name.Length + sizeof(WCHAR); /* Tcpip */ - - RegistryPathStr = ExAllocatePool(PagedPool, PathLength); - if(!RegistryPathStr) - { - NDIS_DbgPrint(MIN_TRACE, ("insufficient resources.\n")); - ExFreePool(KeyInformation); - ExFreePool(Protocol); - *Status = NDIS_STATUS_RESOURCES; - return; - } - - wcscpy(RegistryPathStr, SERVICES_KEY); - wcscat(RegistryPathStr, DataPtr + 8 ); - wcscat(RegistryPathStr, PARAMETERS_KEY); - wcsncat(RegistryPathStr, ProtocolCharacteristics->Name.Buffer, ProtocolCharacteristics->Name.Length / sizeof(WCHAR) ); - - RegistryPathStr[PathLength/sizeof(WCHAR) - 1] = 0; - - RtlInitUnicodeString(&RegistryPath, RegistryPathStr); - - NDIS_DbgPrint(MAX_TRACE, ("Calling protocol's BindAdapter handler with DeviceName %wZ and RegistryPath %wZ\n", - &DeviceName, &RegistryPath)); - - /* XXX SD must do something with bind context */ - *NdisProtocolHandle = Protocol; - - { - BIND_HANDLER BindHandler = ProtocolCharacteristics->BindAdapterHandler; - if(BindHandler) - BindHandler(Status, BindContext, &DeviceName, &RegistryPath, 0); - else - NDIS_DbgPrint(MID_TRACE, ("No protocol bind handler specified\n")); - } - - /* - (*(Protocol->Chars.BindAdapterHandler))(Status, BindContext, &DeviceName, &RegistryPath, 0); - */ - - if(*Status == NDIS_STATUS_SUCCESS) - { - /* Put protocol binding struct on global list */ - ExInterlockedInsertTailList(&ProtocolListHead, &Protocol->ListEntry, &ProtocolListLock); - } - else if(*Status != NDIS_STATUS_PENDING) - { - NDIS_DbgPrint(MIN_TRACE, ("ProtocolBindAdapter failed with status 0x%x\n", *Status)); - ExFreePool(Protocol); - ExFreePool(KeyInformation); - *NdisProtocolHandle = NULL; - return; - } - } - - ExFreePool(KeyInformation); - *Status = NDIS_STATUS_SUCCESS; } @@ -977,4 +942,17 @@ BytesTransferred); } +/* + * @implemented + */ +VOID +NTAPI +NdisReEnumerateProtocolBindings(IN NDIS_HANDLE NdisProtocolHandle) +{ + PPROTOCOL_BINDING Protocol = NdisProtocolHandle; + NDIS_STATUS NdisStatus; + + ndisBindMiniportsToProtocol(&NdisStatus, &Protocol->Chars); +} + /* EOF */ Modified: trunk/reactos/drivers/network/ndis/ndis/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/stubs.c [iso-8859-1] Sat Nov 22 11:02:56 2008 @@ -1063,13 +1063,3 @@ ExQueueWorkItem(pntWorkItem, CriticalWorkQueue); return NDIS_STATUS_SUCCESS; } - -/* - * @unimplemented - */ -VOID -NTAPI -NdisReEnumerateProtocolBindings(IN NDIS_HANDLE NdisProtocolHandle) -{ - UNIMPLEMENTED; -} Modified: trunk/reactos/lib/drivers/ip/network/loopback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/loo… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/loopback.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/loopback.c [iso-8859-1] Sat Nov 22 11:02:56 2008 @@ -22,7 +22,6 @@ KSPIN_LOCK LoopWorkLock; LIST_ENTRY LoopWorkList; WORK_QUEUE_ITEM LoopWorkItem; -BOOLEAN LoopReceiveWorkerBusy = FALSE; VOID STDCALL LoopReceiveWorker( PVOID Context ) { PLIST_ENTRY ListEntry; @@ -35,46 +34,43 @@ TI_DbgPrint(DEBUG_DATALINK, ("Called.\n")); - while( (ListEntry = - ExInterlockedRemoveHeadList( &LoopWorkList, &LoopWorkLock )) ) { - WorkItem = CONTAINING_RECORD(ListEntry, LAN_WQ_ITEM, ListEntry); - - TI_DbgPrint(DEBUG_DATALINK, ("WorkItem: %x\n", WorkItem)); - - Packet = WorkItem->Packet; - Adapter = WorkItem->Adapter; - BytesTransferred = WorkItem->BytesTransferred; - - ExFreePool( WorkItem ); - - IPPacket.NdisPacket = Packet; - - TI_DbgPrint(DEBUG_DATALINK, ("Packet %x Adapter %x Trans %x\n", - Packet, Adapter, BytesTransferred)); - - NdisGetFirstBufferFromPacket(Packet, - &NdisBuffer, - &IPPacket.Header, - &IPPacket.ContigSize, - &IPPacket.TotalSize); - - IPPacket.ContigSize = IPPacket.TotalSize = BytesTransferred; - /* Determine which upper layer protocol that should receive - this packet and pass it to the correct receive handler */ - - TI_DbgPrint(MID_TRACE, - ("ContigSize: %d, TotalSize: %d, BytesTransferred: %d\n", - IPPacket.ContigSize, IPPacket.TotalSize, - BytesTransferred)); - - IPPacket.Position = 0; - - IPReceive(Loopback, &IPPacket); - - FreeNdisPacket( Packet ); - } + ListEntry = ExInterlockedRemoveHeadList( &LoopWorkList, &LoopWorkLock ); + WorkItem = CONTAINING_RECORD(ListEntry, LAN_WQ_ITEM, ListEntry); + + TI_DbgPrint(DEBUG_DATALINK, ("WorkItem: %x\n", WorkItem)); + + Packet = WorkItem->Packet; + Adapter = WorkItem->Adapter; + BytesTransferred = WorkItem->BytesTransferred; + + ExFreePool( WorkItem ); + + IPPacket.NdisPacket = Packet; + + TI_DbgPrint(DEBUG_DATALINK, ("Packet %x Adapter %x Trans %x\n", + Packet, Adapter, BytesTransferred)); + + NdisGetFirstBufferFromPacket(Packet, + &NdisBuffer, + &IPPacket.Header, + &IPPacket.ContigSize, + &IPPacket.TotalSize); + + IPPacket.ContigSize = IPPacket.TotalSize = BytesTransferred; + /* Determine which upper layer protocol that should receive + this packet and pass it to the correct receive handler */ + + TI_DbgPrint(MID_TRACE, + ("ContigSize: %d, TotalSize: %d, BytesTransferred: %d\n", + IPPacket.ContigSize, IPPacket.TotalSize, + BytesTransferred)); + + IPPacket.Position = 0; + + IPReceive(Loopback, &IPPacket); + + FreeNdisPacket( Packet ); TI_DbgPrint(DEBUG_DATALINK, ("Leaving\n")); - LoopReceiveWorkerBusy = FALSE; } VOID LoopSubmitReceiveWork( @@ -84,34 +80,19 @@ UINT BytesTransferred) { PLAN_WQ_ITEM WQItem; PLAN_ADAPTER Adapter = (PLAN_ADAPTER)BindingContext; - KIRQL OldIrql; - - TcpipAcquireSpinLock( &LoopWorkLock, &OldIrql ); WQItem = ExAllocatePool( NonPagedPool, sizeof(LAN_WQ_ITEM) ); - if( !WQItem ) { - TcpipReleaseSpinLock( &LoopWorkLock, OldIrql ); - return; - } + if( !WQItem ) return; WQItem->Packet = Packet; WQItem->Adapter = Adapter; WQItem->BytesTransferred = BytesTransferred; - InsertTailList( &LoopWorkList, &WQItem->ListEntry ); + ExInterlockedInsertTailList( &LoopWorkList, &WQItem->ListEntry, &LoopWorkLock ); TI_DbgPrint(DEBUG_DATALINK, ("Packet %x Adapter %x BytesTrans %x\n", Packet, Adapter, BytesTransferred)); - if( !LoopReceiveWorkerBusy ) { - LoopReceiveWorkerBusy = TRUE; - ExQueueWorkItem( &LoopWorkItem, CriticalWorkQueue ); - TI_DbgPrint(DEBUG_DATALINK, - ("Work item inserted %x %x\n", &LoopWorkItem, WQItem)); - } else { - TI_DbgPrint(DEBUG_DATALINK, - ("LOOP WORKER BUSY %x %x\n", &LoopWorkItem, WQItem)); - } - TcpipReleaseSpinLock( &LoopWorkLock, OldIrql ); + ExQueueWorkItem( &LoopWorkItem, CriticalWorkQueue ); } VOID LoopTransmit( Modified: trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/d… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c [iso-8859-1] Sat Nov 22 11:02:56 2008 @@ -16,9 +16,12 @@ { PLIST_ENTRY ListEntry; PDATAGRAM_RECEIVE_REQUEST ReceiveRequest; + KIRQL OldIrql; TI_DbgPrint(MAX_TRACE, ("Called (Cancel IRP %08x for file %08x).\n", Irp, AddrFile)); + + KeAcquireSpinLock(&AddrFile->Lock, &OldIrql); for( ListEntry = AddrFile->ReceiveQueue.Flink; ListEntry != &AddrFile->ReceiveQueue; @@ -36,6 +39,8 @@ break; } } + + KeReleaseSpinLock(&AddrFile->Lock, OldIrql); TI_DbgPrint(MAX_TRACE, ("Done.\n")); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs