Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 59377: [CMD] Fix some whitespace and misspellings (part 1/x)
by hbelusca＠svn.reactos.org 29 Jun '13

29 Jun '13

Author: hbelusca Date: Sat Jun 29 23:18:27 2013 New Revision: 59377 URL: http://svn.reactos.org/svn/reactos?rev=59377&view=rev Log: [CMD] Fix some whitespace and misspellings (part 1/x) Modified: trunk/reactos/base/shell/cmd/cmd.rc trunk/reactos/base/shell/cmd/readme.txt trunk/reactos/base/shell/cmd/ren.txt trunk/reactos/base/shell/cmd/todo.txt Modified: trunk/reactos/base/shell/cmd/cmd.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.rc?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.rc [iso-8859-1] Sat Jun 29 23:18:27 2013 @@ -3,28 +3,28 @@ #include "resource.h" #include "cmdver.h" -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Command Processor\0" -#define REACTOS_STR_INTERNAL_NAME "cmd\0" -#define REACTOS_STR_ORIGINAL_FILENAME "cmd.exe\0" -#define REACTOS_STR_ORIGINAL_COPYRIGHT "Copyright (C) 1994-1998 Tim Norman and others\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Command Processor\0" +#define REACTOS_STR_INTERNAL_NAME "cmd\0" +#define REACTOS_STR_ORIGINAL_FILENAME "cmd.exe\0" +#define REACTOS_STR_ORIGINAL_COPYRIGHT "Copyright (C) 1994-1998 Tim Norman and others\0" #define REACTOS_STR_LEGAL_COPYRIGHT "Copyright (C) 1998-2006 Eric Kohl and others\0" #include <reactos/version.rc> STRINGTABLE DISCARDABLE BEGIN - STRING_FREEDOS_DEV, " Tim Norman Matt Rains\n\ - Evan Jeffrey Steffen Kaiser\n\ - Svante Frey Oliver Mueller\n\ - Aaron Kaufman Marc Desrochers\n\ - Rob Lake John P Price\n\ - Hans B Pufal\n" + STRING_FREEDOS_DEV, " Tim Norman Matt Rains\n\ + Evan Jeffrey Steffen Kaiser\n\ + Svante Frey Oliver Mueller\n\ + Aaron Kaufman Marc Desrochers\n\ + Rob Lake John P Price\n\ + Hans B Pufal\n" - STRING_REACTOS_DEV, " Eric Kohl Emanuele Aliberti\n\ - Paolo Pantaleo Phillip Susi\n\ - Sylvain Petreolle\n" + STRING_REACTOS_DEV, " Eric Kohl Emanuele Aliberti\n\ + Paolo Pantaleo Phillip Susi\n\ + Sylvain Petreolle\n" END -1 ICON DISCARDABLE res/terminal.ico +1 ICON DISCARDABLE res/terminal.ico #include "rsrc.rc" Modified: trunk/reactos/base/shell/cmd/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/readme.txt?… ============================================================================== --- trunk/reactos/base/shell/cmd/readme.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/readme.txt [iso-8859-1] Sat Jun 29 23:18:27 2013 @@ -47,9 +47,7 @@ Brandon Turner <turnerb7(a)msu.edu> - Bugs ~~~~ -There is still many bugs ;) +There are still many bugs ;) Please report bugs to ReactOS team <ros-dev(a)reactos.org> or to JIRA at www.reactos.org - Modified: trunk/reactos/base/shell/cmd/ren.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/ren.txt?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/ren.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/ren.txt [iso-8859-1] Sat Jun 29 23:18:27 2013 @@ -47,16 +47,16 @@ 2)If srcPattern contains "\" then: - -we activate bPath, since srcPattern has a path inside of it. - -we explit the srcPattern to srcFile and srcPath. - -Now we check the dstPattern ¿does it contain a Path?: - -If does: we divide it in dstPath and dstFile.AND ALSO CHECK THAT dstPath and srcPath it´s the same(see syntax error).If they aren the same we launch an error. - -If doesnt then we copy srcPath to dstPath(see #way2) and also saving dstPattern as dstFile. + -we activate bPath, since srcPattern has a path inside of it. + -we explit the srcPattern to srcFile and srcPath. + -Now we check the dstPattern ¿does it contain a Path?: + -If does: we divide it in dstPath and dstFile.AND ALSO CHECK THAT dstPath and srcPath it´s the same(see syntax error).If they aren the same we launch an error. + -If doesnt then we copy srcPath to dstPath(see #way2) and also saving dstPattern as dstFile. 3)If srcPattern doesnt contain "\" then: - -srcPattern is copied in srcFile(we dont need a previous split,because it´s just a name) - -Now we check the dstPattern ¿does it contains a Path? - -If does: we launch an error (see syntax error 2) - -If doesnt: we copy dstPattern to dstFile(we dont need a previous split because it´s just a name) + -srcPattern is copied in srcFile(we dont need a previous split,because it´s just a name) + -Now we check the dstPattern ¿does it contains a Path? + -If does: we launch an error (see syntax error 2) + -If doesnt: we copy dstPattern to dstFile(we dont need a previous split because it´s just a name) 4)Now we are entering in the do...while: @@ -74,11 +74,11 @@ 5)Now we have to check our Boolean. bPath==TRUE means that Source Argument was a Path so now we have to Join again the Path with the Name File: - -srcFINAL: srcPath+f.cFileName - -dstFINAL: dstPath+dstFile + -srcFINAL: srcPath+f.cFileName + -dstFINAL: dstPath+dstFile bPath==False then Souce wasn a Path an we dont need to join anything. - -srcFINAL:f.cFileName - -dstFINAL:dstFile + -srcFINAL:f.cFileName + -dstFINAL:dstFile At last we just make a MoveFile(srcFinal, dstFinal)): Modified: trunk/reactos/base/shell/cmd/todo.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/todo.txt?re… ============================================================================== --- trunk/reactos/base/shell/cmd/todo.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/todo.txt [iso-8859-1] Sat Jun 29 23:18:27 2013 @@ -1,21 +1,21 @@ Things to do ~~~~~~~~~~~~ -*Implmenet Set /P -This is pretty straight forward. When doing this make sure to take into account the way MS handles "set /A /P foo=5" compared to "set /P /A foo=5". +*Implement Set /P +This is pretty straightforward. When doing this, make sure to take into account the way MS handles "set /A /P foo=5" compared to "set /P /A foo=5". *Compile as unicode -Not sure what is wrong with it, put probably more then just one thing blocking this. For sure pipes break when it is compiled as unicode. +Not sure what is wrong with it, but probably more than just one thing blocking this. For sure pipes break when it is compiled as unicode. *Move.c code clean up -It works, but it needs to be cleaned up, the code is long and overly complex for what it needs to do. Also, we can remove the hack to cover for MoveFileEx bug as it isn't a bug anymore. +It works, but it needs to be cleaned up, the code is long and overly complex for what it needs to do. Also, we can remove the hack to cover for MoveFileEx bug as it isn't a bug anymore. *If rewrite -It works decent but looks _awful_. Very hard to maintain and/or understand what the hell is going on. +It works decent but looks _awful_. Very hard to maintain and/or understand what the hell is going on. *Remove Hardcoded buffers -This is mostly done thanks to Greatlord(cmd.c is the hardest spot that is left). ANytime when you are handling a string that is taken from the commandline there should be no limit to the size. +This is mostly done thanks to Greatlord (cmd.c is the hardest spot that is left). Anytime when you are handling a string that is taken from the commandline there should be no limit to the size. -*Implment & and && +*Implement & and && & runs two commands no matter what. && runs the 2nd command only if the first was a success Not sure where to put this code even

