Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dquintana] 67831: [STOBJECT] Followup to r67830: When no one handles a message, properly return that it was not handled. This way all messages are handled correctly and not just NCCREATE. Also too...
by dquintana＠svn.reactos.org 19 May '15

19 May '15

Author: dquintana Date: Tue May 19 20:31:31 2015 New Revision: 67831 URL: http://svn.reactos.org/svn/reactos?rev=67831&view=rev Log: [STOBJECT] Followup to r67830: When no one handles a message, properly return that it was not handled. This way all messages are handled correctly and not just NCCREATE. Also took the chance to short-cut NCDESTROY, since the icon handlers have no need to receive this message. CORE-9592 #resolve Modified: trunk/reactos/dll/shellext/stobject/csystray.cpp Modified: trunk/reactos/dll/shellext/stobject/csystray.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/csys… ============================================================================== --- trunk/reactos/dll/shellext/stobject/csystray.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/csystray.cpp [iso-8859-1] Tue May 19 20:31:31 2015 @@ -87,11 +87,12 @@ if (FAILED(hr)) return hr; - if (hr != S_FALSE) - return hr; - } - - return S_OK; + if (hr == S_OK) + return hr; + } + + // Not handled by anyone, so return accordingly. + return S_FALSE; } HRESULT CSysTray::NotifyIcon(INT code, UINT uId, HICON hIcon, LPCWSTR szTip) @@ -207,6 +208,7 @@ switch (uMsg) { case WM_NCCREATE: + case WM_NCDESTROY: return FALSE; case WM_CREATE: InitIcons(); @@ -227,8 +229,5 @@ if (FAILED(hr)) return FALSE; - if (hr == S_FALSE) - return FALSE; - - return TRUE; -} + return (hr == S_OK); +}

1 0

[cwittich] 67830: [stobject] do not handle WM_NCCREATE in ProcessWindowMessage otherwise it get passed to ProcessIconMessage which will flag it as handled in case g_NumIcons is 0 which then will re...
by cwittich＠svn.reactos.org 19 May '15

19 May '15

Author: cwittich Date: Tue May 19 19:58:11 2015 New Revision: 67830 URL: http://svn.reactos.org/svn/reactos?rev=67830&view=rev Log: [stobject] do not handle WM_NCCREATE in ProcessWindowMessage otherwise it get passed to ProcessIconMessage which will flag it as handled in case g_NumIcons is 0 which then will result in ATL not calling DefWndProc anymore CORE-9592 Modified: trunk/reactos/dll/shellext/stobject/csystray.cpp Modified: trunk/reactos/dll/shellext/stobject/csystray.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/csys… ============================================================================== --- trunk/reactos/dll/shellext/stobject/csystray.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/csystray.cpp [iso-8859-1] Tue May 19 19:58:11 2015 @@ -206,6 +206,8 @@ switch (uMsg) { + case WM_NCCREATE: + return FALSE; case WM_CREATE: InitIcons(); SetTimer(1, 2000, NULL);

1 0

[akhaldi] 67829: [SHELL32] Fix a typo. Spotted by IRC nick premoboss. CORE-9704
by akhaldi＠svn.reactos.org 19 May '15

19 May '15

Author: akhaldi Date: Tue May 19 19:38:06 2015 New Revision: 67829 URL: http://svn.reactos.org/svn/reactos?rev=67829&view=rev Log: [SHELL32] Fix a typo. Spotted by IRC nick premoboss. CORE-9704 Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Tue May 19 19:38:06 2015 @@ -702,7 +702,7 @@ IDS_FILEOOP_DELETING "Cancellazione in corso..." IDS_FILEOOP_FROM_TO "Da %1 a %2" IDS_FILEOOP_FROM "Da %1" - IDS_FILEOOP_PREFLIGHT "Verifia preliminare" + IDS_FILEOOP_PREFLIGHT "Verifica preliminare" /* message box strings */ IDS_RESTART_TITLE "Riavvia"

1 0

[aandrejevic] 67828: [FAST486] Fix Fast486FpuArithmeticOperation. It doesn't really matter for the operation itself which operand is the source/destination, because the FPU actually always performs...
by aandrejevic＠svn.reactos.org 19 May '15

19 May '15

