Ros-diffs November 2013

ros-diffs@reactos.org

16 participants
348 discussions

[aandrejevic] 60849: [NTVDM] Improve the I/O read/write callbacks to allow multiple reads or writes at once.
by aandrejevic＠svn.reactos.org 03 Nov '13

03 Nov '13

Author: aandrejevic Date: Sun Nov 3 14:37:30 2013 New Revision: 60849 URL: http://svn.reactos.org/svn/reactos?rev=60849&view=rev Log: [NTVDM] Improve the I/O read/write callbacks to allow multiple reads or writes at once. Modified: branches/ntvdm/subsystems/ntvdm/emulator.c Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Sun Nov 3 14:37:30 2013 @@ -82,146 +82,152 @@ static VOID WINAPI EmulatorReadIo(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG Size) { + INT i; LPBYTE Address = (LPBYTE)Buffer; UNREFERENCED_PARAMETER(State); - UNREFERENCED_PARAMETER(Size); - - switch (Port) - { - case PIC_MASTER_CMD: - case PIC_SLAVE_CMD: + + for (i = 0; i < Size; i++) + { + switch (Port) { - *Address = PicReadCommand(Port); - break; + case PIC_MASTER_CMD: + case PIC_SLAVE_CMD: + { + *(Address++) = PicReadCommand(Port); + break; + } + + case PIC_MASTER_DATA: + case PIC_SLAVE_DATA: + { + *(Address++) = PicReadData(Port); + break; + } + + case PIT_DATA_PORT(0): + case PIT_DATA_PORT(1): + case PIT_DATA_PORT(2): + { + *(Address++) = PitReadData(Port - PIT_DATA_PORT(0)); + break; + } + + case PS2_CONTROL_PORT: + { + *(Address++) = KeyboardReadStatus(); + break; + } + + case PS2_DATA_PORT: + { + *(Address++) = KeyboardReadData(); + break; + } + + case VGA_AC_WRITE: + case VGA_AC_READ: + case VGA_SEQ_INDEX: + case VGA_SEQ_DATA: + case VGA_DAC_READ_INDEX: + case VGA_DAC_WRITE_INDEX: + case VGA_DAC_DATA: + case VGA_MISC_READ: + case VGA_MISC_WRITE: + case VGA_CRTC_INDEX: + case VGA_CRTC_DATA: + case VGA_GC_INDEX: + case VGA_GC_DATA: + case VGA_STAT_MONO: + case VGA_STAT_COLOR: + { + *(Address++) = VgaReadPort(Port); + break; + } + + default: + { + DPRINT1("Read from unknown port: 0x%X\n", Port); + } } - - case PIC_MASTER_DATA: - case PIC_SLAVE_DATA: + } +} + +static VOID WINAPI EmulatorWriteIo(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG Size) +{ + INT i; + LPBYTE Address = (LPBYTE)Buffer; + + UNREFERENCED_PARAMETER(State); + + for (i = 0; i < Size; i++) + { + switch (Port) { - *Address = PicReadData(Port); - break; - } - - case PIT_DATA_PORT(0): - case PIT_DATA_PORT(1): - case PIT_DATA_PORT(2): - { - *Address = PitReadData(Port - PIT_DATA_PORT(0)); - break; - } - - case PS2_CONTROL_PORT: - { - *Address = KeyboardReadStatus(); - break; - } - - case PS2_DATA_PORT: - { - *Address = KeyboardReadData(); - break; - } - - case VGA_AC_WRITE: - case VGA_AC_READ: - case VGA_SEQ_INDEX: - case VGA_SEQ_DATA: - case VGA_DAC_READ_INDEX: - case VGA_DAC_WRITE_INDEX: - case VGA_DAC_DATA: - case VGA_MISC_READ: - case VGA_MISC_WRITE: - case VGA_CRTC_INDEX: - case VGA_CRTC_DATA: - case VGA_GC_INDEX: - case VGA_GC_DATA: - case VGA_STAT_MONO: - case VGA_STAT_COLOR: - { - *Address = VgaReadPort(Port); - break; - } - - default: - { - DPRINT1("Read from unknown port: 0x%X\n", Port); - } - } -} - -static VOID WINAPI EmulatorWriteIo(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG Size) -{ - BYTE Byte = *(LPBYTE)Buffer; - - UNREFERENCED_PARAMETER(State); - UNREFERENCED_PARAMETER(Size); - - switch (Port) - { - case PIT_COMMAND_PORT: - { - PitWriteCommand(Byte); - break; - } - - case PIT_DATA_PORT(0): - case PIT_DATA_PORT(1): - case PIT_DATA_PORT(2): - { - PitWriteData(Port - PIT_DATA_PORT(0), Byte); - break; - } - - case PIC_MASTER_CMD: - case PIC_SLAVE_CMD: - { - PicWriteCommand(Port, Byte); - break; - } - - case PIC_MASTER_DATA: - case PIC_SLAVE_DATA: - { - PicWriteData(Port, Byte); - break; - } - - case PS2_CONTROL_PORT: - { - KeyboardWriteCommand(Byte); - break; - } - - case PS2_DATA_PORT: - { - KeyboardWriteData(Byte); - break; - } - - case VGA_AC_WRITE: - case VGA_AC_READ: - case VGA_SEQ_INDEX: - case VGA_SEQ_DATA: - case VGA_DAC_READ_INDEX: - case VGA_DAC_WRITE_INDEX: - case VGA_DAC_DATA: - case VGA_MISC_READ: - case VGA_MISC_WRITE: - case VGA_CRTC_INDEX: - case VGA_CRTC_DATA: - case VGA_GC_INDEX: - case VGA_GC_DATA: - case VGA_STAT_MONO: - case VGA_STAT_COLOR: - { - VgaWritePort(Port, Byte); - break; - } - - default: - { - DPRINT1("Write to unknown port: 0x%X\n", Port); + case PIT_COMMAND_PORT: + { + PitWriteCommand(*(Address++)); + break; + } + + case PIT_DATA_PORT(0): + case PIT_DATA_PORT(1): + case PIT_DATA_PORT(2): + { + PitWriteData(Port - PIT_DATA_PORT(0), *(Address++)); + break; + } + + case PIC_MASTER_CMD: + case PIC_SLAVE_CMD: + { + PicWriteCommand(Port, *(Address++)); + break; + } + + case PIC_MASTER_DATA: + case PIC_SLAVE_DATA: + { + PicWriteData(Port, *(Address++)); + break; + } + + case PS2_CONTROL_PORT: + { + KeyboardWriteCommand(*(Address++)); + break; + } + + case PS2_DATA_PORT: + { + KeyboardWriteData(*(Address++)); + break; + } + + case VGA_AC_WRITE: + case VGA_AC_READ: + case VGA_SEQ_INDEX: + case VGA_SEQ_DATA: + case VGA_DAC_READ_INDEX: + case VGA_DAC_WRITE_INDEX: + case VGA_DAC_DATA: + case VGA_MISC_READ: + case VGA_MISC_WRITE: + case VGA_CRTC_INDEX: + case VGA_CRTC_DATA: + case VGA_GC_INDEX: + case VGA_GC_DATA: + case VGA_STAT_MONO: + case VGA_STAT_COLOR: + { + VgaWritePort(Port, *(Address++)); + break; + } + + default: + { + DPRINT1("Write to unknown port: 0x%X\n", Port); + } } } }

