Ros-diffs

ros-diffs@reactos.org

81390 discussions

[aandrejevic] 68021: [FAST486] - Restore the stack pointer on an exception. - Fix the parameter size for 286 call gates. Caught by V.
by aandrejevic＠svn.reactos.org 05 Jun '15

05 Jun '15

Author: aandrejevic Date: Fri Jun 5 14:02:24 2015 New Revision: 68021 URL: http://svn.reactos.org/svn/reactos?rev=68021&view=rev Log: [FAST486] - Restore the stack pointer on an exception. - Fix the parameter size for 286 call gates. Caught by V. Modified: trunk/reactos/include/reactos/libs/fast486/fast486.h trunk/reactos/lib/fast486/common.c trunk/reactos/lib/fast486/fast486.c Modified: trunk/reactos/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fast4… ============================================================================== --- trunk/reactos/include/reactos/libs/fast486/fast486.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/fast486/fast486.h [iso-8859-1] Fri Jun 5 14:02:24 2015 @@ -515,6 +515,7 @@ FAST486_REG GeneralRegs[FAST486_NUM_GEN_REGS]; FAST486_SEG_REG SegmentRegs[FAST486_NUM_SEG_REGS]; FAST486_REG InstPtr, SavedInstPtr; + FAST486_REG SavedStackPtr; FAST486_FLAGS_REG Flags; FAST486_TABLE_REG Gdtr, Idtr; FAST486_LDT_REG Ldtr; 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 Jun 5 14:02:24 2015 @@ -579,6 +579,9 @@ /* Restore the IP to the saved IP */ State->InstPtr = State->SavedInstPtr; + /* Restore the SP to the saved SP */ + State->GeneralRegs[FAST486_REG_ESP] = State->SavedStackPtr; + /* Get the interrupt vector */ if (!Fast486GetIntVector(State, ExceptionCode, &IdtEntry)) { @@ -1040,7 +1043,7 @@ OldEsp, FALSE, ParamBuffer, - Gate->ParamCount * sizeof(ULONG))) + Gate->ParamCount * (GateSize ? sizeof(ULONG) : sizeof(USHORT)))) { /* Exception occurred */ return FALSE; Modified: trunk/reactos/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fast486.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/fast486.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fast486.c [iso-8859-1] Fri Jun 5 14:02:24 2015 @@ -61,7 +61,11 @@ { NextInst: /* Check if this is a new instruction */ - if (State->PrefixFlags == 0) State->SavedInstPtr = State->InstPtr; + if (State->PrefixFlags == 0) + { + State->SavedInstPtr = State->InstPtr; + State->SavedStackPtr = State->GeneralRegs[FAST486_REG_ESP]; + } /* Perform an instruction fetch */ if (!Fast486FetchByte(State, &Opcode))

1 0

[ekohl] 68020: [DEVMGR] Display class CoInstallers.
by ekohl＠svn.reactos.org 05 Jun '15

05 Jun '15

