Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[npwoods] 18288: Calc: TCHAR-izing, formatting and const-correctness

by npwoods＠svn.reactos.com

Calc: TCHAR-izing, formatting and const-correctness Modified: trunk/reactos/subsys/system/calc/dialog.c Modified: trunk/reactos/subsys/system/calc/winecalc.c Modified: trunk/reactos/subsys/system/calc/winecalc.h _____ Modified: trunk/reactos/subsys/system/calc/dialog.c --- trunk/reactos/subsys/system/calc/dialog.c 2005-10-05 23:52:43 UTC (rev 18287) +++ trunk/reactos/subsys/system/calc/dialog.c 2005-10-05 23:59:13 UTC (rev 18288) @@ -72,11 +72,11 @@ SetBkMode(hdc, TRANSPARENT); - TextOut(hdc, 10, 10, c1, _tcslen(c1)); + TextOut(hdc, 10, 10, c1, _tcslen(c1)); TextOut(hdc, 10, 35, c2, _tcslen(c2)); TextOut(hdc, 10, 50, c3, _tcslen(c3)); TextOut(hdc, 10, 75, c4, _tcslen(c4)); - TextOut(hdc, 10, 90, c5, _tcslen(c5)); + TextOut(hdc, 10, 90, c5, _tcslen(c5)); SelectObject(hdc, hFontOrg); _____ Modified: trunk/reactos/subsys/system/calc/winecalc.c --- trunk/reactos/subsys/system/calc/winecalc.c 2005-10-05 23:52:43 UTC (rev 18287) +++ trunk/reactos/subsys/system/calc/winecalc.c 2005-10-05 23:59:13 UTC (rev 18288) @@ -124,9 +124,6 @@ WNDCLASS wc; HWND hWnd; HACCEL haccel; -#ifdef UNICODE - CHAR s_ansi[CALC_BUF_SIZE]; -#endif TCHAR s[CALC_BUF_SIZE]; int r; @@ -139,12 +136,7 @@ CALC_BUF_SIZE ); -#ifdef UNICODE - wcstombs(s_ansi, s, sizeof(s_ansi)); - calc.sciMode = atoi(s_ansi); -#else - calc.sciMode = atoi(s); -#endif + calc.sciMode = _ttoi(s); if (calc.sciMode != 0 && calc.sciMode != 1) @@ -157,12 +149,7 @@ CALC_BUF_SIZE ); -#ifdef UNICODE - wcstombs(s_ansi, s, sizeof(s_ansi)); - calc.digitGrouping = atoi(s_ansi); -#else - calc.digitGrouping = atoi(s); -#endif + calc.digitGrouping = _ttoi(s); if (calc.digitGrouping != 0 && calc.digitGrouping != 1) @@ -3198,38 +3185,26 @@ MessageBox(calc->hWnd, s, title, MB_OK); } -calcfloat calc_atof(TCHAR *s, int base) +calcfloat calc_atof(const TCHAR *s, int base) { - // converts from another base to decimal calcfloat #ifdef UNICODE char s_ansi[128]; - wcstombs(s_ansi, s, sizeof(s_ansi)); +#endif + + // converts from another base to decimal calcfloat switch (base) { case NBASE_DECIMAL: + wcstombs(s_ansi, s, sizeof(s_ansi)); return CALC_ATOF(s_ansi); case NBASE_HEX: - return (calcfloat)strtol(s_ansi, NULL, 16); + return (calcfloat)_tcstol(s, NULL, 16); case NBASE_OCTAL: - return (calcfloat)strtol(s_ansi, NULL, 8); + return (calcfloat)_tcstol(s, NULL, 8); case NBASE_BINARY: - return (calcfloat)strtol(s_ansi, NULL, 2); + return (calcfloat)_tcstol(s, NULL, 2); default: break; } -#else - switch (base) { - case NBASE_DECIMAL: - return CALC_ATOF(s); - case NBASE_HEX: - return (calcfloat)strtol(s, NULL, 16); - case NBASE_OCTAL: - return (calcfloat)strtol(s, NULL, 8); - case NBASE_BINARY: - return (calcfloat)strtol(s, NULL, 2); - default: - break; - } -#endif return 0L; } _____ Modified: trunk/reactos/subsys/system/calc/winecalc.h --- trunk/reactos/subsys/system/calc/winecalc.h 2005-10-05 23:52:43 UTC (rev 18287) +++ trunk/reactos/subsys/system/calc/winecalc.h 2005-10-05 23:59:13 UTC (rev 18288) @@ -355,7 +355,7 @@ void show_debug(CALC *calc, TCHAR *title, long wParam, long lParam); -calcfloat calc_atof(TCHAR *s, int base); +calcfloat calc_atof(const TCHAR *s, int base); void calc_ftoa(CALC *calc, calcfloat r, TCHAR *buf); long factorial(long n);

19 years

[npwoods] 18287: Notepad: Goto an offscreen line will now properly scroll the edit control

by npwoods＠svn.reactos.com

Notepad: Goto an offscreen line will now properly scroll the edit control Modified: trunk/reactos/subsys/system/notepad/dialog.c _____ Modified: trunk/reactos/subsys/system/notepad/dialog.c --- trunk/reactos/subsys/system/notepad/dialog.c 2005-10-05 23:30:39 UTC (rev 18286) +++ trunk/reactos/subsys/system/notepad/dialog.c 2005-10-05 23:52:43 UTC (rev 18287) @@ -775,6 +775,7 @@ nLine--; } SendMessage(Globals.hEdit, EM_SETSEL, i, i); + SendMessage(Globals.hEdit, EM_SCROLLCARET, 0, 0); } HeapFree(GetProcessHeap(), 0, pszText); }

19 years

[blight] 18286: Change indentation - make it a bit more readable and same style everywhere.

by blight＠svn.reactos.com