1 0

[hbelusca] 59376: [DDK:NTIFS] Correct some definitions (checked against official DDK). Fix also FSCTL_SET_SPARSE. CORE-7333 #resolve #comment Fixed in revision r59376, thanks.
by hbelusca＠svn.reactos.org 29 Jun '13

29 Jun '13

Author: hbelusca Date: Sat Jun 29 23:01:28 2013 New Revision: 59376 URL: http://svn.reactos.org/svn/reactos?rev=59376&view=rev Log: [DDK:NTIFS] Correct some definitions (checked against official DDK). Fix also FSCTL_SET_SPARSE. CORE-7333 #resolve #comment Fixed in revision r59376, thanks. Modified: trunk/reactos/include/ddk/ntifs.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=59… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Sat Jun 29 23:01:28 2013 @@ -3557,25 +3557,25 @@ #if (_WIN32_WINNT >= 0x0500) #define FSCTL_FIND_FILES_BY_SID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 35, METHOD_NEITHER, FILE_ANY_ACCESS) -#define FSCTL_SET_OBJECT_ID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 38, METHOD_BUFFERED, FILE_WRITE_DATA) +#define FSCTL_SET_OBJECT_ID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 38, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) #define FSCTL_GET_OBJECT_ID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 39, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define FSCTL_DELETE_OBJECT_ID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 40, METHOD_BUFFERED, FILE_WRITE_DATA) -#define FSCTL_SET_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 41, METHOD_BUFFERED, FILE_WRITE_DATA) +#define FSCTL_DELETE_OBJECT_ID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 40, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) +#define FSCTL_SET_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 41, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) #define FSCTL_GET_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 42, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define FSCTL_DELETE_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 43, METHOD_BUFFERED, FILE_WRITE_DATA) +#define FSCTL_DELETE_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 43, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) #define FSCTL_ENUM_USN_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 44, METHOD_NEITHER, FILE_READ_DATA) #define FSCTL_SECURITY_ID_CHECK CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 45, METHOD_NEITHER, FILE_READ_DATA) #define FSCTL_READ_USN_JOURNAL CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 46, METHOD_NEITHER, FILE_READ_DATA) -#define FSCTL_SET_OBJECT_ID_EXTENDED CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 47, METHOD_BUFFERED, FILE_WRITE_DATA) +#define FSCTL_SET_OBJECT_ID_EXTENDED CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 47, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) #define FSCTL_CREATE_OR_GET_OBJECT_ID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 48, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define FSCTL_SET_SPARSE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 49, METHOD_BUFFERED, FILE_WRITE_DATA) +#define FSCTL_SET_SPARSE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 49, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) #define FSCTL_SET_ZERO_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 50, METHOD_BUFFERED, FILE_WRITE_DATA) #define FSCTL_QUERY_ALLOCATED_RANGES CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 51, METHOD_NEITHER, FILE_READ_DATA) #define FSCTL_ENABLE_UPGRADE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 52, METHOD_BUFFERED, FILE_WRITE_DATA) #define FSCTL_SET_ENCRYPTION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 53, METHOD_BUFFERED, FILE_ANY_ACCESS) #define FSCTL_ENCRYPTION_FSCTL_IO CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 54, METHOD_NEITHER, FILE_ANY_ACCESS) -#define FSCTL_WRITE_RAW_ENCRYPTED CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 55, METHOD_NEITHER, FILE_ANY_ACCESS) -#define FSCTL_READ_RAW_ENCRYPTED CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 56, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_WRITE_RAW_ENCRYPTED CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 55, METHOD_NEITHER, FILE_SPECIAL_ACCESS) +#define FSCTL_READ_RAW_ENCRYPTED CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 56, METHOD_NEITHER, FILE_SPECIAL_ACCESS) #define FSCTL_CREATE_USN_JOURNAL CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 57, METHOD_NEITHER, FILE_READ_DATA) #define FSCTL_READ_FILE_USN_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 58, METHOD_NEITHER, FILE_READ_DATA) #define FSCTL_WRITE_USN_CLOSE_RECORD CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 59, METHOD_NEITHER, FILE_READ_DATA)

1 0

[akhaldi] 59375: [CMD_WINETEST] * Import from Wine 1.5.26.
by akhaldi＠svn.reactos.org 29 Jun '13

29 Jun '13