Author: ekohl Date: Fri Jun 5 13:47:39 2015 New Revision: 68020 URL: http://svn.reactos.org/svn/reactos?rev=68020&view=rev Log: [DEVMGR] Display class CoInstallers. Modified: trunk/reactos/dll/win32/devmgr/advprop.c Modified: trunk/reactos/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/advprop.c… ============================================================================== --- trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] Fri Jun 5 13:47:39 2015 @@ -1069,6 +1069,96 @@ static VOID +DisplayClassCoinstallers(IN PDEVADVPROP_INFO dap, + IN HWND hwndListView) +{ + HDEVINFO DeviceInfoSet; + PSP_DEVINFO_DATA DeviceInfoData; + WCHAR szClassGuid[45]; + HKEY hKey = INVALID_HANDLE_VALUE; + DWORD dwSize; + DWORD dwType; + LPBYTE lpBuffer = NULL; + LPWSTR lpStr; + INT index; + INT len; + LONG lError; + + if (dap->CurrentDeviceInfoSet != INVALID_HANDLE_VALUE) + { + DeviceInfoSet = dap->CurrentDeviceInfoSet; + DeviceInfoData = &dap->CurrentDeviceInfoData; + } + else + { + DeviceInfoSet = dap->DeviceInfoSet; + DeviceInfoData = &dap->DeviceInfoData; + } + + dwSize = 45 * sizeof(WCHAR); + if (!SetupDiGetDeviceRegistryProperty(DeviceInfoSet, + DeviceInfoData, + SPDRP_CLASSGUID, + &dwType, + (LPBYTE)szClassGuid, + dwSize, + &dwSize)) + return; + + lError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Control\\CoDeviceInstallers", + 0, + GENERIC_READ, + &hKey); + if (lError != ERROR_SUCCESS) + return; + + dwSize = 0; + lError = RegQueryValueEx(hKey, + szClassGuid, + NULL, + &dwType, + NULL, + &dwSize); + if (lError != ERROR_SUCCESS) + goto done; + + if (dwSize == 0) + goto done; + + lpBuffer = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + dwSize); + + RegQueryValueEx(hKey, + szClassGuid, + NULL, + &dwType, + lpBuffer, + &dwSize); + + lpStr = (LPWSTR)lpBuffer; + index = 0; + while (*lpStr != 0) + { + len = wcslen(lpStr) + 1; + + SetListViewText(hwndListView, index, lpStr); + + lpStr += len; + index++; + } + +done: + if (lpBuffer != NULL) + HeapFree(GetProcessHeap(), 0, lpBuffer); + + if (hKey != INVALID_HANDLE_VALUE) + RegCloseKey(hKey); +} + + +static VOID DisplayDeviceCoinstallers(IN PDEVADVPROP_INFO dap, IN HWND hwndListView) { @@ -1351,10 +1441,10 @@ L"Installer32"); break; -#if 0 case 18: /* Class Coinstaller */ + DisplayClassCoinstallers(dap, + hwndListView); break; -#endif case 19: /* Device Coinstaller */ DisplayDeviceCoinstallers(dap,

1 0

[cwittich] 68019: [SHELL32] replace some sizeof(var)/sizeof(WCHAR) by _countof
by cwittich＠svn.reactos.org 05 Jun '15

05 Jun '15