1 0

[gadamopoulos] 60848: [shell32] - Hackix F5 accelerator by moving it for now to the accelerator table of the shell view control - Use uppercase letters in the accelerator table in order to make win...
by gadamopoulos＠svn.reactos.org 03 Nov '13

03 Nov '13

Author: gadamopoulos Date: Sun Nov 3 14:28:40 2013 New Revision: 60848 URL: http://svn.reactos.org/svn/reactos?rev=60848&view=rev Log: [shell32] - Hackix F5 accelerator by moving it for now to the accelerator table of the shell view control - Use uppercase letters in the accelerator table in order to make windres compile it properly. - shell accelerators should work fine now Modified: trunk/reactos/dll/win32/shell32/shell32.rc Modified: trunk/reactos/dll/win32/shell32/shell32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.rc [iso-8859-1] Sun Nov 3 14:28:40 2013 @@ -30,19 +30,25 @@ IDA_SHELLVIEW ACCELERATORS BEGIN - "d", FCIDM_SHVIEW_DELETE, VIRTKEY, CONTROL + "D", FCIDM_SHVIEW_DELETE, VIRTKEY, CONTROL VK_DELETE, FCIDM_SHVIEW_DELETE, VIRTKEY VK_DELETE, FCIDM_SHVIEW_DELETE, VIRTKEY, SHIFT VK_F2, FCIDM_SHVIEW_RENAME, VIRTKEY VK_RETURN, FCIDM_SHVIEW_OPEN, VIRTKEY, ALT - "x", FCIDM_SHVIEW_CUT, VIRTKEY, CONTROL - "c", FCIDM_SHVIEW_COPY, VIRTKEY, CONTROL + "X", FCIDM_SHVIEW_CUT, VIRTKEY, CONTROL + "C", FCIDM_SHVIEW_COPY, VIRTKEY, CONTROL VK_INSERT, FCIDM_SHVIEW_COPY, VIRTKEY, CONTROL - "v", FCIDM_SHVIEW_INSERT, VIRTKEY, CONTROL + "V", FCIDM_SHVIEW_INSERT, VIRTKEY, CONTROL VK_INSERT, FCIDM_SHVIEW_INSERT, VIRTKEY, SHIFT - "z", FCIDM_SHVIEW_UNDO, VIRTKEY, CONTROL - "a", FCIDM_SHVIEW_SELECTALL, VIRTKEY, CONTROL + "Z", FCIDM_SHVIEW_UNDO, VIRTKEY, CONTROL + "A", FCIDM_SHVIEW_SELECTALL, VIRTKEY, CONTROL VK_F1, FCIDM_SHVIEW_HELP, VIRTKEY + + /* FIXME: the following accelerator doesn't belong here. This accelerator + * table is used by the shell view control. F5 should be handled by the + * a different accelerator table thats translated in IShellBrowser::TranslateAcceleratorSB + * but will put it here until the shell work fine */ + VK_F5, FCIDM_SHVIEW_REFRESH, VIRTKEY END shv_accel ACCELERATORS