Author: akhaldi Date: Sat Jun 29 21:38:34 2013 New Revision: 59375 URL: http://svn.reactos.org/svn/reactos?rev=59375&view=rev Log: [CMD_WINETEST] * Import from Wine 1.5.26. Added: trunk/rostests/winetests/cmd/ (with props) trunk/rostests/winetests/cmd/CMakeLists.txt (with props) trunk/rostests/winetests/cmd/batch.c (with props) trunk/rostests/winetests/cmd/rsrc.rc (with props) trunk/rostests/winetests/cmd/test_builtins.cmd (with props) trunk/rostests/winetests/cmd/test_builtins.cmd.exp (with props) trunk/rostests/winetests/cmd/test_cmdline.cmd (with props) trunk/rostests/winetests/cmd/test_cmdline.cmd.exp (with props) trunk/rostests/winetests/cmd/testlist.c (with props) Modified: trunk/rostests/winetests/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… Added: trunk/rostests/winetests/cmd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cmd/CMakeLists.… Added: trunk/rostests/winetests/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cmd/batch.c?rev… Added: trunk/rostests/winetests/cmd/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cmd/rsrc.rc?rev… Added: trunk/rostests/winetests/cmd/test_builtins.cmd URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cmd/test_builti… Added: trunk/rostests/winetests/cmd/test_builtins.cmd.exp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cmd/test_builti… Added: trunk/rostests/winetests/cmd/test_cmdline.cmd URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cmd/test_cmdlin… Added: trunk/rostests/winetests/cmd/test_cmdline.cmd.exp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cmd/test_cmdlin… Added: trunk/rostests/winetests/cmd/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cmd/testlist.c?…

1 0

[aandrejevic] 59374: [NTVDM] Fix several bugs. Implement some interrupt 1Ah services in the BIOS.
by aandrejevic＠svn.reactos.org 29 Jun '13

29 Jun '13

Author: aandrejevic Date: Sat Jun 29 21:37:44 2013 New Revision: 59374 URL: http://svn.reactos.org/svn/reactos?rev=59374&view=rev Log: [NTVDM] Fix several bugs. Implement some interrupt 1Ah services in the BIOS. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/bios.h branches/ntvdm/subsystems/ntvdm/dos.c branches/ntvdm/subsystems/ntvdm/emulator.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 Jun 29 21:37:44 2013 @@ -22,6 +22,8 @@ static WORD BiosKbdBuffer[BIOS_KBD_BUFFER_SIZE]; static UINT BiosKbdBufferStart = 0, BiosKbdBufferEnd = 0; static BOOLEAN BiosKbdBufferEmpty = TRUE; +static DWORD BiosTickCount = 0; +static BOOLEAN BiosPassedMidnight = FALSE; /* PRIVATE FUNCTIONS **********************************************************/ @@ -405,6 +407,44 @@ } } +VOID BiosTimeService() +{ + DWORD Eax = EmulatorGetRegister(EMULATOR_REG_AX); + DWORD Ecx = EmulatorGetRegister(EMULATOR_REG_CX); + DWORD Edx = EmulatorGetRegister(EMULATOR_REG_DX); + + switch (HIBYTE(Eax)) + { + case 0x00: + { + /* Set AL to 1 if midnight had passed, 0 otherwise */ + Eax &= 0xFFFFFF00; + if (BiosPassedMidnight) Eax |= 1; + + /* Return the tick count in CX:DX */ + EmulatorSetRegister(EMULATOR_REG_AX, Eax); + EmulatorSetRegister(EMULATOR_REG_CX, HIWORD(BiosTickCount)); + EmulatorSetRegister(EMULATOR_REG_DX, LOWORD(BiosTickCount)); + + /* Reset the midnight flag */ + BiosPassedMidnight = FALSE; + + break; + } + + case 0x01: + { + /* Set the tick count to CX:DX */ + BiosTickCount = MAKELONG(LOWORD(Edx), LOWORD(Ecx)); + + /* Reset the midnight flag */ + BiosPassedMidnight = FALSE; + + break; + } + } +} + VOID BiosHandleIrq(BYTE IrqNumber) { switch (IrqNumber) @@ -412,6 +452,9 @@ /* PIT IRQ */ case 0: { + /* Increase the system tick count */ + BiosTickCount++; + /* Perform the system timer interrupt */ EmulatorInterrupt(0x1C); Modified: branches/ntvdm/subsystems/ntvdm/bios.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.h?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] Sat Jun 29 21:37:44 2013 @@ -22,8 +22,9 @@ #define BIOS_PIC_MASTER_INT 0x08 #define BIOS_PIC_SLAVE_INT 0x70 #define BIOS_SEGMENT 0xF000 -#define VIDEO_BIOS_INTERRUPT 0x10 -#define VIDEO_KBD_INTERRUPT 0x16 +#define BIOS_VIDEO_INTERRUPT 0x10 +#define BIOS_KBD_INTERRUPT 0x16 +#define BIOS_TIME_INTERRUPT 0x1A #define CONSOLE_FONT_HEIGHT 8 #define BIOS_KBD_BUFFER_SIZE 256 @@ -36,6 +37,7 @@ WORD BiosGetCharacter(); VOID BiosVideoService(); VOID BiosKeyboardService(); +VOID BiosTimeService(); VOID BiosHandleIrq(BYTE IrqNumber); #endif Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Sat Jun 29 21:37:44 2013 @@ -311,14 +311,7 @@ /* Initialize the handle table */ for (i = 0; i < 20; i++) PspBlock->HandleTable[i] = 0xFF; - /* Did we get an environment segment? */ - if (!Environment) - { - /* No, copy the one from the parent */ - Environment = DosCopyEnvironmentBlock((CurrentPsp != SYSTEM_PSP) - ? SEGMENT_TO_PSP(CurrentPsp)->EnvBlock - : SYSTEM_ENV_BLOCK); - } + PspBlock->EnvBlock = Environment; @@ -342,13 +335,13 @@ BOOLEAN DosCreateProcess(LPCSTR CommandLine, WORD EnvBlock) { - BOOLEAN Success = FALSE; + BOOLEAN Success = FALSE, AllocatedEnvBlock = FALSE; HANDLE FileHandle = INVALID_HANDLE_VALUE, FileMapping = NULL; LPBYTE Address = NULL; LPSTR ProgramFilePath, Parameters[128]; CHAR CommandLineCopy[128]; INT ParamCount = 0; - WORD i, Segment, FileSize, ExeSize; + WORD i, Segment = 0, FileSize, ExeSize; PIMAGE_DOS_HEADER Header; PDWORD RelocationTable; PWORD RelocWord; @@ -392,6 +385,18 @@ Address = (LPBYTE)MapViewOfFile(FileMapping, FILE_MAP_READ, 0, 0, 0); if (Address == NULL) goto Cleanup; + /* Did we get an environment segment? */ + if (!EnvBlock) + { + /* Set a flag to know if the environment block was allocated here */ + AllocatedEnvBlock = TRUE; + + /* No, copy the one from the parent */ + EnvBlock = DosCopyEnvironmentBlock((CurrentPsp != SYSTEM_PSP) + ? SEGMENT_TO_PSP(CurrentPsp)->EnvBlock + : SYSTEM_ENV_BLOCK); + } + /* Check if this is an EXE file or a COM file */ if (Address[0] == 'M' && Address[1] == 'Z') { @@ -423,6 +428,7 @@ /* The process owns its own memory */ DosChangeMemoryOwner(Segment, Segment); + DosChangeMemoryOwner(EnvBlock, Segment); /* Copy the program to Segment:0100 */ RtlCopyMemory((PVOID)((ULONG_PTR)BaseAddress @@ -456,7 +462,8 @@ /* Execute */ CurrentPsp = Segment; DiskTransferArea = MAKELONG(0x80, Segment); - EmulatorExecute(Segment + Header->e_cs, sizeof(DOS_PSP) + Header->e_ip); + EmulatorExecute(Segment + Header->e_cs + (sizeof(DOS_PSP) >> 4), + Header->e_ip); Success = TRUE; } @@ -496,6 +503,13 @@ } Cleanup: + if (!Success) + { + /* It was not successful, cleanup the DOS memory */ + if (AllocatedEnvBlock) DosFreeMemory(EnvBlock); + if (Segment) DosFreeMemory(Segment); + } + /* Unmap the file*/ if (Address != NULL) UnmapViewOfFile(Address); Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Sat Jun 29 21:37:44 2013 @@ -199,27 +199,35 @@ { /* It was an IRQ from the master PIC */ BiosHandleIrq(IntNum - BIOS_PIC_MASTER_INT); + return; } else if (IntNum >= BIOS_PIC_SLAVE_INT && IntNum < BIOS_PIC_SLAVE_INT + 8) { /* It was an IRQ from the slave PIC */ BiosHandleIrq(IntNum - BIOS_PIC_SLAVE_INT + 8); + return; } switch (IntNum) { - case VIDEO_BIOS_INTERRUPT: + case BIOS_VIDEO_INTERRUPT: { /* This is the video BIOS interrupt, call the BIOS */ BiosVideoService(); break; } - case VIDEO_KBD_INTERRUPT: + case BIOS_KBD_INTERRUPT: { /* This is the keyboard BIOS interrupt, call the BIOS */ BiosKeyboardService(); break; } + case BIOS_TIME_INTERRUPT: + { + /* This is the time BIOS interrupt, call the BIOS */ + BiosTimeService(); + break; + } case 0x20: { DosInt20h(CodeSegment); @@ -233,6 +241,11 @@ case 0x23: { DosBreakInterrupt(); + break; + } + default: + { + DPRINT1("Unhandled interrupt: 0x%02X\n", IntNum); break; } }

