Ros-diffs June 2016

ros-diffs@reactos.org

17 participants
228 discussions

[hbelusca] 71597: Well no need to initialize "Ret" if we overwrite immediately its old value.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jun 8 23:08:59 2016 New Revision: 71597 URL: http://svn.reactos.org/svn/reactos?rev=71597&view=rev Log: Well no need to initialize "Ret" if we overwrite immediately its old value. Modified: trunk/reactos/win32ss/gdi/ntgdi/coord.c Modified: trunk/reactos/win32ss/gdi/ntgdi/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/coord.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/coord.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/coord.c [iso-8859-1] Wed Jun 8 23:08:59 2016 @@ -1359,7 +1359,7 @@ UINT iPoint, PPOINTL Point) { - BOOL Ret = TRUE; + BOOL Ret; POINTL SafePoint; if (!Point)

8 years, 3 months

[hbelusca] 71596: [WIN32K:NTGDI]: Remove redundant code.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jun 8 23:07:32 2016 New Revision: 71596 URL: http://svn.reactos.org/svn/reactos?rev=71596&view=rev Log: [WIN32K:NTGDI]: Remove redundant code. Modified: trunk/reactos/win32ss/gdi/ntgdi/coord.c Modified: trunk/reactos/win32ss/gdi/ntgdi/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/coord.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/coord.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/coord.c [iso-8859-1] Wed Jun 8 23:07:32 2016 @@ -1341,7 +1341,7 @@ _In_ HDC hdc, _Out_ LPSIZE lpSize) { - return GreGetDCPoint(hdc, GdiGetWindowExt, (PPOINTL)lpSize); + return GreGetDCPoint(hdc, GdiGetWindowExt, (PPOINTL)lpSize); } BOOL @@ -1350,7 +1350,7 @@ _In_ HDC hdc, _Out_ LPSIZE lpSize) { - return GreGetDCPoint(hdc, GdiGetViewPortExt, (PPOINTL)lpSize); + return GreGetDCPoint(hdc, GdiGetViewPortExt, (PPOINTL)lpSize); } BOOL APIENTRY @@ -1360,10 +1360,7 @@ PPOINTL Point) { BOOL Ret = TRUE; - DC *pdc; POINTL SafePoint; - SIZE Size; - PSIZEL pszlViewportExt; if (!Point) { @@ -1371,50 +1368,7 @@ return FALSE; } - pdc = DC_LockDc(hDC); - if (!pdc) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - switch (iPoint) - { - case GdiGetViewPortExt: - pszlViewportExt = DC_pszlViewportExt(pdc); - SafePoint.x = pszlViewportExt->cx; - SafePoint.y = pszlViewportExt->cy; - break; - - case GdiGetWindowExt: - SafePoint.x = pdc->pdcattr->szlWindowExt.cx; - SafePoint.y = pdc->pdcattr->szlWindowExt.cy; - break; - - case GdiGetViewPortOrg: - SafePoint = pdc->pdcattr->ptlViewportOrg; - break; - - case GdiGetWindowOrg: - SafePoint = pdc->pdcattr->ptlWindowOrg; - break; - - case GdiGetDCOrg: - SafePoint = pdc->ptlDCOrig; - break; - - case GdiGetAspectRatioFilter: - DC_vGetAspectRatioFilter(pdc, &Size); - SafePoint.x = Size.cx; - SafePoint.y = Size.cy; - break; - - default: - EngSetLastError(ERROR_INVALID_PARAMETER); - Ret = FALSE; - break; - } - + Ret = GreGetDCPoint(hDC, iPoint, &SafePoint); if (Ret) { _SEH2_TRY @@ -1429,7 +1383,6 @@ _SEH2_END; } - DC_UnlockDc(pdc); return Ret; }

8 years, 3 months