Author: aandrejevic Date: Tue May 19 16:57:46 2015 New Revision: 67828 URL: http://svn.reactos.org/svn/reactos?rev=67828&view=rev Log: [FAST486] Fix Fast486FpuArithmeticOperation. It doesn't really matter for the operation itself which operand is the source/destination, because the FPU actually always performs the operation on ST0 and something else. So, FDIV/FDIVR were never really reversed here, it's just that FDIV always divides ST0 by something and FDIVR always divides something by ST0. Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6782… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Tue May 19 16:57:46 2015 @@ -1273,9 +1273,11 @@ static inline VOID FASTCALL Fast486FpuArithmeticOperation(PFAST486_STATE State, INT Operation, - PFAST486_FPU_DATA_REG SourceOperand, - PFAST486_FPU_DATA_REG DestOperand) + PFAST486_FPU_DATA_REG Operand, + BOOLEAN TopDestination) { + PFAST486_FPU_DATA_REG DestOperand = TopDestination ? &FPU_ST(0) : Operand; + ASSERT(!(Operation & ~7)); /* Check the operation */ @@ -1284,14 +1286,14 @@ /* FADD */ case 0: { - Fast486FpuAdd(State, DestOperand, SourceOperand, DestOperand); + Fast486FpuAdd(State, &FPU_ST(0), Operand, DestOperand); break; } /* FMUL */ case 1: { - Fast486FpuMultiply(State, DestOperand, SourceOperand, DestOperand); + Fast486FpuMultiply(State, &FPU_ST(0), Operand, DestOperand); break; } @@ -1300,7 +1302,7 @@ /* FCOMP */ case 3: { - Fast486FpuCompare(State, DestOperand, SourceOperand); + Fast486FpuCompare(State, &FPU_ST(0), Operand); if (Operation == 3) Fast486FpuPop(State); break; @@ -1309,28 +1311,28 @@ /* FSUB */ case 4: { - Fast486FpuSubtract(State, DestOperand, SourceOperand, DestOperand); + Fast486FpuSubtract(State, &FPU_ST(0), Operand, DestOperand); break; } /* FSUBR */ case 5: { - Fast486FpuSubtract(State, SourceOperand, DestOperand, DestOperand); + Fast486FpuSubtract(State, Operand, &FPU_ST(0), DestOperand); break; } /* FDIV */ case 6: { - Fast486FpuDivide(State, SourceOperand, DestOperand, DestOperand); + Fast486FpuDivide(State, &FPU_ST(0), Operand, DestOperand); break; } /* FDIVR */ case 7: { - Fast486FpuDivide(State, DestOperand, SourceOperand, DestOperand); + Fast486FpuDivide(State, Operand, &FPU_ST(0), DestOperand); break; } } @@ -1425,7 +1427,7 @@ FAST486_MOD_REG_RM ModRegRm; BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; #ifndef FAST486_NO_FPU - PFAST486_FPU_DATA_REG SourceOperand, DestOperand; + PFAST486_FPU_DATA_REG Operand; FAST486_FPU_DATA_REG MemoryData; #endif @@ -1444,9 +1446,6 @@ FPU_SAVE_LAST_INST(); - /* The destination operand is ST0 */ - DestOperand = &FPU_ST(0); - if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) { /* Raise the invalid operation exception */ @@ -1455,9 +1454,9 @@ if (State->FpuControl.Im) { /* Return the indefinite NaN */ - DestOperand->Sign = TRUE; - DestOperand->Exponent = FPU_MAX_EXPONENT + 1; - DestOperand->Mantissa = FPU_INDEFINITE_MANTISSA; + FPU_ST(0).Sign = TRUE; + FPU_ST(0).Exponent = FPU_MAX_EXPONENT + 1; + FPU_ST(0).Mantissa = FPU_INDEFINITE_MANTISSA; FPU_SET_TAG(0, FPU_TAG_SPECIAL); } @@ -1478,7 +1477,7 @@ } Fast486FpuFromSingleReal(State, Value, &MemoryData); - SourceOperand = &MemoryData; + Operand = &MemoryData; FPU_SAVE_LAST_OPERAND(); } @@ -1492,9 +1491,9 @@ if (State->FpuControl.Im) { /* Return the indefinite NaN */ - DestOperand->Sign = TRUE; - DestOperand->Exponent = FPU_MAX_EXPONENT + 1; - DestOperand->Mantissa = FPU_INDEFINITE_MANTISSA; + FPU_ST(0).Sign = TRUE; + FPU_ST(0).Exponent = FPU_MAX_EXPONENT + 1; + FPU_ST(0).Mantissa = FPU_INDEFINITE_MANTISSA; FPU_SET_TAG(0, FPU_TAG_SPECIAL); } @@ -1504,11 +1503,11 @@ } /* Load the source operand from an FPU register */ - SourceOperand = &FPU_ST(ModRegRm.SecondRegister); + Operand = &FPU_ST(ModRegRm.SecondRegister); } /* Perform the requested operation */ - Fast486FpuArithmeticOperation(State, ModRegRm.Register, SourceOperand, DestOperand); + Fast486FpuArithmeticOperation(State, ModRegRm.Register, Operand, TRUE); #endif } @@ -2291,7 +2290,6 @@ FAST486_MOD_REG_RM ModRegRm; BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; #ifndef FAST486_NO_FPU - PFAST486_FPU_DATA_REG SourceOperand, DestOperand; LONG Value; FAST486_FPU_DATA_REG MemoryData; #endif @@ -2348,9 +2346,6 @@ return; } - /* The destination operand is always ST0 */ - DestOperand = &FPU_ST(0); - if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) { /* Raise the invalid operation exception */ @@ -2359,9 +2354,9 @@ if (State->FpuControl.Im) { /* Return the indefinite NaN */ - DestOperand->Sign = TRUE; - DestOperand->Exponent = FPU_MAX_EXPONENT + 1; - DestOperand->Mantissa = FPU_INDEFINITE_MANTISSA; + FPU_ST(0).Sign = TRUE; + FPU_ST(0).Exponent = FPU_MAX_EXPONENT + 1; + FPU_ST(0).Mantissa = FPU_INDEFINITE_MANTISSA; FPU_SET_TAG(0, FPU_TAG_SPECIAL); } @@ -2371,10 +2366,9 @@ } Fast486FpuFromInteger(State, (LONGLONG)Value, &MemoryData); - SourceOperand = &MemoryData; /* Perform the requested operation */ - Fast486FpuArithmeticOperation(State, ModRegRm.Register, SourceOperand, DestOperand); + Fast486FpuArithmeticOperation(State, ModRegRm.Register, &MemoryData, TRUE); #endif } @@ -2614,7 +2608,7 @@ FAST486_MOD_REG_RM ModRegRm; BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; #ifndef FAST486_NO_FPU - PFAST486_FPU_DATA_REG SourceOperand, DestOperand; + PFAST486_FPU_DATA_REG Operand; FAST486_FPU_DATA_REG MemoryData; #endif @@ -2637,9 +2631,6 @@ { ULONGLONG Value; - /* The destination operand is ST0 */ - DestOperand = &FPU_ST(0); - if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) { /* Raise the invalid operation exception */ @@ -2648,9 +2639,9 @@ if (State->FpuControl.Im) { /* Return the indefinite NaN */ - DestOperand->Sign = TRUE; - DestOperand->Exponent = FPU_MAX_EXPONENT + 1; - DestOperand->Mantissa = FPU_INDEFINITE_MANTISSA; + FPU_ST(0).Sign = TRUE; + FPU_ST(0).Exponent = FPU_MAX_EXPONENT + 1; + FPU_ST(0).Mantissa = FPU_INDEFINITE_MANTISSA; FPU_SET_TAG(0, FPU_TAG_SPECIAL); } @@ -2673,17 +2664,14 @@ } Fast486FpuFromDoubleReal(State, Value, &MemoryData); - SourceOperand = &MemoryData; + Operand = &MemoryData; FPU_SAVE_LAST_OPERAND(); } else { - /* The source operand is ST0 */ - SourceOperand = &FPU_ST(0); - /* Load the destination operand from an FPU register */ - DestOperand = &FPU_ST(ModRegRm.SecondRegister); + Operand = &FPU_ST(ModRegRm.SecondRegister); if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || (FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY)) @@ -2694,9 +2682,9 @@ if (State->FpuControl.Im) { /* Return the indefinite NaN */ - DestOperand->Sign = TRUE; - DestOperand->Exponent = FPU_MAX_EXPONENT + 1; - DestOperand->Mantissa = FPU_INDEFINITE_MANTISSA; + Operand->Sign = TRUE; + Operand->Exponent = FPU_MAX_EXPONENT + 1; + Operand->Mantissa = FPU_INDEFINITE_MANTISSA; FPU_SET_TAG(ModRegRm.SecondRegister, FPU_TAG_SPECIAL); } @@ -2707,7 +2695,7 @@ } /* Perform the requested operation */ - Fast486FpuArithmeticOperation(State, ModRegRm.Register, SourceOperand, DestOperand); + Fast486FpuArithmeticOperation(State, ModRegRm.Register, Operand, ModRegRm.Memory); #endif } @@ -2992,7 +2980,7 @@ FAST486_MOD_REG_RM ModRegRm; BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; #ifndef FAST486_NO_FPU - PFAST486_FPU_DATA_REG SourceOperand, DestOperand; + PFAST486_FPU_DATA_REG Operand; FAST486_FPU_DATA_REG MemoryData; #endif @@ -3015,9 +3003,6 @@ { SHORT Value; - /* The destination operand is ST0 */ - DestOperand = &FPU_ST(0); - if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) { /* Raise the invalid operation exception */ @@ -3026,9 +3011,9 @@ if (State->FpuControl.Im) { /* Return the indefinite NaN */ - DestOperand->Sign = TRUE; - DestOperand->Exponent = FPU_MAX_EXPONENT + 1; - DestOperand->Mantissa = FPU_INDEFINITE_MANTISSA; + FPU_ST(0).Sign = TRUE; + FPU_ST(0).Exponent = FPU_MAX_EXPONENT + 1; + FPU_ST(0).Mantissa = FPU_INDEFINITE_MANTISSA; FPU_SET_TAG(0, FPU_TAG_SPECIAL); } @@ -3045,7 +3030,7 @@ } Fast486FpuFromInteger(State, (LONGLONG)Value, &MemoryData); - SourceOperand = &MemoryData; + Operand = &MemoryData; FPU_SAVE_LAST_OPERAND(); } @@ -3059,11 +3044,8 @@ return; } - /* The source operand is ST0 */ - SourceOperand = &FPU_ST(0); - /* Load the destination operand from a register */ - DestOperand = &FPU_ST(ModRegRm.SecondRegister); + Operand = &FPU_ST(ModRegRm.SecondRegister); if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || (FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY)) @@ -3077,7 +3059,7 @@ } /* Perform the requested operation */ - Fast486FpuArithmeticOperation(State, ModRegRm.Register, SourceOperand, DestOperand); + Fast486FpuArithmeticOperation(State, ModRegRm.Register, Operand, ModRegRm.Memory); if (!ModRegRm.Memory) Fast486FpuPop(State); #endif