1 0

[hbelusca] 59373: [FREELDR] Fix extended and control characters handling in text-boxes. We don't show anymore strange characters when pressing on, e.g. up or down arrows anymore. Also, fix uppercas...
by hbelusca＠svn.reactos.org 29 Jun '13

29 Jun '13

Author: hbelusca Date: Sat Jun 29 20:22:36 2013 New Revision: 59373 URL: http://svn.reactos.org/svn/reactos?rev=59373&view=rev Log: [FREELDR] Fix extended and control characters handling in text-boxes. We don't show anymore strange characters when pressing on, e.g. up or down arrows anymore. Also, fix uppercase 'o' character (which has the same scan code but is not an extended key, as the End key). The culprit revision which introduced this bug is r58658. CORE-7323 #resolve #comment The uppercase 'o' problem is fixed in revision r59373. Thanks for your report :) Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/tu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/tui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/tui.c [iso-8859-1] Sat Jun 29 20:22:36 2013 @@ -952,29 +952,29 @@ MachBeep(); } } - else if (key == KEY_HOME) // Go to the start of the buffer + else if (Extended && key == KEY_HOME) // Go to the start of the buffer { EditBoxTextPosition = 0; } - else if (key == KEY_END) // Go to the end of the buffer + else if (Extended && key == KEY_END) // Go to the end of the buffer { EditBoxTextPosition = EditBoxTextLength; } - else if (key == KEY_RIGHT) // Go right + else if (Extended && key == KEY_RIGHT) // Go right { if (EditBoxTextPosition < EditBoxTextLength) EditBoxTextPosition++; else MachBeep(); } - else if (key == KEY_LEFT) // Go left + else if (Extended && key == KEY_LEFT) // Go left { if (EditBoxTextPosition > 0) EditBoxTextPosition--; else MachBeep(); } - else // Add this key to the buffer + else if (!Extended) // Add this key to the buffer { if ( (EditBoxTextLength < Length - 1) && (EditBoxTextPosition < Length - 1) ) @@ -991,6 +991,10 @@ { MachBeep(); } + } + else + { + MachBeep(); } }

1 0

[ekohl] 59372: [MSPORTS] - Add the port settings page for parallel ports. - Implement ParallelPortPropPageProvider.
by ekohl＠svn.reactos.org 29 Jun '13

29 Jun '13