Author: cwittich Date: Fri Jun 5 08:11:25 2015 New Revision: 68019 URL: http://svn.reactos.org/svn/reactos?rev=68019&view=rev Log: [SHELL32] replace some sizeof(var)/sizeof(WCHAR) by _countof Modified: trunk/reactos/dll/win32/shell32/dialogs/drive.cpp Modified: trunk/reactos/dll/win32/shell32/dialogs/drive.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/drive.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/drive.cpp [iso-8859-1] Fri Jun 5 08:11:25 2015 @@ -133,7 +133,7 @@ psh.phpage = hpsp; WCHAR wszName[256]; - if (GetVolumeInformationW(pwszDrive, wszName, sizeof(wszName) / sizeof(WCHAR), NULL, NULL, NULL, NULL, 0)) + if (GetVolumeInformationW(pwszDrive, wszName, _countof(wszName), NULL, NULL, NULL, NULL, 0)) { psh.pszCaption = wszName; psh.dwFlags |= PSH_PROPTITLE; @@ -230,7 +230,7 @@ return; } - if (LoadStringW(shell32_hInstance, IDS_DEFAULT_CLUSTER_SIZE, wszBuf, sizeof(wszBuf) / sizeof(WCHAR))) + if (LoadStringW(shell32_hInstance, IDS_DEFAULT_CLUSTER_SIZE, wszBuf, _countof(wszBuf))) { hDlgCtrl = GetDlgItem(hwndDlg, 28680); SendMessageW(hDlgCtrl, CB_RESETCONTENT, 0, 0); @@ -249,7 +249,7 @@ return; } - if (LoadStringW(shell32_hInstance, IDS_DEFAULT_CLUSTER_SIZE, wszBuf, sizeof(wszBuf) / sizeof(WCHAR))) + if (LoadStringW(shell32_hInstance, IDS_DEFAULT_CLUSTER_SIZE, wszBuf, _countof(wszBuf))) { hDlgCtrl = GetDlgItem(hwndDlg, 28680); SendMessageW(hDlgCtrl, CB_RESETCONTENT, 0, 0); @@ -269,7 +269,7 @@ } hDlgCtrl = GetDlgItem(hwndDlg, 28680); - if (LoadStringW(shell32_hInstance, IDS_DEFAULT_CLUSTER_SIZE, wszBuf, sizeof(wszBuf) / sizeof(WCHAR))) + if (LoadStringW(shell32_hInstance, IDS_DEFAULT_CLUSTER_SIZE, wszBuf, _countof(wszBuf))) { SendMessageW(hDlgCtrl, CB_RESETCONTENT, 0, 0); lIndex = SendMessageW(hDlgCtrl, CB_ADDSTRING, 0, (LPARAM)wszBuf); @@ -281,7 +281,7 @@ for (lIndex = 0; lIndex < 4; lIndex++) { TotalNumberOfBytes.QuadPart = ClusterSize; - if (StrFormatByteSizeW(TotalNumberOfBytes.QuadPart, wszBuf, sizeof(wszBuf) / sizeof(WCHAR))) + if (StrFormatByteSizeW(TotalNumberOfBytes.QuadPart, wszBuf, _countof(wszBuf))) { lIndex = SendMessageW(hDlgCtrl, CB_ADDSTRING, 0, (LPARAM)wszBuf); if (lIndex != CB_ERR) @@ -311,17 +311,17 @@ BOOLEAN Latest; HWND hwndFileSystems; - cchText = GetWindowTextW(hwndDlg, szText, sizeof(szText) / sizeof(WCHAR) - 1); + cchText = GetWindowTextW(hwndDlg, szText, _countof(szText) - 1); if (cchText < 0) cchText = 0; szText[cchText++] = L' '; szDrive[0] = pContext->Drive + L'A'; - if (GetVolumeInformationW(szDrive, &szText[cchText], (sizeof(szText) / sizeof(WCHAR)) - cchText, NULL, NULL, NULL, szFs, sizeof(szFs) / sizeof(WCHAR))) + if (GetVolumeInformationW(szDrive, &szText[cchText], _countof(szText) - cchText, NULL, NULL, NULL, szFs, _countof(szFs))) { if (szText[cchText] == UNICODE_NULL) { /* load default volume label */ - cchText += LoadStringW(shell32_hInstance, IDS_DRIVE_FIXED, &szText[cchText], (sizeof(szText) / sizeof(WCHAR)) - cchText); + cchText += LoadStringW(shell32_hInstance, IDS_DRIVE_FIXED, &szText[cchText], _countof(szText) - cchText); } else { @@ -338,7 +338,7 @@ if (GetDiskFreeSpaceExW(szDrive, &FreeBytesAvailableUser, &TotalNumberOfBytes, NULL)) { - if (StrFormatByteSizeW(TotalNumberOfBytes.QuadPart, szText, sizeof(szText) / sizeof(WCHAR))) + if (StrFormatByteSizeW(TotalNumberOfBytes.QuadPart, szText, _countof(szText))) { /* add drive capacity */ SendDlgItemMessageW(hwndDlg, 28673, CB_ADDSTRING, 0, (LPARAM)szText); @@ -441,7 +441,7 @@ return; } Length = SendMessageW(hDlgCtrl, CB_GETLBTEXTLEN, iSelIndex, 0); - if ((int)Length == CB_ERR || Length + 1 > sizeof(szFileSys) / sizeof(WCHAR)) + if ((int)Length == CB_ERR || Length + 1 > _countof(szFileSys)) { FIXME("\n"); return; @@ -449,17 +449,17 @@ /* retrieve the file system */ SendMessageW(hDlgCtrl, CB_GETLBTEXT, iSelIndex, (LPARAM)szFileSys); - szFileSys[(sizeof(szFileSys)/sizeof(WCHAR))-1] = L'\0'; + szFileSys[_countof(szFileSys)-1] = L'\0'; /* retrieve the volume label */ hDlgCtrl = GetWindow(hwndDlg, 28679); Length = SendMessageW(hDlgCtrl, WM_GETTEXTLENGTH, 0, 0); - if (Length + 1 > sizeof(szLabel) / sizeof(WCHAR)) + if (Length + 1 > _countof(szLabel)) { FIXME("\n"); return; } - SendMessageW(hDlgCtrl, WM_GETTEXT, sizeof(szLabel) / sizeof(WCHAR), (LPARAM)szLabel); + SendMessageW(hDlgCtrl, WM_GETTEXT, _countof(szLabel), (LPARAM)szLabel); szLabel[(sizeof(szLabel)/sizeof(WCHAR))-1] = L'\0'; /* check for quickformat */

