Ros-diffs December 2013

ros-diffs@reactos.org

13 participants
308 discussions

[spetreolle] 61248: [APPWIZ] Fix Gecko installer download. CORE-7687 #resolve
by spetreolle＠svn.reactos.org 08 Dec '13

08 Dec '13

Author: spetreolle Date: Sun Dec 8 17:50:02 2013 New Revision: 61248 URL: http://svn.reactos.org/svn/reactos?rev=61248&view=rev Log: [APPWIZ] Fix Gecko installer download. CORE-7687 #resolve Modified: trunk/reactos/dll/cpl/appwiz/addons.c Modified: trunk/reactos/dll/cpl/appwiz/addons.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/addons.c?re… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/addons.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/addons.c [iso-8859-1] Sun Dec 8 17:50:02 2013 @@ -73,7 +73,7 @@ static HWND install_dialog = NULL; -static WCHAR GeckoUrl[] = L"http://downloads.sourceforge.net/wine/wine_gecko-2.21-x86.msi"; +static WCHAR GeckoUrl[] = L"http://dl.dropboxusercontent.com/u/743491/ReactOS/wine_gecko-2.21-x86.msi"; /* SHA definitions are copied from advapi32. They aren't available in headers. */

1 0

[ekohl] 61247: [WINLOGON] Fix coding style and indentation. No code changes!
by ekohl＠svn.reactos.org 08 Dec '13

08 Dec '13

Author: ekohl Date: Sun Dec 8 14:31:40 2013 New Revision: 61247 URL: http://svn.reactos.org/svn/reactos?rev=61247&view=rev Log: [WINLOGON] Fix coding style and indentation. No code changes! Modified: trunk/reactos/base/system/winlogon/environment.c trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/screensaver.c trunk/reactos/base/system/winlogon/setup.c trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/base/system/winlogon/wlx.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/system/winlogon/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/envir… Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… Modified: trunk/reactos/base/system/winlogon/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/scree… Modified: trunk/reactos/base/system/winlogon/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/setup… Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… Modified: trunk/reactos/base/system/winlogon/wlx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/wlx.c…

1 0

[hbelusca] 61246: [NTVDM] Rewrite the VGA emulation. Nah, it's a joke! - Store VGA registers setup in VGA_REGISTERS structure. - Improve BiosSetVideoMode and introduce a VgaSetRegisters function fo...
by hbelusca＠svn.reactos.org 08 Dec '13

08 Dec '13