1 0

[aandrejevic] 67827: [FAST486] Fix UnsignedDivMod128 (again). Fix Fast486FpuAdd to handle numbers whose difference of exponents is greater than the number of bits in the mantissa.
by aandrejevic＠svn.reactos.org 19 May '15

19 May '15

Author: aandrejevic Date: Tue May 19 02:37:17 2015 New Revision: 67827 URL: http://svn.reactos.org/svn/reactos?rev=67827&view=rev Log: [FAST486] Fix UnsignedDivMod128 (again). Fix Fast486FpuAdd to handle numbers whose difference of exponents is greater than the number of bits in the mantissa. Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6782… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Tue May 19 02:37:17 2015 @@ -204,8 +204,15 @@ * divisor has more than the original divisor */ Bits = CountLeadingZeros64(Divisor); - if (CurrentHigh > 0ULL) Bits -= CountLeadingZeros64(CurrentHigh); + if (CurrentHigh > 0ULL) Bits += 64 - CountLeadingZeros64(CurrentHigh); else Bits -= CountLeadingZeros64(CurrentLow); + + if (Bits >= 64) + { + *QuotientHigh = *QuotientLow; + *QuotientLow = 0ULL; + Bits -= 64; + } if (Bits) { @@ -635,15 +642,33 @@ /* Adjust the first operand to it... */ if (FirstAdjusted.Exponent < TempResult.Exponent) { - FirstAdjusted.Mantissa >>= (TempResult.Exponent - FirstAdjusted.Exponent); - FirstAdjusted.Exponent = TempResult.Exponent; + if ((TempResult.Exponent - FirstAdjusted.Exponent) < 64) + { + FirstAdjusted.Mantissa >>= (TempResult.Exponent - FirstAdjusted.Exponent); + FirstAdjusted.Exponent = TempResult.Exponent; + } + else + { + /* The second operand is the result */ + *Result = *SecondOperand; + return TRUE; + } } /* ... and the second one too */ if (SecondAdjusted.Exponent < TempResult.Exponent) { - SecondAdjusted.Mantissa >>= (TempResult.Exponent - SecondAdjusted.Exponent); - SecondAdjusted.Exponent = TempResult.Exponent; + if ((TempResult.Exponent - FirstAdjusted.Exponent) < 64) + { + SecondAdjusted.Mantissa >>= (TempResult.Exponent - SecondAdjusted.Exponent); + SecondAdjusted.Exponent = TempResult.Exponent; + } + else + { + /* The first operand is the result */ + *Result = *FirstOperand; + return TRUE; + } } if (FirstAdjusted.Sign == SecondAdjusted.Sign)