1 0

[cwittich] 68018: [SHELL32] show/hide some controls on disk drive properties based on drive type
by cwittich＠svn.reactos.org 05 Jun '15

05 Jun '15

Author: cwittich Date: Fri Jun 5 07:38:17 2015 New Revision: 68018 URL: http://svn.reactos.org/svn/reactos?rev=68018&view=rev Log: [SHELL32] show/hide some controls on disk drive properties based on drive type Modified: trunk/reactos/dll/win32/shell32/dialogs/drvdefext.cpp Modified: trunk/reactos/dll/win32/shell32/dialogs/drvdefext.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/drvdefext.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/drvdefext.cpp [iso-8859-1] Fri Jun 5 07:38:17 2015 @@ -308,9 +308,18 @@ default: IconId = IDI_SHELL_DRIVE; TypeStrId = IDS_DRIVE_FIXED; } - if (DriveType != DRIVE_FIXED) + if (DriveType == DRIVE_CDROM) + { + /* volume label textbox */ EnableWindow(GetDlgItem(hwndDlg, 14000), false); - + + /* disk compression */ + ShowWindow(GetDlgItem(hwndDlg, 14011), false); + + /* index */ + ShowWindow(GetDlgItem(hwndDlg, 14012), false); + } + HICON hIcon = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IconId), IMAGE_ICON, 32, 32, LR_SHARED); if (hIcon) SendDlgItemMessageW(hwndDlg, 14016, STM_SETICON, (WPARAM)hIcon, 0); @@ -367,6 +376,9 @@ GetDlgItemTextW(hwndDlg, 14009, wszFormat, _countof(wszFormat)); swprintf(wszBuf, wszFormat, m_wszDrive[0]); SetDlgItemTextW(hwndDlg, 14009, wszBuf); + + /* show disk cleanup button only for fixed drives */ + ShowWindow(GetDlgItem(hwndDlg, 14010), DriveType == DRIVE_FIXED); } INT_PTR CALLBACK

1 0

[aandrejevic] 68017: [NTVDM] Store 8.3 file names in SFT entries. Some programs expect them there.
by aandrejevic＠svn.reactos.org 04 Jun '15

04 Jun '15