Author: hbelusca Date: Sun Dec 8 14:22:27 2013 New Revision: 61246 URL: http://svn.reactos.org/svn/reactos?rev=61246&view=rev Log: [NTVDM] Rewrite the VGA emulation. Nah, it's a joke! - Store VGA registers setup in VGA_REGISTERS structure. - Improve BiosSetVideoMode and introduce a VgaSetRegisters function for setting VGA regs. - Initialize Bda->CrtBasePort: it is used to determine the address of some I/O ports which depend on whether we are in color or monochrome mode. - Add UnregisterIoPort in io.c (and fix some DPRINTs) (needed for VGA). - When setting the misc. VGA register, check whether we're going to monochrome emulation, and reset some port addresses in that case. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/io.c branches/ntvdm/subsystems/ntvdm/io.h branches/ntvdm/subsystems/ntvdm/vga.c branches/ntvdm/subsystems/ntvdm/vga.h 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] Sun Dec 8 14:22:27 2013 @@ -21,6 +21,16 @@ #include "int32.h" #include "registers.h" +/* MACROS *********************************************************************/ + +// +// These macros are defined for ease-of-use of some VGA I/O ports +// whose addresses depend whether we are in Monochrome or Colour mode. +// +#define VGA_INSTAT1_READ Bda->CrtBasePort + 6 // VGA_INSTAT1_READ_MONO or VGA_INSTAT1_READ_COLOR +#define VGA_CRTC_INDEX Bda->CrtBasePort // VGA_CRTC_INDEX_MONO or VGA_CRTC_INDEX_COLOR +#define VGA_CRTC_DATA Bda->CrtBasePort + 1 // VGA_CRTC_DATA_MONO or VGA_CRTC_DATA_COLOR + /* PRIVATE VARIABLES **********************************************************/ PBIOS_DATA_AREA Bda; @@ -33,258 +43,239 @@ * VGA Register Configurations for BIOS Video Modes * The configurations come from DosBox. */ -static BYTE VideoMode_40x25_text[] = +static VGA_REGISTERS VideoMode_40x25_text = { /* Miscellaneous Register */ 0x67, /* Sequencer Registers */ - 0x00, 0x08, 0x03, 0x00, 0x07, + {0x00, 0x08, 0x03, 0x00, 0x07}, + + /* CRTC Registers */ + {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}, /* GC Registers */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x0E, 0x0F, 0xFF, - - /* CRTC Registers */ - 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, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x0E, 0x0F, 0xFF}, /* AC Registers */ - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07, 0x38, 0x39, 0x3A, 0x3B, - 0x3C, 0x3D, 0x3E, 0x3F, 0x0C, 0x00, 0x0F, 0x08, 0x00 + {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07, 0x38, 0x39, 0x3A, 0x3B, + 0x3C, 0x3D, 0x3E, 0x3F, 0x0C, 0x00, 0x0F, 0x08, 0x00} }; -static BYTE VideoMode_80x25_text[] = +static VGA_REGISTERS VideoMode_80x25_text = { /* Miscellaneous Register */ 0x67, /* Sequencer Registers */ - 0x00, 0x00, 0x03, 0x00, 0x07, + {0x00, 0x00, 0x03, 0x00, 0x07}, + + /* CRTC Registers */ + {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}, /* GC Registers */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x0E, 0x0F, 0xFF, - - /* CRTC Registers */ - 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, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x0E, 0x0F, 0xFF}, /* AC Registers */ - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07, 0x38, 0x39, 0x3A, 0x3B, - 0x3C, 0x3D, 0x3E, 0x3F, 0x0C, 0x00, 0x0F, 0x08, 0x00 + {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07, 0x38, 0x39, 0x3A, 0x3B, + 0x3C, 0x3D, 0x3E, 0x3F, 0x0C, 0x00, 0x0F, 0x08, 0x00} }; -static BYTE VideoMode_320x200_4color[] = +static VGA_REGISTERS VideoMode_320x200_4color = { /* Miscellaneous Register */ 0x63, /* Sequencer Registers */ - 0x00, 0x09, 0x00, 0x00, 0x02, + {0x00, 0x09, 0x00, 0x00, 0x02}, + + /* CRTC Registers */ + {0x2D, 0x27, 0x28, 0x90, 0x2B, 0x80, 0xBF, 0x1F, 0x00, 0xC1, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x9C, 0x8E, 0x8F, 0x14, 0x00, 0x96, 0xB9, 0xA2, + 0xFF}, /* GC Registers */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x0F, 0x0F, 0xFF, - - /* CRTC Registers */ - 0x2D, 0x27, 0x28, 0x90, 0x2B, 0x80, 0xBF, 0x1F, 0x00, 0xC1, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x9C, 0x8E, 0x8F, 0x14, 0x00, 0x96, 0xB9, 0xA2, - 0xFF, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x0F, 0x0F, 0xFF}, /* AC Registers */ - 0x00, 0x13, 0x15, 0x17, 0x02, 0x04, 0x06, 0x07, 0x10, 0x11, 0x12, 0x13, - 0x14, 0x15, 0x16, 0x17, 0x01, 0x00, 0x0F, 0x00, 0x00 + {0x00, 0x13, 0x15, 0x17, 0x02, 0x04, 0x06, 0x07, 0x10, 0x11, 0x12, 0x13, + 0x14, 0x15, 0x16, 0x17, 0x01, 0x00, 0x0F, 0x00, 0x00} }; -static BYTE VideoMode_640x200_2color[] = +static VGA_REGISTERS VideoMode_640x200_2color = { /* Miscellaneous Register */ 0x63, /* Sequencer Registers */ - 0x00, 0x09, 0x0F, 0x00, 0x02, + {0x00, 0x09, 0x0F, 0x00, 0x02}, + + /* 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}, /* 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, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x0F, 0xFF}, /* AC Registers */ - 0x00, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, - 0x17, 0x17, 0x17, 0x17, 0x01, 0x00, 0x01, 0x00, 0x00 + {0x00, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, + 0x17, 0x17, 0x17, 0x17, 0x01, 0x00, 0x01, 0x00, 0x00} }; -static BYTE VideoMode_320x200_16color[] = +static VGA_REGISTERS VideoMode_320x200_16color = { /* Miscellaneous Register */ 0x63, /* Sequencer Registers */ - 0x00, 0x09, 0x0F, 0x00, 0x02, + {0x00, 0x09, 0x0F, 0x00, 0x02}, + + /* 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}, /* 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, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x0F, 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, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07, 0x38, 0x39, 0x3A, 0x3B, + 0x3C, 0x3D, 0x3E, 0x3F, 0x01, 0x00, 0x0F, 0x00, 0x00} }; -static BYTE VideoMode_640x200_16color[] = +static VGA_REGISTERS VideoMode_640x200_16color = { /* Miscellaneous Register */ 0x63, /* Sequencer Registers */ - 0x00, 0x01, 0x0F, 0x00, 0x02, + {0x00, 0x01, 0x0F, 0x00, 0x02}, + + /* 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}, /* 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, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x0F, 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, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07, 0x38, 0x39, 0x3A, 0x3B, + 0x3C, 0x3D, 0x3E, 0x3F, 0x01, 0x00, 0x0F, 0x00, 0x00} }; -static BYTE VideoMode_640x350_16color[] = +static VGA_REGISTERS VideoMode_640x350_16color = { /* Miscellaneous Register */ 0xA3, /* Sequencer Registers */ - 0x00, 0x01, 0x0F, 0x00, 0x02, + {0x00, 0x01, 0x0F, 0x00, 0x02}, + + /* 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}, /* 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, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x0F, 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, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07, 0x38, 0x39, 0x3A, 0x3B, + 0x3C, 0x3D, 0x3E, 0x3F, 0x01, 0x00, 0x0F, 0x00, 0x00} }; -static BYTE VideoMode_640x480_2color[] = +static VGA_REGISTERS VideoMode_640x480_2color = { /* Miscellaneous Register */ 0xE3, /* Sequencer Registers */ - 0x00, 0x01, 0x0F, 0x00, 0x02, + {0x00, 0x01, 0x0F, 0x00, 0x02}, + + /* 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, 0xC3, + 0xFF}, /* 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, 0xC3, - 0xFF, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x0F, 0xFF}, /* AC Registers */ - 0x00, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, - 0x3F, 0x3F, 0x3F, 0x3F, 0x01, 0x00, 0x0F, 0x00, 0x00 + {0x00, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, + 0x3F, 0x3F, 0x3F, 0x3F, 0x01, 0x00, 0x0F, 0x00, 0x00} }; -static BYTE VideoMode_640x480_16color[] = +static VGA_REGISTERS VideoMode_640x480_16color = { /* Miscellaneous Register */ 0xE3, /* Sequencer Registers */ - 0x00, 0x01, 0x0F, 0x00, 0x02, + {0x00, 0x01, 0x0F, 0x00, 0x02}, + + /* 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}, /* 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, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x0F, 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, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07, 0x38, 0x39, 0x3A, 0x3B, + 0x3C, 0x3D, 0x3E, 0x3F, 0x01, 0x00, 0x0F, 0x00, 0x00} }; -static BYTE VideoMode_320x200_256color[] = +static VGA_REGISTERS VideoMode_320x200_256color = { /* Miscellaneous Register */ 0x63, /* Sequencer Registers */ - 0x00, 0x01, 0x0F, 0x00, 0x0E, + {0x00, 0x01, 0x0F, 0x00, 0x0E}, + + /* CRTC Registers */ + {0x5F, 0x4F, 0x50, 0x82, 0x54, 0x80, 0xBF, 0x1F, 0x00, 0x41, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x9C, 0x8E, 0x8F, 0x28, 0x40, 0x96, 0xB9, 0xA3, + 0xFF}, /* 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, 0x8E, 0x8F, 0x28, 0x40, 0x96, 0xB9, 0xA3, - 0xFF, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0x0F, 0xFF}, /* AC Registers */ - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, - 0x0C, 0x0D, 0x0E, 0x0F, 0x41, 0x00, 0x0F, 0x00, 0x00 + {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, + 0x0C, 0x0D, 0x0E, 0x0F, 0x41, 0x00, 0x0F, 0x00, 0x00} }; -static LPBYTE VideoModes[] = -{ - VideoMode_40x25_text, /* Mode 00h */ - VideoMode_40x25_text, /* Mode 01h */ - VideoMode_80x25_text, /* Mode 02h */ - VideoMode_80x25_text, /* Mode 03h */ - VideoMode_320x200_4color, /* Mode 04h */ - VideoMode_320x200_4color, /* Mode 05h */ - VideoMode_640x200_2color, /* Mode 06h */ - NULL, /* Mode 07h */ - NULL, /* Mode 08h */ - NULL, /* Mode 09h */ - NULL, /* Mode 0Ah */ - NULL, /* Mode 0Bh */ - NULL, /* Mode 0Ch */ - VideoMode_320x200_16color, /* Mode 0Dh */ - VideoMode_640x200_16color, /* Mode 0Eh */ - NULL, /* Mode 0Fh */ - VideoMode_640x350_16color, /* Mode 10h */ - VideoMode_640x480_2color, /* Mode 11h */ - VideoMode_640x480_16color, /* Mode 12h */ - VideoMode_320x200_256color, /* Mode 13h */ -}; - -static CONST COLORREF EgaPalette[VGA_MAX_COLORS / 4] = -{ - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), - RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0xAA, 0x00), RGB(0xAA, 0xAA, 0xAA), - RGB(0x00, 0x00, 0x55), RGB(0x00, 0x00, 0xFF), RGB(0x00, 0xAA, 0x55), RGB(0x00, 0xAA, 0xFF), - RGB(0xAA, 0x00, 0x55), RGB(0xAA, 0x00, 0xFF), RGB(0xAA, 0xAA, 0x55), RGB(0xAA, 0xAA, 0xFF), - RGB(0x00, 0x55, 0x00), RGB(0x00, 0x55, 0xAA), RGB(0x00, 0xFF, 0x00), RGB(0x00, 0xFF, 0xAA), - RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0x55, 0xAA), RGB(0xAA, 0xFF, 0x00), RGB(0xAA, 0xFF, 0xAA), - RGB(0x00, 0x55, 0x55), RGB(0x00, 0x55, 0xFF), RGB(0x00, 0xFF, 0x55), RGB(0x00, 0xFF, 0xFF), - RGB(0xAA, 0x55, 0x55), RGB(0xAA, 0x55, 0xFF), RGB(0xAA, 0xFF, 0x55), RGB(0xAA, 0xFF, 0xFF), - RGB(0x55, 0x00, 0x00), RGB(0x55, 0x00, 0xAA), RGB(0x55, 0xAA, 0x00), RGB(0x55, 0xAA, 0xAA), - RGB(0xFF, 0x00, 0x00), RGB(0xFF, 0x00, 0xAA), RGB(0xFF, 0xAA, 0x00), RGB(0xFF, 0xAA, 0xAA), - RGB(0x55, 0x00, 0x55), RGB(0x55, 0x00, 0xFF), RGB(0x55, 0xAA, 0x55), RGB(0x55, 0xAA, 0xFF), - RGB(0xFF, 0x00, 0x55), RGB(0xFF, 0x00, 0xFF), RGB(0xFF, 0xAA, 0x55), RGB(0xFF, 0xAA, 0xFF), - RGB(0x55, 0x55, 0x00), RGB(0x55, 0x55, 0xAA), RGB(0x55, 0xFF, 0x00), RGB(0x55, 0xFF, 0xAA), - RGB(0xFF, 0x55, 0x00), RGB(0xFF, 0x55, 0xAA), RGB(0xFF, 0xFF, 0x00), RGB(0xFF, 0xFF, 0xAA), - RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), - RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF) +/* See http://wiki.osdev.org/Drawing_In_Protected_Mode#Locating_Video_Memory */ +static PVGA_REGISTERS VideoModes[] = +{ + &VideoMode_40x25_text, /* Mode 00h */ // 16 color (mono) + &VideoMode_40x25_text, /* Mode 01h */ // 16 color + &VideoMode_80x25_text, /* Mode 02h */ // 16 color (mono) + &VideoMode_80x25_text, /* Mode 03h */ // 16 color + &VideoMode_320x200_4color, /* Mode 04h */ + &VideoMode_320x200_4color, /* Mode 05h */ // same (m) + &VideoMode_640x200_2color, /* Mode 06h */ // 640*200 2 color + NULL, /* Mode 07h */ // MDA monochrome text 80*25 + NULL, /* Mode 08h */ // PCjr + NULL, /* Mode 09h */ // PCjr + NULL, /* Mode 0Ah */ // PCjr + NULL, /* Mode 0Bh */ // Reserved + NULL, /* Mode 0Ch */ // Reserved + &VideoMode_320x200_16color, /* Mode 0Dh */ // EGA 320*200 16 color + &VideoMode_640x200_16color, /* Mode 0Eh */ // EGA 640*200 16 color + NULL, /* Mode 0Fh */ // EGA 640*350 mono + &VideoMode_640x350_16color, /* Mode 10h */ // EGA 640*350 16 color + &VideoMode_640x480_2color, /* Mode 11h */ // VGA 640*480 mono + &VideoMode_640x480_16color, /* Mode 12h */ + &VideoMode_320x200_256color, /* Mode 13h */ }; /* PRIVATE FUNCTIONS **********************************************************/ @@ -388,6 +379,86 @@ } } +static BOOLEAN VgaSetRegisters(PVGA_REGISTERS Registers) +{ + INT i; + + if (Registers == NULL) return FALSE; + + /* Clear interrupts */ + setIF(0); + + /* + * Set the CRT base address according to the selected mode, + * monochrome or color. The following macros: + * VGA_INSTAT1_READ, VGA_CRTC_INDEX and VGA_CRTC_DATA are then + * used to access the correct VGA I/O ports. + */ + Bda->CrtBasePort = (Registers->Misc & 0x01) ? VGA_CRTC_INDEX_COLOR + : VGA_CRTC_INDEX_MONO; + + /* Write the misc register */ + VgaWritePort(VGA_MISC_WRITE, Registers->Misc); + + /* Synchronous reset on */ + VgaWritePort(VGA_SEQ_INDEX, VGA_SEQ_RESET_REG); + VgaWritePort(VGA_SEQ_DATA , VGA_SEQ_RESET_AR); + + /* Write the sequencer registers */ + for (i = 1; i < VGA_SEQ_MAX_REG; i++) + { + VgaWritePort(VGA_SEQ_INDEX, i); + VgaWritePort(VGA_SEQ_DATA, Registers->Sequencer[i]); + } + + /* Synchronous reset off */ + VgaWritePort(VGA_SEQ_INDEX, VGA_SEQ_RESET_REG); + VgaWritePort(VGA_SEQ_DATA , VGA_SEQ_RESET_SR | VGA_SEQ_RESET_AR); + + /* Unlock CRTC registers 0-7 */ + VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_END_HORZ_BLANKING_REG); + VgaWritePort(VGA_CRTC_DATA, VgaReadPort(VGA_CRTC_DATA) | 0x80); + VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_VERT_RETRACE_END_REG); + VgaWritePort(VGA_CRTC_DATA, VgaReadPort(VGA_CRTC_DATA) & ~0x80); + // Make sure they remain unlocked + Registers->CRT[VGA_CRTC_END_HORZ_BLANKING_REG] |= 0x80; + Registers->CRT[VGA_CRTC_VERT_RETRACE_END_REG] &= ~0x80; + + /* Write the CRTC registers */ + for (i = 0; i < VGA_CRTC_MAX_REG; i++) + { + VgaWritePort(VGA_CRTC_INDEX, i); + VgaWritePort(VGA_CRTC_DATA, Registers->CRT[i]); + } + + /* Write the GC registers */ + for (i = 0; i < VGA_GC_MAX_REG; i++) + { + VgaWritePort(VGA_GC_INDEX, i); + VgaWritePort(VGA_GC_DATA, Registers->Graphics[i]); + } + + /* Write the AC registers */ + for (i = 0; i < VGA_AC_MAX_REG; i++) + { + VgaReadPort(VGA_INSTAT1_READ); // Put the AC register into index state + VgaWritePort(VGA_AC_INDEX, i); + VgaWritePort(VGA_AC_WRITE, Registers->Attribute[i]); + } + + /* Set the PEL mask */ + VgaWritePort(VGA_DAC_MASK, 0xFF); + + /* Enable screen and disable palette access */ + VgaReadPort(VGA_INSTAT1_READ); // Put the AC register into index state + VgaWritePort(VGA_AC_INDEX, 0x20); + + /* Set interrupts */ + setIF(1); + + return TRUE; +} + /* PUBLIC FUNCTIONS ***********************************************************/ BYTE BiosGetVideoMode(VOID) @@ -399,47 +470,21 @@ { INT i; COORD Resolution; - LPBYTE Values = VideoModes[ModeNumber]; - - DPRINT1("Switching to mode %Xh; Values = 0x%p\n", ModeNumber, Values); - - if (Values == NULL) return FALSE; - - /* Write the misc register */ - VgaWritePort(VGA_MISC_WRITE, *(Values++)); - - /* Write the sequencer registers */ - for (i = 0; i < VGA_SEQ_MAX_REG; i++) - { - VgaWritePort(VGA_SEQ_INDEX, i); - VgaWritePort(VGA_SEQ_DATA, *(Values++)); - } - - /* Write the GC registers */ - for (i = 0; i < VGA_GC_MAX_REG; i++) - { - VgaWritePort(VGA_GC_INDEX, i); - VgaWritePort(VGA_GC_DATA, *(Values++)); - } - - /* Write the CRTC registers */ - for (i = 0; i < VGA_CRTC_MAX_REG; i++) - { - VgaWritePort(VGA_CRTC_INDEX, i); - VgaWritePort(VGA_CRTC_DATA, *(Values++)); - } - - /* Write the AC registers */ - for (i = 0; i < VGA_AC_MAX_REG; i++) - { - VgaWritePort(VGA_AC_INDEX, i); - VgaWritePort(VGA_AC_WRITE, *(Values++)); - } + PVGA_REGISTERS VgaMode = VideoModes[ModeNumber]; + + DPRINT1("Switching to mode %Xh; VgaMode = 0x%p\n", ModeNumber, VgaMode); + + if (!VgaSetRegisters(VgaMode)) return FALSE; + + // /* Disable screen and enable palette access */ + // VgaReadPort(VGA_INSTAT1_READ); // Put the AC register into index state + // VgaWritePort(VGA_AC_INDEX, 0x00); if ((ModeNumber == 0x0D) || (ModeNumber == 0x0E) || (ModeNumber == 0x10)) { /* EGA modes */ - for (i = 0; i < VGA_MAX_COLORS / 4; i++) + extern CONST COLORREF EgaPalette[VGA_MAX_COLORS / 4]; + for (i = 0; i < sizeof(EgaPalette)/sizeof(EgaPalette[0]); i++) { VgaWritePort(VGA_DAC_WRITE_INDEX, i); VgaWritePort(VGA_DAC_DATA, VGA_COLOR_TO_DAC(GetRValue(EgaPalette[i]))); @@ -452,6 +497,13 @@ /* Reset the palette */ VgaResetPalette(); } + + // /* Enable screen and disable palette access */ + // VgaReadPort(VGA_INSTAT1_READ); // Put the AC register into index state + // VgaWritePort(VGA_AC_INDEX, 0x20); + + // Bda->CrtModeControl; + // Bda->CrtColorPaletteMask; /* Update the values in the BDA */ Bda->VideoMode = ModeNumber; @@ -506,6 +558,7 @@ Bda->MemorySize = 0x0280; Bda->KeybdBufferStart = FIELD_OFFSET(BIOS_DATA_AREA, KeybdBuffer); Bda->KeybdBufferEnd = Bda->KeybdBufferStart + BIOS_KBD_BUFFER_SIZE * sizeof(WORD); + Bda->KeybdBufferHead = Bda->KeybdBufferTail = 0; /* Initialize the 32-bit Interrupt system */ InitializeInt32(BIOS_SEGMENT); @@ -641,16 +694,16 @@ WORD CharacterData = 0; /* Check if there is a key available */ - if (Bda->KeybdBufferHead != Bda->KeybdBufferTail) - { - /* Get the key from the queue, and remove it */ - BiosKbdBufferTop(&CharacterData); + if (BiosKbdBufferTop(&CharacterData)) + { + /* A key was available, remove it from the queue */ BiosKbdBufferPop(); } else { - /* Set the handler CF to repeat the BOP */ + /* No key available. Set the handler CF to repeat the BOP */ EmulatorSetFlag(EMULATOR_FLAG_CF); + // CharacterData = 0xFFFF; } return CharacterData; @@ -1019,10 +1072,8 @@ /* Set Single Palette Register */ case 0x00: { - /* Reset the flip-flop */ - VgaReadPort(VGA_STAT_COLOR); - /* Write the index */ + VgaReadPort(VGA_INSTAT1_READ); // Put the AC register into index state VgaWritePort(VGA_AC_INDEX, getBL()); /* Write the data */ @@ -1034,10 +1085,8 @@ /* Set Overscan Color */ case 0x01: { - /* Reset the flip-flop */ - VgaReadPort(VGA_STAT_COLOR); - /* Write the index */ + VgaReadPort(VGA_INSTAT1_READ); // Put the AC register into index state VgaWritePort(VGA_AC_INDEX, VGA_AC_OVERSCAN_REG); /* Write the data */ @@ -1055,10 +1104,8 @@ /* Set the palette registers */ for (i = 0; i <= VGA_AC_PAL_F_REG; i++) { - /* Reset the flip-flop */ - VgaReadPort(VGA_STAT_COLOR); - /* Write the index */ + VgaReadPort(VGA_INSTAT1_READ); // Put the AC register into index state VgaWritePort(VGA_AC_INDEX, i); /* Write the data */ @@ -1075,10 +1122,8 @@ /* Get Single Palette Register */ case 0x07: { - /* Reset the flip-flop */ - VgaReadPort(VGA_STAT_COLOR); - /* Write the index */ + VgaReadPort(VGA_INSTAT1_READ); // Put the AC register into index state VgaWritePort(VGA_AC_INDEX, getBL()); /* Read the data */ @@ -1090,10 +1135,8 @@ /* Get Overscan Color */ case 0x08: { - /* Reset the flip-flop */ - VgaReadPort(VGA_STAT_COLOR); - /* Write the index */ + VgaReadPort(VGA_INSTAT1_READ); // Put the AC register into index state VgaWritePort(VGA_AC_INDEX, VGA_AC_OVERSCAN_REG); /* Read the data */ @@ -1111,10 +1154,8 @@ /* Get the palette registers */ for (i = 0; i <= VGA_AC_PAL_F_REG; i++) { - /* Reset the flip-flop */ - VgaReadPort(VGA_STAT_COLOR); - /* Write the index */ + VgaReadPort(VGA_INSTAT1_READ); // Put the AC register into index state VgaWritePort(VGA_AC_INDEX, i); /* Read the data */ Modified: branches/ntvdm/subsystems/ntvdm/io.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/io.c?rev… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/io.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/io.c [iso-8859-1] Sun Dec 8 14:22:27 2013 @@ -36,12 +36,18 @@ if (IoPortProc[Port].In == NULL) IoPortProc[Port].In = InHandler; else - DPRINT1("IoPortProc[%d].In already registered\n", Port); + DPRINT1("IoPortProc[0x%X].In already registered\n", Port); if (IoPortProc[Port].Out == NULL) IoPortProc[Port].Out = OutHandler; else - DPRINT1("IoPortProc[%d].Out already registered\n", Port); + DPRINT1("IoPortProc[0x%X].Out already registered\n", Port); +} + +VOID WINAPI UnregisterIoPort(ULONG Port) +{ + IoPortProc[Port].In = NULL; + IoPortProc[Port].Out = NULL; } VOID WINAPI Modified: branches/ntvdm/subsystems/ntvdm/io.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/io.h?rev… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/io.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/io.h [iso-8859-1] Sun Dec 8 14:22:27 2013 @@ -23,6 +23,8 @@ EMULATOR_IN_PROC InHandler, EMULATOR_OUT_PROC OutHandler); +VOID WINAPI UnregisterIoPort(ULONG Port); + VOID WINAPI EmulatorReadIo ( PFAST486_STATE State, @@ -41,7 +43,6 @@ UCHAR DataSize ); - #endif // _IO_H_ /* EOF */ 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] Sun Dec 8 14:22:27 2013 @@ -20,6 +20,27 @@ static CONST DWORD MemoryBase[] = { 0xA0000, 0xA0000, 0xB0000, 0xB8000 }; static CONST DWORD MemoryLimit[] = { 0xAFFFF, 0xAFFFF, 0xB7FFF, 0xBFFFF }; + + +/*static*/ CONST COLORREF EgaPalette[VGA_MAX_COLORS / 4] = +{ + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), + RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0xAA, 0x00), RGB(0xAA, 0xAA, 0xAA), + RGB(0x00, 0x00, 0x55), RGB(0x00, 0x00, 0xFF), RGB(0x00, 0xAA, 0x55), RGB(0x00, 0xAA, 0xFF), + RGB(0xAA, 0x00, 0x55), RGB(0xAA, 0x00, 0xFF), RGB(0xAA, 0xAA, 0x55), RGB(0xAA, 0xAA, 0xFF), + RGB(0x00, 0x55, 0x00), RGB(0x00, 0x55, 0xAA), RGB(0x00, 0xFF, 0x00), RGB(0x00, 0xFF, 0xAA), + RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0x55, 0xAA), RGB(0xAA, 0xFF, 0x00), RGB(0xAA, 0xFF, 0xAA), + RGB(0x00, 0x55, 0x55), RGB(0x00, 0x55, 0xFF), RGB(0x00, 0xFF, 0x55), RGB(0x00, 0xFF, 0xFF), + RGB(0xAA, 0x55, 0x55), RGB(0xAA, 0x55, 0xFF), RGB(0xAA, 0xFF, 0x55), RGB(0xAA, 0xFF, 0xFF), + RGB(0x55, 0x00, 0x00), RGB(0x55, 0x00, 0xAA), RGB(0x55, 0xAA, 0x00), RGB(0x55, 0xAA, 0xAA), + RGB(0xFF, 0x00, 0x00), RGB(0xFF, 0x00, 0xAA), RGB(0xFF, 0xAA, 0x00), RGB(0xFF, 0xAA, 0xAA), + RGB(0x55, 0x00, 0x55), RGB(0x55, 0x00, 0xFF), RGB(0x55, 0xAA, 0x55), RGB(0x55, 0xAA, 0xFF), + RGB(0xFF, 0x00, 0x55), RGB(0xFF, 0x00, 0xFF), RGB(0xFF, 0xAA, 0x55), RGB(0xFF, 0xAA, 0xFF), + RGB(0x55, 0x55, 0x00), RGB(0x55, 0x55, 0xAA), RGB(0x55, 0xFF, 0x00), RGB(0x55, 0xFF, 0xAA), + RGB(0xFF, 0x55, 0x00), RGB(0xFF, 0x55, 0xAA), RGB(0xFF, 0xFF, 0x00), RGB(0xFF, 0xFF, 0xAA), + RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), + RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF) +}; static CONST COLORREF VgaDefaultPalette[VGA_MAX_COLORS] = { @@ -98,21 +119,26 @@ static BOOLEAN DoubleVision = FALSE; static BYTE VgaLatchRegisters[VGA_NUM_BANKS] = {0, 0, 0, 0}; + static BYTE VgaMiscRegister; +static BYTE VgaFeatureRegister; static BYTE VgaSeqIndex = VGA_SEQ_RESET_REG; static BYTE VgaSeqRegisters[VGA_SEQ_MAX_REG]; +static BYTE VgaCrtcIndex = VGA_CRTC_HORZ_TOTAL_REG; +static BYTE VgaCrtcRegisters[VGA_CRTC_MAX_REG]; + static BYTE VgaGcIndex = VGA_GC_RESET_REG; static BYTE VgaGcRegisters[VGA_GC_MAX_REG]; -static BYTE VgaCrtcIndex = VGA_CRTC_HORZ_TOTAL_REG; -static BYTE VgaCrtcRegisters[VGA_CRTC_MAX_REG]; - +static BOOLEAN VgaAcLatch = FALSE; static BYTE VgaAcIndex = VGA_AC_PAL_0_REG; -static BOOLEAN VgaAcLatch = FALSE; static BYTE VgaAcRegisters[VGA_AC_MAX_REG]; +// static VGA_REGISTERS VgaRegisters; + +static BYTE VgaDacMask = 0xFF; static WORD VgaDacIndex = 0; static BOOLEAN VgaDacReadWrite = FALSE; static BYTE VgaDacRegisters[VGA_PALETTE_SIZE]; @@ -210,8 +236,6 @@ static inline BYTE VgaTranslateByteForWriting(BYTE Data, BYTE Plane) { BYTE WriteMode = VgaGcRegisters[VGA_GC_MODE_REG] & 3; - BYTE LogicalOperation = (VgaGcRegisters[VGA_GC_ROTATE_REG] >> 3) & 3; - BYTE RotateCount = VgaGcRegisters[VGA_GC_ROTATE_REG] & 7; BYTE BitMask = VgaGcRegisters[VGA_GC_BITMASK_REG]; if (WriteMode == 1) @@ -223,6 +247,7 @@ if (WriteMode != 2) { /* Write modes 0 and 3 rotate the data to the right first */ + BYTE RotateCount = VgaGcRegisters[VGA_GC_ROTATE_REG] & 7; Data = LOBYTE(((DWORD)Data >> RotateCount) | ((DWORD)Data << (8 - RotateCount))); } else @@ -247,6 +272,8 @@ if (WriteMode != 3) { /* Write modes 0 and 2 then perform a logical operation on the data and latch */ + BYTE LogicalOperation = (VgaGcRegisters[VGA_GC_ROTATE_REG] >> 3) & 3; + if (LogicalOperation == 1) Data &= VgaLatchRegisters[Plane]; else if (LogicalOperation == 2) Data |= VgaLatchRegisters[Plane]; else if (LogicalOperation == 3) Data ^= VgaLatchRegisters[Plane]; @@ -1028,7 +1055,7 @@ DPRINT("VgaReadMemory: Address 0x%08X, Size %lu\n", Address, Size); /* Ignore if video RAM access is disabled */ - if (!(VgaMiscRegister & VGA_MISC_RAM_ENABLED)) return; + if ((VgaMiscRegister & VGA_MISC_RAM_ENABLED) == 0) return; /* Loop through each byte */ for (i = 0; i < Size; i++) @@ -1054,7 +1081,7 @@ DPRINT("VgaWriteMemory: Address 0x%08X, Size %lu\n", Address, Size); /* Ignore if video RAM access is disabled */ - if (!(VgaMiscRegister & VGA_MISC_RAM_ENABLED)) return; + if ((VgaMiscRegister & VGA_MISC_RAM_ENABLED) == 0) return; /* Also ignore if write access to all planes is disabled */ if ((VgaSeqRegisters[VGA_SEQ_MASK_REG] & 0x0F) == 0x00) return; @@ -1097,40 +1124,60 @@ BYTE WINAPI VgaReadPort(ULONG Port) { - DPRINT("VgaReadPort: Port 0x%08X\n", Port); + DPRINT("VgaReadPort: Port 0x%X\n", Port); switch (Port) { + case VGA_MISC_READ: + return VgaMiscRegister; + + case VGA_INSTAT0_READ: + return 0; // Not implemented + + case VGA_INSTAT1_READ_MONO: + case VGA_INSTAT1_READ_COLOR: + { + BYTE Result = 0; + + /* Reset the AC latch */ + VgaAcLatch = FALSE; + + /* Set a flag if there is a vertical or horizontal retrace */ + if (InVerticalRetrace || InHorizontalRetrace) Result |= VGA_STAT_DD; + + /* Set an additional flag if there was a vertical retrace */ + if (InVerticalRetrace) Result |= VGA_STAT_VRETRACE; + + /* Clear the flags */ + InHorizontalRetrace = InVerticalRetrace = FALSE; + + return Result; + } + + case VGA_FEATURE_READ: + return VgaFeatureRegister; + case VGA_AC_INDEX: - { return VgaAcIndex; - } case VGA_AC_READ: - { return VgaAcRegisters[VgaAcIndex]; - } case VGA_SEQ_INDEX: - { return VgaSeqIndex; - } case VGA_SEQ_DATA: - { return VgaSeqRegisters[VgaSeqIndex]; - } + + case VGA_DAC_MASK: + return VgaDacMask; case VGA_DAC_READ_INDEX: - { /* This returns the read/write state */ - return VgaDacReadWrite ? 0 : 3; - } + return (VgaDacReadWrite ? 0 : 3); case VGA_DAC_WRITE_INDEX: - { - return VgaDacIndex / 3; - } + return (VgaDacIndex / 3); case VGA_DAC_DATA: { @@ -1145,62 +1192,82 @@ break; } - case VGA_MISC_READ: - { - return VgaMiscRegister; - } - - case VGA_CRTC_INDEX: - { + case VGA_CRTC_INDEX_MONO: + case VGA_CRTC_INDEX_COLOR: return VgaCrtcIndex; - } - - case VGA_CRTC_DATA: - { + + case VGA_CRTC_DATA_MONO: + case VGA_CRTC_DATA_COLOR: return VgaCrtcRegisters[VgaCrtcIndex]; - } case VGA_GC_INDEX: - { return VgaGcIndex; - } case VGA_GC_DATA: - { return VgaGcRegisters[VgaGcIndex]; - } - - case VGA_STAT_MONO: - case VGA_STAT_COLOR: - { - BYTE Result = 0; - - /* Reset the AC latch */ - VgaAcLatch = FALSE; - - /* Set a flag if there is a vertical or horizontal retrace */ - if (InVerticalRetrace || InHorizontalRetrace) Result |= VGA_STAT_DD; - - /* Set an additional flag if there was a vertical retrace */ - if (InVerticalRetrace) Result |= VGA_STAT_VRETRACE; - - /* Clear the flags */ - InHorizontalRetrace = InVerticalRetrace = FALSE; - - return Result; - } - } - + + default: + DPRINT1("VgaReadPort: Unknown port 0x%X\n", Port); + break; + } + return 0; } VOID WINAPI VgaWritePort(ULONG Port, BYTE Data) { - DPRINT("VgaWritePort: Port 0x%08X, Data 0x%02X\n", Port, Data); + DPRINT("VgaWritePort: Port 0x%X, Data 0x%02X\n", Port, Data); switch (Port) { + case VGA_MISC_WRITE: + { + VgaMiscRegister = Data; + + if (VgaMiscRegister & 0x01) + { + /* Color emulation */ + DPRINT1("Color emulation\n"); + + /* Register the new I/O Ports */ + RegisterIoPort(0x3D4, VgaReadPort, VgaWritePort); // VGA_CRTC_INDEX_COLOR + RegisterIoPort(0x3D5, VgaReadPort, VgaWritePort); // VGA_CRTC_DATA_COLOR + RegisterIoPort(0x3DA, VgaReadPort, VgaWritePort); // VGA_INSTAT1_READ_COLOR, VGA_FEATURE_WRITE_COLOR + + /* Unregister the old ones */ + UnregisterIoPort(0x3B4); // VGA_CRTC_INDEX_MONO + UnregisterIoPort(0x3B5); // VGA_CRTC_DATA_MONO + UnregisterIoPort(0x3BA); // VGA_INSTAT1_READ_MONO, VGA_FEATURE_WRITE_MONO + } + else + { + /* Monochrome emulation */ + DPRINT1("Monochrome emulation\n"); + + /* Register the new I/O Ports */ + RegisterIoPort(0x3B4, VgaReadPort, VgaWritePort); // VGA_CRTC_INDEX_MONO + RegisterIoPort(0x3B5, VgaReadPort, VgaWritePort); // VGA_CRTC_DATA_MONO + RegisterIoPort(0x3BA, VgaReadPort, VgaWritePort); // VGA_INSTAT1_READ_MONO, VGA_FEATURE_WRITE_MONO + + /* Unregister the old ones */ + UnregisterIoPort(0x3D4); // VGA_CRTC_INDEX_COLOR + UnregisterIoPort(0x3D5); // VGA_CRTC_DATA_COLOR + UnregisterIoPort(0x3DA); // VGA_INSTAT1_READ_COLOR, VGA_FEATURE_WRITE_COLOR + } + + // if (VgaMiscRegister & 0x02) { /* Enable RAM access */ } else { /* Disable RAM access */ } + break; + } + + case VGA_FEATURE_WRITE_MONO: + case VGA_FEATURE_WRITE_COLOR: + { + VgaFeatureRegister = Data; + break; + } + case VGA_AC_INDEX: + // case VGA_AC_WRITE: { if (!VgaAcLatch) { @@ -1215,7 +1282,6 @@ /* Toggle the latch */ VgaAcLatch = !VgaAcLatch; - break; } @@ -1233,6 +1299,12 @@ break; } + case VGA_DAC_MASK: + { + VgaDacMask = Data; + break; + } + case VGA_DAC_READ_INDEX: { VgaDacReadWrite = FALSE; @@ -1254,20 +1326,16 @@ break; } - case VGA_MISC_WRITE: - { - VgaMiscRegister = Data; - break; - } - - case VGA_CRTC_INDEX: + case VGA_CRTC_INDEX_MONO: + case VGA_CRTC_INDEX_COLOR: { /* Set the CRTC index register */ if (Data < VGA_CRTC_MAX_REG) VgaCrtcIndex = Data; break; } - case VGA_CRTC_DATA: + case VGA_CRTC_DATA_MONO: + case VGA_CRTC_DATA_COLOR: { /* Call the CRTC function */ VgaWriteCrtc(Data); @@ -1287,6 +1355,10 @@ VgaWriteGc(Data); break; } + + default: + DPRINT1("VgaWritePort: Unknown port 0x%X\n", Port); + break; } } @@ -1324,6 +1396,21 @@ /* Set the global handle */ TextConsoleBuffer = TextHandle; + /* Register the I/O Ports */ + RegisterIoPort(0x3CC, VgaReadPort, NULL); // VGA_MISC_READ + RegisterIoPort(0x3C2, VgaReadPort, VgaWritePort); // VGA_MISC_WRITE, VGA_INSTAT0_READ + RegisterIoPort(0x3CA, VgaReadPort, NULL); // VGA_FEATURE_READ + RegisterIoPort(0x3C0, VgaReadPort, VgaWritePort); // VGA_AC_INDEX, VGA_AC_WRITE + RegisterIoPort(0x3C1, VgaReadPort, NULL); // VGA_AC_READ + RegisterIoPort(0x3C4, VgaReadPort, VgaWritePort); // VGA_SEQ_INDEX + RegisterIoPort(0x3C5, VgaReadPort, VgaWritePort); // VGA_SEQ_DATA + RegisterIoPort(0x3C6, VgaReadPort, VgaWritePort); // VGA_DAC_MASK + RegisterIoPort(0x3C7, VgaReadPort, VgaWritePort); // VGA_DAC_READ_INDEX + RegisterIoPort(0x3C8, VgaReadPort, VgaWritePort); // VGA_DAC_WRITE_INDEX + RegisterIoPort(0x3C9, VgaReadPort, VgaWritePort); // VGA_DAC_DATA + RegisterIoPort(0x3CE, VgaReadPort, VgaWritePort); // VGA_GC_INDEX + RegisterIoPort(0x3CF, VgaReadPort, VgaWritePort); // VGA_GC_DATA + /* Clear the VGA memory */ VgaClearMemory(); @@ -1366,23 +1453,6 @@ Address += ScanlineSize; } - /* Register the I/O Ports */ - RegisterIoPort(VGA_AC_WRITE , VgaReadPort, VgaWritePort); - RegisterIoPort(VGA_AC_READ , VgaReadPort, VgaWritePort); - RegisterIoPort(VGA_SEQ_INDEX, VgaReadPort, VgaWritePort); - RegisterIoPort(VGA_SEQ_DATA , VgaReadPort, VgaWritePort); - RegisterIoPort(VGA_DAC_READ_INDEX , VgaReadPort, VgaWritePort); - RegisterIoPort(VGA_DAC_WRITE_INDEX, VgaReadPort, VgaWritePort); - RegisterIoPort(VGA_DAC_DATA , VgaReadPort, VgaWritePort); - RegisterIoPort(VGA_MISC_READ , VgaReadPort, VgaWritePort); - RegisterIoPort(VGA_MISC_WRITE, VgaReadPort, VgaWritePort); - RegisterIoPort(VGA_CRTC_INDEX, VgaReadPort, VgaWritePort); - RegisterIoPort(VGA_CRTC_DATA , VgaReadPort, VgaWritePort); - RegisterIoPort(VGA_GC_INDEX, VgaReadPort, VgaWritePort); - RegisterIoPort(VGA_GC_DATA , VgaReadPort, VgaWritePort); - RegisterIoPort(VGA_STAT_MONO , VgaReadPort, VgaWritePort); - RegisterIoPort(VGA_STAT_COLOR, VgaReadPort, VgaWritePort); - /* Return success */ return TRUE; } Modified: branches/ntvdm/subsystems/ntvdm/vga.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.h [iso-8859-1] Sun Dec 8 14:22:27 2013 @@ -14,24 +14,6 @@ #include "ntvdm.h" /* DEFINES ********************************************************************/ - -/* Register I/O ports */ -#define VGA_AC_INDEX 0x3C0 -#define VGA_AC_WRITE 0x3C0 -#define VGA_AC_READ 0x3C1 -#define VGA_SEQ_INDEX 0x3C4 -#define VGA_SEQ_DATA 0x3C5 -#define VGA_DAC_READ_INDEX 0x3C7 -#define VGA_DAC_WRITE_INDEX 0x3C8 -#define VGA_DAC_DATA 0x3C9 -#define VGA_MISC_READ 0x3CC -#define VGA_MISC_WRITE 0x3C2 -#define VGA_CRTC_INDEX 0x3D4 -#define VGA_CRTC_DATA 0x3D5 -#define VGA_GC_INDEX 0x3CE -#define VGA_GC_DATA 0x3CF -#define VGA_STAT_MONO 0x3BA -#define VGA_STAT_COLOR 0x3DA #define VGA_NUM_BANKS 4 #define VGA_BANK_SIZE 0x10000 @@ -43,72 +25,81 @@ #define VGA_DAC_TO_COLOR(x) (((x) << 2) | ((x) >> 6)) #define VGA_COLOR_TO_DAC(x) ((x) >> 2) + + +/* Register I/O ports */ + +#define VGA_MISC_READ 0x3CC +#define VGA_MISC_WRITE 0x3C2 + +#define VGA_INSTAT0_READ 0x3C2 + +#define VGA_INSTAT1_READ_MONO 0x3BA +#define VGA_INSTAT1_READ_COLOR 0x3DA + +#define VGA_FEATURE_READ 0x3CA +#define VGA_FEATURE_WRITE_MONO 0x3BA +#define VGA_FEATURE_WRITE_COLOR 0x3DA + +#define VGA_AC_INDEX 0x3C0 +#define VGA_AC_WRITE 0x3C0 +#define VGA_AC_READ 0x3C1 + +#define VGA_SEQ_INDEX 0x3C4 +#define VGA_SEQ_DATA 0x3C5 + +#define VGA_DAC_MASK 0x3C6 +#define VGA_DAC_READ_INDEX 0x3C7 +#define VGA_DAC_WRITE_INDEX 0x3C8 +#define VGA_DAC_DATA 0x3C9 + +#define VGA_CRTC_INDEX_MONO 0x3B4 +#define VGA_CRTC_DATA_MONO 0x3B5 +#define VGA_CRTC_INDEX_COLOR 0x3D4 +#define VGA_CRTC_DATA_COLOR 0x3D5 + +#define VGA_GC_INDEX 0x3CE +#define VGA_GC_DATA 0x3CF + + + +// +// Miscellaneous and Status Registers +// + +/* Miscellaneous register bits */ +#define VGA_MISC_COLOR (1 << 0) +#define VGA_MISC_RAM_ENABLED (1 << 1) +// #define VGA_MISC_CSEL1 (1 << 2) +// #define VGA_MISC_CSEL2 (1 << 3) +#define VGA_MISC_OE_INVERT (1 << 5) +#define VGA_MISC_HSYNCP (1 << 6) +#define VGA_MISC_VSYNCP (1 << 7) + +/* Status register flags */ +#define VGA_STAT_DD (1 << 0) +#define VGA_STAT_VRETRACE (1 << 3) + + +// +// Sequencer Registers +// + /* Sequencer reset register bits */ -#define VGA_SEQ_RESET_AR (1 << 0) -#define VGA_SEQ_RESET_SR (1 << 1) +#define VGA_SEQ_RESET_AR (1 << 0) +#define VGA_SEQ_RESET_SR (1 << 1) /* Sequencer clock register bits */ -#define VGA_SEQ_CLOCK_98DM (1 << 0) -#define VGA_SEQ_CLOCK_SLR (1 << 2) -#define VGA_SEQ_CLOCK_DCR (1 << 3) -#define VGA_SEQ_CLOCK_S4 (1 << 4) -#define VGA_SEQ_CLOCK_SD (1 << 5) +#define VGA_SEQ_CLOCK_98DM (1 << 0) +#define VGA_SEQ_CLOCK_SLR (1 << 2) +#define VGA_SEQ_CLOCK_DCR (1 << 3) +#define VGA_SEQ_CLOCK_S4 (1 << 4) +#define VGA_SEQ_CLOCK_SD (1 << 5) /* Sequencer memory register bits */ -#define VGA_SEQ_MEM_EXT (1 << 1) -#define VGA_SEQ_MEM_OE (1 << 2) -#define VGA_SEQ_MEM_C4 (1 << 3) - -/* Graphics controller mode register bits */ -#define VGA_GC_MODE_READ (1 << 3) -#define VGA_GC_MODE_OE (1 << 4) -#define VGA_GC_MODE_SHIFTREG (1 << 5) -#define VGA_GC_MODE_SHIFT256 (1 << 6) - -/* Graphics controller miscellaneous register bits */ -#define VGA_GC_MISC_NOALPHA (1 << 0) -#define VGA_GC_MISC_OE (1 << 1) - -/* CRTC overflow register bits */ -#define VGA_CRTC_OVERFLOW_VT8 (1 << 0) -#define VGA_CRTC_OVERFLOW_VDE8 (1 << 1) -#define VGA_CRTC_OVERFLOW_VRS8 (1 << 2) -#define VGA_CRTC_OVERFLOW_SVB8 (1 << 3) -#define VGA_CRTC_OVERFLOW_LC8 (1 << 4) -#define VGA_CRTC_OVERFLOW_VT9 (1 << 5) -#define VGA_CRTC_OVERFLOW_VDE9 (1 << 6) -#define VGA_CRTC_OVERFLOW_VRS9 (1 << 7) - -/* CRTC underline register bits */ -#define VGA_CRTC_UNDERLINE_DWORD (1 << 6) - -/* CRTC max scanline register bits */ -#define VGA_CRTC_MAXSCANLINE_DOUBLE (1 << 7) - -/* CRTC mode control register bits */ -#define VGA_CRTC_MODE_CONTROL_WRAP (1 << 5) -#define VGA_CRTC_MODE_CONTROL_BYTE (1 << 6) -#define VGA_CRTC_MODE_CONTROL_SYNC (1 << 7) - -/* AC control register bits */ -#define VGA_AC_CONTROL_ATGE (1 << 0) -#define VGA_AC_CONTROL_MONO (1 << 1) -#define VGA_AC_CONTROL_LGE (1 << 2) -#define VGA_AC_CONTROL_BLINK (1 << 3) -#define VGA_AC_CONTROL_PPM (1 << 5) -#define VGA_AC_CONTROL_8BIT (1 << 6) -#define VGA_AC_CONTROL_P54S (1 << 7) - -/* Miscellaneous register bits */ -#define VGA_MISC_COLOR (1 << 0) -#define VGA_MISC_RAM_ENABLED (1 << 1) -#define VGA_MISC_OE_INVERT (1 << 5) -#define VGA_MISC_HSYNCP (1 << 6) -#define VGA_MISC_VSYNCP (1 << 7) - -/* Status register flags */ -#define VGA_STAT_DD (1 << 0) -#define VGA_STAT_VRETRACE (1 << 3) +#define VGA_SEQ_MEM_EXT (1 << 1) +#define VGA_SEQ_MEM_OE (1 << 2) +#define VGA_SEQ_MEM_C4 (1 << 3) enum { @@ -120,19 +111,31 @@ VGA_SEQ_MAX_REG }; -enum -{ - VGA_GC_RESET_REG, - VGA_GC_ENABLE_RESET_REG, - VGA_GC_COLOR_COMPARE_REG, - VGA_GC_ROTATE_REG, - VGA_GC_READ_MAP_SEL_REG, - VGA_GC_MODE_REG, - VGA_GC_MISC_REG, - VGA_GC_COLOR_IGNORE_REG, - VGA_GC_BITMASK_REG, - VGA_GC_MAX_REG -}; + +// +// CRT Controller Registers +// + +/* CRTC overflow register bits */ +#define VGA_CRTC_OVERFLOW_VT8 (1 << 0) +#define VGA_CRTC_OVERFLOW_VDE8 (1 << 1) +#define VGA_CRTC_OVERFLOW_VRS8 (1 << 2) +#define VGA_CRTC_OVERFLOW_SVB8 (1 << 3) +#define VGA_CRTC_OVERFLOW_LC8 (1 << 4) +#define VGA_CRTC_OVERFLOW_VT9 (1 << 5) +#define VGA_CRTC_OVERFLOW_VDE9 (1 << 6) +#define VGA_CRTC_OVERFLOW_VRS9 (1 << 7) + +/* CRTC underline register bits */ +#define VGA_CRTC_UNDERLINE_DWORD (1 << 6) + +/* CRTC max scanline register bits */ +#define VGA_CRTC_MAXSCANLINE_DOUBLE (1 << 7) + +/* CRTC mode control register bits */ +#define VGA_CRTC_MODE_CONTROL_WRAP (1 << 5) +#define VGA_CRTC_MODE_CONTROL_BYTE (1 << 6) +#define VGA_CRTC_MODE_CONTROL_SYNC (1 << 7) enum { @@ -164,6 +167,50 @@ VGA_CRTC_MAX_REG }; + +// +// Graphics Controller Registers +// + +/* Graphics controller mode register bits */ +#define VGA_GC_MODE_READ (1 << 3) +#define VGA_GC_MODE_OE (1 << 4) +#define VGA_GC_MODE_SHIFTREG (1 << 5) +#define VGA_GC_MODE_SHIFT256 (1 << 6) + +/* Graphics controller miscellaneous register bits */ +#define VGA_GC_MISC_NOALPHA (1 << 0) +#define VGA_GC_MISC_OE (1 << 1) + +enum +{ + VGA_GC_RESET_REG, + VGA_GC_ENABLE_RESET_REG, + VGA_GC_COLOR_COMPARE_REG, + VGA_GC_ROTATE_REG, + VGA_GC_READ_MAP_SEL_REG, + VGA_GC_MODE_REG, + VGA_GC_MISC_REG, + VGA_GC_COLOR_IGNORE_REG, + VGA_GC_BITMASK_REG, + VGA_GC_MAX_REG +}; + + +// +// Attribute Controller Registers +// They are a relinquish of the CGA/EGA era. +// + +/* AC mode control register bits */ +#define VGA_AC_CONTROL_ATGE (1 << 0) +#define VGA_AC_CONTROL_MONO (1 << 1) +#define VGA_AC_CONTROL_LGE (1 << 2) +#define VGA_AC_CONTROL_BLINK (1 << 3) +#define VGA_AC_CONTROL_PPM (1 << 5) +#define VGA_AC_CONTROL_8BIT (1 << 6) +#define VGA_AC_CONTROL_P54S (1 << 7) + enum { VGA_AC_PAL_0_REG, @@ -190,6 +237,17 @@ VGA_AC_MAX_REG }; + +typedef struct _VGA_REGISTERS +{ + UCHAR Misc; + UCHAR Sequencer[VGA_SEQ_MAX_REG]; + UCHAR CRT[VGA_CRTC_MAX_REG]; + UCHAR Graphics[VGA_GC_MAX_REG]; + UCHAR Attribute[VGA_AC_MAX_REG]; +} VGA_REGISTERS, *PVGA_REGISTERS; + + /* FUNCTIONS ******************************************************************/ DWORD VgaGetVideoBaseAddress(VOID);

