Ros-diffs August 2013

ros-diffs@reactos.org

10 participants
327 discussions

[ion] 59732: [SACDRV]: fix a bug in ChannelReferenceToOneByIndexwithLock and ChanMgrCreateChannel. [SACDRV]: implement SacTranslateUnicodeToUtf8. [NTOSKRNL]: implement HadlessCmdPutData. EMS bringu...

by ion＠svn.reactos.org

Author: ion Date: Wed Aug 14 04:20:17 2013 New Revision: 59732 URL: http://svn.reactos.org/svn/reactos?rev=59732&view=rev Log: [SACDRV]: fix a bug in ChannelReferenceToOneByIndexwithLock and ChanMgrCreateChannel. [SACDRV]: implement SacTranslateUnicodeToUtf8. [NTOSKRNL]: implement HadlessCmdPutData. EMS bringup is now functional: " Computer is booting, SAC started and initialized.\n\nUse the \"ch -?\" command for information about using channels.\nUse the \"?\" command for general help. SAC>%0 " Modified: trunk/reactos/drivers/sac/driver/chanmgr.c trunk/reactos/drivers/sac/driver/util.c trunk/reactos/ntoskrnl/ex/hdlsterm.c Modified: trunk/reactos/drivers/sac/driver/chanmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/chanmgr… ============================================================================== --- trunk/reactos/drivers/sac/driver/chanmgr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/chanmgr.c [iso-8859-1] Wed Aug 14 04:20:17 2013 @@ -111,8 +111,7 @@ ChannelReferenceToOneByIndexWithLock(IN LONG Index) { ChannelSlotLock(Index); - ASSERT(ChannelGetReferenceCount((Index)) == 1); - _InterlockedExchange(&ChannelRefCount[Index], 1); + ChannelReferenceToOneByIndex(Index); ChannelSlotUnlock(Index); } @@ -359,7 +358,7 @@ ChannelLockCreates(); /* Is the channel manager initialized? */ - if (ChannelCreateEnabled) + if (!ChannelCreateEnabled) { /* Nope, bail out */ Status = STATUS_UNSUCCESSFUL; @@ -405,7 +404,7 @@ if (i == SAC_MAX_CHANNELS) { /* Bail out */ - Status = STATUS_UNSUCCESSFUL; + SAC_DBG(SAC_DBG_INIT, "failing here: %d %lx\n", __LINE__, Status); goto ReturnStatus; } @@ -439,6 +438,7 @@ else { /* We couldn't create it, free the buffer */ + SAC_DBG(SAC_DBG_INIT, "failing here: %d %lx\n", __LINE__, Status); SacFreePool(NewChannel); } Modified: trunk/reactos/drivers/sac/driver/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/util.c?… ============================================================================== --- trunk/reactos/drivers/sac/driver/util.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/util.c [iso-8859-1] Wed Aug 14 04:20:17 2013 @@ -41,8 +41,43 @@ OUT PULONG UTF8Count, OUT PULONG ProcessedCount) { - ASSERT(FALSE); - return FALSE; + *UTF8Count = 0; + *ProcessedCount = 0; + + while ((*SourceBuffer) && + (*UTF8Count < DestinationBufferSize) && + (*ProcessedCount < SourceBufferLength)) + { + if (*SourceBuffer & 0xFF80) + { + if (*SourceBuffer & 0xF800) + { + if ((*UTF8Count + 3) >= DestinationBufferSize) break; + DestinationBuffer[*UTF8Count] = ((*SourceBuffer >> 12) & 0xF) | 0xE0; + ++*UTF8Count; + DestinationBuffer[*UTF8Count] = ((*SourceBuffer >> 6) & 0x3F) | 0x80; + } + else + { + if ((*UTF8Count + 2) >= DestinationBufferSize) break; + DestinationBuffer[*UTF8Count] = ((*SourceBuffer >> 6) & 31) | 0xC0; + } + ++*UTF8Count; + DestinationBuffer[*UTF8Count] = (*SourceBuffer & 0x3F) | 0x80; + } + else + { + DestinationBuffer[*UTF8Count] = (*SourceBuffer & 0x7F); + } + + ++*UTF8Count; + ++*ProcessedCount; + ++SourceBuffer; + } + + ASSERT(*ProcessedCount <= SourceBufferLength); + ASSERT(*UTF8Count <= DestinationBufferSize); + return TRUE; } PWCHAR Modified: trunk/reactos/ntoskrnl/ex/hdlsterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/hdlsterm.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/hdlsterm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/hdlsterm.c [iso-8859-1] Wed Aug 14 04:20:17 2013 @@ -171,9 +171,19 @@ VOID NTAPI -HdlspPutString( - IN PUCHAR String - ) +HdlspPutData(IN PUCHAR Data, + IN ULONG DataSize) +{ + ULONG i; + for (i = 0; i < DataSize; i++) + { + InbvPortPutByte(HeadlessGlobals->TerminalPort, Data[i]++); + } +} + +VOID +NTAPI +HdlspPutString(IN PUCHAR String) { PUCHAR Dest = HeadlessGlobals->TmpBuffer; UCHAR Char = 0; @@ -306,17 +316,18 @@ break; } - /* Terminal should be on */ - if (HeadlessGlobals->TerminalEnabled) - { - /* Print each byte in the string making sure VT100 chars are used */ - PutString = InputBuffer; - HdlspPutString(PutString->String); - } - - /* Return success either way */ - Status = STATUS_SUCCESS; - break; + /* Terminal should be on */ + if (HeadlessGlobals->TerminalEnabled) + { + /* Print each byte in the string making sure VT100 chars are used */ + PutString = InputBuffer; + HdlspPutString(PutString->String); + } + + /* Return success either way */ + Status = STATUS_SUCCESS; + break; + case HeadlessCmdClearDisplay: break; case HeadlessCmdClearToEndOfDisplay: @@ -403,10 +414,29 @@ case HeadlessCmdQueryGUID: break; case HeadlessCmdPutData: - break; - default: - break; - } + + /* Validate the existence of an input buffer */ + if (!(InputBuffer) || !(InputBufferSize)) + { + Status = STATUS_INVALID_PARAMETER; + break; + } + + /* Terminal should be on */ + if (HeadlessGlobals->TerminalEnabled) + { + /* Print each byte in the string making sure VT100 chars are used */ + PutString = InputBuffer; + HdlspPutData(PutString->String, InputBufferSize); + } + + /* Return success either way */ + Status = STATUS_SUCCESS; + break; + + default: + break; + } /* Unset processing state */ if ((Command != HeadlessCmdAddLogEntry) &&

11 years, 4 months

[akhaldi] 59731: [SAL] * Add _Ret_writes_maybenull_z_ annotation.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Aug 13 21:21:08 2013 New Revision: 59731 URL: http://svn.reactos.org/svn/reactos?rev=59731&view=rev Log: [SAL] * Add _Ret_writes_maybenull_z_ annotation. Modified: trunk/reactos/include/psdk/sal.h Modified: trunk/reactos/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal.h?rev=597… ============================================================================== --- trunk/reactos/include/psdk/sal.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sal.h [iso-8859-1] Tue Aug 13 21:21:08 2013 @@ -1030,7 +1030,7 @@ //#define _Ret_writes_bytes_to_(size,count) //#define _Ret_writes_bytes_to_maybenull_(size,count) //#define _Ret_writes_maybenull_(size) -//#define _Ret_writes_maybenull_z_(size) +#define _Ret_writes_maybenull_z_(size) _SAL2_NAME(_Ret_writes_maybenull_z_) _Group_([SA_Post(Null=SA_Maybe,ValidElements="\n" _SA_SPECSTRIZE(size),NullTerminated=SA_Yes)] [SA_Post(Valid=SA_Yes)]) //#define _Ret_writes_to_(size,count) //#define _Ret_writes_to_maybenull_(size,count) //#define _Ret_writes_z_(size)

