Ros-diffs September 2013

ros-diffs@reactos.org

16 participants
554 discussions

[aandrejevic] 60396: [SOFT386] Fix the BOP opcode. It's LES AX, SP not LES AX, BP.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat Sep 28 00:46:04 2013 New Revision: 60396 URL: http://svn.reactos.org/svn/reactos?rev=60396&view=rev Log: [SOFT386] Fix the BOP opcode. It's LES AX, SP not LES AX, BP. Modified: branches/ntvdm/lib/soft386/opcodes.c Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Sat Sep 28 00:46:04 2013 @@ -4503,7 +4503,7 @@ /* Check if this is a BOP and the host supports BOPs */ if ((Opcode == 0xC4) && (ModRegRm.Register == SOFT386_REG_EAX) - && (ModRegRm.SecondRegister == SOFT386_REG_EBP) + && (ModRegRm.SecondRegister == SOFT386_REG_ESP) && (State->BopCallback != NULL)) { USHORT BopCode;

11 years, 2 months

[aandrejevic] 60395: [SOFT386] Implement the LES and LDS instructions. Add optional support for BOPs (NTVDM-specific). Fix prefix handling in some functions. [NTVDM] Enable BOPs for Soft386 (when N...

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat Sep 28 00:29:16 2013 New Revision: 60395 URL: http://svn.reactos.org/svn/reactos?rev=60395&view=rev Log: [SOFT386] Implement the LES and LDS instructions. Add optional support for BOPs (NTVDM-specific). Fix prefix handling in some functions. [NTVDM] Enable BOPs for Soft386 (when NEW_EMULATOR is defined). Fix the calling convention issue (softx86 uses cdecl, soft386 uses stdcall). Modified: branches/ntvdm/include/reactos/libs/soft386/soft386.h branches/ntvdm/lib/soft386/opcodes.c branches/ntvdm/lib/soft386/opcodes.h branches/ntvdm/lib/soft386/soft386.c branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/emulator.h Modified: branches/ntvdm/include/reactos/libs/soft386/soft386.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/soft… ============================================================================== --- branches/ntvdm/include/reactos/libs/soft386/soft386.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/libs/soft386/soft386.h [iso-8859-1] Sat Sep 28 00:29:16 2013 @@ -155,6 +155,14 @@ (NTAPI *SOFT386_IDLE_PROC) ( PSOFT386_STATE State +); + +typedef +VOID +(NTAPI *SOFT386_BOP_PROC) +( + PSOFT386_STATE State, + USHORT BopCode ); typedef union _SOFT386_REG @@ -295,6 +303,7 @@ SOFT386_IO_READ_PROC IoReadCallback; SOFT386_IO_WRITE_PROC IoWriteCallback; SOFT386_IDLE_PROC IdleCallback; + SOFT386_BOP_PROC BopCallback; SOFT386_REG GeneralRegs[SOFT386_NUM_GEN_REGS]; SOFT386_SEG_REG SegmentRegs[SOFT386_NUM_SEG_REGS]; SOFT386_REG InstPtr; Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Sat Sep 28 00:29:16 2013 @@ -221,8 +221,8 @@ NULL, // TODO: OPCODE 0xC1 NOT SUPPORTED Soft386OpcodeRet, Soft386OpcodeRet, - Soft386OpcodeLes, - Soft386OpcodeLds, + Soft386OpcodeLdsLes, + Soft386OpcodeLdsLes, NULL, // TODO: OPCODE 0xC6 NOT SUPPORTED NULL, // TODO: OPCODE 0xC7 NOT SUPPORTED Soft386OpcodeEnter, @@ -4474,20 +4474,99 @@ return TRUE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeLes) -{ - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; -} - -SOFT386_OPCODE_HANDLER(Soft386OpcodeLds) -{ - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; +SOFT386_OPCODE_HANDLER(Soft386OpcodeLdsLes) +{ + UCHAR FarPointer[6]; + BOOLEAN OperandSize, AddressSize; + SOFT386_MOD_REG_RM ModRegRm; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xFE) == 0xC4); + + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + + /* Get the operands */ + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + if (!ModRegRm.Memory) + { + /* Check if this is a BOP and the host supports BOPs */ + if ((Opcode == 0xC4) + && (ModRegRm.Register == SOFT386_REG_EAX) + && (ModRegRm.SecondRegister == SOFT386_REG_EBP) + && (State->BopCallback != NULL)) + { + USHORT BopCode; + + /* Fetch the BOP code */ + if (!Soft386FetchWord(State, &BopCode)) + { + /* Exception occurred */ + return FALSE; + } + + /* Call the BOP handler */ + State->BopCallback(State, BopCode); + + /* Return success */ + return TRUE; + } + + /* Invalid */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (!Soft386ReadMemory(State, + (State->PrefixFlags & SOFT386_PREFIX_SEG) + ? State->SegmentOverride : SOFT386_REG_DS, + ModRegRm.MemoryAddress, + FALSE, + FarPointer, + OperandSize ? 6 : 4)) + { + /* Exception occurred */ + return FALSE; + } + + if (OperandSize) + { + ULONG Offset = *((PULONG)FarPointer); + USHORT Segment = *((PUSHORT)&FarPointer[sizeof(ULONG)]); + + /* Set the register to the offset */ + State->GeneralRegs[ModRegRm.Register].Long = Offset; + + /* Load the segment */ + return Soft386LoadSegment(State, + (Opcode == 0xC4) + ? SOFT386_REG_ES : SOFT386_REG_DS, + Segment); + } + else + { + USHORT Offset = *((PUSHORT)FarPointer); + USHORT Segment = *((PUSHORT)&FarPointer[sizeof(USHORT)]); + + /* Set the register to the offset */ + State->GeneralRegs[ModRegRm.Register].LowWord = Offset; + + /* Load the segment */ + return Soft386LoadSegment(State, + (Opcode == 0xC4) + ? SOFT386_REG_ES : SOFT386_REG_DS, + Segment); + } } SOFT386_OPCODE_HANDLER(Soft386OpcodeEnter) @@ -4508,7 +4587,7 @@ return FALSE; } - if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) { /* The OPSIZE prefix toggles the size */ Size = !Size; @@ -4577,7 +4656,7 @@ return FALSE; } - if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) { /* The OPSIZE prefix toggles the size */ Size = !Size; @@ -4705,7 +4784,7 @@ return FALSE; } - if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) { /* The OPSIZE prefix toggles the size */ Size = !Size; @@ -5001,7 +5080,7 @@ return FALSE; } - if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) { /* The OPSIZE prefix toggles the size */ Size = !Size; Modified: branches/ntvdm/lib/soft386/opcodes.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.h?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] Sat Sep 28 00:29:16 2013 @@ -115,8 +115,7 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeSahf); SOFT386_OPCODE_HANDLER(Soft386OpcodeLahf); SOFT386_OPCODE_HANDLER(Soft386OpcodeRet); -SOFT386_OPCODE_HANDLER(Soft386OpcodeLes); -SOFT386_OPCODE_HANDLER(Soft386OpcodeLds); +SOFT386_OPCODE_HANDLER(Soft386OpcodeLdsLes); SOFT386_OPCODE_HANDLER(Soft386OpcodeEnter); SOFT386_OPCODE_HANDLER(Soft386OpcodeLeave); SOFT386_OPCODE_HANDLER(Soft386OpcodeRetFarImm); Modified: branches/ntvdm/lib/soft386/soft386.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/soft386.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/soft386.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/soft386.c [iso-8859-1] Sat Sep 28 00:29:16 2013 @@ -211,6 +211,7 @@ SOFT386_IO_READ_PROC IoReadCallback = State->IoReadCallback; SOFT386_IO_WRITE_PROC IoWriteCallback = State->IoWriteCallback; SOFT386_IDLE_PROC IdleCallback = State->IdleCallback; + SOFT386_BOP_PROC BopCallback = State->BopCallback; /* Clear the entire structure */ RtlZeroMemory(State, sizeof(*State)); @@ -245,6 +246,7 @@ State->IoReadCallback = IoReadCallback; State->IoWriteCallback = IoWriteCallback; State->IdleCallback = IdleCallback; + State->BopCallback = BopCallback; } VOID Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Sat Sep 28 00:29:16 2013 @@ -31,7 +31,7 @@ /* PRIVATE FUNCTIONS **********************************************************/ -static VOID EmulatorReadMemory(PVOID Context, UINT Address, LPBYTE Buffer, INT Size) +static VOID NTVDMCALL EmulatorReadMemory(PVOID Context, UINT Address, LPBYTE Buffer, INT Size) { UNREFERENCED_PARAMETER(Context); @@ -56,7 +56,7 @@ } } -static VOID EmulatorWriteMemory(PVOID Context, UINT Address, LPBYTE Buffer, INT Size) +static VOID NTVDMCALL EmulatorWriteMemory(PVOID Context, UINT Address, LPBYTE Buffer, INT Size) { UNREFERENCED_PARAMETER(Context); @@ -84,7 +84,7 @@ } } -static VOID EmulatorReadIo(PVOID Context, UINT Address, LPBYTE Buffer, INT Size) +static VOID NTVDMCALL EmulatorReadIo(PVOID Context, UINT Address, LPBYTE Buffer, INT Size) { UNREFERENCED_PARAMETER(Context); UNREFERENCED_PARAMETER(Size); @@ -152,7 +152,7 @@ } } -static VOID EmulatorWriteIo(PVOID Context, UINT Address, LPBYTE Buffer, INT Size) +static VOID NTVDMCALL EmulatorWriteIo(PVOID Context, UINT Address, LPBYTE Buffer, INT Size) { BYTE Byte = *Buffer; @@ -228,8 +228,6 @@ } } -#ifndef NEW_EMULATOR - static VOID EmulatorBop(WORD Code) { WORD StackSegment, StackPointer, CodeSegment, InstructionPointer; @@ -241,8 +239,8 @@ StackSegment = EmulatorContext.state->segment_reg[SX86_SREG_SS].val; StackPointer = EmulatorContext.state->general_reg[SX86_REG_SP].val; #else - StackSegment = EmulatorContext.SegmentRegs[SOFT386_REG_SS].LowWord; - StackPointer = EmulatorContext.SegmentRegs[SOFT386_REG_SP].LowWord; + StackSegment = EmulatorContext.SegmentRegs[SOFT386_REG_SS].Selector; + StackPointer = EmulatorContext.GeneralRegs[SOFT386_REG_ESP].LowWord; #endif /* Get the stack */ @@ -341,6 +339,21 @@ } } +#ifdef NEW_EMULATOR +static VOID WINAPI EmulatorBiosOperation(PSOFT386_STATE State, WORD Code) +{ + /* + * HACK: To maintain softx86 compatbility, just call the old EmulatorBop here. + * Later on, when softx86 is no longer needed, the code from EmulatorBop should + * be moved here and should use the "State" variable. + */ + EmulatorBop(Code); +} + +#endif + +#ifndef NEW_EMULATOR + static VOID EmulatorSoftwareInt(PVOID Context, BYTE Number) { UNREFERENCED_PARAMETER(Context); @@ -412,6 +425,7 @@ EmulatorContext.MemWriteCallback = (SOFT386_MEM_WRITE_PROC)EmulatorWriteMemory; EmulatorContext.IoReadCallback = (SOFT386_IO_READ_PROC)EmulatorReadIo; EmulatorContext.IoWriteCallback = (SOFT386_IO_WRITE_PROC)EmulatorWriteIo; + EmulatorContext.BopCallback = (SOFT386_BOP_PROC)EmulatorBiosOperation; /* Reset the CPU */ Soft386Reset(&EmulatorContext); Modified: branches/ntvdm/subsystems/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] Sat Sep 28 00:29:16 2013 @@ -86,10 +86,16 @@ }; #ifndef NEW_EMULATOR + +#define NTVDMCALL __cdecl extern softx86_ctx EmulatorContext; extern softx87_ctx FpuEmulatorContext; + #else + +#define NTVDMCALL __stdcall extern SOFT386_STATE EmulatorContext; + #endif /* FUNCTIONS ******************************************************************/

11 years, 2 months

[jimtabor] 60394: [Win32ss] - Add more GDI drawing support.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Sep 27 23:36:39 2013 New Revision: 60394 URL: http://svn.reactos.org/svn/reactos?rev=60394&view=rev Log: [Win32ss] - Add more GDI drawing support. Modified: trunk/reactos/win32ss/gdi/ntgdi/dc.h trunk/reactos/win32ss/gdi/ntgdi/dcutil.c trunk/reactos/win32ss/gdi/ntgdi/fillshap.c trunk/reactos/win32ss/gdi/ntgdi/font.c trunk/reactos/win32ss/gdi/ntgdi/intgdi.h trunk/reactos/win32ss/gdi/ntgdi/line.c trunk/reactos/win32ss/gdi/ntgdi/paint.h trunk/reactos/win32ss/gdi/ntgdi/text.c trunk/reactos/win32ss/gdi/ntgdi/text.h Modified: trunk/reactos/win32ss/gdi/ntgdi/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dc.h?rev… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] Fri Sep 27 23:36:39 2013 @@ -183,7 +183,11 @@ BOOL FASTCALL IntSetDefaultRegion(PDC); ULONG TranslateCOLORREF(PDC pdc, COLORREF crColor); int FASTCALL GreSetStretchBltMode(HDC hdc, int iStretchMode); - +int FASTCALL GreGetBkMode(HDC); +int FASTCALL GreGetMapMode(HDC); +COLORREF FASTCALL GreGetTextColor(HDC); +COLORREF FASTCALL IntSetDCBrushColor(HDC,COLORREF); +COLORREF FASTCALL IntSetDCPenColor(HDC,COLORREF); INIT_FUNCTION NTSTATUS NTAPI InitDcImpl(VOID); Modified: trunk/reactos/win32ss/gdi/ntgdi/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcutil.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] Fri Sep 27 23:36:39 2013 @@ -2,6 +2,42 @@ #define NDEBUG #include <debug.h> + +int FASTCALL +GreGetBkMode(HDC hdc) +{ + PDC dc; + if (!(dc = DC_LockDc(hdc))) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return CLR_INVALID; + } + return dc->pdcattr->lBkMode; +} + +int FASTCALL +GreGetMapMode(HDC hdc) +{ + PDC dc; + if (!(dc = DC_LockDc(hdc))) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return CLR_INVALID; + } + return dc->pdcattr->iMapMode; +} + +COLORREF FASTCALL +GreGetTextColor(HDC hdc) +{ + PDC dc; + if (!(dc = DC_LockDc(hdc))) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return CLR_INVALID; + } + return dc->pdcattr->ulForegroundClr; +} COLORREF FASTCALL IntGdiSetBkColor(HDC hDC, COLORREF color) @@ -94,6 +130,53 @@ DC_UnlockDc(pdc); return crOldColor; +} + +COLORREF FASTCALL +IntSetDCBrushColor(HDC hdc, COLORREF crColor) +{ + COLORREF OldColor = CLR_INVALID; + PDC dc; + if (!(dc = DC_LockDc(hdc))) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return CLR_INVALID; + } + else + { + OldColor = (COLORREF) dc->pdcattr->ulBrushClr; + dc->pdcattr->ulBrushClr = (ULONG) crColor; + + if ( dc->pdcattr->crBrushClr != crColor ) + { + dc->pdcattr->ulDirty_ |= DIRTY_FILL; + dc->pdcattr->crBrushClr = crColor; + } + } + return OldColor; +} + +COLORREF FASTCALL +IntSetDCPenColor(HDC hdc, COLORREF crColor) +{ + COLORREF OldColor; + PDC dc; + if (!(dc = DC_LockDc(hdc))) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + return CLR_INVALID; + } + + OldColor = (COLORREF)dc->pdcattr->ulPenClr; + dc->pdcattr->ulPenClr = (ULONG)crColor; + + if (dc->pdcattr->crPenClr != crColor) + { + dc->pdcattr->ulDirty_ |= DIRTY_LINE; + dc->pdcattr->crPenClr = crColor; + } + + return OldColor; } int Modified: trunk/reactos/win32ss/gdi/ntgdi/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/fillshap… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] Fri Sep 27 23:36:39 2013 @@ -159,6 +159,17 @@ return TRUE; } +BOOL FASTCALL +IntPolygon(HDC hdc, POINT *Point, int Count) +{ + PDC dc; + if (!(dc = DC_LockDc(hdc))) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + return IntGdiPolygon(dc, Point, Count); +} /******************************************************************************/ Modified: trunk/reactos/win32ss/gdi/ntgdi/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/font.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/font.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/font.c [iso-8859-1] Fri Sep 27 23:36:39 2013 @@ -13,7 +13,33 @@ #define NDEBUG #include <debug.h> +HFONT APIENTRY HfontCreate( IN PENUMLOGFONTEXDVW pelfw,IN ULONG cjElfw,IN LFTYPE lft,IN FLONG fl,IN PVOID pvCliData ); + /** Internal ******************************************************************/ + +HFONT FASTCALL +GreCreateFontIndirectW( LOGFONTW *lplf ) +{ + if (lplf) + { + ENUMLOGFONTEXDVW Logfont; + + RtlCopyMemory( &Logfont.elfEnumLogfontEx.elfLogFont, lplf, sizeof(LOGFONTW)); + RtlZeroMemory( &Logfont.elfEnumLogfontEx.elfFullName, + sizeof(Logfont.elfEnumLogfontEx.elfFullName)); + RtlZeroMemory( &Logfont.elfEnumLogfontEx.elfStyle, + sizeof(Logfont.elfEnumLogfontEx.elfStyle)); + RtlZeroMemory( &Logfont.elfEnumLogfontEx.elfScript, + sizeof(Logfont.elfEnumLogfontEx.elfScript)); + + Logfont.elfDesignVector.dvNumAxes = 0; + + RtlZeroMemory( &Logfont.elfDesignVector, sizeof(DESIGNVECTOR)); + + return HfontCreate((PENUMLOGFONTEXDVW)&Logfont, 0, 0, 0, NULL ); + } + else return NULL; +} DWORD FASTCALL Modified: trunk/reactos/win32ss/gdi/ntgdi/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/intgdi.h… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/intgdi.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/intgdi.h [iso-8859-1] Fri Sep 27 23:36:39 2013 @@ -44,6 +44,12 @@ IntGdiPolylineTo(DC *dc, LPPOINT pt, DWORD Count); + +BOOL FASTCALL +GreMoveTo( HDC hdc, + INT x, + INT y, + LPPOINT pptOut); /* Shape functions */ Modified: trunk/reactos/win32ss/gdi/ntgdi/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/line.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] Fri Sep 27 23:36:39 2013 @@ -52,6 +52,21 @@ return PATH_MoveTo ( dc ); return TRUE; +} + +BOOL FASTCALL +GreMoveTo( HDC hdc, + INT x, + INT y, + LPPOINT pptOut) +{ + PDC dc; + if (!(dc = DC_LockDc(hdc))) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + return IntGdiMoveToEx(dc, x, y, pptOut, TRUE); } // Should use Fx in pt Modified: trunk/reactos/win32ss/gdi/ntgdi/paint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/paint.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/paint.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/paint.h [iso-8859-1] Fri Sep 27 23:36:39 2013 @@ -4,3 +4,4 @@ BOOL APIENTRY FillPolygon ( DC* dc, SURFACE* pSurface, BRUSHOBJ* BrushObj, MIX RopMode, CONST PPOINT Points, INT Count, RECTL BoundRect ); BOOL FASTCALL IntFillPolygon(PDC dc, SURFACE *psurf, BRUSHOBJ *BrushObj, CONST PPOINT Points, int Count, RECTL DestRect, POINTL *BrushOrigin); +BOOL FASTCALL IntPolygon(HDC,POINT *,int); Modified: trunk/reactos/win32ss/gdi/ntgdi/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/text.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/text.c [iso-8859-1] Fri Sep 27 23:36:39 2013 @@ -14,6 +14,17 @@ #include <debug.h> /** Functions *****************************************************************/ + +BOOL FASTCALL +GreTextOutW( + HDC hdc, + int nXStart, + int nYStart, + LPCWSTR lpString, + int cchString) +{ + return GreExtTextOutW(hdc, nXStart, nYStart, 0, NULL, (LPWSTR)lpString, cchString, NULL, 0); +} /* flOpts : Modified: trunk/reactos/win32ss/gdi/ntgdi/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/text.h?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/text.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/text.h [iso-8859-1] Fri Sep 27 23:36:39 2013 @@ -131,6 +131,8 @@ BOOL FASTCALL GreGetTextExtentW(HDC,LPWSTR,INT,LPSIZE,UINT); BOOL FASTCALL GreGetTextExtentExW(HDC,LPWSTR,ULONG,ULONG,PULONG,PULONG,LPSIZE,FLONG); DWORD FASTCALL GreGetGlyphIndicesW(HDC,LPWSTR,INT,LPWORD,DWORD,DWORD); +BOOL FASTCALL GreTextOutW(HDC,int,int,LPCWSTR,int); +HFONT FASTCALL GreCreateFontIndirectW( LOGFONTW * ); #define IntLockProcessPrivateFonts(W32Process) \ ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&W32Process->PrivateFontListLock)

11 years, 2 months

[aandrejevic] 60393: [SOFT386] Fix the return to VM86 mode. The VM flag must be set before the call to Soft386LoadSegment.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri Sep 27 21:23:34 2013 New Revision: 60393 URL: http://svn.reactos.org/svn/reactos?rev=60393&view=rev Log: [SOFT386] Fix the return to VM86 mode. The VM flag must be set before the call to Soft386LoadSegment. Modified: branches/ntvdm/lib/soft386/opcodes.c Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Fri Sep 27 21:23:34 2013 @@ -4791,6 +4791,14 @@ if (!Soft386StackPop(State, &Fs)) return FALSE; if (!Soft386StackPop(State, &Gs)) return FALSE; + /* Set the new IP */ + State->InstPtr.Long = LOWORD(InstPtr); + + /* Set the new flags */ + if (Size) State->Flags.Long = NewFlags.Long & REAL_MODE_FLAGS_MASK; + else State->Flags.LowWord = NewFlags.LowWord & REAL_MODE_FLAGS_MASK; + State->Flags.AlwaysSet = State->Flags.Vm = TRUE; + /* Load the new segments */ if (!Soft386LoadSegment(State, SOFT386_REG_CS, CodeSel)) return FALSE; if (!Soft386LoadSegment(State, SOFT386_REG_SS, StackSel)) return FALSE; @@ -4798,14 +4806,6 @@ if (!Soft386LoadSegment(State, SOFT386_REG_DS, Ds)) return FALSE; if (!Soft386LoadSegment(State, SOFT386_REG_FS, Fs)) return FALSE; if (!Soft386LoadSegment(State, SOFT386_REG_GS, Gs)) return FALSE; - - /* Set the new IP */ - State->InstPtr.Long = LOWORD(InstPtr); - - /* Set the new flags */ - if (Size) State->Flags.Long = NewFlags.Long & REAL_MODE_FLAGS_MASK; - else State->Flags.LowWord = NewFlags.LowWord & REAL_MODE_FLAGS_MASK; - State->Flags.AlwaysSet = State->Flags.Vm = TRUE; return TRUE; }

11 years, 2 months

[aandrejevic] 60392: [SOFT386] Halfplement the IRET instruction (everything except task switching).

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri Sep 27 21:18:09 2013 New Revision: 60392 URL: http://svn.reactos.org/svn/reactos?rev=60392&view=rev Log: [SOFT386] Halfplement the IRET instruction (everything except task switching). Modified: branches/ntvdm/lib/soft386/common.h branches/ntvdm/lib/soft386/common.inl branches/ntvdm/lib/soft386/opcodes.c Modified: branches/ntvdm/lib/soft386/common.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/common.h?rev=… ============================================================================== --- branches/ntvdm/lib/soft386/common.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/common.h [iso-8859-1] Fri Sep 27 21:18:09 2013 @@ -18,6 +18,8 @@ #define SIGN_FLAG_BYTE 0x80 #define SIGN_FLAG_WORD 0x8000 #define SIGN_FLAG_LONG 0x80000000 +#define REAL_MODE_FLAGS_MASK 0x17FD5 +#define PROT_MODE_FLAGS_MASK 0x10DD5 #define GET_SEGMENT_RPL(s) ((s) & 3) #define GET_SEGMENT_INDEX(s) ((s) & 0xFFF8) Modified: branches/ntvdm/lib/soft386/common.inl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/common.inl?re… ============================================================================== --- branches/ntvdm/lib/soft386/common.inl [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/common.inl [iso-8859-1] Fri Sep 27 21:18:09 2013 @@ -162,7 +162,7 @@ CachedDescriptor = &State->SegmentRegs[Segment]; /* Check for protected mode */ - if (State->ControlRegisters[SOFT386_REG_CR0] & SOFT386_CR0_PE) + if ((State->ControlRegisters[SOFT386_REG_CR0] & SOFT386_CR0_PE) && !State->Flags.Vm) { /* Make sure the GDT contains the entry */ if (GET_SEGMENT_INDEX(Selector) >= (State->Gdtr.Size + 1)) Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Fri Sep 27 21:18:09 2013 @@ -4690,10 +4690,221 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeIret) { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; + INT i; + ULONG InstPtr, CodeSel, StackPtr, StackSel; + SOFT386_FLAGS_REG NewFlags; + BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xCF); + + if (State->PrefixFlags & SOFT386_PREFIX_LOCK) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + Size = !Size; + } + + /* Pop EIP */ + if (!Soft386StackPop(State, &InstPtr)) + { + /* Exception occurred */ + return FALSE; + } + + /* Pop CS */ + if (!Soft386StackPop(State, &CodeSel)) + { + /* Exception occurred */ + return FALSE; + } + + /* Pop EFLAGS */ + if (!Soft386StackPop(State, &NewFlags.Long)) + { + /* Exception occurred */ + return FALSE; + } + + /* Check for protected mode */ + if (State->ControlRegisters[SOFT386_REG_CR0] & SOFT386_CR0_PE) + { + INT Cpl = Soft386GetCurrentPrivLevel(State); + + if (State->Flags.Vm) + { + /* Return from VM86 mode */ + + /* Check the IOPL */ + if (State->Flags.Iopl == 3) + { + /* Set new EIP */ + State->InstPtr.Long = LOWORD(InstPtr); + + /* Load new CS */ + if (!Soft386LoadSegment(State, SOFT386_REG_CS, CodeSel)) + { + /* Exception occurred */ + return FALSE; + } + + /* Set the new flags */ + if (Size) State->Flags.Long = NewFlags.Long & REAL_MODE_FLAGS_MASK; + else State->Flags.LowWord = NewFlags.LowWord & REAL_MODE_FLAGS_MASK; + State->Flags.AlwaysSet = State->Flags.Vm = TRUE; + State->Flags.Iopl = 3; + } + else + { + /* Call the VM86 monitor */ + Soft386ExceptionWithErrorCode(State, SOFT386_EXCEPTION_GP, 0); + return FALSE; + } + + return TRUE; + } + + if (State->Flags.Nt) + { + /* Nested task return */ + + UNIMPLEMENTED; + return FALSE; + } + + if (NewFlags.Vm) + { + /* Return to VM86 mode */ + ULONG Es, Ds, Fs, Gs; + + /* Pop ESP, SS, ES, FS, GS */ + if (!Soft386StackPop(State, &StackPtr)) return FALSE; + if (!Soft386StackPop(State, &StackSel)) return FALSE; + if (!Soft386StackPop(State, &Es)) return FALSE; + if (!Soft386StackPop(State, &Ds)) return FALSE; + if (!Soft386StackPop(State, &Fs)) return FALSE; + if (!Soft386StackPop(State, &Gs)) return FALSE; + + /* Load the new segments */ + if (!Soft386LoadSegment(State, SOFT386_REG_CS, CodeSel)) return FALSE; + if (!Soft386LoadSegment(State, SOFT386_REG_SS, StackSel)) return FALSE; + if (!Soft386LoadSegment(State, SOFT386_REG_ES, Es)) return FALSE; + if (!Soft386LoadSegment(State, SOFT386_REG_DS, Ds)) return FALSE; + if (!Soft386LoadSegment(State, SOFT386_REG_FS, Fs)) return FALSE; + if (!Soft386LoadSegment(State, SOFT386_REG_GS, Gs)) return FALSE; + + /* Set the new IP */ + State->InstPtr.Long = LOWORD(InstPtr); + + /* Set the new flags */ + if (Size) State->Flags.Long = NewFlags.Long & REAL_MODE_FLAGS_MASK; + else State->Flags.LowWord = NewFlags.LowWord & REAL_MODE_FLAGS_MASK; + State->Flags.AlwaysSet = State->Flags.Vm = TRUE; + + return TRUE; + } + + /* Load the new CS */ + if (!Soft386LoadSegment(State, SOFT386_REG_CS, CodeSel)) + { + /* Exception occurred */ + return FALSE; + } + + /* Set EIP */ + if (Size) State->InstPtr.Long = InstPtr; + else State->InstPtr.LowWord = LOWORD(InstPtr); + + if (GET_SEGMENT_RPL(CodeSel) > Cpl) + { + /* Pop ESP */ + if (!Soft386StackPop(State, &StackPtr)) + { + /* Exception */ + return FALSE; + } + + /* Pop SS */ + if (!Soft386StackPop(State, &StackSel)) + { + /* Exception */ + return FALSE; + } + + /* Load new SS */ + if (!Soft386LoadSegment(State, SOFT386_REG_SS, StackSel)) + { + /* Exception */ + return FALSE; + } + + /* Set ESP */ + if (Size) State->GeneralRegs[SOFT386_REG_ESP].Long = StackPtr; + else State->GeneralRegs[SOFT386_REG_ESP].LowWord = LOWORD(StackPtr); + } + + /* Set the new flags */ + if (Size) State->Flags.Long = NewFlags.Long & PROT_MODE_FLAGS_MASK; + else State->Flags.LowWord = NewFlags.LowWord & PROT_MODE_FLAGS_MASK; + State->Flags.AlwaysSet = TRUE; + + /* Set additional flags */ + if (Cpl <= State->Flags.Iopl) State->Flags.If = NewFlags.If; + if (Cpl == 0) State->Flags.Iopl = NewFlags.Iopl; + + if (GET_SEGMENT_RPL(CodeSel) > Cpl) + { + /* Update the CPL */ + Cpl = Soft386GetCurrentPrivLevel(State); + + /* Check segment security */ + for (i = 0; i <= SOFT386_NUM_SEG_REGS; i++) + { + /* Don't check CS or SS */ + if ((i == SOFT386_REG_CS) || (i == SOFT386_REG_SS)) continue; + + if ((Cpl > State->SegmentRegs[i].Dpl) + && (!State->SegmentRegs[i].Executable + || !State->SegmentRegs[i].DirConf)) + { + /* Load the NULL descriptor in the segment */ + if (!Soft386LoadSegment(State, i, 0)) return FALSE; + } + } + } + } + else + { + if (Size && (InstPtr & 0xFFFF0000)) + { + /* Invalid */ + Soft386ExceptionWithErrorCode(State, SOFT386_EXCEPTION_GP, 0); + return FALSE; + } + + /* Set new EIP */ + State->InstPtr.Long = InstPtr; + + /* Load new CS */ + if (!Soft386LoadSegment(State, SOFT386_REG_CS, CodeSel)) + { + /* Exception occurred */ + return FALSE; + } + + /* Set the new flags */ + if (Size) State->Flags.Long = NewFlags.Long & REAL_MODE_FLAGS_MASK; + else State->Flags.LowWord = NewFlags.LowWord & REAL_MODE_FLAGS_MASK; + State->Flags.AlwaysSet = TRUE; + } + + return TRUE; } SOFT386_OPCODE_HANDLER(Soft386OpcodeAam)

11 years, 2 months

[spetreolle] 60391: [SUBST] Improve French translation. Fix typos in constant names.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Fri Sep 27 12:54:05 2013 New Revision: 60391 URL: http://svn.reactos.org/svn/reactos?rev=60391&view=rev Log: [SUBST] Improve French translation. Fix typos in constant names. Modified: trunk/reactos/base/system/subst/lang/bg-BG.rc trunk/reactos/base/system/subst/lang/en-US.rc trunk/reactos/base/system/subst/lang/es-ES.rc trunk/reactos/base/system/subst/lang/fr-FR.rc trunk/reactos/base/system/subst/lang/it-IT.rc trunk/reactos/base/system/subst/lang/pl-PL.rc trunk/reactos/base/system/subst/lang/ro-RO.rc trunk/reactos/base/system/subst/lang/uk-UA.rc trunk/reactos/base/system/subst/lang/zh-CN.rc trunk/reactos/base/system/subst/resource.h trunk/reactos/base/system/subst/subst.c Modified: trunk/reactos/base/system/subst/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/bg-… ============================================================================== --- trunk/reactos/base/system/subst/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/subst/lang/bg-BG.rc [iso-8859-1] Fri Sep 27 12:54:05 2013 @@ -11,8 +11,8 @@ IDS_INCORRECT_PARAMETER_COUNT "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÐµÐ½ Ð±ÑÐ¾Ð¹ ÐºÐ»ÑÑÐ¾Ð²Ðµ - %s\n" IDS_INVALID_PARAMETER "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÐµÐ½ Ð±ÑÐ¾Ð¹ ÐºÐ»ÑÑÐ¾Ð²Ðµ - %s\n" IDS_INVALID_PARAMETER2 "ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼ ÐºÐ»ÑÑ - %s\n" - IDS_DRIVE_ALREAD_SUBSTED "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ÑÐ¾ Ð²ÐµÑÐµ Ðµ Ð¿Ð¾Ð´Ð»Ð¾Ð¶ÐµÐ½Ð¾ Ð½Ð° SUBST\n" - IDS_FAILED_WITH_ERROCODE "ÐÑÐµÑÐºÐ° Ð½Ð¾Ð¼ÐµÑ: 0x%x: %s\n" + IDS_DRIVE_ALREADY_SUBSTED "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ÑÐ¾ Ð²ÐµÑÐµ Ðµ Ð¿Ð¾Ð´Ð»Ð¾Ð¶ÐµÐ½Ð¾ Ð½Ð° SUBST\n" + IDS_FAILED_WITH_ERRORCODE "ÐÑÐµÑÐºÐ° Ð½Ð¾Ð¼ÐµÑ: 0x%x: %s\n" IDS_USAGE "ÐÐ±Ð²ÑÑÐ·Ð²Ð° Ð¿ÑÑ Ñ Ð¸Ð¼Ðµ Ð½Ð° ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ (Ð´ÑÐ»).\n\nSUBST [drive1: [drive2:]path]\nSUBST drive1: /D\n\n drive1: \ Ð£ÐºÐ°Ð·Ð²Ð° Ð¼Ð½Ð¸Ð¼Ð¾ÑÐ¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ Ð¸ Ð¿ÑÑÐ°, Ñ ÐºÐ¾Ð¹ÑÐ¾ Ð¸ÑÐºÐ°ÑÐµ Ð´Ð° Ð¾Ð±Ð²ÑÑÐ¶ÐµÑÐµ Ð¿ÑÑÑ.\n \ [drive2:]path Ð£ÐºÐ°Ð·Ð²Ð° Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»Ð½Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ Ð¸ Ð¿ÑÑÑ, Ñ ÐºÐ¾Ð¹ÑÐ¾ Ð¸ÑÐºÐ°ÑÐµ Ð´Ð° Ð¾Ð±Ð²ÑÑÐ¶ÐµÑÐµ\n \ Modified: trunk/reactos/base/system/subst/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/en-… ============================================================================== --- trunk/reactos/base/system/subst/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/subst/lang/en-US.rc [iso-8859-1] Fri Sep 27 12:54:05 2013 @@ -5,8 +5,8 @@ IDS_INCORRECT_PARAMETER_COUNT "Incorrect number of parameters - %s\n" IDS_INVALID_PARAMETER "Incorrect number of parameters - %s\n" IDS_INVALID_PARAMETER2 "Invalid parameter - %s\n" - IDS_DRIVE_ALREAD_SUBSTED "Drive already SUBSTed\n" - IDS_FAILED_WITH_ERROCODE "Failed with error code 0x%x: %s\n" + IDS_DRIVE_ALREADY_SUBSTED "Drive already SUBSTed\n" + IDS_FAILED_WITH_ERRORCODE "Failed with error code 0x%x: %s\n" IDS_USAGE "Associates a path with a drive letter.\n\n\ SUBST [drive1: [drive2:]path]\n\ SUBST drive1: /D\n\n\ Modified: trunk/reactos/base/system/subst/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/es-… ============================================================================== --- trunk/reactos/base/system/subst/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/subst/lang/es-ES.rc [iso-8859-1] Fri Sep 27 12:54:05 2013 @@ -5,8 +5,8 @@ IDS_INCORRECT_PARAMETER_COUNT "Cantidad de parÃ¡metros incorrecta - %s\n" IDS_INVALID_PARAMETER "Cantidad de parÃ¡metros incorrecta - %s\n" IDS_INVALID_PARAMETER2 "ParÃ¡metro incorrecto - %s\n" - IDS_DRIVE_ALREAD_SUBSTED "Unidad ya sustituida\n" - IDS_FAILED_WITH_ERROCODE "Falla con cÃ³digo de error 0x%x: %s\n" + IDS_DRIVE_ALREADY_SUBSTED "Unidad ya sustituida\n" + IDS_FAILED_WITH_ERRORCODE "Falla con cÃ³digo de error 0x%x: %s\n" IDS_USAGE "Asocia una ruta con una letra de unidad.\n\n\ SUBST [unidad1: [unidad2:]ruta]\n\ SUBST unidad1: /D\n\n\ Modified: trunk/reactos/base/system/subst/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/fr-… ============================================================================== --- trunk/reactos/base/system/subst/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/subst/lang/fr-FR.rc [iso-8859-1] Fri Sep 27 12:54:05 2013 @@ -5,11 +5,13 @@ IDS_INCORRECT_PARAMETER_COUNT "Nombre incorrect de paramÃ¨tres - %s\n" IDS_INVALID_PARAMETER "Nombre incorrect de paramÃ¨tres - %s\n" IDS_INVALID_PARAMETER2 "ParamÃ¨tre incorrect - %s\n" - IDS_DRIVE_ALREAD_SUBSTED "Disque dÃ©jÃ substituÃ©\n" - IDS_FAILED_WITH_ERROCODE "Ãchoue avec le code d'erreur 0x%x: %s\n" - IDS_USAGE "Associe un chemin avec une lettre de lecteur.\n\nSUBST [disque1: [disque2:]chemin]\nSUBST dique1: /D\n\n disque1: \ - SpÃ©cifie un lecteur virtuel auquel vous voulez affecter un chemin.\n \ - [disque2:]chemin SpÃ©cifie un disque physique et le chemin que vous souhaitez attribuer Ã \n \ - un disque virtuel.\n /D \ - Supprime un disque (virtuel) substituÃ©.\n\nTapez SUBST sans paramÃ¨tres pour afficher la liste des lecteurs virtuels en cours.\n" + IDS_DRIVE_ALREADY_SUBSTED "Disque dÃ©jÃ substituÃ©\n" + IDS_FAILED_WITH_ERRORCODE "Ãchoue avec le code d'erreur 0x%x: %s\n" + IDS_USAGE "Associe un chemin avec une lettre de lecteur.\n\n\ +SUBST [disque1: [disque2:]chemin]\n\ +SUBST dique1: /D\n\n\ +disque1: Lecteur virtuel auquel vous voulez affecter un chemin.\n\ +[disque2:]chemin Disque physique/chemin attribuÃ©s Ã un disque virtuel.\n\ +/D Supprime un disque (virtuel) substituÃ©.\n\n\ +Tapez SUBST sans paramÃ¨tre pour afficher la liste des lecteurs virtuels.\n" END Modified: trunk/reactos/base/system/subst/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/it-… ============================================================================== --- trunk/reactos/base/system/subst/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/subst/lang/it-IT.rc [iso-8859-1] Fri Sep 27 12:54:05 2013 @@ -5,8 +5,8 @@ IDS_INCORRECT_PARAMETER_COUNT "Numero di parametri errato - %s\n" IDS_INVALID_PARAMETER "Numero di parametri errato - %s\n" IDS_INVALID_PARAMETER2 "Parametro errato - %s\n" - IDS_DRIVE_ALREAD_SUBSTED "UnitÃ giÃ sostituita\n" - IDS_FAILED_WITH_ERROCODE "Interruzione con codice di errore 0x%x: %s\n" + IDS_DRIVE_ALREADY_SUBSTED "UnitÃ giÃ sostituita\n" + IDS_FAILED_WITH_ERRORCODE "Interruzione con codice di errore 0x%x: %s\n" IDS_USAGE "Associa un percorso ad una lettera di unitÃ .\n\n\ SUBST [unitÃ 1: [unitÃ 2:]percorso]\n\ SUBST unitÃ 1: /D\n\n\ Modified: trunk/reactos/base/system/subst/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/pl-… ============================================================================== --- trunk/reactos/base/system/subst/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/subst/lang/pl-PL.rc [iso-8859-1] Fri Sep 27 12:54:05 2013 @@ -13,8 +13,8 @@ IDS_INCORRECT_PARAMETER_COUNT "NieprawidÅowa liczba parametrÃ³w - %s\n" IDS_INVALID_PARAMETER "NieprawidÅowy parametr - %s\n" IDS_INVALID_PARAMETER2 "NieprawidÅowe parametry - %s\n" - IDS_DRIVE_ALREAD_SUBSTED "Na tym dysku juÅ¼ uÅ¼yto komendy SUBST\n" - IDS_FAILED_WITH_ERROCODE "BÅÄd 0x%x: %s\n" + IDS_DRIVE_ALREADY_SUBSTED "Na tym dysku juÅ¼ uÅ¼yto komendy SUBST\n" + IDS_FAILED_WITH_ERRORCODE "BÅÄd 0x%x: %s\n" IDS_USAGE "PowiÄzuje ÅcieÅ¼kÄ z literÄ napÄdu.\n\n\ SUBST [napÄd1: [napÄd2:]ÅcieÅ¼ka]\n\ SUBST napÄd1: /D\n\n\ Modified: trunk/reactos/base/system/subst/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/ro-… ============================================================================== --- trunk/reactos/base/system/subst/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/subst/lang/ro-RO.rc [iso-8859-1] Fri Sep 27 12:54:05 2013 @@ -14,8 +14,8 @@ IDS_INCORRECT_PARAMETER_COUNT "NumÄr eronat de parametri - %s\n" IDS_INVALID_PARAMETER "NumÄr eronat de parametri - %s\n" IDS_INVALID_PARAMETER2 "Parametru eronat - %s\n" - IDS_DRIVE_ALREAD_SUBSTED "Unitatea este deja SUBSTituitÄ\n" - IDS_FAILED_WITH_ERROCODE "OperaÈia a eÈuat. Codul de eroare 0x%x: %s\n" + IDS_DRIVE_ALREADY_SUBSTED "Unitatea este deja SUBSTituitÄ\n" + IDS_FAILED_WITH_ERRORCODE "OperaÈia a eÈuat. Codul de eroare 0x%x: %s\n" IDS_USAGE "Substituie un director cu o unitate de stocare.\n\n\ SUBST [unitate1: [unitate2:]cale]\n\ SUBST unitate1: /D\n\n\ Modified: trunk/reactos/base/system/subst/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/uk-… ============================================================================== --- trunk/reactos/base/system/subst/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/subst/lang/uk-UA.rc [iso-8859-1] Fri Sep 27 12:54:05 2013 @@ -13,8 +13,8 @@ IDS_INCORRECT_PARAMETER_COUNT "ÐÐµÐ²ÑÑÐ½Ð° ÐºÑÐ»ÑÐºÑÑÑÑ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑÐ² - %s\n" IDS_INVALID_PARAMETER "ÐÐµÐ²ÑÑÐ½Ð° ÐºÑÐ»ÑÐºÑÑÑÑ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑÐ² - %s\n" IDS_INVALID_PARAMETER2 "ÐÐµÐ²ÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ - %s\n" - IDS_DRIVE_ALREAD_SUBSTED "ÐÐ¾ Ð´Ð¸ÑÐºÑ Ð²Ð¶Ðµ Ð·Ð°ÑÑÐ¾ÑÐ¾Ð²Ð°Ð½Ð¾ SUBST\n" - IDS_FAILED_WITH_ERROCODE "ÐÐµÐ²Ð´Ð°ÑÐ° Ð· ÐºÐ¾Ð´Ð¾Ð¼ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¸ 0x%x: %s\n" + IDS_DRIVE_ALREADY_SUBSTED "ÐÐ¾ Ð´Ð¸ÑÐºÑ Ð²Ð¶Ðµ Ð·Ð°ÑÑÐ¾ÑÐ¾Ð²Ð°Ð½Ð¾ SUBST\n" + IDS_FAILED_WITH_ERRORCODE "ÐÐµÐ²Ð´Ð°ÑÐ° Ð· ÐºÐ¾Ð´Ð¾Ð¼ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¸ 0x%x: %s\n" IDS_USAGE "ÐÑÐ¾ÑÑÑÑ ÑÐ»ÑÑ Ð· Ð±ÑÐºÐ²Ð¾Ñ Ð´Ð¸ÑÐºÑ.\n\n\ SUBST [Ð´Ð¸ÑÐº1: [Ð´Ð¸ÑÐº2:]ÑÐ»ÑÑ]\n\ SUBST Ð´Ð¸ÑÐº1: /D\n\n\ Modified: trunk/reactos/base/system/subst/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/zh-… ============================================================================== --- trunk/reactos/base/system/subst/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/subst/lang/zh-CN.rc [iso-8859-1] Fri Sep 27 12:54:05 2013 @@ -10,8 +10,8 @@ IDS_INCORRECT_PARAMETER_COUNT "åæ°ä¸ªæ°ä¸æ£ç¡® - %s\n" IDS_INVALID_PARAMETER "åæ°ä¸ªæ°ä¸æ£ç¡® - %s\n" IDS_INVALID_PARAMETER2 "æ æåæ° - %s\n" - IDS_DRIVE_ALREAD_SUBSTED "é©±å¨å¨å·²ç»è¿è¡è¿ SUBST\n" - IDS_FAILED_WITH_ERROCODE "æä½å¤±è´¥ï¼éè¯¯ç 0x%xï¼%s\n" + IDS_DRIVE_ALREADY_SUBSTED "é©±å¨å¨å·²ç»è¿è¡è¿ SUBST\n" + IDS_FAILED_WITH_ERRORCODE "æä½å¤±è´¥ï¼éè¯¯ç 0x%xï¼%s\n" IDS_USAGE "å°ä¸ä¸ªè·¯å¾ç¨é©±å¨å¨å·å³èã\n\n\ SUBST [é©±å¨å¨1: [é©±å¨å¨2:]è·¯å¾]\n\ SUBST é©±å¨å¨1: /D\n\n\ Modified: trunk/reactos/base/system/subst/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/resource… ============================================================================== --- trunk/reactos/base/system/subst/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/system/subst/resource.h [iso-8859-1] Fri Sep 27 12:54:05 2013 @@ -3,11 +3,11 @@ #define RC_STRING_MAX_SIZE 2048 /* Strings */ -#define IDS_FAILED_WITH_ERROCODE 1001 +#define IDS_FAILED_WITH_ERRORCODE 1001 #define IDS_USAGE 1002 #define IDS_INCORRECT_PARAMETER_COUNT 1003 #define IDS_INVALID_PARAMETER 1004 #define IDS_INVALID_PARAMETER2 1005 -#define IDS_DRIVE_ALREAD_SUBSTED 1006 +#define IDS_DRIVE_ALREADY_SUBSTED 1006 /* EOF */ Modified: trunk/reactos/base/system/subst/subst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/subst.c?… ============================================================================== --- trunk/reactos/base/system/subst/subst.c [iso-8859-1] (original) +++ trunk/reactos/base/system/subst/subst.c [iso-8859-1] Fri Sep 27 12:54:05 2013 @@ -39,7 +39,7 @@ 0, NULL); LoadString(GetModuleHandle(NULL), - IDS_FAILED_WITH_ERROCODE, + IDS_FAILED_WITH_ERRORCODE, szFmtString, sizeof(szFmtString) / sizeof(szFmtString[0])); _sntprintf(buffer, @@ -228,7 +228,7 @@ if (IsSubstedDrive(Drive)) { LoadString(GetModuleHandle(NULL), - IDS_DRIVE_ALREAD_SUBSTED, + IDS_DRIVE_ALREADY_SUBSTED, szFmtString, sizeof(szFmtString) / sizeof(szFmtString[0])); _tprintf(szFmtString);

11 years, 2 months

[spetreolle] 60390: [FRAMEDYN] Fix framedynex build with msbuild, thanks ThFabba.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Fri Sep 27 10:29:13 2013 New Revision: 60390 URL: http://svn.reactos.org/svn/reactos?rev=60390&view=rev Log: [FRAMEDYN] Fix framedynex build with msbuild, thanks ThFabba. Modified: trunk/reactos/dll/win32/framedyn/CMakeLists.txt Modified: trunk/reactos/dll/win32/framedyn/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/framedyn/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/CMakeLists.txt [iso-8859-1] Fri Sep 27 10:29:13 2013 @@ -34,3 +34,4 @@ add_asm_files(framedynex_asm alias_gcc.s) endif() add_library(framedynex ${framedynex_asm}) +set_target_properties(framedynex PROPERTIES LINKER_LANGUAGE ASM)

11 years, 2 months

[jimtabor] 60389: - Separate NtGdiHfontCreate to allow calling it direct without SEH.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Sep 26 23:59:19 2013 New Revision: 60389 URL: http://svn.reactos.org/svn/reactos?rev=60389&view=rev Log: - Separate NtGdiHfontCreate to allow calling it direct without SEH. Modified: trunk/reactos/win32ss/gdi/ntgdi/font.c Modified: trunk/reactos/win32ss/gdi/ntgdi/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/font.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/font.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/font.c [iso-8859-1] Thu Sep 26 23:59:19 2013 @@ -1003,6 +1003,61 @@ return Ret; } + +HFONT +APIENTRY +HfontCreate( + IN PENUMLOGFONTEXDVW pelfw, + IN ULONG cjElfw, + IN LFTYPE lft, + IN FLONG fl, + IN PVOID pvCliData ) +{ + HFONT hNewFont; + PLFONT plfont; + + if (!pelfw) + { + return NULL; + } + + plfont = LFONT_AllocFontWithHandle(); + if (!plfont) + { + return NULL; + } + hNewFont = plfont->BaseObject.hHmgr; + + plfont->lft = lft; + plfont->fl = fl; + RtlCopyMemory (&plfont->logfont, pelfw, sizeof(ENUMLOGFONTEXDVW)); + ExInitializePushLock(&plfont->lock); + + if (pelfw->elfEnumLogfontEx.elfLogFont.lfEscapement != + pelfw->elfEnumLogfontEx.elfLogFont.lfOrientation) + { + /* This should really depend on whether GM_ADVANCED is set */ + plfont->logfont.elfEnumLogfontEx.elfLogFont.lfOrientation = + plfont->logfont.elfEnumLogfontEx.elfLogFont.lfEscapement; + } + LFONT_UnlockFont(plfont); + + if (pvCliData && hNewFont) + { + // FIXME: Use GDIOBJ_InsertUserData + KeEnterCriticalRegion(); + { + INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)hNewFont); + PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; + Entry->UserData = pvCliData; + } + KeLeaveCriticalRegion(); + } + + return hNewFont; +} + + HFONT APIENTRY NtGdiHfontCreate( @@ -1013,8 +1068,6 @@ IN PVOID pvCliData ) { ENUMLOGFONTEXDVW SafeLogfont; - HFONT hNewFont; - PLFONT plfont; NTSTATUS Status = STATUS_SUCCESS; /* Silence GCC warnings */ @@ -1042,40 +1095,7 @@ return NULL; } - plfont = LFONT_AllocFontWithHandle(); - if (!plfont) - { - return NULL; - } - hNewFont = plfont->BaseObject.hHmgr; - - plfont->lft = lft; - plfont->fl = fl; - RtlCopyMemory (&plfont->logfont, &SafeLogfont, sizeof(ENUMLOGFONTEXDVW)); - ExInitializePushLock(&plfont->lock); - - if (SafeLogfont.elfEnumLogfontEx.elfLogFont.lfEscapement != - SafeLogfont.elfEnumLogfontEx.elfLogFont.lfOrientation) - { - /* This should really depend on whether GM_ADVANCED is set */ - plfont->logfont.elfEnumLogfontEx.elfLogFont.lfOrientation = - plfont->logfont.elfEnumLogfontEx.elfLogFont.lfEscapement; - } - LFONT_UnlockFont(plfont); - - if (pvCliData && hNewFont) - { - // FIXME: Use GDIOBJ_InsertUserData - KeEnterCriticalRegion(); - { - INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)hNewFont); - PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; - Entry->UserData = pvCliData; - } - KeLeaveCriticalRegion(); - } - - return hNewFont; + return HfontCreate(&SafeLogfont, cjElfw, lft, fl, pvCliData); }

11 years, 2 months

[hbelusca] 60388: [NDK]: One can use either RtlGetLengthWithoutTrailingPathSeparators or RtlGetLengthWithoutTrailingPathSeperators...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Sep 26 20:12:21 2013 New Revision: 60388 URL: http://svn.reactos.org/svn/reactos?rev=60388&view=rev Log: [NDK]: One can use either RtlGetLengthWithoutTrailingPathSeparators or RtlGetLengthWithoutTrailingPathSeperators... Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Thu Sep 26 20:12:21 2013 @@ -2733,6 +2733,12 @@ _In_ PCUNICODE_STRING PathString, _Out_ PULONG Length ); +/* + * NOTE: the export is called RtlGetLengthWithoutTrailingPathSeperators + * (with a 'e' instead of a 'a' in "Seperators"). + */ +#define RtlGetLengthWithoutTrailingPathSeperators \ + RtlGetLengthWithoutTrailingPathSeparators NTSYSAPI ULONG

11 years, 2 months

[jimtabor] 60387: - Remove old code.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Sep 26 20:06:18 2013 New Revision: 60387 URL: http://svn.reactos.org/svn/reactos?rev=60387&view=rev Log: - Remove old code. Modified: trunk/reactos/win32ss/user/user32/windows/draw.c Modified: trunk/reactos/win32ss/user/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/draw.c [iso-8859-1] Thu Sep 26 20:06:18 2013 @@ -36,9 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(user32); /* GLOBALS *******************************************************************/ - -static const WORD wPattern_AA55[8] = { 0xaaaa, 0x5555, 0xaaaa, 0x5555, - 0xaaaa, 0x5555, 0xaaaa, 0x5555 }; /* These tables are used in: * UITOOLS_DrawDiagEdge() @@ -623,9 +620,7 @@ { if(GetSysColor(COLOR_BTNHIGHLIGHT) == RGB(255, 255, 255)) { -// HBITMAP hbm = CreateBitmap(8, 8, 1, 1, wPattern_AA55); gpsi->hbrGray HBRUSH hbsave; -// HBRUSH hb = CreatePatternBrush(hbm); COLORREF bg; FillRect(dc, rect, GetSysColorBrush(COLOR_BTNFACE)); @@ -634,8 +629,6 @@ PatBlt(dc, rect->left, rect->top, rect->right-rect->left, rect->bottom-rect->top, 0x00FA0089); SelectObject(dc, hbsave); SetBkColor(dc, bg); -// DeleteObject(hb); -// DeleteObject(hbm); } else {

11 years, 2 months

← Newer
1
...
7
8
9
10
11
12
13
...
56
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 September 2013