1 0

[akhaldi] 61245: [PSDK] * Fix a FIXME. * Add missing wincrypt.h inclusion.
by akhaldi＠svn.reactos.org 08 Dec '13

08 Dec '13

Author: akhaldi Date: Sun Dec 8 11:16:53 2013 New Revision: 61245 URL: http://svn.reactos.org/svn/reactos?rev=61245&view=rev Log: [PSDK] * Fix a FIXME. * Add missing wincrypt.h inclusion. Modified: trunk/reactos/include/psdk/mprapi.h Modified: trunk/reactos/include/psdk/mprapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mprapi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/mprapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mprapi.h [iso-8859-1] Sun Dec 8 11:16:53 2013 @@ -21,7 +21,8 @@ #include <lmcons.h> #include <ras.h> -/* FIXME: #include <in6addr.h> */ +#include <in6addr.h> +#include <wincrypt.h> #define MAX_DEVICE_NAME 128 #define MAX_DEVICETYPE_NAME 16

1 0

[jimtabor] 61244: [Win32k] - Restore code from revision 48982 by Giannis Adamopoulos. See CORE-6554. - Port sync wine winpos code. Fixes all the wine win:test_children/popup_zorder tests except "mo...
by jimtabor＠svn.reactos.org 08 Dec '13

08 Dec '13

Author: jimtabor Date: Sun Dec 8 00:40:54 2013 New Revision: 61244 URL: http://svn.reactos.org/svn/reactos?rev=61244&view=rev Log: [Win32k] - Restore code from revision 48982 by Giannis Adamopoulos. See CORE-6554. - Port sync wine winpos code. Fixes all the wine win:test_children/popup_zorder tests except "move hwnd_F and its popups down" that is if'ed out. Side effect, ReactOS regressed from 29 to 48 failures for the DeferWindowPos API test. That is not bad compared to wine ran 347 tests and 52 failures, ReactOS ran 385 tests. - Keeping code if'ed out for now and added a flag to set most bottom window. Modified: trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/ntuser/window.h trunk/reactos/win32ss/user/ntuser/winpos.c Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Sun Dec 8 00:40:54 2013 @@ -305,6 +305,64 @@ Depth++; } return FALSE; +} + +HWND FASTCALL +IntGetWindow(HWND hWnd, + UINT uCmd) +{ + PWND Wnd, FoundWnd; + HWND Ret = NULL; + + Wnd = ValidateHwndNoErr(hWnd); + if (!Wnd) + return NULL; + + FoundWnd = NULL; + switch (uCmd) + { + case GW_OWNER: + if (Wnd->spwndOwner != NULL) + FoundWnd = Wnd->spwndOwner; + break; + + case GW_HWNDFIRST: + if(Wnd->spwndParent != NULL) + { + FoundWnd = Wnd->spwndParent; + if (FoundWnd->spwndChild != NULL) + FoundWnd = FoundWnd->spwndChild; + } + break; + case GW_HWNDNEXT: + if (Wnd->spwndNext != NULL) + FoundWnd = Wnd->spwndNext; + break; + + case GW_HWNDPREV: + if (Wnd->spwndPrev != NULL) + FoundWnd = Wnd->spwndPrev; + break; + + case GW_CHILD: + if (Wnd->spwndChild != NULL) + FoundWnd = Wnd->spwndChild; + break; + + case GW_HWNDLAST: + FoundWnd = Wnd; + while ( FoundWnd->spwndNext != NULL) + FoundWnd = FoundWnd->spwndNext; + break; + + default: + Wnd = NULL; + break; + } + + if (FoundWnd != NULL) + Ret = UserHMGetHandle(FoundWnd); + return Ret; } /*********************************************************************** @@ -3403,6 +3461,7 @@ } UserRefObjectCo(WndShell, &Ref); + WndShell->state2 |= WNDS2_BOTTOMMOST; co_WinPosSetWindowPos(WndShell, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE); WinStaObject->ShellWindow = hwndShell; Modified: trunk/reactos/win32ss/user/ntuser/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.h [iso-8859-1] Sun Dec 8 00:40:54 2013 @@ -61,5 +61,6 @@ PWND FASTCALL VerifyWnd(PWND); PWND FASTCALL IntGetNonChildAncestor(PWND); LONG FASTCALL co_UserSetWindowLong(HWND,DWORD,LONG,BOOL); +HWND FASTCALL IntGetWindow(HWND,UINT); /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Sun Dec 8 00:40:54 2013 @@ -1349,21 +1349,23 @@ Y = WinPos->y; //ERR("Not SWP_NOMOVE\n"); Parent = Window->spwndParent; - if ((0 != (Window->style & WS_CHILD)) && Parent && - Parent != Window->head.rpdesk->pDeskInfo->spwnd) - { - //ERR("Not SWP_NOMOVE Parent client offset\n"); + if (((Window->style & WS_CHILD) != 0) && + Parent && + Parent != Window->head.rpdesk->pDeskInfo->spwnd) + { + //ERR("Not SWP_NOMOVE 1 Parent client offset X %d Y %d\n",X,Y); X += Parent->rcClient.left; Y += Parent->rcClient.top; + //ERR("Not SWP_NOMOVE 2 Parent client offset X %d Y %d\n",X,Y); } WindowRect->left = X; WindowRect->top = Y; WindowRect->right += X - Window->rcWindow.left; WindowRect->bottom += Y - Window->rcWindow.top; - RECTL_vOffsetRect(ClientRect, - X - Window->rcWindow.left, - Y - Window->rcWindow.top); + + RECTL_vOffsetRect(ClientRect, X - Window->rcWindow.left, + Y - Window->rcWindow.top); } WinPos->flags |= SWP_NOCLIENTMOVE | SWP_NOCLIENTSIZE; @@ -1382,7 +1384,11 @@ * FIXME: hide/show owned popups when owner visibility changes. * * ReactOS: See bug 6751 and 7228. + * */ + //// + // Pass all the win:test_children/popup_zorder tests except "move hwnd_F and its popups down" which is if'ed out. + // Side effect, breaks more of the DeferWindowPos api tests, but wine breaks more!!!! static HWND FASTCALL WinPosDoOwnedPopups(PWND Window, HWND hWndInsertAfter) @@ -1393,13 +1399,20 @@ PWND DesktopWindow, ChildObject; int i; + TRACE("(%p) hInsertAfter = %p\n", Window, hWndInsertAfter ); + Owner = Window->spwndOwner ? Window->spwndOwner->head.h : NULL; Style = Window->style; - if ((Style & WS_POPUP) && Owner) + if (Style & WS_CHILD) + { + TRACE("Window is child\n"); + return hWndInsertAfter; + } + + if (Owner) { /* Make sure this popup stays above the owner */ - HWND hWndLocalPrev = HWND_TOPMOST; if (hWndInsertAfter != HWND_TOPMOST) { @@ -1410,31 +1423,38 @@ { for (i = 0; List[i]; i++) { + BOOL topmost = FALSE; + + ChildObject = ValidateHwndNoErr(List[i]); + if (ChildObject) + { + topmost = (ChildObject->ExStyle & WS_EX_TOPMOST) != 0; + } + if (List[i] == Owner) + { + if (i > 0) hWndInsertAfter = List[i-1]; + else hWndInsertAfter = topmost ? HWND_TOPMOST : HWND_TOP; break; - if (HWND_TOP == hWndInsertAfter) + } + + if (hWndInsertAfter == HWND_TOP || hWndInsertAfter == HWND_NOTOPMOST) { - ChildObject = ValidateHwndNoErr(List[i]); - if (NULL != ChildObject) - { - if (0 == (ChildObject->ExStyle & WS_EX_TOPMOST)) - { - break; - } - } + if (!topmost) break; } - if (List[i] != Window->head.h) - hWndLocalPrev = List[i]; - if (hWndLocalPrev == hWndInsertAfter) - break; + else if (List[i] == hWndInsertAfter) break; } - hWndInsertAfter = hWndLocalPrev; - } - } - } - else if (Style & WS_CHILD) - { - return hWndInsertAfter; + } + else + return hWndInsertAfter; + } + } + + if (hWndInsertAfter == HWND_BOTTOM) + { + TRACE("Window is HWND_BOTTOM\n"); + if (List) ExFreePoolWithTag(List, USERTAG_WINDOWLIST); + goto done; } if (!List) @@ -1442,11 +1462,40 @@ DesktopWindow = UserGetDesktopWindow(); List = IntWinListChildren(DesktopWindow); } + if (List != NULL) { - for (i = 0; List[i]; i++) + i = 0; + + if (hWndInsertAfter == HWND_TOP || hWndInsertAfter == HWND_NOTOPMOST) + { + if (hWndInsertAfter == HWND_NOTOPMOST || !(Window->ExStyle & WS_EX_TOPMOST)) + { + TRACE("skip all the topmost windows\n"); + /* skip all the topmost windows */ + while (List[i] && + (ChildObject = ValidateHwndNoErr(List[i])) && + (ChildObject->ExStyle & WS_EX_TOPMOST)) i++; + } + } + else if (hWndInsertAfter != HWND_TOPMOST) + { + /* skip windows that are already placed correctly */ + for (i = 0; List[i]; i++) + { + if (List[i] == hWndInsertAfter) break; + if (List[i] == UserHMGetHandle(Window)) + { + ExFreePoolWithTag(List, USERTAG_WINDOWLIST); + goto done; /* nothing to do if window is moving backwards in z-order */ + } + } + } + + for (; List[i]; i++) { PWND Wnd; + USER_REFERENCE_ENTRY Ref; if (List[i] == UserHMGetHandle(Window)) break; @@ -1454,24 +1503,24 @@ if (!(Wnd = ValidateHwndNoErr(List[i]))) continue; - if (Wnd->style & WS_POPUP && Wnd->spwndOwner == Window) - { - USER_REFERENCE_ENTRY Ref; - UserRefObjectCo(Wnd, &Ref); - - co_WinPosSetWindowPos(Wnd, hWndInsertAfter, 0, 0, 0, 0, - SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOSENDCHANGING| SWP_DEFERERASE); - - UserDerefObjectCo(Wnd); - - hWndInsertAfter = List[i]; - } + Owner = Wnd->spwndOwner ? Wnd->spwndOwner->head.h : NULL; + + if (Owner != UserHMGetHandle(Window)) continue; + + UserRefObjectCo(Wnd, &Ref); + TRACE( "moving %p owned by %p after %p\n", List[i], UserHMGetHandle(Window), hWndInsertAfter ); + co_WinPosSetWindowPos(Wnd, hWndInsertAfter, 0, 0, 0, 0, + SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOSENDCHANGING| SWP_DEFERERASE); + + UserDerefObjectCo(Wnd); + hWndInsertAfter = List[i]; } ExFreePoolWithTag(List, USERTAG_WINDOWLIST); } - +done: return hWndInsertAfter; } +//// /*********************************************************************** * WinPosInternalMoveWindow @@ -1527,15 +1576,11 @@ Parent = UserGetAncestor( Wnd, GA_PARENT ); if (!IntIsWindowVisible( Parent )) WinPos->flags |= SWP_NOREDRAW; - if (Wnd->style & WS_VISIBLE) - { - WinPos->flags &= ~SWP_SHOWWINDOW; - } + if (Wnd->style & WS_VISIBLE) WinPos->flags &= ~SWP_SHOWWINDOW; else { WinPos->flags &= ~SWP_HIDEWINDOW; - if (!(WinPos->flags & SWP_SHOWWINDOW)) - WinPos->flags |= SWP_NOREDRAW; + if (!(WinPos->flags & SWP_SHOWWINDOW)) WinPos->flags |= SWP_NOREDRAW; } /* Check for right size */ @@ -1548,12 +1593,11 @@ pt.x = WinPos->x; pt.y = WinPos->y; IntClientToScreen( Parent, &pt ); -// ERR("WPFU C2S wpx %d wpy %d ptx %d pty %d\n",WinPos->x,WinPos->y,pt.x,pt.y); + //ERR("WPFU C2S wpx %d wpy %d ptx %d pty %d\n",WinPos->x,WinPos->y,pt.x,pt.y); /* Check for right position */ - if (Wnd->rcWindow.left == pt.x && - Wnd->rcWindow.top == pt.y) - { -// ERR("In right pos\n"); + if (Wnd->rcWindow.left == pt.x && Wnd->rcWindow.top == pt.y) + { + //ERR("In right pos\n"); WinPos->flags |= SWP_NOMOVE; } @@ -1565,12 +1609,12 @@ if ((Wnd->style & (WS_POPUP | WS_CHILD)) != WS_CHILD) { /* Bring to the top when activating */ - if (!(WinPos->flags & SWP_NOACTIVATE)) + if (!(WinPos->flags & (SWP_NOACTIVATE|SWP_HIDEWINDOW)) && + (WinPos->flags & SWP_NOZORDER || + (WinPos->hwndInsertAfter != HWND_TOPMOST && WinPos->hwndInsertAfter != HWND_NOTOPMOST))) { WinPos->flags &= ~SWP_NOZORDER; - WinPos->hwndInsertAfter = (0 != (Wnd->ExStyle & WS_EX_TOPMOST) ? - HWND_TOPMOST : HWND_TOP); - return TRUE; + WinPos->hwndInsertAfter = (0 != (Wnd->ExStyle & WS_EX_TOPMOST) ? HWND_TOPMOST : HWND_TOP); } } @@ -1587,25 +1631,31 @@ WinPos->hwndInsertAfter = HWND_NOTOPMOST; } - if (WinPos->hwndInsertAfter == HWND_NOTOPMOST) + if (WinPos->hwndInsertAfter == HWND_TOP) + { + /* Keep it topmost when it's already topmost */ + if ((Wnd->ExStyle & WS_EX_TOPMOST) != 0) + WinPos->hwndInsertAfter = HWND_TOPMOST; + + if (IntGetWindow(WinPos->hwnd, GW_HWNDFIRST) == WinPos->hwnd) + WinPos->flags |= SWP_NOZORDER; + } + else if (WinPos->hwndInsertAfter == HWND_BOTTOM) + { + if (!(Wnd->ExStyle & WS_EX_TOPMOST) && IntGetWindow(WinPos->hwnd, GW_HWNDLAST) == WinPos->hwnd) + WinPos->flags |= SWP_NOZORDER; + } + else if (WinPos->hwndInsertAfter == HWND_TOPMOST) + { + if ((Wnd->ExStyle & WS_EX_TOPMOST) && IntGetWindow(WinPos->hwnd, GW_HWNDFIRST) == WinPos->hwnd) + WinPos->flags |= SWP_NOZORDER; + } + else if (WinPos->hwndInsertAfter == HWND_NOTOPMOST) { if (!(Wnd->ExStyle & WS_EX_TOPMOST)) WinPos->flags |= SWP_NOZORDER; - - WinPos->hwndInsertAfter = HWND_TOP; - } - else if (HWND_TOP == WinPos->hwndInsertAfter - && 0 != (Wnd->ExStyle & WS_EX_TOPMOST)) - { - /* Keep it topmost when it's already topmost */ - WinPos->hwndInsertAfter = HWND_TOPMOST; - } - - /* hwndInsertAfter must be a sibling of the window */ - if (HWND_TOPMOST != WinPos->hwndInsertAfter - && HWND_TOP != WinPos->hwndInsertAfter - && HWND_NOTOPMOST != WinPos->hwndInsertAfter - && HWND_BOTTOM != WinPos->hwndInsertAfter) + } + else /* hwndInsertAfter must be a sibling of the window */ { PWND InsAfterWnd; @@ -1673,7 +1723,7 @@ RECTL CopyRect; PWND Ancestor; BOOL bPointerInWindow; - BOOL bNoTopMost; + //BOOL bNoTopMost; ASSERT_REFS_CO(Window); @@ -1713,7 +1763,7 @@ co_WinPosDoWinPosChanging(Window, &WinPos, &NewWindowRect, &NewClientRect); // HWND_NOTOPMOST is redirected in WinPosFixupFlags. - bNoTopMost = WndInsertAfter == HWND_NOTOPMOST; + //bNoTopMost = WndInsertAfter == HWND_NOTOPMOST; /* Does the window still exist? */ if (!IntIsWindow(WinPos.hwnd)) @@ -1774,6 +1824,8 @@ /* Validate link windows. (also take into account shell window in hwndShellWindow) */ if (!(WinPos.flags & SWP_NOZORDER) && WinPos.hwnd != UserGetShellWindow()) { + IntLinkHwnd(Window, WinPos.hwndInsertAfter); +#if 0 //// Fix bug 6751 & 7228 see WinPosDoOwnedPopups wine Fixme. PWND ParentWindow; PWND Sibling; @@ -1836,6 +1888,7 @@ } } //// +#endif } OldWindowRect = Window->rcWindow;