[hbelusca] 71595: [SHELL32]: Run dialog box: FillList was ANSI, now it's UNICODE! Partly rewrite Wine code.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jun 8 21:53:34 2016 New Revision: 71595 URL: http://svn.reactos.org/svn/reactos?rev=71595&view=rev Log: [SHELL32]: Run dialog box: FillList was ANSI, now it's UNICODE! Partly rewrite Wine code. Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] Wed Jun 8 21:53:34 2016 @@ -33,8 +33,8 @@ typedef BOOL (WINAPI * LPFNOFN) (OPENFILENAMEW *) ; WINE_DEFAULT_DEBUG_CHANNEL(shell); -static INT_PTR CALLBACK RunDlgProc (HWND, UINT, WPARAM, LPARAM) ; -static void FillList (HWND, char *, BOOL) ; +static INT_PTR CALLBACK RunDlgProc(HWND, UINT, WPARAM, LPARAM); +static void FillList(HWND, LPWSTR, BOOL); /************************************************************************* @@ -393,26 +393,26 @@ // SendMessageW(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)prfdp->hIcon); SendMessageW(GetDlgItem(hwnd, IDC_RUNDLG_ICON), STM_SETICON, (WPARAM)prfdp->hIcon, 0); - FillList (GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH), NULL, (prfdp->uFlags & RFF_NODEFAULT) == 0); + FillList(GetDlgItem(hwnd, IDC_RUNDLG_EDITPATH), NULL, (prfdp->uFlags & RFF_NODEFAULT) == 0); EnableOkButtonFromEditContents(hwnd); - SetFocus (GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH)); + SetFocus(GetDlgItem(hwnd, IDC_RUNDLG_EDITPATH)); return TRUE; case WM_COMMAND: - switch (LOWORD (wParam)) + switch (LOWORD(wParam)) { case IDOK: { int ic; - HWND htxt = GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH); - if ((ic = GetWindowTextLengthW (htxt))) + HWND htxt = GetDlgItem(hwnd, IDC_RUNDLG_EDITPATH); + if ((ic = GetWindowTextLengthW(htxt))) { WCHAR *psz, *parent = NULL; SHELLEXECUTEINFOW sei; - ZeroMemory (&sei, sizeof(sei)); + ZeroMemory(&sei, sizeof(sei)); sei.cbSize = sizeof(sei); - psz = (WCHAR *)HeapAlloc(GetProcessHeap(), 0, (ic + 1)*sizeof(WCHAR)); + psz = (WCHAR*)HeapAlloc(GetProcessHeap(), 0, (ic + 1)*sizeof(WCHAR)); if (psz) { @@ -438,19 +438,18 @@ return TRUE; } - /* FillList is still ANSI */ - GetWindowTextA (htxt, (LPSTR)psz, ic + 1); - FillList (htxt, (LPSTR)psz, FALSE); + GetWindowTextW(htxt, psz, ic + 1); + FillList(htxt, psz, FALSE); HeapFree(GetProcessHeap(), 0, psz); HeapFree(GetProcessHeap(), 0, parent); - EndDialog (hwnd, 0); + EndDialog(hwnd, 0); } } } case IDCANCEL: - EndDialog (hwnd, 0); + EndDialog(hwnd, 0); return TRUE; case IDC_RUNDLG_BROWSE: @@ -466,17 +465,17 @@ LoadStringW(shell32_hInstance, IDS_RUNDLG_BROWSE_CAPTION, szCaption, MAX_PATH); ZeroMemory(&ofn, sizeof(ofn)); - ofn.lStructSize = sizeof(OPENFILENAMEW); + ofn.lStructSize = sizeof(ofn); ofn.hwndOwner = hwnd; ofn.lpstrFilter = filter; ofn.lpstrFile = szFName; - ofn.nMaxFile = 1023; + ofn.nMaxFile = _countof(szFName) - 1; ofn.lpstrTitle = szCaption; ofn.Flags = OFN_ENABLESIZING | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST; ofn.lpstrInitialDir = prfdp->lpstrDirectory; - if (NULL == (hComdlg = LoadLibraryExW (comdlg32W, NULL, 0)) || - NULL == (ofnProc = (LPFNOFN)GetProcAddress (hComdlg, "GetOpenFileNameW"))) + if (NULL == (hComdlg = LoadLibraryExW(comdlg32W, NULL, 0)) || + NULL == (ofnProc = (LPFNOFN)GetProcAddress(hComdlg, "GetOpenFileNameW"))) { ERR("Couldn't get GetOpenFileName function entry (lib=%p, proc=%p)\n", hComdlg, ofnProc); ShellMessageBoxW(shell32_hInstance, hwnd, MAKEINTRESOURCEW(IDS_RUNDLG_BROWSE_ERROR), NULL, MB_OK | MB_ICONERROR); @@ -485,14 +484,14 @@ if (ofnProc(&ofn)) { - SetFocus(GetDlgItem (hwnd, IDOK)); - SetWindowTextW(GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH), szFName); - SendMessageW(GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH), CB_SETEDITSEL, 0, MAKELPARAM (0, -1)); + SetFocus(GetDlgItem(hwnd, IDOK)); + SetWindowTextW(GetDlgItem(hwnd, IDC_RUNDLG_EDITPATH), szFName); + SendMessageW(GetDlgItem(hwnd, IDC_RUNDLG_EDITPATH), CB_SETEDITSEL, 0, MAKELPARAM(0, -1)); EnableOkButtonFromEditContents(hwnd); - SetFocus (GetDlgItem (hwnd, IDOK)); + SetFocus(GetDlgItem(hwnd, IDOK)); } - FreeLibrary (hComdlg); + FreeLibrary(hComdlg); return TRUE; } @@ -510,145 +509,207 @@ return FALSE; } -/* This grabs the MRU list from the registry and fills the combo for the "Run" dialog above */ -/* fShowDefault ignored if pszLatest != NULL */ -static void FillList(HWND hCb, char *pszLatest, BOOL fShowDefault) -{ - HKEY hkey ; -/* char szDbgMsg[256] = "" ; */ - char *pszList = NULL, *pszCmd = NULL, cMatch = 0, cMax = 0x60, szIndex[2] = "-" ; - DWORD icList = 0, icCmd = 0 ; - UINT Nix ; - - SendMessageA (hCb, CB_RESETCONTENT, 0, 0) ; - - if (ERROR_SUCCESS != RegCreateKeyExA ( - HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\RunMRU", - 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL)) - MessageBoxA (hCb, "Unable to open registry key !", "Nix", MB_OK) ; - - RegQueryValueExA (hkey, "MRUList", NULL, NULL, NULL, &icList) ; - - if (icList > 0) - { - pszList = (char *)HeapAlloc( GetProcessHeap(), 0, icList) ; +/* + * This function grabs the MRU list from the registry and fills the combo-list + * for the "Run" dialog above. fShowDefault is ignored if pszLatest != NULL. + */ +static void FillList(HWND hCb, LPWSTR pszLatest, BOOL fShowDefault) +{ + HKEY hkey; + WCHAR *pszList = NULL, *pszCmd = NULL, *pszTmp = NULL, cMatch = 0, cMax = 0x60; + WCHAR szIndex[2] = L"-"; + DWORD dwType, icList = 0, icCmd = 0; + LRESULT lRet; + UINT Nix; + + SendMessageW(hCb, CB_RESETCONTENT, 0, 0); + + lRet = RegCreateKeyExW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\RunMRU", + 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL); + if (lRet != ERROR_SUCCESS) + { + TRACE("Unable to open or create the RunMRU key, error %d\n", GetLastError()); + return; + } + + lRet = RegQueryValueExW(hkey, L"MRUList", NULL, &dwType, NULL, &icList); + if (lRet == ERROR_SUCCESS && dwType == REG_SZ && icList > sizeof(WCHAR)) + { + pszList = (WCHAR*)HeapAlloc(GetProcessHeap(), 0, icList); + if (!pszList) + { + TRACE("HeapAlloc failed to allocate %d bytes\n", icList); + goto Continue; + } + pszList[0] = L'\0'; + + lRet = RegQueryValueExW(hkey, L"MRUList", NULL, NULL, (LPBYTE)pszList, &icList); + if (lRet != ERROR_SUCCESS) + { + TRACE("Unable to grab MRUList, error %d\n", GetLastError()); + pszList[0] = L'\0'; + } + } + else + { +Continue: + icList = sizeof(WCHAR); + pszList = (WCHAR*)HeapAlloc(GetProcessHeap(), 0, icList); + if (!pszList) + { + TRACE("HeapAlloc failed to allocate %d bytes\n", icList); + RegCloseKey(hkey); + return; + } + pszList[0] = L'\0'; + } + + /* Convert the number of bytes from MRUList into number of characters (== number of indices) */ + icList /= sizeof(WCHAR); + + for (Nix = 0; Nix < icList - 1; Nix++) + { + if (pszList[Nix] > cMax) + cMax = pszList[Nix]; + + szIndex[0] = pszList[Nix]; + + lRet = RegQueryValueExW(hkey, szIndex, NULL, &dwType, NULL, &icCmd); + if (lRet != ERROR_SUCCESS || dwType != REG_SZ) + { + TRACE("Unable to grab size of index, error %d\n", GetLastError()); + continue; + } + + if (pszCmd) + { + pszTmp = (WCHAR*)HeapReAlloc(GetProcessHeap(), 0, pszCmd, icCmd); + if (!pszTmp) + { + TRACE("HeapReAlloc failed to reallocate %d bytes\n", icCmd); + continue; + } + pszCmd = pszTmp; + } + else + { + pszCmd = (WCHAR*)HeapAlloc(GetProcessHeap(), 0, icCmd); + if (!pszCmd) + { + TRACE("HeapAlloc failed to allocate %d bytes\n", icCmd); + continue; + } + } + + lRet = RegQueryValueExW(hkey, szIndex, NULL, NULL, (LPBYTE)pszCmd, &icCmd); + if (lRet != ERROR_SUCCESS) + { + TRACE("Unable to grab index, error %d\n", GetLastError()); + continue; + } + + /* + * Generally the command string will end up with "\\1". + * Find the last backslash in the string and NULL-terminate. + * Windows does not seem to check for what comes next, so that + * a command of the form: + * c:\\my_dir\\myfile.exe + * will be cut just after "my_dir", whereas a command of the form: + * c:\\my_dir\\myfile.exe\\1 + * will be cut just after "myfile.exe". + */ + pszTmp = wcsrchr(pszCmd, L'\\'); + if (pszTmp) + *pszTmp = L'\0'; + + /* + * In the following we try to add pszLatest to the MRU list. + * We suppose that our caller has already correctly allocated + * the string with enough space for us to append a "\\1". + * + * FIXME: TODO! (At the moment we don't append it!) + */ + + if (pszLatest) + { + if (wcsicmp(pszCmd, pszLatest) == 0) + { + SendMessageW(hCb, CB_INSERTSTRING, 0, (LPARAM)pszCmd); + SetWindowTextW(hCb, pszCmd); + SendMessageW(hCb, CB_SETEDITSEL, 0, MAKELPARAM(0, -1)); + + cMatch = pszList[Nix]; + memmove(&pszList[1], pszList, Nix * sizeof(WCHAR)); + pszList[0] = cMatch; + continue; + } + } + + if (icList - 1 != 26 || icList - 2 != Nix || cMatch || pszLatest == NULL) + { + SendMessageW(hCb, CB_ADDSTRING, 0, (LPARAM)pszCmd); + if (!Nix && fShowDefault) + { + SetWindowTextW(hCb, pszCmd); + SendMessageW(hCb, CB_SETEDITSEL, 0, MAKELPARAM(0, -1)); + } + } + else + { + SendMessageW(hCb, CB_INSERTSTRING, 0, (LPARAM)pszLatest); + SetWindowTextW(hCb, pszLatest); + SendMessageW(hCb, CB_SETEDITSEL, 0, MAKELPARAM(0, -1)); + + cMatch = pszList[Nix]; + memmove(&pszList[1], pszList, Nix * sizeof(WCHAR)); + pszList[0] = cMatch; + szIndex[0] = cMatch; + RegSetValueExW(hkey, szIndex, 0, REG_SZ, (LPBYTE)pszLatest, (wcslen(pszLatest) + 1) * sizeof(WCHAR)); + } + } + + if (!cMatch && pszLatest != NULL) + { + SendMessageW(hCb, CB_INSERTSTRING, 0, (LPARAM)pszLatest); + SetWindowTextW(hCb, pszLatest); + SendMessageW(hCb, CB_SETEDITSEL, 0, MAKELPARAM (0, -1)); + + cMatch = ++cMax; if (pszList) { - if (ERROR_SUCCESS != RegQueryValueExA (hkey, "MRUList", NULL, NULL, (LPBYTE)pszList, &icList)) - MessageBoxA (hCb, "Unable to grab MRUList !", "Nix", MB_OK); + pszTmp = (WCHAR*)HeapReAlloc(GetProcessHeap(), 0, pszList, (++icList) * sizeof(WCHAR)); + if (!pszTmp) + { + TRACE("HeapReAlloc failed to reallocate enough bytes\n"); + goto Cleanup; + } + pszList = pszTmp; } else { - TRACE("HeapAlloc failed to allocate %d bytes\n", icList); - } - } - else - { - icList = 1 ; - pszList = (char *)HeapAlloc( GetProcessHeap(), 0, icList) ; - pszList[0] = 0 ; - } - - for (Nix = 0 ; Nix < icList - 1 ; Nix++) - { - if (pszList[Nix] > cMax) - cMax = pszList[Nix] ; - - szIndex[0] = pszList[Nix] ; - - if (ERROR_SUCCESS != RegQueryValueExA (hkey, szIndex, NULL, NULL, NULL, &icCmd)) - MessageBoxA (hCb, "Unable to grab size of index", "Nix", MB_OK) ; - if( pszCmd ) - pszCmd = (char *)HeapReAlloc(GetProcessHeap(), 0, pszCmd, icCmd) ; - else - pszCmd = (char *)HeapAlloc(GetProcessHeap(), 0, icCmd) ; - if (ERROR_SUCCESS != RegQueryValueExA (hkey, szIndex, NULL, NULL, (LPBYTE)pszCmd, &icCmd)) - MessageBoxA (hCb, "Unable to grab index", "Nix", MB_OK) ; - - if (NULL != pszLatest) - { - if (!lstrcmpiA(pszCmd, pszLatest)) - { - /* - sprintf (szDbgMsg, "Found existing (%d).\n", Nix) ; - MessageBoxA (hCb, szDbgMsg, "Nix", MB_OK) ; - */ - SendMessageA (hCb, CB_INSERTSTRING, 0, (LPARAM)pszCmd) ; - SetWindowTextA (hCb, pszCmd) ; - SendMessageA (hCb, CB_SETEDITSEL, 0, MAKELPARAM (0, -1)) ; - - cMatch = pszList[Nix] ; - memmove (&pszList[1], pszList, Nix) ; - pszList[0] = cMatch ; - continue ; - } - } - - if (26 != icList - 1 || icList - 2 != Nix || cMatch || NULL == pszLatest) - { - /* - sprintf (szDbgMsg, "Happily appending (%d).\n", Nix) ; - MessageBoxA (hCb, szDbgMsg, "Nix", MB_OK) ; - */ - SendMessageA (hCb, CB_ADDSTRING, 0, (LPARAM)pszCmd) ; - if (!Nix && fShowDefault) - { - SetWindowTextA (hCb, pszCmd) ; - SendMessageA (hCb, CB_SETEDITSEL, 0, MAKELPARAM (0, -1)) ; - } - } - else - { - /* - sprintf (szDbgMsg, "Doing loop thing.\n") ; - MessageBoxA (hCb, szDbgMsg, "Nix", MB_OK) ; - */ - SendMessageA (hCb, CB_INSERTSTRING, 0, (LPARAM)pszLatest) ; - SetWindowTextA (hCb, pszLatest) ; - SendMessageA (hCb, CB_SETEDITSEL, 0, MAKELPARAM (0, -1)) ; - - cMatch = pszList[Nix] ; - memmove (&pszList[1], pszList, Nix) ; - pszList[0] = cMatch ; - szIndex[0] = cMatch ; - RegSetValueExA (hkey, szIndex, 0, REG_SZ, (LPBYTE)pszLatest, strlen (pszLatest) + 1) ; - } - } - - if (!cMatch && NULL != pszLatest) - { - /* - sprintf (szDbgMsg, "Simply inserting (increasing list).\n") ; - MessageBoxA (hCb, szDbgMsg, "Nix", MB_OK) ; - */ - SendMessageA (hCb, CB_INSERTSTRING, 0, (LPARAM)pszLatest) ; - SetWindowTextA (hCb, pszLatest) ; - SendMessageA (hCb, CB_SETEDITSEL, 0, MAKELPARAM (0, -1)) ; - - cMatch = ++cMax ; - if (pszList) - pszList = (char *)HeapReAlloc(GetProcessHeap(), 0, pszList, ++icList) ; - else - pszList = (char *)HeapAlloc(GetProcessHeap(), 0, ++icList) ; - - if (pszList) - { - memmove (&pszList[1], pszList, icList - 1) ; - pszList[0] = cMatch ; - szIndex[0] = cMatch ; - RegSetValueExA (hkey, szIndex, 0, REG_SZ, (LPBYTE)pszLatest, strlen (pszLatest) + 1) ; - } - else - { - TRACE("HeapAlloc or HeapReAlloc failed to allocate enough bytes\n"); - } - } - - RegSetValueExA (hkey, "MRUList", 0, REG_SZ, (LPBYTE)pszList, strlen (pszList) + 1) ; - - HeapFree( GetProcessHeap(), 0, pszCmd) ; - HeapFree( GetProcessHeap(), 0, pszList) ; + pszList = (WCHAR*)HeapAlloc(GetProcessHeap(), 0, (++icList) * sizeof(WCHAR)); + if (!pszList) + { + TRACE("HeapAlloc failed to allocate enough bytes\n"); + goto Cleanup; + } + } + + memmove(&pszList[1], pszList, (icList - 1) * sizeof(WCHAR)); + pszList[0] = cMatch; + szIndex[0] = cMatch; + RegSetValueExW(hkey, szIndex, 0, REG_SZ, (LPBYTE)pszLatest, (wcslen(pszLatest) + 1) * sizeof(WCHAR)); + } + +Cleanup: + RegSetValueExW(hkey, L"MRUList", 0, REG_SZ, (LPBYTE)pszList, (wcslen(pszList) + 1) * sizeof(WCHAR)); + + HeapFree(GetProcessHeap(), 0, pszCmd); + HeapFree(GetProcessHeap(), 0, pszList); + + RegCloseKey(hkey); }

8 years, 3 months

[zhu] 71594: TCP handshake working in driver and properly reported up to user programs. The port is not closed properly, however.

by zhu＠svn.reactos.org