11 years, 4 months

[hbelusca] 59730: [NTVDM] Simplify the code

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Aug 13 20:15:24 2013 New Revision: 59730 URL: http://svn.reactos.org/svn/reactos?rev=59730&view=rev Log: [NTVDM] Simplify the code Modified: branches/ntvdm/subsystems/ntvdm/bios.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Tue Aug 13 20:15:24 2013 @@ -429,7 +429,11 @@ BOOLEAN BiosSetVideoPage(BYTE PageNumber) { + /* Check if the page exists */ if (PageNumber >= BIOS_MAX_PAGES) return FALSE; + + /* Check if this is the same page */ + if (PageNumber == Bda->VideoPage) return TRUE; /* Set the values in the BDA */ Bda->VideoPage = PageNumber; @@ -744,7 +748,6 @@ { BiosSetVideoMode(LOBYTE(Eax)); VgaClearMemory(); - break; } @@ -800,15 +803,7 @@ /* Select Active Display Page */ case 0x05: { - /* Check if the page exists */ - if (LOBYTE(Eax) >= BIOS_MAX_PAGES) break; - - /* Check if this is the same page */ - if (LOBYTE(Eax) == Bda->VideoPage) break; - - /* Change the video page */ BiosSetVideoPage(LOBYTE(Eax)); - break; }

11 years, 4 months

[aandrejevic] 59729: [NTVDM] Fix bug with VGA DAC register access.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Tue Aug 13 19:00:02 2013 New Revision: 59729 URL: http://svn.reactos.org/svn/reactos?rev=59729&view=rev Log: [NTVDM] Fix bug with VGA DAC register access. Modified: branches/ntvdm/subsystems/ntvdm/vga.c Modified: branches/ntvdm/subsystems/ntvdm/vga.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] Tue Aug 13 19:00:02 2013 @@ -98,7 +98,7 @@ static BYTE VgaAcIndex = VGA_AC_PAL_0_REG; static BOOLEAN VgaAcLatch = FALSE; static BYTE VgaAcRegisters[VGA_AC_MAX_REG]; -static BYTE VgaDacIndex = 0; +static WORD VgaDacIndex = 0; static BOOLEAN VgaDacReadWrite = FALSE; static BYTE VgaDacRegisters[VGA_PALETTE_SIZE]; static HPALETTE PaletteHandle = NULL; @@ -957,7 +957,7 @@ case VGA_DAC_WRITE_INDEX: { - return VgaDacIndex; + return VgaDacIndex / 3; } case VGA_DAC_DATA: @@ -1066,7 +1066,7 @@ case VGA_DAC_READ_INDEX: { VgaDacReadWrite = FALSE; - VgaDacIndex = Data % VGA_PALETTE_SIZE; + VgaDacIndex = Data * 3; break; } @@ -1074,7 +1074,7 @@ case VGA_DAC_WRITE_INDEX: { VgaDacReadWrite = TRUE; - VgaDacIndex = Data % VGA_PALETTE_SIZE; + VgaDacIndex = Data * 3; break; }

11 years, 4 months

[aandrejevic] 59728: [NTVDM] Fix VGA register constants.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Tue Aug 13 18:41:35 2013 New Revision: 59728 URL: http://svn.reactos.org/svn/reactos?rev=59728&view=rev Log: [NTVDM] Fix VGA register constants. Modified: branches/ntvdm/subsystems/ntvdm/bios.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Tue Aug 13 18:41:35 2013 @@ -47,7 +47,7 @@ /* AC Registers */ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x39, 0x0A, 0x3B, - 0x0C, 0x3D, 0x0E, 0x3F, 0x10, 0x00, 0x12, 0x08, 0x04 + 0x0C, 0x3D, 0x0E, 0x3F, 0x01, 0x00, 0x12, 0x08, 0x04 }; static BYTE VideoMode_80x25_text[] = @@ -68,7 +68,7 @@ /* AC Registers */ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x39, 0x0A, 0x3B, - 0x0C, 0x3D, 0x0E, 0x3F, 0x10, 0x00, 0x12, 0x08, 0x04 + 0x0C, 0x3D, 0x0E, 0x3F, 0x01, 0x00, 0x12, 0x08, 0x04 }; static BYTE VideoMode_320x200_4color[] = @@ -89,7 +89,7 @@ /* AC Registers */ 0x00, 0x13, 0x02, 0x17, 0x04, 0x04, 0x06, 0x07, 0x08, 0x11, 0x0A, 0x13, - 0x0C, 0x15, 0x0E, 0x17, 0x10, 0x00, 0x12, 0x00, 0x04 + 0x0C, 0x15, 0x0E, 0x17, 0x01, 0x00, 0x12, 0x00, 0x04 }; static BYTE VideoMode_640x200_2color[] = @@ -110,7 +110,7 @@ /* AC Registers */ 0x00, 0x17, 0x02, 0x17, 0x04, 0x17, 0x06, 0x17, 0x08, 0x17, 0x0A, 0x17, - 0x0C, 0x17, 0x0E, 0x17, 0x10, 0x00, 0x12, 0x00, 0x04 + 0x0C, 0x17, 0x0E, 0x17, 0x01, 0x00, 0x12, 0x00, 0x04 }; static BYTE VideoMode_320x200_16color[] = @@ -131,7 +131,7 @@ /* AC Registers */ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x11, 0x0A, 0x13, - 0x0C, 0x15, 0x0E, 0x17, 0x10, 0x00, 0x12, 0x00, 0x04 + 0x0C, 0x15, 0x0E, 0x17, 0x01, 0x00, 0x12, 0x00, 0x04 }; static BYTE VideoMode_640x200_16color[] = @@ -152,7 +152,7 @@ /* AC Registers */ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x11, 0x0A, 0x13, - 0x0C, 0x15, 0x0E, 0x17, 0x10, 0x00, 0x12, 0x00, 0x04 + 0x0C, 0x15, 0x0E, 0x17, 0x01, 0x00, 0x12, 0x00, 0x04 }; static BYTE VideoMode_640x350_16color[] = @@ -173,7 +173,7 @@ /* AC Registers */ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x39, 0x0A, 0x3B, - 0x0C, 0x3D, 0x0E, 0x3F, 0x10, 0x00, 0x12, 0x00, 0x04 + 0x0C, 0x3D, 0x0E, 0x3F, 0x01, 0x00, 0x12, 0x00, 0x04 }; static BYTE VideoMode_640x480_2color[] = @@ -194,7 +194,7 @@ /* AC Registers */ 0x00, 0x3F, 0x02, 0x3F, 0x04, 0x3F, 0x06, 0x3F, 0x08, 0x3F, 0x0A, 0x3F, - 0x0C, 0x3F, 0x0E, 0x3F, 0x10, 0x00, 0x12, 0x00, 0x04 + 0x0C, 0x3F, 0x0E, 0x3F, 0x01, 0x00, 0x12, 0x00, 0x04 }; static BYTE VideoMode_640x480_16color[] = @@ -215,7 +215,7 @@ /* AC Registers */ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x39, 0x0A, 0x3B, - 0x0C, 0x3D, 0x0E, 0x3F, 0x10, 0x00, 0x12, 0x00, 0x04 + 0x0C, 0x3D, 0x0E, 0x3F, 0x01, 0x00, 0x12, 0x00, 0x04 }; static BYTE VideoMode_320x200_256color[] = @@ -236,7 +236,7 @@ /* AC Registers */ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, - 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x00, 0x12, 0x00, 0x04 + 0x0C, 0x0D, 0x0E, 0x0F, 0x41, 0x00, 0x12, 0x00, 0x04 }; static LPBYTE VideoModes[] =

11 years, 4 months