Author: aandrejevic Date: Thu Jun 4 22:56:02 2015 New Revision: 68017 URL: http://svn.reactos.org/svn/reactos?rev=68017&view=rev Log: [NTVDM] Store 8.3 file names in SFT entries. Some programs expect them there. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c [iso-8859-1] Thu Jun 4 22:56:02 2015 @@ -22,6 +22,45 @@ #include "process.h" #include "bios/bios.h" + +/* PRIVATE FUNCTIONS **********************************************************/ + +static VOID StoreNameInSft(LPCSTR FilePath, PDOS_FILE_DESCRIPTOR Descriptor) +{ + CHAR ShortPath[MAX_PATH]; + PCHAR Name; + PCHAR Extension; + + /* Try to get the short path */ + if (!GetShortPathNameA(FilePath, ShortPath, sizeof(ShortPath))) + { + /* If it failed, just use the uppercase long path */ + strncpy(ShortPath, FilePath, sizeof(ShortPath) - 1); + _strupr(ShortPath); + } + + /* Get the name part */ + Name = strrchr(ShortPath, '\\'); + if (Name == NULL) Name = ShortPath; + + /* Find the extension */ + Extension = strchr(Name, '.'); + + if (Extension) + { + /* Terminate the name string, and move the pointer to after the dot */ + *Extension++ = 0; + } + + /* Copy the name into the SFT descriptor */ + RtlCopyMemory(Descriptor->FileName, Name, min(strlen(Name), 8)); + + if (Extension) + { + /* Copy the extension too */ + RtlCopyMemory(&Descriptor->FileName[8], Extension, min(strlen(Extension), 3)); + } +} /* PUBLIC FUNCTIONS ***********************************************************/ @@ -365,20 +404,24 @@ /* Set up the new descriptor */ Descriptor = DosGetFileDescriptor(DescriptorId); RtlZeroMemory(Descriptor, sizeof(*Descriptor)); + RtlFillMemory(Descriptor->FileName, sizeof(Descriptor->FileName), ' '); if (Node != NULL) { Descriptor->DevicePointer = Node->Driver; Descriptor->DeviceInfo = Node->DeviceAttributes | FILE_INFO_DEVICE; + RtlCopyMemory(Descriptor->FileName, Node->Name.Buffer, Node->Name.Length); } else { Descriptor->OpenMode = AccessShareModes; Descriptor->Attributes = LOBYTE(GetFileAttributesA(FilePath)); Descriptor->Size = GetFileSize(FileHandle, NULL); - Descriptor->OwnerPsp = Sda->CurrentPsp; Descriptor->Win32Handle = FileHandle; - } + StoreNameInSft(FilePath, Descriptor); + } + + Descriptor->OwnerPsp = Sda->CurrentPsp; /* Open the DOS handle */ DosHandle = DosOpenHandle(DescriptorId); @@ -441,19 +484,23 @@ /* Set up the new descriptor */ Descriptor = DosGetFileDescriptor(DescriptorId); RtlZeroMemory(Descriptor, sizeof(*Descriptor)); + RtlFillMemory(Descriptor->FileName, sizeof(Descriptor->FileName), ' '); if (Node != NULL) { Descriptor->DevicePointer = Node->Driver; Descriptor->DeviceInfo = Node->DeviceAttributes | FILE_INFO_DEVICE; + RtlCopyMemory(Descriptor->FileName, Node->Name.Buffer, Node->Name.Length); } else { Descriptor->Attributes = LOBYTE(GetFileAttributesA(FilePath)); Descriptor->Size = GetFileSize(FileHandle, NULL); - Descriptor->OwnerPsp = Sda->CurrentPsp; Descriptor->Win32Handle = FileHandle; - } + StoreNameInSft(FilePath, Descriptor); + } + + Descriptor->OwnerPsp = Sda->CurrentPsp; /* Open the DOS handle */ DosHandle = DosOpenHandle(DescriptorId); @@ -589,20 +636,24 @@ /* Set up the new descriptor */ Descriptor = DosGetFileDescriptor(DescriptorId); RtlZeroMemory(Descriptor, sizeof(*Descriptor)); + RtlFillMemory(Descriptor->FileName, sizeof(Descriptor->FileName), ' '); if (Node != NULL) { Descriptor->DevicePointer = Node->Driver; Descriptor->DeviceInfo = Node->DeviceAttributes | FILE_INFO_DEVICE; + RtlCopyMemory(Descriptor->FileName, Node->Name.Buffer, Node->Name.Length); } else { Descriptor->OpenMode = AccessShareModes; Descriptor->Attributes = LOBYTE(GetFileAttributesA(FilePath)); Descriptor->Size = GetFileSize(FileHandle, NULL); - Descriptor->OwnerPsp = Sda->CurrentPsp; Descriptor->Win32Handle = FileHandle; - } + StoreNameInSft(FilePath, Descriptor); + } + + Descriptor->OwnerPsp = Sda->CurrentPsp; /* Open the DOS handle */ DosHandle = DosOpenHandle(DescriptorId); Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.h [iso-8859-1] Thu Jun 4 22:56:02 2015 @@ -26,7 +26,8 @@ DWORD Reserved; WORD OwnerPsp; HANDLE Win32Handle; - BYTE Padding[0x1E - sizeof(HANDLE)]; + CHAR FileName[11]; + BYTE Padding[0x13 - sizeof(HANDLE)]; } DOS_FILE_DESCRIPTOR, *PDOS_FILE_DESCRIPTOR; C_ASSERT(sizeof(DOS_FILE_DESCRIPTOR) == 0x3B); Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c [iso-8859-1] Thu Jun 4 22:56:02 2015 @@ -105,6 +105,8 @@ Descriptor->DeviceInfo = Node->DeviceAttributes | FILE_INFO_DEVICE; Descriptor->DevicePointer = SysVars->ActiveCon; + RtlFillMemory(Descriptor->FileName, sizeof(Descriptor->FileName), ' '); + RtlCopyMemory(Descriptor->FileName, Node->Name.Buffer, Node->Name.Length); /* Call the open routine */ if (Node->OpenRoutine) Node->OpenRoutine(Node);

