Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 69431: [NTVDM] Usability fixes (part 2): - Properly keep the mouse show state across screenbuffer switches. - Use unicode strings for the disk menu items. See r69428.
by hbelusca＠svn.reactos.org 03 Oct '15

03 Oct '15

Author: hbelusca Date: Sat Oct 3 15:06:24 2015 New Revision: 69431 URL: http://svn.reactos.org/svn/reactos?rev=69431&view=rev Log: [NTVDM] Usability fixes (part 2): - Properly keep the mouse show state across screenbuffer switches. - Use unicode strings for the disk menu items. See r69428. Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] Sat Oct 3 15:06:24 2015 @@ -961,12 +961,9 @@ { ASSERT(ScreenBuffer); - /* Set the active buffer */ + /* Set the active buffer and reattach the VDM UI to it */ SetConsoleActiveScreenBuffer(ScreenBuffer); - - /* Reinitialize the VDM menu */ - DestroyVdmMenu(); - CreateVdmMenu(ScreenBuffer); + ConsoleReattach(ScreenBuffer); } static BOOL VgaEnterGraphicsMode(PCOORD Resolution) Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] Sat Oct 3 15:06:24 2015 @@ -163,19 +163,20 @@ UpdateVdmMenuDisks(VOID) { UINT_PTR ItemID; + UNICODE_STRING ValueString; USHORT i; - CHAR szNoMedia[100]; - CHAR szMenuString1[256], szMenuString2[256]; + WCHAR szNoMedia[100]; + WCHAR szMenuString1[256], szMenuString2[256]; /* Update the disks menu items */ - LoadStringA(GetModuleHandle(NULL), + LoadStringW(GetModuleHandle(NULL), IDS_NO_MEDIA, szNoMedia, ARRAYSIZE(szNoMedia)); - LoadStringA(GetModuleHandle(NULL), + LoadStringW(GetModuleHandle(NULL), IDS_VDM_MOUNT_FLOPPY, szMenuString1, ARRAYSIZE(szMenuString1)); @@ -188,10 +189,15 @@ GlobalSettings.FloppyDisks[i].Buffer && GlobalSettings.FloppyDisks[i].Buffer != '\0') { + /* Convert the ANSI string to UNICODE */ + RtlAnsiStringToUnicodeString(&ValueString, &GlobalSettings.FloppyDisks[i], TRUE); + /* Update item text */ - _snprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, i, GlobalSettings.FloppyDisks[i].Buffer); - szMenuString2[ARRAYSIZE(szMenuString2) - 1] = ANSI_NULL; - ModifyMenuA(hConsoleMenu, ItemID, MF_BYCOMMAND | MF_STRING, ItemID, szMenuString2); + _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, i, ValueString.Buffer); + szMenuString2[ARRAYSIZE(szMenuString2) - 1] = UNICODE_NULL; + ModifyMenuW(hConsoleMenu, ItemID, MF_BYCOMMAND | MF_STRING, ItemID, szMenuString2); + + RtlFreeUnicodeString(&ValueString); /* Enable the eject item */ EnableMenuItem(hConsoleMenu, ItemID + 1, MF_BYCOMMAND | MF_ENABLED); @@ -199,9 +205,9 @@ else { /* Update item text */ - _snprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, i, szNoMedia); - szMenuString2[ARRAYSIZE(szMenuString2) - 1] = ANSI_NULL; - ModifyMenuA(hConsoleMenu, ItemID, MF_BYCOMMAND | MF_STRING, ItemID, szMenuString2); + _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, i, szNoMedia); + szMenuString2[ARRAYSIZE(szMenuString2) - 1] = UNICODE_NULL; + ModifyMenuW(hConsoleMenu, ItemID, MF_BYCOMMAND | MF_STRING, ItemID, szMenuString2); /* Disable the eject item */ EnableMenuItem(hConsoleMenu, ItemID + 1, MF_BYCOMMAND | MF_GRAYED); @@ -209,46 +215,27 @@ } } -static VOID ShowHideMousePointer(HANDLE ConOutHandle, BOOLEAN ShowPtr) -{ - if (ShowPtr) - { - /* Be sure the cursor will be shown */ - while (ShowConsoleCursor(ConOutHandle, TRUE) < 0) ; - } - else - { - /* Be sure the cursor will be hidden */ - while (ShowConsoleCursor(ConOutHandle, FALSE) >= 0) ; - } -} - static VOID UpdateVdmMenu(VOID) { - // This is a temporary HACK until I find the most elegant way - // to synchronize mouse cursor display with console screenbuffer switches. - ShowHideMousePointer(CurrentConsoleOutput, ShowPointer); - UpdateVdmMenuMouse(); UpdateVdmMenuDisks(); } -/*static*/ VOID +static VOID CreateVdmMenu(HANDLE ConOutHandle) { HMENU hVdmSubMenu; - UINT_PTR ItemID = ID_VDM_DRIVES; + UINT_PTR ItemID; UINT Pos; + USHORT i; WCHAR szNoMedia[100]; WCHAR szMenuString1[256], szMenuString2[256]; hConsoleMenu = ConsoleMenuControl(ConOutHandle, ID_SHOWHIDE_MOUSE, - ID_VDM_DRIVES + 4); + ID_VDM_DRIVES + (2 * ARRAYSIZE(GlobalSettings.FloppyDisks))); if (hConsoleMenu == NULL) return; - - CurrentConsoleOutput = ConOutHandle; /* Get the position where we are going to insert our menu items */ VdmMenuPos = GetMenuItemCount(hConsoleMenu); @@ -273,30 +260,32 @@ szMenuString1, ARRAYSIZE(szMenuString1)); - /* Drive 0 -- Mount */ - _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, 0, szNoMedia); - szMenuString2[ARRAYSIZE(szMenuString2) - 1] = UNICODE_NULL; - InsertMenuW(hVdmSubMenu, Pos++, MF_STRING | MF_BYPOSITION, ItemID + 0, szMenuString2); - - /* Drive 1 -- Mount */ - _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, 1, szNoMedia); - szMenuString2[ARRAYSIZE(szMenuString2) - 1] = UNICODE_NULL; - InsertMenuW(hVdmSubMenu, Pos++, MF_STRING | MF_BYPOSITION, ItemID + 2, szMenuString2); + /* Drive 'x' -- Mount */ + for (i = 0; i < ARRAYSIZE(GlobalSettings.FloppyDisks); ++i) + { + ItemID = ID_VDM_DRIVES + (2 * i); + + /* Add the item */ + _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, i, szNoMedia); + szMenuString2[ARRAYSIZE(szMenuString2) - 1] = UNICODE_NULL; + InsertMenuW(hVdmSubMenu, Pos++, MF_STRING | MF_BYPOSITION, ItemID, szMenuString2); + } LoadStringW(GetModuleHandle(NULL), IDS_VDM_EJECT_FLOPPY, szMenuString1, ARRAYSIZE(szMenuString1)); - /* Drive 0 -- Eject */ - _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, 0); - szMenuString2[ARRAYSIZE(szMenuString2) - 1] = UNICODE_NULL; - InsertMenuW(hVdmSubMenu, Pos++, MF_STRING | MF_BYPOSITION, ItemID + 1, szMenuString2); - - /* Drive 1 -- Eject */ - _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, 1); - szMenuString2[ARRAYSIZE(szMenuString2) - 1] = UNICODE_NULL; - InsertMenuW(hVdmSubMenu, Pos++, MF_STRING | MF_BYPOSITION, ItemID + 3, szMenuString2); + /* Drive 'x' -- Eject */ + for (i = 0; i < ARRAYSIZE(GlobalSettings.FloppyDisks); ++i) + { + ItemID = ID_VDM_DRIVES + (2 * i); + + /* Add the item */ + _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, i); + szMenuString2[ARRAYSIZE(szMenuString2) - 1] = UNICODE_NULL; + InsertMenuW(hVdmSubMenu, Pos++, MF_STRING | MF_BYPOSITION, ItemID + 1, szMenuString2); + } /* Refresh the menu state */ UpdateVdmMenu(); @@ -304,7 +293,7 @@ } } -/*static*/ VOID +static VOID DestroyVdmMenu(VOID) { UINT i = 0; @@ -317,8 +306,20 @@ } while (!(Items[i].uID == 0 && Items[i].SubMenu == NULL && Items[i].uCmdID == 0)); DrawMenuBar(hConsoleWnd); - - CurrentConsoleOutput = INVALID_HANDLE_VALUE; +} + +static VOID ShowHideMousePointer(HANDLE ConOutHandle, BOOLEAN ShowPtr) +{ + if (ShowPtr) + { + /* Be sure the cursor will be shown */ + while (ShowConsoleCursor(ConOutHandle, TRUE) < 0) ; + } + else + { + /* Be sure the cursor will be hidden */ + while (ShowConsoleCursor(ConOutHandle, FALSE) >= 0) ; + } } static VOID EnableExtraHardware(HANDLE ConsoleInput) @@ -867,6 +868,17 @@ SetConsoleMode(ConsoleInput , OrgConsoleInputMode ); } +VOID +ConsoleReattach(HANDLE ConOutHandle) +{ + DestroyVdmMenu(); + CurrentConsoleOutput = ConOutHandle; + CreateVdmMenu(ConOutHandle); + + /* Synchronize mouse cursor display with console screenbuffer switches */ + ShowHideMousePointer(CurrentConsoleOutput, ShowPointer); +} + static BOOL ConsoleInit(VOID) { Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] Sat Oct 3 15:06:24 2015 @@ -100,14 +100,11 @@ IN LPCSTR Format, ...); /*static*/ VOID -CreateVdmMenu(HANDLE ConOutHandle); -/*static*/ VOID -DestroyVdmMenu(VOID); -/*static*/ VOID UpdateVdmMenuDisks(VOID); BOOL ConsoleAttach(VOID); VOID ConsoleDetach(VOID); +VOID ConsoleReattach(HANDLE ConOutHandle); VOID MenuEventHandler(PMENU_EVENT_RECORD MenuEvent); VOID FocusEventHandler(PFOCUS_EVENT_RECORD FocusEvent);