[akhaldi] 59727: [PSDK] * Update oleauto.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Aug 13 18:23:10 2013 New Revision: 59727 URL: http://svn.reactos.org/svn/reactos?rev=59727&view=rev Log: [PSDK] * Update oleauto.h. Modified: trunk/reactos/include/psdk/oleauto.h Modified: trunk/reactos/include/psdk/oleauto.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/oleauto.h?rev… ============================================================================== --- trunk/reactos/include/psdk/oleauto.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/oleauto.h [iso-8859-1] Tue Aug 13 18:23:10 2013 @@ -750,6 +750,8 @@ HRESULT WINAPI QueryPathOfRegTypeLib(REFGUID,WORD,WORD,LCID,LPBSTR); HRESULT WINAPI RegisterTypeLib(ITypeLib*,OLECHAR*,OLECHAR*); HRESULT WINAPI UnRegisterTypeLib(REFGUID,WORD,WORD,LCID,SYSKIND); +HRESULT WINAPI RegisterTypeLibForUser(ITypeLib*,OLECHAR*,OLECHAR*); +HRESULT WINAPI UnRegisterTypeLibForUser(REFGUID,WORD,WORD,LCID,SYSKIND); VOID WINAPI ClearCustData(LPCUSTDATA);

11 years, 4 months