Author: zhu Date: Wed Jun 8 19:26:53 2016 New Revision: 71594 URL: http://svn.reactos.org/svn/reactos?rev=71594&view=rev Log: TCP handshake working in driver and properly reported up to user programs. The port is not closed properly, however. Modified: branches/GSoC_2016/lwIP/drivers/network/tcpip/address.c branches/GSoC_2016/lwIP/drivers/network/tcpip/address.h branches/GSoC_2016/lwIP/drivers/network/tcpip/main.c branches/GSoC_2016/lwIP/drivers/network/tcpip/precomp.h Modified: branches/GSoC_2016/lwIP/drivers/network/tcpip/address.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP/drivers/network/… ============================================================================== --- branches/GSoC_2016/lwIP/drivers/network/tcpip/address.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP/drivers/network/tcpip/address.c [iso-8859-1] Wed Jun 8 19:26:53 2016 @@ -142,6 +142,24 @@ } static +err_t +lwip_tcp_accept_callback( + void *arg, + struct tcp_pcb *newpcb, + err_t err) +{ + PIRP Irp; + + DPRINT1("lwIP TCP Accept Callback\n"); + + Irp = (PIRP)arg; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + + return ERR_OK; +} + +static u8_t lwip_raw_ReceiveDatagram_callback( void *arg, @@ -184,6 +202,24 @@ pbuf_free(p); return Result; +} + +static +err_t +lwip_tcp_Connected_callback( + void *arg, + struct tcp_pcb *tpcb, + err_t err) +{ + PIRP Irp; + + DPRINT1("lwIP TCP Connected Callback\n"); + + Irp = (PIRP)arg; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + + return ERR_OK; } NTSTATUS @@ -248,9 +284,10 @@ struct netif* lwip_netif = netif_list; ip_addr_t IpAddr; - ip4_addr_set_u32(&IpAddr, AddressFile->Address.in_addr); + ip4_addr_set_u32(&IpAddr, Address->in_addr); while (lwip_netif) { + DPRINT1("Comparing against address %lx\n", lwip_netif->ip_addr.addr); if (ip_addr_cmp(&IpAddr, &lwip_netif->ip_addr)) { break; @@ -260,7 +297,7 @@ if (!lwip_netif) { - DPRINT1("Cound not find an interface for address 0x08x\n", AddressFile->Address.in_addr); + DPRINT1("Cound not find an interface for address 0x%08x\n", AddressFile->Address.in_addr); KeReleaseSpinLock(&AddressListLock, OldIrql); return STATUS_INVALID_ADDRESS; } @@ -288,8 +325,13 @@ switch (Protocol) { case IPPROTO_TCP: + { + ip_addr_t IpAddr; + ip4_addr_set_u32(&IpAddr, AddressFile->Address.in_addr); InsertEntityInstance(CO_TL_ENTITY, &AddressFile->Instance); - break; + AddressFile->lwip_tcp_pcb = tcp_new(); + break; + } case IPPROTO_UDP: { ip_addr_t IpAddr; @@ -441,6 +483,301 @@ ExFreePoolWithTag(Request, TAG_ADDRESS_FILE); } +/* implementation in testing */ +NTSTATUS +TcpIpConnect( + _Inout_ PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp; + ADDRESS_FILE *AddressFile; + PTDI_REQUEST_KERNEL_CONNECT Parameters; + PTRANSPORT_ADDRESS RemoteTransportAddress; + + struct sockaddr *SocketAddressRemote; + struct sockaddr_in *SocketAddressInRemote; + + err_t lwip_err; + + IrpSp = IoGetCurrentIrpStackLocation(Irp); + + /* Check this is really a connection file */ + if ((ULONG_PTR)IrpSp->FileObject->FsContext2 != TDI_TRANSPORT_ADDRESS_FILE) + { + DPRINT1("File object not an address file\n"); + return STATUS_FILE_INVALID; + } + + AddressFile = IrpSp->FileObject->FsContext; + if (AddressFile->Protocol != IPPROTO_TCP) + { + DPRINT1("Received TDI_CONNECT for a non-TCP protocol\n"); + return STATUS_INVALID_ADDRESS; + } + + Parameters = (PTDI_REQUEST_KERNEL_CONNECT)&IrpSp->Parameters; + + RemoteTransportAddress = Parameters->RequestConnectionInformation->RemoteAddress; + + SocketAddressRemote = (struct sockaddr *)&RemoteTransportAddress->Address[0]; + SocketAddressInRemote = (struct sockaddr_in *)&SocketAddressRemote->sa_data; + + DPRINT1("\n Remote Address\n Address: %08x\n Port: %04x\n", + SocketAddressInRemote->sin_addr.s_addr, + SocketAddressInRemote->sin_port); + DPRINT1("\n Local Address\n Address: %08x\n Port: %04x\n", + AddressFile->lwip_tcp_pcb->local_ip, + AddressFile->lwip_tcp_pcb->local_port); + + lwip_err = tcp_connect(AddressFile->lwip_tcp_pcb, + (ip_addr_t *)&SocketAddressInRemote->sin_addr.s_addr, + SocketAddressInRemote->sin_port, + lwip_tcp_Connected_callback); + DPRINT1("lwip error %d\n", lwip_err); + switch (lwip_err) + { + case (ERR_VAL) : + { + return STATUS_INVALID_PARAMETER; + } + case (ERR_ISCONN) : + { + return STATUS_CONNECTION_ACTIVE; + } + case (ERR_RTE) : + { + /* several errors look right here */ + return STATUS_NETWORK_UNREACHABLE; + } + case (ERR_BUF) : + { + /* use correct error once NDIS errors are included + this return value means local port unavailable */ + return STATUS_ADDRESS_ALREADY_EXISTS; + } + case (ERR_USE) : + { + /* STATUS_CONNECTION_ACTIVE maybe? */ + return STATUS_ADDRESS_ALREADY_EXISTS; + } + case (ERR_MEM) : + { + return STATUS_NO_MEMORY; + } + case (ERR_OK) : + { + DPRINT1("lwip ERR_OK\n"); + tcp_arg(AddressFile->lwip_tcp_pcb, Irp); + break; + } + default : + { + /* unknown return value */ + DPRINT1("lwip unknown return code\n"); + return STATUS_NOT_IMPLEMENTED; + } + } + + return STATUS_PENDING; +} + +/* Implementation in testing */ +NTSTATUS +TcpIpAssociateAddress( + _Inout_ PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp; + ADDRESS_FILE *AddressFile; + ADDRESS_FILE *BindTo; + PTDI_REQUEST_KERNEL_ASSOCIATE RequestInfo; + PFILE_OBJECT FileObject; + + err_t lwip_err; + NTSTATUS Status; + + IrpSp = IoGetCurrentIrpStackLocation(Irp); + + /* Check this is really an address file */ + if ((ULONG_PTR)IrpSp->FileObject->FsContext2 != TDI_TRANSPORT_ADDRESS_FILE) + { + return STATUS_FILE_INVALID; + } + + /* Get address file */ + AddressFile = IrpSp->FileObject->FsContext; + + if (AddressFile->Protocol != IPPROTO_TCP) + { + DPRINT1("Received TDI_ASSOCIATE_ADDRESS for a non-TCP protocol\n"); + return STATUS_INVALID_ADDRESS; + } + + RequestInfo = (PTDI_REQUEST_KERNEL_ASSOCIATE)&IrpSp->Parameters; + + Status = ObReferenceObjectByHandle( + RequestInfo->AddressHandle, + 0, + *IoFileObjectType, + KernelMode, + (PVOID*)&FileObject, + NULL); + if (Status != STATUS_SUCCESS) + { + DPRINT1("Reference by handle failed with status 0x%08x\n", Status); + return Status; + } + + if (FileObject->FsContext2 != (PVOID)TDI_TRANSPORT_ADDRESS_FILE) + { + DPRINT1("File object is not an address file\n"); + ObDereferenceObject(FileObject); + return STATUS_INVALID_PARAMETER; + } + BindTo = FileObject->FsContext; + if (BindTo->Protocol != IPPROTO_TCP) + { + DPRINT1("TCP socket association with non-TCP handle\n"); + ObDereferenceObject(FileObject); + return STATUS_INVALID_PARAMETER; + } + + DPRINT1("\n TDI Address\n Port: %04x\n Address: %08x\n", + BindTo->Address.sin_port, + BindTo->Address.in_addr); + + /* Finally calling into lwip to perform socket bind */ + lwip_err = tcp_bind( + AddressFile->lwip_tcp_pcb, + (ip_addr_t *)&BindTo->Address.in_addr, + BindTo->Address.sin_port); + + DPRINT1("lwip error %d\n TCP PCB:\n Local Address: %08x\n Local Port: %04x\n Remote Address: %08x\n Remote Port: %04x\n", + lwip_err, + AddressFile->lwip_tcp_pcb->local_ip, + AddressFile->lwip_tcp_pcb->local_port, + AddressFile->lwip_tcp_pcb->remote_ip, + AddressFile->lwip_tcp_pcb->remote_port); + if (lwip_err != ERR_OK) + { + switch (lwip_err) + { + case (ERR_BUF) : + { + /* Not actually sure which error I should return here + ERR_BUF means the port is already taken + fix when I figure out how to use NDIS errors */ + Status = STATUS_ADDRESS_ALREADY_EXISTS; + goto LEAVE; + } + case (ERR_VAL) : + { + Status = STATUS_INVALID_PARAMETER; + goto LEAVE; + } + case (ERR_USE) : + { + Status = STATUS_ADDRESS_ALREADY_EXISTS; + goto LEAVE; + } + default : + { + break; + } + } + } + ip_set_option(AddressFile->lwip_tcp_pcb, SOF_BROADCAST); + + Status = STATUS_SUCCESS; +LEAVE: + return Status; +} + + +/* Implementation in testing */ +NTSTATUS +TcpIpDisassociateAddress( + _Inout_ PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp; + ADDRESS_FILE *AddressFile; + + err_t lwip_err; + + IrpSp = IoGetCurrentIrpStackLocation(Irp); + if ((ULONG)IrpSp->FileObject->FsContext2 != TDI_TRANSPORT_ADDRESS_FILE) + { + return STATUS_FILE_INVALID; + } + + AddressFile = IrpSp->FileObject->FsContext; + + if (AddressFile->Protocol != IPPROTO_TCP) + { + DPRINT1("Received TDI_DISASSOCIATE_ADDRESS for non-TCP protocol\n"); + return STATUS_INVALID_ADDRESS; + } + + lwip_err = tcp_close(AddressFile->lwip_tcp_pcb); + switch (lwip_err) + { + case ERR_MEM : + return STATUS_NO_MEMORY; + case ERR_OK : + break; + default : + DPRINT1("Unexpected lwIP error\n"); + return STATUS_NOT_IMPLEMENTED; + } + + return STATUS_SUCCESS; +} + +/* Implementation in testing */ +NTSTATUS +TcpIpListen( + _Inout_ PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp; + ADDRESS_FILE *AddressFile; + + struct tcp_pcb *lpcb; + + IrpSp = IoGetCurrentIrpStackLocation(Irp); + + /* Check this is really an address file */ + if ((ULONG_PTR)IrpSp->FileObject->FsContext2 != TDI_TRANSPORT_ADDRESS_FILE) + { + return STATUS_FILE_INVALID; + } + + /* Get address file */ + AddressFile = IrpSp->FileObject->FsContext; + if (AddressFile->Protocol != IPPROTO_TCP) + { + DPRINT1("Received TDI_LISTEN for a non-TCP protocol\n"); + return STATUS_INVALID_ADDRESS; + } + + /* Call down into lwip to initiate a listen */ + lpcb = tcp_listen(AddressFile->lwip_tcp_pcb); + DPRINT1("lwip tcp_listen returned\n"); + if (lpcb == NULL) + { + /* tcp_listen returning NULL can mean + either INVALID_ADDRESS or NO_MEMORY + if SO_REUSE is enabled in lwip options */ + DPRINT1("lwip tcp_listen error\n"); + return STATUS_NO_MEMORY; + } + else + { + AddressFile->lwip_tcp_pcb = lpcb; + } + + tcp_accept(AddressFile->lwip_tcp_pcb, lwip_tcp_accept_callback); + tcp_arg(AddressFile->lwip_tcp_pcb, Irp); + + return STATUS_PENDING; +} NTSTATUS TcpIpReceiveDatagram( Modified: branches/GSoC_2016/lwIP/drivers/network/tcpip/address.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP/drivers/network/… ============================================================================== --- branches/GSoC_2016/lwIP/drivers/network/tcpip/address.h [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP/drivers/network/tcpip/address.h [iso-8859-1] Wed Jun 8 19:26:53 2016 @@ -14,6 +14,7 @@ { struct raw_pcb* lwip_raw_pcb; struct udp_pcb* lwip_udp_pcb; + struct tcp_pcb* lwip_tcp_pcb; }; } ADDRESS_FILE; @@ -31,6 +32,25 @@ TcpIpCloseAddress( _Inout_ ADDRESS_FILE* AddressFile ); + +NTSTATUS +TcpIpConnect( + _Inout_ PIRP Irp +); + +NTSTATUS +TcpIpAssociateAddress( + _Inout_ PIRP Irp +); + +NTSTATUS +TcpIpDisassociateAddress( + _Inout_ PIRP Irp +); + +NTSTATUS +TcpIpListen( + _Inout_ PIRP Irp); NTSTATUS TcpIpReceiveDatagram( Modified: branches/GSoC_2016/lwIP/drivers/network/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP/drivers/network/… ============================================================================== --- branches/GSoC_2016/lwIP/drivers/network/tcpip/main.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP/drivers/network/tcpip/main.c [iso-8859-1] Wed Jun 8 19:26:53 2016 @@ -7,7 +7,7 @@ #include "precomp.h" -#define NDEBUG +//#define NDEBUG #include <debug.h> /* DriverEntry, DriverUnload and dispatch routines declaration */ @@ -264,14 +264,30 @@ } case TDI_CONNECTION_CONTEXT_LENGTH: + { + PTA_IP_ADDRESS Address; + if (strncmp(&FileInfo->EaName[0], TdiConnectionContext, TDI_CONNECTION_CONTEXT_LENGTH) != 0) { DPRINT1("TCPIP: Should maybe open file %*s.\n", FileInfo->EaNameLength, &FileInfo->EaName[0]); return STATUS_INVALID_PARAMETER; } DPRINT1("Should create a connection!\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; + + Address = (PTA_IP_ADDRESS)(&FileInfo->EaName[FileInfo->EaNameLength + 1]); + + /* Get the protocol this address will be created for. */ + Protocol = ProtocolFromIrp(DeviceObject, IrpSp); + if (Protocol == (IPPROTO)-1) + { + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + /* All good. */ + Status = TcpIpCreateAddress(Irp, &Address->Address[0].Address[0], Protocol); + break; + } default: DPRINT1("TCPIP: Should open file %*s.\n", FileInfo->EaNameLength, &FileInfo->EaName[0]); @@ -372,14 +388,14 @@ break; case TDI_LISTEN: - DPRINT1("TCPIP: TDI_LISTEN!\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; + DPRINT1("TCPIP: TDI_LISTEN!\n"); + Status = TcpIpListen(Irp); + break; case TDI_CONNECT: DPRINT1("TCPIP: TDI_CONNECT!\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; + Status = TcpIpConnect(Irp); + break; case TDI_DISCONNECT: DPRINT1("TCPIP: TDI_DISCONNECT!\n"); @@ -387,13 +403,13 @@ break; case TDI_ASSOCIATE_ADDRESS: - DPRINT1("TCPIP: TDI_ASSOCIATE_ADDRESS!\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; + DPRINT1("TCPIP: TDI_ASSOCIATE_ADDRESS\n"); + Status = TcpIpAssociateAddress(Irp); + break; case TDI_DISASSOCIATE_ADDRESS: DPRINT1("TCPIP: TDI_DISASSOCIATE_ADDRESS!\n"); - Status = STATUS_NOT_IMPLEMENTED; + Status = TcpIpDisassociateAddress(Irp); break; case TDI_QUERY_INFORMATION: @@ -474,7 +490,7 @@ break; } - DPRINT("TCPIP dispatched with status 0x%08x.\n", Status); + //DPRINT("TCPIP dispatched with status 0x%08x.\n", Status); Irp->IoStatus.Status = Status; if (Status == STATUS_PENDING) Modified: branches/GSoC_2016/lwIP/drivers/network/tcpip/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP/drivers/network/… ============================================================================== --- branches/GSoC_2016/lwIP/drivers/network/tcpip/precomp.h [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP/drivers/network/tcpip/precomp.h [iso-8859-1] Wed Jun 8 19:26:53 2016 @@ -23,6 +23,7 @@ #include <lwip/raw.h> #include <lwip/snmp.h> #include <lwip/tcpip.h> +#include <lwip/tcp.h> #include <lwip/udp.h> #include <netif/etharp.h>

