Ros-diffs August 2017

ros-diffs@reactos.org

22 participants
262 discussions

[gadamopoulos] 75666: [SHELL32] -Silence two unneeded prints.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Aug 25 08:59:10 2017 New Revision: 75666 URL: http://svn.reactos.org/svn/reactos?rev=75666&view=rev Log: [SHELL32] -Silence two unneeded prints. Modified: trunk/reactos/dll/win32/shell32/CIDLDataObj.cpp Modified: trunk/reactos/dll/win32/shell32/CIDLDataObj.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CIDLData… ============================================================================== --- trunk/reactos/dll/win32/shell32/CIDLDataObj.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CIDLDataObj.cpp [iso-8859-1] Fri Aug 25 08:59:10 2017 @@ -394,12 +394,12 @@ HRESULT WINAPI CIDLDataObj::StartOperation(IBindCtx *pbcReserved) { - FIXME("(%p)->()\n", this); + TRACE("(%p)->()\n", this); return E_NOTIMPL; } HRESULT WINAPI CIDLDataObj::EndOperation(HRESULT hResult, IBindCtx *pbcReserved, DWORD dwEffects) { - FIXME("(%p)->()\n", this); + TRACE("(%p)->()\n", this); return E_NOTIMPL; }

7 years

[gadamopoulos] 75665: [SHELL32] -CRecycleBin: Call GetDriveTypeW with correct parameters. Now files can be deleted to the recycle bin again. Patch by Serge Gautherie. CORE-12340

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Aug 25 08:44:13 2017 New Revision: 75665 URL: http://svn.reactos.org/svn/reactos?rev=75665&view=rev Log: [SHELL32] -CRecycleBin: Call GetDriveTypeW with correct parameters. Now files can be deleted to the recycle bin again. Patch by Serge Gautherie. CORE-12340 Modified: trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] Fri Aug 25 08:44:13 2017 @@ -885,13 +885,19 @@ return FALSE; } - if (GetDriveTypeW(wszPath) != DRIVE_FIXED) + // Only keep the base path. + WCHAR wszRootPathName[MAX_PATH]; + strcpyW(wszRootPathName, wszPath); + PathRemoveFileSpecW(wszRootPathName); + PathAddBackslashW(wszRootPathName); + + if (GetDriveTypeW(wszRootPathName) != DRIVE_FIXED) { /* no bitbucket on removable media */ return FALSE; } - if (!GetVolumeInformationW(wszPath, NULL, 0, &VolSerialNumber, &MaxComponentLength, &FileSystemFlags, NULL, 0)) + if (!GetVolumeInformationW(wszRootPathName, NULL, 0, &VolSerialNumber, &MaxComponentLength, &FileSystemFlags, NULL, 0)) { ERR("GetVolumeInformationW failed with %u\n", GetLastError()); return FALSE;

7 years

[ashaposhnikov] 75664: [RAPPS] - HACKFIX for ReactOS in gui.cpp - prevent counting below zero see explanation comment - Fix for percentage being shown incorrectly

by ashaposhnikov＠svn.reactos.org

Author: ashaposhnikov Date: Thu Aug 24 23:48:10 2017 New Revision: 75664 URL: http://svn.reactos.org/svn/reactos?rev=75664&view=rev Log: [RAPPS] - HACKFIX for ReactOS in gui.cpp - prevent counting below zero see explanation comment - Fix for percentage being shown incorrectly Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] Thu Aug 24 23:48:10 2017 @@ -1059,7 +1059,17 @@ if ((pnic->uNewState & LVIS_STATEIMAGEMASK) && !bUpdating) { BOOL checked = ListView_GetCheckState(pnic->hdr.hwndFrom, pnic->iItem); - nSelectedApps += (checked) ? 1 : -1; + /* FIXME: HAX! + - preventing decremention below zero as a safeguard for ReactOS + In ReactOS this action is triggered whenever user changes *selection*, but should be only when *checkbox* state toggled + Maybe LVIS_STATEIMAGEMASK is set incorrectly + */ + nSelectedApps += + (checked) + ? 1 + :((nSelectedApps > 0) + ? -1 + : 0); UpdateStatusBarText(); } } @@ -1290,7 +1300,7 @@ break; case ID_INSTALL: - if (nSelectedApps) + if (nSelectedApps > 0) { CDownloadManager::DownloadListOfApplications(m_ListView->GetCheckedItems()); UpdateApplicationsList(-1); Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp [iso-8859-1] Thu Aug 24 23:48:10 2017 @@ -163,9 +163,9 @@ m_UrlHasBeenCopied = TRUE; } - SetLastError(0); + SetLastError(ERROR_SUCCESS); r = GetWindowLongPtrW(m_hDialog, GWLP_USERDATA); - if (0 != r || 0 != GetLastError()) + if (r || GetLastError() != ERROR_SUCCESS) { *m_pbCancelled = TRUE; return E_ABORT; @@ -432,7 +432,7 @@ case WM_CLOSE: EndDialog(Dlg, 0); - DestroyWindow(Dlg); + //DestroyWindow(Dlg); return TRUE; default: @@ -719,6 +719,7 @@ if (hOut == INVALID_HANDLE_VALUE) goto end; + dwCurrentBytesRead = 0; do { if (!InternetReadFile(hFile, lpBuffer, _countof(lpBuffer), &dwBytesRead)) @@ -734,7 +735,7 @@ } dwCurrentBytesRead += dwBytesRead; - dl->OnProgress(dwCurrentBytesRead, dwContentLen, 0, pCurrentInfo->szUrlDownload); + dl->OnProgress(dwCurrentBytesRead, dwContentLen, 0, pCurrentInfo->szUrlDownload.GetString()); } while (dwBytesRead && !bCancelled); CloseHandle(hOut); @@ -870,6 +871,5 @@ hMainWnd, DownloadDlgProc); } - } // CDownloadManager

7 years