[akhaldi] 59726: [PSDK] * Annotate commctrl.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Aug 13 18:09:50 2013 New Revision: 59726 URL: http://svn.reactos.org/svn/reactos?rev=59726&view=rev Log: [PSDK] * Annotate commctrl.h. Modified: trunk/reactos/include/psdk/commctrl.h Modified: trunk/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re… ============================================================================== --- trunk/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/commctrl.h [iso-8859-1] Tue Aug 13 18:09:50 2013 @@ -3,6 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ + #ifndef _INC_COMMCTRL #define _INC_COMMCTRL @@ -21,7 +22,7 @@ #ifndef _HRESULT_DEFINED #define _HRESULT_DEFINED -typedef LONG HRESULT; +typedef _Return_type_success_(return >= 0) LONG HRESULT; #endif #ifndef NOUSER @@ -70,7 +71,8 @@ #define ICC_NATIVEFNTCTL_CLASS 0x2000 #define ICC_STANDARD_CLASSES 0x4000 #define ICC_LINK_CLASS 0x8000 - WINCOMMCTRLAPI WINBOOL WINAPI InitCommonControlsEx(const INITCOMMONCONTROLSEX *); + + WINCOMMCTRLAPI WINBOOL WINAPI InitCommonControlsEx(_In_ const INITCOMMONCONTROLSEX *); #define ODT_HEADER 100 #define ODT_TAB 101 @@ -330,15 +332,57 @@ #define ILC_PERITEMMIRROR 0x8000 WINCOMMCTRLAPI HIMAGELIST WINAPI ImageList_Create(int cx,int cy,UINT flags,int cInitial,int cGrow); - WINCOMMCTRLAPI WINBOOL WINAPI ImageList_Destroy(HIMAGELIST himl); - WINCOMMCTRLAPI int WINAPI ImageList_GetImageCount(HIMAGELIST himl); - WINCOMMCTRLAPI WINBOOL WINAPI ImageList_SetImageCount(HIMAGELIST himl,UINT uNewCount); - WINCOMMCTRLAPI int WINAPI ImageList_Add(HIMAGELIST himl,HBITMAP hbmImage,HBITMAP hbmMask); - WINCOMMCTRLAPI int WINAPI ImageList_ReplaceIcon(HIMAGELIST himl,int i,HICON hicon); - WINCOMMCTRLAPI COLORREF WINAPI ImageList_SetBkColor(HIMAGELIST himl,COLORREF clrBk); - WINCOMMCTRLAPI COLORREF WINAPI ImageList_GetBkColor(HIMAGELIST himl); - WINCOMMCTRLAPI WINBOOL WINAPI ImageList_SetOverlayImage(HIMAGELIST himl,int iImage,int iOverlay); - WINCOMMCTRLAPI HRESULT WINAPI HIMAGELIST_QueryInterface(HIMAGELIST,REFIID,void **); + WINCOMMCTRLAPI WINBOOL WINAPI ImageList_Destroy(_In_opt_ HIMAGELIST himl); + WINCOMMCTRLAPI int WINAPI ImageList_GetImageCount(_In_ HIMAGELIST himl); + + WINCOMMCTRLAPI + WINBOOL + WINAPI + ImageList_SetImageCount( + _In_ HIMAGELIST himl, + _In_ UINT uNewCount); + + WINCOMMCTRLAPI + int + WINAPI + ImageList_Add( + _In_ HIMAGELIST himl, + _In_ HBITMAP hbmImage, + _In_opt_ HBITMAP hbmMask); + + WINCOMMCTRLAPI + int + WINAPI + ImageList_ReplaceIcon( + _In_ HIMAGELIST himl, + _In_ int i, + _In_ HICON hicon); + + WINCOMMCTRLAPI + COLORREF + WINAPI + ImageList_SetBkColor( + _In_ HIMAGELIST himl, + _In_ COLORREF clrBk); + + WINCOMMCTRLAPI COLORREF WINAPI ImageList_GetBkColor(_In_ HIMAGELIST himl); + + WINCOMMCTRLAPI + WINBOOL + WINAPI + ImageList_SetOverlayImage( + _In_ HIMAGELIST himl, + _In_ int iImage, + _In_ int iOverlay); + + WINCOMMCTRLAPI + HRESULT + WINAPI + HIMAGELIST_QueryInterface( + _In_ HIMAGELIST, + _In_ REFIID, + _Outptr_ void **); + #define ImageList_AddIcon(himl,hicon) ImageList_ReplaceIcon(himl,-1,hicon) #define ILD_NORMAL 0x0 @@ -365,13 +409,70 @@ #define ILS_SATURATE 0x4 #define ILS_ALPHA 0x8 - WINCOMMCTRLAPI WINBOOL WINAPI ImageList_Draw(HIMAGELIST himl,int i,HDC hdcDst,int x,int y,UINT fStyle); - WINCOMMCTRLAPI WINBOOL WINAPI ImageList_Replace(HIMAGELIST himl,int i,HBITMAP hbmImage,HBITMAP hbmMask); - WINCOMMCTRLAPI int WINAPI ImageList_AddMasked(HIMAGELIST himl,HBITMAP hbmImage,COLORREF crMask); - WINCOMMCTRLAPI WINBOOL WINAPI ImageList_DrawEx(HIMAGELIST himl,int i,HDC hdcDst,int x,int y,int dx,int dy,COLORREF rgbBk,COLORREF rgbFg,UINT fStyle); - WINCOMMCTRLAPI WINBOOL WINAPI ImageList_DrawIndirect(IMAGELISTDRAWPARAMS *pimldp); - WINCOMMCTRLAPI WINBOOL WINAPI ImageList_Remove(HIMAGELIST himl,int i); - WINCOMMCTRLAPI HICON WINAPI ImageList_GetIcon(HIMAGELIST himl,int i,UINT flags); + WINCOMMCTRLAPI + WINBOOL + WINAPI + ImageList_Draw( + _In_ HIMAGELIST himl, + _In_ int i, + _In_ HDC hdcDst, + _In_ int x, + _In_ int y, + _In_ UINT fStyle); + + WINCOMMCTRLAPI + WINBOOL + WINAPI + ImageList_Replace( + _In_ HIMAGELIST himl, + _In_ int i, + _In_ HBITMAP hbmImage, + _In_opt_ HBITMAP hbmMask); + + WINCOMMCTRLAPI + int + WINAPI + ImageList_AddMasked( + _In_ HIMAGELIST himl, + _In_ HBITMAP hbmImage, + _In_ COLORREF crMask); + + WINCOMMCTRLAPI + WINBOOL + WINAPI + ImageList_DrawEx( + _In_ HIMAGELIST himl, + _In_ int i, + _In_ HDC hdcDst, + _In_ int x, + _In_ int y, + _In_ int dx, + _In_ int dy, + _In_ COLORREF rgbBk, + _In_ COLORREF rgbFg, + _In_ UINT fStyle); + + WINCOMMCTRLAPI + WINBOOL + WINAPI + ImageList_DrawIndirect( + _In_ IMAGELISTDRAWPARAMS *pimldp); + + WINCOMMCTRLAPI + WINBOOL + WINAPI + ImageList_Remove( + _In_ HIMAGELIST himl, + _In_ int i); + + WINCOMMCTRLAPI + HICON + WINAPI + ImageList_GetIcon( + _In_ HIMAGELIST himl, + _In_ int i, + _In_ UINT flags); + WINCOMMCTRLAPI HIMAGELIST WINAPI ImageList_LoadImageA(HINSTANCE hi,LPCSTR lpbmp,int cx,int cGrow,COLORREF crMask,UINT uType,UINT uFlags); WINCOMMCTRLAPI HIMAGELIST WINAPI ImageList_LoadImageW(HINSTANCE hi,LPCWSTR lpbmp,int cx,int cGrow,COLORREF crMask,UINT uType,UINT uFlags); @@ -379,26 +480,61 @@ #define ILCF_MOVE 0x0 #define ILCF_SWAP 0x1 - WINCOMMCTRLAPI WINBOOL WINAPI ImageList_Copy(HIMAGELIST himlDst,int iDst,HIMAGELIST himlSrc,int iSrc,UINT uFlags); - WINCOMMCTRLAPI WINBOOL WINAPI ImageList_BeginDrag(HIMAGELIST himlTrack,int iTrack,int dxHotspot,int dyHotspot); + + WINCOMMCTRLAPI + WINBOOL + WINAPI + ImageList_Copy( + _In_ HIMAGELIST himlDst, + _In_ int iDst, + _In_ HIMAGELIST himlSrc, + _In_ int iSrc, + _In_ UINT uFlags); + + WINCOMMCTRLAPI + WINBOOL + WINAPI + ImageList_BeginDrag( + _In_ HIMAGELIST himlTrack, + _In_ int iTrack, + _In_ int dxHotspot, + _In_ int dyHotspot); + WINCOMMCTRLAPI void WINAPI ImageList_EndDrag(void); WINCOMMCTRLAPI WINBOOL WINAPI ImageList_DragEnter(HWND hwndLock,int x,int y); WINCOMMCTRLAPI WINBOOL WINAPI ImageList_DragLeave(HWND hwndLock); WINCOMMCTRLAPI WINBOOL WINAPI ImageList_DragMove(int x,int y); - WINCOMMCTRLAPI WINBOOL WINAPI ImageList_SetDragCursorImage(HIMAGELIST himlDrag,int iDrag,int dxHotspot,int dyHotspot); + + WINCOMMCTRLAPI + WINBOOL + WINAPI + ImageList_SetDragCursorImage( + _In_ HIMAGELIST himlDrag, + _In_ int iDrag, + _In_ int dxHotspot, + _In_ int dyHotspot); + WINCOMMCTRLAPI WINBOOL WINAPI ImageList_DragShowNolock(WINBOOL fShow); - WINCOMMCTRLAPI HIMAGELIST WINAPI ImageList_GetDragImage(POINT *ppt,POINT *pptHotspot); + + _Success_(return != NULL) + WINCOMMCTRLAPI + HIMAGELIST + WINAPI + ImageList_GetDragImage( + _Out_opt_ POINT *ppt, + _Out_opt_ POINT *pptHotspot); + #define ImageList_RemoveAll(himl) ImageList_Remove(himl,-1) #define ImageList_ExtractIcon(hi,himl,i) ImageList_GetIcon(himl,i,0) #define ImageList_LoadBitmap(hi,lpbmp,cx,cGrow,crMask) ImageList_LoadImage(hi,lpbmp,cx,cGrow,crMask,IMAGE_BITMAP,0) #ifdef __IStream_INTERFACE_DEFINED__ - WINCOMMCTRLAPI HIMAGELIST WINAPI ImageList_Read(LPSTREAM pstm); - WINCOMMCTRLAPI WINBOOL WINAPI ImageList_Write(HIMAGELIST himl,LPSTREAM pstm); + WINCOMMCTRLAPI HIMAGELIST WINAPI ImageList_Read(_In_ LPSTREAM pstm); + WINCOMMCTRLAPI WINBOOL WINAPI ImageList_Write(_In_ HIMAGELIST himl, _In_ LPSTREAM pstm); #define ILP_NORMAL 0 #define ILP_DOWNLEVEL 1 - WINCOMMCTRLAPI HRESULT WINAPI ImageList_ReadEx(DWORD dwFlags,LPSTREAM pstm,REFIID riid,PVOID *ppv); - WINCOMMCTRLAPI HRESULT WINAPI ImageList_WriteEx(HIMAGELIST himl,DWORD dwFlags,LPSTREAM pstm); + WINCOMMCTRLAPI HRESULT WINAPI ImageList_ReadEx(_In_ DWORD dwFlags, _In_ LPSTREAM pstm, _In_ REFIID riid, _Outptr_ PVOID *ppv); + WINCOMMCTRLAPI HRESULT WINAPI ImageList_WriteEx(_In_ HIMAGELIST himl, _In_ DWORD dwFlags, _In_ LPSTREAM pstm); #endif #ifndef IMAGEINFO @@ -411,11 +547,46 @@ } IMAGEINFO,*LPIMAGEINFO; #endif - WINCOMMCTRLAPI WINBOOL WINAPI ImageList_GetIconSize(HIMAGELIST himl,int *cx,int *cy); - WINCOMMCTRLAPI WINBOOL WINAPI ImageList_SetIconSize(HIMAGELIST himl,int cx,int cy); - WINCOMMCTRLAPI WINBOOL WINAPI ImageList_GetImageInfo(HIMAGELIST himl,int i,IMAGEINFO *pImageInfo); - WINCOMMCTRLAPI HIMAGELIST WINAPI ImageList_Merge(HIMAGELIST himl1,int i1,HIMAGELIST himl2,int i2,int dx,int dy); - WINCOMMCTRLAPI HIMAGELIST WINAPI ImageList_Duplicate(HIMAGELIST himl); + _Success_(return != 0) + WINCOMMCTRLAPI + WINBOOL + WINAPI + ImageList_GetIconSize( + _In_ HIMAGELIST himl, + _Out_opt_ int *cx, + _Out_opt_ int *cy); + + _Success_(return != 0) + WINCOMMCTRLAPI + WINBOOL + WINAPI + ImageList_SetIconSize( + _In_ HIMAGELIST himl, + _In_ int cx, + _In_ int cy); + + _Success_(return != 0) + WINCOMMCTRLAPI + WINBOOL + WINAPI + ImageList_GetImageInfo( + _In_ HIMAGELIST himl, + _In_ int i, + _Out_ IMAGEINFO *pImageInfo); + + WINCOMMCTRLAPI + HIMAGELIST + WINAPI + ImageList_Merge( + _In_ HIMAGELIST himl1, + _In_ int i1, + _In_ HIMAGELIST himl2, + _In_ int i2, + _In_ int dx, + _In_ int dy); + + WINCOMMCTRLAPI HIMAGELIST WINAPI ImageList_Duplicate(_In_ HIMAGELIST himl); + #endif #ifndef NOHEADER @@ -1760,8 +1931,22 @@ #ifndef NOMENUHELP WINCOMMCTRLAPI void WINAPI MenuHelp(UINT uMsg,WPARAM wParam,LPARAM lParam,HMENU hMainMenu,HINSTANCE hInst,HWND hwndStatus,UINT *lpwIDs); - WINCOMMCTRLAPI WINBOOL WINAPI ShowHideMenuCtl(HWND hWnd,UINT_PTR uFlags,LPINT lpInfo); - WINCOMMCTRLAPI void WINAPI GetEffectiveClientRect(HWND hWnd,LPRECT lprc,const INT *lpInfo); + + WINCOMMCTRLAPI + WINBOOL + WINAPI + ShowHideMenuCtl( + _In_ HWND hWnd, + _In_ UINT_PTR uFlags, + _In_z_ LPINT lpInfo); + + WINCOMMCTRLAPI + void + WINAPI + GetEffectiveClientRect( + _In_ HWND hWnd, + _Out_ LPRECT lprc, + _In_z_ const INT *lpInfo); #define MINSYSCOMMAND SC_SIZE #endif @@ -4519,33 +4704,79 @@ typedef int (CALLBACK *PFNDSAENUMCALLBACK)(void *p,void *pData); WINCOMMCTRLAPI HDSA WINAPI DSA_Create(int cbItem,int cItemGrow); - WINCOMMCTRLAPI WINBOOL WINAPI DSA_Destroy(HDSA hdsa); - WINCOMMCTRLAPI void WINAPI DSA_DestroyCallback(HDSA hdsa,PFNDSAENUMCALLBACK pfnCB,void *pData); - WINCOMMCTRLAPI PVOID WINAPI DSA_GetItemPtr(HDSA hdsa,int i); - WINCOMMCTRLAPI int WINAPI DSA_InsertItem(HDSA hdsa,int i,void *pitem); + WINCOMMCTRLAPI WINBOOL WINAPI DSA_Destroy(_Inout_opt_ HDSA hdsa); + + WINCOMMCTRLAPI + void + WINAPI + DSA_DestroyCallback( + _Inout_opt_ HDSA hdsa, + _In_ PFNDSAENUMCALLBACK pfnCB, + _In_opt_ void *pData); + + WINCOMMCTRLAPI PVOID WINAPI DSA_GetItemPtr(_In_ HDSA hdsa, int i); + + WINCOMMCTRLAPI + int + WINAPI + DSA_InsertItem( + _Inout_ HDSA hdsa, + _In_ int i, + _In_ void *pitem); typedef struct _DPA *HDPA; WINCOMMCTRLAPI HDPA WINAPI DPA_Create(int cItemGrow); - WINCOMMCTRLAPI WINBOOL WINAPI DPA_Destroy(HDPA hdpa); - WINCOMMCTRLAPI PVOID WINAPI DPA_DeletePtr(HDPA hdpa,int i); - WINCOMMCTRLAPI WINBOOL WINAPI DPA_DeleteAllPtrs(HDPA hdpa); - WINCOMMCTRLAPI void WINAPI DPA_EnumCallback(HDPA hdpa,PFNDPAENUMCALLBACK pfnCB,void *pData); - WINCOMMCTRLAPI void WINAPI DPA_DestroyCallback(HDPA hdpa,PFNDPAENUMCALLBACK pfnCB,void *pData); - WINCOMMCTRLAPI WINBOOL WINAPI DPA_SetPtr(HDPA hdpa,int i,void *p); - WINCOMMCTRLAPI int WINAPI DPA_InsertPtr(HDPA hdpa,int i,void *p); - WINCOMMCTRLAPI PVOID WINAPI DPA_GetPtr(HDPA hdpa,INT_PTR i); + WINCOMMCTRLAPI WINBOOL WINAPI DPA_Destroy(_Inout_opt_ HDPA hdpa); + WINCOMMCTRLAPI PVOID WINAPI DPA_DeletePtr(_Inout_ HDPA hdpa, _In_ int i); + WINCOMMCTRLAPI WINBOOL WINAPI DPA_DeleteAllPtrs(_Inout_ HDPA hdpa); + + WINCOMMCTRLAPI + void + WINAPI + DPA_EnumCallback( + _In_opt_ HDPA hdpa, + _In_opt_ PFNDPAENUMCALLBACK pfnCB, + _In_opt_ void *pData); + + WINCOMMCTRLAPI + void + WINAPI + DPA_DestroyCallback( + _Inout_opt_ HDPA hdpa, + _In_ PFNDPAENUMCALLBACK pfnCB, + _In_opt_ void *pData); typedef int (CALLBACK *PFNDPACOMPARE)(void *p1,void *p2,LPARAM lParam); - WINCOMMCTRLAPI WINBOOL WINAPI DPA_Sort(HDPA hdpa,PFNDPACOMPARE pfnCompare,LPARAM lParam); + WINCOMMCTRLAPI + WINBOOL + WINAPI + DPA_Sort( + _Inout_ HDPA hdpa, + _In_ PFNDPACOMPARE pfnCompare, + _In_ LPARAM lParam); #define DPAS_SORTED 0x1 #define DPAS_INSERTBEFORE 0x2 #define DPAS_INSERTAFTER 0x4 - WINCOMMCTRLAPI int WINAPI DPA_Search(HDPA hdpa,void *pFind,int iStart,PFNDPACOMPARE pfnCompare,LPARAM lParam,UINT options); - WINCOMMCTRLAPI WINBOOL WINAPI Str_SetPtrW(LPWSTR *ppsz,LPCWSTR psz); + WINCOMMCTRLAPI + int + WINAPI + DPA_Search( + _In_ HDPA hdpa, + _In_opt_ void *pFind, + _In_ int iStart, + _In_ PFNDPACOMPARE pfnCompare, + _In_ LPARAM lParam, + _In_ UINT options); + + WINCOMMCTRLAPI + WINBOOL + WINAPI Str_SetPtrW( + _Inout_ LPWSTR *ppsz, + _In_opt_ LPCWSTR psz); typedef struct _DPASTREAMINFO { int iPos; @@ -4553,17 +4784,71 @@ } DPASTREAMINFO; struct IStream; -typedef HRESULT (CALLBACK *PFNDPASTREAM)(DPASTREAMINFO*, struct IStream*, void*); -typedef void* (CALLBACK *PFNDPAMERGE)(UINT, void*, void*, LPARAM); -typedef const void* (CALLBACK *PFNDPAMERGECONST)(UINT, const void*, const void*, LPARAM); - - WINCOMMCTRLAPI HRESULT WINAPI DPA_LoadStream(HDPA * phdpa, PFNDPASTREAM pfn, struct IStream * pstream, void *pvInstData); - WINCOMMCTRLAPI HRESULT WINAPI DPA_SaveStream(HDPA hdpa, PFNDPASTREAM pfn, struct IStream * pstream, void *pvInstData); - WINCOMMCTRLAPI WINBOOL WINAPI DPA_Grow(HDPA pdpa, int cp); - WINCOMMCTRLAPI int WINAPI DPA_InsertPtr(HDPA hdpa, int i, void *p); - WINCOMMCTRLAPI PVOID WINAPI DPA_GetPtr(HDPA hdpa, INT_PTR i); - WINCOMMCTRLAPI WINBOOL WINAPI DPA_SetPtr(HDPA hdpa, int i, void *p); - WINCOMMCTRLAPI int WINAPI DPA_GetPtrIndex(HDPA hdpa, const void *p); + +typedef HRESULT +(CALLBACK *PFNDPASTREAM)( + _In_ DPASTREAMINFO*, + _In_ struct IStream*, + _In_opt_ void*); + +typedef void* +(CALLBACK *PFNDPAMERGE)( + _In_ UINT, + _In_ void*, + _In_ void*, + _In_ LPARAM); + +typedef const void* +(CALLBACK *PFNDPAMERGECONST)( + _In_ UINT, + _In_ const void*, + _In_ const void*, + _In_ LPARAM); + + WINCOMMCTRLAPI + HRESULT + WINAPI + DPA_LoadStream( + _Outptr_ HDPA * phdpa, + _In_ PFNDPASTREAM pfn, + _In_ struct IStream * pstream, + _In_opt_ void *pvInstData); + + WINCOMMCTRLAPI + HRESULT + WINAPI + DPA_SaveStream( + _In_ HDPA hdpa, + _In_ PFNDPASTREAM pfn, + _In_ struct IStream * pstream, + _In_opt_ void *pvInstData); + + WINCOMMCTRLAPI WINBOOL WINAPI DPA_Grow(_Inout_ HDPA pdpa, _In_ int cp); + + WINCOMMCTRLAPI + int + WINAPI + DPA_InsertPtr( + _Inout_ HDPA hdpa, + _In_ int i, + _In_opt_ void *p); + + WINCOMMCTRLAPI PVOID WINAPI DPA_GetPtr(_In_ HDPA hdpa, _In_ INT_PTR i); + + WINCOMMCTRLAPI + WINBOOL + WINAPI + DPA_SetPtr( + _Inout_ HDPA hdpa, + _In_ int i, + _In_opt_ void *p); + + WINCOMMCTRLAPI + int + WINAPI + DPA_GetPtrIndex( + _In_ HDPA hdpa, + _In_opt_ const void *p); #define DPA_GetPtrCount(hdpa) (*(int *)(hdpa)) #define DPA_SetPtrCount(hdpa, cItems) (*(int *)(hdpa) = (cItems)) @@ -4606,7 +4891,12 @@ } TRACKMOUSEEVENT,*LPTRACKMOUSEEVENT; #endif - WINCOMMCTRLAPI WINBOOL WINAPI _TrackMouseEvent(LPTRACKMOUSEEVENT lpEventTrack); + WINCOMMCTRLAPI + WINBOOL + WINAPI + _TrackMouseEvent( + _Inout_ LPTRACKMOUSEEVENT lpEventTrack); + #endif #ifndef NOFLATSBAPIS @@ -4653,11 +4943,46 @@ typedef LRESULT (CALLBACK *SUBCLASSPROC)(HWND hWnd,UINT uMsg,WPARAM wParam,LPARAM lParam,UINT_PTR uIdSubclass,DWORD_PTR dwRefData); - WINBOOL WINAPI SetWindowSubclass(HWND hWnd,SUBCLASSPROC pfnSubclass,UINT_PTR uIdSubclass,DWORD_PTR dwRefData); - WINBOOL WINAPI GetWindowSubclass(HWND hWnd,SUBCLASSPROC pfnSubclass,UINT_PTR uIdSubclass,DWORD_PTR *pdwRefData); - WINBOOL WINAPI RemoveWindowSubclass(HWND hWnd,SUBCLASSPROC pfnSubclass,UINT_PTR uIdSubclass); + _Success_(return != 0) + WINBOOL + WINAPI + SetWindowSubclass( + _In_ HWND hWnd, + _In_ SUBCLASSPROC pfnSubclass, + _In_ UINT_PTR uIdSubclass, + _In_ DWORD_PTR dwRefData); + + _Success_(return != 0) + WINBOOL + WINAPI + GetWindowSubclass( + _In_ HWND hWnd, + _In_ SUBCLASSPROC pfnSubclass, + _In_ UINT_PTR uIdSubclass, + _Out_opt_ DWORD_PTR *pdwRefData); + + _Success_(return != 0) + WINBOOL + WINAPI + RemoveWindowSubclass( + _In_ HWND hWnd, + _In_ SUBCLASSPROC pfnSubclass, + _In_ UINT_PTR uIdSubclass); + LRESULT WINAPI DefSubclassProc(HWND hWnd,UINT uMsg,WPARAM wParam,LPARAM lParam); - int WINAPI DrawShadowText(HDC hdc,LPCWSTR pszText,UINT cch,RECT *prc,DWORD dwFlags,COLORREF crText,COLORREF crShadow,int ixOffset,int iyOffset); + + int + WINAPI + DrawShadowText( + _In_ HDC hdc, + _In_reads_(cch) LPCWSTR pszText, + _In_ UINT cch, + _In_ RECT *prc, + _In_ DWORD dwFlags, + _In_ COLORREF crText, + _In_ COLORREF crShadow, + _In_ int ixOffset, + _In_ int iyOffset); #ifndef NOTASKDIALOG @@ -4701,7 +5026,13 @@ PCWSTR pszButtonText; } TASKDIALOG_BUTTON; -typedef HRESULT (CALLBACK *PFTASKDIALOGCALLBACK)(HWND, UINT, WPARAM, LPARAM, LONG_PTR); +typedef HRESULT +(CALLBACK *PFTASKDIALOGCALLBACK)( + _In_ HWND, + _In_ UINT, + _In_ WPARAM, + _In_ LPARAM, + _In_ LONG_PTR); typedef struct _TASKDIALOGCONFIG { @@ -4739,7 +5070,13 @@ UINT cxWidth; } TASKDIALOGCONFIG; -HRESULT WINAPI TaskDialogIndirect(const TASKDIALOGCONFIG *, int *, int *, BOOL *); +HRESULT +WINAPI +TaskDialogIndirect( + _In_ const TASKDIALOGCONFIG *, + _Out_opt_ int *, + _Out_opt_ int *, + _Out_opt_ BOOL *); #include <poppack.h> @@ -4748,5 +5085,6 @@ #ifdef __cplusplus } #endif -#endif -#endif + +#endif +#endif