1 0

[fireball] 60847: Initial commit of a small subproject I wanted to do for years. If you like it, please feel free to join me as there is more than enough place for improvement. This commit brings t...
by fireball＠svn.reactos.org 03 Nov '13

03 Nov '13

Author: fireball Date: Sun Nov 3 14:08:12 2013 New Revision: 60847 URL: http://svn.reactos.org/svn/reactos?rev=60847&view=rev Log: Initial commit of a small subproject I wanted to do for years. If you like it, please feel free to join me as there is more than enough place for improvement. This commit brings the first very small implemented part (mainly everything related to phase 0 initialization). A cut from the readme file: Monstera is a new implementation of a memory manager (along with a cache manager) compatible with the ReactOS kernel at source code level and providing the same binary compatible Native API through a lightweight wrapper. Monstera is implemented in a subset of C++ programming language. A document outlining specific restrictions, coding style and other considerations is available. Key ideas: 1. Object oriented language for object oriented kernel. When NT was implemented, C++ wasn't that good. 2. Simplicity > optimization. Nowadays we can sacrifice a bit of performance in favor of more robust implementation. 3. Same Native API. Internal implementation and external interfaces are two different things. 4. Don't drift away too much. It's still based on NT architecture, but think of it as if Microsoft Research would decide to reimplement NT in C++ for fun. Credits: - ReactOS Portable Systems Group for the code which is used as a base in many places of Monstera. - Alex Ionescu for his invaluable contribution to the ReactOS kernel. - Timo Kreuzer, Johannes Anderwald for their C++-in-the-kernel-mode help. - Amine Khaldi for help with the build environment. - ReactOS team for their great work. Added: branches/monstera/README (with props) branches/monstera/ntoskrnl/ (with props) branches/monstera/ntoskrnl/cc2/ (with props) branches/monstera/ntoskrnl/cc2/ccntapi.cpp (with props) branches/monstera/ntoskrnl/mm2/ (with props) branches/monstera/ntoskrnl/mm2/i386/ (with props) branches/monstera/ntoskrnl/mm2/i386/mach86.cpp (with props) branches/monstera/ntoskrnl/mm2/i386/mach86.hpp (with props) branches/monstera/ntoskrnl/mm2/i386/pte.cpp (with props) branches/monstera/ntoskrnl/mm2/memorymanager.cpp (with props) branches/monstera/ntoskrnl/mm2/memorymanager.hpp (with props) branches/monstera/ntoskrnl/mm2/mmntapi.cpp (with props) branches/monstera/ntoskrnl/mm2/pfndb.cpp (with props) branches/monstera/ntoskrnl/mm2/pfndb.hpp (with props) branches/monstera/ntoskrnl/mm2/pool.cpp (with props) branches/monstera/ntoskrnl/mm2/pool.hpp (with props) branches/monstera/ntoskrnl/mm2/poolmanager.cpp (with props) branches/monstera/ntoskrnl/mm2/poolmanager.hpp (with props) branches/monstera/ntoskrnl/mm2/pte.hpp (with props) branches/monstera/ntoskrnl/mm2/systemcache.cpp (with props) branches/monstera/ntoskrnl/mm2/systemcache.hpp (with props) branches/monstera/ntoskrnl/mm2/systemptes.cpp (with props) branches/monstera/ntoskrnl/mm2/systemptes.hpp (with props) branches/monstera/ntoskrnl/mm2/virtualmemory.cpp (with props) branches/monstera/ntoskrnl/mm2/virtualmemory.hpp (with props) branches/monstera/ntoskrnl/mm2/workingset.cpp (with props) branches/monstera/ntoskrnl/mm2/workingset.hpp (with props) branches/monstera/trunk.diff [This mail would be too long, it was shortened to contain the URLs only.] Added: branches/monstera/README URL: http://svn.reactos.org/svn/reactos/branches/monstera/README?rev=60847 Added: branches/monstera/ntoskrnl/cc2/ccntapi.cpp URL: http://svn.reactos.org/svn/reactos/branches/monstera/ntoskrnl/cc2/ccntapi.c… Added: branches/monstera/ntoskrnl/mm2/i386/mach86.cpp URL: http://svn.reactos.org/svn/reactos/branches/monstera/ntoskrnl/mm2/i386/mach… Added: branches/monstera/ntoskrnl/mm2/i386/mach86.hpp URL: http://svn.reactos.org/svn/reactos/branches/monstera/ntoskrnl/mm2/i386/mach… Added: branches/monstera/ntoskrnl/mm2/i386/pte.cpp URL: http://svn.reactos.org/svn/reactos/branches/monstera/ntoskrnl/mm2/i386/pte.… Added: branches/monstera/ntoskrnl/mm2/memorymanager.cpp URL: http://svn.reactos.org/svn/reactos/branches/monstera/ntoskrnl/mm2/memoryman… Added: branches/monstera/ntoskrnl/mm2/memorymanager.hpp URL: http://svn.reactos.org/svn/reactos/branches/monstera/ntoskrnl/mm2/memoryman… Added: branches/monstera/ntoskrnl/mm2/mmntapi.cpp URL: http://svn.reactos.org/svn/reactos/branches/monstera/ntoskrnl/mm2/mmntapi.c… Added: branches/monstera/ntoskrnl/mm2/pfndb.cpp URL: http://svn.reactos.org/svn/reactos/branches/monstera/ntoskrnl/mm2/pfndb.cpp… Added: branches/monstera/ntoskrnl/mm2/pfndb.hpp URL: http://svn.reactos.org/svn/reactos/branches/monstera/ntoskrnl/mm2/pfndb.hpp… Added: branches/monstera/ntoskrnl/mm2/pool.cpp URL: http://svn.reactos.org/svn/reactos/branches/monstera/ntoskrnl/mm2/pool.cpp?… Added: branches/monstera/ntoskrnl/mm2/pool.hpp URL: http://svn.reactos.org/svn/reactos/branches/monstera/ntoskrnl/mm2/pool.hpp?… Added: branches/monstera/ntoskrnl/mm2/poolmanager.cpp URL: http://svn.reactos.org/svn/reactos/branches/monstera/ntoskrnl/mm2/poolmanag… Added: branches/monstera/ntoskrnl/mm2/poolmanager.hpp URL: http://svn.reactos.org/svn/reactos/branches/monstera/ntoskrnl/mm2/poolmanag… Added: branches/monstera/ntoskrnl/mm2/pte.hpp URL: http://svn.reactos.org/svn/reactos/branches/monstera/ntoskrnl/mm2/pte.hpp?r… Added: branches/monstera/ntoskrnl/mm2/systemcache.cpp URL: http://svn.reactos.org/svn/reactos/branches/monstera/ntoskrnl/mm2/systemcac… Added: branches/monstera/ntoskrnl/mm2/systemcache.hpp URL: http://svn.reactos.org/svn/reactos/branches/monstera/ntoskrnl/mm2/systemcac… Added: branches/monstera/ntoskrnl/mm2/systemptes.cpp URL: http://svn.reactos.org/svn/reactos/branches/monstera/ntoskrnl/mm2/systempte… Added: branches/monstera/ntoskrnl/mm2/systemptes.hpp URL: http://svn.reactos.org/svn/reactos/branches/monstera/ntoskrnl/mm2/systempte… Added: branches/monstera/ntoskrnl/mm2/virtualmemory.cpp URL: http://svn.reactos.org/svn/reactos/branches/monstera/ntoskrnl/mm2/virtualme… Added: branches/monstera/ntoskrnl/mm2/virtualmemory.hpp URL: http://svn.reactos.org/svn/reactos/branches/monstera/ntoskrnl/mm2/virtualme… Added: branches/monstera/ntoskrnl/mm2/workingset.cpp URL: http://svn.reactos.org/svn/reactos/branches/monstera/ntoskrnl/mm2/workingse… Added: branches/monstera/ntoskrnl/mm2/workingset.hpp URL: http://svn.reactos.org/svn/reactos/branches/monstera/ntoskrnl/mm2/workingse… Added: branches/monstera/trunk.diff URL: http://svn.reactos.org/svn/reactos/branches/monstera/trunk.diff?rev=60847