1 0

[akhaldi] 61243: [WS2_32_WINETEST] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 07 Dec '13

07 Dec '13

Author: akhaldi Date: Sat Dec 7 20:26:32 2013 New Revision: 61243 URL: http://svn.reactos.org/svn/reactos?rev=61243&view=rev Log: [WS2_32_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/ws2_32/CMakeLists.txt trunk/rostests/winetests/ws2_32/protocol.c trunk/rostests/winetests/ws2_32/sock.c trunk/rostests/winetests/ws2_32/testlist.c Modified: trunk/rostests/winetests/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ws2_32/CMakeLis… ============================================================================== --- trunk/rostests/winetests/ws2_32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/ws2_32/CMakeLists.txt [iso-8859-1] Sat Dec 7 20:26:32 2013 @@ -1,11 +1,7 @@ - -add_definitions( - -D__ROS_LONG64__) add_executable(ws2_32_winetest protocol.c sock.c testlist.c) -target_link_libraries(ws2_32_winetest wine) set_module_type(ws2_32_winetest win32cui) -add_importlibs(ws2_32_winetest ws2_32 user32 msvcrt kernel32 ntdll) +add_importlibs(ws2_32_winetest ws2_32 user32 msvcrt kernel32) add_cd_file(TARGET ws2_32_winetest DESTINATION reactos/bin FOR all) if(NOT MSVC) Modified: trunk/rostests/winetests/ws2_32/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ws2_32/protocol… ============================================================================== --- trunk/rostests/winetests/ws2_32/protocol.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ws2_32/protocol.c [iso-8859-1] Sat Dec 7 20:26:32 2013 @@ -26,22 +26,55 @@ #include "wine/test.h" +/* TCP and UDP over IP fixed set of service flags */ +#define TCPIP_SERVICE_FLAGS (XP1_GUARANTEED_DELIVERY \ + | XP1_GUARANTEED_ORDER \ + | XP1_GRACEFUL_CLOSE \ + | XP1_EXPEDITED_DATA \ + | XP1_IFS_HANDLES) + +#define UDPIP_SERVICE_FLAGS (XP1_CONNECTIONLESS \ + | XP1_MESSAGE_ORIENTED \ + | XP1_SUPPORT_BROADCAST \ + | XP1_SUPPORT_MULTIPOINT \ + | XP1_IFS_HANDLES) + +static void test_service_flags(int family, int version, int socktype, int protocol, DWORD testflags) +{ + DWORD expectedflags = 0; + if (socktype == SOCK_STREAM && protocol == IPPROTO_TCP) + expectedflags = TCPIP_SERVICE_FLAGS; + if (socktype == SOCK_DGRAM && protocol == IPPROTO_UDP) + expectedflags = UDPIP_SERVICE_FLAGS; + + /* check if standard TCP and UDP protocols are offering the correct service flags */ + if ((family == AF_INET || family == AF_INET6) && version == 2 && expectedflags) + { + /* QOS may or may not be installed */ + testflags &= ~XP1_QOS_SUPPORTED; + ok(expectedflags == testflags, + "Incorrect flags, expected 0x%x, received 0x%x\n", + expectedflags, testflags); + } +} static void test_WSAEnumProtocolsA(void) { INT ret; - DWORD len = 0; + DWORD len = 0, error; WSAPROTOCOL_INFOA info, *buffer; ret = WSAEnumProtocolsA( NULL, NULL, &len ); - ok( ret == SOCKET_ERROR, "WSAEnumProtocolsA() succeeded unexpectedly: %d\n", - WSAGetLastError() ); + ok( ret == SOCKET_ERROR, "WSAEnumProtocolsA() succeeded unexpectedly\n"); + error = WSAGetLastError(); + ok( error == WSAENOBUFS, "Expected 10055, received %d\n", error); len = 0; ret = WSAEnumProtocolsA( NULL, &info, &len ); - ok( ret == SOCKET_ERROR, "WSAEnumProtocolsA() succeeded unexpectedly: %d\n", - WSAGetLastError() ); + ok( ret == SOCKET_ERROR, "WSAEnumProtocolsA() succeeded unexpectedly\n"); + error = WSAGetLastError(); + ok( error == WSAENOBUFS, "Expected 10055, received %d\n", error); buffer = HeapAlloc( GetProcessHeap(), 0, len ); @@ -56,6 +89,9 @@ for (i = 0; i < ret; i++) { ok( strlen( buffer[i].szProtocol ), "No protocol name found\n" ); + test_service_flags( buffer[i].iAddressFamily, buffer[i].iVersion, + buffer[i].iSocketType, buffer[i].iProtocol, + buffer[i].dwServiceFlags1); } HeapFree( GetProcessHeap(), 0, buffer ); @@ -65,18 +101,20 @@ static void test_WSAEnumProtocolsW(void) { INT ret; - DWORD len = 0; + DWORD len = 0, error; WSAPROTOCOL_INFOW info, *buffer; ret = WSAEnumProtocolsW( NULL, NULL, &len ); - ok( ret == SOCKET_ERROR, "WSAEnumProtocolsW() succeeded unexpectedly: %d\n", - WSAGetLastError() ); + ok( ret == SOCKET_ERROR, "WSAEnumProtocolsW() succeeded unexpectedly\n"); + error = WSAGetLastError(); + ok( error == WSAENOBUFS, "Expected 10055, received %d\n", error); len = 0; ret = WSAEnumProtocolsW( NULL, &info, &len ); - ok( ret == SOCKET_ERROR, "WSAEnumProtocolsW() succeeded unexpectedly: %d\n", - WSAGetLastError() ); + ok( ret == SOCKET_ERROR, "WSAEnumProtocolsW() succeeded unexpectedly\n"); + error = WSAGetLastError(); + ok( error == WSAENOBUFS, "Expected 10055, received %d\n", error); buffer = HeapAlloc( GetProcessHeap(), 0, len ); @@ -91,6 +129,9 @@ for (i = 0; i < ret; i++) { ok( lstrlenW( buffer[i].szProtocol ), "No protocol name found\n" ); + test_service_flags( buffer[i].iAddressFamily, buffer[i].iVersion, + buffer[i].iSocketType, buffer[i].iProtocol, + buffer[i].dwServiceFlags1); } HeapFree( GetProcessHeap(), 0, buffer ); Modified: trunk/rostests/winetests/ws2_32/sock.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ws2_32/sock.c?r… ============================================================================== --- trunk/rostests/winetests/ws2_32/sock.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ws2_32/sock.c [iso-8859-1] Sat Dec 7 20:26:32 2013 @@ -1109,6 +1109,18 @@ int timeout; LINGER lingval; int size; + WSAPROTOCOL_INFOA infoA; + WSAPROTOCOL_INFOW infoW; + char providername[WSAPROTOCOL_LEN + 1]; + struct _prottest + { + int family, type, proto; + } prottest[] = { + {AF_INET, SOCK_STREAM, IPPROTO_TCP}, + {AF_INET, SOCK_DGRAM, IPPROTO_UDP}, + {AF_INET6, SOCK_STREAM, IPPROTO_TCP}, + {AF_INET6, SOCK_DGRAM, IPPROTO_UDP} + }; s = socket(AF_INET, SOCK_STREAM, 0); ok(s!=INVALID_SOCKET, "socket() failed error: %d\n", WSAGetLastError()); @@ -1186,17 +1198,120 @@ SetLastError(0xdeadbeef); err = setsockopt(s, 0xffffffff, SO_RCVTIMEO, (char *) &timeout, size); ok( (err == SOCKET_ERROR) && (WSAGetLastError() == WSAEINVAL), - "got %d with %d (expected SOCKET_ERROR with WSAEINVAL\n", + "got %d with %d (expected SOCKET_ERROR with WSAEINVAL)\n", err, WSAGetLastError()); timeout = SOCKTIMEOUT1; SetLastError(0xdeadbeef); err = setsockopt(s, 0x00008000, SO_RCVTIMEO, (char *) &timeout, size); ok( (err == SOCKET_ERROR) && (WSAGetLastError() == WSAEINVAL), - "got %d with %d (expected SOCKET_ERROR with WSAEINVAL\n", + "got %d with %d (expected SOCKET_ERROR with WSAEINVAL)\n", err, WSAGetLastError()); + /* Test SO_ERROR set/get */ + SetLastError(0xdeadbeef); + i = 1234; + err = setsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, size); +todo_wine + ok( !err && !WSAGetLastError(), + "got %d with %d (expected 0 with 0)\n", + err, WSAGetLastError()); + + SetLastError(0xdeadbeef); + i = 4321; + err = getsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, &size); +todo_wine + ok( !err && !WSAGetLastError(), + "got %d with %d (expected 0 with 0)\n", + err, WSAGetLastError()); +todo_wine + ok (i == 1234, "got %d (expected 1234)\n", i); + + /* Test invalid optlen */ + SetLastError(0xdeadbeef); + size = 1; + err = getsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, &size); +todo_wine + ok( (err == SOCKET_ERROR) && (WSAGetLastError() == WSAEFAULT), + "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", + err, WSAGetLastError()); + closesocket(s); + + /* test SO_PROTOCOL_INFOA invalid parameters */ + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOA, NULL, NULL), + "getsockopt should have failed\n"); + err = WSAGetLastError(); +todo_wine + ok(err == WSAEFAULT, "expected 10014, got %d instead\n", err); + ok(getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOA, (char *) &infoA, NULL), + "getsockopt should have failed\n"); + err = WSAGetLastError(); +todo_wine + ok(err == WSAEFAULT, "expected 10014, got %d instead\n", err); + ok(getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOA, NULL, &size), + "getsockopt should have failed\n"); + err = WSAGetLastError(); +todo_wine + ok(err == WSAEFAULT, "expected 10014, got %d instead\n", err); + + size = sizeof(WSAPROTOCOL_INFOA) / 2; + ok(getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOA, (char *) &infoA, &size), + "getsockopt should have failed\n"); + err = WSAGetLastError(); +todo_wine + ok(err == WSAEFAULT, "expected 10014, got %d instead\n", err); + closesocket(s); + + /* test SO_PROTOCOL_INFO structure returned for different protocols */ + for (i = 0; i < sizeof(prottest) / sizeof(prottest[0]); i++) + { + s = socket(prottest[i].family, prottest[i].type, prottest[i].proto); + if (s == INVALID_SOCKET && prottest[i].family == AF_INET6) continue; + + ok(s != INVALID_SOCKET, "Failed to create socket: %d\n", + WSAGetLastError()); + + /* compare both A and W version */ + infoA.szProtocol[0] = 0; + size = sizeof(WSAPROTOCOL_INFOA); + err = getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOA, (char *) &infoA, &size); +todo_wine + ok(!err,"getsockopt failed with %d\n", WSAGetLastError()); + + infoW.szProtocol[0] = 0; + size = sizeof(WSAPROTOCOL_INFOW); + err = getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOW, (char *) &infoW, &size); +todo_wine + ok(!err,"getsockopt failed with %d\n", WSAGetLastError()); + + trace("provider name '%s', family %d, type %d, proto %d\n", + infoA.szProtocol, prottest[i].family, prottest[i].type, prottest[i].proto); + + todo_wine { + ok(infoA.szProtocol[0], "WSAPROTOCOL_INFOA was not filled\n"); + ok(infoW.szProtocol[0], "WSAPROTOCOL_INFOW was not filled\n"); + } + + WideCharToMultiByte(CP_ACP, 0, infoW.szProtocol, -1, + providername, sizeof(providername), NULL, NULL); + ok(!strcmp(infoA.szProtocol,providername), + "different provider names '%s' != '%s'\n", infoA.szProtocol, providername); + + todo_wine { + ok(!memcmp(&infoA, &infoW, FIELD_OFFSET(WSAPROTOCOL_INFOA, szProtocol)), + "SO_PROTOCOL_INFO[A/W] comparison failed\n"); + ok(infoA.iAddressFamily == prottest[i].family, "socket family invalid, expected %d received %d\n", + prottest[i].family, infoA.iAddressFamily); + ok(infoA.iSocketType == prottest[i].type, "socket type invalid, expected %d received %d\n", + prottest[i].type, infoA.iSocketType); + ok(infoA.iProtocol == prottest[i].proto, "socket protocol invalid, expected %d received %d\n", + prottest[i].proto, infoA.iProtocol); + } + + closesocket(s); + } } static void test_so_reuseaddr(void) @@ -1641,17 +1756,65 @@ { SOCKET sock = INVALID_SOCKET; WSAPROTOCOL_INFOA *pi; - int providers[] = {6, 0}; - int ret, err; + int wsaproviders[] = {IPPROTO_TCP, IPPROTO_IP}; + int autoprotocols[] = {IPPROTO_TCP, IPPROTO_UDP}; + int items, err, size, socktype, i, j; UINT pi_size; + + SetLastError(0xdeadbeef); + ok(WSASocketA(0, 0, 0, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); + err = WSAGetLastError(); +todo_wine + ok(err == WSAEINVAL, "Expected 10022, received %d\n", err); + + sock = WSASocketA(AF_INET, 0, 0, NULL, 0, 0); +todo_wine + ok(sock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); + closesocket(sock); + + sock = WSASocketA(AF_INET, SOCK_STREAM, 0, NULL, 0, 0); + ok(sock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); + closesocket(sock); + + sock = WSASocketA(AF_INET, 0, IPPROTO_TCP, NULL, 0, 0); +todo_wine + ok(sock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); + closesocket(sock); + + SetLastError(0xdeadbeef); + ok(WSASocketA(0, SOCK_STREAM, 0, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); + err = WSAGetLastError(); +todo_wine + ok(err == WSAEINVAL, "Expected 10022, received %d\n", err); + + sock = WSASocketA(0, 0, IPPROTO_TCP, NULL, 0, 0); +todo_wine + ok(sock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); + closesocket(sock); + + /* SOCK_STREAM does not support IPPROTO_UDP */ + SetLastError(0xdeadbeef); + ok(WSASocketA(AF_INET, SOCK_STREAM, IPPROTO_UDP, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); +todo_wine + ok(err == WSAEPROTONOSUPPORT, "Expected 10043, received %d\n", err); + + /* SOCK_DGRAM does not support IPPROTO_TCP */ + SetLastError(0xdeadbeef); + ok(WSASocketA(AF_INET, SOCK_DGRAM, IPPROTO_TCP, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); +todo_wine + ok(err == WSAEPROTONOSUPPORT, "Expected 10043, received %d\n", err); /* Set pi_size explicitly to a value below 2*sizeof(WSAPROTOCOL_INFOA) * to avoid a crash on win98. */ pi_size = 0; - ret = WSAEnumProtocolsA(providers, NULL, &pi_size); - ok(ret == SOCKET_ERROR, "WSAEnumProtocolsA({6,0}, NULL, 0) returned %d\n", - ret); + items = WSAEnumProtocolsA(wsaproviders, NULL, &pi_size); + ok(items == SOCKET_ERROR, "WSAEnumProtocolsA({6,0}, NULL, 0) returned %d\n", + items); err = WSAGetLastError(); ok(err == WSAENOBUFS, "WSAEnumProtocolsA error is %d, not WSAENOBUFS(%d)\n", err, WSAENOBUFS); @@ -1663,11 +1826,11 @@ return; } - ret = WSAEnumProtocolsA(providers, pi, &pi_size); - ok(ret != SOCKET_ERROR, "WSAEnumProtocolsA failed, last error is %d\n", + items = WSAEnumProtocolsA(wsaproviders, pi, &pi_size); + ok(items != SOCKET_ERROR, "WSAEnumProtocolsA failed, last error is %d\n", WSAGetLastError()); - if (ret == 0) { + if (items == 0) { skip("No protocols enumerated.\n"); HeapFree(GetProcessHeap(), 0, pi); return; @@ -1677,8 +1840,116 @@ FROM_PROTOCOL_INFO, &pi[0], 0, 0); ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", WSAGetLastError()); - closesocket(sock); + + /* find what parameters are used first: plain parameters or protocol info struct */ + pi[0].iProtocol = IPPROTO_UDP; + pi[0].iSocketType = SOCK_DGRAM; + pi[0].iAddressFamily = AF_INET; + sock = WSASocketA(0, 0, 0, &pi[0], 0, 0); +todo_wine { + ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", + WSAGetLastError()); + size = sizeof(socktype); + socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err,"getsockopt failed with %d\n", WSAGetLastError()); + ok(socktype == SOCK_DGRAM, "Wrong socket type, expected %d received %d\n", + SOCK_DGRAM, socktype); + closesocket(sock); +} + sock = WSASocketA(AF_INET, SOCK_STREAM, IPPROTO_TCP, &pi[0], 0, 0); + ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", + WSAGetLastError()); + size = sizeof(socktype); + socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err,"getsockopt failed with %d\n", WSAGetLastError()); + ok(socktype == SOCK_STREAM, "Wrong socket type, expected %d received %d\n", + SOCK_STREAM, socktype); + closesocket(sock); + + HeapFree(GetProcessHeap(), 0, pi); + + pi_size = 0; + items = WSAEnumProtocolsA(NULL, NULL, &pi_size); + ok(items == SOCKET_ERROR, "WSAEnumProtocolsA(NULL, NULL, 0) returned %d\n", + items); + err = WSAGetLastError(); + ok(err == WSAENOBUFS, "WSAEnumProtocolsA error is %d, not WSAENOBUFS(%d)\n", + err, WSAENOBUFS); + + pi = HeapAlloc(GetProcessHeap(), 0, pi_size); + ok(pi != NULL, "Failed to allocate memory\n"); + if (pi == NULL) { + skip("Can't continue without memory.\n"); + return; + } + + items = WSAEnumProtocolsA(NULL, pi, &pi_size); + ok(items != SOCKET_ERROR, "WSAEnumProtocolsA failed, last error is %d\n", + WSAGetLastError()); + + /* when no protocol and socket type are specified the first entry + * from WSAEnumProtocols that has the flag PFL_MATCHES_PROTOCOL_ZERO + * is returned */ + sock = WSASocketA(AF_INET, 0, 0, NULL, 0, 0); +todo_wine + ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", + WSAGetLastError()); + +todo_wine { + size = sizeof(socktype); + socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); + for(i = 0; i < items; i++) + { + if(pi[i].dwProviderFlags & PFL_MATCHES_PROTOCOL_ZERO) + { + ok(socktype == pi[i].iSocketType, "Wrong socket type, expected %d received %d\n", + pi[i].iSocketType, socktype); + break; + } + } + ok(i != items, "Creating a socket without protocol and socket type didn't work\n"); +} + closesocket(sock); + + /* when no socket type is specified the first entry from WSAEnumProtocols + * that matches the protocol is returned */ + for (i = 0; i < sizeof(autoprotocols) / sizeof(autoprotocols[0]); i++) + { + sock = WSASocketA(0, 0, autoprotocols[i], NULL, 0, 0); +todo_wine + ok(sock != INVALID_SOCKET, "Failed to create socket for protocol %d, received %d\n", + autoprotocols[i], WSAGetLastError()); + + size = sizeof(socktype); + socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); +todo_wine + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); + + for (err = 1, j = 0; j < items; j++) + { + if (pi[j].iProtocol == autoprotocols[i]) + { + if (socktype == pi[j].iSocketType) + err = 0; + else +todo_wine + ok(0, "Wrong socket type, expected %d received %d\n", + pi[j].iSocketType, socktype); + break; + } + } +todo_wine + ok(!err, "Protocol %d not found in WSAEnumProtocols\n", autoprotocols[i]); + + closesocket(sock); + } + HeapFree(GetProcessHeap(), 0, pi); } @@ -2331,6 +2602,91 @@ ret = closesocket(sock); ok ( (ret == 0), "closesocket failed unexpectedly: %d\n", WSAGetLastError()); +} + +static void test_listen(void) +{ + SOCKET fdA, fdB; + int ret, acceptc, olen = sizeof(acceptc); + struct sockaddr_in address; + + memset(&address, 0, sizeof(address)); + address.sin_addr.s_addr = inet_addr("127.0.0.1"); + address.sin_family = AF_INET; + address.sin_port = htons(SERVERPORT); + + /* invalid socket tests */ + SetLastError(0xdeadbeef); + ok ((listen(0, 0) == SOCKET_ERROR), "listen did not fail\n"); + ret = WSAGetLastError(); + ok (ret == WSAENOTSOCK, "expected 10038, received %d\n", ret); + + SetLastError(0xdeadbeef); + ok ((listen(0xdeadbeef, 0) == SOCKET_ERROR), "listen did not fail\n"); + ret = WSAGetLastError(); + ok (ret == WSAENOTSOCK, "expected 10038, received %d\n", ret); + + /* tcp tests */ + fdA = socket(AF_INET, SOCK_STREAM, 0); + ok ((fdA != INVALID_SOCKET), "socket failed unexpectedly: %d\n", WSAGetLastError() ); + + fdB = socket(AF_INET, SOCK_STREAM, 0); + ok ((fdB != INVALID_SOCKET), "socket failed unexpectedly: %d\n", WSAGetLastError() ); + + SetLastError(0xdeadbeef); + ok ((listen(fdA, -2) == SOCKET_ERROR), "listen did not fail\n"); + ret = WSAGetLastError(); + ok (ret == WSAEINVAL, "expected 10022, received %d\n", ret); + + SetLastError(0xdeadbeef); + ok ((listen(fdA, 1) == SOCKET_ERROR), "listen did not fail\n"); + ret = WSAGetLastError(); + ok (ret == WSAEINVAL, "expected 10022, received %d\n", ret); + + SetLastError(0xdeadbeef); + ok ((listen(fdA, SOMAXCONN) == SOCKET_ERROR), "listen did not fail\n"); + ret = WSAGetLastError(); + ok (ret == WSAEINVAL, "expected 10022, received %d\n", ret); + + ok (!bind(fdA, (struct sockaddr*) &address, sizeof(address)), "bind failed\n"); + + SetLastError(0xdeadbeef); + ok (bind(fdB, (struct sockaddr*) &address, sizeof(address)), "bind should have failed\n"); + ok (ret == WSAEINVAL, "expected 10022, received %d\n", ret); + + acceptc = 0xdead; + ret = getsockopt(fdA, SOL_SOCKET, SO_ACCEPTCONN, (char*)&acceptc, &olen); + ok (!ret, "getsockopt failed\n"); + ok (acceptc == 0, "SO_ACCEPTCONN should be 0, received %d\n", acceptc); + + ok (!listen(fdA, 0), "listen failed\n"); + ok (!listen(fdA, SOMAXCONN), "double listen failed\n"); + + acceptc = 0xdead; + ret = getsockopt(fdA, SOL_SOCKET, SO_ACCEPTCONN, (char*)&acceptc, &olen); + ok (!ret, "getsockopt failed\n"); + ok (acceptc == 1, "SO_ACCEPTCONN should be 1, received %d\n", acceptc); + + SetLastError(0xdeadbeef); + ok ((listen(fdB, SOMAXCONN) == SOCKET_ERROR), "listen did not fail\n"); + ret = WSAGetLastError(); + ok (ret == WSAEINVAL, "expected 10022, received %d\n", ret); + + ret = closesocket(fdB); + ok (ret == 0, "closesocket failed unexpectedly: %d\n", ret); + + fdB = socket(AF_INET, SOCK_STREAM, 0); + ok ((fdB != INVALID_SOCKET), "socket failed unexpectedly: %d\n", WSAGetLastError() ); + + SetLastError(0xdeadbeef); + ok (bind(fdB, (struct sockaddr*) &address, sizeof(address)), "bind should have failed\n"); + ret = WSAGetLastError(); + ok (ret == WSAEADDRINUSE, "expected 10048, received %d\n", ret); + + ret = closesocket(fdA); + ok (ret == 0, "closesocket failed unexpectedly: %d\n", ret); + ret = closesocket(fdB); + ok (ret == 0, "closesocket failed unexpectedly: %d\n", ret); } static void test_select(void) @@ -2374,9 +2730,7 @@ ok ( !FD_ISSET(fdRead, &exceptfds), "FD should not be set\n"); ok ( !FD_ISSET(fdWrite, &exceptfds), "FD should not be set\n"); - todo_wine { ok ((listen(fdWrite, SOMAXCONN) == SOCKET_ERROR), "listen did not fail\n"); - } ret = closesocket(fdWrite); ok ( (ret == 0), "closesocket failed unexpectedly: %d\n", ret); @@ -2701,7 +3055,7 @@ return; } - memcpy(&sa_get, &sa_set, sizeof(sa_set)); + sa_get = sa_set; if (getsockname(sock, (struct sockaddr*) &sa_get, &sa_get_len) == 0) ok(0, "getsockname on unbound socket should fail\n"); else { @@ -2763,22 +3117,22 @@ addr.mem = h + 1; if(h->h_addr_list == addr.mem) /* <= W2K */ { - skip("Skipping hostent tests since this OS is unsupported\n"); + win_skip("Skipping hostent tests since this OS is unsupported\n"); return; } - todo_wine ok(h->h_aliases == addr.mem, + ok(h->h_aliases == addr.mem, "hostent->h_aliases should be in %p, it is in %p\n", addr.mem, h->h_aliases); for(ptr = h->h_aliases, acount = 1; *ptr; ptr++) acount++; addr.chr += sizeof(*ptr) * acount; - todo_wine ok(h->h_addr_list == addr.mem, + ok(h->h_addr_list == addr.mem, "hostent->h_addr_list should be in %p, it is in %p\n", addr.mem, h->h_addr_list); for(ptr = h->h_addr_list, acount = 1; *ptr; ptr++) acount++; addr.chr += sizeof(*ptr) * acount; - todo_wine ok(h->h_addr_list[0] == addr.mem, + ok(h->h_addr_list[0] == addr.mem, "hostent->h_addr_list[0] should be in %p, it is in %p\n", addr.mem, h->h_addr_list[0]); } @@ -3029,7 +3383,7 @@ ok(ret != SOCKET_ERROR, "ioctlsocket failed unexpectedly\n"); ok(arg, "SIOCATMARK expected a non-zero value\n"); - /* disable SO_OOBINLINE and get the same old bahavior */ + /* disable SO_OOBINLINE and get the same old behavior */ optval = 0; ret = setsockopt(sock, SOL_SOCKET, SO_OOBINLINE, (void *)&optval, sizeof(optval)); ok(ret != SOCKET_ERROR, "setsockopt failed unexpectedly\n"); @@ -3549,12 +3903,18 @@ goto end; } + ret = set_blocking(src, TRUE); + ok(!ret, "set_blocking failed, error %d\n", WSAGetLastError()); + src2 = socket(AF_INET, SOCK_STREAM, 0); if (src2 == INVALID_SOCKET) { ok(0, "creating socket pair failed (%d), skipping test\n", GetLastError()); goto end; } + + ret = set_blocking(src2, TRUE); + ok(!ret, "set_blocking failed, error %d\n", WSAGetLastError()); len = sizeof(BOOL); if (getsockopt(src, SOL_SOCKET, SO_OOBINLINE, (void *)&bret, &len) == SOCKET_ERROR) @@ -3596,12 +3956,18 @@ goto end; } + ok(set_blocking(src, TRUE) == SOCKET_ERROR, "set_blocking should failed!\n"); + ok(WSAGetLastError() == WSAEINVAL, "expect WSAEINVAL, returned %x\n", WSAGetLastError()); + ret = WSAAsyncSelect(src2, hWnd, WM_SOCKET, FD_CONNECT | FD_READ | FD_OOB | FD_WRITE | FD_CLOSE); if (ret) { ok(0, "WSAAsyncSelect failed, error %d\n", ret); goto end; } + + ok(set_blocking(src2, TRUE) == SOCKET_ERROR, "set_blocking should failed!\n"); + ok(WSAGetLastError() == WSAEINVAL, "expect WSAEINVAL, returned %x\n", WSAGetLastError()); } else { @@ -3628,12 +3994,18 @@ goto end; } + ok(set_blocking(src, TRUE) == SOCKET_ERROR, "set_blocking should failed!\n"); + ok(WSAGetLastError() == WSAEINVAL, "expect WSAEINVAL, returned %x\n", WSAGetLastError()); + ret = WSAEventSelect(src2, hEvent2, FD_CONNECT | FD_READ | FD_OOB | FD_WRITE | FD_CLOSE); if (ret) { ok(0, "WSAEventSelect failed, error %d\n", ret); goto end; } + + ok(set_blocking(src2, TRUE) == SOCKET_ERROR, "set_blocking should failed!\n"); + ok(WSAGetLastError() == WSAEINVAL, "expect WSAEINVAL, returned %x\n", WSAGetLastError()); } server = socket(AF_INET, SOCK_STREAM, 0); @@ -3755,7 +4127,7 @@ ok(ret == 50, "Failed to recv buffer %d err %d\n", ret, GetLastError()); ok_event_seq(src, hEvent, empty_seq, NULL, 0); - /* fun fact - events are reenabled even on failure, but only for messages */ + /* fun fact - events are re-enabled even on failure, but only for messages */ ret = send(dst, "1", 1, 0); ok(ret == 1, "Failed to send buffer %d err %d\n", ret, GetLastError()); ok_event_seq(src, hEvent, read_seq, NULL, 0); @@ -3965,6 +4337,51 @@ ret = send(src2, "1", 1, 0); ok(ret == 1, "Sending to half-closed socket failed %d err %d\n", ret, GetLastError()); ok_event_seq(src2, hEvent2, empty_seq, NULL, 0); + + if (useMessages) + { + ret = WSAAsyncSelect(src, hWnd, WM_SOCKET, 0); + if (ret) + { + ok(0, "WSAAsyncSelect failed, error %d\n", ret); + goto end; + } + + ret = set_blocking(src, TRUE); + ok(!ret, "set_blocking failed, error %d\n", WSAGetLastError()); + + ret = WSAAsyncSelect(src2, hWnd, WM_SOCKET, 0); + if (ret) + { + ok(0, "WSAAsyncSelect failed, error %d\n", ret); + goto end; + } + + ret = set_blocking(src2, TRUE); + ok(!ret, "set_blocking failed, error %d\n", WSAGetLastError()); + } + else + { + ret = WSAEventSelect(src, hEvent2, 0); + if (ret) + { + ok(0, "WSAAsyncSelect failed, error %d\n", ret); + goto end; + } + + ret = set_blocking(src, TRUE); + ok(!ret, "set_blocking failed, error %d\n", WSAGetLastError()); + + ret = WSAEventSelect(src2, hEvent2, 0); + if (ret) + { + ok(0, "WSAAsyncSelect failed, error %d\n", ret); + goto end; + } + + ret = set_blocking(src2, TRUE); + ok(!ret, "set_blocking failed, error %d\n", WSAGetLastError()); + } end: if (src != INVALID_SOCKET) @@ -4154,6 +4571,8 @@ todo_wine ok(!bret && (GetLastError() == ERROR_NETNAME_DELETED || broken(GetLastError() == ERROR_IO_INCOMPLETE) /* win9x */), "Did not get disconnect event: %d, error %d\n", bret, GetLastError()); ok(bytesReturned == 0, "Bytes received is %d\n", bytesReturned); + closesocket(dest); + dest = INVALID_SOCKET; src = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, 0); ok(src != INVALID_SOCKET, "failed to create socket %d\n", WSAGetLastError()); @@ -4749,6 +5168,7 @@ ok(!iret, "getsockopt failed %d\n", WSAGetLastError()); ok(connect_time == ~0u, "unexpected connect time %u\n", connect_time); + /* AcceptEx() still won't complete until we send data */ iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); ok(iret == 0, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); @@ -4764,7 +5184,14 @@ iret = getsockname( connector, (struct sockaddr *)&peerAddress, &remoteSize); ok( !iret, "getsockname failed.\n"); - /* Check if the buffer from AcceptEx is decoded correclty */ + /* AcceptEx() could complete any time now */ + iret = send(connector, buffer, 1, 0); + ok(iret == 1, "could not send 1 byte: send %d errno %d\n", iret, WSAGetLastError()); + + dwret = WaitForSingleObject(overlapped.hEvent, 1000); + ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); + + /* Check if the buffer from AcceptEx is decoded correctly */ pGetAcceptExSockaddrs(buffer, 2, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, (struct sockaddr **)&readBindAddress, &localSize, (struct sockaddr **)&readRemoteAddress, &remoteSize); @@ -4782,12 +5209,6 @@ ok( readRemoteAddress->sin_port == peerAddress.sin_port, "Remote socket port is different: %d != %d\n", readRemoteAddress->sin_port, peerAddress.sin_port); - - iret = send(connector, buffer, 1, 0); - ok(iret == 1, "could not send 1 byte: send %d errno %d\n", iret, WSAGetLastError()); - - dwret = WaitForSingleObject(overlapped.hEvent, 1000); - ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE); ok(bret, "GetOverlappedResult failed, error %d\n", GetLastError()); @@ -5379,6 +5800,8 @@ ok(iret == SOCKET_ERROR, "WSARecv returned %d\n", iret); ok(GetLastError() == ERROR_IO_PENDING, "Last error was %d\n", GetLastError()); + Sleep(100); + closesocket(src); src = INVALID_SOCKET; @@ -5408,8 +5831,6 @@ if (dest != INVALID_SOCKET) closesocket(dest); - if (src != INVALID_SOCKET) - closesocket(src); memset(&ov, 0, sizeof(ov)); @@ -5436,6 +5857,9 @@ closesocket(src); src = INVALID_SOCKET; + + Sleep(100); + num_bytes = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -5500,11 +5924,11 @@ bret = GetQueuedCompletionStatus(io_port, &num_bytes, &key, &olp, 100); ok(bret == FALSE, "failed to get completion status %u\n", bret); - todo_wine ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %d\n", GetLastError()); - todo_wine ok(key == 125, "Key is %lu\n", key); - todo_wine ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); - todo_wine ok(olp == &ov, "Overlapped structure is at %p\n", olp); - todo_wine ok(olp && (olp->Internal == (ULONG)STATUS_CANCELLED), "Internal status is %lx\n", olp ? olp->Internal : 0); + ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %d\n", GetLastError()); + ok(key == 125, "Key is %lu\n", key); + ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); + ok(olp == &ov, "Overlapped structure is at %p\n", olp); + ok(olp && (olp->Internal == (ULONG)STATUS_CANCELLED), "Internal status is %lx\n", olp ? olp->Internal : 0); SetLastError(0xdeadbeef); key = 0xdeadbeef; @@ -5543,11 +5967,11 @@ bret = GetQueuedCompletionStatus(io_port, &num_bytes, &key, &olp, 100); ok(bret == FALSE, "failed to get completion status %u\n", bret); - todo_wine ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %d\n", GetLastError()); - todo_wine ok(key == 125, "Key is %lu\n", key); - todo_wine ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); - todo_wine ok(olp == &ov, "Overlapped structure is at %p\n", olp); - todo_wine ok(olp && (olp->Internal == (ULONG)STATUS_CANCELLED), "Internal status is %lx\n", olp ? olp->Internal : 0); + ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %d\n", GetLastError()); + ok(key == 125, "Key is %lu\n", key); + ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); + ok(olp == &ov, "Overlapped structure is at %p\n", olp); + ok(olp && (olp->Internal == (ULONG)STATUS_CANCELLED), "Internal status is %lx\n", olp ? olp->Internal : 0); SetLastError(0xdeadbeef); key = 0xdeadbeef; @@ -5602,11 +6026,11 @@ olp = (WSAOVERLAPPED *)0xdeadbeef; bret = GetQueuedCompletionStatus(io_port, &num_bytes, &key, &olp, 100); ok(bret == FALSE, "failed to get completion status %u\n", bret); - todo_wine ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %d\n", GetLastError()); - todo_wine ok(key == 125, "Key is %lu\n", key); - todo_wine ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); - todo_wine ok(olp == &ov, "Overlapped structure is at %p\n", olp); - todo_wine ok(olp && olp->Internal == (ULONG)STATUS_CANCELLED, "Internal status is %lx\n", olp ? olp->Internal : 0); + ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %d\n", GetLastError()); + ok(key == 125, "Key is %lu\n", key); + ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); + ok(olp == &ov, "Overlapped structure is at %p\n", olp); + ok(olp && olp->Internal == (ULONG)STATUS_CANCELLED, "Internal status is %lx\n", olp ? olp->Internal : 0); SetLastError(0xdeadbeef); key = 0xdeadbeef; @@ -5669,11 +6093,11 @@ bret = GetQueuedCompletionStatus(io_port, &num_bytes, &key, &olp, 100); ok(bret == FALSE, "failed to get completion status %u\n", bret); - todo_wine ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %d\n", GetLastError()); - todo_wine ok(key == 125, "Key is %lu\n", key); - todo_wine ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); - todo_wine ok(olp == &ov, "Overlapped structure is at %p\n", olp); - todo_wine ok(olp && (olp->Internal == (ULONG)STATUS_CANCELLED), "Internal status is %lx\n", olp ? olp->Internal : 0); + ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %d\n", GetLastError()); + ok(key == 125, "Key is %lu\n", key); + ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); + ok(olp == &ov, "Overlapped structure is at %p\n", olp); + ok(olp && (olp->Internal == (ULONG)STATUS_CANCELLED), "Internal status is %lx\n", olp ? olp->Internal : 0); SetLastError(0xdeadbeef); key = 0xdeadbeef; @@ -5725,11 +6149,11 @@ bret = GetQueuedCompletionStatus(io_port, &num_bytes, &key, &olp, 100); ok(bret == FALSE, "failed to get completion status %u\n", bret); - todo_wine ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %d\n", GetLastError()); - todo_wine ok(key == 125, "Key is %lu\n", key); - todo_wine ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); - todo_wine ok(olp == &ov, "Overlapped structure is at %p\n", olp); - todo_wine ok(olp && (olp->Internal == (ULONG)STATUS_CANCELLED), "Internal status is %lx\n", olp ? olp->Internal : 0); + ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %d\n", GetLastError()); + ok(key == 125, "Key is %lu\n", key); + ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); + ok(olp == &ov, "Overlapped structure is at %p\n", olp); + ok(olp && (olp->Internal == (ULONG)STATUS_CANCELLED), "Internal status is %lx\n", olp ? olp->Internal : 0); SetLastError(0xdeadbeef); key = 0xdeadbeef; @@ -5860,6 +6284,8 @@ iret = send(connector, buf, 1, 0); ok(iret == 1, "could not send 1 byte: send %d errno %d\n", iret, WSAGetLastError()); + Sleep(100); + closesocket(dest); dest = INVALID_SOCKET; @@ -5935,12 +6361,15 @@ bret = GetQueuedCompletionStatus(io_port, &num_bytes, &key, &olp, 100); ok(bret == FALSE, "failed to get completion status %u\n", bret); - todo_wine ok((GetLastError() == ERROR_NETNAME_DELETED) || (GetLastError() == ERROR_CONNECTION_ABORTED), "Last error was %d\n", GetLastError()); + todo_wine ok(GetLastError() == ERROR_NETNAME_DELETED || + GetLastError() == ERROR_OPERATION_ABORTED || + GetLastError() == ERROR_CONNECTION_ABORTED, "Last error was %d\n", GetLastError()); ok(key == 125, "Key is %lu\n", key); ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); ok(olp == &ov, "Overlapped structure is at %p\n", olp); - todo_wine ok(olp && ((olp->Internal == (ULONG)STATUS_LOCAL_DISCONNECT) - || (olp->Internal == (ULONG)STATUS_CONNECTION_ABORTED)), "Internal status is %lx\n", olp ? olp->Internal : 0); + todo_wine ok(olp && (olp->Internal == (ULONG)STATUS_LOCAL_DISCONNECT || + olp->Internal == (ULONG)STATUS_CANCELLED || + olp->Internal == (ULONG)STATUS_CONNECTION_ABORTED), "Internal status is %lx\n", olp ? olp->Internal : 0); SetLastError(0xdeadbeef); key = 0xdeadbeef; @@ -6001,6 +6430,7 @@ test_WSAStringToAddressW(); test_errors(); + test_listen(); test_select(); test_accept(); test_getpeername(); Modified: trunk/rostests/winetests/ws2_32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ws2_32/testlist… ============================================================================== --- trunk/rostests/winetests/ws2_32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ws2_32/testlist.c [iso-8859-1] Sat Dec 7 20:26:32 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_protocol(void); extern void func_sock(void);