8 years, 3 months

[hbelusca] 71593: [CONSRV] Only add a history entry if console echo is enabled. This ensures that anything sent to the console when echo is disabled (e.g. binary data, or secrets like passwords...)...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jun 8 00:27:25 2016 New Revision: 71593 URL: http://svn.reactos.org/svn/reactos?rev=71593&view=rev Log: [CONSRV] Only add a history entry if console echo is enabled. This ensures that anything sent to the console when echo is disabled (e.g. binary data, or secrets like passwords...) does not remain stored in memory. Modified: trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c [iso-8859-1] Wed Jun 8 00:27:25 2016 @@ -60,7 +60,7 @@ LineInputSetPos(PCONSRV_CONSOLE Console, UINT Pos) { - if (Pos != Console->LinePos && GetConsoleInputBufferMode(Console) & ENABLE_ECHO_INPUT) + if (Pos != Console->LinePos && (GetConsoleInputBufferMode(Console) & ENABLE_ECHO_INPUT)) { PCONSOLE_SCREEN_BUFFER Buffer = Console->ActiveBuffer; SHORT OldCursorX = Buffer->CursorPosition.X; @@ -95,7 +95,7 @@ if (GetType(Console->ActiveBuffer) != TEXTMODE_BUFFER) return; ActiveBuffer = (PTEXTMODE_SCREEN_BUFFER)Console->ActiveBuffer; - /* Make sure there's always enough room for ending \r\n */ + /* Make sure there is always enough room for ending \r\n */ if (NewSize + 2 > Console->LineMaxSize) return; @@ -182,7 +182,7 @@ { case VK_ESCAPE: { - /* Clear entire line */ + /* Clear the entire line */ LineInputSetPos(Console, 0); LineInputEdit(Console, Console->LineSize, 0, NULL); @@ -197,7 +197,7 @@ case VK_HOME: { - /* Move to start of line. With CTRL, erase everything left of cursor */ + /* Move to start of line. With CTRL, erase everything left of cursor. */ LineInputSetPos(Console, 0); if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) LineInputEdit(Console, Pos, 0, NULL); @@ -206,7 +206,7 @@ case VK_END: { - /* Move to end of line. With CTRL, erase everything right of cursor */ + /* Move to end of line. With CTRL, erase everything right of cursor. */ if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) LineInputEdit(Console, Console->LineSize - Pos, 0, NULL); else @@ -216,7 +216,7 @@ case VK_LEFT: { - /* Move left. With CTRL, move to beginning of previous word */ + /* Move to the left. With CTRL, move to beginning of previous word. */ if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) { while (Pos > 0 && Console->LineBuffer[Pos - 1] == L' ') Pos--; @@ -233,7 +233,7 @@ case VK_RIGHT: case VK_F1: { - /* Move right. With CTRL, move to beginning of next word */ + /* Move to the right. With CTRL, move to beginning of next word. */ if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) { while (Pos < Console->LineSize && Console->LineBuffer[Pos] != L' ') Pos++; @@ -262,7 +262,7 @@ case VK_DELETE: { - /* Remove character to right of cursor */ + /* Remove one character to right of cursor */ if (Pos != Console->LineSize) LineInputEdit(Console, 1, 0, NULL); return; @@ -270,14 +270,14 @@ case VK_PRIOR: { - /* Recall first history entry */ + /* Recall the first history entry */ LineInputRecallHistory(Console, ExeName, -((WORD)-1)); return; } case VK_NEXT: { - /* Recall last history entry */ + /* Recall the last history entry */ LineInputRecallHistory(Console, ExeName, +((WORD)-1)); return; } @@ -286,8 +286,8 @@ case VK_F5: { /* - * Recall previous history entry. On first time, actually recall the - * current (usually last) entry; on subsequent times go back. + * Recall the previous history entry. On first time, actually recall + * the current (usually last) entry; on subsequent times go back. */ LineInputRecallHistory(Console, ExeName, Console->LineUpPressed ? -1 : 0); Console->LineUpPressed = TRUE; @@ -296,14 +296,14 @@ case VK_DOWN: { - /* Recall next history entry */ + /* Recall the next history entry */ LineInputRecallHistory(Console, ExeName, +1); return; } case VK_F3: { - /* Recall remainder of current history entry */ + /* Recall the remainder of the current history entry */ HistoryGetCurrentEntry(Console, ExeName, &Entry); if (Pos * sizeof(WCHAR) < Entry.Length) { @@ -356,7 +356,7 @@ PHISTORY_BUFFER Hist; INT HistPos; - /* Search for history entries starting with input. */ + /* Search for history entries starting with input */ Hist = HistoryCurrentBuffer(Console, ExeName); if (!Hist || Hist->NumEntries == 0) return; @@ -403,10 +403,12 @@ * OK, we deal with normal keys, we can continue... */ - if (KeyEvent->uChar.UnicodeChar == L'\b' && GetConsoleInputBufferMode(Console) & ENABLE_PROCESSED_INPUT) - { - /* backspace handling - if processed input enabled then we handle it here - * otherwise we treat it like a normal char. */ + if (KeyEvent->uChar.UnicodeChar == L'\b' && (GetConsoleInputBufferMode(Console) & ENABLE_PROCESSED_INPUT)) + { + /* + * Backspace handling - if processed input enabled then we handle it + * here, otherwise we treat it like a normal character. + */ if (Pos > 0) { LineInputSetPos(Console, Pos - 1); @@ -415,9 +417,18 @@ } else if (KeyEvent->uChar.UnicodeChar == L'\r') { - Entry.Length = Entry.MaximumLength = Console->LineSize * sizeof(WCHAR); - Entry.Buffer = Console->LineBuffer; - HistoryAddEntry(Console, ExeName, &Entry); + /* + * Only add a history entry if console echo is enabled. This ensures + * that anything sent to the console when echo is disabled (e.g. + * binary data, or secrets like passwords...) does not remain stored + * in memory. + */ + if (GetConsoleInputBufferMode(Console) & ENABLE_ECHO_INPUT) + { + Entry.Length = Entry.MaximumLength = Console->LineSize * sizeof(WCHAR); + Entry.Buffer = Console->LineBuffer; + HistoryAddEntry(Console, ExeName, &Entry); + } /* TODO: Expand aliases */ DPRINT1("TODO: Expand aliases\n"); @@ -434,10 +445,10 @@ /* * Add \n if processed input. There should usually be room for it, - * but an exception to the rule exists: the buffer could have been + * but an exception to the rule exists: the buffer could have been * pre-filled with LineMaxSize - 1 characters. */ - if (GetConsoleInputBufferMode(Console) & ENABLE_PROCESSED_INPUT && + if ((GetConsoleInputBufferMode(Console) & ENABLE_PROCESSED_INPUT) && Console->LineSize < Console->LineMaxSize) { Console->LineBuffer[Console->LineSize++] = L'\n';