1 0

[hbelusca] 69430: [WIN32SS:GDI] Convert COLOR16 values to byte range before calling XLATEOBJ_iXlate. This fixes gradient colors in some applications, as for example in Code::Blocks. Patch by Vort. ...
by hbelusca＠svn.reactos.org 03 Oct '15

03 Oct '15

Author: hbelusca Date: Sat Oct 3 13:30:15 2015 New Revision: 69430 URL: http://svn.reactos.org/svn/reactos?rev=69430&view=rev Log: [WIN32SS:GDI] Convert COLOR16 values to byte range before calling XLATEOBJ_iXlate. This fixes gradient colors in some applications, as for example in Code::Blocks. Patch by Vort. This is a fix for code written in revision r8117, so old !! CORE-8652 #comment Committed in r69430, thanks guys! Modified: trunk/reactos/win32ss/gdi/eng/gradient.c Modified: trunk/reactos/win32ss/gdi/eng/gradient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/gradient.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/gradient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/gradient.c [iso-8859-1] Sat Oct 3 13:30:15 2015 @@ -161,7 +161,7 @@ do { RECTL FillRect; - ULONG Color = XLATEOBJ_iXlate(pxlo, RGB(v1->Red, v1->Green, v1->Blue)); + ULONG Color = XLATEOBJ_iXlate(pxlo, RGB(v1->Red >> 8, v1->Green >> 8, v1->Blue >> 8)); EnumMore = CLIPOBJ_bEnum(pco, (ULONG) sizeof(RectEnum), (PVOID) &RectEnum); for (i = 0; i < RectEnum.c && RectEnum.arcl[i].top <= rcSG.bottom; i++)

1 0

[akhaldi] 69429: [RAPPS] Fix SSL certificate pinning, allow HTTPS links, add URL args support, some UX fixes, comment improvements and fix stopping the download process when pressing cancel. By Ism...
by akhaldi＠svn.reactos.org 03 Oct '15

03 Oct '15