1 0

[aandrejevic] 68016: [FAST486] Fix VERR and VERW.
by aandrejevic＠svn.reactos.org 04 Jun '15

04 Jun '15

Author: aandrejevic Date: Thu Jun 4 20:25:14 2015 New Revision: 68016 URL: http://svn.reactos.org/svn/reactos?rev=68016&view=rev Log: [FAST486] Fix VERR and VERW. Modified: trunk/reactos/lib/fast486/opgroups.c Modified: trunk/reactos/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opgroups.c?rev… ============================================================================== --- trunk/reactos/lib/fast486/opgroups.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opgroups.c [iso-8859-1] Thu Jun 4 20:25:14 2015 @@ -2002,13 +2002,6 @@ return; } - /* This is a privileged instruction */ - if (Fast486GetCurrentPrivLevel(State) != 0) - { - Fast486Exception(State, FAST486_EXCEPTION_GP); - return; - } - if (!Fast486ReadModrmWordOperands(State, &ModRegRm, NULL, @@ -2033,23 +2026,23 @@ /* Set ZF if it is valid and accessible */ State->Flags.Zf = GdtEntry.Present // must be present - && GdtEntry.SystemType // must be a segment - && (((ModRegRm.Register == 4) - /* code segments are only readable if the RW bit is set */ - && (!GdtEntry.Executable || GdtEntry.ReadWrite)) - || ((ModRegRm.Register == 5) - /* code segments are never writable, data segments are writable when RW is set */ - && (!GdtEntry.Executable && GdtEntry.ReadWrite))) - /* - * for segments other than conforming code segments, - * both RPL and CPL must be less than or equal to DPL - */ - && ((!GdtEntry.Executable || !GdtEntry.DirConf) - && ((GET_SEGMENT_RPL(Selector) <= GdtEntry.Dpl) - && (Fast486GetCurrentPrivLevel(State) <= GdtEntry.Dpl))) - /* for conforming code segments, DPL must be less than or equal to CPL */ - && ((GdtEntry.Executable && GdtEntry.DirConf) - && (GdtEntry.Dpl <= Fast486GetCurrentPrivLevel(State))); + && GdtEntry.SystemType // must be a segment + && (((ModRegRm.Register == 4) + /* code segments are only readable if the RW bit is set */ + && (!GdtEntry.Executable || GdtEntry.ReadWrite)) + || ((ModRegRm.Register == 5) + /* code segments are never writable, data segments are writable when RW is set */ + && (!GdtEntry.Executable && GdtEntry.ReadWrite))) + /* + * for segments other than conforming code segments, + * both RPL and CPL must be less than or equal to DPL + */ + && (((!GdtEntry.Executable || !GdtEntry.DirConf) + && (GET_SEGMENT_RPL(Selector) <= GdtEntry.Dpl) + && (Fast486GetCurrentPrivLevel(State) <= GdtEntry.Dpl)) + /* for conforming code segments, DPL must be less than or equal to CPL */ + || ((GdtEntry.Executable && GdtEntry.DirConf) + && (GdtEntry.Dpl <= Fast486GetCurrentPrivLevel(State)))); break;