[gadamopoulos] 75663: [USER32_APITEST] -Add a monster of a test to check if WM_DESTROYCLIPBOARD is blocking or not. Use a critical section while recording as we use a single message cache in two th...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Aug 24 23:08:09 2017 New Revision: 75663 URL: http://svn.reactos.org/svn/reactos?rev=75663&view=rev Log: [USER32_APITEST] -Add a monster of a test to check if WM_DESTROYCLIPBOARD is blocking or not. Use a critical section while recording as we use a single message cache in two threads. After 50154, 50816, 50846 and 75616 changing back and forth, this test shows that 75616 is correct and making sure that it won't be changed again in the future, somehting that would break the ole clipboard. Added: trunk/rostests/apitests/user32/EmptyClipboard.c (with props) Modified: trunk/rostests/apitests/user32/CMakeLists.txt trunk/rostests/apitests/user32/testlist.c Modified: trunk/rostests/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CMakeList… ============================================================================== --- trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] Thu Aug 24 23:08:09 2017 @@ -9,6 +9,7 @@ DestroyCursorIcon.c DrawIconEx.c desktop.c + EmptyClipboard.c EnumDisplaySettings.c GetDCEx.c GetIconInfo.c Added: trunk/rostests/apitests/user32/EmptyClipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/EmptyClip… ============================================================================== --- trunk/rostests/apitests/user32/EmptyClipboard.c (added) +++ trunk/rostests/apitests/user32/EmptyClipboard.c [iso-8859-1] Thu Aug 24 23:08:09 2017 @@ -0,0 +1,195 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for EmptyClipboard + * PROGRAMMERS: Giannis Adamopoulos + */ + +#include <apitest.h> + +#include <wingdi.h> +#include <winuser.h> + +#include <msgtrace.h> +#include <user32testhelpers.h> + +HWND hWnd1, hWnd2; + +CRITICAL_SECTION CritSect; + +/* FIXME: test for HWND_TOP, etc...*/ +static int get_iwnd(HWND hWnd) +{ + if(hWnd == hWnd1) return 1; + else if(hWnd2 && hWnd == hWnd2) return 2; + else return 0; +} + +LRESULT CALLBACK ClipTestProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + int iwnd = get_iwnd(hWnd); + + if(message > WM_USER || !iwnd || IsDWmMsg(message) || IseKeyMsg(message)) + return DefWindowProc(hWnd, message, wParam, lParam); + + switch(message) + { + case WM_GETICON : + case WM_SETICON: + break; + case WM_DESTROYCLIPBOARD: + Sleep(1000); + default: + EnterCriticalSection(&CritSect); + RECORD_MESSAGE(iwnd, message, SENT, 0,0); + LeaveCriticalSection(&CritSect); + } + return DefWindowProc(hWnd, message, wParam, lParam); +} + +static void RecordAndDispatch(MSG* pmsg) +{ + int iwnd = get_iwnd(pmsg->hwnd); + if(!(pmsg->message > WM_USER || !iwnd || IsDWmMsg(pmsg->message) || IseKeyMsg(pmsg->message))) + { + EnterCriticalSection(&CritSect); + RECORD_MESSAGE(iwnd, pmsg->message, POST,0,0); + LeaveCriticalSection(&CritSect); + } + DispatchMessageA( pmsg ); +} + +static void FlushMessages() +{ + MSG msg; + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) + RecordAndDispatch(&msg); +} + +static DWORD WINAPI ClipThread(PVOID Parameter) +{ + BOOL ret; + + hWnd2 = CreateWindowW(L"clipstest", L"clipstest", WS_OVERLAPPEDWINDOW, + 20, 20, 300, 300, NULL, NULL, 0, NULL); + + /* Get ownership of the clipboard and record the messages we get */ + ret = OpenClipboard(hWnd2); + ok (ret, "OpenClipboard failed\n"); + + EnterCriticalSection(&CritSect); + RECORD_MESSAGE(1, WM_DESTROYCLIPBOARD, MARKER,0,0); + LeaveCriticalSection(&CritSect); + + ret = EmptyClipboard(); + ok (ret, "EmptyClipboard failed\n"); + + EnterCriticalSection(&CritSect); + RECORD_MESSAGE(1, WM_DESTROYCLIPBOARD, MARKER,1,0); + LeaveCriticalSection(&CritSect); + + ret = CloseClipboard(); + ok (ret, "CloseClipboard failed\n"); + + /* Record if we got any post messages */ + FlushMessages(); + + /* Force the parent thread out of its loop */ + PostMessageW(hWnd1, WM_QUIT, 0, 0); + + return 0; +} + +MSG_ENTRY EmptyClipboard_chain[]={ + {1,WM_DESTROYCLIPBOARD, MARKER, 0}, + {1,WM_DESTROYCLIPBOARD, SENT}, + {1,WM_DESTROYCLIPBOARD, MARKER, 1}, + {0,0}}; + +void TestMessages() +{ + HANDLE hThread; + DWORD dwThread; + BOOL ret; + MSG msg; + + /* Initialize the test */ + InitializeCriticalSection(&CritSect); + + RegisterSimpleClass(ClipTestProc, L"clipstest"); + + hWnd2 = NULL; + hWnd1 = CreateWindowW(L"clipstest", L"clipstest", WS_OVERLAPPEDWINDOW, + 20, 20, 300, 300, NULL, NULL, 0, NULL); + ok (hWnd1 != NULL, "CreateWindowW failed\n"); + + EMPTY_CACHE(); + + /* Get ownership of the clipboard and record the messages we get */ + ret = OpenClipboard(hWnd1); + ok (ret, "OpenClipboard failed\n"); + + ret = EmptyClipboard(); + ok (ret, "EmptyClipboard failed\n"); + + ret = CloseClipboard(); + ok (ret, "CloseClipboard failed\n"); + + /* Record posted messages */ + FlushMessages(); + COMPARE_CACHE(empty_chain); + + /* Create the child thread and record messages till we get the WM_QUIT */ + hThread = CreateThread(NULL, 0, ClipThread, NULL, 0, &dwThread); + + while (GetMessage(&msg, 0, 0 ,0)) + RecordAndDispatch(&msg); + + COMPARE_CACHE(EmptyClipboard_chain); + + CloseHandle(hThread); +} + +void TestOwnership() +{ + BOOL ret; + HWND hWnd, hWndClipOwner; + + ret = OpenClipboard(NULL); + ok (ret, "OpenClipboard failed\n"); + + ret = EmptyClipboard(); + ok (ret, "EmptyClipboard failed\n"); + + ret = CloseClipboard(); + ok (ret, "CloseClipboard failed\n"); + + hWndClipOwner = GetClipboardOwner(); + ok (hWndClipOwner == NULL, "Expected NULL owner\n"); + + hWnd = CreateWindowW(L"static", L"static", WS_OVERLAPPEDWINDOW, 20, 20, 300, 300, NULL, NULL, 0, NULL); + ok (hWnd != 0 , "CreateWindowW failed\n"); + + ret = OpenClipboard(hWnd); + ok (ret, "OpenClipboard failed\n"); + + hWndClipOwner = GetClipboardOwner(); + ok (hWndClipOwner == NULL, "Expected NULL owner\n"); + + ret = EmptyClipboard(); + ok (ret, "EmptyClipboard failed\n"); + + ret = CloseClipboard(); + ok (ret, "CloseClipboard failed\n"); + + hWndClipOwner = GetClipboardOwner(); + ok (hWndClipOwner == hWnd, "Expected hWnd owner\n"); + + DestroyWindow(hWnd); +} + +START_TEST(EmptyClipboard) +{ + TestOwnership(); + TestMessages(); +} Propchange: trunk/rostests/apitests/user32/EmptyClipboard.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/testlist.… ============================================================================== --- trunk/rostests/apitests/user32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/testlist.c [iso-8859-1] Thu Aug 24 23:08:09 2017 @@ -11,6 +11,7 @@ extern void func_DestroyCursorIcon(void); extern void func_DrawIconEx(void); extern void func_desktop(void); +extern void func_EmptyClipboard(void); extern void func_EnumDisplaySettings(void); extern void func_GetDCEx(void); extern void func_GetIconInfo(void); @@ -50,6 +51,7 @@ { "DestroyCursorIcon", func_DestroyCursorIcon }, { "DrawIconEx", func_DrawIconEx }, { "desktop", func_desktop }, + { "EmptyClipboard", func_EmptyClipboard }, { "EnumDisplaySettings", func_EnumDisplaySettings }, { "GetDCEx", func_GetDCEx }, { "GetIconInfo", func_GetIconInfo },

7 years

[ashaposhnikov] 75662: [RAPPS] Changes in the update process: - Made UpdateAppsDB() functions static and added ForceUpdateAppsDB() - EnumAvailableApplications() doesn't update DB on it's own - Forc...

by ashaposhnikov＠svn.reactos.org