1 0

[hbelusca] 60846: [NTVDM] Implement INT 10h, AH 10h, AL 10h, 12h, 15h and 17h (set/get individual or block of DAC registers).
by hbelusca＠svn.reactos.org 03 Nov '13

03 Nov '13

Author: hbelusca Date: Sun Nov 3 13:25:01 2013 New Revision: 60846 URL: http://svn.reactos.org/svn/reactos?rev=60846&view=rev Log: [NTVDM] Implement INT 10h, AH 10h, AL 10h, 12h, 15h and 17h (set/get individual or block of DAC registers). 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] Sun Nov 3 13:25:01 2013 @@ -1031,6 +1031,77 @@ break; } + /* Set Individual DAC Register */ + case 0x10: + { + /* Write the index */ + // Certainly in BL and not in BX as said by Ralf Brown... + VgaWritePort(VGA_DAC_WRITE_INDEX, getBL()); + + /* Write the data in this order: Red, Green, Blue */ + VgaWritePort(VGA_DAC_DATA, getDH()); + VgaWritePort(VGA_DAC_DATA, getCH()); + VgaWritePort(VGA_DAC_DATA, getCL()); + + break; + } + + /* Set Block of DAC Registers */ + case 0x12: + { + INT i; + LPBYTE Buffer = SEG_OFF_TO_PTR(getES(), getDX()); + + /* Write the index */ + // Certainly in BL and not in BX as said by Ralf Brown... + VgaWritePort(VGA_DAC_WRITE_INDEX, getBL()); + + for (i = 0; i < getCX(); i++) + { + /* Write the data in this order: Red, Green, Blue */ + VgaWritePort(VGA_DAC_DATA, *Buffer++); + VgaWritePort(VGA_DAC_DATA, *Buffer++); + VgaWritePort(VGA_DAC_DATA, *Buffer++); + } + + break; + } + + /* Get Individual DAC Register */ + case 0x15: + { + /* Write the index */ + VgaWritePort(VGA_DAC_READ_INDEX, getBL()); + + /* Read the data in this order: Red, Green, Blue */ + setDH(VgaReadPort(VGA_DAC_DATA)); + setCH(VgaReadPort(VGA_DAC_DATA)); + setCL(VgaReadPort(VGA_DAC_DATA)); + + break; + } + + /* Get Block of DAC Registers */ + case 0x17: + { + INT i; + LPBYTE Buffer = SEG_OFF_TO_PTR(getES(), getDX()); + + /* Write the index */ + // Certainly in BL and not in BX as said by Ralf Brown... + VgaWritePort(VGA_DAC_READ_INDEX, getBL()); + + for (i = 0; i < getCX(); i++) + { + /* Write the data in this order: Red, Green, Blue */ + *Buffer++ = VgaReadPort(VGA_DAC_DATA); + *Buffer++ = VgaReadPort(VGA_DAC_DATA); + *Buffer++ = VgaReadPort(VGA_DAC_DATA); + } + + break; + } + default: { DPRINT1("BIOS Palette Control Sub-command AL = 0x%02X NOT IMPLEMENTED\n",