1 0

[aandrejevic] 67826: [FAST486] Add checks for special numbers in Fast486FpuAdd. Don't use pointers to out-of-scope variables.
by aandrejevic＠svn.reactos.org 18 May '15

18 May '15

Author: aandrejevic Date: Mon May 18 23:33:25 2015 New Revision: 67826 URL: http://svn.reactos.org/svn/reactos?rev=67826&view=rev Log: [FAST486] Add checks for special numbers in Fast486FpuAdd. Don't use pointers to out-of-scope variables. Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6782… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Mon May 18 23:33:25 2015 @@ -591,6 +591,18 @@ FAST486_FPU_DATA_REG SecondAdjusted = *SecondOperand; FAST486_FPU_DATA_REG TempResult; + if (FPU_IS_INDEFINITE(FirstOperand) + || FPU_IS_INDEFINITE(SecondOperand) + || (FPU_IS_POS_INF(FirstOperand) && FPU_IS_NEG_INF(SecondOperand)) + || (FPU_IS_NEG_INF(FirstOperand) && FPU_IS_POS_INF(SecondOperand))) + { + /* The result will be indefinite */ + Result->Sign = TRUE; + Result->Exponent = FPU_MAX_EXPONENT + 1; + Result->Mantissa = FPU_INDEFINITE_MANTISSA; + return TRUE; + } + if ((!FPU_IS_NORMALIZED(FirstOperand) || !FPU_IS_NORMALIZED(SecondOperand))) { /* Raise the denormalized exception */ @@ -601,6 +613,20 @@ Fast486FpuException(State); return FALSE; } + } + + if (FPU_IS_ZERO(FirstOperand) || FPU_IS_INFINITY(SecondOperand)) + { + /* The second operand is the result */ + *Result = *SecondOperand; + return TRUE; + } + + if (FPU_IS_ZERO(SecondOperand) || FPU_IS_INFINITY(FirstOperand)) + { + /* The first operand is the result */ + *Result = *FirstOperand; + return TRUE; } /* Find the largest exponent */ @@ -2942,6 +2968,7 @@ BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; #ifndef FAST486_NO_FPU PFAST486_FPU_DATA_REG SourceOperand, DestOperand; + FAST486_FPU_DATA_REG MemoryData; #endif TOGGLE_ADSIZE(AddressSize); @@ -2962,7 +2989,6 @@ if (ModRegRm.Memory) { SHORT Value; - FAST486_FPU_DATA_REG MemoryData; /* The destination operand is ST0 */ DestOperand = &FPU_ST(0);