8 years, 3 months

[hbelusca] 71592: [DHCPSVC]: It's a service, move it in the correct directory.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Jun 7 23:14:58 2016 New Revision: 71592 URL: http://svn.reactos.org/svn/reactos?rev=71592&view=rev Log: [DHCPSVC]: It's a service, move it in the correct directory. Added: trunk/reactos/base/services/dhcpcsvc/ - copied from r71591, trunk/reactos/dll/win32/dhcpcsvc/ Removed: trunk/reactos/dll/win32/dhcpcsvc/ Modified: trunk/reactos/base/services/CMakeLists.txt trunk/reactos/dll/win32/CMakeLists.txt Modified: trunk/reactos/base/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/CMakeLists.t… ============================================================================== --- trunk/reactos/base/services/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/CMakeLists.txt [iso-8859-1] Tue Jun 7 23:14:58 2016 @@ -1,5 +1,6 @@ add_subdirectory(audiosrv) +add_subdirectory(dhcpcsvc) add_subdirectory(eventlog) add_subdirectory(rpcss) add_subdirectory(schedsvc) Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Tue Jun 7 23:14:58 2016 @@ -36,7 +36,6 @@ add_subdirectory(dbghelp) add_subdirectory(dciman32) add_subdirectory(devmgr) -add_subdirectory(dhcpcsvc) add_subdirectory(dnsapi) add_subdirectory(esent) add_subdirectory(faultrep)

8 years, 3 months

[hbelusca] 71591: [CONSRV] - Remove a wrong assertion that I introduced in r70281 concerning Console->LinePos. - Fix some boundary conditions. - Completely reset line discipline variables when the ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Jun 7 22:52:44 2016 New Revision: 71591 URL: http://svn.reactos.org/svn/reactos?rev=71591&view=rev Log: [CONSRV] - Remove a wrong assertion that I introduced in r70281 concerning Console->LinePos. - Fix some boundary conditions. - Completely reset line discipline variables when the line buffer is freed. - Fix a potential buffer overrun in the case ReadControl->nInitialChars was larger than Console->LineMaxSize (the size of Console->LineBuffer), which serves to initialize Console->LineSize, Console->LinePos, and copy nInitialChars characters from user buffer. CORE-11380 CORE-10997 #resolve Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/terminal.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/terminal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/terminal.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/terminal.c [iso-8859-1] Tue Jun 7 22:52:44 2016 @@ -330,7 +330,13 @@ { /* Start a new line */ Console->LineMaxSize = max(256, NumCharsToRead); - ASSERT(ReadControl->nInitialChars <= Console->LineMaxSize); + + /* + * Fixup ReadControl->nInitialChars in case the number of initial + * characters is bigger than the number of characters to be read. + * It will always be, lesser than or equal to Console->LineMaxSize. + */ + ReadControl->nInitialChars = min(ReadControl->nInitialChars, NumCharsToRead); Console->LineBuffer = ConsoleAllocHeap(0, Console->LineMaxSize * sizeof(WCHAR)); if (Console->LineBuffer == NULL) return STATUS_NO_MEMORY; @@ -346,7 +352,7 @@ * worry about ANSI <-> Unicode conversion. */ memcpy(Console->LineBuffer, Buffer, Console->LineSize * sizeof(WCHAR)); - if (Console->LineSize == Console->LineMaxSize) + if (Console->LineSize >= Console->LineMaxSize) { Console->LineComplete = TRUE; Console->LinePos = 0; @@ -356,7 +362,7 @@ /* If we don't have a complete line yet, process the pending input */ while (!Console->LineComplete && !IsListEmpty(&InputBuffer->InputEvents)) { - /* Remove input event from queue */ + /* Remove an input event from the queue */ CurrentEntry = RemoveHeadList(&InputBuffer->InputEvents); if (IsListEmpty(&InputBuffer->InputEvents)) { @@ -378,12 +384,14 @@ /* Check if we have a complete line to read from */ if (Console->LineComplete) { - // NOTE: I want to check whether we always set LinePos to zero - // when LineComplete is set to TRUE. - // Basically, we are going to use LinePos as 'i'. - ASSERT(Console->LinePos == 0); - - while (i < NumCharsToRead && Console->LinePos != Console->LineSize) + /* + * Console->LinePos keeps the next position of the character to read + * in the line buffer across the different calls of the function, + * so that the line buffer can be read by chunks after all the input + * has been buffered. + */ + + while (i < NumCharsToRead && Console->LinePos < Console->LineSize) { WCHAR Char = Console->LineBuffer[Console->LinePos++]; @@ -398,11 +406,14 @@ ++i; } - if (Console->LinePos == Console->LineSize) - { - /* Entire line has been read */ + if (Console->LinePos >= Console->LineSize) + { + /* The entire line has been read */ ConsoleFreeHeap(Console->LineBuffer); Console->LineBuffer = NULL; + Console->LinePos = Console->LineMaxSize = Console->LineSize = 0; + // Console->LineComplete = Console->LineUpPressed = FALSE; + Console->LineComplete = FALSE; } Status = STATUS_SUCCESS; @@ -415,7 +426,7 @@ /* Character input */ while (i < NumCharsToRead && !IsListEmpty(&InputBuffer->InputEvents)) { - /* Remove input event from queue */ + /* Remove an input event from the queue */ CurrentEntry = RemoveHeadList(&InputBuffer->InputEvents); if (IsListEmpty(&InputBuffer->InputEvents)) {

8 years, 3 months

[ekohl] 71590: [SC] Add the sdshow command.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Jun 7 21:51:37 2016 New Revision: 71590 URL: http://svn.reactos.org/svn/reactos?rev=71590&view=rev Log: [SC] Add the sdshow command. Added: trunk/reactos/base/applications/sc/sdshow.c (with props) Modified: trunk/reactos/base/applications/sc/CMakeLists.txt trunk/reactos/base/applications/sc/sc.c trunk/reactos/base/applications/sc/sc.h trunk/reactos/base/applications/sc/usage.c Modified: trunk/reactos/base/applications/sc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/CMake… ============================================================================== --- trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] Tue Jun 7 21:51:37 2016 @@ -8,6 +8,7 @@ print.c query.c sc.c + sdshow.c start.c usage.c sc.h) Modified: trunk/reactos/base/applications/sc/sc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.c?… ============================================================================== --- trunk/reactos/base/applications/sc/sc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/sc.c [iso-8859-1] Tue Jun 7 21:51:37 2016 @@ -179,6 +179,18 @@ else ControlUsage(); } + else if (!lstrcmpi(Command, _T("sdshow"))) + { + if (ArgCount > 0) + { + ServiceName = *ServiceArgs++; + ArgCount--; + + SdShow(ServiceName); + } + else + SdShowUsage(); + } else { MainUsage(); Modified: trunk/reactos/base/applications/sc/sc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.h?… ============================================================================== --- trunk/reactos/base/applications/sc/sc.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/sc.h [iso-8859-1] Tue Jun 7 21:51:37 2016 @@ -6,6 +6,7 @@ #include <windef.h> #include <winbase.h> #include <winsvc.h> +#include <sddl.h> #include <tchar.h> #define SCDBG @@ -18,6 +19,7 @@ BOOL Query(LPCTSTR *ServiceArgs, DWORD ArgCount, BOOL bExtended); LPSERVICE_STATUS_PROCESS QueryService(LPCTSTR ServiceName); +BOOL SdShow(LPCTSTR ServiceName); /* print and error functions */ VOID PrintService(LPCTSTR ServiceName, LPSERVICE_STATUS_PROCESS pStatus, BOOL bExtended); @@ -35,5 +37,6 @@ VOID DeleteUsage(VOID); VOID CreateUsage(VOID); VOID ControlUsage(VOID); +VOID SdShowUsage(VOID); #endif /* _SC_PCH_ */ Added: trunk/reactos/base/applications/sc/sdshow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sdsho… ============================================================================== --- trunk/reactos/base/applications/sc/sdshow.c (added) +++ trunk/reactos/base/applications/sc/sdshow.c [iso-8859-1] Tue Jun 7 21:51:37 2016 @@ -0,0 +1,101 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/sc/sdshow.c + * PURPOSE: Show a service security descriptor + * COPYRIGHT: Copyright 2016 Eric Kohl + * + */ + +#include "sc.h" + +BOOL SdShow(LPCTSTR ServiceName) +{ + SC_HANDLE hManager = NULL; + SC_HANDLE hService = NULL; + BOOL bResult = TRUE; + DWORD cbBytesNeeded = 0; + PSECURITY_DESCRIPTOR pSecurityDescriptor = NULL; + LPTSTR pStringBuffer = NULL; + +#ifdef SCDBG + _tprintf(_T("service to show sd - %s\n\n"), ServiceName); +#endif + + hManager = OpenSCManager(NULL, + NULL, + SC_MANAGER_CONNECT); + if (hManager == NULL) + { + bResult = FALSE; + goto done; + } + + hService = OpenService(hManager, ServiceName, READ_CONTROL); + if (hService == NULL) + { + bResult = FALSE; + goto done; + } + + if (!QueryServiceObjectSecurity(hService, + DACL_SECURITY_INFORMATION, + (PSECURITY_DESCRIPTOR)&pSecurityDescriptor, + sizeof(PSECURITY_DESCRIPTOR), + &cbBytesNeeded)) + { + if (cbBytesNeeded == 0) + { + bResult = FALSE; + goto done; + } + } + + pSecurityDescriptor = HeapAlloc(GetProcessHeap(), 0, cbBytesNeeded); + if (pSecurityDescriptor == NULL) + { + SetLastError(ERROR_OUTOFMEMORY); + bResult = FALSE; + goto done; + } + + if (!QueryServiceObjectSecurity(hService, + DACL_SECURITY_INFORMATION, + pSecurityDescriptor, + cbBytesNeeded, + &cbBytesNeeded)) + { + bResult = FALSE; + goto done; + } + + if (!ConvertSecurityDescriptorToStringSecurityDescriptor(pSecurityDescriptor, + SDDL_REVISION_1, + DACL_SECURITY_INFORMATION, + &pStringBuffer, + NULL)) + { + bResult = FALSE; + goto done; + } + + _tprintf(_T("\n%s\n"), pStringBuffer); + +done: + if (bResult == FALSE) + ReportLastError(); + + if (pStringBuffer != NULL) + LocalFree(pStringBuffer); + + if (pSecurityDescriptor != NULL) + HeapFree(GetProcessHeap(), 0, pSecurityDescriptor); + + if (hService) + CloseServiceHandle(hService); + + if (hManager) + CloseServiceHandle(hManager); + + return bResult; +} Propchange: trunk/reactos/base/applications/sc/sdshow.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/sc/usage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/usage… ============================================================================== --- trunk/reactos/base/applications/sc/usage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/usage.c [iso-8859-1] Tue Jun 7 21:51:37 2016 @@ -41,8 +41,8 @@ // "\t qfailure : Queries the actions taken by a service upon failure.\n" _T("\t delete : Deletes a service (from the registry).\n") _T("\t create : Creates a service. (adds it to the registry).\n") - _T("\t control : Sends a control to a service.\n")); -// "\t sdshow : Displays a service's security descriptor.\n") + _T("\t control : Sends a control to a service.\n") + _T("\t sdshow : Displays a service's security descriptor.\n")); // "\t sdset : Sets a service's security descriptor.\n") // "\t GetDisplayName : Gets the DisplayName for a service.\n") // "\t GetKeyName : Gets the ServiceKeyName for a service.\n") @@ -190,3 +190,11 @@ _T("USAGE:\n") _T(" sc <server> control [service name] <value>\n")); } + +VOID SdShowUsage(VOID) +{ + _tprintf(_T("DESCRIPTION:\n") + _T(" Displays a service's security descriptor in SDDL format.\n") + _T("USAGE:\n") + _T(" sc <server> sdshow <service name>\n")); +}