1 0

[gadamopoulos] 60845: [shell32] - When the caller uses SVGIO_BACKGROUND we should always return a context menu of the background. To do it we pass no items to CDefFolderMenu even when we have selec...
by gadamopoulos＠svn.reactos.org 03 Nov '13

03 Nov '13

Author: gadamopoulos Date: Sun Nov 3 13:15:52 2013 New Revision: 60845 URL: http://svn.reactos.org/svn/reactos?rev=60845&view=rev Log: [shell32] - When the caller uses SVGIO_BACKGROUND we should always return a context menu of the background. To do it we pass no items to CDefFolderMenu even when we have selected items. Should improve the situation for ctrl+c, ctrl+v in the shell Modified: trunk/reactos/dll/win32/shell32/shlview.cpp Modified: trunk/reactos/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] Sun Nov 3 13:15:52 2013 @@ -2089,7 +2089,7 @@ if (IsEqualIID(riid, IID_IContextMenu)) { //*ppvOut = ISvBgCm_Constructor(pSFParent, FALSE); - CDefFolderMenu_Create2(NULL, NULL, cidl, (LPCITEMIDLIST*)apidl, pSFParent, NULL, 0, NULL, (IContextMenu**)ppvOut); + CDefFolderMenu_Create2(NULL, NULL, 0, NULL, pSFParent, NULL, 0, NULL, (IContextMenu**)ppvOut); if (!ppvOut) hr = E_OUTOFMEMORY; else

1 0

[tfaber] 60844: [SHELL32] - Use correct constants for return values. Patch by Ivan Rodionov. CORE-7543 #resolve
by tfaber＠svn.reactos.org 03 Nov '13

03 Nov '13