1 0

[cwittich] 68015: [SHELL32] fix reported disk size
by cwittich＠svn.reactos.org 04 Jun '15

04 Jun '15

Author: cwittich Date: Thu Jun 4 18:18:48 2015 New Revision: 68015 URL: http://svn.reactos.org/svn/reactos?rev=68015&view=rev Log: [SHELL32] fix reported disk size Modified: trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] Thu Jun 4 18:18:48 2015 @@ -793,7 +793,7 @@ { _ILSimpleGetText (pidl, szPath, MAX_PATH); GetDiskFreeSpaceExA (szPath, NULL, &ulBytes, NULL); - StrFormatByteSizeA (ulBytes.LowPart, psd->str.cStr, MAX_PATH); + StrFormatByteSize64A (ulBytes.QuadPart, psd->str.cStr, MAX_PATH); } break; case 3: /* free size */ @@ -801,7 +801,7 @@ { _ILSimpleGetText (pidl, szPath, MAX_PATH); GetDiskFreeSpaceExA (szPath, &ulBytes, NULL, NULL); - StrFormatByteSizeA (ulBytes.LowPart, psd->str.cStr, MAX_PATH); + StrFormatByteSize64A (ulBytes.QuadPart, psd->str.cStr, MAX_PATH); } break; }

1 0

[aandrejevic] 68014: [FAST486] - Interrupts always clear TF. - Let at least one instruction happen between #DB's (when TF is set).
by aandrejevic＠svn.reactos.org 04 Jun '15

04 Jun '15

Author: aandrejevic Date: Thu Jun 4 14:48:07 2015 New Revision: 68014 URL: http://svn.reactos.org/svn/reactos?rev=68014&view=rev Log: [FAST486] - Interrupts always clear TF. - Let at least one instruction happen between #DB's (when TF is set). Modified: trunk/reactos/lib/fast486/common.c trunk/reactos/lib/fast486/fast486.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 Jun 4 14:48:07 2015 @@ -430,8 +430,8 @@ State->InstPtr.LowWord = IdtEntry->Offset; } - /* Clear TF and NT */ - State->Flags.Tf = State->Flags.Nt = FALSE; + /* Clear NT */ + State->Flags.Nt = FALSE; if (OldVm) { @@ -512,6 +512,9 @@ /* Disable interrupts after a jump to an interrupt gate handler */ State->Flags.If = FALSE; } + + /* Clear TF */ + State->Flags.Tf = FALSE; return TRUE; } Modified: trunk/reactos/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fast486.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/fast486.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fast486.c [iso-8859-1] Thu Jun 4 14:48:07 2015 @@ -50,10 +50,13 @@ UCHAR Opcode; FAST486_OPCODE_HANDLER_PROC CurrentHandler; INT ProcedureCallCount = 0; + BOOLEAN Trap; /* Main execution loop */ do { + Trap = State->Flags.Tf; + if (!State->Halted) { NextInst: @@ -90,19 +93,10 @@ /* Clear the interrupt delay flag */ State->DoNotInterrupt = FALSE; } - else if (State->Flags.Tf && !State->Halted) + else if (Trap && !State->Halted) { /* Perform the interrupt */ - Fast486PerformInterrupt(State, 0x01); - - /* - * Flags and TF are pushed on stack so we can reset TF now, - * to not break into the INT 0x01 handler. - * After the INT 0x01 handler returns, the flags and therefore - * TF are popped back off the stack and restored, so TF will be - * automatically reset to its previous state. - */ - State->Flags.Tf = FALSE; + Fast486PerformInterrupt(State, FAST486_EXCEPTION_DB); } else if (State->Flags.If && State->IntSignaled) {