Change indentation - make it a bit more readable and same style everywhere. KiCheckFPU: Change calculation of DummyArea/FxSaveArea (avoid conditional) KeSaveFloatingPointState: Allocate NonPagedPool for the saved state because function can be called only at IRQL >= DISPATCH Modified: trunk/reactos/ntoskrnl/ke/i386/fpu.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/fpu.c --- trunk/reactos/ntoskrnl/ke/i386/fpu.c 2005-10-05 23:24:25 UTC (rev 18285) +++ trunk/reactos/ntoskrnl/ke/i386/fpu.c 2005-10-05 23:30:39 UTC (rev 18286) @@ -48,235 +48,227 @@ STATIC USHORT KiTagWordFnsaveToFxsave(USHORT TagWord) { - INT tmp; + INT tmp; - /* - * Converts the tag-word. 11 (Empty) is converted into 0, everything else into 1 - */ - tmp = ~TagWord; /* Empty is now 00, any 2 bits containing 1 mean valid */ - tmp = (tmp | (tmp >> 1)) & 0x5555; /* 0V0V0V0V0V0V0V0V */ - tmp = (tmp | (tmp >> 1)) & 0x3333; /* 00VV00VV00VV00VV */ - tmp = (tmp | (tmp >> 2)) & 0x0f0f; /* 0000VVVV0000VVVV */ - tmp = (tmp | (tmp >> 4)) & 0x00ff; /* 00000000VVVVVVVV */ + /* + * Converts the tag-word. 11 (Empty) is converted into 0, everything else into 1 + */ + tmp = ~TagWord; /* Empty is now 00, any 2 bits containing 1 mean valid */ + tmp = (tmp | (tmp >> 1)) & 0x5555; /* 0V0V0V0V0V0V0V0V */ + tmp = (tmp | (tmp >> 1)) & 0x3333; /* 00VV00VV00VV00VV */ + tmp = (tmp | (tmp >> 2)) & 0x0f0f; /* 0000VVVV0000VVVV */ + tmp = (tmp | (tmp >> 4)) & 0x00ff; /* 00000000VVVVVVVV */ - return tmp; + return tmp; } STATIC USHORT KiTagWordFxsaveToFnsave(PFXSAVE_FORMAT FxSave) { - USHORT TagWord = 0; - UCHAR Tag; - INT i; - struct FPREG { USHORT Significand[4]; USHORT Exponent; } *FpReg; + USHORT TagWord = 0; + UCHAR Tag; + INT i; + struct FPREG { USHORT Significand[4]; USHORT Exponent; } *FpReg; - for (i = 0; i < 8; i++) + for (i = 0; i < 8; i++) { - if (FxSave->TagWord & (1 << i)) /* valid */ + if (FxSave->TagWord & (1 << i)) /* valid */ { - FpReg = (struct FPREG *)(FxSave->RegisterArea + (i * 16)); - switch (FpReg->Exponent & 0x00007fff) + FpReg = (struct FPREG *)(FxSave->RegisterArea + (i * 16)); + switch (FpReg->Exponent & 0x00007fff) { - case 0x0000: + case 0x0000: if (FpReg->Significand[0] == 0 && FpReg->Significand[1] == 0 && FpReg->Significand[2] == 0 && FpReg->Significand[3] == 0) - { Tag = 1; /* Zero */ - } else - { Tag = 2; /* Special */ - } break; - case 0x7fff: + case 0x7fff: Tag = 2; /* Special */ break; - default: + default: if (FpReg->Significand[3] & 0x00008000) - { Tag = 0; /* Valid */ - } else - { Tag = 2; /* Special */ - } break; } } - else /* empty */ + else /* empty */ { - Tag = 3; + Tag = 3; } - TagWord |= Tag << (i * 2); + TagWord |= Tag << (i * 2); } - return TagWord; + return TagWord; } STATIC VOID KiFnsaveToFxsaveFormat(PFXSAVE_FORMAT FxSave, CONST PFNSAVE_FORMAT FnSave) { - INT i; + INT i; - FxSave->ControlWord = (USHORT)FnSave->ControlWord; - FxSave->StatusWord = (USHORT)FnSave->StatusWord; - FxSave->TagWord = KiTagWordFnsaveToFxsave((USHORT)FnSave->TagWord); - FxSave->ErrorOpcode = (USHORT)(FnSave->ErrorSelector >> 16); - FxSave->ErrorOffset = FnSave->ErrorOffset; - FxSave->ErrorSelector = FnSave->ErrorSelector & 0x0000ffff; - FxSave->DataOffset = FnSave->DataOffset; - FxSave->DataSelector = FnSave->DataSelector & 0x0000ffff; - if (XmmSupport) - FxSave->MXCsr = 0x00001f80 & MxcsrFeatureMask; - else - FxSave->MXCsr = 0; - FxSave->MXCsrMask = MxcsrFeatureMask; - memset(FxSave->Reserved3, 0, sizeof(FxSave->Reserved3) + - sizeof(FxSave->Reserved4)); /* XXX - doesnt zero Align16Byte because - Context->ExtendedRegisters is only 512 bytes, not 520 */ - for (i = 0; i < 8; i++) + FxSave->ControlWord = (USHORT)FnSave->ControlWord; + FxSave->StatusWord = (USHORT)FnSave->StatusWord; + FxSave->TagWord = KiTagWordFnsaveToFxsave((USHORT)FnSave->TagWord); + FxSave->ErrorOpcode = (USHORT)(FnSave->ErrorSelector >> 16); + FxSave->ErrorOffset = FnSave->ErrorOffset; + FxSave->ErrorSelector = FnSave->ErrorSelector & 0x0000ffff; + FxSave->DataOffset = FnSave->DataOffset; + FxSave->DataSelector = FnSave->DataSelector & 0x0000ffff; + if (XmmSupport) + FxSave->MXCsr = 0x00001f80 & MxcsrFeatureMask; + else + FxSave->MXCsr = 0; + FxSave->MXCsrMask = MxcsrFeatureMask; + memset(FxSave->Reserved3, 0, sizeof(FxSave->Reserved3) + + sizeof(FxSave->Reserved4)); /* Don't zero Align16Byte because Context->ExtendedRegisters + is only 512 bytes, not 520 */ + for (i = 0; i < 8; i++) { - memcpy(FxSave->RegisterArea + (i * 16), FnSave->RegisterArea + (i * 10), 10); - memset(FxSave->RegisterArea + (i * 16) + 10, 0, 6); + memcpy(FxSave->RegisterArea + (i * 16), FnSave->RegisterArea + (i * 10), 10); + memset(FxSave->RegisterArea + (i * 16) + 10, 0, 6); } } STATIC VOID KiFxsaveToFnsaveFormat(PFNSAVE_FORMAT FnSave, CONST PFXSAVE_FORMAT FxSave) { - INT i; + INT i; - FnSave->ControlWord = 0xffff0000 | FxSave->ControlWord; - FnSave->StatusWord = 0xffff0000 | FxSave->StatusWord; - FnSave->TagWord = 0xffff0000 | KiTagWordFxsaveToFnsave(FxSave); - FnSave->ErrorOffset = FxSave->ErrorOffset; - FnSave->ErrorSelector = FxSave->ErrorSelector & 0x0000ffff; - FnSave->ErrorSelector |= FxSave->ErrorOpcode << 16; - FnSave->DataOffset = FxSave->DataOffset; - FnSave->DataSelector = FxSave->DataSelector | 0xffff0000; - for (i = 0; i < 8; i++) + FnSave->ControlWord = 0xffff0000 | FxSave->ControlWord; + FnSave->StatusWord = 0xffff0000 | FxSave->StatusWord; + FnSave->TagWord = 0xffff0000 | KiTagWordFxsaveToFnsave(FxSave); + FnSave->ErrorOffset = FxSave->ErrorOffset; + FnSave->ErrorSelector = FxSave->ErrorSelector & 0x0000ffff; + FnSave->ErrorSelector |= FxSave->ErrorOpcode << 16; + FnSave->DataOffset = FxSave->DataOffset; + FnSave->DataSelector = FxSave->DataSelector | 0xffff0000; + for (i = 0; i < 8; i++) { - memcpy(FnSave->RegisterArea + (i * 10), FxSave->RegisterArea + (i * 16), 10); + memcpy(FnSave->RegisterArea + (i * 10), FxSave->RegisterArea + (i * 16), 10); } } VOID KiFloatingSaveAreaToFxSaveArea(PFX_SAVE_AREA FxSaveArea, CONST FLOATING_SAVE_AREA *FloatingSaveArea) { - if (FxsrSupport) - { - KiFnsaveToFxsaveFormat(&FxSaveArea->U.FxArea, (PFNSAVE_FORMAT)FloatingSaveArea); - } - else - { - memcpy(&FxSaveArea->U.FnArea, FloatingSaveArea, sizeof(FxSaveArea->U.FnArea)); - } - FxSaveArea->NpxSavedCpu = 0; - FxSaveArea->Cr0NpxState = FloatingSaveArea->Cr0NpxState; + if (FxsrSupport) + { + KiFnsaveToFxsaveFormat(&FxSaveArea->U.FxArea, (PFNSAVE_FORMAT)FloatingSaveArea); + } + else + { + memcpy(&FxSaveArea->U.FnArea, FloatingSaveArea, sizeof(FxSaveArea->U.FnArea)); + } + FxSaveArea->NpxSavedCpu = 0; + FxSaveArea->Cr0NpxState = FloatingSaveArea->Cr0NpxState; } BOOL KiContextToFxSaveArea(PFX_SAVE_AREA FxSaveArea, PCONTEXT Context) { - BOOL FpuContextChanged = FALSE; + BOOL FpuContextChanged = FALSE; - /* First of all convert the FLOATING_SAVE_AREA into the FX_SAVE_AREA */ - if ((Context->ContextFlags & CONTEXT_FLOATING_POINT) == CONTEXT_FLOATING_POINT) + /* First of all convert the FLOATING_SAVE_AREA into the FX_SAVE_AREA */ + if ((Context->ContextFlags & CONTEXT_FLOATING_POINT) == CONTEXT_FLOATING_POINT) { - KiFloatingSaveAreaToFxSaveArea(FxSaveArea, &Context->FloatSave); - FpuContextChanged = TRUE; + KiFloatingSaveAreaToFxSaveArea(FxSaveArea, &Context->FloatSave); + FpuContextChanged = TRUE; } - /* Now merge the FX_SAVE_AREA from the context with the destination area */ - if ((Context->ContextFlags & CONTEXT_EXTENDED_REGISTERS) == CONTEXT_EXTENDED_REGISTERS) + /* Now merge the FX_SAVE_AREA from the context with the destination area */ + if ((Context->ContextFlags & CONTEXT_EXTENDED_REGISTERS) == CONTEXT_EXTENDED_REGISTERS) { - if (FxsrSupport) + if (FxsrSupport) { - PFXSAVE_FORMAT src = (PFXSAVE_FORMAT)Context->ExtendedRegisters; - PFXSAVE_FORMAT dst = &FxSaveArea->U.FxArea; - dst->MXCsr = src->MXCsr & MxcsrFeatureMask; - memcpy(dst->Reserved3, src->Reserved3, - sizeof(src->Reserved3) + sizeof(src->Reserved4)); + PFXSAVE_FORMAT src = (PFXSAVE_FORMAT)Context->ExtendedRegisters; + PFXSAVE_FORMAT dst = &FxSaveArea->U.FxArea; + dst->MXCsr = src->MXCsr & MxcsrFeatureMask; + memcpy(dst->Reserved3, src->Reserved3, + sizeof(src->Reserved3) + sizeof(src->Reserved4)); - if ((Context->ContextFlags & CONTEXT_FLOATING_POINT) != CONTEXT_FLOATING_POINT) + if ((Context->ContextFlags & CONTEXT_FLOATING_POINT) != CONTEXT_FLOATING_POINT) { - dst->ControlWord = src->ControlWord; - dst->StatusWord = src->StatusWord; - dst->TagWord = src->TagWord; - dst->ErrorOpcode = src->ErrorOpcode; - dst->ErrorOffset = src->ErrorOffset; - dst->ErrorSelector = src->ErrorSelector; - dst->DataOffset = src->DataOffset; - dst->DataSelector = src->DataSelector; - memcpy(dst->RegisterArea, src->RegisterArea, sizeof(src->RegisterArea)); + dst->ControlWord = src->ControlWord; + dst->StatusWord = src->StatusWord; + dst->TagWord = src->TagWord; + dst->ErrorOpcode = src->ErrorOpcode; + dst->ErrorOffset = src->ErrorOffset; + dst->ErrorSelector = src->ErrorSelector; + dst->DataOffset = src->DataOffset; + dst->DataSelector = src->DataSelector; + memcpy(dst->RegisterArea, src->RegisterArea, sizeof(src->RegisterArea)); - FxSaveArea->NpxSavedCpu = 0; - FxSaveArea->Cr0NpxState = 0; + FxSaveArea->NpxSavedCpu = 0; + FxSaveArea->Cr0NpxState = 0; } - FpuContextChanged = TRUE; + FpuContextChanged = TRUE; } } - return FpuContextChanged; + return FpuContextChanged; } VOID INIT_FUNCTION KiCheckFPU(VOID) { - unsigned short int status; - int cr0; - ULONG Flags; - PKPRCB Prcb = KeGetCurrentPrcb(); + unsigned short int status; + int cr0; + ULONG Flags; + PKPRCB Prcb = KeGetCurrentPrcb(); - Ke386SaveFlags(Flags); - Ke386DisableInterrupts(); + Ke386SaveFlags(Flags); + Ke386DisableInterrupts(); - HardwareMathSupport = 0; - FxsrSupport = 0; - XmmSupport = 0; + HardwareMathSupport = 0; + FxsrSupport = 0; + XmmSupport = 0; - cr0 = Ke386GetCr0(); - cr0 |= X86_CR0_NE | X86_CR0_MP; - cr0 &= ~(X86_CR0_EM | X86_CR0_TS); - Ke386SetCr0(cr0); + cr0 = Ke386GetCr0(); + cr0 |= X86_CR0_NE | X86_CR0_MP; + cr0 &= ~(X86_CR0_EM | X86_CR0_TS); + Ke386SetCr0(cr0); #if defined(__GNUC__) - asm volatile("fninit\n\t"); - asm volatile("fstsw %0\n\t" : "=a" (status)); + asm volatile("fninit\n\t"); + asm volatile("fstsw %0\n\t" : "=a" (status)); #elif defined(_MSC_VER) - __asm - { + __asm + { fninit; fstsw status - } + } #else #error Unknown compiler for inline assembler #endif - if (status != 0) - { - /* Set the EM flag in CR0 so any FPU instructions cause a trap. */ - Ke386SetCr0(Ke386GetCr0() | X86_CR0_EM); + if (status != 0) + { + /* Set the EM flag in CR0 so any FPU instructions cause a trap. */ + Ke386SetCr0(Ke386GetCr0() | X86_CR0_EM); Ke386RestoreFlags(Flags); - return; - } + return; + } - /* fsetpm for i287, ignored by i387 */ + /* fsetpm for i287, ignored by i387 */ #if defined(__GNUC__) - asm volatile(".byte 0xDB, 0xE4\n\t"); + asm volatile(".byte 0xDB, 0xE4\n\t"); #elif defined(_MSC_VER) - __asm _emit 0xDB __asm _emit 0xe4 + __asm _emit 0xDB __asm _emit 0xe4 #else #error Unknown compiler for inline assembler #endif - HardwareMathSupport = 1; + HardwareMathSupport = 1; - /* check for and enable MMX/SSE support if possible */ - if ((Prcb->FeatureBits & X86_FEATURE_FXSR) != 0) - { + /* check for and enable MMX/SSE support if possible */ + if ((Prcb->FeatureBits & X86_FEATURE_FXSR) != 0) + { BYTE DummyArea[sizeof(FX_SAVE_AREA) + 15]; PFX_SAVE_AREA FxSaveArea; @@ -284,32 +276,28 @@ FxsrSupport = 1; /* we need a 16 byte aligned FX_SAVE_AREA */ - FxSaveArea = (PFX_SAVE_AREA)DummyArea; - if ((ULONG_PTR)FxSaveArea & 0x0f) - { - FxSaveArea = (PFX_SAVE_AREA)(((ULONG_PTR)FxSaveArea + 0x10) & (~0x0f)); - } + FxSaveArea = (PFX_SAVE_AREA)(((ULONG_PTR)DummyArea + 0xf) & (~0x0f)); Ke386SetCr4(Ke386GetCr4() | X86_CR4_OSFXSR); memset(&FxSaveArea->U.FxArea, 0, sizeof(FxSaveArea->U.FxArea)); asm volatile("fxsave %0" : : "m"(FxSaveArea->U.FxArea)); MxcsrFeatureMask = FxSaveArea->U.FxArea.MXCsrMask; if (MxcsrFeatureMask == 0) - { - MxcsrFeatureMask = 0x0000ffbf; - } - } - /* FIXME: Check for SSE3 in Ke386CpuidFlags2! */ - if (Prcb->FeatureBits & (X86_FEATURE_SSE | X86_FEATURE_SSE2)) - { + { + MxcsrFeatureMask = 0x0000ffbf; + } + } + /* FIXME: Check for SSE3 in Ke386CpuidFlags2! */ + if (Prcb->FeatureBits & (X86_FEATURE_SSE | X86_FEATURE_SSE2)) + { Ke386SetCr4(Ke386GetCr4() | X86_CR4_OSXMMEXCPT); /* enable SSE */ XmmSupport = 1; - } + } - Ke386SetCr0(Ke386GetCr0() | X86_CR0_TS); - Ke386RestoreFlags(Flags); + Ke386SetCr0(Ke386GetCr0() | X86_CR0_TS); + Ke386RestoreFlags(Flags); } /* This is a rather naive implementation of Ke(Save/Restore)FloatingPointState @@ -320,261 +308,260 @@ NTSTATUS STDCALL KeSaveFloatingPointState(OUT PKFLOATING_SAVE Save) { - char *FpState; + char *FpState; - ASSERT_IRQL(DISPATCH_LEVEL); /* FIXME: is this removed for non-debug builds? I hope not! */ + ASSERT_IRQL(DISPATCH_LEVEL); - /* check if we are doing software emulation */ - if (!HardwareMathSupport) + /* check if we are doing software emulation */ + if (!HardwareMathSupport) { - return STATUS_ILLEGAL_FLOAT_CONTEXT; + return STATUS_ILLEGAL_FLOAT_CONTEXT; } - FpState = ExAllocatePool(PagedPool, FPU_STATE_SIZE); - if (NULL == FpState) + FpState = ExAllocatePool(NonPagedPool, FPU_STATE_SIZE); + if (NULL == FpState) { - return STATUS_INSUFFICIENT_RESOURCES; + return STATUS_INSUFFICIENT_RESOURCES; } - *((PVOID *) Save) = FpState; + *((PVOID *) Save) = FpState; #if defined(__GNUC__) - asm volatile("fsave %0\n\t" : "=m" (*FpState)); + asm volatile("fsave %0\n\t" : "=m" (*FpState)); #elif defined(_MSC_VER) - __asm mov eax, FpState; - __asm fsave [eax]; + __asm mov eax, FpState; + __asm fsave [eax]; #else #error Unknown compiler for inline assembler #endif - KeGetCurrentThread()->NpxIrql = KeGetCurrentIrql(); + KeGetCurrentThread()->NpxIrql = KeGetCurrentIrql(); - return STATUS_SUCCESS; + return STATUS_SUCCESS; } NTSTATUS STDCALL KeRestoreFloatingPointState(IN PKFLOATING_SAVE Save) { - char *FpState = *((PVOID *) Save); + char *FpState = *((PVOID *) Save); - if (KeGetCurrentThread()->NpxIrql != KeGetCurrentIrql()) + if (KeGetCurrentThread()->NpxIrql != KeGetCurrentIrql()) { - KEBUGCHECK(UNDEFINED_BUG_CODE); + KEBUGCHECK(UNDEFINED_BUG_CODE); } #if defined(__GNUC__) - __asm__("frstor %0\n\t" : "=m" (*FpState)); + __asm__("frstor %0\n\t" : "=m" (*FpState)); #elif defined(_MSC_VER) - __asm mov eax, FpState; - __asm frstor [eax]; + __asm mov eax, FpState; + __asm frstor [eax]; #else #error Unknown compiler for inline assembler #endif - ExFreePool(FpState); + ExFreePool(FpState); - return STATUS_SUCCESS; + return STATUS_SUCCESS; } NTSTATUS KiHandleFpuFault(PKTRAP_FRAME Tf, ULONG ExceptionNr) { - if (ExceptionNr == 7) /* device not present */ + if (ExceptionNr == 7) /* device not present */ { - BOOL FpuInitialized = FALSE; - unsigned int cr0 = Ke386GetCr0(); - PKTHREAD CurrentThread; - PFX_SAVE_AREA FxSaveArea; - KIRQL oldIrql; + BOOL FpuInitialized = FALSE; + unsigned int cr0 = Ke386GetCr0(); + PKTHREAD CurrentThread; + PFX_SAVE_AREA FxSaveArea; + KIRQL oldIrql; #ifndef CONFIG_SMP - PKTHREAD NpxThread; + PKTHREAD NpxThread; #endif - (void) cr0; - ASSERT((cr0 & X86_CR0_TS) == X86_CR0_TS); - ASSERT((Tf->Eflags & X86_EFLAGS_VM) == 0); - ASSERT((cr0 & X86_CR0_EM) == 0); + (void) cr0; + ASSERT((cr0 & X86_CR0_TS) == X86_CR0_TS); + ASSERT((Tf->Eflags & X86_EFLAGS_VM) == 0); + ASSERT((cr0 & X86_CR0_EM) == 0); - /* disable scheduler, clear TS in cr0 */ - ASSERT_IRQL(DISPATCH_LEVEL); - KeRaiseIrql(DISPATCH_LEVEL, &oldIrql); - asm volatile("clts"); + /* disable scheduler, clear TS in cr0 */ + ASSERT_IRQL(DISPATCH_LEVEL); + KeRaiseIrql(DISPATCH_LEVEL, &oldIrql); + asm volatile("clts"); - CurrentThread = KeGetCurrentThread(); + CurrentThread = KeGetCurrentThread(); #ifndef CONFIG_SMP - NpxThread = KeGetCurrentPrcb()->NpxThread; + NpxThread = KeGetCurrentPrcb()->NpxThread; #endif - ASSERT(CurrentThread != NULL); - DPRINT("Device not present exception happened! (Cr0 = 0x%x, NpxState = 0x%x)\n", cr0, CurrentThread->NpxState); + ASSERT(CurrentThread != NULL); + DPRINT("Device not present exception happened! (Cr0 = 0x%x, NpxState = 0x%x)\n", cr0, CurrentThread->NpxState); #ifndef CONFIG_SMP - /* check if the current thread already owns the FPU */ - if (NpxThread != CurrentThread) /* FIXME: maybe this could be an assertation */ + /* check if the current thread already owns the FPU */ + if (NpxThread != CurrentThread) /* FIXME: maybe this could be an assertation */ { - /* save the FPU state into the owner's save area */ - if (NpxThread != NULL) + /* save the FPU state into the owner's save area */ + if (NpxThread != NULL) { - KeGetCurrentPrcb()->NpxThread = NULL; - FxSaveArea = (PFX_SAVE_AREA)((char *)NpxThread->InitialStack - sizeof (FX_SAVE_AREA)); - /* the fnsave might raise a delayed #MF exception */ - if (FxsrSupport) + KeGetCurrentPrcb()->NpxThread = NULL; + FxSaveArea = (PFX_SAVE_AREA)((char *)NpxThread->InitialStack - sizeof (FX_SAVE_AREA)); + /* the fnsave might raise a delayed #MF exception */ + if (FxsrSupport) { - asm volatile("fxsave %0" : : "m"(FxSaveArea->U.FxArea)); + asm volatile("fxsave %0" : : "m"(FxSaveArea->U.FxArea)); } - else + else { - asm volatile("fnsave %0" : : "m"(FxSaveArea->U.FnArea)); - FpuInitialized = TRUE; + asm volatile("fnsave %0" : : "m"(FxSaveArea->U.FnArea)); + FpuInitialized = TRUE; } - NpxThread->NpxState = NPX_STATE_VALID; + NpxThread->NpxState = NPX_STATE_VALID; } #endif /* !CONFIG_SMP */ - /* restore the state of the current thread */ - ASSERT((CurrentThread->NpxState & NPX_STATE_DIRTY) == 0); - FxSaveArea = (PFX_SAVE_AREA)((char *)CurrentThread->InitialStack - sizeof (FX_SAVE_AREA)); - if (CurrentThread->NpxState & NPX_STATE_VALID) + /* restore the state of the current thread */ + ASSERT((CurrentThread->NpxState & NPX_STATE_DIRTY) == 0); + FxSaveArea = (PFX_SAVE_AREA)((char *)CurrentThread->InitialStack - sizeof (FX_SAVE_AREA)); + if (CurrentThread->NpxState & NPX_STATE_VALID) { - if (FxsrSupport) + if (FxsrSupport) { FxSaveArea->U.FxArea.MXCsr &= MxcsrFeatureMask; asm volatile("fxrstor %0" : : "m"(FxSaveArea->U.FxArea)); } - else + else { asm volatile("frstor %0" : : "m"(FxSaveArea->U.FnArea)); } } - else /* NpxState & NPX_STATE_INVALID */ + else /* NpxState & NPX_STATE_INVALID */ { - DPRINT("Setting up clean FPU state\n"); - if (FxsrSupport) + DPRINT("Setting up clean FPU state\n"); + if (FxsrSupport) { - memset(&FxSaveArea->U.FxArea, 0, sizeof(FxSaveArea->U.FxArea)); - FxSaveArea->U.FxArea.ControlWord = 0x037f; - if (XmmSupport) + memset(&FxSaveArea->U.FxArea, 0, sizeof(FxSaveArea->U.FxArea)); + FxSaveArea->U.FxArea.ControlWord = 0x037f; + if (XmmSupport) { - FxSaveArea->U.FxArea.MXCsr = 0x00001f80 & MxcsrFeatureMask; + FxSaveArea->U.FxArea.MXCsr = 0x00001f80 & MxcsrFeatureMask; } - asm volatile("fxrstor %0" : : "m"(FxSaveArea->U.FxArea)); + asm volatile("fxrstor %0" : : "m"(FxSaveArea->U.FxArea)); } - else if (!FpuInitialized) + else if (!FpuInitialized) { - asm volatile("finit"); + asm volatile("finit"); } } - KeGetCurrentPrcb()->NpxThread = CurrentThread; + KeGetCurrentPrcb()->NpxThread = CurrentThread; #ifndef CONFIG_SMP } #endif - CurrentThread->NpxState |= NPX_STATE_DIRTY; - KeLowerIrql(oldIrql); - DPRINT("Device not present exception handled!\n"); + CurrentThread->NpxState |= NPX_STATE_DIRTY; + KeLowerIrql(oldIrql); + DPRINT("Device not present exception handled!\n"); - return STATUS_SUCCESS; + return STATUS_SUCCESS; } - else /* ExceptionNr == 16 || ExceptionNr == 19 */ + else /* ExceptionNr == 16 || ExceptionNr == 19 */ { - EXCEPTION_RECORD Er; - UCHAR DummyContext[sizeof(CONTEXT) + 16]; - PCONTEXT Context; - KPROCESSOR_MODE PreviousMode; - PKTHREAD CurrentThread, NpxThread; - KIRQL oldIrql; + EXCEPTION_RECORD Er; + UCHAR DummyContext[sizeof(CONTEXT) + 16]; + PCONTEXT Context; + KPROCESSOR_MODE PreviousMode; + PKTHREAD CurrentThread, NpxThread; + KIRQL oldIrql; - ASSERT(ExceptionNr == 16 || ExceptionNr == 19); /* math fault or XMM fault*/ + ASSERT(ExceptionNr == 16 || ExceptionNr == 19); /* math fault or XMM fault*/ - KeRaiseIrql(DISPATCH_LEVEL, &oldIrql); + KeRaiseIrql(DISPATCH_LEVEL, &oldIrql); - NpxThread = KeGetCurrentPrcb()->NpxThread; - CurrentThread = KeGetCurrentThread(); - if (NpxThread == NULL) + NpxThread = KeGetCurrentPrcb()->NpxThread; + CurrentThread = KeGetCurrentThread(); + if (NpxThread == NULL) { - KeLowerIrql(oldIrql); - DPRINT1("!!! Math/Xmm fault ignored! (NpxThread == NULL)\n"); - return STATUS_SUCCESS; + KeLowerIrql(oldIrql); + DPRINT1("!!! Math/Xmm fault ignored! (NpxThread == NULL)\n"); + return STATUS_SUCCESS; } - PreviousMode = ((Tf->Cs & 0xffff) == USER_CS) ? (UserMode) : (KernelMode); - DPRINT("Math/Xmm fault happened! (PreviousMode = %s)\n", - (PreviousMode != KernelMode) ? ("UserMode") : ("KernelMode")); + PreviousMode = ((Tf->Cs & 0xffff) == USER_CS) ? (UserMode) : (KernelMode); + DPRINT("Math/Xmm fault happened! (PreviousMode = %s)\n", + (PreviousMode != KernelMode) ? ("UserMode") : ("KernelMode")); - ASSERT(NpxThread == CurrentThread); /* FIXME: Is not always true I think */ + ASSERT(NpxThread == CurrentThread); /* FIXME: Is not always true I think */ - /* For fxsave we have to align Context->ExtendedRegisters on 16 bytes */ - Context = (PCONTEXT)DummyContext; - Context = (PCONTEXT)((ULONG_PTR)Context + 0x10 - ((ULONG_PTR)Context->ExtendedRegisters & 0x0f)); + /* For fxsave we have to align Context->ExtendedRegisters on 16 bytes */ + Context = (PCONTEXT)DummyContext; + Context = (PCONTEXT)((ULONG_PTR)Context + 0x10 - ((ULONG_PTR)Context->ExtendedRegisters & 0x0f)); - /* Get FPU/XMM state */ - Context->FloatSave.Cr0NpxState = 0; - if (FxsrSupport) + /* Get FPU/XMM state */ + Context->FloatSave.Cr0NpxState = 0; + if (FxsrSupport) { - PFXSAVE_FORMAT FxSave = (PFXSAVE_FORMAT)Context->ExtendedRegisters; - FxSave->MXCsrMask = MxcsrFeatureMask; - memset(FxSave->RegisterArea, 0, sizeof(FxSave->RegisterArea) + - sizeof(FxSave->Reserved3) + sizeof(FxSave->Reserved4)); - asm volatile("fxsave %0" : : "m"(*FxSave)); - KeLowerIrql(oldIrql); - KiFxsaveToFnsaveFormat((PFNSAVE_FORMAT)&Context->FloatSave, FxSave); + PFXSAVE_FORMAT FxSave = (PFXSAVE_FORMAT)Context->ExtendedRegisters; + FxSave->MXCsrMask = MxcsrFeatureMask; + memset(FxSave->RegisterArea, 0, sizeof(FxSave->RegisterArea) + + sizeof(FxSave->Reserved3) + sizeof(FxSave->Reserved4)); + asm volatile("fxsave %0" : : "m"(*FxSave)); + KeLowerIrql(oldIrql); + KiFxsaveToFnsaveFormat((PFNSAVE_FORMAT)&Context->FloatSave, FxSave); } - else + else { - PFNSAVE_FORMAT FnSave = (PFNSAVE_FORMAT)&Context->FloatSave; - asm volatile("fnsave %0" : : "m"(*FnSave)); - KeLowerIrql(oldIrql); - KiFnsaveToFxsaveFormat((PFXSAVE_FORMAT)Context->ExtendedRegisters, FnSave); + PFNSAVE_FORMAT FnSave = (PFNSAVE_FORMAT)&Context->FloatSave; + asm volatile("fnsave %0" : : "m"(*FnSave)); + KeLowerIrql(oldIrql); + KiFnsaveToFxsaveFormat((PFXSAVE_FORMAT)Context->ExtendedRegisters, FnSave); } - /* Fill the rest of the context */ - Context->ContextFlags = CONTEXT_FULL; - KeTrapFrameToContext(Tf, NULL, Context); - Context->ContextFlags |= CONTEXT_FLOATING_POINT | CONTEXT_EXTENDED_REGISTERS; + /* Fill the rest of the context */ + Context->ContextFlags = CONTEXT_FULL; + KeTrapFrameToContext(Tf, NULL, Context); + Context->ContextFlags |= CONTEXT_FLOATING_POINT | CONTEXT_EXTENDED_REGISTERS; - /* Determine exception code */ - if (ExceptionNr == 16) + /* Determine exception code */ + if (ExceptionNr == 16) { - USHORT FpuStatusWord = Context->FloatSave.StatusWord & 0xffff; - DPRINT("FpuStatusWord = 0x%04x\n", FpuStatusWord); + USHORT FpuStatusWord = Context->FloatSave.StatusWord & 0xffff; + DPRINT("FpuStatusWord = 0x%04x\n", FpuStatusWord); - if (FpuStatusWord & X87_SW_IE) - Er.ExceptionCode = STATUS_FLOAT_INVALID_OPERATION; - else if (FpuStatusWord & X87_SW_DE) - Er.ExceptionCode = STATUS_FLOAT_DENORMAL_OPERAND; - else if (FpuStatusWord & X87_SW_ZE) - Er.ExceptionCode = STATUS_FLOAT_DIVIDE_BY_ZERO; - else if (FpuStatusWord & X87_SW_OE) - Er.ExceptionCode = STATUS_FLOAT_OVERFLOW; - else if (FpuStatusWord & X87_SW_UE) - Er.ExceptionCode = STATUS_FLOAT_UNDERFLOW; - else if (FpuStatusWord & X87_SW_PE) - Er.ExceptionCode = STATUS_FLOAT_INEXACT_RESULT; - else if (FpuStatusWord & X87_SW_SE) - Er.ExceptionCode = STATUS_FLOAT_STACK_CHECK; - else - ASSERT(0); /* not reached */ - /* FIXME: is this the right way to get the correct EIP of the faulting instruction? */ - Er.ExceptionAddress = (PVOID)Context->FloatSave.ErrorOffset; + if (FpuStatusWord & X87_SW_IE) + Er.ExceptionCode = STATUS_FLOAT_INVALID_OPERATION; + else if (FpuStatusWord & X87_SW_DE) + Er.ExceptionCode = STATUS_FLOAT_DENORMAL_OPERAND; + else if (FpuStatusWord & X87_SW_ZE) + Er.ExceptionCode = STATUS_FLOAT_DIVIDE_BY_ZERO; + else if (FpuStatusWord & X87_SW_OE) + Er.ExceptionCode = STATUS_FLOAT_OVERFLOW; + else if (FpuStatusWord & X87_SW_UE) + Er.ExceptionCode = STATUS_FLOAT_UNDERFLOW; + else if (FpuStatusWord & X87_SW_PE) + Er.ExceptionCode = STATUS_FLOAT_INEXACT_RESULT; + else if (FpuStatusWord & X87_SW_SE) + Er.ExceptionCode = STATUS_FLOAT_STACK_CHECK; + else + ASSERT(0); /* not reached */ + /* FIXME: is this the right way to get the correct EIP of the faulting instruction? */ + Er.ExceptionAddress = (PVOID)Context->FloatSave.ErrorOffset; } - else /* ExceptionNr == 19 */ + else /* ExceptionNr == 19 */ { - /* FIXME: When should we use STATUS_FLOAT_MULTIPLE_FAULTS? */ - Er.ExceptionCode = STATUS_FLOAT_MULTIPLE_TRAPS; - Er.ExceptionAddress = (PVOID)Tf->Eip; + /* FIXME: When should we use STATUS_FLOAT_MULTIPLE_FAULTS? */ + Er.ExceptionCode = STATUS_FLOAT_MULTIPLE_TRAPS; + Er.ExceptionAddress = (PVOID)Tf->Eip; } - Er.ExceptionFlags = 0; - Er.ExceptionRecord = NULL; - Er.NumberParameters = 0; + Er.ExceptionFlags = 0; + Er.ExceptionRecord = NULL; + Er.NumberParameters = 0; - /* Dispatch exception */ - DPRINT("Dispatching exception (ExceptionCode = 0x%08x)\n", Er.ExceptionCode); - KiDispatchException(&Er, NULL, Tf, PreviousMode, TRUE); + /* Dispatch exception */ + DPRINT("Dispatching exception (ExceptionCode = 0x%08x)\n", Er.ExceptionCode); + KiDispatchException(&Er, NULL, Tf, PreviousMode, TRUE); - DPRINT("Math-fault handled!\n"); - return STATUS_SUCCESS; + DPRINT("Math-fault handled!\n"); + return STATUS_SUCCESS; } - return STATUS_UNSUCCESSFUL; + return STATUS_UNSUCCESSFUL; } -

19 years

[mf] 18285: strip extended options from the front of the command line

by mf＠svn.reactos.com

strip extended options from the front of the command line Modified: trunk/reactos/subsys/system/explorer/explorer.cpp _____ Modified: trunk/reactos/subsys/system/explorer/explorer.cpp --- trunk/reactos/subsys/system/explorer/explorer.cpp 2005-10-05 23:05:13 UTC (rev 18284) +++ trunk/reactos/subsys/system/explorer/explorer.cpp 2005-10-05 23:24:25 UTC (rev 18285) @@ -856,8 +856,19 @@ BOOL startup_desktop; + // strip extended options from the front of the command line + String ext_options; + + while(*lpCmdLine == '-') { + while(*lpCmdLine && !_istspace((unsigned)*lpCmdLine)) + ext_options += *lpCmdLine++; + + while(_istspace((unsigned)*lpCmdLine)) + ++lpCmdLine; + } + // command line option "-install" to replace previous shell application with ROS Explorer - if (_tcsstr(lpCmdLine,TEXT("-install"))) { + if (_tcsstr(ext_options,TEXT("-install"))) { // install ROS Explorer into the registry TCHAR path[MAX_PATH]; @@ -921,24 +932,24 @@ #endif // If there is given the command line option "-desktop", create desktop window anyways - if (_tcsstr(lpCmdLine,TEXT("-desktop"))) + if (_tcsstr(ext_options,TEXT("-desktop"))) startup_desktop = TRUE; #ifndef ROSSHELL - else if (_tcsstr(lpCmdLine,TEXT("-nodesktop"))) + else if (_tcsstr(ext_options,TEXT("-nodesktop"))) startup_desktop = FALSE; // Don't display cabinet window in desktop mode - if (startup_desktop && !_tcsstr(lpCmdLine,TEXT("-explorer"))) + if (startup_desktop && !_tcsstr(ext_options,TEXT("-explorer"))) nShowCmd = SW_HIDE; #endif - if (_tcsstr(lpCmdLine,TEXT("-noautostart"))) + if (_tcsstr(ext_options,TEXT("-noautostart"))) autostart = false; - else if (_tcsstr(lpCmdLine,TEXT("-autostart"))) + else if (_tcsstr(ext_options,TEXT("-autostart"))) autostart = true; #ifndef __WINE__ - if (_tcsstr(lpCmdLine,TEXT("-console"))) { + if (_tcsstr(ext_options,TEXT("-console"))) { AllocConsole(); _dup2(_open_osfhandle((long)GetStdHandle(STD_INPUT_HANDLE), _O_RDONLY), 0); @@ -974,10 +985,10 @@ bool use_gdb_stub = false; // !IsDebuggerPresent(); - if (_tcsstr(lpCmdLine,TEXT("-debug"))) + if (_tcsstr(ext_options,TEXT("-debug"))) use_gdb_stub = true; - if (_tcsstr(lpCmdLine,TEXT("-break"))) { + if (_tcsstr(ext_options,TEXT("-break"))) { LOG(TEXT("debugger breakpoint")); #ifdef _MSC_VER __asm int 3

19 years

[mf] 18284: implemented command line parser for Explorer

by mf＠svn.reactos.com

implemented command line parser for Explorer Modified: trunk/reactos/subsys/system/explorer/doc/TODO.txt Modified: trunk/reactos/subsys/system/explorer/explorer.cpp Modified: trunk/reactos/subsys/system/explorer/explorer.h Modified: trunk/reactos/subsys/system/explorer/shell/filechild.cpp Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.h Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp _____ Modified: trunk/reactos/subsys/system/explorer/doc/TODO.txt --- trunk/reactos/subsys/system/explorer/doc/TODO.txt 2005-10-05 20:36:23 UTC (rev 18283) +++ trunk/reactos/subsys/system/explorer/doc/TODO.txt 2005-10-05 23:05:13 UTC (rev 18284) @@ -7,7 +7,6 @@ - implement Drag Drop from the tree view. - activate accelerator keys like <DEL> in shell view folders - program manager "progman" DDE server -- command line parameters like "/e,/root,c:\" and "::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\::{21EC2020-3AEA-1069-A2DD-080 02B30309D}" (launch of control panel) - Windows-key combos - Application Desktop Toolbars - hide CVS subdirectories, may be even implement a CVS managment plugin _____ Modified: trunk/reactos/subsys/system/explorer/explorer.cpp --- trunk/reactos/subsys/system/explorer/explorer.cpp 2005-10-05 20:36:23 UTC (rev 18283) +++ trunk/reactos/subsys/system/explorer/explorer.cpp 2005-10-05 23:05:13 UTC (rev 18284) @@ -533,8 +533,10 @@ #ifndef ROSSHELL -void explorer_show_frame(int cmdshow, LPTSTR lpCmdLine) +void explorer_show_frame(int cmdShow, LPTSTR lpCmdLine) { + ExplorerCmd cmd; + if (g_Globals._hMainWnd) { if (IsIconic(g_Globals._hMainWnd)) ShowWindow(g_Globals._hMainWnd, SW_RESTORE); @@ -553,21 +555,121 @@ if (mdiStr.empty()) Dialog::DoModal(IDD_MDI_SDI, WINDOW_CREATOR(MdiSdiDlg), g_Globals._hwndDesktop); - // Now read the setting again and interpret it as boolean value. - bool mdi = XMLBool(explorer_options, "mdi", true); + // Now read the MDI attribute again and interpret it as boolean value. + cmd._mdi = XMLBool(explorer_options, "mdi", true); + cmd._cmdShow = cmdShow; + + // parse command line options, which may overwrite the MDI flag + cmd.ParseCmdLine(lpCmdLine); + // create main window - MainFrameBase::Create(lpCmdLine, mdi, cmdshow); + MainFrameBase::Create(cmd); } +bool ExplorerCmd::ParseCmdLine(LPCTSTR lpCmdLine) +{ + bool ok = true; + + LPCTSTR b = lpCmdLine; + LPCTSTR p = b; + + while(*b) { + // remove leading space + while(_istspace((unsigned)*b)) + ++b; + + p = b; + + bool quote = false; + + // options are separated by ',' + for(; *p; ++p) { + if (*p == '"') // Quote characters may appear at any position in the command line. + quote = !quote; + else if (*p==',' && !quote) + break; + } + + if (p > b) { + int l = p - b; + + // remove trailing space + while(l>0 && _istspace((unsigned)b[l-1])) + --l; + + if (!EvaluateOption(String(b, l))) + ok = false; + + if (*p) + ++p; + + b = p; + } + } + + return ok; +} + +bool ExplorerCmd::EvaluateOption(LPCTSTR option) +{ + String opt_str; + + // Remove quote characters, as they are evaluated at this point. + for(; *option; ++option) + if (*option != '"') + opt_str += *option; + + option = opt_str; + + if (option[0] == '/') { + ++option; + + // option /e for windows in explorer mode + if (!_tcsicmp(option, TEXT("e"))) + _flags |= OWM_EXPLORE; + // option /root for rooted explorer windows + else if (!_tcsicmp(option, TEXT("root"))) + _flags |= OWM_ROOTED; + // non-standard options: /mdi, /sdi + else if (!_tcsicmp(option, TEXT("mdi"))) + _mdi = true; + else if (!_tcsicmp(option, TEXT("sdi"))) + _mdi = false; + else + return false; + } else { + if (!_path.empty()) + return false; + + _path = opt_str; + } + + return true; +} + +bool ExplorerCmd::IsValidPath() const +{ + if (!_path.empty()) { + DWORD attribs = GetFileAttributes(_path); + + if (attribs!=INVALID_FILE_ATTRIBUTES && (attribs&FILE_ATTRIBUTE_DIRECTORY)) + return true; // file system path + else if (*_path==':' && _path.at(1)==':') + return true; // text encoded IDL + } + + return false; +} + #else -void explorer_show_frame(int cmdshow, LPTSTR lpCmdLine) +void explorer_show_frame(int cmdShow, LPTSTR lpCmdLine) { if (!lpCmdLine) lpCmdLine = TEXT("explorer.exe"); - launch_file(GetDesktopWindow(), lpCmdLine, cmdshow); + launch_file(GetDesktopWindow(), lpCmdLine, cmdShow); } #endif @@ -671,7 +773,7 @@ } -int explorer_main(HINSTANCE hInstance, LPTSTR lpCmdLine, int cmdshow) +int explorer_main(HINSTANCE hInstance, LPTSTR lpCmdLine, int cmdShow) { CONTEXT("explorer_main"); @@ -686,14 +788,14 @@ } #ifndef ROSSHELL - if (cmdshow != SW_HIDE) { + if (cmdShow != SW_HIDE) { /* // don't maximize if being called from the ROS desktop - if (cmdshow == SW_SHOWNORMAL) + if (cmdShow == SW_SHOWNORMAL) ///@todo read window placement from registry - cmdshow = SW_MAXIMIZE; + cmdShow = SW_MAXIMIZE; */ - explorer_show_frame(cmdshow, lpCmdLine); + explorer_show_frame(cmdShow, lpCmdLine); } #endif @@ -721,10 +823,10 @@ LPWSTR cmdline = GetCommandLineW(); - while(*cmdline && !_istspace(*cmdline)) + while(*cmdline && !_istspace((unsigned)*cmdline)) ++cmdline; - while(_istspace(*cmdline)) + while(_istspace((unsigned)*cmdline)) ++cmdline; return wWinMain(GetModuleHandle(NULL), 0, cmdline, nShowCmd); @@ -929,17 +1031,12 @@ #ifndef ROSSHELL if (g_Globals._hwndDesktop) g_Globals._desktop_mode = true; - - /**TODO fix command line handling */ - if (*lpCmdLine=='"' && lpCmdLine[_tcslen(lpCmdLine)-1]=='"') { - ++lpCmdLine; - lpCmdLine[_tcslen(lpCmdLine)-1] = '\0'; - } #endif int ret = explorer_main(hInstance, lpCmdLine, nShowCmd); + // write configuration file g_Globals.write_persistent(); _____ Modified: trunk/reactos/subsys/system/explorer/explorer.h --- trunk/reactos/subsys/system/explorer/explorer.h 2005-10-05 20:36:23 UTC (rev 18283) +++ trunk/reactos/subsys/system/explorer/explorer.h 2005-10-05 23:05:13 UTC (rev 18284) @@ -72,6 +72,42 @@ #include "shell/filechild.h" #include "shell/shellbrowser.h" + #ifndef ROSSHELL + + /// Explorer command line parser + // for commands like "/e,/root,c:\" + // or "::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\::{21EC2020-3AEA-1069-A2DD-080 02B30309D}" (launch of control panel) +struct ExplorerCmd +{ + ExplorerCmd() + : _flags(0), + _cmdShow(SW_SHOWNORMAL), + _mdi(false), + _valid_path(false) + { + } + + ExplorerCmd(LPCTSTR url, bool mdi) + : _path(url), + _flags(0), + _cmdShow(SW_SHOWNORMAL), + _mdi(mdi), + _valid_path(true) //@@ + { + } + + bool ParseCmdLine(LPCTSTR lpCmdLine); + bool EvaluateOption(LPCTSTR option); + bool IsValidPath() const; + + String _path; + int _flags; // OPEN_WINDOW_MODE + int _cmdShow; + bool _mdi; + bool _valid_path; +}; + #include "shell/mainframe.h" + #endif _____ Modified: trunk/reactos/subsys/system/explorer/shell/filechild.cpp --- trunk/reactos/subsys/system/explorer/shell/filechild.cpp 2005-10-05 20:36:23 UTC (rev 18283) +++ trunk/reactos/subsys/system/explorer/shell/filechild.cpp 2005-10-05 23:05:13 UTC (rev 18284) @@ -228,6 +228,8 @@ _root._entry->_data.dwFileAttributes = FILE_ATTRIBUTE_DIRECTORY; + ///@todo use OWM_ROOTED flag + if (info._open_mode & OWM_EXPLORE) ///@todo Is not-explore-mode for FileChildWindow completely implemented? _left_hwnd = *(_left=new Pane(_hwnd, IDW_TREE_LEFT, IDW_HEADER_LEFT, _root._entry, true, COL_CONTENT)); _____ Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp --- trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-10-05 20:36:23 UTC (rev 18283) +++ trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-10-05 23:05:13 UTC (rev 18284) @@ -38,12 +38,12 @@ #include "../dialogs/settings.h" // for MdiSdiDlg -HWND MainFrameBase::Create(LPCTSTR path, bool mdi, UINT cmdshow) +HWND MainFrameBase::Create(const ExplorerCmd& cmd) { HWND hFrame; -#ifndef _NO_MDI ///@todo implement command line option to switch between MDI and SDI - if (mdi) +#ifndef _NO_MDI + if (cmd._mdi) hFrame = MDIMainFrame::Create(); else #endif @@ -54,32 +54,20 @@ g_Globals._hMainWnd = hFrame; - if (path) { - static String sPath = path; // copy path to avoid accessing freed memory - path = sPath; - } - if (hwndOld) DestroyWindow(hwndOld); - ShowWindow(hFrame, cmdshow); + ShowWindow(hFrame, cmd._cmdShow); UpdateWindow(hFrame); - bool valid_dir = false; - - if (path) { - DWORD attribs = GetFileAttributes(path); - - if (attribs!=INVALID_FILE_ATTRIBUTES && (attribs&FILE_ATTRIBUTE_DIRECTORY)) - valid_dir = true; - else if (*path==':' || *path=='"') - valid_dir = true; - } - // Open the first child window after initializing the application - if (valid_dir) - PostMessage(hFrame, PM_OPEN_WINDOW, 0, (LPARAM)path); - else + if (cmd.IsValidPath()) { + // We use the static s_path variable to store the path string in order + // to avoid accessing prematurely freed memory in the PostMessage handlers. + static String s_path = cmd._path; + + PostMessage(hFrame, PM_OPEN_WINDOW, cmd._flags, (LPARAM)(LPCTSTR)s_path); + } else PostMessage(hFrame, PM_OPEN_WINDOW, OWM_EXPLORE|OWM_DETAILS, 0); } @@ -989,7 +977,7 @@ create_info._pos.rcNormalPosition.right = CW_USEDEFAULT; create_info._pos.rcNormalPosition.bottom = CW_USEDEFAULT; - create_info._open_mode = (OPEN_WINDOW_MODE)wparam; + create_info._open_mode = wparam; // FileChildWindow::create(_hmdiclient, create_info); return (LRESULT)MDIShellBrowserChild::create(create_info); @@ -1149,7 +1137,7 @@ break; case ID_VIEW_SDI: - MainFrameBase::Create(NULL, false); + MainFrameBase::Create(ExplorerCmd()); break; case IDW_COMMANDBAR: @@ -1516,7 +1504,7 @@ root_path = path; } - jump_to(root_path, (OPEN_WINDOW_MODE)wparam); //@todo content of 'path' not used any more + jump_to(root_path, wparam); //@todo content of 'path' not used any more return TRUE;} // success default: def: @@ -1530,7 +1518,7 @@ { switch(id) { case ID_VIEW_MDI: - MainFrameBase::Create(_url, true); + MainFrameBase::Create(ExplorerCmd(_url, true)); break; case IDW_COMMANDBAR: @@ -1632,6 +1620,8 @@ delete _shellBrowser.release(); } + ///@todo use OWM_ROOTED flag + // create explorer treeview if (_shellpath_info._open_mode & OWM_EXPLORE) { if (!_left_hwnd) { _____ Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.h --- trunk/reactos/subsys/system/explorer/shell/mainframe.h 2005-10-05 20:36:23 UTC (rev 18283) +++ trunk/reactos/subsys/system/explorer/shell/mainframe.h 2005-10-05 23:05:13 UTC (rev 18284) @@ -27,9 +27,16 @@ #define PM_OPEN_WINDOW (WM_APP+0x07) -enum OPEN_WINDOW_MODE {OWM_EXPLORE=1, OWM_DETAILS=2, OWM_PIDL=4, OWM_SEPARATE=8}; +enum OPEN_WINDOW_MODE { + OWM_EXPLORE=1, /// window in explore mode + OWM_ROOTED=2, /// "rooted" window with special shell namespace root + OWM_DETAILS=4, /// view files in detail mode + OWM_PIDL=8, /// path is given as PIDL, otherwise as LPCTSTR + OWM_SEPARATE=16 /// open separate subfolder windows +}; + /// Explorer frame window base class struct MainFrameBase : public PreTranslateWindow { @@ -38,7 +45,7 @@ MainFrameBase(HWND hwnd); ~MainFrameBase(); - static HWND Create(LPCTSTR path, bool mdi=true, UINT cmdshow=SW_SHOWNORMAL); + static HWND Create(const ExplorerCmd& cmd); static int OpenShellFolders(LPIDA pida, HWND hFrameWnd); WindowHandle _hwndrebar; _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp --- trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2005-10-05 20:36:23 UTC (rev 18283) +++ trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2005-10-05 23:05:13 UTC (rev 18284) @@ -112,17 +112,17 @@ if (!_cur_dir) _cur_dir = static_cast<ShellDirectory*>(_root._entry); -/*@todo - we should call read_tree() here to iterate through the hierarchy and open all folders from shell_info._root_shell_path to shell_info._shell_path - _root._entry->read_tree(shell_info._root_shell_path.get_folder(), info._shell_path, SORT_NAME); - -> see FileChildWindow::FileChildWindow() -*/ + //LOG(FmtString(TEXT("ShellBrowser::jump_to(): pidl=%s"), (LPCTSTR)FileSysShellPath(pidl))); - LOG(FmtString(TEXT("ShellBrowser::jump_to(): pidl=%s"), (LPCTSTR)FileSysShellPath(pidl))); - if (_cur_dir) { static DynamicFct<LPITEMIDLIST(WINAPI*)(LPCITEMIDLIST, LPCITEMIDLIST)> ILFindChild(TEXT("SHELL32"), 24); +/*@todo + we should call read_tree() here to iterate through the hierarchy and open all folders from _create_info._root_shell_path (_cur_dir) to _create_info._shell_path (pidl) + _root._entry->read_tree(_create_info._root_shell_path.get_folder(), info._shell_path, SORT_NAME); + -> see FileChildWindow::FileChildWindow()_create_info._shell_path +*/ + LPCITEMIDLIST child_pidl; if (ILFindChild) @@ -582,7 +582,7 @@ break; case ID_VIEW_SDI: - MainFrameBase::Create(_url, false); + MainFrameBase::Create(ExplorerCmd(_url, false)); break; default: @@ -606,6 +606,8 @@ delete _shellBrowser.release(); } + ///@todo use OWM_ROOTED flag + // create explorer treeview if (_create_info._open_mode & OWM_EXPLORE) { if (!_left_hwnd) {

19 years

[ea] 18283: XML chunks must contain a single subtree.

by ea＠svn.reactos.com

XML chunks must contain a single subtree. Modified: trunk/reactos/subsys/system/directory.xml _____ Modified: trunk/reactos/subsys/system/directory.xml --- trunk/reactos/subsys/system/directory.xml 2005-10-05 19:52:39 UTC (rev 18282) +++ trunk/reactos/subsys/system/directory.xml 2005-10-05 20:36:23 UTC (rev 18283) @@ -1,3 +1,4 @@ +<group> <directory name="autochk"> <xi:include href="autochk/autochk.xml" /> </directory> @@ -85,3 +86,4 @@ <directory name="welcome"> <xi:include href="welcome/welcome.xml" /> </directory> +</group>

19 years

[mf] 18282: comment, const corrections

by mf＠svn.reactos.com

comment, const corrections Modified: trunk/reactos/subsys/system/explorer/shell/filechild.cpp _____ Modified: trunk/reactos/subsys/system/explorer/shell/filechild.cpp --- trunk/reactos/subsys/system/explorer/shell/filechild.cpp 2005-10-05 19:51:08 UTC (rev 18281) +++ trunk/reactos/subsys/system/explorer/shell/filechild.cpp 2005-10-05 19:52:39 UTC (rev 18282) @@ -134,7 +134,7 @@ _right = NULL; switch(info._etype) { - case ET_SHELL: { //@@ separate into FileChildWindow in ShellChildWindow, WinChildWindow, UnixChildWindow ? + case ET_SHELL: { //@@ separate FileChildWindow into ShellChildWindow, WinChildWindow, UnixChildWindow ? _root._drive_type = DRIVE_UNKNOWN; _root._sort_order = SORT_NAME; @@ -199,7 +199,7 @@ lstrcpy(_root._volname, TEXT("FAT XXX")); //@@ lstrcpy(_root._fs, TEXT("FAT")); lstrcpy(_root._path, drv); - FATDrive* drive = new FATDrive(TEXT("c:/reactos-bochs/cdrv.img")); //TEXT("\\\\.\\F:")); //@@ + FATDrive* drive = new FATDrive(TEXT("c:/reactos-emu/c.img")); //TEXT("\\\\.\\F:")); //@@ if (drive->_hDrive != INVALID_HANDLE_VALUE) { _root._entry = drive; @@ -497,7 +497,7 @@ case WM_CONTEXTMENU: { // first select the current item in the listbox HWND hpanel = (HWND) wparam; - POINTS& pos = MAKEPOINTS(lparam); + const POINTS& pos = MAKEPOINTS(lparam); POINT pt; POINTSTOPOINT(pt, pos); POINT pt_screen = pt; ScreenToClient(hpanel, &pt);

19 years

[mf] 18281: leave TrackStartmenu() function when executing any start menu command

by mf＠svn.reactos.com

leave TrackStartmenu() function when executing any start menu command Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp --- trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-10-05 19:50:48 UTC (rev 18280) +++ trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-10-05 19:51:08 UTC (rev 18281) @@ -311,7 +311,7 @@ break; case WM_MOVE: { - POINTS& pos = MAKEPOINTS(lparam); + const POINTS& pos = MAKEPOINTS(lparam); // move open submenus of floating menus if (_submenu) { @@ -1623,13 +1623,13 @@ ShowWindow(hwnd, SW_SHOW); SetForegroundWindow(hwnd); - while(IsWindow(hwnd)) { + while(IsWindow(hwnd) && IsWindowVisible(hwnd)) { if (!GetMessage(&msg, 0, 0, 0)) { PostQuitMessage(msg.wParam); break; } - // Check for a mouse click on any window, which is not part of the start menu + // Check for a mouse click on any window, that is not part of the start menu if (msg.message==WM_LBUTTONDOWN || msg.message==WM_MBUTTONDOWN || msg.message==WM_RBUTTONDOWN) { StartMenu* menu_wnd = NULL;

19 years

[greatlrd] 18280: NtGdiDdCreateDirectDrawObject

by greatlrd＠svn.reactos.com

NtGdiDdCreateDirectDrawObject - add missing error checking for GDIOBJ_AllocObj - add missing error checking for GDIOBJ_LockObj Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c _____ Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c --- trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-10-05 19:49:37 UTC (rev 18279) +++ trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-10-05 19:50:48 UTC (rev 18280) @@ -50,9 +50,7 @@ DC_UnlockDc(pDC); return NULL; } - - BOOL success = pDC->DriverFunctions.EnableDirectDraw( pDC->PDev, &callbacks, &surface_callbacks, &palette_callbacks); @@ -64,7 +62,21 @@ } HANDLE hDirectDraw = GDIOBJ_AllocObj(GDI_OBJECT_TYPE_DIRECTDRAW); + if (!hDirectDraw) + { + /* No more memmory */ + DC_UnlockDc(pDC); + return NULL; + } + PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDraw, GDI_OBJECT_TYPE_DIRECTDRAW); + if (!pDirectDraw) + { + /* invalid handle */ + DC_UnlockDc(pDC); + return NULL; + } + pDirectDraw->Global.dhpdev = pDC->PDev; pDirectDraw->Local.lpGbl = &pDirectDraw->Global;

19 years

[mf] 18279: use GET_X_LPARAM macro in WM_MOUSEMOVE handlers

by mf＠svn.reactos.com

use GET_X_LPARAM macro in WM_MOUSEMOVE handlers Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp Modified: trunk/reactos/subsys/system/explorer/utility/window.cpp _____ Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp --- trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-10-05 19:48:29 UTC (rev 18278) +++ trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-10-05 19:49:37 UTC (rev 18279) @@ -1466,7 +1466,7 @@ case WM_MOUSEMOVE: if (GetCapture() == _hwnd) { - int x = LOWORD(lparam); + int x = GET_X_LPARAM(lparam); ClientRect rt(_hwnd); _____ Modified: trunk/reactos/subsys/system/explorer/utility/window.cpp --- trunk/reactos/subsys/system/explorer/utility/window.cpp 2005-10-05 19:48:29 UTC (rev 18278) +++ trunk/reactos/subsys/system/explorer/utility/window.cpp 2005-10-05 19:49:37 UTC (rev 18279) @@ -472,7 +472,7 @@ case WM_MOUSEMOVE: if (GetCapture() == _hwnd) { - int x = LOWORD(lparam); + int x = GET_X_LPARAM(lparam); ClientRect rt(_hwnd);

19 years

← Newer
1
...
61
62
63
64
65
66
67
...
74
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2005