Author: tfaber Date: Sun Nov 3 12:03:54 2013 New Revision: 60844 URL: http://svn.reactos.org/svn/reactos?rev=60844&view=rev Log: [SHELL32] - Use correct constants for return values. Patch by Ivan Rodionov. CORE-7543 #resolve Modified: trunk/reactos/dll/win32/shell32/folders/printers.cpp trunk/reactos/dll/win32/shell32/pidl.cpp trunk/reactos/dll/win32/shell32/shell32_main.cpp trunk/reactos/dll/win32/shell32/shelllink.cpp trunk/reactos/dll/win32/shell32/shellole.cpp trunk/reactos/dll/win32/shell32/shellord.cpp trunk/reactos/dll/win32/shell32/shellpath.cpp trunk/reactos/dll/win32/shell32/shlfsbind.cpp trunk/reactos/dll/win32/shell32/shlview.cpp Modified: trunk/reactos/dll/win32/shell32/folders/printers.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/printers.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/printers.cpp [iso-8859-1] Sun Nov 3 12:03:54 2013 @@ -112,7 +112,7 @@ *piIndex = -IDI_SHELL_PRINTERS_FOLDER; /* FIXME: other icons for default, network, print to file */ TRACE("-- %s %x\n", debugstr_w(szIconFile), *piIndex); - return NOERROR; + return S_OK; } /************************************************************************** Modified: trunk/reactos/dll/win32/shell32/pidl.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.cpp… ============================================================================== --- trunk/reactos/dll/win32/shell32/pidl.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/pidl.cpp [iso-8859-1] Sun Nov 3 12:03:54 2013 @@ -1102,7 +1102,7 @@ lstrcpynA(pfd->cAlternateFileName, shortname, sizeof(pfd->cAlternateFileName)); else pfd->cAlternateFileName[0] = '\0'; - return NOERROR; + return S_OK; case SHGDFIL_NETRESOURCE: case SHGDFIL_DESCRIPTIONID: @@ -1161,7 +1161,7 @@ pfd->cAlternateFileName[0] = '\0'; else if (!MultiByteToWideChar(CP_ACP, 0, shortname, -1, pfd->cAlternateFileName, 14)) pfd->cAlternateFileName[13] = 0; - return NOERROR; + return S_OK; case SHGDFIL_NETRESOURCE: case SHGDFIL_DESCRIPTIONID: Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] Sun Nov 3 12:03:54 2013 @@ -1013,7 +1013,7 @@ CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, IID_IUnknown, (void **)&ptr); if (ptr) - return NOERROR; + return S_OK; return DISP_E_MEMBERNOTFOUND; } Modified: trunk/reactos/dll/win32/shell32/shelllink.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelllink.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelllink.cpp [iso-8859-1] Sun Nov 3 12:03:54 2013 @@ -221,7 +221,7 @@ HRESULT WINAPI CShellLink::SaveCompleted(LPCOLESTR pszFileName) { FIXME("(%p)->(%s)\n", this, debugstr_w(pszFileName)); - return NOERROR; + return S_OK; } HRESULT WINAPI CShellLink::GetCurFile(LPOLESTR *ppszFileName) @@ -244,7 +244,7 @@ /* copy last saved filename */ wcscpy(*ppszFileName, sLinkPath); - return NOERROR; + return S_OK; } /************************************************************************ @@ -1087,7 +1087,7 @@ this->iShowCmd = iShowCmd; bDirty = TRUE; - return NOERROR; + return S_OK; } static HRESULT SHELL_PidlGeticonLocationA(IShellFolder* psf, LPCITEMIDLIST pidl, @@ -1340,7 +1340,7 @@ if (sArgs) lstrcpynW(pszArgs, sArgs, cchMaxPath); - return NOERROR; + return S_OK; } HRESULT WINAPI CShellLink::SetArguments(LPCWSTR pszArgs) Modified: trunk/reactos/dll/win32/shell32/shellole.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellole… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellole.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellole.cpp [iso-8859-1] Sun Nov 3 12:03:54 2013 @@ -422,7 +422,7 @@ if (FAILED(hResult)) return hResult; *ppv = pcf; - return NOERROR; + return S_OK; } /************************************************************************* Modified: trunk/reactos/dll/win32/shell32/shellord.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellord.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellord.cpp [iso-8859-1] Sun Nov 3 12:03:54 2013 @@ -1070,7 +1070,7 @@ return E_FAIL; SHELL32_IExplorerInterface->AddRef(); - return NOERROR; + return S_OK; } /************************************************************************* * SHFreeUnusedLibraries [SHELL32.123] @@ -1097,7 +1097,7 @@ BOOL WINAPI DAD_AutoScroll(HWND hwnd, AUTO_SCROLL_DATA *samples, const POINT * pt) { FIXME("hwnd = %p %p %p\n",hwnd,samples,pt); - return 0; + return FALSE; } /************************************************************************* * DAD_DragEnter [SHELL32.130] @@ -1146,7 +1146,7 @@ LPPOINT lppt) { FIXME("%p %p stub\n",himlTrack, lppt); - return 0; + return FALSE; } /************************************************************************* * DAD_ShowDragImage [SHELL32.137] @@ -1157,7 +1157,7 @@ BOOL WINAPI DAD_ShowDragImage(BOOL bShow) { FIXME("0x%08x stub\n",bShow); - return 0; + return FALSE; } static const WCHAR szwCabLocation[] = { @@ -1250,8 +1250,9 @@ * */ BOOL WINAPI FileIconInit(BOOL bFullInit) -{ FIXME("(%s)\n", bFullInit ? "true" : "false"); - return 0; +{ + FIXME("(%s)\n", bFullInit ? "true" : "false"); + return FALSE; } /************************************************************************* Modified: trunk/reactos/dll/win32/shell32/shellpath.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellpat… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellpath.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellpath.cpp [iso-8859-1] Sun Nov 3 12:03:54 2013 @@ -1811,7 +1811,7 @@ } } if(*ppidl) - hr = NOERROR; + hr = S_OK; TRACE("-- (new pidl %p)\n",*ppidl); return hr; Modified: trunk/reactos/dll/win32/shell32/shlfsbind.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfsbin… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfsbind.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfsbind.cpp [iso-8859-1] Sun Nov 3 12:03:54 2013 @@ -149,7 +149,7 @@ return E_INVALIDARG; memcpy(pfd, &findFile, sizeof(WIN32_FIND_DATAW)); - return NOERROR; + return S_OK; } HRESULT WINAPI IFileSystemBindDataImpl::SetFindData(const WIN32_FIND_DATAW *pfd) @@ -160,5 +160,5 @@ memcpy(&findFile, pfd, sizeof(WIN32_FIND_DATAW)); else memset(&findFile, 0, sizeof(WIN32_FIND_DATAW)); - return NOERROR; + return S_OK; } Modified: trunk/reactos/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] Sun Nov 3 12:03:54 2013 @@ -2008,7 +2008,7 @@ return E_INVALIDARG; *lpfs = FolderSettings; - return NOERROR; + return S_OK; } HRESULT WINAPI CDefView::AddPropertySheetPages(DWORD dwReserved, LPFNADDPROPSHEETPAGE lpfn, LPARAM lparam) @@ -2499,7 +2499,7 @@ else if (!(grfKeyState & MK_LBUTTON) && !(grfKeyState & MK_RBUTTON)) return DRAGDROP_S_DROP; else - return NOERROR; + return S_OK; } HRESULT WINAPI CDefView::GiveFeedback(DWORD dwEffect)