11 years, 4 months

[aandrejevic] 59725: [SOFTX86] Fix carry/overflow flag computation for ADD instructions.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Tue Aug 13 17:06:15 2013 New Revision: 59725 URL: http://svn.reactos.org/svn/reactos?rev=59725&view=rev Log: [SOFTX86] Fix carry/overflow flag computation for ADD instructions. Modified: branches/ntvdm/lib/3rdparty/softx86/softx86/add.c Modified: branches/ntvdm/lib/3rdparty/softx86/softx86/add.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/3rdparty/softx86/soft… ============================================================================== --- branches/ntvdm/lib/3rdparty/softx86/softx86/add.c [iso-8859-1] (original) +++ branches/ntvdm/lib/3rdparty/softx86/softx86/add.c [iso-8859-1] Tue Aug 13 17:06:15 2013 @@ -35,13 +35,16 @@ /* peform the addition */ ret = src + val; -/* if carry/overflow */ - if (ret < src) - ctx->state->reg_flags.val |= - (SX86_CPUFLAG_CARRY | SX86_CPUFLAG_OVERFLOW); - else - ctx->state->reg_flags.val &= - ~(SX86_CPUFLAG_CARRY | SX86_CPUFLAG_OVERFLOW); +/* if carry */ + if ((ret < src) || (ret < val)) ctx->state->reg_flags.val |= SX86_CPUFLAG_CARRY; + else ctx->state->reg_flags.val &= ~SX86_CPUFLAG_CARRY; + +/* if overflow */ + if (((src & 0x80) == (val & 0x80)) && ((src & 0x80) != (ret & 0x80))) + { + ctx->state->reg_flags.val |= SX86_CPUFLAG_OVERFLOW; + } + else ctx->state->reg_flags.val &= ~SX86_CPUFLAG_OVERFLOW; /* if result treated as signed value is negative */ if (ret & 0x80) ctx->state->reg_flags.val |= SX86_CPUFLAG_SIGN; @@ -79,13 +82,16 @@ /* peform the addition */ ret = src + val; -/* if carry/overflow */ - if (ret < src) - ctx->state->reg_flags.val |= - (SX86_CPUFLAG_CARRY | SX86_CPUFLAG_OVERFLOW); - else - ctx->state->reg_flags.val &= - ~(SX86_CPUFLAG_CARRY | SX86_CPUFLAG_OVERFLOW); +/* if carry */ + if ((ret < src) || (ret < val)) ctx->state->reg_flags.val |= SX86_CPUFLAG_CARRY; + else ctx->state->reg_flags.val &= ~SX86_CPUFLAG_CARRY; + +/* if overflow */ + if (((src & 0x8000) == (val & 0x8000)) && ((src & 0x8000) != (ret & 0x8000))) + { + ctx->state->reg_flags.val |= SX86_CPUFLAG_OVERFLOW; + } + else ctx->state->reg_flags.val &= ~SX86_CPUFLAG_OVERFLOW; /* if result treated as signed value is negative */ if (ret & 0x8000) @@ -125,13 +131,17 @@ /* peform the addition */ ret = src + val; -/* if carry/overflow */ - if (ret < src) - ctx->state->reg_flags.val |= - (SX86_CPUFLAG_CARRY | SX86_CPUFLAG_OVERFLOW); - else - ctx->state->reg_flags.val &= - ~(SX86_CPUFLAG_CARRY | SX86_CPUFLAG_OVERFLOW); +/* if carry */ + if ((ret < src) || (ret < val)) ctx->state->reg_flags.val |= SX86_CPUFLAG_CARRY; + else ctx->state->reg_flags.val &= ~SX86_CPUFLAG_CARRY; + +/* if overflow */ + if (((src & 0x80000000) == (val & 0x80000000)) + && ((src & 0x80000000) != (ret & 0x80000000))) + { + ctx->state->reg_flags.val |= SX86_CPUFLAG_OVERFLOW; + } + else ctx->state->reg_flags.val &= ~SX86_CPUFLAG_OVERFLOW; /* if result treated as signed value is negative */ if (ret & 0x80000000)