Author: ekohl Date: Sat Jun 29 19:25:31 2013 New Revision: 59372 URL: http://svn.reactos.org/svn/reactos?rev=59372&view=rev Log: [MSPORTS] - Add the port settings page for parallel ports. - Implement ParallelPortPropPageProvider. Added: trunk/reactos/dll/win32/msports/parallel.c (with props) Modified: trunk/reactos/dll/win32/msports/CMakeLists.txt trunk/reactos/dll/win32/msports/lang/bg-BG.rc trunk/reactos/dll/win32/msports/lang/de-DE.rc trunk/reactos/dll/win32/msports/lang/en-US.rc trunk/reactos/dll/win32/msports/lang/he-IL.rc trunk/reactos/dll/win32/msports/lang/pl-PL.rc trunk/reactos/dll/win32/msports/lang/ro-RO.rc trunk/reactos/dll/win32/msports/lang/uk-UA.rc trunk/reactos/dll/win32/msports/msports.spec trunk/reactos/dll/win32/msports/resource.h Modified: trunk/reactos/dll/win32/msports/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/msports/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/CMakeLists.txt [iso-8859-1] Sat Jun 29 19:25:31 2013 @@ -6,6 +6,7 @@ classinst.c comdb.c msports.c + parallel.c serial.c msports.rc ${CMAKE_CURRENT_BINARY_DIR}/msports_stubs.c Modified: trunk/reactos/dll/win32/msports/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/msports/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/lang/bg-BG.rc [iso-8859-1] Sat Jun 29 19:25:31 2013 @@ -22,3 +22,12 @@ PUSHBUTTON "Ð Ð°Ð·&ÑÐ¸ÑÐµÐ½Ð¸...",IDC_SERIAL_ADVANCED, 111, 130, 65, 14,WS_GROUP PUSHBUTTON "&ÐÑÑÑÐ°Ð½Ðµ Ð½Ð° Ð¿Ð¾Ð´&ÑÐ°Ð·Ð±Ð¸ÑÐ°Ð½Ð¸ÑÐµ",IDC_SERIAL_RESTORE, 180, 130, 65, 14, WS_GROUP END + + +IDD_PARALLELSETTINGS DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð½Ð° Ð¸Ð·Ð»Ð°Ð·Ð° (Ð¿Ð¾ÑÑÐ°)" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "TEST", -1, 74, 19, 62, 8, WS_GROUP +END Modified: trunk/reactos/dll/win32/msports/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/msports/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/lang/de-DE.rc [iso-8859-1] Sat Jun 29 19:25:31 2013 @@ -1,4 +1,4 @@ - +ï»¿ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_SERIALSETTINGS DIALOGEX DISCARDABLE 0, 0, 252, 218 @@ -19,3 +19,12 @@ PUSHBUTTON "&Erweitert...",IDC_SERIAL_ADVANCED, 111, 130, 65, 14,WS_GROUP PUSHBUTTON "Wieder&herstellen",IDC_SERIAL_RESTORE, 180, 130, 65, 14, WS_GROUP END + + +IDD_PARALLELSETTINGS DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Port Einstellungen" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "TEST", -1, 74, 19, 62, 8, WS_GROUP +END Modified: trunk/reactos/dll/win32/msports/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/msports/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/lang/en-US.rc [iso-8859-1] Sat Jun 29 19:25:31 2013 @@ -19,3 +19,12 @@ PUSHBUTTON "&Advanced...",IDC_SERIAL_ADVANCED, 111, 130, 65, 14,WS_GROUP PUSHBUTTON "&Restore Defaults",IDC_SERIAL_RESTORE, 180, 130, 65, 14, WS_GROUP END + + +IDD_PARALLELSETTINGS DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Port Settings" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "TEST", -1, 74, 19, 62, 8, WS_GROUP +END Modified: trunk/reactos/dll/win32/msports/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/lang/he-… ============================================================================== --- trunk/reactos/dll/win32/msports/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/lang/he-IL.rc [iso-8859-1] Sat Jun 29 19:25:31 2013 @@ -19,3 +19,12 @@ PUSHBUTTON "××ª×§××...",IDC_SERIAL_ADVANCED, 111, 130, 65, 14,WS_GROUP PUSHBUTTON "×©×××¨ ××¨××¨×ª ××××",IDC_SERIAL_RESTORE, 180, 130, 65, 14, WS_GROUP END + + +IDD_PARALLELSETTINGS DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "××××¨××ª ××¦×××" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "TEST", -1, 74, 19, 62, 8, WS_GROUP +END Modified: trunk/reactos/dll/win32/msports/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/msports/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/lang/pl-PL.rc [iso-8859-1] Sat Jun 29 19:25:31 2013 @@ -26,3 +26,12 @@ PUSHBUTTON "&Zaawansowane...",IDC_SERIAL_ADVANCED, 111, 130, 65, 14,WS_GROUP PUSHBUTTON "P&rzywrÃ³Ä domyÅlne",IDC_SERIAL_RESTORE, 180, 130, 65, 14, WS_GROUP END + + +IDD_PARALLELSETTINGS DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ustawienia portu" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "TEST", -1, 74, 19, 62, 8, WS_GROUP +END Modified: trunk/reactos/dll/win32/msports/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/msports/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/lang/ro-RO.rc [iso-8859-1] Sat Jun 29 19:25:31 2013 @@ -25,3 +25,12 @@ PUSHBUTTON "A&vansateâ¦", IDC_SERIAL_ADVANCED, 111, 130, 65, 14,WS_GROUP PUSHBUTTON "Valori i&mplicite", IDC_SERIAL_RESTORE, 180, 130, 65, 14, WS_GROUP END + + +IDD_PARALLELSETTINGS DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ConfiguraÈia portului" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "TEST", -1, 74, 19, 62, 8, WS_GROUP +END Modified: trunk/reactos/dll/win32/msports/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/msports/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/lang/uk-UA.rc [iso-8859-1] Sat Jun 29 19:25:31 2013 @@ -26,3 +26,12 @@ PUSHBUTTON "&Ð Ð¾Ð·ÑÐ¸ÑÐµÐ½Ñ...",IDC_SERIAL_ADVANCED, 111, 130, 65, 14,WS_GROUP PUSHBUTTON "&ÐÐ° Ð·Ð°Ð¼Ð¾Ð²ÑÑÐ²Ð°Ð½Ð½ÑÐ¼",IDC_SERIAL_RESTORE, 180, 130, 65, 14, WS_GROUP END + + +IDD_PARALLELSETTINGS DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÐÐ°ÑÐ°Ð¼ÐµÑÑÐ¸ Ð¿Ð¾ÑÑÑ" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "TEST", -1, 74, 19, 62, 8, WS_GROUP +END Modified: trunk/reactos/dll/win32/msports/msports.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/msports.… ============================================================================== --- trunk/reactos/dll/win32/msports/msports.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/msports.spec [iso-8859-1] Sat Jun 29 19:25:31 2013 @@ -6,7 +6,7 @@ @ stdcall ComDBReleasePort(ptr long) @ stdcall ComDBResizeDatabase(ptr long) @ stdcall LibMain(ptr long ptr) DllMain -@ stub ParallelPortPropPageProvider +@ stdcall ParallelPortPropPageProvider(ptr ptr long) @ stdcall PortsClassInstaller(long ptr ptr) @ stub SerialDisplayAdvancedSettings @ stdcall SerialPortPropPageProvider(ptr ptr long) Added: trunk/reactos/dll/win32/msports/parallel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/parallel… ============================================================================== --- trunk/reactos/dll/win32/msports/parallel.c (added) +++ trunk/reactos/dll/win32/msports/parallel.c [iso-8859-1] Sat Jun 29 19:25:31 2013 @@ -0,0 +1,89 @@ +/* + * PROJECT: Ports installer library + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll\win32\msports\parallel.c + * PURPOSE: Parallel Port property functions + * COPYRIGHT: Copyright 2013 Eric Kohl + */ + +#include "precomp.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msports); + + +static +BOOL +OnInitDialog(HWND hwnd, + WPARAM wParam, + LPARAM lParam) +{ + TRACE("Port_OnInit()\n"); + return TRUE; +} + + +static +INT_PTR +CALLBACK +ParallelSettingsDlgProc(HWND hwnd, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + TRACE("ParallelSettingsDlgProc()\n"); + + switch (uMsg) + { + case WM_INITDIALOG: + return OnInitDialog(hwnd, wParam, lParam); + } + + return FALSE; +} + + +BOOL +WINAPI +ParallelPortPropPageProvider(PSP_PROPSHEETPAGE_REQUEST lpPropSheetPageRequest, + LPFNADDPROPSHEETPAGE lpfnAddPropSheetPageProc, + LPARAM lParam) +{ + PROPSHEETPAGEW PropSheetPage; + HPROPSHEETPAGE hPropSheetPage; + + TRACE("ParallelPortPropPageProvider(%p %p %lx)\n", + lpPropSheetPageRequest, lpfnAddPropSheetPageProc, lParam); + + if (lpPropSheetPageRequest->PageRequested == SPPSR_ENUM_ADV_DEVICE_PROPERTIES) + { + TRACE("SPPSR_ENUM_ADV_DEVICE_PROPERTIES\n"); + + PropSheetPage.dwSize = sizeof(PROPSHEETPAGEW); + PropSheetPage.dwFlags = 0; + PropSheetPage.hInstance = hInstance; + PropSheetPage.pszTemplate = MAKEINTRESOURCE(IDD_PARALLELSETTINGS); + PropSheetPage.pfnDlgProc = ParallelSettingsDlgProc; + PropSheetPage.lParam = 0; + PropSheetPage.pfnCallback = NULL; + + hPropSheetPage = CreatePropertySheetPageW(&PropSheetPage); + if (hPropSheetPage == NULL) + { + TRACE("CreatePropertySheetPageW() failed!\n"); + return FALSE; + } + + if (!(*lpfnAddPropSheetPageProc)(hPropSheetPage, lParam)) + { + TRACE("lpfnAddPropSheetPageProc() failed!\n"); + DestroyPropertySheetPage(hPropSheetPage); + return FALSE; + } + } + + TRACE("Done!\n"); + + return TRUE; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/msports/parallel.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msports/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/resource… ============================================================================== --- trunk/reactos/dll/win32/msports/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/resource.h [iso-8859-1] Sat Jun 29 19:25:31 2013 @@ -8,3 +8,5 @@ #define IDC_SERIAL_FLOWCONTROL 205 #define IDC_SERIAL_ADVANCED 206 #define IDC_SERIAL_RESTORE 207 + +#define IDD_PARALLELSETTINGS 220