1 0

[dgorbachev] 60843: [TCPSVCS] Fix buffer size.
by dgorbachev＠svn.reactos.org 03 Nov '13

03 Nov '13

Author: dgorbachev Date: Sun Nov 3 11:04:59 2013 New Revision: 60843 URL: http://svn.reactos.org/svn/reactos?rev=60843&view=rev Log: [TCPSVCS] Fix buffer size. Modified: trunk/reactos/base/services/tcpsvcs/chargen.c Modified: trunk/reactos/base/services/tcpsvcs/chargen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/char… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/chargen.c [iso-8859-1] (original) +++ trunk/reactos/base/services/tcpsvcs/chargen.c [iso-8859-1] Sun Nov 3 11:04:59 2013 @@ -12,7 +12,7 @@ /* printable ASCII's characters for chargen */ #define ASCII_START 32 #define ASCII_END 126 -#define NUM_CHARS ASCII_END - ASCII_START +#define NUM_CHARS ASCII_END - ASCII_START + 1 /* number of chars to put on a line */ #define LINESIZE 74 // 72 + CR + NL @@ -58,7 +58,7 @@ /* fill the array with printable characters */ for (charIndex = 0, i = ASCII_START; i <= ASCII_END; charIndex++, i++) - chars[charIndex] = (char)i; + chars[charIndex] = (CHAR)i; loopIndex = 0; while (!bShutdown)

1 0

[aandrejevic] 60842: [NTVDM] Halfplement the BIOS palette control command (INT 10h, AH = 10h).
by aandrejevic＠svn.reactos.org 03 Nov '13

03 Nov '13