Author: ashaposhnikov Date: Thu Aug 24 22:04:44 2017 New Revision: 75662 URL: http://svn.reactos.org/svn/reactos?rev=75662&view=rev Log: [RAPPS] Changes in the update process: - Made UpdateAppsDB() functions static and added ForceUpdateAppsDB() - EnumAvailableApplications() doesn't update DB on it's own - Force updating now done only if bUpdateAtStart set or if no settings loaded (first run) - Minor cleanup Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1] Thu Aug 24 22:04:44 2017 @@ -201,15 +201,28 @@ // CAvailableApplicationInfo // CAvailableApps -CAvailableApps::CAvailableApps() -{ - //set all paths - if (GetStorageDirectory(m_szPath)) +ATL::CStringW CAvailableApps::m_szPath; +ATL::CStringW CAvailableApps::m_szCabPath; +ATL::CStringW CAvailableApps::m_szAppsPath; +ATL::CStringW CAvailableApps::m_szSearchPath; + +BOOL CAvailableApps::InitializeStaticStrings() +{ + //FIXME: maybe provide a fallback? + if (m_szPath.IsEmpty() && GetStorageDirectory(m_szPath)) { m_szAppsPath = m_szPath + L"\\rapps\\"; m_szCabPath = m_szPath + L"\\rappmgr.cab"; m_szSearchPath = m_szAppsPath + L"*.txt"; - } + return TRUE; + } + return FALSE; +} + +CAvailableApps::CAvailableApps() +{ + //set all paths + InitializeStaticStrings(); } VOID CAvailableApps::FreeCachedEntries() @@ -235,7 +248,6 @@ if (m_szPath.IsEmpty()) return; - DeleteFileW(m_szCabPath.GetString()); hFind = FindFirstFileW(m_szSearchPath.GetString(), &FindFileData); if (hFind != INVALID_HANDLE_VALUE) @@ -248,50 +260,62 @@ } while (FindNextFileW(hFind, &FindFileData) != 0); FindClose(hFind); } + + RemoveDirectoryW(m_szAppsPath); + RemoveDirectoryW(m_szPath); } BOOL CAvailableApps::UpdateAppsDB() -{ - DeleteCurrentAppsDB(); - - CDownloadManager::DownloadApplicationsDB(APPLICATION_DATABASE_URL); - - if (m_szPath.IsEmpty()) - return FALSE; - - if (!ExtractFilesFromCab(m_szCabPath, m_szAppsPath)) - { - return FALSE; - } - - return TRUE; -} - -BOOL CAvailableApps::EnumAvailableApplications(INT EnumType, AVAILENUMPROC lpEnumProc) { HANDLE hFind = INVALID_HANDLE_VALUE; WIN32_FIND_DATAW FindFileData; - if (!CreateDirectoryW(m_szPath.GetString(), NULL) && - GetLastError() != ERROR_ALREADY_EXISTS) - { - return FALSE; - } - + if (m_szPath.IsEmpty() && !InitializeStaticStrings()) + { + return FALSE; + } + + if (!CreateDirectoryW(m_szPath.GetString(), NULL) && GetLastError() != ERROR_ALREADY_EXISTS) + { + return FALSE; + } + + //if there are some files in the db folder - we're good hFind = FindFirstFileW(m_szSearchPath.GetString(), &FindFileData); + if (hFind != INVALID_HANDLE_VALUE) + { + return TRUE; + } + + CDownloadManager::DownloadApplicationsDB(APPLICATION_DATABASE_URL); + + if (!ExtractFilesFromCab(m_szCabPath, m_szAppsPath)) + { + return FALSE; + } + + DeleteFileW(m_szCabPath.GetString()); + + return TRUE; +} + +BOOL CAvailableApps::ForceUpdateAppsDB() +{ + DeleteCurrentAppsDB(); + return UpdateAppsDB(); +} + +BOOL CAvailableApps::EnumAvailableApplications(INT EnumType, AVAILENUMPROC lpEnumProc) +{ + HANDLE hFind = INVALID_HANDLE_VALUE; + WIN32_FIND_DATAW FindFileData; + + hFind = FindFirstFileW(m_szSearchPath.GetString(), &FindFileData); if (hFind == INVALID_HANDLE_VALUE) { - if(!UpdateAppsDB()) { - return FALSE; - } - - hFind = FindFirstFileW(m_szSearchPath.GetString(), &FindFileData); - - if (hFind == INVALID_HANDLE_VALUE) - { - return FALSE; - } + //no db yet + return FALSE; } do Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] Thu Aug 24 22:04:44 2017 @@ -1321,7 +1321,7 @@ break; case ID_RESETDB: - m_AvailableApps.UpdateAppsDB(); + CAvailableApps::ForceUpdateAppsDB(); UpdateApplicationsList(-1); break; Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h [iso-8859-1] Thu Aug 24 22:04:44 2017 @@ -107,16 +107,21 @@ class CAvailableApps { ATL::CAtlList<CAvailableApplicationInfo*> m_InfoList; - ATL::CStringW m_szPath; - ATL::CStringW m_szCabPath; - ATL::CStringW m_szAppsPath; - ATL::CStringW m_szSearchPath; + static ATL::CStringW m_szPath; + static ATL::CStringW m_szCabPath; + static ATL::CStringW m_szAppsPath; + static ATL::CStringW m_szSearchPath; + + static BOOL InitializeStaticStrings(); public: CAvailableApps(); + + static BOOL UpdateAppsDB(); + static BOOL ForceUpdateAppsDB(); + VOID FreeCachedEntries(); - VOID DeleteCurrentAppsDB(); - BOOL UpdateAppsDB(); + static VOID DeleteCurrentAppsDB(); BOOL EnumAvailableApplications(INT EnumType, AVAILENUMPROC lpEnumProc); const PAPPLICATION_INFO FindInfo(const ATL::CStringW& szAppName); ATL::CSimpleArray<PAPPLICATION_INFO> FindInfoList(const ATL::CSimpleArray<ATL::CStringW> &arrAppsNames); Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp [iso-8859-1] Thu Aug 24 22:04:44 2017 @@ -565,7 +565,6 @@ continue; } - // build the path for the download p = wcsrchr(pCurrentInfo->szUrlDownload.GetString(), L'/'); q = wcsrchr(pCurrentInfo->szUrlDownload.GetString(), L'?'); Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp [iso-8859-1] Thu Aug 24 22:04:44 2017 @@ -56,6 +56,7 @@ } CAvailableApps apps; + CAvailableApps::UpdateAppsDB(); apps.EnumAvailableApplications(ENUM_ALL_AVAILABLE, NULL); ATL::CSimpleArray<PAPPLICATION_INFO> arrAppInfo = apps.FindInfoList(arrNames); if (arrAppInfo.GetSize() > 0) Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp [iso-8859-1] Thu Aug 24 22:04:44 2017 @@ -128,6 +128,7 @@ HANDLE hMutex; HACCEL KeyBrd; MSG Msg; + BOOL bFirstLaunch; InitializeAtlModule(hInstance, TRUE); @@ -149,8 +150,8 @@ SetForegroundWindow(hWindow); return 1; } - - if (!LoadSettings()) + bFirstLaunch = LoadSettings(); + if (bFirstLaunch) { FillDefaultSettings(&SettingsInfo); } @@ -158,19 +159,19 @@ InitLogs(); InitCommonControls(); - //skip window creation if there were some keys + // skip window creation if there were some keys if (!CmdParser(lpCmdLine)) { + if (SettingsInfo.bUpdateAtStart || bFirstLaunch) + CAvailableApps::ForceUpdateAppsDB(); + hMainWnd = CreateMainWindow(); + if (hMainWnd) { /* Maximize it if we must */ - ShowWindow(hMainWnd, (SettingsInfo.bSaveWndPos && SettingsInfo.Maximized ? SW_MAXIMIZE : nShowCmd)); + ShowWindow(hMainWnd, ((SettingsInfo.bSaveWndPos && SettingsInfo.Maximized) ? SW_MAXIMIZE : nShowCmd)); UpdateWindow(hMainWnd); - - //TODO: get around the ugliness - if (SettingsInfo.bUpdateAtStart) - GetAvailableApps()->UpdateAppsDB(); /* Load the menu hotkeys */ KeyBrd = LoadAcceleratorsW(NULL, MAKEINTRESOURCEW(HOTKEYS));

7 years

[jimtabor] 75661: [User32] - Patch by mudhead : If the index is out of range, no error should be set, see CORE-13716.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Aug 24 22:03:01 2017 New Revision: 75661 URL: http://svn.reactos.org/svn/reactos?rev=75661&view=rev Log: [User32] - Patch by mudhead : If the index is out of range, no error should be set, see CORE-13716. Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] Thu Aug 24 22:03:01 2017 @@ -50,7 +50,6 @@ return gpsi->ahbrSystem[nIndex]; } - SetLastError(ERROR_INVALID_PARAMETER); return NULL; }

7 years

[ashaposhnikov] 75660: [RAPPS] - Clean up the DB directory if extracting failed

by ashaposhnikov＠svn.reactos.org

Author: ashaposhnikov Date: Thu Aug 24 21:56:27 2017 New Revision: 75660 URL: http://svn.reactos.org/svn/reactos?rev=75660&view=rev Log: [RAPPS] - Clean up the DB directory if extracting failed Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp [iso-8859-1] Thu Aug 24 21:56:27 2017 @@ -267,6 +267,10 @@ { FreeLibrary(hCabinetDll); return TRUE; + } + else + { + RemoveDirectoryW(lpOutputPath); } } }

7 years

[ashaposhnikov] 75659: [RAPPS] - Changed the download process - now ThreadFunc handles the download loop - Passing values to ThreadFunc as a parameter rather than static members - Declared .cab dow...

by ashaposhnikov＠svn.reactos.org