Author: akhaldi Date: Sat Oct 3 08:39:05 2015 New Revision: 69429 URL: http://svn.reactos.org/svn/reactos?rev=69429&view=rev Log: [RAPPS] Fix SSL certificate pinning, allow HTTPS links, add URL args support, some UX fixes, comment improvements and fix stopping the download process when pressing cancel. By Ismael Ferreras Morezuelas. CORE-9060 CORE-10289 Modified: trunk/reactos/base/applications/rapps/loaddlg.c Modified: trunk/reactos/base/applications/rapps/loaddlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lo… ============================================================================== --- trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] Sat Oct 3 08:39:05 2015 @@ -29,6 +29,7 @@ #include "rapps.h" #include <wininet.h> #include <shellapi.h> +#include <windowsx.h> static PAPPLICATION_INFO AppInfo; @@ -39,6 +40,7 @@ HWND hDialog; BOOL *pbCancelled; BOOL UrlHasBeenCopied; + WCHAR ProgressText[MAX_PATH]; } IBindStatusCallbackImpl; static @@ -117,7 +119,20 @@ Item = GetDlgItem(This->hDialog, IDC_DOWNLOAD_PROGRESS); if (Item && ulProgressMax) { - SendMessageW(Item, PBM_SETPOS, ((ULONGLONG)ulProgress * 100) / ulProgressMax, 0); + WCHAR szProgress[100]; + WCHAR szProgressMax[100]; + UINT uiPercentage = ((ULONGLONG)ulProgress * 100) / ulProgressMax; + + /* send the current progress to the progress bar */ + SendMessageW(Item, PBM_SETPOS, uiPercentage, 0); + + /* format the bits and bytes into pretty and accesible units... */ + StrFormatByteSizeW(ulProgress, szProgress, sizeof(szProgress)); + StrFormatByteSizeW(ulProgressMax, szProgressMax, sizeof(szProgressMax)); + + /* ...and post all of it to our subclassed progress bar text subroutine */ + swprintf(This->ProgressText, L"%u%% â %s / %s", uiPercentage, szProgress, szProgressMax); + SendMessageW(Item, WM_SETTEXT, 0, (LPARAM)This->ProgressText); } Item = GetDlgItem(This->hDialog, IDC_DOWNLOAD_STATUS); @@ -227,15 +242,15 @@ BOOL Ret = FALSE; INTERNET_CERTIFICATE_INFOW certInfo; - hConnect = InternetConnectW(hInternet, lpszHostName, INTERNET_DEFAULT_HTTPS_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, INTERNET_FLAG_SECURE, 0); + hConnect = InternetConnectW(hInternet, lpszHostName, INTERNET_DEFAULT_HTTPS_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, INTERNET_FLAG_SECURE, 0); if (hConnect) { hRequest = HttpOpenRequestW(hConnect, L"HEAD", NULL, NULL, NULL, NULL, INTERNET_FLAG_SECURE, 0); if (hRequest != NULL) - { + { Ret = HttpSendRequestW(hRequest, L"", 0, NULL, 0); - if (Ret) - { + if (Ret) + { certInfoLength = sizeof(INTERNET_CERTIFICATE_INFOW); Ret = InternetQueryOptionW(hRequest, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, @@ -243,7 +258,7 @@ &certInfoLength); if (Ret) { - if (certInfo.lpszEncryptionAlgName) + if (certInfo.lpszEncryptionAlgName) LocalFree(certInfo.lpszEncryptionAlgName); if (certInfo.lpszIssuerInfo) { @@ -251,11 +266,11 @@ Ret = FALSE; LocalFree(certInfo.lpszIssuerInfo); } - if (certInfo.lpszProtocolName) + if (certInfo.lpszProtocolName) LocalFree(certInfo.lpszProtocolName); - if (certInfo.lpszSignatureAlgName) + if (certInfo.lpszSignatureAlgName) LocalFree(certInfo.lpszSignatureAlgName); - if (certInfo.lpszSubjectInfo) + if (certInfo.lpszSubjectInfo) { if (strcmp((LPSTR)certInfo.lpszSubjectInfo, CERT_SUBJECT_INFO) != 0) Ret = FALSE; @@ -276,7 +291,7 @@ { IBindStatusCallback *dl = NULL; WCHAR path[MAX_PATH]; - LPWSTR p; + PWSTR p, q; HWND Dlg = (HWND) Context; DWORD dwContentLen, dwBytesWritten, dwBytesRead, dwStatus; DWORD dwCurrentBytesRead = 0; @@ -290,45 +305,58 @@ unsigned char lpBuffer[4096]; const LPWSTR lpszAgent = L"RApps/1.0"; URL_COMPONENTS urlComponents; - size_t urlLength; - - /* built the path for the download */ + size_t urlLength, filenameLength; + + /* build the path for the download */ p = wcsrchr(AppInfo->szUrlDownload, L'/'); - + q = wcsrchr(AppInfo->szUrlDownload, L'?'); + + /* do we have a final slash separator? */ if (!p) goto end; - if (wcscmp(AppInfo->szUrlDownload, APPLICATION_DATABASE_URL) == 0) - { - bCab = TRUE; - if (!GetStorageDirectory(path, sizeof(path) / sizeof(path[0]))) - goto end; - } - else - { - if (FAILED(StringCbCopyW(path, sizeof(path), SettingsInfo.szDownloadDir))) - 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 (wcscmp(AppInfo->szUrlDownload, APPLICATION_DATABASE_URL) == 0) + { + bCab = TRUE; + if (!GetStorageDirectory(path, _countof(path))) + goto end; + } + else + { + if (FAILED(StringCbCopyW(path, sizeof(path), SettingsInfo.szDownloadDir))) + goto end; + } + + /* is the path valid? can we access it? */ if (GetFileAttributesW(path) == INVALID_FILE_ATTRIBUTES) { if (!CreateDirectoryW(path, NULL)) goto end; } + /* append a \ to the provided file system path, and the filename portion from the URL after that */ if (FAILED(StringCbCatW(path, sizeof(path), L"\\"))) goto end; - if (FAILED(StringCbCatW(path, sizeof(path), p + 1))) - goto end; - - /* download it */ + if (FAILED(StringCbCatNW(path, sizeof(path), p + 1, filenameLength))) + goto end; + + /* create an async download context for it */ bTempfile = TRUE; dl = CreateDl(Context, &bCancelled); if (dl == NULL) goto end; + /* FIXME: this should just be using the system-wide proxy settings */ switch(SettingsInfo.Proxy) { case 0: /* preconfig */ @@ -348,7 +376,7 @@ if (!hOpen) goto end; - hFile = InternetOpenUrlW(hOpen, AppInfo->szUrlDownload, NULL, 0, INTERNET_FLAG_PRAGMA_NOCACHE|INTERNET_FLAG_KEEP_CONNECTION, 0); + hFile = InternetOpenUrlW(hOpen, AppInfo->szUrlDownload, NULL, 0, INTERNET_FLAG_PRAGMA_NOCACHE | INTERNET_FLAG_KEEP_CONNECTION, 0); if (!hFile) goto end; @@ -373,15 +401,15 @@ if(FAILED(StringCbLengthW(AppInfo->szUrlDownload, sizeof(AppInfo->szUrlDownload), &urlLength))) goto end; - + urlComponents.dwSchemeLength = urlLength*sizeof(WCHAR); urlComponents.lpszScheme = malloc(urlComponents.dwSchemeLength); urlComponents.dwHostNameLength = urlLength*sizeof(WCHAR); urlComponents.lpszHostName = malloc(urlComponents.dwHostNameLength); - + if(!InternetCrackUrlW(AppInfo->szUrlDownload, urlLength+1, ICU_DECODE | ICU_ESCAPE, &urlComponents)) goto end; - + if(urlComponents.nScheme == INTERNET_SCHEME_HTTP || urlComponents.nScheme == INTERNET_SCHEME_HTTPS) HttpQueryInfo(hFile, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &dwContentLen, &dwStatus, 0); @@ -389,14 +417,17 @@ dwContentLen = FtpGetFileSize(hFile, &dwStatus); #ifdef USE_CERT_PINNING - if ((urlComponents.nScheme == INTERNET_SCHEME_HTTPS) && (!CertIsValid(hOpen, urlComponents.lpszHostName))) + /* are we using HTTPS to download the RAPPS update package? check if the certificate is original */ + if ((urlComponents.nScheme == INTERNET_SCHEME_HTTPS) && + (wcscmp(AppInfo->szUrlDownload, APPLICATION_DATABASE_URL) == 0) && + (!CertIsValid(hOpen, urlComponents.lpszHostName))) { WCHAR szMsgText[MAX_STR_LEN]; if (!LoadStringW(hInst, IDS_CERT_DOES_NOT_MATCH, szMsgText, sizeof(szMsgText) / sizeof(WCHAR))) goto end; - MessageBoxW(hMainWnd, szMsgText, NULL, MB_OK | MB_ICONERROR); + MessageBoxW(Dlg, szMsgText, NULL, MB_OK | MB_ICONERROR); goto end; } #endif @@ -416,7 +447,7 @@ dwCurrentBytesRead += dwBytesRead; IBindStatusCallback_OnProgress(dl, dwCurrentBytesRead, dwContentLen, 0, AppInfo->szUrlDownload); } - while (dwBytesRead); + while (dwBytesRead && !bCancelled); CloseHandle(hOut); hOut = INVALID_HANDLE_VALUE; @@ -451,15 +482,88 @@ return 0; } + +LRESULT CALLBACK +DownloadProgressProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uIdSubclass, DWORD_PTR dwRefData) +{ + static WCHAR szProgressText[MAX_STR_LEN] = {0}; + + switch (uMsg) + { + case WM_SETTEXT: + { + if (lParam) + wcscpy(szProgressText, (WCHAR *)lParam); + } + + case WM_ERASEBKGND: + case WM_PAINT: + { + PAINTSTRUCT ps; + HDC hDC = BeginPaint(hWnd, &ps), hdcMem; + HBITMAP hbmMem; + HANDLE hOld; + RECT myRect; + UINT win_width, win_height; + + GetClientRect(hWnd, &myRect); + + /* grab the progress bar rect size */ + win_width = myRect.right - myRect.left; + win_height = myRect.bottom - myRect.top; + + /* create an off-screen DC for double-buffering */ + hdcMem = CreateCompatibleDC(hDC); + hbmMem = CreateCompatibleBitmap(hDC, win_width, win_height); + + hOld = SelectObject(hdcMem, hbmMem); + + /* call the original draw code and redirect it to our memory buffer */ + DefSubclassProc(hWnd, uMsg, (WPARAM)hdcMem, lParam); + + /* draw our nifty progress text over it */ + SelectFont(hdcMem, GetStockFont(DEFAULT_GUI_FONT)); + DrawShadowText(hdcMem, szProgressText, wcslen(szProgressText), + &myRect, + DT_CENTER | DT_VCENTER | DT_NOPREFIX | DT_SINGLELINE, + GetSysColor(COLOR_CAPTIONTEXT), + GetSysColor(COLOR_3DSHADOW), + 1, 1); + + /* transfer the off-screen DC to the screen */ + BitBlt(hDC, 0, 0, win_width, win_height, hdcMem, 0, 0, SRCCOPY); + + /* free the off-screen DC */ + SelectObject(hdcMem, hOld); + DeleteObject(hbmMem); + DeleteDC(hdcMem); + + EndPaint(hWnd, &ps); + return 0; + } + + /* Raymond Chen says that we should safely unsubclass all the things! + (http://blogs.msdn.com/b/oldnewthing/archive/2003/11/11/55653.aspx) */ + case WM_NCDESTROY: + { + ZeroMemory(szProgressText, MAX_STR_LEN); + RemoveWindowSubclass(hWnd, DownloadProgressProc, uIdSubclass); + } + + default: + return DefSubclassProc(hWnd, uMsg, wParam, lParam); + } +} + static INT_PTR CALLBACK -DownloadDlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam) +DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { HANDLE Thread; DWORD ThreadId; HWND Item; - switch (Msg) + switch (uMsg) { case WM_INITDIALOG: { @@ -478,16 +582,25 @@ Item = GetDlgItem(Dlg, IDC_DOWNLOAD_PROGRESS); if (Item) { + /* initialize the default values for our nifty progress bar + and subclass it so that it learns to print a status text */ SendMessageW(Item, PBM_SETRANGE, 0, MAKELPARAM(0, 100)); SendMessageW(Item, PBM_SETPOS, 0, 0); + + SetWindowSubclass(Item, DownloadProgressProc, 0, 0); } + /* add a neat placeholder until the download URL is retrieved */ + Item = GetDlgItem(Dlg, IDC_DOWNLOAD_STATUS); + SendMessageW(Item, WM_SETTEXT, 0, (LPARAM) L"â¢ â¢ â¢"); + Thread = CreateThread(NULL, 0, ThreadFunc, Dlg, 0, &ThreadId); - if (!Thread) return FALSE; + if (!Thread) + return FALSE; + CloseHandle(Thread); return TRUE; } - case WM_COMMAND: if (wParam == IDCANCEL) {

1 0