Author: aandrejevic Date: Sun Nov 3 03:22:36 2013 New Revision: 60842 URL: http://svn.reactos.org/svn/reactos?rev=60842&view=rev Log: [NTVDM] Halfplement the BIOS palette control command (INT 10h, AH = 10h). 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] Sun Nov 3 03:22:36 2013 @@ -914,6 +914,134 @@ break; } + /* Palette Control */ + case 0x10: + { + switch (getAL()) + { + /* Set Single Palette Register */ + case 0x00: + { + /* Reset the flip-flop */ + VgaReadPort(VGA_STAT_COLOR); + + /* Write the index */ + VgaWritePort(VGA_AC_INDEX, getBL()); + + /* Write the data */ + VgaWritePort(VGA_AC_WRITE, getBH()); + + break; + } + + /* Set Overscan Color */ + case 0x01: + { + /* Reset the flip-flop */ + VgaReadPort(VGA_STAT_COLOR); + + /* Write the index */ + VgaWritePort(VGA_AC_INDEX, VGA_AC_OVERSCAN_REG); + + /* Write the data */ + VgaWritePort(VGA_AC_WRITE, getBH()); + + break; + } + + /* Set All Palette Registers */ + case 0x02: + { + INT i; + LPBYTE Buffer = SEG_OFF_TO_PTR(getES(), getDX()); + + /* 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 */ + VgaWritePort(VGA_AC_INDEX, i); + + /* Write the data */ + VgaWritePort(VGA_AC_WRITE, Buffer[i]); + } + + /* Set the overscan register */ + VgaWritePort(VGA_AC_INDEX, VGA_AC_OVERSCAN_REG); + VgaWritePort(VGA_AC_WRITE, Buffer[VGA_AC_PAL_F_REG + 1]); + + break; + } + + /* Get Single Palette Register */ + case 0x07: + { + /* Reset the flip-flop */ + VgaReadPort(VGA_STAT_COLOR); + + /* Write the index */ + VgaWritePort(VGA_AC_INDEX, getBL()); + + /* Read the data */ + setBH(VgaReadPort(VGA_AC_READ)); + + break; + } + + /* Get Overscan Color */ + case 0x08: + { + /* Reset the flip-flop */ + VgaReadPort(VGA_STAT_COLOR); + + /* Write the index */ + VgaWritePort(VGA_AC_INDEX, VGA_AC_OVERSCAN_REG); + + /* Read the data */ + setBH(VgaReadPort(VGA_AC_READ)); + + break; + } + + /* Get All Palette Registers */ + case 0x09: + { + INT i; + LPBYTE Buffer = SEG_OFF_TO_PTR(getES(), getDX()); + + /* 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 */ + VgaWritePort(VGA_AC_INDEX, i); + + /* Read the data */ + Buffer[i] = VgaReadPort(VGA_AC_READ); + } + + /* Get the overscan register */ + VgaWritePort(VGA_AC_INDEX, VGA_AC_OVERSCAN_REG); + Buffer[VGA_AC_PAL_F_REG + 1] = VgaReadPort(VGA_AC_READ); + + break; + } + + default: + { + DPRINT1("BIOS Palette Control Sub-command AL = 0x%02X NOT IMPLEMENTED\n", + getAL()); + break; + } + } + + break; + } + /* Scroll Window */ case 0x12: {

1 0

[aandrejevic] 60841: [FAST486] The RCL, RCR, ROL and ROR instructions do not update SF, ZF or PF.
by aandrejevic＠svn.reactos.org 03 Nov '13

03 Nov '13

Author: aandrejevic Date: Sun Nov 3 01:05:40 2013 New Revision: 60841 URL: http://svn.reactos.org/svn/reactos?rev=60841&view=rev Log: [FAST486] The RCL, RCR, ROL and ROR instructions do not update SF, ZF or PF. Modified: branches/ntvdm/lib/fast486/opgroups.c Modified: branches/ntvdm/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] Sun Nov 3 01:05:40 2013 @@ -278,10 +278,13 @@ } } - /* Update ZF, SF and PF */ - State->Flags.Zf = (Result == 0) ? TRUE : FALSE; - State->Flags.Sf = (Result & HighestBit) ? TRUE : FALSE; - State->Flags.Pf = Fast486CalculateParity(Result); + if (Operation >= 4) + { + /* Update ZF, SF and PF */ + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & HighestBit) ? TRUE : FALSE; + State->Flags.Pf = Fast486CalculateParity(Result); + } /* Return the result */ return Result;

1 0

[fireball] 60840: Create a new branch for my experimental pet project. The branch will be organized the same way as the arwinss branch - as a diff to trunk plus its own files, so no copying from tr...
by fireball＠svn.reactos.org 02 Nov '13

02 Nov '13

Author: fireball Date: Sat Nov 2 22:54:54 2013 New Revision: 60840 URL: http://svn.reactos.org/svn/reactos?rev=60840&view=rev Log: Create a new branch for my experimental pet project. The branch will be organized the same way as the arwinss branch - as a diff to trunk plus its own files, so no copying from trunk is involved. Added: branches/monstera/ (with props) Propchange: branches/monstera/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Nov 2 22:54:54 2013 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/monstera/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/monstera/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2013