Author: ashaposhnikov Date: Thu Aug 24 18:46:39 2017 New Revision: 75659 URL: http://svn.reactos.org/svn/reactos?rev=75659&view=rev Log: [RAPPS] - Changed the download process - now ThreadFunc handles the download loop - Passing values to ThreadFunc as a parameter rather than static members - Declared .cab download AppInfo static so it won't fade away during the download - Fixed .cab extraction failing while no rapps folder present - Visual improvements to the .cab dialog Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/dialogs.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1] Thu Aug 24 18:46:39 2017 @@ -227,43 +227,38 @@ } } -BOOL CAvailableApps::DeleteCurrentAppsDB() +VOID CAvailableApps::DeleteCurrentAppsDB() { HANDLE hFind = INVALID_HANDLE_VALUE; WIN32_FIND_DATAW FindFileData; - BOOL result = TRUE; + + if (m_szPath.IsEmpty()) + return; + + DeleteFileW(m_szCabPath.GetString()); + hFind = FindFirstFileW(m_szSearchPath.GetString(), &FindFileData); + + if (hFind != INVALID_HANDLE_VALUE) + { + ATL::CStringW szTmp; + do + { + szTmp = m_szPath + FindFileData.cFileName; + DeleteFileW(szTmp.GetString()); + } while (FindNextFileW(hFind, &FindFileData) != 0); + FindClose(hFind); + } +} + +BOOL CAvailableApps::UpdateAppsDB() +{ + DeleteCurrentAppsDB(); + + CDownloadManager::DownloadApplicationsDB(APPLICATION_DATABASE_URL); if (m_szPath.IsEmpty()) return FALSE; - result = result && DeleteFileW(m_szCabPath.GetString()); - hFind = FindFirstFileW(m_szSearchPath.GetString(), &FindFileData); - - if (hFind == INVALID_HANDLE_VALUE) - return result; - - ATL::CStringW szTmp; - do - { - szTmp = m_szPath + FindFileData.cFileName; - result = result && DeleteFileW(szTmp.GetString()); - } while (FindNextFileW(hFind, &FindFileData) != 0); - - FindClose(hFind); - - return result; -} - -BOOL CAvailableApps::UpdateAppsDB() -{ - if (!DeleteCurrentAppsDB()) - return FALSE; - - CDownloadManager::DownloadApplicationsDB(APPLICATION_DATABASE_URL); - - if (m_szPath.IsEmpty()) - return FALSE; - if (!ExtractFilesFromCab(m_szCabPath, m_szAppsPath)) { return FALSE; @@ -287,12 +282,10 @@ if (hFind == INVALID_HANDLE_VALUE) { - if (GetFileAttributesW(m_szCabPath) == INVALID_FILE_ATTRIBUTES) - { - CDownloadManager::DownloadApplicationsDB(APPLICATION_DATABASE_URL); - } - - ExtractFilesFromCab(m_szCabPath, m_szAppsPath); + if(!UpdateAppsDB()) { + return FALSE; + } + hFind = FindFirstFileW(m_szSearchPath.GetString(), &FindFileData); if (hFind == INVALID_HANDLE_VALUE) Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] Thu Aug 24 18:46:39 2017 @@ -1461,7 +1461,7 @@ nSelectedApps = 0; if (EnumType < 0) EnumType = SelectedEnumType; - if (IS_INSTALLED_ENUM(SelectedEnumType)) + if (IS_INSTALLED_ENUM(EnumType)) { FreeInstalledAppList(); } @@ -1482,7 +1482,10 @@ if (isAvailableEnum(EnumType)) { /* Enum available applications */ - m_AvailableApps.EnumAvailableApplications(EnumType, s_EnumAvailableAppProc); + if (!m_AvailableApps.EnumAvailableApplications(EnumType, s_EnumAvailableAppProc)) + { + return; + } } SelectedEnumType = EnumType; Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h [iso-8859-1] Thu Aug 24 18:46:39 2017 @@ -115,7 +115,7 @@ public: CAvailableApps(); VOID FreeCachedEntries(); - BOOL DeleteCurrentAppsDB(); + VOID DeleteCurrentAppsDB(); BOOL UpdateAppsDB(); BOOL EnumAvailableApplications(INT EnumType, AVAILENUMPROC lpEnumProc); const PAPPLICATION_INFO FindInfo(const ATL::CStringW& szAppName); Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/dialogs.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/dialogs.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/dialogs.h [iso-8859-1] Thu Aug 24 18:46:39 2017 @@ -10,7 +10,6 @@ class CDownloadManager { - static PAPPLICATION_INFO AppInfo; static ATL::CSimpleArray<PAPPLICATION_INFO> AppsToInstallList; static CDowloadingAppsListView DownloadsListView; static INT iCurrentApp; Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp [iso-8859-1] Thu Aug 24 18:46:39 2017 @@ -346,19 +346,26 @@ } } +struct DownloadParam +{ + DownloadParam() : Dialog(NULL), AppInfo(), szCaption(NULL) {} + DownloadParam(HWND dlg, const ATL::CSimpleArray<PAPPLICATION_INFO> &info, LPCWSTR caption) + : Dialog(dlg), AppInfo(info), szCaption(caption) + { + } + + HWND Dialog; + ATL::CSimpleArray<PAPPLICATION_INFO> AppInfo; + LPCWSTR szCaption; +}; + // CDownloadManager -PAPPLICATION_INFO CDownloadManager::AppInfo; ATL::CSimpleArray<PAPPLICATION_INFO> CDownloadManager::AppsToInstallList; CDowloadingAppsListView CDownloadManager::DownloadsListView; INT CDownloadManager::iCurrentApp; -#define DL_START_NEW WM_APP + 1 - INT_PTR CALLBACK CDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { - HANDLE Thread; - DWORD ThreadId; - HWND Item; static WCHAR szCaption[MAX_PATH]; switch (uMsg) @@ -377,7 +384,7 @@ } SetWindowLongW(Dlg, GWLP_USERDATA, 0); - Item = GetDlgItem(Dlg, IDC_DOWNLOAD_PROGRESS); + HWND Item = GetDlgItem(Dlg, IDC_DOWNLOAD_PROGRESS); if (Item) { // initialize the default values for our nifty progress bar @@ -387,8 +394,6 @@ SetWindowSubclass(Item, DownloadProgressProc, 0, 0); } - // Get a dlg string for later use - GetWindowTextW(Dlg, szCaption, MAX_PATH); // Add a ListView HWND hListView = DownloadsListView.Create(Dlg); @@ -397,15 +402,26 @@ return FALSE; } DownloadsListView.LoadList(AppsToInstallList); - iCurrentApp = -1; ShowWindow(Dlg, SW_SHOW); - // Start new download - SendMessageW(Dlg, DL_START_NEW, 0, 0); - + // Get a dlg string for later use + GetWindowTextW(Dlg, szCaption, MAX_PATH); + + // Start download process + DownloadParam *param = new DownloadParam(Dlg, AppsToInstallList, szCaption); + DWORD ThreadId; + HANDLE Thread = CreateThread(NULL, 0, ThreadFunc, (LPVOID) param, 0, &ThreadId); + + if (!Thread) + { + return FALSE; + } + + CloseHandle(Thread); return TRUE; } + case WM_COMMAND: if (wParam == IDCANCEL) { @@ -413,45 +429,6 @@ PostMessageW(Dlg, WM_CLOSE, 0, 0); } return FALSE; - - case DL_START_NEW: - - ++iCurrentApp; - // If some downloads left we issue it - if (iCurrentApp < AppsToInstallList.GetSize()) - { - AppInfo = AppsToInstallList[iCurrentApp]; - if (!AppInfo) - { - return FALSE; - } - - ATL::CStringW szNewCaption; - - // Reset progress bar - Item = GetDlgItem(Dlg, IDC_DOWNLOAD_PROGRESS); - if (Item) - { - SendMessageW(Item, PBM_SETPOS, 0, 0); - } - - // Change caption to show the currently downloaded app - szNewCaption.Format(szCaption, AppInfo->szName.GetString()); - SetWindowTextW(Dlg, szNewCaption.GetString()); - - // Add a neat placeholder until the download URL is retrieved - SetDlgItemTextW(Dlg, IDC_DOWNLOAD_STATUS, L"\x2022 \x2022 \x2022"); - Thread = CreateThread(NULL, 0, ThreadFunc, Dlg, 0, &ThreadId); - - if (!Thread) - { - return FALSE; - } - - CloseHandle(Thread); - return TRUE; - } - // No downloads left, closing (fallthrough) case WM_CLOSE: EndDialog(Dlg, 0); @@ -463,7 +440,12 @@ } } -LRESULT CALLBACK CDownloadManager::DownloadProgressProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uIdSubclass, DWORD_PTR dwRefData) +LRESULT CALLBACK CDownloadManager::DownloadProgressProc(HWND hWnd, + UINT uMsg, + WPARAM wParam, + LPARAM lParam, + UINT_PTR uIdSubclass, + DWORD_PTR dwRefData) { static ATL::CStringW szProgressText; @@ -538,12 +520,13 @@ } } -DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID Context) +DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) { CComPtr<IBindStatusCallback> dl; ATL::CStringW Path; PWSTR p, q; - HWND Dlg = (HWND) Context; + + HWND hDlg = static_cast<DownloadParam*>(param)->Dialog; ULONG dwContentLen, dwBytesWritten, dwBytesRead, dwStatus; ULONG dwCurrentBytesRead = 0; @@ -563,233 +546,272 @@ size_t urlLength, filenameLength; const INT iAppId = iCurrentApp; - const PAPPLICATION_INFO pCurrentInfo = AppInfo; - if (!AppInfo) + const ATL::CSimpleArray<PAPPLICATION_INFO> InfoArray = static_cast<DownloadParam*>(param)->AppInfo; + LPCWSTR szCaption = static_cast<DownloadParam*>(param)->szCaption; + + delete param; + if (InfoArray.GetSize() <= 0) { MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_DOWNLOAD); goto end; } - DownloadsListView.SetDownloadStatus(iAppId, DOWNLOAD_STATUS::DLDownloading); - - // build the path for the download - p = wcsrchr(pCurrentInfo->szUrlDownload.GetString(), L'/'); - q = wcsrchr(pCurrentInfo->szUrlDownload.GetString(), L'?'); - - // do we have a final slash separator? - if (!p) - goto end; - - // prepare the tentative length of the filename, maybe we've to remove part of it later on - filenameLength = wcslen(p) * sizeof(WCHAR); - - /* do we have query arguments in the target URL after the filename? account for them - (e.g. https://example.org/myfile.exe?no_adware_plz) */ - if (q && q > p && (q - p) > 0) - filenameLength -= wcslen(q - 1) * sizeof(WCHAR); - - // is this URL an update package for RAPPS? if so store it in a different place - if (pCurrentInfo->szUrlDownload == APPLICATION_DATABASE_URL) - { - bCab = TRUE; - if (!GetStorageDirectory(Path)) - goto end; - } - else - { - Path = SettingsInfo.szDownloadDir; - } - - // is the path valid? can we access it? - if (GetFileAttributesW(Path.GetString()) == INVALID_FILE_ATTRIBUTES) - { - if (!CreateDirectoryW(Path.GetString(), NULL)) - goto end; - } - - // append a \ to the provided file system path, and the filename portion from the URL after that - Path += L"\\"; - Path += (LPWSTR) (p + 1); - - if (!bCab && pCurrentInfo->szSHA1[0] && GetFileAttributesW(Path.GetString()) != INVALID_FILE_ATTRIBUTES) - { - // only open it in case of total correctness - if (VerifyInteg(pCurrentInfo->szSHA1, Path)) - goto run; - } - - // download it - bTempfile = TRUE; - CDownloadDialog_Constructor(Dlg, &bCancelled, IID_PPV_ARG(IBindStatusCallback, &dl)); - - if (dl == NULL) - goto end; - - /* FIXME: this should just be using the system-wide proxy settings */ - switch (SettingsInfo.Proxy) - { - case 0: // preconfig - hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); - break; - case 1: // direct (no proxy) - hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); - break; - case 2: // use proxy - hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PROXY, SettingsInfo.szProxyServer, SettingsInfo.szNoProxyFor, 0); - break; - default: // preconfig - hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); - break; - } - - if (!hOpen) - goto end; - - hFile = InternetOpenUrlW(hOpen, pCurrentInfo->szUrlDownload, NULL, 0, INTERNET_FLAG_PRAGMA_NOCACHE | INTERNET_FLAG_KEEP_CONNECTION, 0); - if (!hFile) - { - MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_DOWNLOAD2); - goto end; - } - - if (!HttpQueryInfoW(hFile, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &dwStatus, &dwStatusLen, NULL)) - goto end; - - if (dwStatus != HTTP_STATUS_OK) - { - MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_DOWNLOAD); - goto end; - } - - dwStatusLen = sizeof(dwStatus); - - memset(&urlComponents, 0, sizeof(urlComponents)); - urlComponents.dwStructSize = sizeof(urlComponents); - - urlLength = pCurrentInfo->szUrlDownload.GetLength(); - urlComponents.dwSchemeLength = urlLength + 1; - urlComponents.lpszScheme = (LPWSTR) malloc(urlComponents.dwSchemeLength * sizeof(WCHAR)); - urlComponents.dwHostNameLength = urlLength + 1; - urlComponents.lpszHostName = (LPWSTR) malloc(urlComponents.dwHostNameLength * sizeof(WCHAR)); - - if (!InternetCrackUrlW(pCurrentInfo->szUrlDownload, urlLength + 1, ICU_DECODE | ICU_ESCAPE, &urlComponents)) - goto end; - - if (urlComponents.nScheme == INTERNET_SCHEME_HTTP || urlComponents.nScheme == INTERNET_SCHEME_HTTPS) - HttpQueryInfoW(hFile, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &dwContentLen, &dwStatus, 0); - - if (urlComponents.nScheme == INTERNET_SCHEME_FTP) - dwContentLen = FtpGetFileSize(hFile, &dwStatus); + for (INT iAppId = 0; iAppId < InfoArray.GetSize(); ++iAppId) + { + PAPPLICATION_INFO pCurrentInfo = AppsToInstallList[iAppId]; + if (!pCurrentInfo) + { + MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_DOWNLOAD); + continue; + } + + + // build the path for the download + p = wcsrchr(pCurrentInfo->szUrlDownload.GetString(), L'/'); + q = wcsrchr(pCurrentInfo->szUrlDownload.GetString(), L'?'); + + // do we have a final slash separator? + if (!p) + goto end; + + // prepare the tentative length of the filename, maybe we've to remove part of it later on + filenameLength = wcslen(p) * sizeof(WCHAR); + + /* do we have query arguments in the target URL after the filename? account for them + (e.g. https://example.org/myfile.exe?no_adware_plz) */ + if (q && q > p && (q - p) > 0) + filenameLength -= wcslen(q - 1) * sizeof(WCHAR); + + // is this URL an update package for RAPPS? if so store it in a different place + if (pCurrentInfo->szUrlDownload == APPLICATION_DATABASE_URL) + { + bCab = TRUE; + if (!GetStorageDirectory(Path)) + goto end; + } + else + { + Path = SettingsInfo.szDownloadDir; + } + + // is the path valid? can we access it? + if (GetFileAttributesW(Path.GetString()) == INVALID_FILE_ATTRIBUTES) + { + if (!CreateDirectoryW(Path.GetString(), NULL)) + goto end; + } + + // append a \ to the provided file system path, and the filename portion from the URL after that + Path += L"\\"; + Path += (LPWSTR) (p + 1); + + if (!bCab && pCurrentInfo->szSHA1[0] && GetFileAttributesW(Path.GetString()) != INVALID_FILE_ATTRIBUTES) + { + // only open it in case of total correctness + if (VerifyInteg(pCurrentInfo->szSHA1, Path)) + goto run; + } + + // Reset progress bar + HWND Item = GetDlgItem(hDlg, IDC_DOWNLOAD_PROGRESS); + if (Item) + { + SendMessageW(Item, PBM_SETPOS, 0, 0); + } + + // Change caption to show the currently downloaded app + if (!bCab) + { + ATL::CStringW szNewCaption = ""; + szNewCaption.Format(szCaption, pCurrentInfo->szName.GetString()); + SetWindowTextW(hDlg, szNewCaption.GetString()); + } + else + { + //TODO: add this string to .rc + SetWindowTextW(hDlg, L"Downloading Database..."); + } + + // Add the download URL + SetDlgItemTextW(hDlg, IDC_DOWNLOAD_STATUS, pCurrentInfo->szUrlDownload.GetString()); + + DownloadsListView.SetDownloadStatus(iAppId, DOWNLOAD_STATUS::DLDownloading); + + // download it + bTempfile = TRUE; + CDownloadDialog_Constructor(hDlg, &bCancelled, IID_PPV_ARG(IBindStatusCallback, &dl)); + + if (dl == NULL) + goto end; + + /* FIXME: this should just be using the system-wide proxy settings */ + switch (SettingsInfo.Proxy) + { + case 0: // preconfig + hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); + break; + case 1: // direct (no proxy) + hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + break; + case 2: // use proxy + hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PROXY, SettingsInfo.szProxyServer, SettingsInfo.szNoProxyFor, 0); + break; + default: // preconfig + hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); + break; + } + + if (!hOpen) + goto end; + + hFile = InternetOpenUrlW(hOpen, pCurrentInfo->szUrlDownload.GetString(), NULL, 0, INTERNET_FLAG_PRAGMA_NOCACHE | INTERNET_FLAG_KEEP_CONNECTION, 0); + + if (!hFile) + { + MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_DOWNLOAD2); + goto end; + } + + if (!HttpQueryInfoW(hFile, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &dwStatus, &dwStatusLen, NULL)) + goto end; + + if (dwStatus != HTTP_STATUS_OK) + { + MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_DOWNLOAD); + goto end; + } + + dwStatusLen = sizeof(dwStatus); + + memset(&urlComponents, 0, sizeof(urlComponents)); + urlComponents.dwStructSize = sizeof(urlComponents); + + urlLength = pCurrentInfo->szUrlDownload.GetLength(); + urlComponents.dwSchemeLength = urlLength + 1; + urlComponents.lpszScheme = (LPWSTR) malloc(urlComponents.dwSchemeLength * sizeof(WCHAR)); + urlComponents.dwHostNameLength = urlLength + 1; + urlComponents.lpszHostName = (LPWSTR) malloc(urlComponents.dwHostNameLength * sizeof(WCHAR)); + + if (!InternetCrackUrlW(pCurrentInfo->szUrlDownload, urlLength + 1, ICU_DECODE | ICU_ESCAPE, &urlComponents)) + goto end; + + if (urlComponents.nScheme == INTERNET_SCHEME_HTTP || urlComponents.nScheme == INTERNET_SCHEME_HTTPS) + HttpQueryInfoW(hFile, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &dwContentLen, &dwStatus, 0); + + if (urlComponents.nScheme == INTERNET_SCHEME_FTP) + dwContentLen = FtpGetFileSize(hFile, &dwStatus); #ifdef USE_CERT_PINNING - // are we using HTTPS to download the RAPPS update package? check if the certificate is original - if ((urlComponents.nScheme == INTERNET_SCHEME_HTTPS) && - (wcscmp(pCurrentInfo->szUrlDownload, APPLICATION_DATABASE_URL) == 0) && - (!CertIsValid(hOpen, urlComponents.lpszHostName))) - { - MessageBox_LoadString(hMainWnd, IDS_CERT_DOES_NOT_MATCH); - goto end; - } + // are we using HTTPS to download the RAPPS update package? check if the certificate is original + if ((urlComponents.nScheme == INTERNET_SCHEME_HTTPS) && + (wcscmp(pCurrentInfo->szUrlDownload, APPLICATION_DATABASE_URL) == 0) && + (!CertIsValid(hOpen, urlComponents.lpszHostName))) + { + MessageBox_LoadString(hMainWnd, IDS_CERT_DOES_NOT_MATCH); + goto end; + } #endif - free(urlComponents.lpszScheme); - free(urlComponents.lpszHostName); - - hOut = CreateFileW(Path.GetString(), GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); - - if (hOut == INVALID_HANDLE_VALUE) - goto end; - - do - { - if (!InternetReadFile(hFile, lpBuffer, _countof(lpBuffer), &dwBytesRead)) - { - MessageBox_LoadString(hMainWnd, IDS_INTERRUPTED_DOWNLOAD); - goto end; - } - - if (!WriteFile(hOut, &lpBuffer[0], dwBytesRead, &dwBytesWritten, NULL)) - { - MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_WRITE); - goto end; - } - - dwCurrentBytesRead += dwBytesRead; - dl->OnProgress(dwCurrentBytesRead, dwContentLen, 0, pCurrentInfo->szUrlDownload); - } while (dwBytesRead && !bCancelled); - - CloseHandle(hOut); - hOut = INVALID_HANDLE_VALUE; - - if (bCancelled) - goto end; - - /* if this thing isn't a RAPPS update and it has a SHA-1 checksum - verify its integrity by using the native advapi32.A_SHA1 functions */ - if (!bCab && pCurrentInfo->szSHA1[0] != 0) - { - ATL::CStringW szMsgText; - - // change a few strings in the download dialog to reflect the verification process - if (!szMsgText.LoadStringW(hInst, IDS_INTEG_CHECK_TITLE)) - goto end; - - SetWindowTextW(Dlg, szMsgText.GetString()); - SendMessageW(GetDlgItem(Dlg, IDC_DOWNLOAD_STATUS), WM_SETTEXT, 0, (LPARAM) Path.GetString()); - - // this may take a while, depending on the file size - if (!VerifyInteg(pCurrentInfo->szSHA1, Path.GetString())) - { - if (!szMsgText.LoadStringW(hInst, IDS_INTEG_CHECK_FAIL)) + free(urlComponents.lpszScheme); + free(urlComponents.lpszHostName); + + hOut = CreateFileW(Path.GetString(), GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); + + if (hOut == INVALID_HANDLE_VALUE) + goto end; + + do + { + if (!InternetReadFile(hFile, lpBuffer, _countof(lpBuffer), &dwBytesRead)) + { + MessageBox_LoadString(hMainWnd, IDS_INTERRUPTED_DOWNLOAD); goto end; - - MessageBoxW(Dlg, szMsgText.GetString(), NULL, MB_OK | MB_ICONERROR); - goto end; - } - } - + } + + if (!WriteFile(hOut, &lpBuffer[0], dwBytesRead, &dwBytesWritten, NULL)) + { + MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_WRITE); + goto end; + } + + dwCurrentBytesRead += dwBytesRead; + dl->OnProgress(dwCurrentBytesRead, dwContentLen, 0, pCurrentInfo->szUrlDownload); + } while (dwBytesRead && !bCancelled); + + CloseHandle(hOut); + hOut = INVALID_HANDLE_VALUE; + + if (bCancelled) + goto end; + + /* if this thing isn't a RAPPS update and it has a SHA-1 checksum + verify its integrity by using the native advapi32.A_SHA1 functions */ + if (!bCab && pCurrentInfo->szSHA1[0] != 0) + { + ATL::CStringW szMsgText; + + // change a few strings in the download dialog to reflect the verification process + if (!szMsgText.LoadStringW(hInst, IDS_INTEG_CHECK_TITLE)) + goto end; + + SetWindowTextW(hDlg, szMsgText.GetString()); + SendMessageW(GetDlgItem(hDlg, IDC_DOWNLOAD_STATUS), WM_SETTEXT, 0, (LPARAM) Path.GetString()); + + // this may take a while, depending on the file size + if (!VerifyInteg(pCurrentInfo->szSHA1, Path.GetString())) + { + if (!szMsgText.LoadStringW(hInst, IDS_INTEG_CHECK_FAIL)) + goto end; + + MessageBoxW(hDlg, szMsgText.GetString(), NULL, MB_OK | MB_ICONERROR); + goto end; + } + } run: - DownloadsListView.SetDownloadStatus(iAppId, DOWNLOAD_STATUS::DLWaitingToInstall); - - // run it - if (!bCab) - { - SHELLEXECUTEINFOW shExInfo = {0}; - shExInfo.cbSize = sizeof(shExInfo); - shExInfo.fMask = SEE_MASK_NOCLOSEPROCESS; - shExInfo.lpVerb = L"open"; - shExInfo.lpFile = Path.GetString(); - shExInfo.lpParameters = L""; - shExInfo.nShow = SW_SHOW; - - if (ShellExecuteExW(&shExInfo)) - { - DownloadsListView.SetDownloadStatus(iAppId, DOWNLOAD_STATUS::DLInstalling); - //TODO: issue an install operation separately so that the apps could be downloaded in the background - WaitForSingleObject(shExInfo.hProcess, INFINITE); - CloseHandle(shExInfo.hProcess); - } - else - { - MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_INSTALL); - } - } + DownloadsListView.SetDownloadStatus(iAppId, DOWNLOAD_STATUS::DLWaitingToInstall); + + // run it + if (!bCab) + { + SHELLEXECUTEINFOW shExInfo = {0}; + shExInfo.cbSize = sizeof(shExInfo); + shExInfo.fMask = SEE_MASK_NOCLOSEPROCESS; + shExInfo.lpVerb = L"open"; + shExInfo.lpFile = Path.GetString(); + shExInfo.lpParameters = L""; + shExInfo.nShow = SW_SHOW; + + if (ShellExecuteExW(&shExInfo)) + { + DownloadsListView.SetDownloadStatus(iAppId, DOWNLOAD_STATUS::DLInstalling); + //TODO: issue an install operation separately so that the apps could be downloaded in the background + WaitForSingleObject(shExInfo.hProcess, INFINITE); + CloseHandle(shExInfo.hProcess); + } + else + { + MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_INSTALL); + } + } end: - if (hOut != INVALID_HANDLE_VALUE) - CloseHandle(hOut); - - InternetCloseHandle(hFile); - InternetCloseHandle(hOpen); - - if (bTempfile) - { - if (bCancelled || (SettingsInfo.bDelInstaller && !bCab)) - DeleteFileW(Path.GetString()); - } - DownloadsListView.SetDownloadStatus(iAppId, DOWNLOAD_STATUS::DLFinished); - SendMessageW(Dlg, DL_START_NEW, 0, 0); + if (hOut != INVALID_HANDLE_VALUE) + CloseHandle(hOut); + + InternetCloseHandle(hFile); + InternetCloseHandle(hOpen); + + if (bTempfile) + { + if (bCancelled || (SettingsInfo.bDelInstaller && !bCab)) + DeleteFileW(Path.GetString()); + } + + DownloadsListView.SetDownloadStatus(iAppId, DOWNLOAD_STATUS::DLFinished); + } + + SendMessageW(hDlg, WM_CLOSE, 0, 0); return 0; } @@ -825,10 +847,11 @@ VOID CDownloadManager::DownloadApplicationsDB(LPCWSTR lpUrl) { - APPLICATION_INFO IntInfo; + static APPLICATION_INFO IntInfo; IntInfo.szUrlDownload = lpUrl; - - DownloadApplication(&IntInfo); + //TODO: add this string to .rc + IntInfo.szName = L"RAPPS DB"; + DownloadApplication(&IntInfo, TRUE); } //TODO: Reuse the dialog Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp [iso-8859-1] Thu Aug 24 18:46:39 2017 @@ -260,6 +260,8 @@ if (Result == S_OK) { Dest.Operation = EXTRACT_EXTRACTFILES; + CreateDirectoryW(lpOutputPath, NULL); + Result = pfnExtract(&Dest, szCabName); if (Result == S_OK) { Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp [iso-8859-1] Thu Aug 24 18:46:39 2017 @@ -156,7 +156,6 @@ } InitLogs(); - InitCommonControls(); //skip window creation if there were some keys