1 0

[aandrejevic] 61242: [NTVDM] Use the EGA palette for EGA modes.
by aandrejevic＠svn.reactos.org 07 Dec '13

07 Dec '13

Author: aandrejevic Date: Sat Dec 7 03:47:58 2013 New Revision: 61242 URL: http://svn.reactos.org/svn/reactos?rev=61242&view=rev Log: [NTVDM] Use the EGA palette for EGA modes. 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] Sat Dec 7 03:47:58 2013 @@ -134,8 +134,8 @@ 0xFF, /* AC Registers */ - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x10, 0x11, 0x12, 0x13, - 0x14, 0x15, 0x16, 0x17, 0x01, 0x00, 0x0F, 0x00, 0x00 + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07, 0x38, 0x39, 0x3A, 0x3B, + 0x3C, 0x3D, 0x3E, 0x3F, 0x01, 0x00, 0x0F, 0x00, 0x00 }; static BYTE VideoMode_640x200_16color[] = @@ -155,8 +155,8 @@ 0xFF, /* AC Registers */ - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x10, 0x11, 0x12, 0x13, - 0x14, 0x15, 0x16, 0x17, 0x01, 0x00, 0x0F, 0x00, 0x00 + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07, 0x38, 0x39, 0x3A, 0x3B, + 0x3C, 0x3D, 0x3E, 0x3F, 0x01, 0x00, 0x0F, 0x00, 0x00 }; static BYTE VideoMode_640x350_16color[] = @@ -267,6 +267,26 @@ VideoMode_320x200_256color, /* Mode 13h */ }; +static CONST COLORREF EgaPalette[VGA_MAX_COLORS / 4] = +{ + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), + RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0xAA, 0x00), RGB(0xAA, 0xAA, 0xAA), + RGB(0x00, 0x00, 0x55), RGB(0x00, 0x00, 0xFF), RGB(0x00, 0xAA, 0x55), RGB(0x00, 0xAA, 0xFF), + RGB(0xAA, 0x00, 0x55), RGB(0xAA, 0x00, 0xFF), RGB(0xAA, 0xAA, 0x55), RGB(0xAA, 0xAA, 0xFF), + RGB(0x00, 0x55, 0x00), RGB(0x00, 0x55, 0xAA), RGB(0x00, 0xFF, 0x00), RGB(0x00, 0xFF, 0xAA), + RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0x55, 0xAA), RGB(0xAA, 0xFF, 0x00), RGB(0xAA, 0xFF, 0xAA), + RGB(0x00, 0x55, 0x55), RGB(0x00, 0x55, 0xFF), RGB(0x00, 0xFF, 0x55), RGB(0x00, 0xFF, 0xFF), + RGB(0xAA, 0x55, 0x55), RGB(0xAA, 0x55, 0xFF), RGB(0xAA, 0xFF, 0x55), RGB(0xAA, 0xFF, 0xFF), + RGB(0x55, 0x00, 0x00), RGB(0x55, 0x00, 0xAA), RGB(0x55, 0xAA, 0x00), RGB(0x55, 0xAA, 0xAA), + RGB(0xFF, 0x00, 0x00), RGB(0xFF, 0x00, 0xAA), RGB(0xFF, 0xAA, 0x00), RGB(0xFF, 0xAA, 0xAA), + RGB(0x55, 0x00, 0x55), RGB(0x55, 0x00, 0xFF), RGB(0x55, 0xAA, 0x55), RGB(0x55, 0xAA, 0xFF), + RGB(0xFF, 0x00, 0x55), RGB(0xFF, 0x00, 0xFF), RGB(0xFF, 0xAA, 0x55), RGB(0xFF, 0xAA, 0xFF), + RGB(0x55, 0x55, 0x00), RGB(0x55, 0x55, 0xAA), RGB(0x55, 0xFF, 0x00), RGB(0x55, 0xFF, 0xAA), + RGB(0xFF, 0x55, 0x00), RGB(0xFF, 0x55, 0xAA), RGB(0xFF, 0xFF, 0x00), RGB(0xFF, 0xFF, 0xAA), + RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), + RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF) +}; + /* PRIVATE FUNCTIONS **********************************************************/ static BOOLEAN BiosKbdBufferPush(WORD Data) @@ -416,8 +436,22 @@ VgaWritePort(VGA_AC_WRITE, *(Values++)); } - /* Reset the palette */ - VgaResetPalette(); + if ((ModeNumber == 0x0D) || (ModeNumber == 0x0E) || (ModeNumber == 0x10)) + { + /* EGA modes */ + for (i = 0; i < VGA_MAX_COLORS / 4; i++) + { + VgaWritePort(VGA_DAC_WRITE_INDEX, i); + VgaWritePort(VGA_DAC_DATA, VGA_COLOR_TO_DAC(GetRValue(EgaPalette[i]))); + VgaWritePort(VGA_DAC_DATA, VGA_COLOR_TO_DAC(GetGValue(EgaPalette[i]))); + VgaWritePort(VGA_DAC_DATA, VGA_COLOR_TO_DAC(GetBValue(EgaPalette[i]))); + } + } + else + { + /* Reset the palette */ + VgaResetPalette(); + } /* Update the values in the BDA */ Bda->VideoMode = ModeNumber;