8 years, 3 months

[apriyadarshi] 71589: Added AhciHwInterrupt -- Round Robin Implementation (SharedPort) Added Support Function AhciInterruptHandler Added DeviceInquiryRequest - Need to implement EVPD. SRB_FUNCTION_...

by apriyadarshi＠svn.reactos.org

Author: apriyadarshi Date: Tue Jun 7 18:06:51 2016 New Revision: 71589 URL: http://svn.reactos.org/svn/reactos?rev=71589&view=rev Log: Added AhciHwInterrupt -- Round Robin Implementation (SharedPort) Added Support Function AhciInterruptHandler Added DeviceInquiryRequest - Need to implement EVPD. SRB_FUNCTION_EXECUTE_SCSI for cdb->CDB10.OperationCode != SCSIOP_INQUIRY Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] Tue Jun 7 18:06:51 2016 @@ -6,22 +6,6 @@ */ #include "storahci.h" - -BOOLEAN AhciAdapterReset( - __in PAHCI_ADAPTER_EXTENSION adapterExtension -); - -__inline -VOID AhciZeroMemory( - __in PCHAR buffer, - __in ULONG bufferSize -); - -__inline -BOOLEAN IsPortValid( - __in PAHCI_ADAPTER_EXTENSION adapterExtension, - __in UCHAR pathId -); /** * @name AhciPortInitialize @@ -192,6 +176,24 @@ }// -- AhciHwInitialize(); /** + * @name AhciInterruptHandler + * @implemented + * + * Interrupt Handler for portExtension + * + * @param portExtension + * + */ +VOID AhciInterruptHandler( + __in PAHCI_PORT_EXTENSION portExtension +) +{ + StorPortDebugPrint(0, "AhciInterruptHandler()\n"); + StorPortDebugPrint(0, "\tPort Number: %d\n", portExtension->PortNumber); + +}// -- AhciInterruptHandler(); + +/** * @name AhciHwInterrupt * @implemented * @@ -207,11 +209,39 @@ __in PVOID AdapterExtension ) { + ULONG portPending, nextPort, i; PAHCI_ADAPTER_EXTENSION adapterExtension; StorPortDebugPrint(0, "AhciHwInterrupt()\n"); adapterExtension = (PAHCI_ADAPTER_EXTENSION)AdapterExtension; + + if (adapterExtension->StateFlags.Removed) + return FALSE; + + portPending = StorPortReadRegisterUlong(adapterExtension, adapterExtension->IS); + // we process interrupt for implemented ports only + portPending = portPending & adapterExtension->PortImplemented; + + if (portPending == 0) + return FALSE; + + for (i = 1; i <= MAXIMUM_AHCI_PORT_COUNT; i++) + { + nextPort = (adapterExtension->LastInterruptPort + i) % MAXIMUM_AHCI_PORT_COUNT; + + if ((portPending & (0x1 << nextPort)) == 0) + continue; + + if (nextPort == adapterExtension->LastInterruptPort + || adapterExtension->PortExtension[nextPort].IsActive == FALSE) + return FALSE; + + // we can assign this interrupt to this port + adapterExtension->LastInterruptPort = nextPort; + AhciInterruptHandler(nextPort); + return TRUE; + } return FALSE; }// -- AhciHwInterrupt(); @@ -302,7 +332,10 @@ PCDB cdb = (PCDB)&Srb->Cdb; if (cdb->CDB10.OperationCode == SCSIOP_INQUIRY) { - StorPortDebugPrint(0, "\tINQUIRY Called!\n"); + Srb->SrbStatus = DeviceInquiryRequest(adapterExtension, Srb, cdb); + StorPortNotification(RequestComplete, adapterExtension, Srb); + + return TRUE; } } else @@ -343,7 +376,7 @@ adapterExtension = (PAHCI_ADAPTER_EXTENSION)AdapterExtension; - return TRUE; + return FALSE; }// -- AhciHwResetBus(); /** @@ -455,15 +488,16 @@ adapterExtension->CAP = StorPortReadRegisterUlong(adapterExtension, &abar->CAP); adapterExtension->CAP2 = StorPortReadRegisterUlong(adapterExtension, &abar->CAP2); adapterExtension->Version = StorPortReadRegisterUlong(adapterExtension, &abar->VS); + adapterExtension->LastInterruptPort = -1; // 10.1.2 // 1. Indicate that system software is AHCI aware by setting GHC.AE to â1â. // 3.1.2 -- AE bit is read-write only if CAP.SAM is '0' ghc = StorPortReadRegisterUlong(adapterExtension, &abar->GHC); // AE := Highest Significant bit of GHC - if ((ghc & AHCI_Global_HBA_CONTROL_AE) == 1)//Hmm, controller was already in power state - { - // reset controller to have it in know state + if ((ghc & AHCI_Global_HBA_CONTROL_AE) != 0)//Hmm, controller was already in power state + { + // reset controller to have it in known state StorPortDebugPrint(0, "\tAE Already set, Reset()\n"); if (!AhciAdapterReset(adapterExtension)){ StorPortDebugPrint(0, "\tReset Failed!\n"); @@ -603,7 +637,7 @@ return FALSE; // HR -- Very first bit (lowest significant) - ghc = 1; + ghc = AHCI_Global_HBA_CONTROL_HR; StorPortWriteRegisterUlong(adapterExtension, &abar->GHC, ghc); for (ticks = 0; (ticks < 50) && @@ -647,7 +681,7 @@ * @param PathId * * @return - * return TRUE if bus was successfully reset + * return TRUE if provided port is valid (implemented) or not */ __inline BOOLEAN IsPortValid( @@ -657,5 +691,55 @@ { if (pathId >= MAXIMUM_AHCI_PORT_COUNT) return FALSE; + return adapterExtension->PortExtension[pathId].IsActive; }// -- IsPortValid() + +/** + * @name DeviceInquiryRequest + * @implemented + * + * Tells wheather given port is implemented or not + * + * @param adapterExtension + * @param Srb + * @param Cdb + * + * @return + * return STOR status for DeviceInquiryRequest + * + * @remark + * http://www.seagate.com/staticfiles/support/disc/manuals/Interface%20manuals… + */ +ULONG DeviceInquiryRequest( + __in PAHCI_ADAPTER_EXTENSION adapterExtension, + __in PSCSI_REQUEST_BLOCK Srb, + __in PCDB Cdb +) +{ + PVOID DataBuffer; + ULONG DataBufferLength; + + StorPortDebugPrint(0, "DeviceInquiryRequest()\n"); + + // 3.6.1 + // If the EVPD bit is set to zero, the device server shall return the standard INQUIRY data + if (Cdb->CDB6INQUIRY3.EnableVitalProductData == 0) + { + StorPortDebugPrint(0, "\tEVPD Inquired\n"); + } + else + { + StorPortDebugPrint(0, "\tVPD Inquired\n"); + + DataBuffer = Srb->DataBuffer; + DataBufferLength = Srb->DataTransferLength; + + if (DataBuffer == NULL) + return SRB_STATUS_INVALID_REQUEST; + + AhciZeroMemory((PCHAR)DataBuffer, DataBufferLength); + } + + return SRB_STATUS_BAD_FUNCTION; +}// -- DeviceInquiryRequest(); Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h [iso-8859-1] Tue Jun 7 18:06:51 2016 @@ -212,6 +212,7 @@ ULONG Version; ULONG CAP; ULONG CAP2; + ULONG LastInterruptPort; PVOID NonCachedExtension;// holds virtual address to noncached buffer allocated for Port Extension @@ -231,3 +232,29 @@ { ULONG Reserved[4]; } AHCI_SRB_EXTENSION; + +////////////////////////////////////////////////////////////// +// Declarations // +////////////////////////////////////////////////////////////// + +BOOLEAN AhciAdapterReset( + __in PAHCI_ADAPTER_EXTENSION adapterExtension +); + +__inline +VOID AhciZeroMemory( + __in PCHAR buffer, + __in ULONG bufferSize +); + +__inline +BOOLEAN IsPortValid( + __in PAHCI_ADAPTER_EXTENSION adapterExtension, + __in UCHAR pathId +); + +ULONG DeviceInquiryRequest( + __in PAHCI_ADAPTER_EXTENSION adapterExtension, + __in PSCSI_REQUEST_BLOCK Srb, + __in PCDB Cdb +);

8 years, 3 months

[apriyadarshi] 71588: AHCI-SATA Interface almost ready. - tested on VM. - need to implement Interrupt Routine (MessagePerPort) and ATA/ATAPI Based SCSI Query.

by apriyadarshi＠svn.reactos.org