11 years, 4 months

[hbelusca] 59724: [NTVDM] - Add new BIOS video modes (obtained from DosBox with the help of Aleksander) - Remove an unneeded comment.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Aug 13 16:49:54 2013 New Revision: 59724 URL: http://svn.reactos.org/svn/reactos?rev=59724&view=rev Log: [NTVDM] - Add new BIOS video modes (obtained from DosBox with the help of Aleksander) - Remove an unneeded comment. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/vga.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Tue Aug 13 16:49:54 2013 @@ -25,25 +25,29 @@ static HANDLE BiosConsoleOutput = INVALID_HANDLE_VALUE; static CONSOLE_SCREEN_BUFFER_INFO BiosSavedBufferInfo; +/* + * VGA Register Configurations for BIOS Video Modes + * The configurations come from DosBox. + */ static BYTE VideoMode_40x25_text[] = { /* Miscellaneous Register */ 0x67, /* Sequencer Registers */ - 0x03, 0x08, 0x03, 0x00, 0x02, + 0x00, 0x08, 0x03, 0x00, 0x07, /* GC Registers */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x0E, 0x0F, 0xFF, /* CRTC Registers */ - 0x2D, 0x27, 0x28, 0x90, 0x2B, 0xA0, 0xBF, 0x1F, 0x00, 0x4F, 0x0D, 0x0F, + 0x2D, 0x27, 0x28, 0x90, 0x2B, 0xA0, 0xBF, 0x1F, 0x00, 0x4F, 0x0D, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x9C, 0x8E, 0x8F, 0x14, 0x1F, 0x96, 0xB9, 0xA3, 0xFF, /* AC Registers */ - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07, 0x38, 0x39, 0x3A, 0x3B, - 0x3C, 0x3D, 0x3E, 0x3F, 0x0C, 0x01, 0x0F, 0x13, 0x00 + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x39, 0x0A, 0x3B, + 0x0C, 0x3D, 0x0E, 0x3F, 0x10, 0x00, 0x12, 0x08, 0x04 }; static BYTE VideoMode_80x25_text[] = @@ -52,19 +56,19 @@ 0x67, /* Sequencer Registers */ - 0x03, 0x00, 0x03, 0x00, 0x02, + 0x00, 0x00, 0x03, 0x00, 0x07, /* GC Registers */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x0E, 0x0F, 0xFF, /* CRTC Registers */ - 0x5F, 0x4F, 0x50, 0x82, 0x55, 0x81, 0xBF, 0x1F, 0x00, 0x4F, 0x0D, 0x0F, + 0x5F, 0x4F, 0x50, 0x82, 0x55, 0x81, 0xBF, 0x1F, 0x00, 0x4F, 0x0D, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x9C, 0x8E, 0x8F, 0x28, 0x1F, 0x96, 0xB9, 0xA3, 0xFF, /* AC Registers */ - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07, 0x38, 0x39, 0x3A, 0x3B, - 0x3C, 0x3D, 0x3E, 0x3F, 0x0C, 0x01, 0x0F, 0x13, 0x00 + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x39, 0x0A, 0x3B, + 0x0C, 0x3D, 0x0E, 0x3F, 0x10, 0x00, 0x12, 0x08, 0x04 }; static BYTE VideoMode_320x200_4color[] = @@ -73,10 +77,10 @@ 0x63, /* Sequencer Registers */ - 0x03, 0x09, 0x03, 0x00, 0x02, + 0x00, 0x09, 0x00, 0x00, 0x02, /* GC Registers */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x0F, 0x0F, 0xFF, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x0F, 0x0F, 0xFF, /* CRTC Registers */ 0x2D, 0x27, 0x28, 0x90, 0x2B, 0x80, 0xBF, 0x1F, 0x00, 0xC1, 0x00, 0x00, @@ -84,29 +88,134 @@ 0xFF, /* AC Registers */ - 0x00, 0x13, 0x15, 0x17, 0x02, 0x04, 0x06, 0x07, 0x10, 0x11, 0x12, 0x13, - 0x14, 0x15, 0x16, 0x17, 0x01, 0x00, 0x03, 0x00, 0x00 + 0x00, 0x13, 0x02, 0x17, 0x04, 0x04, 0x06, 0x07, 0x08, 0x11, 0x0A, 0x13, + 0x0C, 0x15, 0x0E, 0x17, 0x10, 0x00, 0x12, 0x00, 0x04 }; -static BYTE VideoMode_640x480_16color[] = +static BYTE VideoMode_640x200_2color[] = +{ + /* Miscellaneous Register */ + 0x63, + + /* Sequencer Registers */ + 0x00, 0x09, 0x0F, 0x00, 0x02, + + /* GC Registers */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x0F, 0xFF, + + /* CRTC Registers */ + 0x5F, 0x4F, 0x50, 0x82, 0x54, 0x80, 0xBF, 0x1F, 0x00, 0xC1, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x9C, 0x8E, 0x8F, 0x28, 0x00, 0x96, 0xB9, 0xC2, + 0xFF, + + /* AC Registers */ + 0x00, 0x17, 0x02, 0x17, 0x04, 0x17, 0x06, 0x17, 0x08, 0x17, 0x0A, 0x17, + 0x0C, 0x17, 0x0E, 0x17, 0x10, 0x00, 0x12, 0x00, 0x04 +}; + +static BYTE VideoMode_320x200_16color[] = +{ + /* Miscellaneous Register */ + 0x63, + + /* Sequencer Registers */ + 0x00, 0x09, 0x0F, 0x00, 0x02, + + /* GC Registers */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x0F, 0xFF, + + /* CRTC Registers */ + 0x2D, 0x27, 0x28, 0x90, 0x2B, 0x80, 0xBF, 0x1F, 0x00, 0xC0, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x9C, 0x8E, 0x8F, 0x14, 0x00, 0x96, 0xB9, 0xE3, + 0xFF, + + /* AC Registers */ + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x11, 0x0A, 0x13, + 0x0C, 0x15, 0x0E, 0x17, 0x10, 0x00, 0x12, 0x00, 0x04 +}; + +static BYTE VideoMode_640x200_16color[] = +{ + /* Miscellaneous Register */ + 0x63, + + /* Sequencer Registers */ + 0x00, 0x01, 0x0F, 0x00, 0x02, + + /* GC Registers */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x0F, 0xFF, + + /* CRTC Registers */ + 0x5F, 0x4F, 0x50, 0x82, 0x54, 0x80, 0xBF, 0x1F, 0x00, 0xC0, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x9C, 0x8E, 0x8F, 0x28, 0x00, 0x96, 0xB9, 0xE3, + 0xFF, + + /* AC Registers */ + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x11, 0x0A, 0x13, + 0x0C, 0x15, 0x0E, 0x17, 0x10, 0x00, 0x12, 0x00, 0x04 +}; + +static BYTE VideoMode_640x350_16color[] = +{ + /* Miscellaneous Register */ + 0xA3, + + /* Sequencer Registers */ + 0x00, 0x01, 0x0F, 0x00, 0x02, + + /* GC Registers */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x0F, 0xFF, + + /* CRTC Registers */ + 0x5F, 0x4F, 0x50, 0x82, 0x54, 0x80, 0xBF, 0x1F, 0x00, 0x40, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x83, 0x85, 0x5D, 0x28, 0x0F, 0x63, 0xBA, 0xE3, + 0xFF, + + /* AC Registers */ + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x39, 0x0A, 0x3B, + 0x0C, 0x3D, 0x0E, 0x3F, 0x10, 0x00, 0x12, 0x00, 0x04 +}; + +static BYTE VideoMode_640x480_2color[] = { /* Miscellaneous Register */ 0xE3, /* Sequencer Registers */ - 0x03, 0x01, 0x08, 0x00, 0x06, + 0x00, 0x01, 0x0F, 0x00, 0x02, /* GC Registers */ - 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x05, 0x0F, 0xFF, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x0F, 0xFF, /* CRTC Registers */ 0x5F, 0x4F, 0x50, 0x82, 0x54, 0x80, 0x0B, 0x3E, 0x00, 0x40, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xEA, 0x0C, 0xDF, 0x28, 0x00, 0xE7, 0x04, 0xE3, + 0x00, 0x00, 0x00, 0x00, 0xEA, 0x8C, 0xDF, 0x28, 0x00, 0xE7, 0x04, 0xC3, 0xFF, /* AC Registers */ - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07, 0x38, 0x39, 0x3A, 0x3B, - 0x3C, 0x3D, 0x3E, 0x3F, 0x01, 0x00, 0x0F, 0x00, 0x00 + 0x00, 0x3F, 0x02, 0x3F, 0x04, 0x3F, 0x06, 0x3F, 0x08, 0x3F, 0x0A, 0x3F, + 0x0C, 0x3F, 0x0E, 0x3F, 0x10, 0x00, 0x12, 0x00, 0x04 +}; + +static BYTE VideoMode_640x480_16color[] = +{ + /* Miscellaneous Register */ + 0xE3, + + /* Sequencer Registers */ + 0x00, 0x01, 0x0F, 0x00, 0x02, + + /* GC Registers */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x0F, 0xFF, + + /* CRTC Registers */ + 0x5F, 0x4F, 0x50, 0x82, 0x54, 0x80, 0x0B, 0x3E, 0x00, 0x40, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xEA, 0x8C, 0xDF, 0x28, 0x00, 0xE7, 0x04, 0xE3, + 0xFF, + + /* AC Registers */ + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x39, 0x0A, 0x3B, + 0x0C, 0x3D, 0x0E, 0x3F, 0x10, 0x00, 0x12, 0x00, 0x04 }; static BYTE VideoMode_320x200_256color[] = @@ -115,19 +224,19 @@ 0x63, /* Sequencer Registers */ - 0x03, 0x01, 0x0F, 0x00, 0x0E, + 0x00, 0x01, 0x0F, 0x00, 0x0E, /* GC Registers */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0x0F, 0xFF, /* CRTC Registers */ 0x5F, 0x4F, 0x50, 0x82, 0x54, 0x80, 0xBF, 0x1F, 0x00, 0x41, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x9C, 0x0E, 0x8F, 0x28, 0x40, 0x96, 0xB9, 0xA3, + 0x00, 0x00, 0x00, 0x00, 0x9C, 0x8E, 0x8F, 0x28, 0x40, 0x96, 0xB9, 0xA3, 0xFF, /* AC Registers */ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, - 0x0C, 0x0D, 0x0E, 0x0F, 0x41, 0x00, 0x0F, 0x00, 0x00 + 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x00, 0x12, 0x00, 0x04 }; static LPBYTE VideoModes[] = @@ -138,18 +247,18 @@ VideoMode_80x25_text, /* Mode 03h */ VideoMode_320x200_4color, /* Mode 04h */ VideoMode_320x200_4color, /* Mode 05h */ - NULL, /* Mode 06h */ + VideoMode_640x200_2color, /* Mode 06h */ NULL, /* Mode 07h */ NULL, /* Mode 08h */ NULL, /* Mode 09h */ NULL, /* Mode 0Ah */ NULL, /* Mode 0Bh */ NULL, /* Mode 0Ch */ - NULL, /* Mode 0Dh */ - NULL, /* Mode 0Eh */ + VideoMode_320x200_16color, /* Mode 0Dh */ + VideoMode_640x200_16color, /* Mode 0Eh */ NULL, /* Mode 0Fh */ - NULL, /* Mode 10h */ - NULL, /* Mode 11h */ + VideoMode_640x350_16color, /* Mode 10h */ + VideoMode_640x480_2color, /* Mode 11h */ VideoMode_640x480_16color, /* Mode 12h */ VideoMode_320x200_256color, /* Mode 13h */ }; Modified: branches/ntvdm/subsystems/ntvdm/vga.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] Tue Aug 13 16:49:54 2013 @@ -668,7 +668,7 @@ /* Yes, write the new value */ CharBuffer[i * Resolution.X + j] = CharInfo; - /* Mark the specified pixel as changed */ + /* Mark the specified cell as changed */ VgaMarkForUpdate(i, j); } } @@ -786,11 +786,6 @@ { if (VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_NOALPHA) { - /* Set the graphics mode palette */ - //SetConsolePalette(GraphicsConsoleBuffer, - // PaletteHandle, - // SYSPAL_NOSTATIC256); - /* Trigger a full update of the screen */ NeedsUpdate = TRUE; UpdateRectangle.Left = 0; @@ -1154,7 +1149,7 @@ TextConsoleBuffer = TextHandle; /* Clear the VGA memory */ - ZeroMemory(VgaMemory, VGA_NUM_BANKS * VGA_BANK_SIZE); + VgaClearMemory(); /* Set the default video mode */ BiosSetVideoMode(BIOS_DEFAULT_VIDEO_MODE);