1 0

[jimtabor] 61241: [RosApps] - Add cat, ps and winefile for testing. Building winefile (cmake hacked please check it) is syned up with wine head (winefile.c/h only).
by jimtabor＠svn.reactos.org 07 Dec '13

07 Dec '13

Author: jimtabor Date: Sat Dec 7 01:37:47 2013 New Revision: 61241 URL: http://svn.reactos.org/svn/reactos?rev=61241&view=rev Log: [RosApps] - Add cat, ps and winefile for testing. Building winefile (cmake hacked please check it) is syned up with wine head (winefile.c/h only). Added: trunk/rosapps/applications/sysutils/utils/CMakeLists.txt (with props) trunk/rosapps/applications/sysutils/utils/cat/CMakeLists.txt (with props) trunk/rosapps/applications/sysutils/utils/ps/CMakeLists.txt (with props) trunk/rosapps/applications/winfile/CMakeLists.txt (with props) Modified: trunk/rosapps/applications/CMakeLists.txt trunk/rosapps/applications/sysutils/CMakeLists.txt trunk/rosapps/applications/winfile/resource.h trunk/rosapps/applications/winfile/winefile.c trunk/rosapps/applications/winfile/winefile.h Modified: trunk/rosapps/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/CMakeLists.tx… ============================================================================== --- trunk/rosapps/applications/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/CMakeLists.txt [iso-8859-1] Sat Dec 7 01:37:47 2013 @@ -6,4 +6,4 @@ add_subdirectory(notevil) add_subdirectory(screensavers) add_subdirectory(sysutils) -#add_subdirectory(winfile) +add_subdirectory(winfile) Modified: trunk/rosapps/applications/sysutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/CMak… ============================================================================== --- trunk/rosapps/applications/sysutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/CMakeLists.txt [iso-8859-1] Sat Dec 7 01:37:47 2013 @@ -14,4 +14,4 @@ #add_subdirectory(systeminfo) #add_subdirectory(tcat) add_subdirectory(tlist) -#add_subdirectory(utils) +add_subdirectory(utils) Added: trunk/rosapps/applications/sysutils/utils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… ============================================================================== --- trunk/rosapps/applications/sysutils/utils/CMakeLists.txt (added) +++ trunk/rosapps/applications/sysutils/utils/CMakeLists.txt [iso-8859-1] Sat Dec 7 01:37:47 2013 @@ -0,0 +1,16 @@ +#add_subdirectory(binpatch) +add_subdirectory(cat) +#add_subdirectory(driver) +#add_subdirectory(infinst) +#add_subdirectory(nts2w32err) +#add_subdirectory(objdir) +#add_subdirectory(partinfo) +#add_subdirectory(pice) +#add_subdirectory(pnpdump) +add_subdirectory(ps) +#add_subdirectory(rosperf) +#add_subdirectory(sdkparse) +#add_subdirectory(stats) +#add_subdirectory(theme) +#add_subdirectory(tickcount) + Propchange: trunk/rosapps/applications/sysutils/utils/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rosapps/applications/sysutils/utils/CMakeLists.txt ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/rosapps/applications/sysutils/utils/cat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… ============================================================================== --- trunk/rosapps/applications/sysutils/utils/cat/CMakeLists.txt (added) +++ trunk/rosapps/applications/sysutils/utils/cat/CMakeLists.txt [iso-8859-1] Sat Dec 7 01:37:47 2013 @@ -0,0 +1,5 @@ + +add_executable(cat cat.c) +set_module_type(cat win32cui) +add_importlibs(cat ntdll user32 msvcrt kernel32) +add_cd_file(TARGET cat DESTINATION reactos/bin FOR all) Propchange: trunk/rosapps/applications/sysutils/utils/cat/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rosapps/applications/sysutils/utils/cat/CMakeLists.txt ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/rosapps/applications/sysutils/utils/ps/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… ============================================================================== --- trunk/rosapps/applications/sysutils/utils/ps/CMakeLists.txt (added) +++ trunk/rosapps/applications/sysutils/utils/ps/CMakeLists.txt [iso-8859-1] Sat Dec 7 01:37:47 2013 @@ -0,0 +1,5 @@ + +add_executable(ps ps.c) +set_module_type(ps win32cui) +add_importlibs(ps ntdll user32 msvcrt kernel32) +add_cd_file(TARGET ps DESTINATION reactos/bin FOR all) Propchange: trunk/rosapps/applications/sysutils/utils/ps/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rosapps/applications/sysutils/utils/ps/CMakeLists.txt ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/rosapps/applications/winfile/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/CMake… ============================================================================== --- trunk/rosapps/applications/winfile/CMakeLists.txt (added) +++ trunk/rosapps/applications/winfile/CMakeLists.txt [iso-8859-1] Sat Dec 7 01:37:47 2013 @@ -0,0 +1,14 @@ + +add_executable(winefile winefile.c rsrc.rc) + +set_module_type(winefile win32gui UNICODE) +add_importlibs(winefile advapi32 gdi32 user32 ws2_32 msimg32 version mpr comctl32 comdlg32 ole32 oleaut32 shell32 shlwapi msvcrt kernel32 ntdll) +target_link_libraries(winefile uuid) + +add_cd_file(TARGET winefile DESTINATION reactos/system32 FOR all) + +if(NOT MSVC) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #add_target_compile_flags(winefile "-Wno-format") + allow_warnings(winefile) +endif() Propchange: trunk/rosapps/applications/winfile/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rosapps/applications/winfile/CMakeLists.txt ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/rosapps/applications/winfile/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/resou… ============================================================================== --- trunk/rosapps/applications/winfile/resource.h [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/resource.h [iso-8859-1] Sat Dec 7 01:37:47 2013 @@ -132,6 +132,9 @@ #define IDS_COL_ATTR 1217 #define IDS_COL_SEC 1218 #define IDS_FREE_SPACE_FMT 1219 +#define IDS_UNIT_KB 1220 +#define IDS_UNIT_MB 1221 +#define IDS_UNIT_GB 1222 /* range for drive bar command ids: 0x9000..0x90FF */ Modified: trunk/rosapps/applications/winfile/winefile.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/winef… ============================================================================== --- trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] Sat Dec 7 01:37:47 2013 @@ -35,10 +35,6 @@ #include "resource.h" #include "wine/unicode.h" -#ifdef _NO_EXTENSIONS -#undef _LEFT_FILES -#endif - #ifndef _MAX_PATH #define _MAX_DRIVE 3 #define _MAX_FNAME 256 @@ -53,12 +49,7 @@ #define UNION_MEMBER(x) x #endif - -#ifdef _SHELL_FOLDERS #define DEFAULT_SPLIT_POS 300 -#else -#define DEFAULT_SPLIT_POS 200 -#endif static const WCHAR registry_key[] = { 'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\', @@ -72,9 +63,7 @@ enum ENTRY_TYPE { ET_WINDOWS, ET_UNIX, -#ifdef _SHELL_FOLDERS ET_SHELL -#endif }; typedef struct _Entry { @@ -88,16 +77,12 @@ WIN32_FIND_DATAW data; -#ifndef _NO_EXTENSIONS BY_HANDLE_FILE_INFORMATION bhfi; BOOL bhfi_valid; enum ENTRY_TYPE etype; -#endif -#ifdef _SHELL_FOLDERS LPITEMIDLIST pidl; IShellFolder* folder; HICON hicon; -#endif } Entry; typedef struct { @@ -115,13 +100,9 @@ COL_TIME = 0x04, COL_ATTRIBUTES = 0x08, COL_DOSNAMES = 0x10, -#ifdef _NO_EXTENSIONS - COL_ALL = COL_SIZE|COL_DATE|COL_TIME|COL_ATTRIBUTES|COL_DOSNAMES -#else COL_INDEX = 0x20, COL_LINKS = 0x40, COL_ALL = COL_SIZE|COL_DATE|COL_TIME|COL_ATTRIBUTES|COL_DOSNAMES|COL_INDEX|COL_LINKS -#endif }; typedef enum { @@ -133,15 +114,9 @@ typedef struct { HWND hwnd; -#ifndef _NO_EXTENSIONS HWND hwndHeader; -#endif - -#ifndef _NO_EXTENSIONS + #define COLUMNS 10 -#else -#define COLUMNS 5 -#endif int widths[COLUMNS]; int positions[COLUMNS+1]; @@ -263,11 +238,14 @@ LOGFONTW lFont; HDC hdc = GetDC(hwnd); + + GetObjectW(Globals.hfont, sizeof(LOGFONTW), &lFont); + chFont.lStructSize = sizeof(CHOOSEFONTW); chFont.hwndOwner = hwnd; chFont.hDC = NULL; chFont.lpLogFont = &lFont; - chFont.Flags = CF_SCREENFONTS | CF_FORCEFONTEXIST | CF_LIMITSIZE | CF_NOSCRIPTSEL; + chFont.Flags = CF_SCREENFONTS | CF_FORCEFONTEXIST | CF_LIMITSIZE | CF_NOSCRIPTSEL | CF_INITTOLOGFONTSTRUCT | CF_NOVERTFONTS; chFont.rgbColors = RGB(0,0,0); chFont.lCustData = 0; chFont.lpfnHook = NULL; @@ -315,11 +293,9 @@ { Entry* entry = HeapAlloc(GetProcessHeap(), 0, sizeof(Entry)); -#ifdef _SHELL_FOLDERS entry->pidl = NULL; entry->folder = NULL; entry->hicon = 0; -#endif return entry; } @@ -327,7 +303,6 @@ /* free a directory entry */ static void free_entry(Entry* entry) { -#ifdef _SHELL_FOLDERS if (entry->hicon && entry->hicon!=(HICON)-1) DestroyIcon(entry->hicon); @@ -336,7 +311,6 @@ if (entry->pidl) IMalloc_Free(Globals.iMalloc, entry->pidl); -#endif HeapFree(GetProcessHeap(), 0, entry); } @@ -369,9 +343,7 @@ int level = dir->level + 1; WIN32_FIND_DATAW w32fd; HANDLE hFind; -#ifndef _NO_EXTENSIONS HANDLE hFile; -#endif WCHAR buffer[MAX_PATH], *p; for(p=buffer; *path; ) @@ -385,15 +357,6 @@ if (hFind != INVALID_HANDLE_VALUE) { do { -#ifdef _NO_EXTENSIONS - /* hide directory entry "." */ - if (w32fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { - LPCWSTR name = w32fd.cFileName; - - if (name[0]=='.' && name[1]=='\0') - continue; - } -#endif entry = alloc_entry(); if (!first_entry) @@ -408,8 +371,6 @@ entry->expanded = FALSE; entry->scanned = FALSE; entry->level = level; - -#ifndef _NO_EXTENSIONS entry->etype = ET_WINDOWS; entry->bhfi_valid = FALSE; @@ -424,7 +385,6 @@ CloseHandle(hFile); } -#endif last = entry; } while(FindNextFileW(hFind, &w32fd)); @@ -475,10 +435,7 @@ HCURSOR old_cursor = SetCursor(LoadCursorW(0, (LPCWSTR)IDC_WAIT)); -#ifndef _NO_EXTENSIONS entry->etype = ET_WINDOWS; -#endif - while(entry) { while(*s && *s != '\\' && *s != '/') *d++ = *s++; @@ -506,11 +463,11 @@ } -#if !defined(_NO_EXTENSIONS) && defined(__WINE__) - -static BOOL time_to_filetime(const time_t* t, FILETIME* ftime) -{ - struct tm* tm = gmtime(t); +#ifdef __WINE__ + +static BOOL time_to_filetime(time_t t, FILETIME* ftime) +{ + struct tm* tm = gmtime(&t); SYSTEMTIME stime; if (!tm) @@ -523,6 +480,7 @@ stime.wHour = tm->tm_hour; stime.wMinute = tm->tm_min; stime.wSecond = tm->tm_sec; + stime.wMilliseconds = 0; return SystemTimeToFileTime(&stime, ftime); } @@ -576,8 +534,8 @@ entry->data.nFileSizeHigh = st.st_size >> 32; memset(&entry->data.ftCreationTime, 0, sizeof(FILETIME)); - time_to_filetime(&st.st_atime, &entry->data.ftLastAccessTime); - time_to_filetime(&st.st_mtime, &entry->data.ftLastWriteTime); + time_to_filetime(st.st_atime, &entry->data.ftLastAccessTime); + time_to_filetime(st.st_mtime, &entry->data.ftLastWriteTime); entry->bhfi.nFileIndexLow = ent->d_ino; entry->bhfi.nFileIndexHigh = 0; @@ -664,10 +622,7 @@ return entry; } -#endif /* !defined(_NO_EXTENSIONS) && defined(__WINE__) */ - - -#ifdef _SHELL_FOLDERS +#endif /* __WINE__ */ static void free_strret(STRRET* str) { @@ -837,10 +792,7 @@ HCURSOR old_cursor = SetCursor(LoadCursorW(0, (LPCWSTR)IDC_WAIT)); -#ifndef _NO_EXTENSIONS entry->etype = ET_SHELL; -#endif - folder = Globals.iDesktop; while(entry) { @@ -1025,10 +977,8 @@ entry->scanned = FALSE; entry->level = level; -#ifndef _NO_EXTENSIONS entry->etype = ET_SHELL; entry->bhfi_valid = FALSE; -#endif last = entry; } @@ -1043,9 +993,6 @@ dir->down = first_entry; dir->scanned = TRUE; } - -#endif /* _SHELL_FOLDERS */ - /* sort order for different directory/file types */ enum TYPE_ORDER { @@ -1175,7 +1122,7 @@ static void SortDirectory(Entry* dir, SORT_ORDER sortOrder) { - Entry* entry = dir->down; + Entry* entry; Entry** array, **p; int len; @@ -1212,7 +1159,6 @@ LPCWSTR s; PWSTR d; -#ifdef _SHELL_FOLDERS if (dir->etype == ET_SHELL) { read_directory_shell(dir, hwnd); @@ -1234,8 +1180,7 @@ } } else -#endif -#if !defined(_NO_EXTENSIONS) && defined(__WINE__) +#ifdef __WINE__ if (dir->etype == ET_UNIX) { read_directory_unix(dir, path); @@ -1286,12 +1231,11 @@ static Entry* read_tree(Root* root, LPCWSTR path, LPITEMIDLIST pidl, LPWSTR drv, SORT_ORDER sortOrder, HWND hwnd) { -#if !defined(_NO_EXTENSIONS) && defined(__WINE__) +#ifdef __WINE__ static const WCHAR sSlash[] = {'/', '\0'}; #endif static const WCHAR sBackslash[] = {'\\', '\0'}; -#ifdef _SHELL_FOLDERS if (pidl) { /* read shell namespace tree */ @@ -1305,8 +1249,7 @@ return read_tree_shell(root, pidl, sortOrder, hwnd); } else -#endif -#if !defined(_NO_EXTENSIONS) && defined(__WINE__) +#ifdef __WINE__ if (*path == '/') { /* read unix file system tree */ @@ -1350,8 +1293,8 @@ { WCHAR drv[_MAX_DRIVE+1], dir[_MAX_DIR], name[_MAX_FNAME], ext[_MAX_EXT]; WCHAR dir_path[MAX_PATH]; - WCHAR b1[BUFFER_LEN]; static const WCHAR sAsterics[] = {'*', '\0'}; + static const WCHAR sTitleFmt[] = {'%','s',' ','-',' ','%','s','\0'}; ChildWnd* child = HeapAlloc(GetProcessHeap(), 0, sizeof(ChildWnd)); Root* root = &child->root; @@ -1363,11 +1306,7 @@ child->left.visible_cols = 0; child->right.treePane = FALSE; -#ifndef _NO_EXTENSIONS child->right.visible_cols = COL_SIZE|COL_DATE|COL_TIME|COL_ATTRIBUTES|COL_INDEX|COL_LINKS; -#else - child->right.visible_cols = COL_SIZE|COL_DATE|COL_TIME|COL_ATTRIBUTES; -#endif child->pos.length = sizeof(WINDOWPLACEMENT); child->pos.flags = 0; @@ -1398,12 +1337,10 @@ lstrcatW(dir_path, dir); entry = read_tree(root, dir_path, pidl, drv, child->sortOrder, hwnd); -#ifdef _SHELL_FOLDERS if (root->entry.etype == ET_SHELL) load_string(root->entry.data.cFileName, sizeof(root->entry.data.cFileName)/sizeof(root->entry.data.cFileName[0]), IDS_DESKTOP); else -#endif - wsprintfW(root->entry.data.cFileName, RS(b1,IDS_TITLEFMT), drv, root->fs); + wsprintfW(root->entry.data.cFileName, sTitleFmt, drv, root->fs); root->entry.data.dwFileAttributes = FILE_ATTRIBUTE_DIRECTORY; @@ -1431,7 +1368,6 @@ int len = 0; int level = 0; -#ifdef _SHELL_FOLDERS if (dir->etype == ET_SHELL) { SFGAOF attribs; @@ -1451,7 +1387,6 @@ } } else -#endif { for(entry=dir; entry; level++) { LPCWSTR name; @@ -1472,12 +1407,10 @@ memcpy(path+1, name, l*sizeof(WCHAR)); len += l+1; -#ifndef _NO_EXTENSIONS if (entry->etype == ET_UNIX) path[0] = '/'; else -#endif - path[0] = '\\'; + path[0] = '\\'; } entry = entry->up; @@ -1490,11 +1423,9 @@ } if (!level) { -#ifndef _NO_EXTENSIONS if (entry->etype == ET_UNIX) path[len++] = '/'; else -#endif path[len++] = '\\'; } @@ -1830,6 +1761,7 @@ static WCHAR sTranslation[] = {'\\','V','a','r','F','i','l','e','I','n','f','o','\\','T','r','a','n','s','l','a','t','i','o','n','\0'}; static WCHAR sStringFileInfo[] = {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o','\\', '%','0','4','x','%','0','4','x','\\','%','s','\0'}; + static WCHAR sFmt[] = {'%','d','.','%','d','.','%','d','.','%','d','\0'}; DWORD dwVersionDataLen = GetFileVersionInfoSizeW(strFilename, NULL); if (dwVersionDataLen) { @@ -1842,13 +1774,13 @@ if (VerQueryValueW(dlg->pVersionData, sBackSlash, &pVal, &nValLen)) { if (nValLen == sizeof(VS_FIXEDFILEINFO)) { VS_FIXEDFILEINFO* pFixedFileInfo = (VS_FIXEDFILEINFO*)pVal; - char buffer[BUFFER_LEN]; - - sprintf(buffer, "%d.%d.%d.%d", - HIWORD(pFixedFileInfo->dwFileVersionMS), LOWORD(pFixedFileInfo->dwFileVersionMS), - HIWORD(pFixedFileInfo->dwFileVersionLS), LOWORD(pFixedFileInfo->dwFileVersionLS)); - - SetDlgItemTextA(hwnd, IDC_STATIC_PROP_VERSION, buffer); + WCHAR buffer[BUFFER_LEN]; + + sprintfW(buffer, sFmt, + HIWORD(pFixedFileInfo->dwFileVersionMS), LOWORD(pFixedFileInfo->dwFileVersionMS), + HIWORD(pFixedFileInfo->dwFileVersionLS), LOWORD(pFixedFileInfo->dwFileVersionLS)); + + SetDlgItemTextW(hwnd, IDC_STATIC_PROP_VERSION, buffer); } } @@ -1961,9 +1893,6 @@ DialogBoxParamW(Globals.hInstance, MAKEINTRESOURCEW(IDD_DIALOG_PROPERTIES), hwnd, PropertiesDialogDlgProc, (LPARAM)&dlg); } - - -#ifndef _NO_EXTENSIONS static struct FullScreenParameters { BOOL mode; @@ -2055,9 +1984,6 @@ MoveWindow(hwnd, rt.left, rt.top, rt.right-rt.left, rt.bottom-rt.top, TRUE); } -#endif - - static void toggle_child(HWND hwnd, UINT cmd, HWND hchild) { BOOL vis = IsWindowVisible(hchild); @@ -2066,10 +1992,8 @@ ShowWindow(hchild, vis?SW_HIDE:SW_SHOW); -#ifndef _NO_EXTENSIONS if (g_fullscreen.mode) fullscreen_move(hwnd); -#endif resize_frame_client(hwnd); } @@ -2081,7 +2005,7 @@ _wsplitpath(path, drv1, 0, 0, 0); - /* search for a already open window for the same drive */ + /* search for an already open window for the same drive */ for(child_wnd=GetNextWindow(Globals.hmdiclient,GW_CHILD); child_wnd; child_wnd=GetNextWindow(child_wnd, GW_HWNDNEXT)) { ChildWnd* child = (ChildWnd*)GetWindowLongPtrW(child_wnd, GWLP_USERDATA); @@ -2106,7 +2030,7 @@ { HWND child_wnd; - /* search for a already open window of the given file system name */ + /* search for an already open window of the given file system name */ for(child_wnd=GetNextWindow(Globals.hmdiclient,GW_CHILD); child_wnd; child_wnd=GetNextWindow(child_wnd, GW_HWNDNEXT)) { ChildWnd* child = (ChildWnd*) GetWindowLongPtrW(child_wnd, GWLP_USERDATA); @@ -2274,18 +2198,10 @@ } break;} - case ID_FORMAT_DISK: { - UINT sem_org = SetErrorMode(0); /* Get the current Error Mode settings. */ - SetErrorMode(sem_org & ~SEM_FAILCRITICALERRORS); /* Force O/S to handle */ - SHFormatDrive(hwnd, 0 /* A: */, SHFMT_ID_DEFAULT, 0); - SetErrorMode(sem_org); /* Put it back the way it was. */ - break;} - case ID_HELP: WinHelpW(hwnd, RS(b1,IDS_WINEFILE), HELP_INDEX, 0); break; -#ifndef _NO_EXTENSIONS case ID_VIEW_FULLSCREEN: CheckMenuItem(Globals.hMenuOptions, cmd, toggle_fullscreen(hwnd)?MF_CHECKED:0); break; @@ -2307,7 +2223,6 @@ HeapFree(GetProcessHeap(), 0, child); break;} #endif -#ifdef _SHELL_FOLDERS case ID_DRIVE_SHELL_NS: { WCHAR path[MAX_PATH]; ChildWnd* child; @@ -2321,8 +2236,6 @@ if (!create_child_window(child)) HeapFree(GetProcessHeap(), 0, child); break;} -#endif -#endif /*TODO: There are even more menu items! */ @@ -2351,7 +2264,6 @@ SendMessageW(hwnd, WM_COMMAND, MAKELONG(ID_REFRESH,0), 0); break; -#ifndef _NO_EXTENSIONS case WM_GETMINMAXINFO: { LPMINMAXINFO lpmmi = (LPMINMAXINFO)lparam; @@ -2362,7 +2274,6 @@ case FRM_CALC_CLIENT: frame_get_clientspace(hwnd, (PRECT)lparam); return TRUE; -#endif /* _NO_EXTENSIONS */ default: return DefFrameProcW(hwnd, Globals.hmdiclient, nmsg, wparam, lparam); @@ -2372,7 +2283,7 @@ } -static WCHAR g_pos_names[COLUMNS][20] = { +static WCHAR g_pos_names[COLUMNS][40] = { {'\0'} /* symbol */ }; @@ -2381,22 +2292,20 @@ HDF_LEFT, /* Name */ HDF_RIGHT, /* Size */ HDF_LEFT, /* CDate */ -#ifndef _NO_EXTENSIONS HDF_LEFT, /* ADate */ HDF_LEFT, /* MDate */ HDF_LEFT, /* Index */ HDF_CENTER, /* Links */ -#endif HDF_CENTER, /* Attributes */ -#ifndef _NO_EXTENSIONS HDF_LEFT /* Security */ -#endif }; static void resize_tree(ChildWnd* child, int cx, int cy) { HDWP hdwp = BeginDeferWindowPos(4); RECT rt; + WINDOWPOS wp; + HD_LAYOUT hdl; rt.left = 0; rt.top = 0; @@ -2404,32 +2313,20 @@ rt.bottom = cy; cx = child->split_pos + SPLIT_WIDTH/2; - -#ifndef _NO_EXTENSIONS - { - WINDOWPOS wp; - HD_LAYOUT hdl; - - hdl.prc = &rt; - hdl.pwpos = &wp; - - SendMessageW(child->left.hwndHeader, HDM_LAYOUT, 0, (LPARAM)&hdl); - - DeferWindowPos(hdwp, child->left.hwndHeader, wp.hwndInsertAfter, - wp.x-1, wp.y, child->split_pos-SPLIT_WIDTH/2+1, wp.cy, wp.flags); - DeferWindowPos(hdwp, child->right.hwndHeader, wp.hwndInsertAfter, - rt.left+cx+1, wp.y, wp.cx-cx+2, wp.cy, wp.flags); - } -#endif /* _NO_EXTENSIONS */ - + hdl.prc = &rt; + hdl.pwpos = &wp; + + SendMessageW(child->left.hwndHeader, HDM_LAYOUT, 0, (LPARAM)&hdl); + + DeferWindowPos(hdwp, child->left.hwndHeader, wp.hwndInsertAfter, + wp.x-1, wp.y, child->split_pos-SPLIT_WIDTH/2+1, wp.cy, wp.flags); + DeferWindowPos(hdwp, child->right.hwndHeader, wp.hwndInsertAfter, + rt.left+cx+1, wp.y, wp.cx-cx+2, wp.cy, wp.flags); DeferWindowPos(hdwp, child->left.hwnd, 0, rt.left, rt.top, child->split_pos-SPLIT_WIDTH/2-rt.left, rt.bottom-rt.top, SWP_NOZORDER|SWP_NOACTIVATE); DeferWindowPos(hdwp, child->right.hwnd, 0, rt.left+cx+1, rt.top, rt.right-cx, rt.bottom-rt.top, SWP_NOZORDER|SWP_NOACTIVATE); EndDeferWindowPos(hdwp); } - - -#ifndef _NO_EXTENSIONS static HWND create_header(HWND parent, Pane* pane, UINT id) { @@ -2454,9 +2351,6 @@ return hwnd; } - -#endif /* _NO_EXTENSIONS */ - static void init_output(HWND hwnd) { @@ -2565,9 +2459,7 @@ return TRUE; } - /* calculate one preferred column width */ - static void calc_single_width(Pane* pane, int col) { HFONT hfontOld; @@ -2625,7 +2517,6 @@ SendMessageW(pane->hwnd, LB_SETHORIZONTALEXTENT, x, 0); } - static BOOL pattern_match(LPCWSTR str, LPCWSTR pattern) { for( ; *str&&*pattern; str++,pattern++) { @@ -2687,19 +2578,15 @@ ShowWindow(pane->hwnd, SW_HIDE); for(; entry; entry=entry->next) { -#ifndef _LEFT_FILES if (pane->treePane && !(entry->data.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY)) continue; -#endif if (entry->data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { /* don't display entries "." and ".." in the left pane */ if (pane->treePane && entry->data.cFileName[0] == '.') - if ( -#ifndef _NO_EXTENSIONS - entry->data.cFileName[1] == '\0' || -#endif - (entry->data.cFileName[1] == '.' && entry->data.cFileName[2] == '\0')) + if (entry->data.cFileName[1] == '\0' || + (entry->data.cFileName[1] == '.' && + entry->data.cFileName[2] == '\0')) continue; /* filter directories in right pane */ @@ -2751,21 +2638,34 @@ static void format_bytes(LPWSTR buffer, LONGLONG bytes) { - static const WCHAR sFmtGB[] = {'%', '.', '1', 'f', ' ', 'G', 'B', '\0'}; - static const WCHAR sFmtMB[] = {'%', '.', '1', 'f', ' ', 'M', 'B', '\0'}; - static const WCHAR sFmtkB[] = {'%', '.', '1', 'f', ' ', 'k', 'B', '\0'}; - static const WCHAR sFmtB[] = {'%', 'u', 0}; - - float fBytes = (float)bytes; - - if (bytes >= 1073741824) /* 1 GB */ - sprintfW(buffer, sFmtGB, fBytes/1073741824.f+.5f); - else if (bytes >= 1048576) /* 1 MB */ - sprintfW(buffer, sFmtMB, fBytes/1048576.f+.5f); - else if (bytes >= 1024) /* 1 kB */ - sprintfW(buffer, sFmtkB, fBytes/1024.f+.5f); + static const WCHAR sFmtSmall[] = {'%', 'u', 0}; + static const WCHAR sFmtBig[] = {'%', '.', '1', 'f', ' ', '%', 's', '\0'}; + + if (bytes < 1024) + sprintfW(buffer, sFmtSmall, (DWORD)bytes); else - sprintfW(buffer, sFmtB, (DWORD)bytes); + { + WCHAR unit[64]; + UINT resid; + float fBytes; + if (bytes >= 1073741824) /* 1 GB */ + { + fBytes = ((float)bytes)/1073741824.f+.5f; + resid = IDS_UNIT_GB; + } + else if (bytes >= 1048576) /* 1 MB */ + { + fBytes = ((float)bytes)/1048576.f+.5f; + resid = IDS_UNIT_MB; + } + else /* bytes >= 1024 */ /* 1 kB */ + { + fBytes = ((float)bytes)/1024.f+.5f; + resid = IDS_UNIT_KB; + } + LoadStringW(Globals.hInstance, resid, unit, sizeof(unit)/sizeof(*unit)); + sprintfW(buffer, sFmtBig, fBytes, unit); + } } static void set_space_status(void) @@ -2774,9 +2674,14 @@ WCHAR fmt[64], b1[64], b2[64], buffer[BUFFER_LEN]; if (GetDiskFreeSpaceExW(NULL, &ulFreeBytesToCaller, &ulTotalBytes, &ulFreeBytes)) { + DWORD_PTR args[2]; format_bytes(b1, ulFreeBytesToCaller.QuadPart); format_bytes(b2, ulTotalBytes.QuadPart); - wsprintfW(buffer, RS(fmt,IDS_FREE_SPACE_FMT), b1, b2); + args[0] = (DWORD_PTR)b1; + args[1] = (DWORD_PTR)b2; + FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, + RS(fmt,IDS_FREE_SPACE_FMT), 0, 0, buffer, + sizeof(buffer)/sizeof(*buffer), (__ms_va_list*)args); } else lstrcpyW(buffer, sQMarks); @@ -2790,7 +2695,7 @@ { static const WCHAR sListBox[] = {'L','i','s','t','B','o','x','\0'}; - static int s_init = 0; + static BOOL s_init = FALSE; Entry* entry = pane->root; pane->hwnd = CreateWindowW(sListBox, sEmpty, WS_CHILD|WS_VISIBLE|WS_HSCROLL|WS_VSCROLL| @@ -2808,15 +2713,13 @@ /* calculate column widths */ if (!s_init) { - s_init = 1; + s_init = TRUE; init_output(pane->hwnd); } calc_widths(pane, TRUE); -#ifndef _NO_EXTENSIONS pane->hwndHeader = create_header(parent, pane, id_header); -#endif } @@ -2876,9 +2779,6 @@ { RECT rt = {0, 0, 0, 0}; -/* DRAWTEXTPARAMS dtp = {sizeof(DRAWTEXTPARAMS), 2}; - DrawTextExW(dis->hDC, (LPWSTR)str, -1, &rt, DT_CALCRECT|DT_SINGLELINE|DT_NOPREFIX|DT_EXPANDTABS|DT_TABSTOP, &dtp);*/ - DrawTextW(dis->hDC, str, -1, &rt, DT_CALCRECT|DT_SINGLELINE|DT_EXPANDTABS|DT_TABSTOP|(2<<8)); /*FIXME rt (0,0) ??? */ @@ -2909,9 +2809,6 @@ rt.top = dis->rcItem.top; rt.right = x+pane->positions[col+1]-Globals.spaceSize.cx; rt.bottom = dis->rcItem.bottom; - -/* DRAWTEXTPARAMS dtp = {sizeof(DRAWTEXTPARAMS), 2}; - DrawTextExW(dis->hDC, (LPWSTR)str, -1, &rt, DT_SINGLELINE|DT_NOPREFIX|DT_EXPANDTABS|DT_TABSTOP, &dtp);*/ DrawTextW(dis->hDC, str, -1, &rt, DT_SINGLELINE|DT_EXPANDTABS|DT_TABSTOP|(2<<8)); } @@ -2955,11 +2852,9 @@ {'E','X','E','\0'}, {'B','A','T','\0'}, {'C','M','D','\0'}, -#ifndef _NO_EXTENSIONS {'C','M','M','\0'}, {'B','T','M','\0'}, {'A','W','K','\0'}, -#endif /* _NO_EXTENSIONS */ {'\0'} }; @@ -3021,15 +2916,9 @@ if (entry->data.cFileName[0] == '.' && entry->data.cFileName[1] == '.' && entry->data.cFileName[2] == '\0') img = IMG_FOLDER_UP; -#ifndef _NO_EXTENSIONS else if (entry->data.cFileName[0] == '.' && entry->data.cFileName[1] == '\0') img = IMG_FOLDER_CUR; -#endif - else if ( -#ifdef _NO_EXTENSIONS - entry->expanded || -#endif - (pane->treePane && (dis->itemState&ODS_FOCUS))) + else if (pane->treePane && (dis->itemState&ODS_FOCUS)) img = IMG_OPEN_FOLDER; else img = IMG_FOLDER; @@ -3069,7 +2958,6 @@ hrgn_org = 0; } - /* HGDIOBJ holdPen = SelectObject(dis->hDC, GetStockObject(BLACK_PEN)); */ ExtSelectClipRgn(dis->hDC, hrgn, RGN_AND); DeleteObject(hrgn); @@ -3083,9 +2971,7 @@ x -= IMAGE_WIDTH+TREE_LINE_DX; if (up->next -#ifndef _LEFT_FILES && (up->next->data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) -#endif ) { MoveToEx(dis->hDC, x, dis->rcItem.top, 0); LineTo(dis->hDC, x, dis->rcItem.bottom); @@ -3099,15 +2985,11 @@ LineTo(dis->hDC, x, y); if (entry->next -#ifndef _LEFT_FILES - && (entry->next->data.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY) -#endif - ) + && (entry->next->data.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY)) LineTo(dis->hDC, x, dis->rcItem.bottom); SelectClipRgn(dis->hDC, hrgn_org); if (hrgn_org) DeleteObject(hrgn_org); - /* SelectObject(dis->hDC, holdPen); */ } else if (calcWidthCol==col || calcWidthCol==COLUMNS) { int right = img_pos + IMAGE_WIDTH - TREE_LINE_DX; @@ -3127,20 +3009,9 @@ if (calcWidthCol == -1) { focusRect.left = img_pos -2; -#ifdef _NO_EXTENSIONS - if (pane->treePane && entry) { - RECT rt = {0}; - - DrawTextW(dis->hDC, entry->data.cFileName, -1, &rt, DT_CALCRECT|DT_SINGLELINE|DT_NOPREFIX); - - focusRect.right = dis->rcItem.left+pane->positions[col+1]+TREE_LINE_DX + rt.right +2; - } -#else - if (attrs & FILE_ATTRIBUTE_COMPRESSED) textcolor = COLOR_COMPRESSED; else -#endif /* _NO_EXTENSIONS */ textcolor = RGB(0,0,0); if (dis->itemState & ODS_FOCUS) { @@ -3163,11 +3034,9 @@ if (cx > IMAGE_WIDTH) cx = IMAGE_WIDTH; -#ifdef _SHELL_FOLDERS if (entry->hicon && entry->hicon!=(HICON)-1) DrawIconEx(dis->hDC, img_pos, dis->rcItem.top, entry->hicon, cx, GetSystemMetrics(SM_CYSMICON), 0, 0, DI_NORMAL); else -#endif ImageList_DrawEx(Globals.himl, img, dis->hDC, img_pos, dis->rcItem.top, cx, IMAGE_HEIGHT, bkcolor, CLR_DEFAULT, ILD_NORMAL); @@ -3177,14 +3046,9 @@ if (!entry) return; -#ifdef _NO_EXTENSIONS - if (img >= IMG_FOLDER_UP) - return; -#endif - col++; - /* ouput file name */ + /* output file name */ if (calcWidthCol == -1) output_text(pane, dis, col, entry->data.cFileName, 0); else if (calcWidthCol==col || calcWidthCol==COLUMNS) @@ -3192,30 +3056,20 @@ col++; -#ifdef _NO_EXTENSIONS - if (!pane->treePane) { -#endif - /* display file size */ if (visible_cols & COL_SIZE) { -#ifdef _NO_EXTENSIONS - if (!(attrs&FILE_ATTRIBUTE_DIRECTORY)) -#endif - { - format_longlong( buffer, ((ULONGLONG)entry->data.nFileSizeHigh << 32) | entry->data.nFileSizeLow ); - - if (calcWidthCol == -1) - output_number(pane, dis, col, buffer); - else if (calcWidthCol==col || calcWidthCol==COLUMNS) - calc_width(pane, dis, col, buffer);/*TODO: not ever time enough */ - } + format_longlong( buffer, ((ULONGLONG)entry->data.nFileSizeHigh << 32) | entry->data.nFileSizeLow ); + + if (calcWidthCol == -1) + output_number(pane, dis, col, buffer); + else if (calcWidthCol==col || calcWidthCol==COLUMNS) + calc_width(pane, dis, col, buffer);/*TODO: not ever time enough */ col++; } /* display file date */ if (visible_cols & (COL_DATE|COL_TIME)) { -#ifndef _NO_EXTENSIONS format_date(&entry->data.ftCreationTime, buffer, visible_cols); if (calcWidthCol == -1) output_text(pane, dis, col, buffer, 0); @@ -3229,7 +3083,6 @@ else if (calcWidthCol==col || calcWidthCol==COLUMNS) calc_width(pane, dis, col, buffer); col++; -#endif /* _NO_EXTENSIONS */ format_date(&entry->data.ftLastWriteTime, buffer, visible_cols); if (calcWidthCol == -1) @@ -3239,7 +3092,6 @@ col++; } -#ifndef _NO_EXTENSIONS if (entry->bhfi_valid) { if (visible_cols & COL_INDEX) { static const WCHAR fmtlow[] = {'%','X',0}; @@ -3271,17 +3123,11 @@ } } else col += 2; -#endif /* _NO_EXTENSIONS */ /* show file attributes */ if (visible_cols & COL_ATTRIBUTES) { -#ifdef _NO_EXTENSIONS - static const WCHAR s4Tabs[] = {' ','\t',' ','\t',' ','\t',' ','\t',' ','\0'}; - lstrcpyW(buffer, s4Tabs); -#else static const WCHAR s11Tabs[] = {' ','\t',' ','\t',' ','\t',' ','\t',' ','\t',' ','\t',' ','\t',' ','\t',' ','\t',' ','\t',' ','\t',' ','\0'}; lstrcpyW(buffer, s11Tabs); -#endif if (attrs & FILE_ATTRIBUTE_NORMAL) buffer[ 0] = 'N'; else { @@ -3290,7 +3136,6 @@ if (attrs & FILE_ATTRIBUTE_SYSTEM) buffer[ 6] = 'S'; if (attrs & FILE_ATTRIBUTE_ARCHIVE) buffer[ 8] = 'A'; if (attrs & FILE_ATTRIBUTE_COMPRESSED) buffer[10] = 'C'; -#ifndef _NO_EXTENSIONS if (attrs & FILE_ATTRIBUTE_DIRECTORY) buffer[12] = 'D'; if (attrs & FILE_ATTRIBUTE_ENCRYPTED) buffer[14] = 'E'; if (attrs & FILE_ATTRIBUTE_TEMPORARY) buffer[16] = 'T'; @@ -3298,7 +3143,6 @@ if (attrs & FILE_ATTRIBUTE_REPARSE_POINT) buffer[20] = 'Q'; if (attrs & FILE_ATTRIBUTE_OFFLINE) buffer[22] = 'O'; if (attrs & FILE_ATTRIBUTE_NOT_CONTENT_INDEXED) buffer[24] = 'X'; -#endif /* _NO_EXTENSIONS */ } if (calcWidthCol == -1) @@ -3308,94 +3152,7 @@ col++; } - -/*TODO - if (flags.security) { - static const WCHAR sSecTabs[] = { - ' ','\t',' ','\t',' ','\t',' ', - ' ','\t',' ', - ' ','\t',' ','\t',' ','\t',' ', - ' ','\t',' ', - ' ','\t',' ','\t',' ','\t',' ', - '\0' - }; - - DWORD rights = get_access_mask(); - - lstrcpyW(buffer, sSecTabs); - - if (rights & FILE_READ_DATA) buffer[ 0] = 'R'; - if (rights & FILE_WRITE_DATA) buffer[ 2] = 'W'; - if (rights & FILE_APPEND_DATA) buffer[ 4] = 'A'; - if (rights & FILE_READ_EA) {buffer[6] = 'entry'; buffer[ 7] = 'R';} - if (rights & FILE_WRITE_EA) {buffer[9] = 'entry'; buffer[10] = 'W';} - if (rights & FILE_EXECUTE) buffer[12] = 'X'; - if (rights & FILE_DELETE_CHILD) buffer[14] = 'D'; - if (rights & FILE_READ_ATTRIBUTES) {buffer[16] = 'a'; buffer[17] = 'R';} - if (rights & FILE_WRITE_ATTRIBUTES) {buffer[19] = 'a'; buffer[20] = 'W';} - if (rights & WRITE_DAC) buffer[22] = 'C'; - if (rights & WRITE_OWNER) buffer[24] = 'O'; - if (rights & SYNCHRONIZE) buffer[26] = 'S'; - - output_text(dis, col++, buffer, DT_LEFT, 3, psize); - } - - if (flags.description) { - get_description(buffer); - output_text(dis, col++, buffer, 0, psize); - } -*/ - -#ifdef _NO_EXTENSIONS - } - - /* draw focus frame */ - if ((dis->itemState&ODS_FOCUS) && calcWidthCol==-1) { - /* Currently [04/2000] Wine neither behaves exactly the same */ - /* way as WIN 95 nor like Windows NT... */ - HGDIOBJ lastBrush; - HPEN lastPen; - HPEN hpen; - - if (!(GetVersion() & 0x80000000)) { /* Windows NT? */ - LOGBRUSH lb = {PS_SOLID, RGB(255,255,255)}; - hpen = ExtCreatePen(PS_COSMETIC|PS_ALTERNATE, 1, &lb, 0, 0); - } else - hpen = CreatePen(PS_DOT, 0, RGB(255,255,255)); - - lastPen = SelectPen(dis->hDC, hpen); - lastBrush = SelectObject(dis->hDC, GetStockObject(HOLLOW_BRUSH)); - SetROP2(dis->hDC, R2_XORPEN); - Rectangle(dis->hDC, focusRect.left, focusRect.top, focusRect.right, focusRect.bottom); - SelectObject(dis->hDC, lastBrush); - SelectObject(dis->hDC, lastPen); - DeleteObject(hpen); - } -#endif /* _NO_EXTENSIONS */ -} - - -#ifdef _NO_EXTENSIONS - -static void draw_splitbar(HWND hwnd, int x) -{ - RECT rt; - HDC hdc = GetDC(hwnd); - - GetClientRect(hwnd, &rt); - - rt.left = x - SPLIT_WIDTH/2; - rt.right = x + SPLIT_WIDTH/2+1; - - InvertRect(hdc, &rt); - - ReleaseDC(hwnd, hdc); -} - -#endif /* _NO_EXTENSIONS */ - - -#ifndef _NO_EXTENSIONS +} static void set_header(Pane* pane) { @@ -3406,7 +3163,7 @@ item.mask = HDI_WIDTH; item.cxy = 0; - for(; x+pane->widths[i]<scroll_pos && i<COLUMNS; i++) { + for(; (i < COLUMNS) && (x+pane->widths[i] < scroll_pos); i++) { x += pane->widths[i]; SendMessageW(pane->hwndHeader, HDM_SETITEMW, i, (LPARAM)&item); } @@ -3416,7 +3173,7 @@ item.cxy = x - scroll_pos; SendMessageW(pane->hwndHeader, HDM_SETITEMW, i++, (LPARAM)&item); - for(; i<COLUMNS; i++) { + for(; i < COLUMNS; i++) { item.cxy = pane->widths[i]; x += pane->widths[i]; SendMessageW(pane->hwndHeader, HDM_SETITEMW, i, (LPARAM)&item); @@ -3491,9 +3248,6 @@ return 0; } -#endif /* _NO_EXTENSIONS */ - - static void scan_entry(ChildWnd* child, Entry* entry, int idx, HWND hwnd) { WCHAR path[MAX_PATH]; @@ -3517,13 +3271,11 @@ free_entries(entry); /* read contents from disk */ -#ifdef _SHELL_FOLDERS if (entry->etype == ET_SHELL) { read_directory(entry, NULL, child->sortOrder, hwnd); } else -#endif { get_path(entry, path); read_directory(entry, path, child->sortOrder, hwnd); @@ -3532,9 +3284,7 @@ /* insert found entries in right pane */ insert_entries(&child->right, entry->down, child->filter_pattern, child->filter_flags, -1); calc_widths(&child->right, FALSE); -#ifndef _NO_EXTENSIONS set_header(&child->right); -#endif child->header_wdths_ok = FALSE; @@ -3575,9 +3325,7 @@ if (!child->header_wdths_ok) { if (calc_widths(&child->left, FALSE)) { -#ifndef _NO_EXTENSIONS set_header(&child->left); -#endif child->header_wdths_ok = TRUE; } @@ -3589,7 +3337,10 @@ static void collapse_entry(Pane* pane, Entry* dir) { - int idx = SendMessageW(pane->hwnd, LB_FINDSTRING, 0, (LPARAM)dir); + int idx; + + if (!dir) return; + idx = SendMessageW(pane->hwnd, LB_FINDSTRING, 0, (LPARAM)dir); ShowWindow(pane->hwnd, SW_HIDE); @@ -3616,9 +3367,7 @@ insert_entries(&child->right, child->right.root, child->filter_pattern, child->filter_flags, -1); calc_widths(&child->right, FALSE); -#ifndef _NO_EXTENSIONS set_header(&child->right); -#endif } static void set_curdir(ChildWnd* child, Entry* entry, int idx, HWND hwnd) @@ -3664,8 +3413,6 @@ child->right.root = NULL; scan_entry(child, &child->root.entry, 0, child->hwnd); - -#ifdef _SHELL_FOLDERS if (child->root.entry.etype == ET_SHELL) { @@ -3676,7 +3423,6 @@ entry = NULL; } else -#endif entry = read_tree(&child->root, path, NULL, drv, child->sortOrder, child->hwnd); if (!entry) @@ -3694,9 +3440,7 @@ static void create_drive_bar(void) { TBBUTTON drivebarBtn = {0, 0, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0}; -#ifndef _NO_EXTENSIONS WCHAR b1[BUFFER_LEN]; -#endif int btn = 1; PWSTR p; @@ -3706,7 +3450,6 @@ IDW_DRIVEBAR, 2, Globals.hInstance, IDB_DRIVEBAR, &drivebarBtn, 0, 16, 13, 16, 13, sizeof(TBBUTTON)); -#ifndef _NO_EXTENSIONS #ifdef __WINE__ /* insert unix file system button */ b1[0] = '/'; @@ -3718,7 +3461,6 @@ SendMessageW(Globals.hdrivebar, TB_INSERTBUTTONW, btn++, (LPARAM)&drivebarBtn); drivebarBtn.iString++; #endif -#ifdef _SHELL_FOLDERS /* insert shell namespace button */ load_string(b1, sizeof(b1)/sizeof(b1[0]), IDS_SHELL); b1[lstrlenW(b1)+1] = '\0'; @@ -3727,20 +3469,13 @@ drivebarBtn.idCommand = ID_DRIVE_SHELL_NS; SendMessageW(Globals.hdrivebar, TB_INSERTBUTTONW, btn++, (LPARAM)&drivebarBtn); drivebarBtn.iString++; -#endif /* register windows drive root strings */ SendMessageW(Globals.hdrivebar, TB_ADDSTRINGW, 0, (LPARAM)Globals.drives); -#endif drivebarBtn.idCommand = ID_DRIVE_FIRST; for(p=Globals.drives; *p; ) { -#ifdef _NO_EXTENSIONS - /* insert drive letter */ - WCHAR b[3] = {tolower(*p)}; - SendMessageW(Globals.hdrivebar, TB_ADDSTRINGW, 0, (LPARAM)b); -#endif switch(GetDriveTypeW(p)) { case DRIVE_REMOVABLE: drivebarBtn.iBitmap = 1; break; case DRIVE_CDROM: drivebarBtn.iBitmap = 3; break; @@ -3791,7 +3526,6 @@ { WCHAR cmd[MAX_PATH]; -#ifdef _SHELL_FOLDERS if (entry->etype == ET_SHELL) { BOOL ret = TRUE; @@ -3817,7 +3551,6 @@ return ret; } -#endif get_path(entry, cmd); @@ -3842,10 +3575,8 @@ scan_entry(child, entry, idx, hwnd); } -#ifndef _NO_EXTENSIONS if (entry->data.cFileName[0]=='.' && entry->data.cFileName[1]=='\0') return; -#endif if (entry->data.cFileName[0]=='.' && entry->data.cFileName[1]=='.' && entry->data.cFileName[2]=='\0') { entry = child->left.cur->up; @@ -3867,9 +3598,7 @@ if (!scanned_old) { calc_widths(pane, FALSE); -#ifndef _NO_EXTENSIONS set_header(pane); -#endif } } else { if (GetKeyState(VK_MENU) < 0) @@ -3887,13 +3616,10 @@ if (pane->visible_cols) { pane->visible_cols = 0; calc_widths(pane, TRUE); -#ifndef _NO_EXTENSIONS set_header(pane); -#endif InvalidateRect(pane->hwnd, 0, TRUE); CheckMenuItem(Globals.hMenuView, ID_VIEW_NAME, MF_BYCOMMAND|MF_CHECKED); CheckMenuItem(Globals.hMenuView, ID_VIEW_ALL_ATTRIBUTES, MF_BYCOMMAND); - CheckMenuItem(Globals.hMenuView, ID_VIEW_SELECTED_ATTRIBUTES, MF_BYCOMMAND); } break; @@ -3901,23 +3627,18 @@ if (pane->visible_cols != COL_ALL) { pane->visible_cols = COL_ALL; calc_widths(pane, TRUE); -#ifndef _NO_EXTENSIONS set_header(pane); -#endif InvalidateRect(pane->hwnd, 0, TRUE); CheckMenuItem(Globals.hMenuView, ID_VIEW_NAME, MF_BYCOMMAND); CheckMenuItem(Globals.hMenuView, ID_VIEW_ALL_ATTRIBUTES, MF_BYCOMMAND|MF_CHECKED); - CheckMenuItem(Globals.hMenuView, ID_VIEW_SELECTED_ATTRIBUTES, MF_BYCOMMAND); } break; -#ifndef _NO_EXTENSIONS case ID_PREFERRED_SIZES: { calc_widths(pane, TRUE); set_header(pane); InvalidateRect(pane->hwnd, 0, TRUE); break;} -#endif /* TODO: more command ids... */ @@ -3954,7 +3675,7 @@ if (target_attr == INVALID_FILE_ATTRIBUTES) return FALSE; - return target_attr&FILE_ATTRIBUTE_DIRECTORY? TRUE: FALSE; + return (target_attr & FILE_ATTRIBUTE_DIRECTORY) != 0; } static BOOL prompt_target(Pane* pane, LPWSTR source, LPWSTR target) @@ -4036,14 +3757,12 @@ return FALSE; } - static HRESULT ShellFolderContextMenu(IShellFolder* shell_folder, HWND hwndParent, int cidl, LPCITEMIDLIST* apidl, int x, int y) { IContextMenu* pcm; BOOL executed = FALSE; HRESULT hr = IShellFolder_GetUIObjectOf(shell_folder, hwndParent, cidl, apidl, &IID_IContextMenu, NULL, (LPVOID*)&pcm); -/* HRESULT hr = CDefFolderMenu_Create2(dir?dir->_pidl:DesktopFolder(), hwndParent, 1, &pidl, shell_folder, NULL, 0, NULL, &pcm); */ if (SUCCEEDED(hr)) { HMENU hmenu = CreatePopupMenu(); @@ -4083,7 +3802,6 @@ return FAILED(hr)? hr: executed? S_OK: S_FALSE; } - static LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam) { @@ -4124,10 +3842,6 @@ lastBrush = SelectObject(ps.hdc, GetStockObject(COLOR_SPLITBAR)); Rectangle(ps.hdc, rt.left, rt.top-1, rt.right, rt.bottom+1); SelectObject(ps.hdc, lastBrush); -#ifdef _NO_EXTENSIONS - rt.top = rt.bottom - GetSystemMetrics(SM_CYHSCROLL); - FillRect(ps.hdc, &rt, GetStockObject(BLACK_BRUSH)); -#endif EndPaint(hwnd, &ps); break;} @@ -4152,45 +3866,21 @@ if (x>=child->split_pos-SPLIT_WIDTH/2 && x<child->split_pos+SPLIT_WIDTH/2+1) { last_split = child->split_pos; -#ifdef _NO_EXTENSIONS - draw_splitbar(hwnd, last_split); -#endif SetCapture(hwnd); } break;} case WM_LBUTTONUP: - if (GetCapture() == hwnd) { -#ifdef _NO_EXTENSIONS - RECT rt; - int x = (short)LOWORD(lparam); - draw_splitbar(hwnd, last_split); - last_split = -1; - GetClientRect(hwnd, &rt); - child->split_pos = x; - resize_tree(child, rt.right, rt.bottom); -#endif - ReleaseCapture(); - } + if (GetCapture() == hwnd) + ReleaseCapture(); break; - -#ifdef _NO_EXTENSIONS - case WM_CAPTURECHANGED: - if (GetCapture()==hwnd && last_split>=0) - draw_splitbar(hwnd, last_split); - break; -#endif case WM_KEYDOWN: if (wparam == VK_ESCAPE) if (GetCapture() == hwnd) { RECT rt; -#ifdef _NO_EXTENSIONS - draw_splitbar(hwnd, last_split); -#else child->split_pos = last_split; -#endif GetClientRect(hwnd, &rt); resize_tree(child, rt.right, rt.bottom); last_split = -1; @@ -4204,21 +3894,6 @@ RECT rt; int x = (short)LOWORD(lparam); -#ifdef _NO_EXTENSIONS - HDC hdc = GetDC(hwnd); - GetClientRect(hwnd, &rt); - - rt.left = last_split-SPLIT_WIDTH/2; - rt.right = last_split+SPLIT_WIDTH/2+1; - InvertRect(hdc, &rt); - - last_split = x; - rt.left = x-SPLIT_WIDTH/2; - rt.right = x+SPLIT_WIDTH/2+1; - InvertRect(hdc, &rt); - - ReleaseDC(hwnd, hdc); -#else GetClientRect(hwnd, &rt); if (x>=0 && x<rt.right) { @@ -4231,11 +3906,9 @@ UpdateWindow(hwnd); UpdateWindow(child->right.hwnd); } -#endif } break; -#ifndef _NO_EXTENSIONS case WM_GETMINMAXINFO: DefMDIChildProcW(hwnd, nmsg, wparam, lparam); @@ -4244,7 +3917,6 @@ lpmmi->ptMaxTrackSize.x <<= 1;/*2*GetSystemMetrics(SM_CXSCREEN) / SM_CXVIRTUALSCREEN */ lpmmi->ptMaxTrackSize.y <<= 1;/*2*GetSystemMetrics(SM_CYSCREEN) / SM_CYVIRTUALSCREEN */ break;} -#endif /* _NO_EXTENSIONS */ case WM_SETFOCUS: if (SetCurrentDirectoryW(child->path)) @@ -4345,9 +4017,6 @@ case ID_VIEW_SPLIT: { last_split = child->split_pos; -#ifdef _NO_EXTENSIONS - draw_splitbar(hwnd, last_split); -#endif SetCapture(hwnd); break;} @@ -4381,13 +4050,10 @@ } break;} -#ifndef _NO_EXTENSIONS case WM_NOTIFY: { NMHDR* pnmh = (NMHDR*) lparam; return pane_notify(pnmh->idFrom==IDW_HEADER_LEFT? &child->left: &child->right, pnmh);} -#endif - -#ifdef _SHELL_FOLDERS + case WM_CONTEXTMENU: { POINT pt, pt_clnt; Pane* pane; @@ -4426,7 +4092,6 @@ } } break;} -#endif case WM_MEASUREITEM: draw_menu_item: @@ -4474,11 +4139,9 @@ ASSERT(child); switch(nmsg) { -#ifndef _NO_EXTENSIONS case WM_HSCROLL: set_header(pane); break; -#endif case WM_SETFOCUS: child->focus_pane = pane==&child->right? 1: 0; @@ -4559,12 +4222,10 @@ Globals.hInstance = hinstance; -#ifdef _SHELL_FOLDERS CoInitialize(NULL); CoGetMalloc(MEMCTX_TASK, &Globals.iMalloc); SHGetDesktopFolder(&Globals.iDesktop); Globals.cfStrFName = RegisterClipboardFormatW(CFSTR_FILENAMEW); -#endif /* load column strings */ col = 1; @@ -4572,16 +4233,12 @@ load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_NAME); load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_SIZE); load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_CDATE); -#ifndef _NO_EXTENSIONS load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_ADATE); load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_MDATE); load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_IDX); load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_LINKS); -#endif load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_ATTR); -#ifndef _NO_EXTENSIONS load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_SEC); -#endif } @@ -4604,15 +4261,15 @@ hMenuWindow = GetSubMenu(hMenuFrame, GetMenuItemCount(hMenuFrame)-2); Globals.hMenuFrame = hMenuFrame; - Globals.hMenuView = GetSubMenu(hMenuFrame, 3); - Globals.hMenuOptions = GetSubMenu(hMenuFrame, 4); + Globals.hMenuView = GetSubMenu(hMenuFrame, 2); + Globals.hMenuOptions = GetSubMenu(hMenuFrame, 3); ccs.hWindowMenu = hMenuWindow; ccs.idFirstChild = IDW_FIRST_CHILD; /* create main window */ - Globals.hMainWnd = CreateWindowExW(0, MAKEINTRESOURCEW(Globals.hframeClass), RS(b1,IDS_WINE_FILE), WS_OVERLAPPEDWINDOW, + Globals.hMainWnd = CreateWindowExW(0, MAKEINTRESOURCEW(Globals.hframeClass), RS(b1,IDS_WINEFILE), WS_OVERLAPPEDWINDOW, opts.start_x, opts.start_y, opts.width, opts.height, hwndParent, Globals.hMenuFrame, Globals.hInstance, 0/*lpParam*/); @@ -4634,10 +4291,7 @@ {1, ID_WINDOW_CASCADE, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0}, {2, ID_WINDOW_TILE_HORZ, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0}, {3, ID_WINDOW_TILE_VERT, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0}, -/*TODO - {4, ID_... , TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0}, - {5, ID_... , TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0}, -*/ }; + }; Globals.htoolbar = CreateToolbarEx(Globals.hMainWnd, WS_CHILD|WS_VISIBLE, IDW_TOOLBAR, 2, Globals.hInstance, IDB_TOOLBAR, toolbarBtns, @@ -4648,11 +4302,6 @@ Globals.hstatusbar = CreateStatusWindowW(WS_CHILD|WS_VISIBLE, 0, Globals.hMainWnd, IDW_STATUSBAR); CheckMenuItem(Globals.hMenuOptions, ID_VIEW_STATUSBAR, MF_BYCOMMAND|MF_CHECKED); -/* CreateStatusWindowW does not accept WS_BORDER - Globals.hstatusbar = CreateWindowExW(WS_EX_NOPARENTNOTIFY, STATUSCLASSNAME, 0, - WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS|WS_BORDER|CCS_NODIVIDER, 0,0,0,0, - Globals.hMainWnd, (HMENU)IDW_STATUSBAR, hinstance, 0);*/ - /*TODO: read paths from registry */ if (!path || !*path) { @@ -4662,7 +4311,7 @@ ShowWindow(Globals.hMainWnd, cmdshow); -#if defined(_SHELL_FOLDERS) && !defined(__WINE__) +#ifndef __WINE__ /* Shell Namespace as default: */ child = alloc_child_window(path, get_path_pidl(path,Globals.hMainWnd), Globals.hMainWnd); #else @@ -4721,56 +4370,21 @@ static void ExitInstance(void) { -#ifdef _SHELL_FOLDERS IShellFolder_Release(Globals.iDesktop); IMalloc_Release(Globals.iMalloc); CoUninitialize(); -#endif DeleteObject(Globals.hfont); ImageList_Destroy(Globals.himl); } -#ifdef _NO_EXTENSIONS - -/* search for already running win[e]files */ - -static int g_foundPrevInstance = 0; - -static BOOL CALLBACK EnumWndProc(HWND hwnd, LPARAM lparam) -{ - WCHAR cls[128]; - - GetClassName(hwnd, cls, 128); - - if (!lstrcmpW(cls, (LPCWSTR)lparam)) { - g_foundPrevInstance++; - return FALSE; - } - - return TRUE; -} - -/* search for window of given class name to allow only one running instance */ -static int find_window_class(LPCWSTR classname) -{ - EnumWindows(EnumWndProc, (LPARAM)classname); - - if (g_foundPrevInstance) - return 1; - - return 0; -} - -#endif - -static int winefile_main(HINSTANCE hinstance, int cmdshow, LPCWSTR path) +int APIENTRY wWinMain(HINSTANCE hinstance, HINSTANCE previnstance, LPWSTR cmdline, int cmdshow) { MSG msg; InitInstance(hinstance); - if( !show_frame(0, cmdshow, path) ) + if( !show_frame(0, cmdshow, cmdline) ) { ExitInstance(); return 1; @@ -4791,24 +4405,3 @@ return msg.wParam; } - - -#if defined(_MSC_VER) -int APIENTRY wWinMain(HINSTANCE hinstance, HINSTANCE previnstance, LPWSTR cmdline, int cmdshow) -#else -int APIENTRY WinMain(HINSTANCE hinstance, HINSTANCE previnstance, LPSTR cmdline, int cmdshow) -#endif -{ -#ifdef _NO_EXTENSIONS - if (find_window_class(sWINEFILEFRAME)) - return 1; -#endif - - { /* convert ANSI cmdline into WCS path string */ - WCHAR buffer[MAX_PATH]; - MultiByteToWideChar(CP_ACP, 0, cmdline, -1, buffer, MAX_PATH); - winefile_main(hinstance, cmdshow, buffer); - } - - return 0; -} Modified: trunk/rosapps/applications/winfile/winefile.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/winef… ============================================================================== --- trunk/rosapps/applications/winfile/winefile.h [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/winefile.h [iso-8859-1] Sat Dec 7 01:37:47 2013 @@ -30,25 +30,17 @@ #define NONAMELESSUNION #include <windows.h> -#include <commctrl.h> #include <commdlg.h> -#ifdef UNICODE -#define _UNICODE -#endif +//#ifdef UNICODE +//#define _UNICODE +//#endif -#include <stdlib.h> -#include <stdio.h> -#include <ctype.h> #include <locale.h> #include <time.h> #include <shellapi.h> /* for ShellExecuteW() */ -#include <shlobj.h> /* for SHFormatDrive() */ - -#ifndef _NO_EXTENSIONS -#define _SHELL_FOLDERS -#endif /* _NO_EXTENSIONS */ +#include <shlobj.h> #ifndef FILE_ATTRIBUTE_NOT_CONTENT_INDEXED #define FILE_ATTRIBUTE_ENCRYPTED 0x00000040 @@ -92,12 +84,7 @@ #define COLOR_COMPRESSED RGB(0,0,255) #define COLOR_SELECTION RGB(0,0,128) - -#ifdef _NO_EXTENSIONS -#define COLOR_SPLITBAR WHITE_BRUSH -#else #define COLOR_SPLITBAR LTGRAY_BRUSH -#endif #define FRM_CALC_CLIENT 0xBF83 #define Frame_CalcFrameClient(hwnd, prt) (SendMessageW(hwnd, FRM_CALC_CLIENT, 0, (LPARAM)(PRECT)prt)) @@ -135,14 +122,12 @@ WCHAR drives[BUFFER_LEN]; BOOL prescan_node; /*TODO*/ BOOL saveSettings; - -#ifdef _SHELL_FOLDERS + IShellFolder* iDesktop; IMalloc* iMalloc; UINT cfStrFName; -#endif } WINEFILE_GLOBALS; extern WINEFILE_GLOBALS Globals; -extern void _wsplitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext); +//extern void _wsplitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext);