1 0

[ekohl] 67825: [SYSDM] The maximum length of hardware profiles names is 79 characters. Use a matching string length and set the length of the edit control accordingly.
by ekohl＠svn.reactos.org 18 May '15

18 May '15

Author: ekohl Date: Mon May 18 20:29:14 2015 New Revision: 67825 URL: http://svn.reactos.org/svn/reactos?rev=67825&view=rev Log: [SYSDM] The maximum length of hardware profiles names is 79 characters. Use a matching string length and set the length of the edit control accordingly. Modified: trunk/reactos/dll/cpl/sysdm/hardprof.c Modified: trunk/reactos/dll/cpl/sysdm/hardprof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/hardprof.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/hardprof.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/hardprof.c [iso-8859-1] Mon May 18 20:29:14 2015 @@ -11,9 +11,11 @@ #include <debug.h> +#define PROFILE_NAME_LENGTH 80 + typedef struct _PROFILE { - WCHAR szFriendlyName[256]; + WCHAR szFriendlyName[PROFILE_NAME_LENGTH]; WCHAR szName[5]; DWORD dwProfileNumber; DWORD dwPreferenceOrder; @@ -37,11 +39,12 @@ UINT idFrom, UINT idTo) { - WCHAR szNewProfileName[256]; + WCHAR szNewProfileName[PROFILE_NAME_LENGTH]; SetDlgItemText(hwndDlg, idFrom, pProfileData->pProfiles[pProfileData->dwSelectedProfileIndex].szFriendlyName); swprintf(szNewProfileName, L"Profile %lu", pProfileData->dwProfileCount); + SendDlgItemMessageW(hwndDlg, idTo, EM_SETLIMITTEXT, PROFILE_NAME_LENGTH - 1, 0); SetDlgItemText(hwndDlg, idTo, szNewProfileName); } @@ -76,7 +79,7 @@ GetDlgItemText(hwndDlg, IDC_COPYPROFILETO, pDstProfile->szFriendlyName, - 256); + PROFILE_NAME_LENGTH); pDstProfile->dwProfileNumber = ++pProfileData->dwLastProfile; swprintf(pDstProfile->szName, L"%04lu", pDstProfile->dwProfileNumber); @@ -138,7 +141,7 @@ GetDlgItemText(hwndDlg, IDC_RENPROFEDITTO, pProfile->szFriendlyName, - 256); + PROFILE_NAME_LENGTH); /* Replace the listbox string */ SendDlgItemMessageW(pProfileData->hwndProfileDlg, IDC_HRDPROFLSTBOX, LB_DELETESTRING, pProfileData->dwSelectedProfileIndex, 0); @@ -288,7 +291,7 @@ if (lError != ERROR_SUCCESS) return; - dwSize = 256 * sizeof(WCHAR); + dwSize = PROFILE_NAME_LENGTH * sizeof(WCHAR); lError = RegQueryValueExW(hProfileKey, L"FriendlyName", NULL,

1 0

[pschweitzer] 67824: [FASTFAT] Implement support for FastIO for: - FastIoQueryBasicInfo - FastIoQueryStandardInfo Now, with this commit and the two previous, ReactOS won't attempt to issue an IRP f...
by pschweitzer＠svn.reactos.org 18 May '15

18 May '15