1 0

[hbelusca] 59371: [REGEDIT] Fix tree-view's image-list handle leakage when application quits. Loosely based on a patch by Edijs Kolesnicovičs and Grégory Macário Harbs NOTE: Always cleanup / destro...
by hbelusca＠svn.reactos.org 29 Jun '13

29 Jun '13

Author: hbelusca Date: Sat Jun 29 19:22:00 2013 New Revision: 59371 URL: http://svn.reactos.org/svn/reactos?rev=59371&view=rev Log: [REGEDIT] Fix tree-view's image-list handle leakage when application quits. Loosely based on a patch by Edijs Kolesnicovičs and Grégory Macário Harbs NOTE: Always cleanup / destroy (or, try to) things in the reverse way they are created / initialized (i.e. in a symmetrical way). Therefore, destry the associated tree-view's image-list in the DestroyTreeView function, which is the opposite of CreateTreeView (which calls InitTreeViewImageLists). The same mechanism is already used by the list-view. For completeness, add a parameter to the DestroyTreeView function (a handle to a tree-view) so that we can pass to it the global tree-view's handle (see what's done in WM_DESTROY message handling in ChildWndProc). CORE-6856 #resolve #comment Should be fixed in revision r59371. See the commit log for more details. Thanks :) Modified: trunk/reactos/base/applications/regedit/childwnd.c trunk/reactos/base/applications/regedit/main.h trunk/reactos/base/applications/regedit/treeview.c Modified: trunk/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] Sat Jun 29 19:22:00 2013 @@ -439,8 +439,8 @@ } goto def; case WM_DESTROY: - DestroyTreeView(); DestroyListView(g_pChildWnd->hListWnd); + DestroyTreeView(g_pChildWnd->hTreeWnd); DestroyMainMenu(); HeapFree(GetProcessHeap(), 0, g_pChildWnd); g_pChildWnd = NULL; Modified: trunk/reactos/base/applications/regedit/main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/main.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/main.h [iso-8859-1] Sat Jun 29 19:22:00 2013 @@ -129,9 +129,9 @@ extern HWND StartKeyRename(HWND hwndTV); extern BOOL CreateNewKey(HWND hwndTV, HTREEITEM hItem); extern BOOL SelectNode(HWND hwndTV, LPCWSTR keyPath); -extern void DestroyTreeView( void ); -extern void DestroyListView( HWND hwndLV ); -extern void DestroyMainMenu( void ); +extern void DestroyTreeView(HWND hwndTV); +extern void DestroyListView(HWND hwndLV); +extern void DestroyMainMenu(void); /* edit.c */ extern BOOL ModifyValue(HWND hwnd, HKEY hKey, LPCWSTR valueName, BOOL EditBin); Modified: trunk/reactos/base/applications/regedit/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/treeview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/treeview.c [iso-8859-1] Sat Jun 29 19:22:00 2013 @@ -651,10 +651,15 @@ return hwndTV; } -void DestroyTreeView() -{ - if (pathBuffer) - HeapFree(GetProcessHeap(), 0, pathBuffer); +void DestroyTreeView(HWND hwndTV) +{ + HIMAGELIST himl; + + if (pathBuffer) HeapFree(GetProcessHeap(), 0, pathBuffer); + + /* Destroy the image list associated with the tree view control */ + himl = TreeView_GetImageList(hwndTV, TVSIL_NORMAL); + if (himl) ImageList_Destroy(himl); } BOOL SelectNode(HWND hwndTV, LPCWSTR keyPath)