7 years

[rgampa] 75658: [USBXHCI] - Changed inf file to fix device descriptons - Added licence headers for all files in xhci folder - Wrote the stop controller function to disable the controller safely and...

by rgampa＠svn.reactos.org

Author: rgampa Date: Thu Aug 24 13:04:30 2017 New Revision: 75658 URL: http://svn.reactos.org/svn/reactos?rev=75658&view=rev Log: [USBXHCI] - Changed inf file to fix device descriptons - Added licence headers for all files in xhci folder - Wrote the stop controller function to disable the controller safely and re-enable - defined NDEBUG to reduce windbg output or noisy functions CORE-13344 Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/dbg_xhci.h branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/debug.c branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/hardware.h branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.h branches/GSoC_2017/usbxhci/reactos/media/inf/usbport.inf Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/dbg_xhci.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/dbg_xhci.h [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/dbg_xhci.h [iso-8859-1] Thu Aug 24 13:04:30 2017 @@ -1,3 +1,9 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: debug header files + * PROGRAMMER: Rama Teja Gampa <ramateja.g(a)gmail.com> +*/ #ifndef DBG_XHCI_H__ #define DBG_XHCI_H__ Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/debug.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/debug.c [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/debug.c [iso-8859-1] Thu Aug 24 13:04:30 2017 @@ -1,3 +1,9 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: debug functions + * PROGRAMMER: Rama Teja Gampa <ramateja.g(a)gmail.com> +*/ #include "usbxhci.h" #define NDEBUG Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/hardware.h [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/hardware.h [iso-8859-1] Thu Aug 24 13:04:30 2017 @@ -1,4 +1,10 @@ -/* XHCI hardware registers */ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: hardware register definitions + * PROGRAMMER: Rama Teja Gampa <ramateja.g(a)gmail.com> +*/ + // base io addr register offsets #define XHCI_HCSP1 1 #define XHCI_HCSP2 2 Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c [iso-8859-1] Thu Aug 24 13:04:30 2017 @@ -1,5 +1,11 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: roothub functions of xHCI + * PROGRAMMER: Rama Teja Gampa <ramateja.g(a)gmail.com> +*/ #include "usbxhci.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> #define NDEBUG_XHCI_ROOT_HUB #include "dbg_xhci.h" @@ -89,7 +95,7 @@ XHCI_RH_GetHubStatus(IN PVOID xhciExtension, IN PUSB_HUB_STATUS_AND_CHANGE HubStatus) { - //DPRINT1("XHCI_RH_GetHubStatus: function initiated\n"); //removed to reduce windbg output + DPRINT("XHCI_RH_GetHubStatus: function initiated\n"); //removed to reduce windbg output HubStatus->AsUlong32 = 0; return 0; } @@ -311,11 +317,12 @@ NTAPI XHCI_RH_DisableIrq(IN PVOID xhciExtension) { - //DPRINT1("XHCI_RH_DisableIrq: function initiated\n"); removed to reduce windbg output + PXHCI_EXTENSION XhciExtension; PULONG OperationalRegs; XHCI_USB_COMMAND usbCommand; + DPRINT("XHCI_RH_DisableIrq: function initiated\n"); XhciExtension = (PXHCI_EXTENSION)xhciExtension; OperationalRegs = XhciExtension->OperationalRegs; usbCommand.AsULONG =READ_REGISTER_ULONG(OperationalRegs + XHCI_USBCMD); @@ -329,11 +336,12 @@ NTAPI XHCI_RH_EnableIrq(IN PVOID xhciExtension) { - //DPRINT1("XHCI_RH_EnableIrq: function initiated\n"); removed to reduce windbg output + PXHCI_EXTENSION XhciExtension; PULONG OperationalRegs; XHCI_USB_COMMAND usbCommand; + DPRINT("XHCI_RH_EnableIrq: function initiated\n"); XhciExtension = (PXHCI_EXTENSION)xhciExtension; OperationalRegs = XhciExtension->OperationalRegs; usbCommand.AsULONG =READ_REGISTER_ULONG(OperationalRegs + XHCI_USBCMD); Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c [iso-8859-1] Thu Aug 24 13:04:30 2017 @@ -1,6 +1,14 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: main functions of xHCI + * PROGRAMMER: Rama Teja Gampa <ramateja.g(a)gmail.com> +*/ #include "usbxhci.h" +#define NDEBUG #include <debug.h> #define NDEBUG_XHCI_TRACE + #include "dbg_xhci.h" USBPORT_REGISTRATION_PACKET RegPacket; @@ -571,7 +579,7 @@ return MP_STATUS_FAILURE; } } - DPRINT("XHCI_InitializeHardware: Reset - OK\n"); + DPRINT1("XHCI_InitializeHardware: Reset - OK\n"); StructuralParams_1.AsULONG = READ_REGISTER_ULONG(BaseIoAdress + XHCI_HCSP1); // HCSPARAMS1 register @@ -649,12 +657,12 @@ MaxScratchPadBuffers = MaxScratchPadBuffers + HCSPARAMS2.MaxSPBuffersLo; XhciExtension->MaxScratchPadBuffers = MaxScratchPadBuffers; - DPRINT("XHCI_StartController: BaseIoAdress - %p\n", BaseIoAdress); - DPRINT("XHCI_StartController: OperationalRegs - %p\n", OperationalRegs); - DPRINT("XHCI_StartController: DoorBellRegisterBase - %p\n", DoorBellRegisterBase); - DPRINT("XHCI_StartController: RunTimeRegisterBase - %p\n", RunTimeRegisterBase); - DPRINT("XHCI_StartController: PageSize - %p\n", XhciExtension->PageSize); - DPRINT("XHCI_StartController: MaxScratchPadBuffers - %p\n", MaxScratchPadBuffers); + DPRINT1("XHCI_StartController: BaseIoAdress - %p\n", BaseIoAdress); + DPRINT1("XHCI_StartController: OperationalRegs - %p\n", OperationalRegs); + DPRINT1("XHCI_StartController: DoorBellRegisterBase - %p\n", DoorBellRegisterBase); + DPRINT1("XHCI_StartController: RunTimeRegisterBase - %p\n", RunTimeRegisterBase); + DPRINT1("XHCI_StartController: PageSize - %p\n", XhciExtension->PageSize); + DPRINT1("XHCI_StartController: MaxScratchPadBuffers - %p\n", MaxScratchPadBuffers); RegPacket.UsbPortReadWriteConfigSpace(XhciExtension, 1, @@ -705,8 +713,13 @@ PMDL ScratchPadArrayMDL; PMDL ScratchPadBufferMDL; PXHCI_SCRATCHPAD_BUFFER_ARRAY BufferArrayPointer; - - DPRINT1("XHCI_StopController: Function initiated. FIXME\n"); + XHCI_USB_COMMAND Command, Command_temp; + PULONG OperationalRegs; + XHCI_USB_STATUS Status; + LARGE_INTEGER CurrentTime = {{0, 0}}; + LARGE_INTEGER LastTime = {{0, 0}}; + + DPRINT1("XHCI_StopController: Function initiated. \n"); XhciExtension = (PXHCI_EXTENSION) xhciExtension; MaxScratchPadBuffers = XhciExtension->MaxScratchPadBuffers; // free memory allocated to scratchpad buffers. @@ -722,6 +735,33 @@ IoFreeMdl(ScratchPadArrayMDL); MmFreeContiguousMemory(BufferArrayPointer); } + + OperationalRegs = XhciExtension->OperationalRegs; + Command_temp.AsULONG = READ_REGISTER_ULONG(OperationalRegs + XHCI_USBCMD); + Command.AsULONG = 0; + Command.RsvdP1 = Command_temp.RsvdP1; + Command.RsvdP2 = Command_temp.RsvdP2; + Command.RsvdP3 = Command_temp.RsvdP3; + WRITE_REGISTER_ULONG(OperationalRegs + XHCI_USBCMD, Command.AsULONG); + + KeQuerySystemTime(&CurrentTime); + CurrentTime.QuadPart += 100 * 10000; + while (TRUE) + { + KeQuerySystemTime(&LastTime); + + Status.AsULONG = READ_REGISTER_ULONG(OperationalRegs + XHCI_USBSTS); + + if (Status.HCHalted == 1) + { + break; + } + + if (LastTime.QuadPart >= CurrentTime.QuadPart) + { + DPRINT1("XHCI_StopController: controller stop failed!\n"); + } + } } @@ -877,14 +917,14 @@ NTAPI XHCI_CheckController(IN PVOID xhciExtension) { - //DPRINT1("XHCI_CheckController: function initiated\n"); + DPRINT("XHCI_CheckController: function initiated\n"); } ULONG NTAPI XHCI_Get32BitFrameNumber(IN PVOID xhciExtension) { - //DPRINT1("XHCI_Get32BitFrameNumber: function initiated\n"); this function is called multiple times. commented out to reduce output in windbg + DPRINT("XHCI_Get32BitFrameNumber: function initiated\n"); return 0; } @@ -937,9 +977,9 @@ NTAPI XHCI_PollController(IN PVOID xhciExtension) { - //DPRINT1("XHCI_PollController: function initiated\n"); commented out to reduce windbg output + PXHCI_EXTENSION XhciExtension; - + DPRINT("XHCI_PollController: function initiated\n"); XhciExtension = (PXHCI_EXTENSION)xhciExtension; if (!(XhciExtension->Flags & XHCI_FLAGS_CONTROLLER_SUSPEND)) @@ -1062,7 +1102,7 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) { - DPRINT("DriverEntry: DriverObject - %p, RegistryPath - %wZ\n", + DPRINT1("DriverEntry: DriverObject - %p, RegistryPath - %wZ\n", DriverObject, RegistryPath); if (USBPORT_GetHciMn() != USBPORT_HCI_MN) Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.h [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.h [iso-8859-1] Thu Aug 24 13:04:30 2017 @@ -1,3 +1,9 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: resources definitions + * PROGRAMMER: Rama Teja Gampa <ramateja.g(a)gmail.com> +*/ #ifndef USBXHCI_H__ #define USBXHCI_H__ Modified: branches/GSoC_2017/usbxhci/reactos/media/inf/usbport.inf URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/media… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/media/inf/usbport.inf [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/media/inf/usbport.inf [iso-8859-1] Thu Aug 24 13:04:30 2017 @@ -142,6 +142,7 @@ PCI\CC_0C0300.DeviceDesc = "UHCI USB controller" PCI\CC_0C0310.DeviceDesc = "OHCI USB controller" PCI\CC_0C0320.DeviceDesc = "EHCI USB controller" +PCI\CC_0C0330.DeviceDesc = "XHCI USB controller" USB\ROOT_HUB.DeviceDesc = "Root hub" IntelMfg = "Intel" @@ -155,6 +156,7 @@ PCI\CC_0C0300.DeviceDesc = "UHCI USB ÅadiÄ" PCI\CC_0C0310.DeviceDesc = "OHCI USB ÅadiÄ" PCI\CC_0C0320.DeviceDesc = "EHCI USB ÅadiÄ" +PCI\CC_0C0330.DeviceDesc = "XHCI USB ÅadiÄ" USB\ROOT_HUB.DeviceDesc = "KoÅenovÃ½ rozboÄovaÄ" IntelMfg = "Intel" @@ -168,6 +170,7 @@ PCI\CC_0C0300.DeviceDesc = "UHCI USB-Controller" PCI\CC_0C0310.DeviceDesc = "OHCI USB-Controller" PCI\CC_0C0320.DeviceDesc = "EHCI USB-Controller" +PCI\CC_0C0330.DeviceDesc = "XHCI USB-Controller" USB\ROOT_HUB.DeviceDesc = "Root Hub" [Strings.0a] @@ -178,6 +181,7 @@ PCI\CC_0C0300.DeviceDesc = "Controlador USB UHCI" PCI\CC_0C0310.DeviceDesc = "Controlador USB OHCI" PCI\CC_0C0320.DeviceDesc = "Controlador USB EHCI USB" +PCI\CC_0C0330.DeviceDesc = "Controlador USB XHCI" USB\ROOT_HUB.DeviceDesc = "Concentrador raÃz USB" IntelMfg = "Intel" @@ -192,6 +196,7 @@ PCI\CC_0C0300.DeviceDesc = "ContrÃ´leur USB UHCI" PCI\CC_0C0310.DeviceDesc = "ContrÃ´leur USB OHCI" PCI\CC_0C0320.DeviceDesc = "ContrÃ´leur USB EHCI" +PCI\CC_0C0330.DeviceDesc = "ContrÃ´leur USB XHCI" USB\ROOT_HUB.DeviceDesc = "Concentrateur racine" PCI\VEN_8086&DEV_7020&CC_0C0300.DeviceDesc = "ContrÃ´leur USB Intel 82371SB PIIX3" @@ -204,6 +209,7 @@ PCI\CC_0C0300.DeviceDesc = "UHCI USB ã³ã³ããã¼ã©" PCI\CC_0C0310.DeviceDesc = "OHCI USB ã³ã³ããã¼ã©" PCI\CC_0C0320.DeviceDesc = "EHCI USB ã³ã³ããã¼ã©" +PCI\CC_0C0330.DeviceDesc = "XHCI USB ã³ã³ããã¼ã©" USB\ROOT_HUB.DeviceDesc = "ã«ã¼ã ãã" [Strings.0415] @@ -214,6 +220,7 @@ PCI\CC_0C0300.DeviceDesc = "Kontroler UHCI USB" PCI\CC_0C0310.DeviceDesc = "Kontroler OHCI USB" PCI\CC_0C0320.DeviceDesc = "Kontroler EHCI USB" +PCI\CC_0C0330.DeviceDesc = "Kontroler XHCI USB" USB\ROOT_HUB.DeviceDesc = "GÅÃ³wny koncentrator USB" IntelMfg = "Intel" @@ -227,6 +234,7 @@ PCI\CC_0C0300.DeviceDesc = "Controlador USB UHCI" PCI\CC_0C0310.DeviceDesc = "Controlador USB OHCI" PCI\CC_0C0320.DeviceDesc = "Controlador USB EHCI USB" +PCI\CC_0C0330.DeviceDesc = "Controlador USB XHCI" USB\ROOT_HUB.DeviceDesc = "Concentrador raÃz USB" IntelMfg = "Intel" @@ -240,6 +248,7 @@ PCI\CC_0C0300.DeviceDesc = "Dispozitive de control USB UHCI" PCI\CC_0C0310.DeviceDesc = "Dispozitive de control USB OHCI" PCI\CC_0C0320.DeviceDesc = "Dispozitive de control USB EHCI" +PCI\CC_0C0330.DeviceDesc = "Dispozitive de control USB XHCI" USB\ROOT_HUB.DeviceDesc = "Cuplator rÄdÄcinÄ" IntelMfg = "Intel" PCI\VEN_8086&DEV_7020&CC_0C0300.DeviceDesc = "Dispozitiv de control USB Intel 82371SB PIIX3" @@ -253,6 +262,7 @@ PCI\CC_0C0300.DeviceDesc = "ÐÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ UHCI USB" PCI\CC_0C0310.DeviceDesc = "ÐÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ OHCI USB" PCI\CC_0C0320.DeviceDesc = "ÐÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ EHCI USB" +PCI\CC_0C0330.DeviceDesc = "ÐÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ XHCI USB" USB\ROOT_HUB.DeviceDesc = "ÐÐ¾ÑÐ½ÐµÐ²Ð¾Ð¹ ÑÐ°Ð±" PCI\VEN_8086&DEV_7020&CC_0C0300.DeviceDesc = "ÐÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ Intel 82371SB PIIX3 USB" @@ -265,6 +275,7 @@ PCI\CC_0C0300.DeviceDesc = "UHCI USB radiÄ" PCI\CC_0C0310.DeviceDesc = "OHCI USB radiÄ" PCI\CC_0C0320.DeviceDesc = "EHCI USB radiÄ" +PCI\CC_0C0330.DeviceDesc = "XHCI USB radiÄ" USB\ROOT_HUB.DeviceDesc = "KoreÅovÃ½ rozboÄovaÄ" PCI\VEN_8086&DEV_7020&CC_0C0300.DeviceDesc = "Intel 82371SB PIIX3 USB radiÄ" @@ -277,6 +288,7 @@ PCI\CC_0C0300.DeviceDesc = "UHCI USB valdiklis" PCI\CC_0C0310.DeviceDesc = "OHCI USB valdiklis" PCI\CC_0C0320.DeviceDesc = "EHCI USB valdiklis" +PCI\CC_0C0330.DeviceDesc = "XHCI USB valdiklis" USB\ROOT_HUB.DeviceDesc = "Pagrindinis Å¡akotuvas" PCI\VEN_8086&DEV_7020&CC_0C0300.DeviceDesc = "Intel 82371SB PIIX3 USB valdiklis" @@ -290,6 +302,7 @@ PCI\CC_0C0300.DeviceDesc = "UHCI USB Denetleyicisi" PCI\CC_0C0310.DeviceDesc = "OHCI USB Denetleyicisi" PCI\CC_0C0320.DeviceDesc = "EHCI USB Denetleyicisi" +PCI\CC_0C0330.DeviceDesc = "XHCI USB Denetleyicisi" USB\ROOT_HUB.DeviceDesc = "KÃ¶k GÃ¶bek" IntelMfg = "Intel" @@ -304,6 +317,7 @@ PCI\CC_0C0300.DeviceDesc = "ÐÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ UHCI USB" PCI\CC_0C0310.DeviceDesc = "ÐÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ OHCI USB" PCI\CC_0C0320.DeviceDesc = "ÐÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ EHCI USB" +PCI\CC_0C0330.DeviceDesc = "ÐÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ XHCI USB" USB\ROOT_HUB.DeviceDesc = "ÐÐ¾ÑÐµÐ½ÐµÐ²Ð¸Ð¹ ÑÐ°Ð±" PCI\VEN_8086&DEV_7020&CC_0C0300.DeviceDesc = "ÐÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ Intel 82371SB PIIX3 USB"

7 years

[hbelusca] 75657: [SETUPLIB]: Fix n00b bug.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Aug 23 17:48:00 2017 New Revision: 75657 URL: http://svn.reactos.org/svn/reactos?rev=75657&view=rev Log: [SETUPLIB]: Fix n00b bug. Modified: branches/setup_improvements/base/setup/lib/filesup.h Modified: branches/setup_improvements/base/setup/lib/filesup.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/filesup.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/filesup.h [iso-8859-1] Wed Aug 23 17:48:00 2017 @@ -106,6 +106,6 @@ do { \ UnMapFile((SectionHandle), (BaseAddress)); \ NtClose(FileHandle); \ -} while (1) +} while (0) /* EOF */

7 years

← Newer
1
...
4
5
6
7
8
9
10
...
27
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 August 2017