1 0

[hbelusca] 61240: Fix my Engrish :)
by hbelusca＠svn.reactos.org 07 Dec '13

07 Dec '13

Author: hbelusca Date: Sat Dec 7 00:03:39 2013 New Revision: 61240 URL: http://svn.reactos.org/svn/reactos?rev=61240&view=rev Log: Fix my Engrish :) Modified: branches/ntvdm/subsystems/ntvdm/ps2.c Modified: branches/ntvdm/subsystems/ntvdm/ps2.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ps2.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ps2.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ps2.c [iso-8859-1] Sat Dec 7 00:03:39 2013 @@ -65,8 +65,8 @@ WaitForSingleObject(QueueMutex, INFINITE); /* - * Recheck whether keyboard queue is not empty (it may - * have been changed after having grabbed the mutex). + * Recheck whether keyboard queue is not empty (it + * may have changed after having grabbed the mutex). */ if (KeyboardQueueEmpty) {

1 0

[hbelusca] 61239: [NTVDM] - Last race condition fix (see revision 61230). - Add a comment why we do twice the same emptiness check (one before holding the mutex and one just after).
by hbelusca＠svn.reactos.org 07 Dec '13

07 Dec '13

Author: hbelusca Date: Sat Dec 7 00:01:24 2013 New Revision: 61239 URL: http://svn.reactos.org/svn/reactos?rev=61239&view=rev Log: [NTVDM] - Last race condition fix (see revision 61230). - Add a comment why we do twice the same emptiness check (one before holding the mutex and one just after). Modified: branches/ntvdm/subsystems/ntvdm/ps2.c Modified: branches/ntvdm/subsystems/ntvdm/ps2.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ps2.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ps2.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ps2.c [iso-8859-1] Sat Dec 7 00:01:24 2013 @@ -31,10 +31,16 @@ static BOOLEAN KeyboardQueuePush(BYTE ScanCode) { + BOOLEAN Result = TRUE; + + WaitForSingleObject(QueueMutex, INFINITE); + /* Check if the keyboard queue is full */ - WaitForSingleObject(QueueMutex, INFINITE); - - if (!KeyboardQueueEmpty && (KeyboardQueueStart == KeyboardQueueEnd)) return FALSE; + if (!KeyboardQueueEmpty && (KeyboardQueueStart == KeyboardQueueEnd)) + { + Result = FALSE; + goto Done; + } /* Insert the value in the queue */ KeyboardQueue[KeyboardQueueEnd] = ScanCode; @@ -44,19 +50,24 @@ /* Since we inserted a value, it's not empty anymore */ KeyboardQueueEmpty = FALSE; +Done: ReleaseMutex(QueueMutex); - return TRUE; + return Result; } static BOOLEAN KeyboardQueuePop(BYTE *ScanCode) { BOOLEAN Result = TRUE; - /* Make sure the keyboard queue is not empty */ + /* Make sure the keyboard queue is not empty (fast check) */ if (KeyboardQueueEmpty) return FALSE; WaitForSingleObject(QueueMutex, INFINITE); + /* + * Recheck whether keyboard queue is not empty (it may + * have been changed after having grabbed the mutex). + */ if (KeyboardQueueEmpty) { Result = FALSE;

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
31
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2013