1 0

[hbelusca] 59370: [REGEDIT] Code formatting only.
by hbelusca＠svn.reactos.org 29 Jun '13

29 Jun '13

Author: hbelusca Date: Sat Jun 29 19:05:15 2013 New Revision: 59370 URL: http://svn.reactos.org/svn/reactos?rev=59370&view=rev Log: [REGEDIT] Code formatting only. Modified: trunk/reactos/base/applications/regedit/settings.c Modified: trunk/reactos/base/applications/regedit/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/settings.c [iso-8859-1] Sat Jun 29 19:05:15 2013 @@ -149,7 +149,7 @@ /* Get program window settings */ tConfig.tPlacement.length = sizeof(WINDOWPLACEMENT); - GetWindowPlacement(hFrameWnd , &tConfig.tPlacement); + GetWindowPlacement(hFrameWnd, &tConfig.tPlacement); /* Save all the data */ RegSetValueExW(hKey, L"View", 0, REG_BINARY, (LPBYTE)&tConfig, iBufferSize);

1 0

[ekohl] 59369: [LSALIB] - Implement LsaConnectUntrusted. - Remove dead code. - LsaRegisterLogonProcess: Fix ConnectInfo.Status check.
by ekohl＠svn.reactos.org 29 Jun '13

29 Jun '13