1 0

[dreimer] 68013: [RAPPS] update cab maker scripts. POSIX toy is untested!
by dreimer＠svn.reactos.org 04 Jun '15

04 Jun '15

Author: dreimer Date: Thu Jun 4 14:23:08 2015 New Revision: 68013 URL: http://svn.reactos.org/svn/reactos?rev=68013&view=rev Log: [RAPPS] update cab maker scripts. POSIX toy is untested! Modified: trunk/reactos/base/applications/rapps/CreateCabFile.bat trunk/reactos/base/applications/rapps/CreateCabFile.sh Modified: trunk/reactos/base/applications/rapps/CreateCabFile.bat URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/Cr… ============================================================================== --- trunk/reactos/base/applications/rapps/CreateCabFile.bat [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/CreateCabFile.bat [iso-8859-1] Thu Jun 4 14:23:08 2015 @@ -1,10 +1,12 @@ @echo off + +cd ..\..\..\media mkdir rapps\utf16 for %%f in (rapps\*.txt) do ( - ..\..\..\output-MinGW-i386\host-tools\tools\utf16le.exe "rapps\%%~nf.txt" "rapps\utf16\%%~nf.txt" + ..\output-MinGW-i386\host-tools\tools\utf16le.exe "rapps\%%~nf.txt" "rapps\utf16\%%~nf.txt" ) -..\..\..\output-MinGW-i386\host-tools\tools\cabman\cabman.exe -M mszip -S rappmgr.cab rapps\utf16\*.txt +..\output-MinGW-i386\host-tools\tools\cabman\cabman.exe -M mszip -S rappmgr.cab rapps\utf16\*.txt rmdir /s /q rapps\utf16 Modified: trunk/reactos/base/applications/rapps/CreateCabFile.sh URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/Cr… ============================================================================== --- trunk/reactos/base/applications/rapps/CreateCabFile.sh [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/CreateCabFile.sh [iso-8859-1] Thu Jun 4 14:23:08 2015 @@ -1,8 +1,8 @@ #/bin/sh -cd rapps +cd ../../../media/rapps mkdir utf16 for i in $(find -type f); do - ../../../host-tools/tools/utf16le $i utf16/$i + ../../host-tools/tools/utf16le $i utf16/$i done cd .. ../../host-tools/tools/cabman/cabman -M mszip -S rappmgr.cab rapps/utf16/*.txt

1 0

[dreimer] 68012: [RAPPS] Move the RAPPS DB out of the source.
by dreimer＠svn.reactos.org 04 Jun '15

04 Jun '15

Author: dreimer Date: Thu Jun 4 14:12:33 2015 New Revision: 68012 URL: http://svn.reactos.org/svn/reactos?rev=68012&view=rev Log: [RAPPS] Move the RAPPS DB out of the source. Added: trunk/reactos/media/rapps/ - copied from r68008, trunk/reactos/base/applications/rapps/rapps/ Removed: trunk/reactos/base/applications/rapps/rapps/

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