Author: pschweitzer Date: Mon May 18 19:51:14 2015 New Revision: 67824 URL: http://svn.reactos.org/svn/reactos?rev=67824&view=rev Log: [FASTFAT] Implement support for FastIO for: - FastIoQueryBasicInfo - FastIoQueryStandardInfo Now, with this commit and the two previous, ReactOS won't attempt to issue an IRP for these query, but will directly go with the FastIO path. The performance improvement is really visible in 1st stage (at least, here with VBox). Modified: trunk/reactos/drivers/filesystems/fastfat/fastio.c trunk/reactos/drivers/filesystems/fastfat/finfo.c trunk/reactos/drivers/filesystems/fastfat/vfat.h Modified: trunk/reactos/drivers/filesystems/fastfat/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fastio.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fastio.c [iso-8859-1] Mon May 18 19:51:14 2015 @@ -1,9 +1,10 @@ /* - * FILE: drivers/fs/vfat/fastio.c + * FILE: drivers/filesystems/fastfat/fastio.c * PURPOSE: Fast IO routines. * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PROGRAMMER: Herve Poussineau (hpoussin(a)reactos.org) + * Pierre Schweitzer (pierre(a)reactos.org) */ #include "vfat.h" @@ -111,15 +112,51 @@ OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject) { + NTSTATUS Status; + PVFATFCB FCB = NULL; + BOOLEAN Success = FALSE; + ULONG BufferLength = sizeof(FILE_BASIC_INFORMATION); + DPRINT("VfatFastIoQueryBasicInfo()\n"); - UNREFERENCED_PARAMETER(FileObject); - UNREFERENCED_PARAMETER(Wait); - UNREFERENCED_PARAMETER(Buffer); - UNREFERENCED_PARAMETER(IoStatus); - UNREFERENCED_PARAMETER(DeviceObject); - - return FALSE; + FCB = (PVFATFCB)FileObject->FsContext; + if (FCB == NULL) + { + return FALSE; + } + + FsRtlEnterFileSystem(); + + if (!(FCB->Flags & FCB_IS_PAGE_FILE)) + { + if (!ExAcquireResourceSharedLite(&FCB->MainResource, Wait)) + { + FsRtlExitFileSystem(); + return FALSE; + } + } + + Status = VfatGetBasicInformation(FileObject, + FCB, + DeviceObject, + Buffer, + &BufferLength); + + if (!(FCB->Flags & FCB_IS_PAGE_FILE)) + { + ExReleaseResourceLite(&FCB->MainResource); + } + + if (NT_SUCCESS(Status)) + { + IoStatus->Status = STATUS_SUCCESS; + IoStatus->Information = sizeof(FILE_BASIC_INFORMATION) - BufferLength; + Success = TRUE; + } + + FsRtlExitFileSystem(); + + return Success; } static FAST_IO_QUERY_STANDARD_INFO VfatFastIoQueryStandardInfo; @@ -134,15 +171,51 @@ OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject) { - DPRINT("VfatFastIoQueryStandardInfo\n"); - - UNREFERENCED_PARAMETER(FileObject); - UNREFERENCED_PARAMETER(Wait); - UNREFERENCED_PARAMETER(Buffer); - UNREFERENCED_PARAMETER(IoStatus); - UNREFERENCED_PARAMETER(DeviceObject); - - return FALSE; + NTSTATUS Status; + PVFATFCB FCB = NULL; + BOOLEAN Success = FALSE; + ULONG BufferLength = sizeof(FILE_STANDARD_INFORMATION); + + DPRINT("VfatFastIoQueryStandardInfo()\n"); + + UNREFERENCED_PARAMETER(DeviceObject); + + FCB = (PVFATFCB)FileObject->FsContext; + if (FCB == NULL) + { + return FALSE; + } + + FsRtlEnterFileSystem(); + + if (!(FCB->Flags & FCB_IS_PAGE_FILE)) + { + if (!ExAcquireResourceSharedLite(&FCB->MainResource, Wait)) + { + FsRtlExitFileSystem(); + return FALSE; + } + } + + Status = VfatGetStandardInformation(FCB, + Buffer, + &BufferLength); + + if (!(FCB->Flags & FCB_IS_PAGE_FILE)) + { + ExReleaseResourceLite(&FCB->MainResource); + } + + if (NT_SUCCESS(Status)) + { + IoStatus->Status = STATUS_SUCCESS; + IoStatus->Information = sizeof(FILE_STANDARD_INFORMATION) - BufferLength; + Success = TRUE; + } + + FsRtlExitFileSystem(); + + return Success; } static FAST_IO_LOCK VfatFastIoLock; Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Mon May 18 19:51:14 2015 @@ -71,7 +71,6 @@ /* * FUNCTION: Retrieve the standard file information */ -static NTSTATUS VfatGetStandardInformation( PVFATFCB FCB, @@ -236,7 +235,6 @@ return STATUS_SUCCESS; } -static NTSTATUS VfatGetBasicInformation( PFILE_OBJECT FileObject, Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] Mon May 18 19:51:14 2015 @@ -875,6 +875,20 @@ /* finfo.c */ NTSTATUS +VfatGetStandardInformation( + PVFATFCB FCB, + PFILE_STANDARD_INFORMATION StandardInfo, + PULONG BufferLength); + +NTSTATUS +VfatGetBasicInformation( + PFILE_OBJECT FileObject, + PVFATFCB FCB, + PDEVICE_OBJECT DeviceObject, + PFILE_BASIC_INFORMATION BasicInfo, + PULONG BufferLength); + +NTSTATUS VfatQueryInformation( PVFAT_IRP_CONTEXT IrpContext);

1 0

[pschweitzer] 67823: [NTOSKRNL] Addendum to r67822: Add IoSetIoCompletion() to header
by pschweitzer＠svn.reactos.org 18 May '15

18 May '15