Author: ekohl Date: Sat Jun 29 18:45:45 2013 New Revision: 59369 URL: http://svn.reactos.org/svn/reactos?rev=59369&view=rev Log: [LSALIB] - Implement LsaConnectUntrusted. - Remove dead code. - LsaRegisterLogonProcess: Fix ConnectInfo.Status check. Modified: trunk/reactos/lib/lsalib/lsa.c Modified: trunk/reactos/lib/lsalib/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/lsalib/lsa.c?rev=59369… ============================================================================== --- trunk/reactos/lib/lsalib/lsa.c [iso-8859-1] (original) +++ trunk/reactos/lib/lsalib/lsa.c [iso-8859-1] Sat Jun 29 18:45:45 2013 @@ -66,13 +66,50 @@ /* - * @unimplemented + * @implemented */ NTSTATUS WINAPI LsaConnectUntrusted(PHANDLE LsaHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNICODE_STRING PortName; // = RTL_CONSTANT_STRING(L"\\LsaAuthenticationPort"); + SECURITY_QUALITY_OF_SERVICE SecurityQos; + LSA_CONNECTION_INFO ConnectInfo; + ULONG ConnectInfoLength = sizeof(ConnectInfo); + NTSTATUS Status; + + DPRINT1("LsaConnectUntrusted(%p)\n", LsaHandle); + + RtlInitUnicodeString(&PortName, + L"\\LsaAuthenticationPort"); + + SecurityQos.Length = sizeof(SecurityQos); + SecurityQos.ImpersonationLevel = SecurityIdentification; + SecurityQos.ContextTrackingMode = SECURITY_DYNAMIC_TRACKING; + SecurityQos.EffectiveOnly = TRUE; + + RtlZeroMemory(&ConnectInfo, + ConnectInfoLength); + + Status = ZwConnectPort(LsaHandle, + &PortName, + &SecurityQos, + NULL, + NULL, + NULL, + &ConnectInfo, + &ConnectInfoLength); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwConnectPort failed (Status 0x%08lx)\n", Status); + return Status; + } + + if (!NT_SUCCESS(ConnectInfo.Status)) + { + DPRINT1("ConnectInfo.Status: 0x%08lx\n", ConnectInfo.Status); + } + + return ConnectInfo.Status; } @@ -122,56 +159,6 @@ *ProtocolStatus = ApiMessage.CallAuthenticationPackage.Reply.ProtocolStatus; return Status; - - -#if 0 - PLSASS_REQUEST Request; - PLSASS_REPLY Reply; - LSASS_REQUEST RawRequest; - LSASS_REPLY RawReply; - NTSTATUS Status; - ULONG OutBufferSize; - - Request = (PLSASS_REQUEST)&RawRequest; - Reply = (PLSASS_REPLY)&RawReply; - - Request->Header.u1.s1.DataLength = sizeof(LSASS_REQUEST) + SubmitBufferLength - - sizeof(PORT_MESSAGE); - Request->Header.u1.s1.TotalLength = - Request->Header.u1.s1.DataLength + sizeof(PORT_MESSAGE); - Request->Type = LSASS_REQUEST_CALL_AUTHENTICATION_PACKAGE; - Request->d.CallAuthenticationPackageRequest.AuthenticationPackage = - AuthenticationPackage; - Request->d.CallAuthenticationPackageRequest.InBufferLength = - SubmitBufferLength; - memcpy(Request->d.CallAuthenticationPackageRequest.InBuffer, - ProtocolSubmitBuffer, - SubmitBufferLength); - - Status = ZwRequestWaitReplyPort(LsaHandle, - &Request->Header, - &Reply->Header); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - if (!NT_SUCCESS(Reply->Status)) - { - return Reply->Status; - } - - OutBufferSize = Reply->d.CallAuthenticationPackageReply.OutBufferLength; - *ProtocolReturnBuffer = RtlAllocateHeap(Secur32Heap, - 0, - OutBufferSize); - *ReturnBufferLength = OutBufferSize; - memcpy(*ProtocolReturnBuffer, - Reply->d.CallAuthenticationPackageReply.OutBuffer, - *ReturnBufferLength); - - return Status; -#endif } @@ -297,91 +284,6 @@ *SubStatus = ApiMessage.LogonUser.Reply.SubStatus; return Status; - -#if 0 - ULONG RequestLength; - ULONG CurrentLength; - PLSASS_REQUEST Request; - LSASS_REQUEST RawMessage; - PLSASS_REPLY Reply; - LSASS_REPLY RawReply; - NTSTATUS Status; - - RequestLength = sizeof(LSASS_REQUEST) - sizeof(PORT_MESSAGE); - RequestLength = RequestLength + (OriginName->Length * sizeof(WCHAR)); - RequestLength = RequestLength + AuthenticationInformationLength; - RequestLength = RequestLength + - (LocalGroups->GroupCount * sizeof(SID_AND_ATTRIBUTES)); - - CurrentLength = 0; - Request = (PLSASS_REQUEST)&RawMessage; - - Request->d.LogonUserRequest.OriginNameLength = OriginName->Length; - Request->d.LogonUserRequest.OriginName = (PWSTR)&RawMessage + CurrentLength; - memcpy((PWSTR)&RawMessage + CurrentLength, - OriginName->Buffer, - OriginName->Length * sizeof(WCHAR)); - CurrentLength = CurrentLength + (OriginName->Length * sizeof(WCHAR)); - - Request->d.LogonUserRequest.LogonType = LogonType; - - Request->d.LogonUserRequest.AuthenticationPackage = - AuthenticationPackage; - - Request->d.LogonUserRequest.AuthenticationInformation = - (PVOID)((ULONG_PTR)&RawMessage + CurrentLength); - Request->d.LogonUserRequest.AuthenticationInformationLength = - AuthenticationInformationLength; - memcpy((PVOID)((ULONG_PTR)&RawMessage + CurrentLength), - AuthenticationInformation, - AuthenticationInformationLength); - CurrentLength = CurrentLength + AuthenticationInformationLength; - - Request->d.LogonUserRequest.LocalGroupsCount = LocalGroups->GroupCount; - Request->d.LogonUserRequest.LocalGroups = - (PSID_AND_ATTRIBUTES)&RawMessage + CurrentLength; - memcpy((PSID_AND_ATTRIBUTES)&RawMessage + CurrentLength, - LocalGroups->Groups, - LocalGroups->GroupCount * sizeof(SID_AND_ATTRIBUTES)); - - Request->d.LogonUserRequest.SourceContext = *SourceContext; - - Request->Type = LSASS_REQUEST_LOGON_USER; - Request->Header.u1.s1.DataLength = RequestLength - sizeof(PORT_MESSAGE); - Request->Header.u1.s1.TotalLength = RequestLength + sizeof(PORT_MESSAGE); - - Reply = (PLSASS_REPLY)&RawReply; - - Status = ZwRequestWaitReplyPort(LsaHandle, - &Request->Header, - &Reply->Header); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - *SubStatus = Reply->d.LogonUserReply.SubStatus; - - if (!NT_SUCCESS(Reply->Status)) - { - return Status; - } - - *ProfileBuffer = RtlAllocateHeap(Secur32Heap, - 0, - Reply->d.LogonUserReply.ProfileBufferLength); - memcpy(*ProfileBuffer, - (PVOID)((ULONG_PTR)Reply->d.LogonUserReply.Data + - (ULONG_PTR)Reply->d.LogonUserReply.ProfileBuffer), - Reply->d.LogonUserReply.ProfileBufferLength); - *LogonId = Reply->d.LogonUserReply.LogonId; - *Token = Reply->d.LogonUserReply.Token; - memcpy(Quotas, - &Reply->d.LogonUserReply.Quotas, - sizeof(Reply->d.LogonUserReply.Quotas)); - - return Status; -#endif } @@ -436,7 +338,7 @@ DPRINT("ConnectInfo.OperationalMode: 0x%08lx\n", ConnectInfo.OperationalMode); *OperationalMode = ConnectInfo.OperationalMode; - if (!NT_SUCCESS(Status)) + if (!NT_SUCCESS(ConnectInfo.Status)) { DPRINT1("ConnectInfo.Status: 0x%08lx\n", ConnectInfo.Status); }

1 0

[spetreolle] 59368: [SHELL32] Fix MSVC build.
by spetreolle＠svn.reactos.org 29 Jun '13

29 Jun '13

Author: spetreolle Date: Sat Jun 29 17:46:24 2013 New Revision: 59368 URL: http://svn.reactos.org/svn/reactos?rev=59368&view=rev Log: [SHELL32] Fix MSVC build. Modified: trunk/rostests/winetests/shell32/progman_dde.c Modified: trunk/rostests/winetests/shell32/progman_dde.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/progman… ============================================================================== --- trunk/rostests/winetests/shell32/progman_dde.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/progman_dde.c [iso-8859-1] Sat Jun 29 17:46:24 2013 @@ -695,16 +695,17 @@ START_TEST(progman_dde) { - if(!winetest_interactive) - { - skip("Skipping progman_dde() until we have a sane DDE implementation. CORE-6559.\n"); - return; - } DWORD instance = 0; UINT err; HSZ hszProgman; HCONV hConv; int testnum; + + if(!winetest_interactive) + { + skip("Skipping progman_dde() until we have a sane DDE implementation. CORE-6559.\n"); + return; + } init_function_pointers(); init_strings();

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