11 years, 4 months

[akhaldi] 59723: [KERNEL32] * Include winspool.h only where it's needed.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Aug 13 15:27:13 2013 New Revision: 59723 URL: http://svn.reactos.org/svn/reactos?rev=59723&view=rev Log: [KERNEL32] * Include winspool.h only where it's needed. Modified: trunk/reactos/dll/win32/kernel32/client/job.c trunk/reactos/dll/win32/kernel32/k32.h Modified: trunk/reactos/dll/win32/kernel32/client/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/job.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/job.c [iso-8859-1] Tue Aug 13 15:27:13 2013 @@ -11,6 +11,7 @@ /* INCLUDES *******************************************************************/ #include <k32.h> +#include <winspool.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/dll/win32/kernel32/k32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/k32.h?r… ============================================================================== --- trunk/reactos/dll/win32/kernel32/k32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/k32.h [iso-8859-1] Tue Aug 13 15:27:13 2013 @@ -20,7 +20,6 @@ #include <winreg.h> #include <wincon.h> #include <winuser.h> -#include <winspool.h> #include <tlhelp32.h> /* Redefine NTDDI_VERSION to 2K3 SP1 to get correct NDK definitions */

11 years, 4 months

← Newer
1
...
18
19
20
21
22
23
24
...
33
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 August 2013