Author: pschweitzer Date: Mon May 18 19:49:15 2015 New Revision: 67823 URL: http://svn.reactos.org/svn/reactos?rev=67823&view=rev Log: [NTOSKRNL] Addendum to r67822: Add IoSetIoCompletion() to header Modified: trunk/reactos/ntoskrnl/include/internal/io.h Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Mon May 18 19:49:15 2015 @@ -1247,6 +1247,17 @@ PVOID ObjectBody ); +NTSTATUS +NTAPI +IoSetIoCompletion( + IN PVOID IoCompletion, + IN PVOID KeyContext, + IN PVOID ApcContext, + IN NTSTATUS IoStatus, + IN ULONG_PTR IoStatusInformation, + IN BOOLEAN Quota +); + // // Ramdisk Routines //

1 0

[pschweitzer] 67822: [NTOSKRNL] Implement FastIO support for: - NtFsControlFile() - NtLockFile() - NtUnlockFile() - NtQueryInformationFile()
by pschweitzer＠svn.reactos.org 18 May '15

18 May '15

Author: pschweitzer Date: Mon May 18 19:47:11 2015 New Revision: 67822 URL: http://svn.reactos.org/svn/reactos?rev=67822&view=rev Log: [NTOSKRNL] Implement FastIO support for: - NtFsControlFile() - NtLockFile() - NtUnlockFile() - NtQueryInformationFile() Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Mon May 18 19:47:11 2015 @@ -1,11 +1,12 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/io/iofunc.c + * FILE: ntoskrnl/io/iomgr/iofunc.c * PURPOSE: Generic I/O Functions that build IRPs for various operations * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Gunnar Dalsnes * Filip Navara (navaraf(a)reactos.org) + * Pierre Schweitzer (pierre(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -339,6 +340,113 @@ { /* Otherwise get the related device */ DeviceObject = IoGetRelatedDeviceObject(FileObject); + } + + /* If that's FS I/O, try to do it with FastIO path */ + if (!IsDevIoCtl) + { + PFAST_IO_DISPATCH FastIoDispatch = DeviceObject->DriverObject->FastIoDispatch; + + /* Check whether FSD is FastIO aware and provide an appropriate routine */ + if (FastIoDispatch != NULL && FastIoDispatch->FastIoDeviceControl != NULL) + { + IO_STATUS_BLOCK KernelIosb; + + /* If we have an output buffer coming from usermode */ + if (PreviousMode != KernelMode && OutputBuffer != NULL) + { + /* Probe it according to its usage */ + _SEH2_TRY + { + if (AccessType == METHOD_IN_DIRECT) + { + ProbeForRead(OutputBuffer, OutputBufferLength, sizeof(CHAR)); + } + else if (AccessType == METHOD_OUT_DIRECT) + { + ProbeForWrite(OutputBuffer, OutputBufferLength, sizeof(CHAR)); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Cleanup after exception and return */ + IopCleanupAfterException(FileObject, NULL, EventObject, NULL); + + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } + + /* If we're to dismount a volume, increaase the dismount count */ + if (IoControlCode == FSCTL_DISMOUNT_VOLUME) + { + InterlockedExchangeAdd((PLONG)&SharedUserData->DismountCount, 1); + } + + /* Call the FSD */ + if (FastIoDispatch->FastIoDeviceControl(FileObject, + TRUE, + InputBuffer, + InputBufferLength, + OutputBuffer, + OutputBufferLength, + IoControlCode, + &KernelIosb, + DeviceObject)) + { + IO_COMPLETION_CONTEXT CompletionInfo = { NULL, NULL }; + + /* Write the IOSB back */ + _SEH2_TRY + { + *IoStatusBlock = KernelIosb; + + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + KernelIosb.Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + /* Backup our complete context in case it exists */ + if (FileObject->CompletionContext) + { + CompletionInfo = *(FileObject->CompletionContext); + } + + /* If we had an event, signal it */ + if (Event) + { + KeSetEvent(EventObject, IO_NO_INCREMENT, FALSE); + ObDereferenceObject(EventObject); + } + + /* If FO was locked, unlock it */ + if (LockedForSynch) + { + IopUnlockFileObject(FileObject); + } + + /* Set completion if required */ + if (CompletionInfo.Port != NULL && UserApcContext != NULL) + { + if (!NT_SUCCESS(IoSetIoCompletion(CompletionInfo.Port, + CompletionInfo.Key, + UserApcContext, + KernelIosb.Status, + KernelIosb.Information, + TRUE))) + { + KernelIosb.Status = STATUS_INSUFFICIENT_RESOURCES; + } + } + + /* We're done with FastIO! */ + ObDereferenceObject(FileObject); + return KernelIosb.Status; + } + } } /* Clear the event */ @@ -1491,6 +1599,7 @@ LARGE_INTEGER CapturedByteOffset, CapturedLength; NTSTATUS Status; OBJECT_HANDLE_INFORMATION HandleInformation; + PFAST_IO_DISPATCH FastIoDispatch; PAGED_CODE(); CapturedByteOffset.QuadPart = 0; CapturedLength.QuadPart = 0; @@ -1557,6 +1666,62 @@ /* Get the device object */ DeviceObject = IoGetRelatedDeviceObject(FileObject); + + /* Try to do it the FastIO way if possible */ + FastIoDispatch = DeviceObject->DriverObject->FastIoDispatch; + if (FastIoDispatch != NULL && FastIoDispatch->FastIoLock != NULL) + { + IO_STATUS_BLOCK KernelIosb; + + if (FastIoDispatch->FastIoLock(FileObject, + &CapturedByteOffset, + &CapturedLength, + PsGetCurrentProcess(), + Key, + FailImmediately, + ExclusiveLock, + &KernelIosb, + DeviceObject)) + { + /* Write the IOSB back */ + _SEH2_TRY + { + *IoStatusBlock = KernelIosb; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + KernelIosb.Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + /* If we had an event, signal it */ + if (EventHandle) + { + KeSetEvent(Event, IO_NO_INCREMENT, FALSE); + ObDereferenceObject(Event); + } + + /* Set completion if required */ + if (FileObject->CompletionContext != NULL && ApcContext != NULL) + { + if (!NT_SUCCESS(IoSetIoCompletion(FileObject->CompletionContext->Port, + FileObject->CompletionContext->Key, + ApcContext, + KernelIosb.Status, + KernelIosb.Information, + TRUE))) + { + KernelIosb.Status = STATUS_INSUFFICIENT_RESOURCES; + } + } + + FileObject->LockOperation = TRUE; + + /* We're done with FastIO! */ + ObDereferenceObject(FileObject); + return KernelIosb.Status; + } + } /* Check if we should use Sync IO or not */ if (FileObject->Flags & FO_SYNCHRONOUS_IO) @@ -1897,6 +2062,7 @@ PFILE_MODE_INFORMATION ModeBuffer; PFILE_ALIGNMENT_INFORMATION AlignmentBuffer; PFILE_ALL_INFORMATION AllBuffer; + PFAST_IO_DISPATCH FastIoDispatch; PAGED_CODE(); IOTRACE(IO_API_DEBUG, "FileHandle: %p\n", FileHandle); @@ -2018,6 +2184,52 @@ } KeInitializeEvent(Event, SynchronizationEvent, FALSE); LocalEvent = TRUE; + } + + /* Check if FastIO is possible for the two available information classes */ + FastIoDispatch = DeviceObject->DriverObject->FastIoDispatch; + if (FastIoDispatch != NULL && + ((FileInformationClass == FileBasicInformation && FastIoDispatch->FastIoQueryBasicInfo != NULL) || + (FileInformationClass == FileStandardInformation && FastIoDispatch->FastIoQueryStandardInfo != NULL))) + { + BOOLEAN Success = FALSE; + + if (FileInformationClass == FileBasicInformation) + { + Success = FastIoDispatch->FastIoQueryBasicInfo(FileObject, TRUE, + FileInformation, + &KernelIosb, + DeviceObject); + } + else + { + Success = FastIoDispatch->FastIoQueryStandardInfo(FileObject, TRUE, + FileInformation, + &KernelIosb, + DeviceObject); + } + + /* If call succeed */ + if (Success) + { + /* Write the IOSB back */ + _SEH2_TRY + { + *IoStatusBlock = KernelIosb; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + KernelIosb.Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + /* Unlock FO */ + IopUnlockFileObject(FileObject); + + /* We're done with FastIO! */ + ObDereferenceObject(FileObject); + return KernelIosb.Status; + } } /* Clear the File Object event */ @@ -2668,6 +2880,9 @@ DeviceObject = IoGetRelatedDeviceObject(FileObject); } + DPRINT("Will call: %p\n", DeviceObject); + DPRINT("Associated driver: %p (%wZ)\n", DeviceObject->DriverObject, &DeviceObject->DriverObject->DriverName); + /* Check if this is a file that was opened for Synch I/O */ if (FileObject->Flags & FO_SYNCHRONOUS_IO) { @@ -3028,6 +3243,7 @@ NTSTATUS Status; OBJECT_HANDLE_INFORMATION HandleInformation; IO_STATUS_BLOCK KernelIosb; + PFAST_IO_DISPATCH FastIoDispatch; PAGED_CODE(); CapturedByteOffset.QuadPart = 0; CapturedLength.QuadPart = 0; @@ -3086,6 +3302,35 @@ else { DeviceObject = IoGetRelatedDeviceObject(FileObject); + } + + /* Try to do it the FastIO way if possible */ + FastIoDispatch = DeviceObject->DriverObject->FastIoDispatch; + if (FastIoDispatch != NULL && FastIoDispatch->FastIoUnlockSingle != NULL) + { + if (FastIoDispatch->FastIoUnlockSingle(FileObject, + &CapturedByteOffset, + &CapturedLength, + PsGetCurrentProcess(), + Key, + &KernelIosb, + DeviceObject)) + { + /* Write the IOSB back */ + _SEH2_TRY + { + *IoStatusBlock = KernelIosb; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + KernelIosb.Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + /* We're done with FastIO! */ + ObDereferenceObject(FileObject); + return KernelIosb.Status; + } } /* Check if we should use Sync IO or not */

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