Author: apriyadarshi Date: Tue Jun 7 11:05:32 2016 New Revision: 71588 URL: http://svn.reactos.org/svn/reactos?rev=71588&view=rev Log: AHCI-SATA Interface almost ready. - tested on VM. - need to implement Interrupt Routine (MessagePerPort) and ATA/ATAPI Based SCSI Query. Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/sources branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/sources URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/sources [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/sources [iso-8859-1] Tue Jun 7 11:05:32 2016 @@ -1,6 +1,7 @@ TARGETNAME = storahci TARGETTYPE = MINIPORT +MSC_WARNING_LEVEL=/W4 TARGETLIBS=$(DDK_LIB_PATH)\storport.lib INCLUDES = %BUILD%\inc Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] Tue Jun 7 11:05:32 2016 @@ -11,11 +11,18 @@ __in PAHCI_ADAPTER_EXTENSION adapterExtension ); +__inline VOID AhciZeroMemory( __in PCHAR buffer, __in ULONG bufferSize ); +__inline +BOOLEAN IsPortValid( + __in PAHCI_ADAPTER_EXTENSION adapterExtension, + __in UCHAR pathId +); + /** * @name AhciPortInitialize * @implemented @@ -40,6 +47,7 @@ adapterExtension = portExtension->AdapterExtension; abar = adapterExtension->ABAR_Address; + portExtension->Port = &abar->PortList[portExtension->PortNumber]; commandListPhysical = StorPortGetPhysicalAddress(adapterExtension, NULL, portExtension->CommandList, &mappedLength); @@ -61,6 +69,14 @@ StorPortWriteRegisterUlong(adapterExtension, &portExtension->Port->CLB, commandListPhysical.LowPart); StorPortWriteRegisterUlong(adapterExtension, &portExtension->Port->FB, receivedFISPhysical.LowPart); + // set device power state flag to D0 + portExtension->DevicePowerState = StorPowerDeviceD0; + + // clear pending interrupts + StorPortWriteRegisterUlong(adapterExtension, &portExtension->Port->SERR, (ULONG)-1); + StorPortWriteRegisterUlong(adapterExtension, &portExtension->Port->IS, (ULONG)-1); + StorPortWriteRegisterUlong(adapterExtension, portExtension->AdapterExtension->IS, (1 << portExtension->PortNumber)); + return TRUE; }// -- AhciPortInitialize(); @@ -87,7 +103,7 @@ StorPortDebugPrint(0, "AhciAllocateResourceForAdapter()\n"); - // 3.1.1 NCS = CAP[12:08] -> Align + // 3.1.1 NCS = CAP[12:08] -> Align NCS = (adapterExtension->CAP & 0xF00) >> 8; AlignedNCS = ((NCS/8) + 1) * 8; @@ -116,33 +132,16 @@ nonCachedExtension = (PCHAR)adapterExtension->NonCachedExtension; AhciZeroMemory(nonCachedExtension, nonCachedExtensionSize); - - - // allocate memory for port extension - /* --> Allocate memory for port extension, but right now it is returning STOR_STATUS_NOT_IMPLEMENTED - so, for testing purpose, I allocated during driver entry itself. - status = StorPortAllocatePool( - adapterExtension, - portCount * sizeof(AHCI_PORT_EXTENSION), - AHCI_POOL_TAG, - (PVOID*)&portsExtension); - - if (status != STOR_STATUS_SUCCESS){ - StorPortDebugPrint(0, "\tstatus : %x\n", status); - return FALSE; - } - - AhciZeroMemory((PCHAR)portsExtension, portCount * sizeof(AHCI_PORT_EXTENSION)); - */ + nonCachedExtensionSize /= portCount; currentCount = 0; - for (index = 0; index < 32; index++) - { + for (index = 0; index < MAXIMUM_AHCI_PORT_COUNT; index++) + { + adapterExtension->PortExtension[index].IsActive = FALSE; if ((adapterExtension->PortImplemented & (1<<index)) != 0) { - //adapterExtension->PortExtension[index] = (PAHCI_PORT_EXTENSION)((PCHAR)portsExtension + sizeof(AHCI_PORT_EXTENSION) * currentCount); - adapterExtension->PortExtension[index].PortNumber = index; + adapterExtension->PortExtension[index].IsActive = TRUE; adapterExtension->PortExtension[index].AdapterExtension = adapterExtension; adapterExtension->PortExtension[index].CommandList = (PAHCI_COMMAND_HEADER)(nonCachedExtension + (currentCount*nonCachedExtensionSize)); adapterExtension->PortExtension[index].ReceivedFIS = (PAHCI_RECEIVED_FIS)((PCHAR)adapterExtension->PortExtension[index].CommandList + sizeof(AHCI_COMMAND_HEADER) * AlignedNCS); @@ -168,11 +167,26 @@ __in PVOID AdapterExtension ) { + ULONG ghc, messageCount, status; PAHCI_ADAPTER_EXTENSION adapterExtension; StorPortDebugPrint(0, "AhciHwInitialize()\n"); adapterExtension = (PAHCI_ADAPTER_EXTENSION)AdapterExtension; + adapterExtension->StateFlags.MessagePerPort = FALSE; + + // First check what type of interrupt/synchronization device is using + ghc = StorPortReadRegisterUlong(adapterExtension, &adapterExtension->ABAR_Address->GHC); + + //When set to â1â by hardware, indicates that the HBA requested more than one MSI vector + //but has reverted to using the first vector only. When this bit is cleared to â0â, + //the HBA has not reverted to single MSI mode (i.e. hardware is already in single MSI mode, + //software has allocated the number of messages requested + if ((ghc & AHCI_Global_HBA_CONTROL_MRSM) == 0) + { + adapterExtension->StateFlags.MessagePerPort = TRUE; + StorPortDebugPrint(0, "\tMultiple MSI based message not supported\n"); + } return TRUE; }// -- AhciHwInitialize(); @@ -199,7 +213,7 @@ adapterExtension = (PAHCI_ADAPTER_EXTENSION)AdapterExtension; - return TRUE; + return FALSE; }// -- AhciHwInterrupt(); /** @@ -221,14 +235,87 @@ ) { - UCHAR function; + UCHAR function, pathId; PAHCI_ADAPTER_EXTENSION adapterExtension; StorPortDebugPrint(0, "AhciHwStartIo()\n"); + pathId = Srb->PathId; + function = Srb->Function; adapterExtension = (PAHCI_ADAPTER_EXTENSION)AdapterExtension; - function = Srb->Function; - + + if (!IsPortValid(adapterExtension, pathId)) + { + Srb->SrbStatus = SRB_STATUS_NO_DEVICE; + StorPortNotification(RequestComplete, adapterExtension, Srb); + return TRUE; + } + + // https://msdn.microsoft.com/windows/hardware/drivers/storage/handling-srb-fu… + // If the function member of an SRB is set to SRB_FUNCTION_PNP, + // the SRB is a structure of type SCSI_PNP_REQUEST_BLOCK. + if (function == SRB_FUNCTION_PNP) + { + PSCSI_PNP_REQUEST_BLOCK pnpRequest; + + pnpRequest = (PSCSI_PNP_REQUEST_BLOCK)Srb; + if ((pnpRequest->SrbPnPFlags & SRB_PNP_FLAGS_ADAPTER_REQUEST) != 0) + { + if (pnpRequest->PnPAction == StorRemoveDevice || + pnpRequest->PnPAction == StorSurpriseRemoval) + { + Srb->SrbStatus = SRB_STATUS_SUCCESS; + adapterExtension->StateFlags.Removed = 1; + StorPortDebugPrint(0, "\tadapter removed\n"); + } + else if (pnpRequest->PnPAction == StorStopDevice) + { + Srb->SrbStatus = SRB_STATUS_SUCCESS; + StorPortDebugPrint(0, "\tRequested to Stop the adapter\n"); + } + else + Srb->SrbStatus = SRB_STATUS_INVALID_REQUEST; + StorPortNotification(RequestComplete, adapterExtension, Srb); + return TRUE; + } + } + + if (function == SRB_FUNCTION_EXECUTE_SCSI) + { + // https://msdn.microsoft.com/en-us/windows/hardware/drivers/storage/handling-… + // On receipt of an SRB_FUNCTION_EXECUTE_SCSI request, a miniport driver's HwScsiStartIo + // routine does the following: + // + // - Gets and/or sets up whatever context the miniport driver maintains in its device, + // logical unit, and/or SRB extensions + // For example, a miniport driver might set up a logical unit extension with pointers + // to the SRB itself and the SRB DataBuffer pointer, the SRB DataTransferLength value, + // and a driver-defined value (or CDB SCSIOP_XXX value) indicating the operation to be + // carried out on the HBA. + // + // - Calls an internal routine to program the HBA, as partially directed by the SrbFlags, + // for the requested operation + // For a device I/O operation, such an internal routine generally selects the target device + // and sends the CDB over the bus to the target logical unit. + if (Srb->CdbLength > 0) + { + PCDB cdb = (PCDB)&Srb->Cdb; + if (cdb->CDB10.OperationCode == SCSIOP_INQUIRY) + { + StorPortDebugPrint(0, "\tINQUIRY Called!\n"); + } + } + else + { + Srb->SrbStatus = SRB_STATUS_BAD_FUNCTION; + StorPortNotification(RequestComplete, adapterExtension, Srb); + return TRUE; + } + } + + StorPortDebugPrint(0, "\tUnknow function code recieved: %x\n", function); + Srb->SrbStatus = SRB_STATUS_BAD_FUNCTION; + StorPortNotification(RequestComplete, adapterExtension, Srb); return TRUE; }// -- AhciHwStartIo(); @@ -305,7 +392,7 @@ ULONG portCount, portImplemented; ULONG pci_cfg_len; UCHAR pci_cfg_buf[0x30]; - + PAHCI_MEMORY_REGISTERS abar; PPCI_COMMON_CONFIG pciConfigData; PAHCI_ADAPTER_EXTENSION adapterExtension; @@ -315,7 +402,7 @@ adapterExtension = (PAHCI_ADAPTER_EXTENSION)AdapterExtension; adapterExtension->SlotNumber = ConfigInfo->SlotNumber; adapterExtension->SystemIoBusNumber = ConfigInfo->SystemIoBusNumber; - + // get PCI configuration header pci_cfg_len = StorPortGetBusData( adapterExtension, @@ -374,7 +461,7 @@ // 3.1.2 -- AE bit is read-write only if CAP.SAM is '0' ghc = StorPortReadRegisterUlong(adapterExtension, &abar->GHC); // AE := Highest Significant bit of GHC - if ((ghc & (0x1<<31)) == 1)//Hmm, controller was already in power state + if ((ghc & AHCI_Global_HBA_CONTROL_AE) == 1)//Hmm, controller was already in power state { // reset controller to have it in know state StorPortDebugPrint(0, "\tAE Already set, Reset()\n"); @@ -384,10 +471,10 @@ } } - ghc = 0x1<<31;// only AE=1 + ghc = AHCI_Global_HBA_CONTROL_AE;// only AE=1 StorPortWriteRegisterUlong(adapterExtension, &abar->GHC, ghc); - adapterExtension->IS = abar->IS; + adapterExtension->IS = &abar->IS; adapterExtension->PortImplemented = StorPortReadRegisterUlong(adapterExtension, &abar->PI); if (adapterExtension->PortImplemented == 0){ @@ -400,23 +487,23 @@ ConfigInfo->MaximumNumberOfTargets = 1; ConfigInfo->MaximumNumberOfLogicalUnits = 1; ConfigInfo->ResetTargetSupported = TRUE; - ConfigInfo->NumberOfBuses = 32; + ConfigInfo->NumberOfBuses = MAXIMUM_AHCI_PORT_COUNT; ConfigInfo->SynchronizationModel = StorSynchronizeFullDuplex; ConfigInfo->ScatterGather = TRUE; // Turn IE -- Interrupt Enabled - ghc |= 0x2; + ghc |= AHCI_Global_HBA_CONTROL_IE; StorPortWriteRegisterUlong(adapterExtension, &abar->GHC, ghc); - + // allocate necessary resource for each port if (!AhciAllocateResourceForAdapter(adapterExtension, ConfigInfo)){ StorPortDebugPrint(0, "\tAhciAllocateResourceForAdapter() == FALSE\n"); return SP_RETURN_ERROR; } - for (index = 0; index < 32; index++) - { - if ((adapterExtension->PortImplemented & (1<<index)) != 0) + for (index = 0; index < MAXIMUM_AHCI_PORT_COUNT; index++) + { + if ((adapterExtension->PortImplemented & (0x1<<index)) != 0) AhciPortInitialize(&adapterExtension->PortExtension[index]); } @@ -443,7 +530,7 @@ HW_INITIALIZATION_DATA hwInitializationData; ULONG i, status; - StorPortDebugPrint(0, "Storahci Loaded 10023\n"); + StorPortDebugPrint(0, "Storahci Loaded\n"); // initialize the hardware data structure AhciZeroMemory((PCHAR)&hwInitializationData, sizeof(HW_INITIALIZATION_DATA)); @@ -471,13 +558,14 @@ // set required extension sizes hwInitializationData.SrbExtensionSize = sizeof(AHCI_SRB_EXTENSION); hwInitializationData.DeviceExtensionSize = sizeof(AHCI_ADAPTER_EXTENSION); - + // register our hw init data status = StorPortInitialize( DriverObject, RegistryPath, &hwInitializationData, NULL); + StorPortDebugPrint(0, "\tstatus:%x\n", status); return status; }// -- DriverEntry(); @@ -494,7 +582,7 @@ * software sets GHC.HR to â1â and may poll until this bit is read to be â0â, at which point software knows that * the HBA reset has completed. * If the HBA has not cleared GHC.HR to â0â within 1 second of software setting GHC.HR to â1â, the HBA is in - * a hung or locked state. + * a hung or locked state. * * @param adapterExtension * @@ -538,6 +626,7 @@ * * @param buffer */ +__inline VOID AhciZeroMemory( __in PCHAR buffer, __in ULONG bufferSize @@ -547,3 +636,26 @@ for (i = 0; i < bufferSize; i++) buffer[i] = 0; }// -- AhciZeroMemory(); + +/** + * @name IsPortValid + * @implemented + * + * Tells wheather given port is implemented or not + * + * @param adapterExtension + * @param PathId + * + * @return + * return TRUE if bus was successfully reset + */ +__inline +BOOLEAN IsPortValid( + __in PAHCI_ADAPTER_EXTENSION adapterExtension, + __in UCHAR pathId +) +{ + if (pathId >= MAXIMUM_AHCI_PORT_COUNT) + return FALSE; + return adapterExtension->PortExtension[pathId].IsActive; +}// -- IsPortValid() Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h [iso-8859-1] Tue Jun 7 11:05:32 2016 @@ -4,11 +4,22 @@ * PURPOSE: To Implement AHCI Miniport driver targeting storport NT 5.2 * PROGRAMMERS: Aman Priyadarshi (aman.eureka(a)gmail.com) */ - + #include "miniport.h" #include "storport.h" #define AHCI_POOL_TAG 'ahci' +#define MAXIMUM_AHCI_PORT_COUNT 12 + +// section 3.1.2 +#define AHCI_Global_HBA_CONTROL_HR (0x1<<0) +#define AHCI_Global_HBA_CONTROL_IE (0x1<<1) +#define AHCI_Global_HBA_CONTROL_MRSM (0x1<<2) +#define AHCI_Global_HBA_CONTROL_AE (0x1<<31) + +////////////////////////////////////////////////////////////// +// ---- Support Structures --- // +////////////////////////////////////////////////////////////// typedef struct _AHCI_FIS_DMA_SETUP { @@ -24,7 +35,7 @@ ULONG Reserved2; //More reserved ULONG DmaBufferOffset; //Byte offset into buffer. First 2 bits must be 0 ULONG TranferCount; //Number of bytes to transfer. Bit 0 must be 0 - ULONG Reserved3; //Reserved + ULONG Reserved3; //Reserved } AHCI_FIS_DMA_SETUP; typedef struct _AHCI_PIO_SETUP_FIS @@ -54,12 +65,11 @@ USHORT TransferCount; UCHAR Reserved5[2]; - -} AHCI_PIO_SETUP_FIS; +} AHCI_PIO_SETUP_FIS; typedef struct _AHCI_D2H_REGISTER_FIS { - UCHAR FisType; // 0x34 + UCHAR FisType; UCHAR Reserved1 :6; UCHAR I:1; UCHAR Reserved2 :1; @@ -83,9 +93,9 @@ UCHAR Reserved4[4]; } AHCI_D2H_REGISTER_FIS; -typedef struct _AHCI_SET_DEVICE_BITS_FIS { - - UCHAR FisType; //0xA1 +typedef struct _AHCI_SET_DEVICE_BITS_FIS +{ + UCHAR FisType; UCHAR PMPort: 4; UCHAR Reserved1 :2; @@ -100,9 +110,13 @@ UCHAR Error; UCHAR Reserved5[4]; -} AHCI_SET_DEVICE_BITS_FIS; - -// 4.2.2 +} AHCI_SET_DEVICE_BITS_FIS; + +////////////////////////////////////////////////////////////// +// --------------------------- // +////////////////////////////////////////////////////////////// + +// 4.2.2 Command Header typedef struct _AHCI_COMMAND_HEADER { ULONG HEADER_DESCRIPTION; // DW 0 @@ -115,84 +129,81 @@ // Received FIS typedef struct _AHCI_RECEIVED_FIS { - AHCI_FIS_DMA_SETUP DmaSetupFIS; // 0x00 -- DMA Setup FIS - ULONG pad0; // 4 BYTE padding - AHCI_PIO_SETUP_FIS PioSetupFIS; // 0x20 -- PIO Setup FIS - ULONG pad1[3]; // 12 BYTE padding - AHCI_D2H_REGISTER_FIS RegisterFIS; // 0x40 -- Register â Device to Host FIS - ULONG pad2; // 4 BYTE padding - AHCI_SET_DEVICE_BITS_FIS SetDeviceFIS; // 0x58 -- Set Device Bit FIS - ULONG UnknowFIS[16]; // 0x60 -- Unknown FIS - ULONG Reserved[24]; // 0xA0 -- Reserved + struct _AHCI_FIS_DMA_SETUP DmaSetupFIS; // 0x00 -- DMA Setup FIS + ULONG pad0; // 4 BYTE padding + struct _AHCI_PIO_SETUP_FIS PioSetupFIS; // 0x20 -- PIO Setup FIS + ULONG pad1[3]; // 12 BYTE padding + struct _AHCI_D2H_REGISTER_FIS RegisterFIS; // 0x40 -- Register â Device to Host FIS + ULONG pad2; // 4 BYTE padding + struct _AHCI_SET_DEVICE_BITS_FIS SetDeviceFIS; // 0x58 -- Set Device Bit FIS + ULONG UnknowFIS[16]; // 0x60 -- Unknown FIS + ULONG Reserved[24]; // 0xA0 -- Reserved } AHCI_RECEIVED_FIS, *PAHCI_RECEIVED_FIS; +// Holds Port Information typedef struct _AHCI_PORT { - ULONG CLB; // 0x00, command list base address, 1K-byte aligned - ULONG CLBU; // 0x04, command list base address upper 32 bits - ULONG FB; // 0x08, FIS base address, 256-byte aligned - ULONG FBU; // 0x0C, FIS base address upper 32 bits - ULONG IS; // 0x10, interrupt status - ULONG IE; // 0x14, interrupt enable - ULONG CMD; // 0x18, command and status - ULONG RSV0; // 0x1C, Reserved - ULONG TFD; // 0x20, task file data - ULONG SIG; // 0x24, signature - ULONG SSTS; // 0x28, SATA status (SCR0:SStatus) - ULONG SCTL; // 0x2C, SATA control (SCR2:SControl) - ULONG SERR; // 0x30, SATA error (SCR1:SError) - ULONG SACT; // 0x34, SATA active (SCR3:SActive) - ULONG CI; // 0x38, command issue - ULONG SNTF; // 0x3C, SATA notification (SCR4:SNotification) - ULONG FBS; // 0x40, FIS-based switch control - ULONG RSV1[11]; // 0x44 ~ 0x6F, Reserved - ULONG Vendor[4]; // 0x70 ~ 0x7F, vendor specific + ULONG CLB; // 0x00, command list base address, 1K-byte aligned + ULONG CLBU; // 0x04, command list base address upper 32 bits + ULONG FB; // 0x08, FIS base address, 256-byte aligned + ULONG FBU; // 0x0C, FIS base address upper 32 bits + ULONG IS; // 0x10, interrupt status + ULONG IE; // 0x14, interrupt enable + ULONG CMD; // 0x18, command and status + ULONG RSV0; // 0x1C, Reserved + ULONG TFD; // 0x20, task file data + ULONG SIG; // 0x24, signature + ULONG SSTS; // 0x28, SATA status (SCR0:SStatus) + ULONG SCTL; // 0x2C, SATA control (SCR2:SControl) + ULONG SERR; // 0x30, SATA error (SCR1:SError) + ULONG SACT; // 0x34, SATA active (SCR3:SActive) + ULONG CI; // 0x38, command issue + ULONG SNTF; // 0x3C, SATA notification (SCR4:SNotification) + ULONG FBS; // 0x40, FIS-based switch control + ULONG RSV1[11]; // 0x44 ~ 0x6F, Reserved + ULONG Vendor[4]; // 0x70 ~ 0x7F, vendor specific } AHCI_PORT, *PAHCI_PORT; typedef struct _AHCI_MEMORY_REGISTERS { // 0x00 - 0x2B, Generic Host Control - ULONG CAP; // 0x00, Host capability - ULONG GHC; // 0x04, Global host control - ULONG IS; // 0x08, Interrupt status - ULONG PI; // 0x0C, Port implemented - ULONG VS; // 0x10, Version - ULONG CCC_CTL; // 0x14, Command completion coalescing control - ULONG CCC_PTS; // 0x18, Command completion coalescing ports - ULONG EM_LOC; // 0x1C, Enclosure management location - ULONG EM_CTL; // 0x20, Enclosure management control - ULONG CAP2; // 0x24, Host capabilities extended - ULONG BOHC; // 0x28, BIOS/OS handoff control and status - - // 0x2C - 0x9F, Reserved - ULONG Reserved[0xA0-0x2C]; - - // 0xA0 - 0xFF, Vendor specific registers - ULONG VendorSpecific[0x100-0xA0]; - - AHCI_PORT PortList[32];//1~32 + ULONG CAP; // 0x00, Host capability + ULONG GHC; // 0x04, Global host control + ULONG IS; // 0x08, Interrupt status + ULONG PI; // 0x0C, Port implemented + ULONG VS; // 0x10, Version + ULONG CCC_CTL; // 0x14, Command completion coalescing control + ULONG CCC_PTS; // 0x18, Command completion coalescing ports + ULONG EM_LOC; // 0x1C, Enclosure management location + ULONG EM_CTL; // 0x20, Enclosure management control + ULONG CAP2; // 0x24, Host capabilities extended + ULONG BOHC; // 0x28, BIOS/OS handoff control and status + ULONG Reserved[0xA0-0x2C]; // 0x2C - 0x9F, Reserved + ULONG VendorSpecific[0x100-0xA0]; // 0xA0 - 0xFF, Vendor specific registers + AHCI_PORT PortList[MAXIMUM_AHCI_PORT_COUNT]; } AHCI_MEMORY_REGISTERS, *PAHCI_MEMORY_REGISTERS; -struct _AHCI_ADAPTER_EXTENSION; - +// Holds information for each attached attached port to a given adapter. typedef struct _AHCI_PORT_EXTENSION { ULONG PortNumber; - struct _AHCI_ADAPTER_EXTENSION* AdapterExtension; + BOOLEAN IsActive; + PAHCI_PORT Port; // AHCI Port Infomation + PAHCI_RECEIVED_FIS ReceivedFIS; PAHCI_COMMAND_HEADER CommandList; - PAHCI_RECEIVED_FIS ReceivedFIS; - PAHCI_PORT Port; + STOR_DEVICE_POWER_STATE DevicePowerState; // Device Power State + struct _AHCI_ADAPTER_EXTENSION* AdapterExtension; // Port's Adapter Information } AHCI_PORT_EXTENSION, *PAHCI_PORT_EXTENSION; +// Holds Adapter Information typedef struct _AHCI_ADAPTER_EXTENSION { - ULONG AdapterNumber; ULONG SystemIoBusNumber; ULONG SlotNumber; ULONG AhciBaseAddress; - ULONG IS; // Interrupt status - ULONG PortImplemented; + PULONG IS;// Interrupt Status, In case of MSIM == `1` + ULONG PortImplemented;// bit-mapping of ports which are implemented USHORT VendorID; USHORT DeviceID; @@ -202,10 +213,18 @@ ULONG CAP; ULONG CAP2; - PVOID NonCachedExtension; + PVOID NonCachedExtension;// holds virtual address to noncached buffer allocated for Port Extension + + struct + { + // Message per port or shared port? + ULONG MessagePerPort : 1; + ULONG Removed : 1; + ULONG Reserved : 30; // not in use -- maintain 4 byte alignment + } StateFlags; PAHCI_MEMORY_REGISTERS ABAR_Address; - AHCI_PORT_EXTENSION PortExtension[32]; + AHCI_PORT_EXTENSION PortExtension[MAXIMUM_AHCI_PORT_COUNT]; } AHCI_ADAPTER_EXTENSION, *PAHCI_ADAPTER_EXTENSION; typedef struct _AHCI_SRB_EXTENSION

8 years, 3 months

← Newer
1
...
9
10
11
12
13
14
15
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2016