[hbelusca] 69428: [NTVDM] Usability fixes: - Update the menu each time the user chooses to show or hide the mouse pointer. - Keep the mouse show state across screenbuffer switches (text/graphics) (...
by hbelusca＠svn.reactos.org 03 Oct '15

03 Oct '15

Author: hbelusca Date: Sat Oct 3 02:36:35 2015 New Revision: 69428 URL: http://svn.reactos.org/svn/reactos?rev=69428&view=rev Log: [NTVDM] Usability fixes: - Update the menu each time the user chooses to show or hide the mouse pointer. - Keep the mouse show state across screenbuffer switches (text/graphics) (half-hackish at the moment; will be elegantly fixed later on). - Update the floppy disk menu items each time the user mounts / ejects a disk; display the disk image file name currently mounted (CHAR strings used at the moment, WCHAR conversion will follow soon). Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/emul… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] Sat Oct 3 02:36:35 2015 @@ -414,39 +414,69 @@ #define OFN_EX_NOPLACESBAR 0x00000001 #endif // (_WIN32_WINNT >= 0x0500) - OPENFILENAMEA ofn; - CHAR szFile[MAX_PATH] = ""; + OPENFILENAMEW ofn; + WCHAR szFile[MAX_PATH] = L""; + UNICODE_STRING ValueString; + + ASSERT(DiskNumber < ARRAYSIZE(GlobalSettings.FloppyDisks)); RtlZeroMemory(&ofn, sizeof(ofn)); ofn.lStructSize = sizeof(ofn); ofn.hwndOwner = hConsoleWnd; - ofn.lpstrTitle = "Select a virtual floppy image"; + ofn.lpstrTitle = L"Select a virtual floppy image"; ofn.Flags = OFN_EXPLORER | OFN_ENABLESIZING | OFN_LONGNAMES | OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST; // ofn.FlagsEx = OFN_EX_NOPLACESBAR; - ofn.lpstrFilter = "Virtual floppy images (*.vfd;*.img;*.ima;*.dsk)\0*.vfd;*.img;*.ima;*.dsk\0All files (*.*)\0*.*\0\0"; - ofn.lpstrDefExt = "vfd"; + ofn.lpstrFilter = L"Virtual floppy images (*.vfd;*.img;*.ima;*.dsk)\0*.vfd;*.img;*.ima;*.dsk\0All files (*.*)\0*.*\0\0"; + ofn.lpstrDefExt = L"vfd"; ofn.nFilterIndex = 0; ofn.lpstrFile = szFile; ofn.nMaxFile = ARRAYSIZE(szFile); - if (!GetOpenFileNameA(&ofn)) + if (!GetOpenFileNameW(&ofn)) { DPRINT1("CommDlgExtendedError = %d\n", CommDlgExtendedError()); return; } - // TODO: Refresh the menu state - - if (!MountDisk(FLOPPY_DISK, DiskNumber, szFile, !!(ofn.Flags & OFN_READONLY))) + /* Free the old string */ + if (GlobalSettings.FloppyDisks[DiskNumber].Buffer) + RtlFreeAnsiString(&GlobalSettings.FloppyDisks[DiskNumber]); + + /* Convert the UNICODE string to ANSI and store it */ + RtlInitEmptyUnicodeString(&ValueString, szFile, wcslen(szFile) * sizeof(WCHAR)); + ValueString.Length = ValueString.MaximumLength; + RtlUnicodeStringToAnsiString(&GlobalSettings.FloppyDisks[DiskNumber], &ValueString, TRUE); + + /* Mount the disk */ + if (!MountDisk(FLOPPY_DISK, DiskNumber, GlobalSettings.FloppyDisks[DiskNumber].Buffer, !!(ofn.Flags & OFN_READONLY))) + { DisplayMessage(L"An error happened when mounting disk %d", DiskNumber); + RtlFreeAnsiString(&GlobalSettings.FloppyDisks[DiskNumber]); + RtlInitEmptyAnsiString(&GlobalSettings.FloppyDisks[DiskNumber], NULL, 0); + return; + } + + /* Refresh the menu state */ + UpdateVdmMenuDisks(); } VOID EjectFloppy(IN ULONG DiskNumber) { - // TODO: Refresh the menu state - + ASSERT(DiskNumber < ARRAYSIZE(GlobalSettings.FloppyDisks)); + + /* Unmount the disk */ if (!UnmountDisk(FLOPPY_DISK, DiskNumber)) DisplayMessage(L"An error happened when ejecting disk %d", DiskNumber); + + /* Free the old string */ + if (GlobalSettings.FloppyDisks[DiskNumber].Buffer) + { + RtlFreeAnsiString(&GlobalSettings.FloppyDisks[DiskNumber]); + RtlInitEmptyAnsiString(&GlobalSettings.FloppyDisks[DiskNumber], NULL, 0); + } + + /* Refresh the menu state */ + UpdateVdmMenuDisks(); } @@ -560,7 +590,12 @@ GlobalSettings.FloppyDisks[i].Buffer && GlobalSettings.FloppyDisks[i].Buffer != '\0') { - MountDisk(FLOPPY_DISK, i, GlobalSettings.FloppyDisks[i].Buffer, FALSE); + if (!MountDisk(FLOPPY_DISK, i, GlobalSettings.FloppyDisks[i].Buffer, FALSE)) + { + DPRINT1("Failed to mount floppy disk file '%Z'.\n", &GlobalSettings.FloppyDisks[i]); + RtlFreeAnsiString(&GlobalSettings.FloppyDisks[i]); + RtlInitEmptyAnsiString(&GlobalSettings.FloppyDisks[i], NULL, 0); + } } } @@ -576,12 +611,15 @@ { if (!MountDisk(HARD_DISK, i, GlobalSettings.HardDisks[i].Buffer, FALSE)) { - wprintf(L"FATAL: Failed to mount hard disk file '%Z'.\n", &GlobalSettings); + wprintf(L"FATAL: Failed to mount hard disk file '%Z'.\n", &GlobalSettings.HardDisks[i]); EmulatorCleanup(); return FALSE; } } } + + /* Refresh the menu state */ + UpdateVdmMenuDisks(); /* Initialize the software callback system and register the emulator BOPs */ InitializeInt32(); Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] Sat Oct 3 02:36:35 2015 @@ -22,6 +22,8 @@ /* VARIABLES ******************************************************************/ +static HANDLE CurrentConsoleOutput = INVALID_HANDLE_VALUE; + static HANDLE ConsoleInput = INVALID_HANDLE_VALUE; static HANDLE ConsoleOutput = INVALID_HANDLE_VALUE; static DWORD OrgConsoleInputMode, OrgConsoleOutputMode; @@ -35,7 +37,7 @@ HWND hConsoleWnd = NULL; static HMENU hConsoleMenu = NULL; static INT VdmMenuPos = -1; -static BOOLEAN ShowPointer = FALSE; +static BOOLEAN ShowPointer = TRUE; /* * Those menu helpers were taken from the GUI frontend in winsrv.dll @@ -141,6 +143,97 @@ return FALSE; } +static VOID +UpdateVdmMenuMouse(VOID) +{ + WCHAR szMenuString[256]; + + /* Update "Hide/Show mouse" menu item */ + if (LoadStringW(GetModuleHandle(NULL), + (!ShowPointer ? IDS_SHOW_MOUSE : IDS_HIDE_MOUSE), + szMenuString, + ARRAYSIZE(szMenuString)) > 0) + { + ModifyMenuW(hConsoleMenu, ID_SHOWHIDE_MOUSE, + MF_BYCOMMAND, ID_SHOWHIDE_MOUSE, szMenuString); + } +} + +/*static*/ VOID +UpdateVdmMenuDisks(VOID) +{ + UINT_PTR ItemID; + USHORT i; + + CHAR szNoMedia[100]; + CHAR szMenuString1[256], szMenuString2[256]; + + /* Update the disks menu items */ + + LoadStringA(GetModuleHandle(NULL), + IDS_NO_MEDIA, + szNoMedia, + ARRAYSIZE(szNoMedia)); + + LoadStringA(GetModuleHandle(NULL), + IDS_VDM_MOUNT_FLOPPY, + szMenuString1, + ARRAYSIZE(szMenuString1)); + + for (i = 0; i < ARRAYSIZE(GlobalSettings.FloppyDisks); ++i) + { + ItemID = ID_VDM_DRIVES + (2 * i); + + if (GlobalSettings.FloppyDisks[i].Length != 0 && + GlobalSettings.FloppyDisks[i].Buffer && + GlobalSettings.FloppyDisks[i].Buffer != '\0') + { + /* Update item text */ + _snprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, i, GlobalSettings.FloppyDisks[i].Buffer); + szMenuString2[ARRAYSIZE(szMenuString2) - 1] = ANSI_NULL; + ModifyMenuA(hConsoleMenu, ItemID, MF_BYCOMMAND | MF_STRING, ItemID, szMenuString2); + + /* Enable the eject item */ + EnableMenuItem(hConsoleMenu, ItemID + 1, MF_BYCOMMAND | MF_ENABLED); + } + else + { + /* Update item text */ + _snprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, i, szNoMedia); + szMenuString2[ARRAYSIZE(szMenuString2) - 1] = ANSI_NULL; + ModifyMenuA(hConsoleMenu, ItemID, MF_BYCOMMAND | MF_STRING, ItemID, szMenuString2); + + /* Disable the eject item */ + EnableMenuItem(hConsoleMenu, ItemID + 1, MF_BYCOMMAND | MF_GRAYED); + } + } +} + +static VOID ShowHideMousePointer(HANDLE ConOutHandle, BOOLEAN ShowPtr) +{ + if (ShowPtr) + { + /* Be sure the cursor will be shown */ + while (ShowConsoleCursor(ConOutHandle, TRUE) < 0) ; + } + else + { + /* Be sure the cursor will be hidden */ + while (ShowConsoleCursor(ConOutHandle, FALSE) >= 0) ; + } +} + +static VOID +UpdateVdmMenu(VOID) +{ + // This is a temporary HACK until I find the most elegant way + // to synchronize mouse cursor display with console screenbuffer switches. + ShowHideMousePointer(CurrentConsoleOutput, ShowPointer); + + UpdateVdmMenuMouse(); + UpdateVdmMenuDisks(); +} + /*static*/ VOID CreateVdmMenu(HANDLE ConOutHandle) { @@ -155,6 +248,8 @@ ID_VDM_DRIVES + 4); if (hConsoleMenu == NULL) return; + CurrentConsoleOutput = ConOutHandle; + /* Get the position where we are going to insert our menu items */ VdmMenuPos = GetMenuItemCount(hConsoleMenu); @@ -203,9 +298,8 @@ szMenuString2[ARRAYSIZE(szMenuString2) - 1] = UNICODE_NULL; InsertMenuW(hVdmSubMenu, Pos++, MF_STRING | MF_BYPOSITION, ItemID + 3, szMenuString2); - // TODO: Refresh the menu state - - /* Refresh the menu */ + /* Refresh the menu state */ + UpdateVdmMenu(); DrawMenuBar(hConsoleWnd); } } @@ -223,31 +317,8 @@ } while (!(Items[i].uID == 0 && Items[i].SubMenu == NULL && Items[i].uCmdID == 0)); DrawMenuBar(hConsoleWnd); -} - -static VOID ShowHideMousePointer(HANDLE ConOutHandle, BOOLEAN ShowPtr) -{ - WCHAR szMenuString[256]; - - if (ShowPtr) - { - /* Be sure the cursor will be shown */ - while (ShowConsoleCursor(ConOutHandle, TRUE) < 0) ; - } - else - { - /* Be sure the cursor will be hidden */ - while (ShowConsoleCursor(ConOutHandle, FALSE) >= 0) ; - } - - if (LoadStringW(GetModuleHandle(NULL), - (!ShowPtr ? IDS_SHOW_MOUSE : IDS_HIDE_MOUSE), - szMenuString, - ARRAYSIZE(szMenuString)) > 0) - { - ModifyMenu(hConsoleMenu, ID_SHOWHIDE_MOUSE, - MF_BYCOMMAND, ID_SHOWHIDE_MOUSE, szMenuString); - } + + CurrentConsoleOutput = INVALID_HANDLE_VALUE; } static VOID EnableExtraHardware(HANDLE ConsoleInput) @@ -859,8 +930,9 @@ switch (MenuEvent->dwCommandId) { case ID_SHOWHIDE_MOUSE: - ShowHideMousePointer(ConsoleOutput, ShowPointer); ShowPointer = !ShowPointer; + ShowHideMousePointer(CurrentConsoleOutput, ShowPointer); + UpdateVdmMenuMouse(); break; case ID_VDM_DUMPMEM_TXT: Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] Sat Oct 3 02:36:35 2015 @@ -103,6 +103,8 @@ CreateVdmMenu(HANDLE ConOutHandle); /*static*/ VOID DestroyVdmMenu(VOID); +/*static*/ VOID +UpdateVdmMenuDisks(VOID); BOOL ConsoleAttach(VOID); VOID ConsoleDetach(VOID);

1 0

[aandrejevic] 69427: [FAST486] Reading/writing to memory should #SS(0) when the segment is the stack segment, and #GP(0) otherwise. It should never generate #NP.
by aandrejevic＠svn.reactos.org 02 Oct '15

02 Oct '15

Author: aandrejevic Date: Fri Oct 2 15:11:24 2015 New Revision: 69427 URL: http://svn.reactos.org/svn/reactos?rev=69427&view=rev Log: [FAST486] Reading/writing to memory should #SS(0) when the segment is the stack segment, and #GP(0) otherwise. It should never generate #NP. Modified: trunk/reactos/lib/fast486/common.c Modified: trunk/reactos/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.c?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.c [iso-8859-1] Fri Oct 2 15:11:24 2015 @@ -42,6 +42,8 @@ { ULONG LinearAddress; PFAST486_SEG_REG CachedDescriptor; + FAST486_EXCEPTIONS Exception = SegmentReg != FAST486_REG_SS + ? FAST486_EXCEPTION_GP : FAST486_EXCEPTION_SS; ASSERT(SegmentReg < FAST486_NUM_SEG_REGS); @@ -53,7 +55,7 @@ if ((Offset + Size - 1) > CachedDescriptor->Limit) { /* Read beyond limit */ - Fast486Exception(State, FAST486_EXCEPTION_GP); + Fast486Exception(State, Exception); return FALSE; } } @@ -62,7 +64,7 @@ if (Offset < CachedDescriptor->Limit) { /* Read beyond limit */ - Fast486Exception(State, FAST486_EXCEPTION_GP); + Fast486Exception(State, Exception); return FALSE; } } @@ -74,14 +76,14 @@ if (!CachedDescriptor->Present) { - Fast486Exception(State, FAST486_EXCEPTION_NP); + Fast486Exception(State, Exception); return FALSE; } if ((!InstFetch && (CachedDescriptor->Rpl > CachedDescriptor->Dpl)) || (Fast486GetCurrentPrivLevel(State) > CachedDescriptor->Dpl)) { - Fast486Exception(State, FAST486_EXCEPTION_GP); + Fast486Exception(State, Exception); return FALSE; } @@ -90,7 +92,7 @@ if (!CachedDescriptor->Executable) { /* Data segment not executable */ - Fast486Exception(State, FAST486_EXCEPTION_GP); + Fast486Exception(State, Exception); return FALSE; } } @@ -99,7 +101,7 @@ if (CachedDescriptor->Executable && (!CachedDescriptor->ReadWrite)) { /* Code segment not readable */ - Fast486Exception(State, FAST486_EXCEPTION_GP); + Fast486Exception(State, Exception); return FALSE; } } @@ -166,6 +168,8 @@ { ULONG LinearAddress; PFAST486_SEG_REG CachedDescriptor; + FAST486_EXCEPTIONS Exception = SegmentReg != FAST486_REG_SS + ? FAST486_EXCEPTION_GP : FAST486_EXCEPTION_SS; ASSERT(SegmentReg < FAST486_NUM_SEG_REGS); @@ -177,7 +181,7 @@ if ((Offset + Size - 1) > CachedDescriptor->Limit) { /* Write beyond limit */ - Fast486Exception(State, FAST486_EXCEPTION_GP); + Fast486Exception(State, Exception); return FALSE; } } @@ -185,8 +189,8 @@ { if (Offset < CachedDescriptor->Limit) { - /* Read beyond limit */ - Fast486Exception(State, FAST486_EXCEPTION_GP); + /* Write beyond limit */ + Fast486Exception(State, Exception); return FALSE; } } @@ -198,27 +202,27 @@ if (!CachedDescriptor->Present) { - Fast486Exception(State, FAST486_EXCEPTION_NP); + Fast486Exception(State, Exception); return FALSE; } if ((CachedDescriptor->Rpl > CachedDescriptor->Dpl) || (Fast486GetCurrentPrivLevel(State) > CachedDescriptor->Dpl)) { - Fast486Exception(State, FAST486_EXCEPTION_GP); + Fast486Exception(State, Exception); return FALSE; } if (CachedDescriptor->Executable) { /* Code segment not writable */ - Fast486Exception(State, FAST486_EXCEPTION_GP); + Fast486Exception(State, Exception); return FALSE; } else if (!CachedDescriptor->ReadWrite) { /* Data segment not writeable */ - Fast486Exception(State, FAST486_EXCEPTION_GP); + Fast486Exception(State, Exception); return FALSE; } }

1 0

[akhaldi] 69426: [INCLUDES] Improve the FILE header section. Brought to you by Adam Stachowicz. CORE-10114
by akhaldi＠svn.reactos.org 01 Oct '15

01 Oct '15

Author: akhaldi Date: Thu Oct 1 18:12:45 2015 New Revision: 69426 URL: http://svn.reactos.org/svn/reactos?rev=69426&view=rev Log: [INCLUDES] Improve the FILE header section. Brought to you by Adam Stachowicz. CORE-10114 Modified: trunk/reactos/include/psdk/ddkernel.h trunk/reactos/include/psdk/dmemmgr.h trunk/reactos/include/psdk/driverspecs.h trunk/reactos/include/psdk/dvp.h trunk/reactos/include/psdk/objerror.h trunk/reactos/include/psdk/polarity.h trunk/reactos/include/reactos/arm/peripherals/pl190.h trunk/reactos/include/reactos/arm/peripherals/sp804.h trunk/reactos/include/reactos/drivers/afd/shared.h trunk/reactos/include/reactos/libs/cportlib/cportlib.h trunk/reactos/include/reactos/libs/fslib/ext2lib.h trunk/reactos/include/reactos/libs/fslib/vfatlib.h trunk/reactos/include/reactos/libs/fslib/vfatxlib.h trunk/reactos/include/reactos/libs/umpnpmgr/sysguid.h trunk/reactos/include/reactos/services/services.h trunk/reactos/include/reactos/subsys/lsass/lsass.h trunk/reactos/include/reactos/subsys/sm/smmsg.h trunk/reactos/include/reactos/version.h.cmake trunk/reactos/include/reactos/winsock/msafd.h trunk/reactos/include/reactos/winsock/msafdlib.h trunk/reactos/include/reactos/winsock/mswinsock.h trunk/reactos/include/reactos/winsock/nsp_dns.h trunk/reactos/include/reactos/winsock/rnr20lib.h trunk/reactos/include/reactos/winsock/ws2help.h trunk/reactos/include/reactos/winsock/wsmobile.h Modified: trunk/reactos/include/psdk/ddkernel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddkernel.h?re… ============================================================================== --- trunk/reactos/include/psdk/ddkernel.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ddkernel.h [iso-8859-1] Thu Oct 1 18:12:45 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: This file is in the public domain. * PROJECT: ReactOS kernel - * FILE: + * FILE: include/psdk/ddkernel.h * PURPOSE: Directx headers * PROGRAMMER: Magnus Olsen (greatlrd) * Modified: trunk/reactos/include/psdk/dmemmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dmemmgr.h?rev… ============================================================================== --- trunk/reactos/include/psdk/dmemmgr.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dmemmgr.h [iso-8859-1] Thu Oct 1 18:12:45 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: This file is in the public domain. * PROJECT: ReactOS kernel - * FILE: + * FILE: include/psdk/dmemmgr.h * PURPOSE: Directx headers * PROGRAMMER: Magnus Olsen (greatlrd) * Modified: trunk/reactos/include/psdk/driverspecs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/driverspecs.h… ============================================================================== --- trunk/reactos/include/psdk/driverspecs.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/driverspecs.h [iso-8859-1] Thu Oct 1 18:12:45 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS DDK * COPYRIGHT: This file is in the Public Domain. - * FILE: driverspecs.h + * FILE: include/psdk/driverspecs.h * ABSTRACT: This header stubs out Driver Verifier annotations to * allow drivers using them to compile with our header set. */ Modified: trunk/reactos/include/psdk/dvp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dvp.h?rev=694… ============================================================================== --- trunk/reactos/include/psdk/dvp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dvp.h [iso-8859-1] Thu Oct 1 18:12:45 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: This file is in the public domain. * PROJECT: ReactOS kernel - * FILE: + * FILE: include/psdk/dvp.h * PURPOSE: Directx headers * PROGRAMMER: Magnus Olsen (greatlrd) * Modified: trunk/reactos/include/psdk/objerror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/objerror.h?re… ============================================================================== --- trunk/reactos/include/psdk/objerror.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/objerror.h [iso-8859-1] Thu Oct 1 18:12:45 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: This file is in the public domain. * PROJECT: ReactOS kernel - * FILE: + * FILE: include/psdk/objerror.h * PURPOSE: Directx headers * PROGRAMMER: Magnus Olsen (greatlrd) * Modified: trunk/reactos/include/psdk/polarity.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/polarity.h?re… ============================================================================== --- trunk/reactos/include/psdk/polarity.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/polarity.h [iso-8859-1] Thu Oct 1 18:12:45 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: This file is in the public domain. * PROJECT: ReactOS kernel - * FILE: + * FILE: include/psdk/polarity.h * PURPOSE: * PROGRAMMER: Magnus Olsen (greatlrd) * Modified: trunk/reactos/include/reactos/arm/peripherals/pl190.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/periph… ============================================================================== --- trunk/reactos/include/reactos/arm/peripherals/pl190.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arm/peripherals/pl190.h [iso-8859-1] Thu Oct 1 18:12:45 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Kernel * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: include/reactos/arm/targets/pl190.h + * FILE: include/reactos/arm/peripherals/pl190.h * PURPOSE: PL190 Registers and Constants * PROGRAMMERS: ReactOS Portable Systems Group */ Modified: trunk/reactos/include/reactos/arm/peripherals/sp804.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/periph… ============================================================================== --- trunk/reactos/include/reactos/arm/peripherals/sp804.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arm/peripherals/sp804.h [iso-8859-1] Thu Oct 1 18:12:45 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Kernel * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: include/reactos/arm/targets/pl011.h + * FILE: include/reactos/arm/peripherals/sp804.h * PURPOSE: SB804 Registers and Constants * PROGRAMMERS: ReactOS Portable Systems Group */ Modified: trunk/reactos/include/reactos/drivers/afd/shared.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/af… ============================================================================== --- trunk/reactos/include/reactos/drivers/afd/shared.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/afd/shared.h [iso-8859-1] Thu Oct 1 18:12:45 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Ancillary Function Driver - * FILE: include/afd/shared.h + * FILE: include/reactos/drivers/afd/shared.h * PURPOSE: Shared definitions for AFD.SYS and MSAFD.DLL */ #ifndef __AFD_SHARED_H Modified: trunk/reactos/include/reactos/libs/cportlib/cportlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/cport… ============================================================================== --- trunk/reactos/include/reactos/libs/cportlib/cportlib.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/cportlib/cportlib.h [iso-8859-1] Thu Oct 1 18:12:45 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS ComPort Library * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: include/reactos/lib/cportlib/cportlib.h + * FILE: include/reactos/libs/cportlib/cportlib.h * PURPOSE: Header for the ComPort Library * PROGRAMMERS: ReactOS Portable Systems Group */ Modified: trunk/reactos/include/reactos/libs/fslib/ext2lib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fslib… ============================================================================== --- trunk/reactos/include/reactos/libs/fslib/ext2lib.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/fslib/ext2lib.h [iso-8859-1] Thu Oct 1 18:12:45 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS EXT2 filesystem library - * FILE: include/fslib/ext2lib.h + * FILE: include/reactos/libs/fslib/ext2lib.h * PURPOSE: Public definitions for ext2 filesystem library */ #ifndef __EXT2LIB_H Modified: trunk/reactos/include/reactos/libs/fslib/vfatlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fslib… ============================================================================== --- trunk/reactos/include/reactos/libs/fslib/vfatlib.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/fslib/vfatlib.h [iso-8859-1] Thu Oct 1 18:12:45 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS VFAT filesystem library - * FILE: include/fslib/vfatlib.h + * FILE: include/reactos/libs/fslib/vfatlib.h * PURPOSE: Public definitions for vfat filesystem library */ #ifndef __VFATLIB_H Modified: trunk/reactos/include/reactos/libs/fslib/vfatxlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fslib… ============================================================================== --- trunk/reactos/include/reactos/libs/fslib/vfatxlib.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/fslib/vfatxlib.h [iso-8859-1] Thu Oct 1 18:12:45 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS VFAT filesystem library - * FILE: include/fslib/vfatlib.h + * FILE: include/reactos/libs/fslib/vfatxlib.h * PURPOSE: Public definitions for vfat filesystem library */ #ifndef __VFATXLIB_H Modified: trunk/reactos/include/reactos/libs/umpnpmgr/sysguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/umpnp… ============================================================================== --- trunk/reactos/include/reactos/libs/umpnpmgr/sysguid.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/umpnpmgr/sysguid.h [iso-8859-1] Thu Oct 1 18:12:45 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS UserMode PnP - * FILE: ntoskrnl/rtl/libsupp.c + * FILE: include/reactos/libs/umpnpmgr/sysguid.h * PURPOSE: GUIDs shared between umpnpmgr and the Kernel PnP Manager * PROGRAMMERS: Eric Kohl */ Modified: trunk/reactos/include/reactos/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/services/s… ============================================================================== --- trunk/reactos/include/reactos/services/services.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/services/services.h [iso-8859-1] Thu Oct 1 18:12:45 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: include/services/services.h + * FILE: include/reactos/services/services.h * PURPOSE: Private interface between SERVICES.EXE and ADVAPI32.DLL * PROGRAMMER: Eric Kohl */ Modified: trunk/reactos/include/reactos/subsys/lsass/lsass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/lsa… ============================================================================== --- trunk/reactos/include/reactos/subsys/lsass/lsass.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/lsass/lsass.h [iso-8859-1] Thu Oct 1 18:12:45 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: include/lsass/lsass.h + * FILE: include/reactos/subsys/lsass/lsass.h * PURPOSE: LSASS API declarations * UPDATE HISTORY: * Created 05/08/00 Modified: trunk/reactos/include/reactos/subsys/sm/smmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/sm/… ============================================================================== --- trunk/reactos/include/reactos/subsys/sm/smmsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/sm/smmsg.h [iso-8859-1] Thu Oct 1 18:12:45 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Windows-Compatible Session Manager * LICENSE: BSD 2-Clause License - * FILE: include/reactos/subsystems/sm/smmsg.h + * FILE: include/reactos/subsys/sm/smmsg.h * PURPOSE: SMSS (SB and SM) Message Format * PROGRAMMERS: Alex Ionescu */ Modified: trunk/reactos/include/reactos/version.h.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/version.h.… ============================================================================== --- trunk/reactos/include/reactos/version.h.cmake [iso-8859-1] (original) +++ trunk/reactos/include/reactos/version.h.cmake [iso-8859-1] Thu Oct 1 18:12:45 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: include/internal/version.h + * FILE: include/reactos/version.h.cmake * PURPOSE: Defines the current version * PROGRAMMER: David Welch (welch(a)mcmail.com) * REVISIONS: Modified: trunk/reactos/include/reactos/winsock/msafd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/winsock/ms… ============================================================================== --- trunk/reactos/include/reactos/winsock/msafd.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/winsock/msafd.h [iso-8859-1] Thu Oct 1 18:12:45 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Ancillary Function Driver DLL - * FILE: include/msafd.h + * FILE: include/reactos/winsock/msafd.h * PURPOSE: Ancillary Function Driver DLL header */ Modified: trunk/reactos/include/reactos/winsock/msafdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/winsock/ms… ============================================================================== --- trunk/reactos/include/reactos/winsock/msafdlib.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/winsock/msafdlib.h [iso-8859-1] Thu Oct 1 18:12:45 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 NSP - * FILE: lib/mswsock/sock.h + * FILE: include/reactos/winsock/msafdlib.h * PURPOSE: Winsock 2 SPI Utility Header */ Modified: trunk/reactos/include/reactos/winsock/mswinsock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/winsock/ms… ============================================================================== --- trunk/reactos/include/reactos/winsock/mswinsock.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/winsock/mswinsock.h [iso-8859-1] Thu Oct 1 18:12:45 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Ancillary Function Driver DLL - * FILE: include/mswsock.h + * FILE: include/reactos/winsock/mswinsock.h * PURPOSE: Ancillary Function Driver DLL header */ #ifndef __MSWINSOCK_H Modified: trunk/reactos/include/reactos/winsock/nsp_dns.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/winsock/ns… ============================================================================== --- trunk/reactos/include/reactos/winsock/nsp_dns.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/winsock/nsp_dns.h [iso-8859-1] Thu Oct 1 18:12:45 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 Headers - * FILE: include/winsock/nsp_dns.h + * FILE: include/reactos/winsock/nsp_dns.h * PURPOSE: WinSock 2 Shared NSP Header */ Modified: trunk/reactos/include/reactos/winsock/rnr20lib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/winsock/rn… ============================================================================== --- trunk/reactos/include/reactos/winsock/rnr20lib.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/winsock/rnr20lib.h [iso-8859-1] Thu Oct 1 18:12:45 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 NSP - * FILE: include/nsp_dns.h + * FILE: include/reactos/winsock/rnr20lib.h * PURPOSE: WinSock 2 NSP Header */ Modified: trunk/reactos/include/reactos/winsock/ws2help.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/winsock/ws… ============================================================================== --- trunk/reactos/include/reactos/winsock/ws2help.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/winsock/ws2help.h [iso-8859-1] Thu Oct 1 18:12:45 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 Helper DLL - * FILE: include/libs/winsock/ws2help.h + * FILE: include/reactos/winsock/ws2help.h * PURPOSE: WinSock 2 Helper DLL header */ Modified: trunk/reactos/include/reactos/winsock/wsmobile.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/winsock/ws… ============================================================================== --- trunk/reactos/include/reactos/winsock/wsmobile.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/winsock/wsmobile.h [iso-8859-1] Thu Oct 1 18:12:45 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 NSP - * FILE: include/nsp_dns.h + * FILE: include/reactos/winsock/wsmobile.h * PURPOSE: WinSock 2 NSP Header */

1 0

[akhaldi] 69425: [RAPPS] Get rid of the flickering of the URL in the download dialog and decode it. By Ismael Ferreras Morezuelas. CORE-9060
by akhaldi＠svn.reactos.org 01 Oct '15

01 Oct '15

Author: akhaldi Date: Thu Oct 1 09:37:55 2015 New Revision: 69425 URL: http://svn.reactos.org/svn/reactos?rev=69425&view=rev Log: [RAPPS] Get rid of the flickering of the URL in the download dialog and decode it. By Ismael Ferreras Morezuelas. CORE-9060 Modified: trunk/reactos/base/applications/rapps/loaddlg.c Modified: trunk/reactos/base/applications/rapps/loaddlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lo… ============================================================================== --- trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] Thu Oct 1 09:37:55 2015 @@ -6,6 +6,7 @@ * Copyright 2004 Mike McCormack (for CodeWeavers) * Copyright 2005 Ge van Geldorp (gvg(a)reactos.org) * Copyright 2009 Dmitry Chapyshev (dmitry(a)reactos.org) + * Copyright 2015 Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com) */ /* * Based on Wine dlls/shdocvw/shdocvw_main.c @@ -37,6 +38,7 @@ LONG ref; HWND hDialog; BOOL *pbCancelled; + BOOL UrlHasBeenCopied; } IBindStatusCallbackImpl; static @@ -111,7 +113,6 @@ IBindStatusCallbackImpl *This = (IBindStatusCallbackImpl *) iface; HWND Item; LONG r; - WCHAR OldText[100]; Item = GetDlgItem(This->hDialog, IDC_DOWNLOAD_PROGRESS); if (Item && ulProgressMax) @@ -120,13 +121,29 @@ } Item = GetDlgItem(This->hDialog, IDC_DOWNLOAD_STATUS); - if (Item && szStatusText) - { - SendMessageW(Item, WM_GETTEXT, sizeof(OldText) / sizeof(OldText[0]), (LPARAM) OldText); - if (sizeof(OldText) / sizeof(OldText[0]) - 1 <= wcslen(OldText) || 0 != wcscmp(OldText, szStatusText)) + if (Item && szStatusText && wcslen(szStatusText) > 0 && This->UrlHasBeenCopied == FALSE) + { + DWORD len = wcslen(szStatusText) * sizeof(WCHAR); + PWSTR buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + + if (buf) { - SendMessageW(Item, WM_SETTEXT, 0, (LPARAM) szStatusText); + /* beautify our url for display purposes */ + InternetCanonicalizeUrl(szStatusText, buf, &len, ICU_DECODE | ICU_NO_ENCODE); + + /* paste it into our dialog, free the temp buffer + and don't do it again in this instance */ + SendMessageW(Item, WM_SETTEXT, 0, (LPARAM)buf); + HeapFree(GetProcessHeap(), 0, buf); } + else + { + /* our computer is old and rusty and does not have enough ram for this, + use the ugly version and call it a day */ + SendMessageW(Item, WM_SETTEXT, 0, (LPARAM)szStatusText); + } + + This->UrlHasBeenCopied = TRUE; } SetLastError(0);

1 0

[aandrejevic] 69424: [FAST486] Fix the TSS limit validity check. Implement I/O privilege checking.
by aandrejevic＠svn.reactos.org 01 Oct '15

01 Oct '15

Author: aandrejevic Date: Thu Oct 1 02:24:17 2015 New Revision: 69424 URL: http://svn.reactos.org/svn/reactos?rev=69424&view=rev Log: [FAST486] Fix the TSS limit validity check. Implement I/O privilege checking. Modified: trunk/reactos/lib/fast486/common.c trunk/reactos/lib/fast486/common.inl trunk/reactos/lib/fast486/opcodes.c Modified: trunk/reactos/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.c?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.c [iso-8859-1] Thu Oct 1 02:24:17 2015 @@ -628,8 +628,8 @@ PFAST486_LEGACY_TSS NewLegacyTss = (PFAST486_LEGACY_TSS)&NewTss; USHORT NewLdtr, NewEs, NewCs, NewSs, NewDs; - if (State->TaskReg.Limit < (sizeof(FAST486_TSS) - 1) - && State->TaskReg.Limit != (sizeof(FAST486_LEGACY_TSS) - 1)) + if ((State->TaskReg.Modern && State->TaskReg.Limit < (sizeof(FAST486_TSS) - 1)) + || (!State->TaskReg.Modern && State->TaskReg.Limit < (sizeof(FAST486_LEGACY_TSS) - 1))) { /* Invalid task register limit */ Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_TS, State->TaskReg.Selector); @@ -882,6 +882,7 @@ State->TaskReg.Selector = Selector; State->TaskReg.Base = NewTssAddress; State->TaskReg.Limit = NewTssLimit; + State->TaskReg.Modern = (NewTssDescriptor.Signature == FAST486_BUSY_TSS_SIGNATURE); if (NewTssDescriptor.Signature == FAST486_BUSY_TSS_SIGNATURE) { Modified: trunk/reactos/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.inl?rev… ============================================================================== --- trunk/reactos/lib/fast486/common.inl [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.inl [iso-8859-1] Thu Oct 1 02:24:17 2015 @@ -1599,6 +1599,54 @@ return TRUE; } +FORCEINLINE +BOOLEAN +FASTCALL +Fast486IoPrivilegeCheck(PFAST486_STATE State, USHORT Port) +{ + UCHAR Bits; + ULONG Location; + FAST486_TSS Tss; + + /* Access is always allowed if the CPL is less than or equal to the IOPL */ + if (State->Cpl <= State->Flags.Iopl) return TRUE; + + /* Legacy Task State Segments have no IOPB */ + if (!State->TaskReg.Modern) return FALSE; + + /* Read the TSS */ + if (!Fast486ReadLinearMemory(State, State->TaskReg.Base, &Tss, sizeof(FAST486_TSS), FALSE)) + { + /* Exception occurred */ + return FALSE; + } + + Location = State->TaskReg.Base + HIWORD(Tss.IopbOffset) + (Port >> 3); + + if (Location > State->TaskReg.Limit) + { + /* Access denied */ + Fast486Exception(State, FAST486_EXCEPTION_GP); + return FALSE; + } + + /* Read the appropriate bit from the TSS IOPB */ + if (!Fast486ReadLinearMemory(State, Location, &Bits, sizeof(UCHAR), FALSE)) + { + /* Exception occurred */ + return FALSE; + } + + if (Bits & (1 << (Port & 0x07))) + { + /* Access denied */ + Fast486Exception(State, FAST486_EXCEPTION_GP); + return FALSE; + } + + return TRUE; +} + #ifndef FAST486_NO_FPU FORCEINLINE Modified: trunk/reactos/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] Thu Oct 1 02:24:17 2015 @@ -790,6 +790,8 @@ Port = State->GeneralRegs[FAST486_REG_EDX].LowWord; } + if (!Fast486IoPrivilegeCheck(State, Port)) return; + /* Read a byte from the I/O port */ State->IoReadCallback(State, Port, &Data, 1, sizeof(UCHAR)); @@ -828,6 +830,8 @@ Port = State->GeneralRegs[FAST486_REG_EDX].LowWord; } + if (!Fast486IoPrivilegeCheck(State, Port)) return; + if (Size) { ULONG Data; @@ -876,6 +880,8 @@ Port = State->GeneralRegs[FAST486_REG_EDX].LowWord; } + if (!Fast486IoPrivilegeCheck(State, Port)) return; + /* Read the value from AL */ Data = State->GeneralRegs[FAST486_REG_EAX].LowByte; @@ -913,6 +919,8 @@ /* The port number is in DX */ Port = State->GeneralRegs[FAST486_REG_EDX].LowWord; } + + if (!Fast486IoPrivilegeCheck(State, Port)) return; if (Size) { @@ -5836,6 +5844,8 @@ TOGGLE_OPSIZE(OperandSize); TOGGLE_ADSIZE(AddressSize); + if (!Fast486IoPrivilegeCheck(State, State->GeneralRegs[FAST486_REG_EDX].LowWord)) return; + /* Calculate the size */ if (Opcode == 0x6C) DataSize = sizeof(UCHAR); else DataSize = OperandSize ? sizeof(ULONG) : sizeof(USHORT); @@ -5973,6 +5983,8 @@ TOGGLE_OPSIZE(OperandSize); TOGGLE_ADSIZE(AddressSize); + + if (!Fast486IoPrivilegeCheck(State, State->GeneralRegs[FAST486_REG_EDX].LowWord)) return; /* Calculate the size */ if (Opcode == 0x6E) DataSize = sizeof(UCHAR);

1 0

[hbelusca] 69423: [NTVDM]: Fix the open-file dialog filter.
by hbelusca＠svn.reactos.org 01 Oct '15

01 Oct '15

Author: hbelusca Date: Thu Oct 1 02:03:31 2015 New Revision: 69423 URL: http://svn.reactos.org/svn/reactos?rev=69423&view=rev Log: [NTVDM]: Fix the open-file dialog filter. Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/emul… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] Thu Oct 1 02:03:31 2015 @@ -423,7 +423,7 @@ ofn.lpstrTitle = "Select a virtual floppy image"; ofn.Flags = OFN_EXPLORER | OFN_ENABLESIZING | OFN_LONGNAMES | OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST; // ofn.FlagsEx = OFN_EX_NOPLACESBAR; - ofn.lpstrFilter = "Virtual floppy images (*.vfd;*.img;*.ima;*.dsk)\0*.vfd\0All files (*.*)\0*.*\0"; + ofn.lpstrFilter = "Virtual floppy images (*.vfd;*.img;*.ima;*.dsk)\0*.vfd;*.img;*.ima;*.dsk\0All files (*.*)\0*.*\0\0"; ofn.lpstrDefExt = "vfd"; ofn.nFilterIndex = 0; ofn.lpstrFile = szFile;

1 0

[hbelusca] 69422: [NTVDM] - Temporarily hack the boot sequence to floppy, then hard disk. See r69421; will be improved in the future. - Complete the BIOS 16-bit bootstrap code.
by hbelusca＠svn.reactos.org 01 Oct '15

01 Oct '15

Author: hbelusca Date: Thu Oct 1 00:37:38 2015 New Revision: 69422 URL: http://svn.reactos.org/svn/reactos?rev=69422&view=rev Log: [NTVDM] - Temporarily hack the boot sequence to floppy, then hard disk. See r69421; will be improved in the future. - Complete the BIOS 16-bit bootstrap code. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] Thu Oct 1 00:37:38 2015 @@ -20,6 +20,7 @@ #include "cpu/cpu.h" // for EMULATOR_FLAG_CF #include "cpu/bop.h" #include "int32.h" +#include <isvbop.h> #include <bios/bios.h> #include <bios/rom.h> @@ -155,7 +156,8 @@ { LOBYTE(EMULATOR_BOP), HIBYTE(EMULATOR_BOP), BOP_RESET, // Call BIOS POST 0xCD, BIOS_BOOTSTRAP_LOADER, // INT 0x19 -// LOBYTE(EMULATOR_BOP), HIBYTE(EMULATOR_BOP), BOP_UNSIMULATE + 0xCD, BIOS_ROM_BASIC, // INT 0x18 + LOBYTE(EMULATOR_BOP), HIBYTE(EMULATOR_BOP), BOP_UNSIMULATE }; Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c [iso-8859-1] Thu Oct 1 00:37:38 2015 @@ -483,6 +483,9 @@ CmosMemory.ShutdownStatus = 0x00; CmosMemory.EquipmentList = CMOS_EQUIPMENT_LIST; + // HACK: For the moment, set the boot sequence to: 1-Floppy, 2-Hard Disk . + CmosMemory.Regs[CMOS_REG_SYSOP] |= (1 << 5); + /* Memory settings */ /*

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs