Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 68751: [WIN32K:NTGDI] - Allow NULL rectangle in NtGdiSetBoundsRect as shown by the test. Fixes a bunch of annoying first chance exceptions
by tfaber＠svn.reactos.org 18 Aug '15

18 Aug '15

Author: tfaber Date: Tue Aug 18 10:25:45 2015 New Revision: 68751 URL: http://svn.reactos.org/svn/reactos?rev=68751&view=rev Log: [WIN32K:NTGDI] - Allow NULL rectangle in NtGdiSetBoundsRect as shown by the test. Fixes a bunch of annoying first chance exceptions Modified: trunk/reactos/win32ss/gdi/ntgdi/dcutil.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcutil.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] Tue Aug 18 10:25:45 2015 @@ -689,7 +689,7 @@ RECTL_vSetEmptyRect(&pdc->erclBoundsApp); } - if (flags & DCB_ACCUMULATE) + if (flags & DCB_ACCUMULATE && prc != NULL) { /* Capture the rect */ _SEH2_TRY

1 0

[tfaber] 68750: [GDI32_APITEST] - Add a simple test for SetBoundsRect
by tfaber＠svn.reactos.org 18 Aug '15

18 Aug '15

Author: tfaber Date: Tue Aug 18 10:24:01 2015 New Revision: 68750 URL: http://svn.reactos.org/svn/reactos?rev=68750&view=rev Log: [GDI32_APITEST] - Add a simple test for SetBoundsRect Added: trunk/rostests/apitests/gdi32/SetBoundsRect.c (with props) Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt trunk/rostests/apitests/gdi32/testlist.c Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CMakeLists… ============================================================================== --- trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] Tue Aug 18 10:24:01 2015 @@ -59,6 +59,7 @@ Rectangle.c RealizePalette.c SelectObject.c + SetBoundsRect.c SetBrushOrgEx.c SetDCPenColor.c SetDIBits.c Added: trunk/rostests/apitests/gdi32/SetBoundsRect.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetBoundsR… ============================================================================== --- trunk/rostests/apitests/gdi32/SetBoundsRect.c (added) +++ trunk/rostests/apitests/gdi32/SetBoundsRect.c [iso-8859-1] Tue Aug 18 10:24:01 2015 @@ -0,0 +1,56 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for SetBoundsRect + * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org + */ + +#include <apitest.h> +#include <winuser.h> +#include <wingdi.h> + +START_TEST(SetBoundsRect) +{ + HDC hDC; + UINT ret; + DWORD error; + + hDC = CreateCompatibleDC(GetDC(NULL)); + if (hDC == NULL) + { + skip("No DC\n"); + return; + } + + SetLastError(0xbeeffeed); + ret = SetBoundsRect(hDC, NULL, 0); + error = GetLastError(); + ok(ret == (DCB_DISABLE | DCB_RESET), "ret = %u\n", ret); + ok(error == 0xbeeffeed, "error = %lu\n", error); + + SetLastError(0xbeeffeed); + ret = SetBoundsRect(hDC, NULL, DCB_ACCUMULATE); + error = GetLastError(); + ok(ret == (DCB_DISABLE | DCB_RESET), "ret = %u\n", ret); + ok(error == 0xbeeffeed, "error = %lu\n", error); + + SetLastError(0xbeeffeed); + ret = SetBoundsRect(hDC, NULL, DCB_DISABLE); + error = GetLastError(); + ok(ret == (DCB_DISABLE | DCB_RESET), "ret = %u\n", ret); + ok(error == 0xbeeffeed, "error = %lu\n", error); + + SetLastError(0xbeeffeed); + ret = SetBoundsRect(hDC, NULL, DCB_ENABLE); + error = GetLastError(); + ok(ret == (DCB_DISABLE | DCB_RESET), "ret = %u\n", ret); + ok(error == 0xbeeffeed, "error = %lu\n", error); + + SetLastError(0xbeeffeed); + ret = SetBoundsRect(hDC, NULL, DCB_RESET); + error = GetLastError(); + ok(ret == (DCB_ENABLE | DCB_RESET), "ret = %u\n", ret); + ok(error == 0xbeeffeed, "error = %lu\n", error); + + DeleteDC(hDC); +} Propchange: trunk/rostests/apitests/gdi32/SetBoundsRect.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/gdi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/testlist.c… ============================================================================== --- trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] Tue Aug 18 10:24:01 2015 @@ -60,6 +60,7 @@ extern void func_Rectangle(void); extern void func_RealizePalette(void); extern void func_SelectObject(void); +extern void func_SetBoundsRect(void); extern void func_SetBrushOrgEx(void); extern void func_SetDCPenColor(void); extern void func_SetDIBits(void); @@ -129,6 +130,7 @@ { "Rectangle", func_Rectangle }, { "RealizePalette", func_RealizePalette }, { "SelectObject", func_SelectObject }, + { "SetBoundsRect", func_SetBoundsRect }, { "SetBrushOrgEx", func_SetBrushOrgEx }, { "SetDCPenColor", func_SetDCPenColor }, { "SetDIBits", func_SetDIBits },

1 0

[tfaber] 68749: [SHELL32] - Don't use SHELL32_GetDisplayNameOfGUIDItem on the desktop folder. Fixes file open dialog. Giannis please review ; )
by tfaber＠svn.reactos.org 18 Aug '15

18 Aug '15

Author: tfaber Date: Tue Aug 18 10:10:36 2015 New Revision: 68749 URL: http://svn.reactos.org/svn/reactos?rev=68749&view=rev Log: [SHELL32] - Don't use SHELL32_GetDisplayNameOfGUIDItem on the desktop folder. Fixes file open dialog. Giannis please review ;) Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] Tue Aug 18 10:10:36 2015 @@ -650,7 +650,7 @@ if (!strRet) return E_INVALIDARG; - if (_ILIsPidlSimple(pidl) && _ILIsSpecialFolder(pidl)) + if (!_ILIsDesktop(pidl) && _ILIsPidlSimple(pidl) && _ILIsSpecialFolder(pidl)) { return SHELL32_GetDisplayNameOfGUIDItem(this, L"", pidl, dwFlags, strRet); }

1 0

[cwittich] 68748: [KERNEL32] lpBytesReturned must not be NULL when lpOverlapped is NULL as well
by cwittich＠svn.reactos.org 18 Aug '15

18 Aug '15

Author: cwittich Date: Tue Aug 18 07:13:02 2015 New Revision: 68748 URL: http://svn.reactos.org/svn/reactos?rev=68748&view=rev Log: [KERNEL32] lpBytesReturned must not be NULL when lpOverlapped is NULL as well Modified: trunk/reactos/dll/win32/kernel32/client/file/volume.c Modified: trunk/reactos/dll/win32/kernel32/client/file/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/volume.c [iso-8859-1] Tue Aug 18 07:13:02 2015 @@ -426,6 +426,7 @@ IN DWORD len) { DWORD size = 1024; + DWORD br; HANDLE mgr = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, INVALID_HANDLE_VALUE ); if (mgr == INVALID_HANDLE_VALUE) return INVALID_HANDLE_VALUE; @@ -443,7 +444,7 @@ memset( &input, 0, sizeof(input) ); if (!DeviceIoControl( mgr, IOCTL_MOUNTMGR_QUERY_POINTS, &input, sizeof(input), - output, size, NULL, NULL )) + output, size, &br, NULL )) { if (GetLastError() != ERROR_MORE_DATA) break; size = output->Size;

1 0

[hbelusca] 68747: Fix a comment and add something that was forgotten in the previous commit.
by hbelusca＠svn.reactos.org 17 Aug '15

17 Aug '15

Author: hbelusca Date: Mon Aug 17 20:22:10 2015 New Revision: 68747 URL: http://svn.reactos.org/svn/reactos?rev=68747&view=rev Log: Fix a comment and add something that was forgotten in the previous commit. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] Mon Aug 17 20:22:10 2015 @@ -546,7 +546,7 @@ */ setDX(Segment); setDI(FinalSP); - setBP(0x091E); // DOS base stack pointer relic value + setBP(0x091E); // DOS base stack pointer relic value. In MS-DOS 5.0 and Windows' NTVDM it's 0x091C. This is in fact the old SP value inside DosData disk stack. setSI(FinalIP); setAX(0/*0xFFFF*/); // FIXME: fcbcode @@ -897,7 +897,7 @@ /* Notify VDDs of process termination */ VDDTerminateUserHook(Psp); - /* Check if this PSP is it's own parent */ + /* Check if this PSP is its own parent */ if (PspBlock->ParentPsp == Psp) goto Done; if (KeepResident == 0)

1 0

[hbelusca] 68746: [NTVDM] Changes in preparation for CORE-9773 - Split DosLoadExecutable into DosLoadExecutable & DosLoadExecutableInternal, the latter one can be used for small programs embedded i...
by hbelusca＠svn.reactos.org 17 Aug '15

17 Aug '15

Author: hbelusca Date: Mon Aug 17 20:11:51 2015 New Revision: 68746 URL: http://svn.reactos.org/svn/reactos?rev=68746&view=rev Log: [NTVDM] Changes in preparation for CORE-9773 - Split DosLoadExecutable into DosLoadExecutable & DosLoadExecutableInternal, the latter one can be used for small programs embedded in ntvdm.exe (will be used for integrated command.com). - Factorize common loading code in DosLoadExecutable(Internal); just before starting a program, set the CPU registers to the default values DOS use; see comments in the code for more details (some programs expect those values). - Set a correct termination type (hiword in the returned ErrorLevel) when terminating programs (the value is different for TSRs and for regular programs). CORE-9773 CORE-9729 CORE-9711 CORE-8247 Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] Mon Aug 17 20:11:51 2015 @@ -73,7 +73,10 @@ { PDOS_REGISTER_STATE State; - /* Pop the state structure from the stack */ + /* + * Pop the state structure from the stack. Note that we + * already have one word allocated (the interrupt number). + */ State = SEG_OFF_TO_PTR(getSS(), getSP()); setSP(getSP() + sizeof(DOS_REGISTER_STATE) - sizeof(WORD)); @@ -89,8 +92,8 @@ setDI(State->DI); } -static WORD DosCopyEnvironmentBlock(LPCSTR Environment OPTIONAL, - LPCSTR ProgramName) +static WORD DosCopyEnvironmentBlock(IN LPCSTR Environment OPTIONAL, + IN LPCSTR ProgramName) { PCHAR Ptr, DestBuffer = NULL; ULONG TotalSize = 0; @@ -237,82 +240,29 @@ Sda->DiskTransferArea = MAKELONG(0x80, Segment); } -DWORD DosLoadExecutable(IN DOS_EXEC_TYPE LoadType, - IN LPCSTR ExecutablePath, - IN PDOS_EXEC_PARAM_BLOCK Parameters, - IN LPCSTR CommandLine OPTIONAL, - IN LPCSTR Environment OPTIONAL, - IN DWORD ReturnAddress OPTIONAL) +DWORD DosLoadExecutableInternal(IN DOS_EXEC_TYPE LoadType, + IN LPBYTE ExeBuffer, + IN DWORD ExeBufferSize, + IN LPCSTR ExePath, + IN PDOS_EXEC_PARAM_BLOCK Parameters, + IN LPCSTR CommandLine OPTIONAL, + IN LPCSTR Environment OPTIONAL, + IN DWORD ReturnAddress OPTIONAL) { DWORD Result = ERROR_SUCCESS; - HANDLE FileHandle = INVALID_HANDLE_VALUE, FileMapping = NULL; - LPBYTE Address = NULL; WORD Segment = 0; WORD EnvBlock = 0; WORD LoadSegment; WORD MaxAllocSize; - DWORD i, FileSize; - CHAR FullPath[MAX_PATH]; - CHAR ShortFullPath[MAX_PATH]; + + WORD FinalSS, FinalSP; + WORD FinalCS, FinalIP; /* Buffer for command line conversion: 1 byte for size; 127 bytes for contents */ CHAR CmdLineBuffer[1 + DOS_CMDLINE_LENGTH]; - DPRINT1("DosLoadExecutable(%d, '%s', 0x%08X, 0x%08X, 0x%08X)\n", - LoadType, - ExecutablePath, - Parameters, - CommandLine, - Environment); - - /* Try to get the full path to the executable */ - if (GetFullPathNameA(ExecutablePath, sizeof(FullPath), FullPath, NULL)) - { - /* Try to shorten the full path */ - if (GetShortPathNameA(FullPath, ShortFullPath, sizeof(ShortFullPath))) - { - /* Use the shortened full path from now on */ - ExecutablePath = ShortFullPath; - } - } - - /* Open a handle to the executable */ - FileHandle = CreateFileA(ExecutablePath, - GENERIC_READ, - FILE_SHARE_READ, - NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, - NULL); - if (FileHandle == INVALID_HANDLE_VALUE) - { - Result = GetLastError(); - goto Cleanup; - } - - /* Get the file size */ - FileSize = GetFileSize(FileHandle, NULL); - - /* Create a mapping object for the file */ - FileMapping = CreateFileMapping(FileHandle, - NULL, - PAGE_READONLY, - 0, - 0, - NULL); - if (FileMapping == NULL) - { - Result = GetLastError(); - goto Cleanup; - } - - /* Map the file into memory */ - Address = (LPBYTE)MapViewOfFile(FileMapping, FILE_MAP_READ, 0, 0, 0); - if (Address == NULL) - { - Result = GetLastError(); - goto Cleanup; - } + DPRINT1("DosLoadExecutableInternal(%d, 0x%p, '%s', 0x%p, 0x%p, 0x%p)\n", + LoadType, ExeBuffer, ExePath, Parameters, CommandLine, Environment); if (LoadType != DOS_LOAD_OVERLAY) { @@ -388,7 +338,7 @@ } /* Copy the environment block to DOS memory */ - EnvBlock = DosCopyEnvironmentBlock(Environment, ExecutablePath); + EnvBlock = DosCopyEnvironmentBlock(Environment, ExePath); if (EnvBlock == 0) { Result = Sda->LastErrorCode; @@ -397,18 +347,18 @@ } /* Check if this is an EXE file or a COM file */ - if (Address[0] == 'M' && Address[1] == 'Z') + if (ExeBuffer[0] == 'M' && ExeBuffer[1] == 'Z') { /* EXE file */ PIMAGE_DOS_HEADER Header; - DWORD BaseSize; + DWORD BaseSize, i; PDWORD RelocationTable; PWORD RelocWord; WORD RelocFactor; BOOLEAN LoadHigh = FALSE; /* Get the MZ header */ - Header = (PIMAGE_DOS_HEADER)Address; + Header = (PIMAGE_DOS_HEADER)ExeBuffer; /* Get the base size of the file, in paragraphs (rounded up) */ BaseSize = ((((Header->e_cp - (Header->e_cblp != 0)) * 512) @@ -452,7 +402,7 @@ } /* The process owns its own memory */ - DosChangeMemoryOwner(Segment, Segment); + DosChangeMemoryOwner(Segment , Segment); DosChangeMemoryOwner(EnvBlock, Segment); /* Set INT 22h to the return address */ @@ -480,11 +430,11 @@ /* Copy the program to the code segment */ RtlCopyMemory(SEG_OFF_TO_PTR(LoadSegment, 0), - Address + (Header->e_cparhdr << 4), - min(FileSize - (Header->e_cparhdr << 4), BaseSize << 4)); + ExeBuffer + (Header->e_cparhdr << 4), + min(ExeBufferSize - (Header->e_cparhdr << 4), BaseSize << 4)); /* Get the relocation table */ - RelocationTable = (PDWORD)(Address + Header->e_lfarlc); + RelocationTable = (PDWORD)(ExeBuffer + Header->e_lfarlc); /* Perform relocations */ for (i = 0; i < Header->e_crlc; i++) @@ -497,39 +447,13 @@ *RelocWord += RelocFactor; } - if (LoadType == DOS_LOAD_AND_EXECUTE) - { - /* Save the program state */ - if (Sda->CurrentPsp != SYSTEM_PSP) - { - /* Push the task state */ - DosSaveState(); - - /* Update the last stack in the PSP */ - SEGMENT_TO_PSP(Sda->CurrentPsp)->LastStack = MAKELONG(getSP(), getSS()); - } - - /* Set the initial segment registers */ - setDS(Segment); - setES(Segment); - - /* Set the stack to the location from the header */ - setSS(LoadSegment + Header->e_ss); - setSP(Header->e_sp); - - /* Notify VDDs of process execution */ - VDDCreateUserHook(Segment); - - /* Execute */ - DosSetProcessContext(Segment); - CpuExecute(LoadSegment + Header->e_cs, Header->e_ip); - } - else if (LoadType == DOS_LOAD_ONLY) - { - ASSERT(Parameters); - Parameters->StackLocation = MAKELONG(Header->e_sp, LoadSegment + Header->e_ss); - Parameters->EntryPoint = MAKELONG(Header->e_ip, LoadSegment + Header->e_cs); - } + /* Set the stack to the location from the header */ + FinalSS = LoadSegment + Header->e_ss; + FinalSP = Header->e_sp; + + /* Set the code segment/pointer */ + FinalCS = LoadSegment + Header->e_cs; + FinalIP = Header->e_ip; } else { @@ -541,7 +465,7 @@ DosAllocateMemory(0xFFFF, &MaxAllocSize); /* Make sure it's enough for the whole program and the PSP */ - if (((DWORD)MaxAllocSize << 4) < (FileSize + sizeof(DOS_PSP))) + if (((DWORD)MaxAllocSize << 4) < (ExeBufferSize + sizeof(DOS_PSP))) { Result = ERROR_NOT_ENOUGH_MEMORY; goto Cleanup; @@ -556,7 +480,7 @@ } /* The process owns its own memory */ - DosChangeMemoryOwner(Segment, Segment); + DosChangeMemoryOwner(Segment , Segment); DosChangeMemoryOwner(EnvBlock, Segment); /* Set INT 22h to the return address */ @@ -578,48 +502,75 @@ /* Copy the program to the code segment */ RtlCopyMemory(SEG_OFF_TO_PTR(LoadSegment, 0), - Address, - FileSize); - - if (LoadType == DOS_LOAD_AND_EXECUTE) - { - /* Save the program state */ - if (Sda->CurrentPsp != SYSTEM_PSP) - { - /* Push the task state */ - DosSaveState(); - - /* Update the last stack in the PSP */ - SEGMENT_TO_PSP(Sda->CurrentPsp)->LastStack = MAKELONG(getSP(), getSS()); - } - - /* Set the initial segment registers */ - setDS(Segment); - setES(Segment); - - /* Set the stack to the last word of the segment */ - setSS(Segment); - setSP(0xFFFE); - - /* - * Set the value on the stack to 0, so that a near return - * jumps to PSP:0000 which has the exit code. - */ - *((LPWORD)SEG_OFF_TO_PTR(Segment, 0xFFFE)) = 0; - - /* Notify VDDs of process execution */ - VDDCreateUserHook(Segment); - - /* Execute */ - DosSetProcessContext(Segment); - CpuExecute(Segment, 0x100); - } - else if (LoadType == DOS_LOAD_ONLY) - { - ASSERT(Parameters); - Parameters->StackLocation = MAKELONG(0xFFFE, Segment); - Parameters->EntryPoint = MAKELONG(0x0100, Segment); - } + ExeBuffer, ExeBufferSize); + + /* Set the stack to the last word of the segment */ + FinalSS = Segment; + FinalSP = 0xFFFE; + + /* + * Set the value on the stack to 0x0000, so that a near return + * jumps to PSP:0000 which has the exit code. + */ + *((LPWORD)SEG_OFF_TO_PTR(Segment, 0xFFFE)) = 0x0000; + + /* Set the code segment/pointer */ + FinalCS = Segment; + FinalIP = 0x0100; + } + + if (LoadType == DOS_LOAD_AND_EXECUTE) + { + /* Save the program state */ + if (Sda->CurrentPsp != SYSTEM_PSP) + { + /* Push the task state */ + DosSaveState(); + + /* Update the last stack in the PSP */ + SEGMENT_TO_PSP(Sda->CurrentPsp)->LastStack = MAKELONG(getSP(), getSS()); + } + + /* Set the initial segment registers */ + setDS(Segment); + setES(Segment); + + /* Set the stack */ + setSS(FinalSS); + setSP(FinalSP); + + /* + * Set the other registers as in real DOS: some demos expect them so! + * See http://www.fysnet.net/yourhelp.htm + * and http://www.beroset.com/asm/showregs.asm + */ + setDX(Segment); + setDI(FinalSP); + setBP(0x091E); // DOS base stack pointer relic value + setSI(FinalIP); + + setAX(0/*0xFFFF*/); // FIXME: fcbcode + setBX(0/*0xFFFF*/); // FIXME: fcbcode + setCX(0x00FF); + + /* + * Keep critical flags, clear test flags (OF, SF, ZF, AF, PF, CF) + * and explicitely set the interrupt flag. + */ + setEFLAGS((getEFLAGS() & ~0x08D5) | 0x0200); + + /* Notify VDDs of process execution */ + VDDCreateUserHook(Segment); + + /* Execute */ + DosSetProcessContext(Segment); + CpuExecute(FinalCS, FinalIP); + } + else if (LoadType == DOS_LOAD_ONLY) + { + ASSERT(Parameters); + Parameters->StackLocation = MAKELONG(FinalSP, FinalSS); + Parameters->EntryPoint = MAKELONG(FinalIP, FinalCS); } Cleanup: @@ -630,6 +581,85 @@ if (Segment) DosFreeMemory(Segment); } + return Result; +} + +DWORD DosLoadExecutable(IN DOS_EXEC_TYPE LoadType, + IN LPCSTR ExecutablePath, + IN PDOS_EXEC_PARAM_BLOCK Parameters, + IN LPCSTR CommandLine OPTIONAL, + IN LPCSTR Environment OPTIONAL, + IN DWORD ReturnAddress OPTIONAL) +{ + DWORD Result = ERROR_SUCCESS; + HANDLE FileHandle = INVALID_HANDLE_VALUE, FileMapping = NULL; + DWORD FileSize; + LPBYTE Address = NULL; + CHAR FullPath[MAX_PATH]; + CHAR ShortFullPath[MAX_PATH]; + + DPRINT1("DosLoadExecutable(%d, '%s', 0x%p, 0x%p, 0x%p)\n", + LoadType, ExecutablePath, Parameters, CommandLine, Environment); + + /* Try to get the full path to the executable */ + if (GetFullPathNameA(ExecutablePath, sizeof(FullPath), FullPath, NULL)) + { + /* Get the corresponding short path */ + if (GetShortPathNameA(FullPath, ShortFullPath, sizeof(ShortFullPath))) + { + /* Use the shortened full path from now on */ + ExecutablePath = ShortFullPath; + } + } + + /* Open a handle to the executable */ + FileHandle = CreateFileA(ExecutablePath, + GENERIC_READ, + FILE_SHARE_READ, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + NULL); + if (FileHandle == INVALID_HANDLE_VALUE) + { + Result = GetLastError(); + goto Cleanup; + } + + /* Get the file size */ + FileSize = GetFileSize(FileHandle, NULL); + + /* Create a mapping object for the file */ + FileMapping = CreateFileMapping(FileHandle, + NULL, + PAGE_READONLY, + 0, + 0, + NULL); + if (FileMapping == NULL) + { + Result = GetLastError(); + goto Cleanup; + } + + /* Map the file into memory */ + Address = (LPBYTE)MapViewOfFile(FileMapping, FILE_MAP_READ, 0, 0, 0); + if (Address == NULL) + { + Result = GetLastError(); + goto Cleanup; + } + + Result = DosLoadExecutableInternal(LoadType, + Address, + FileSize, + ExecutablePath, + Parameters, + CommandLine, + Environment, + ReturnAddress); + +Cleanup: /* Unmap the file*/ if (Address != NULL) UnmapViewOfFile(Address); @@ -690,9 +720,9 @@ } #ifndef STANDALONE -WORD DosCreateProcess(LPCSTR ProgramName, - PDOS_EXEC_PARAM_BLOCK Parameters, - DWORD ReturnAddress OPTIONAL) +WORD DosCreateProcess(IN LPCSTR ProgramName, + IN PDOS_EXEC_PARAM_BLOCK Parameters, + IN DWORD ReturnAddress OPTIONAL) { DWORD Result; DWORD BinaryType; @@ -851,29 +881,28 @@ VOID DosTerminateProcess(WORD Psp, BYTE ReturnCode, WORD KeepResident) { - WORD i; WORD McbSegment = SysVars->FirstMcb; PDOS_MCB CurrentMcb; LPDWORD IntVecTable = (LPDWORD)((ULONG_PTR)BaseAddress); PDOS_PSP PspBlock = SEGMENT_TO_PSP(Psp); LPWORD Stack; + BYTE TerminationType; #ifndef STANDALONE VDM_COMMAND_INFO CommandInfo; #endif DPRINT("DosTerminateProcess: Psp 0x%04X, ReturnCode 0x%02X, KeepResident 0x%04X\n", - Psp, - ReturnCode, - KeepResident); + Psp, ReturnCode, KeepResident); + + /* Notify VDDs of process termination */ + VDDTerminateUserHook(Psp); /* Check if this PSP is it's own parent */ if (PspBlock->ParentPsp == Psp) goto Done; - /* Notify VDDs of process termination */ - VDDTerminateUserHook(Psp); - if (KeepResident == 0) { + WORD i; for (i = 0; i < PspBlock->HandleTableSize; i++) { /* Close the handle */ @@ -923,10 +952,10 @@ IntVecTable[0x23] = PspBlock->BreakAddress; IntVecTable[0x24] = PspBlock->CriticalAddress; - /* Update the current PSP */ + /* Update the current PSP with the parent's one */ if (Psp == Sda->CurrentPsp) { - Sda->CurrentPsp = PspBlock->ParentPsp; + DosSetProcessContext(PspBlock->ParentPsp); if (Sda->CurrentPsp == SYSTEM_PSP) { ResetEvent(VdmTaskEvent); @@ -952,15 +981,19 @@ #endif - /* Save the return code - Normal termination */ - Sda->ErrorLevel = MAKEWORD(ReturnCode, 0x00); - - /* Restore the old stack */ - setSS(HIWORD(SEGMENT_TO_PSP(Sda->CurrentPsp)->LastStack)); - setSP(LOWORD(SEGMENT_TO_PSP(Sda->CurrentPsp)->LastStack)); - - /* Pop the task state */ - DosRestoreState(); + /* Save the return code - Normal termination or TSR */ + TerminationType = (KeepResident != 0 ? 0x03 : 0x00); + Sda->ErrorLevel = MAKEWORD(ReturnCode, TerminationType); + + if (Sda->CurrentPsp != SYSTEM_PSP) + { + /* Restore the parent's stack */ + setSS(HIWORD(SEGMENT_TO_PSP(Sda->CurrentPsp)->LastStack)); + setSP(LOWORD(SEGMENT_TO_PSP(Sda->CurrentPsp)->LastStack)); + + /* Pop the task state */ + DosRestoreState(); + } /* Return control to the parent process */ Stack = (LPWORD)SEG_OFF_TO_PTR(getSS(), getSP()); @@ -968,3 +1001,4 @@ Stack[STACK_IP] = LOWORD(PspBlock->TerminateAddress); } +/* EOF */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h [iso-8859-1] Mon Aug 17 20:11:51 2015 @@ -87,6 +87,18 @@ VOID DosCreatePsp(WORD Segment, WORD ProgramSize); VOID DosSetProcessContext(WORD Segment); +DWORD DosLoadExecutableInternal +( + IN DOS_EXEC_TYPE LoadType, + IN LPBYTE ExeBuffer, + IN DWORD ExeBufferSize, + IN LPCSTR ExePath, + IN PDOS_EXEC_PARAM_BLOCK Parameters, + IN LPCSTR CommandLine OPTIONAL, + IN LPCSTR Environment OPTIONAL, + IN DWORD ReturnAddress OPTIONAL +); + DWORD DosLoadExecutable ( IN DOS_EXEC_TYPE LoadType,

1 0

[gadamopoulos] 68745: [SHELL32] - CControlPanelFolder: Fix showing the description in control panel. Patch with improvements by me. CORE-8827
by gadamopoulos＠svn.reactos.org 17 Aug '15

17 Aug '15

Author: gadamopoulos Date: Mon Aug 17 17:10:03 2015 New Revision: 68745 URL: http://svn.reactos.org/svn/reactos?rev=68745&view=rev Log: [SHELL32] - CControlPanelFolder: Fix showing the description in control panel. Patch with improvements by me. CORE-8827 Modified: trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] Mon Aug 17 17:10:03 2015 @@ -55,8 +55,8 @@ */ static const shvheader ControlPanelSFHeader[] = { - {IDS_SHV_COLUMN8, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15},/*FIXME*/ - {IDS_SHV_COLUMN9, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 200},/*FIXME*/ + {IDS_SHV_COLUMN8, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 15},/*FIXME*/ + {IDS_SHV_COLUMN9, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 80},/*FIXME*/ }; #define CONROLPANELSHELLVIEWCOLUMNS 2 @@ -154,10 +154,10 @@ { for (i = 0; i < applet->count; ++i) { - WideCharToMultiByte(CP_ACP, 0, applet->info[i].szName, -1, displayName, MAX_PATH, 0, 0); - WideCharToMultiByte(CP_ACP, 0, applet->info[i].szInfo, -1, comment, MAX_PATH, 0, 0); - applet->proc(0, CPL_INQUIRE, i, (LPARAM)&info); + + LoadStringA(applet->hModule, info.idName, displayName, MAX_PATH); + LoadStringA(applet->hModule, info.idInfo, comment, MAX_PATH); if (info.idIcon > 0) iconIdx = -info.idIcon; /* negative icon index instead of icon number */ @@ -671,8 +671,22 @@ hr = GetDisplayNameOf(pidl, SHGDN_NORMAL | SHGDN_INFOLDER, &psd->str); break; case 1: /* comment */ - _ILGetFileType(pidl, psd->str.cStr, MAX_PATH); + { + PIDLCPanelStruct* pCPanel = _ILGetCPanelPointer(pidl); + if (pCPanel) + lstrcpyA(psd->str.cStr, pCPanel->szName + pCPanel->offsComment); + if (_ILIsSpecialFolder(pidl)) + { + HKEY hKey; + GUID *pGuid = _ILGetGUIDPointer(pidl); + if (HCR_RegOpenClassIDKey(*pGuid, &hKey)) + { + RegLoadMUIStringA(hKey, "InfoTip", psd->str.cStr, MAX_PATH, NULL, 0, NULL); + RegCloseKey(hKey); + } + } break; + } } hr = S_OK; }

1 0

[gadamopoulos] 68744: [SHELL32] - Use SHELL32_GetDisplayNameOfGUIDItem in CDesktopFolder
by gadamopoulos＠svn.reactos.org 17 Aug '15

17 Aug '15

Author: gadamopoulos Date: Mon Aug 17 15:34:02 2015 New Revision: 68744 URL: http://svn.reactos.org/svn/reactos?rev=68744&view=rev Log: [SHELL32] - Use SHELL32_GetDisplayNameOfGUIDItem in CDesktopFolder Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] Mon Aug 17 15:34:02 2015 @@ -650,6 +650,11 @@ if (!strRet) return E_INVALIDARG; + if (_ILIsPidlSimple(pidl) && _ILIsSpecialFolder(pidl)) + { + return SHELL32_GetDisplayNameOfGUIDItem(this, L"", pidl, dwFlags, strRet); + } + pszPath = (LPWSTR)CoTaskMemAlloc((MAX_PATH + 1) * sizeof(WCHAR)); if (!pszPath) return E_OUTOFMEMORY; @@ -664,84 +669,28 @@ } else if (_ILIsPidlSimple (pidl)) { - GUID const *clsid; - - if ((clsid = _ILGetGUIDPointer (pidl))) - { - if (GET_SHGDN_FOR (dwFlags) == SHGDN_FORPARSING) - { - int bWantsForParsing; - - /* - * We can only get a filesystem path from a shellfolder if the - * value WantsFORPARSING in CLSID\\{...}\\shellfolder exists. - * - * Exception: The MyComputer folder doesn't have this key, - * but any other filesystem backed folder it needs it. - */ - if (IsEqualIID (*clsid, CLSID_MyComputer)) - { - bWantsForParsing = TRUE; - } - else - { - /* get the "WantsFORPARSING" flag from the registry */ - static const WCHAR clsidW[] = - { 'C', 'L', 'S', 'I', 'D', '\\', 0 }; - static const WCHAR shellfolderW[] = - { '\\', 's', 'h', 'e', 'l', 'l', 'f', 'o', 'l', 'd', 'e', 'r', 0 }; - static const WCHAR wantsForParsingW[] = - { 'W', 'a', 'n', 't', 's', 'F', 'o', 'r', 'P', 'a', 'r', 's', 'i', 'n', - 'g', 0 - }; - WCHAR szRegPath[100]; - LONG r; - - wcscpy (szRegPath, clsidW); - SHELL32_GUIDToStringW (*clsid, &szRegPath[6]); - wcscat (szRegPath, shellfolderW); - r = SHGetValueW(HKEY_CLASSES_ROOT, szRegPath, - wantsForParsingW, NULL, NULL, NULL); - if (r == ERROR_SUCCESS) - bWantsForParsing = TRUE; - else - bWantsForParsing = FALSE; - } - - if ((GET_SHGDN_RELATION (dwFlags) == SHGDN_NORMAL) && - bWantsForParsing) - { - /* - * we need the filesystem path to the destination folder. - * Only the folder itself can know it - */ - hr = SHELL32_GetDisplayNameOfChild (this, pidl, dwFlags, - pszPath, - MAX_PATH); - } - else - { - /* parsing name like ::{...} */ - pszPath[0] = ':'; - pszPath[1] = ':'; - SHELL32_GUIDToStringW (*clsid, &pszPath[2]); - } - } - else - { - /* user friendly name */ - HCR_GetClassNameW (*clsid, pszPath, MAX_PATH); - } - } - else - { - int cLen = 0; - - /* file system folder or file rooted at the desktop */ + int cLen = 0; + + /* file system folder or file rooted at the desktop */ + if ((GET_SHGDN_FOR(dwFlags) == SHGDN_FORPARSING) && + (GET_SHGDN_RELATION(dwFlags) != SHGDN_INFOLDER)) + { + lstrcpynW(pszPath, sPathTarget, MAX_PATH - 1); + PathAddBackslashW(pszPath); + cLen = wcslen(pszPath); + } + + _ILSimpleGetTextW(pidl, pszPath + cLen, MAX_PATH - cLen); + if (!_ILIsFolder(pidl)) + SHELL_FS_ProcessDisplayFilename(pszPath, dwFlags); + + if (GetFileAttributes(pszPath) == INVALID_FILE_ATTRIBUTES) + { + /* file system folder or file rooted at the AllUsers desktop */ if ((GET_SHGDN_FOR(dwFlags) == SHGDN_FORPARSING) && (GET_SHGDN_RELATION(dwFlags) != SHGDN_INFOLDER)) { - lstrcpynW(pszPath, sPathTarget, MAX_PATH - 1); + SHGetSpecialFolderPathW(0, pszPath, CSIDL_COMMON_DESKTOPDIRECTORY, FALSE); PathAddBackslashW(pszPath); cLen = wcslen(pszPath); } @@ -749,22 +698,6 @@ _ILSimpleGetTextW(pidl, pszPath + cLen, MAX_PATH - cLen); if (!_ILIsFolder(pidl)) SHELL_FS_ProcessDisplayFilename(pszPath, dwFlags); - - if (GetFileAttributes(pszPath) == INVALID_FILE_ATTRIBUTES) - { - /* file system folder or file rooted at the AllUsers desktop */ - if ((GET_SHGDN_FOR(dwFlags) == SHGDN_FORPARSING) && - (GET_SHGDN_RELATION(dwFlags) != SHGDN_INFOLDER)) - { - SHGetSpecialFolderPathW(0, pszPath, CSIDL_COMMON_DESKTOPDIRECTORY, FALSE); - PathAddBackslashW(pszPath); - cLen = wcslen(pszPath); - } - - _ILSimpleGetTextW(pidl, pszPath + cLen, MAX_PATH - cLen); - if (!_ILIsFolder(pidl)) - SHELL_FS_ProcessDisplayFilename(pszPath, dwFlags); - } } } else

1 0

[gadamopoulos] 68743: [SHELL32] - Remove CDesktopFolderDropTarget and make CDesktopFolder just get the drop target from m_DesktopFSFolder
by gadamopoulos＠svn.reactos.org 17 Aug '15

17 Aug '15

Author: gadamopoulos Date: Mon Aug 17 15:20:04 2015 New Revision: 68743 URL: http://svn.reactos.org/svn/reactos?rev=68743&view=rev Log: [SHELL32] - Remove CDesktopFolderDropTarget and make CDesktopFolder just get the drop target from m_DesktopFSFolder Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] Mon Aug 17 15:20:04 2015 @@ -43,37 +43,6 @@ /* Undocumented functions from shdocvw */ extern "C" HRESULT WINAPI IEParseDisplayNameWithBCW(DWORD codepage, LPCWSTR lpszDisplayName, LPBC pbc, LPITEMIDLIST *ppidl); - -/*********************************************************************** -* Desktopfolder implementation -*/ - -class CDesktopFolderDropTarget : - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IDropTarget -{ - private: - CComPtr<IShellFolder> m_psf; - BOOL m_fAcceptFmt; /* flag for pending Drop */ - UINT m_cfShellIDList; /* clipboardformat for IDropTarget */ - - void SF_RegisterClipFmt(); - BOOL QueryDrop (DWORD dwKeyState, LPDWORD pdwEffect); - public: - CDesktopFolderDropTarget(); - - HRESULT WINAPI Initialize(IShellFolder *psf); - - // IDropTarget - virtual HRESULT WINAPI DragEnter(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); - virtual HRESULT WINAPI DragOver(DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); - virtual HRESULT WINAPI DragLeave(); - virtual HRESULT WINAPI Drop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); - - BEGIN_COM_MAP(CDesktopFolderDropTarget) - COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget) - END_COM_MAP() -}; class CDesktopFolderEnum : public CEnumIDListBase @@ -509,7 +478,7 @@ if (IsEqualIID (riid, IID_IDropTarget)) { - hr = ShellObjectCreatorInit<CDesktopFolderDropTarget>(this, IID_IDropTarget, ppvOut); + hr = m_DesktopFSFolder->CreateViewObject(hwndOwner, riid, ppvOut); } else if (IsEqualIID (riid, IID_IContextMenu)) { @@ -641,11 +610,9 @@ else if (IsEqualIID (riid, IID_IDropTarget)) { /* only interested in attempting to bind to shell folders, not files, semicolon intentionate */ - if (cidl != 1 || FAILED(hr = this->_GetDropTarget(apidl[0], (LPVOID*) &pObj))) - { - IDropTarget * pDt = NULL; - hr = ShellObjectCreatorInit<CDesktopFolderDropTarget>(this, IID_IDropTarget, &pDt); - pObj = pDt; + if (cidl > 1) + { + hr = this->_GetDropTarget(apidl[0], (LPVOID*) &pObj); } } else if ((IsEqualIID(riid, IID_IShellLinkW) || @@ -1081,184 +1048,6 @@ return psfHelper->CopyItems(pSFFrom, cidl, apidl, bCopy); } -/**************************************************************************** - * IDropTarget implementation - * - * This should allow two somewhat separate things, copying files to the users directory, - * as well as allowing icons to be moved anywhere and updating the registry to save. - * - * The first thing I think is best done using fs.cpp to prevent WET code. So we'll simulate - * a drop to the user's home directory. The second will look at the pointer location and - * set sensible places for the icons to live. - * - */ -void CDesktopFolderDropTarget::SF_RegisterClipFmt() -{ - TRACE ("(%p)\n", this); - - if (!m_cfShellIDList) - m_cfShellIDList = RegisterClipboardFormatW(CFSTR_SHELLIDLIST); -} - -CDesktopFolderDropTarget::CDesktopFolderDropTarget() : - m_psf(NULL), - m_fAcceptFmt(FALSE), - m_cfShellIDList(0) -{ -} - -HRESULT WINAPI CDesktopFolderDropTarget::Initialize(IShellFolder *psf) -{ - m_psf = psf; - SF_RegisterClipFmt(); - return S_OK; -} - -BOOL CDesktopFolderDropTarget::QueryDrop(DWORD dwKeyState, LPDWORD pdwEffect) -{ - /* TODO Windows does different drop effects if dragging across drives. - i.e., it will copy instead of move if the directories are on different disks. */ - - DWORD dwEffect = DROPEFFECT_MOVE; - - *pdwEffect = DROPEFFECT_NONE; - - if (m_fAcceptFmt) { /* Does our interpretation of the keystate ... */ - *pdwEffect = KeyStateToDropEffect (dwKeyState); - - if (*pdwEffect == DROPEFFECT_NONE) - *pdwEffect = dwEffect; - - /* ... matches the desired effect ? */ - if (dwEffect & *pdwEffect) { - return TRUE; - } - } - return FALSE; -} - -HRESULT WINAPI CDesktopFolderDropTarget::DragEnter(IDataObject *pDataObject, - DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) -{ - TRACE("(%p)->(DataObject=%p)\n", this, pDataObject); - FORMATETC fmt; - FORMATETC fmt2; - m_fAcceptFmt = FALSE; - - InitFormatEtc (fmt, m_cfShellIDList, TYMED_HGLOBAL); - InitFormatEtc (fmt2, CF_HDROP, TYMED_HGLOBAL); - - if (SUCCEEDED(pDataObject->QueryGetData(&fmt))) - m_fAcceptFmt = TRUE; - else if (SUCCEEDED(pDataObject->QueryGetData(&fmt2))) - m_fAcceptFmt = TRUE; - - QueryDrop(dwKeyState, pdwEffect); - return S_OK; -} - -HRESULT WINAPI CDesktopFolderDropTarget::DragOver(DWORD dwKeyState, POINTL pt, - DWORD *pdwEffect) -{ - TRACE("(%p)\n", this); - - if (!pdwEffect) - return E_INVALIDARG; - - QueryDrop(dwKeyState, pdwEffect); - - return S_OK; -} - -HRESULT WINAPI CDesktopFolderDropTarget::DragLeave() -{ - TRACE("(%p)\n", this); - m_fAcceptFmt = FALSE; - return S_OK; -} - -HRESULT WINAPI CDesktopFolderDropTarget::Drop(IDataObject *pDataObject, - DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) -{ - TRACE("(%p) object dropped desktop\n", this); - - STGMEDIUM medium; - bool passthroughtofs = FALSE; - FORMATETC formatetc; - InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_SHELLIDLIST), TYMED_HGLOBAL); - - HRESULT hr = pDataObject->GetData(&formatetc, &medium); - if (SUCCEEDED(hr)) - { - /* lock the handle */ - LPIDA lpcida = (LPIDA)GlobalLock(medium.hGlobal); - if (!lpcida) - { - ReleaseStgMedium(&medium); - return E_FAIL; - } - - /* convert the clipboard data into pidl (pointer to id list) */ - LPITEMIDLIST pidl; - LPITEMIDLIST *apidl = _ILCopyCidaToaPidl(&pidl, lpcida); - if (!apidl) - { - ReleaseStgMedium(&medium); - return E_FAIL; - } - passthroughtofs = !_ILIsDesktop(pidl) || (dwKeyState & MK_CONTROL); - SHFree(pidl); - _ILFreeaPidl(apidl, lpcida->cidl); - ReleaseStgMedium(&medium); - } - else - { - InitFormatEtc (formatetc, CF_HDROP, TYMED_HGLOBAL); - if (SUCCEEDED(pDataObject->QueryGetData(&formatetc))) - { - passthroughtofs = TRUE; - } - } - /* We only want to really move files around if they don't already - come from the desktop, or we're linking or copying */ - if (passthroughtofs) - { - LPITEMIDLIST pidl = NULL; - - WCHAR szPath[MAX_PATH]; - STRRET strRet; - //LPWSTR pathPtr; - - /* build a complete path to create a simple pidl */ - hr = m_psf->GetDisplayNameOf(NULL, SHGDN_NORMAL | SHGDN_FORPARSING, &strRet); - if (SUCCEEDED(hr)) - { - hr = StrRetToBufW(&strRet, NULL, szPath, MAX_PATH); - ASSERT(SUCCEEDED(hr)); - /*pathPtr = */PathAddBackslashW(szPath); - //hr = _ILCreateFromPathW(szPath, &pidl); - hr = m_psf->ParseDisplayName(NULL, NULL, szPath, NULL, &pidl, NULL); - } - - if (SUCCEEDED(hr)) - { - CComPtr<IDropTarget> pDT; - hr = m_psf->BindToObject(pidl, NULL, IID_PPV_ARG(IDropTarget, &pDT)); - CoTaskMemFree(pidl); - if (SUCCEEDED(hr)) - SHSimulateDrop(pDT, pDataObject, dwKeyState, NULL, pdwEffect); - else - ERR("Error Binding"); - } - else - ERR("Error creating from %s\n", debugstr_w(szPath)); - } - - /* Todo, rewrite the registry such that the icons are well placed. - Blocked by no bags implementation. */ - return hr; -} - HRESULT WINAPI CDesktopFolder::_GetDropTarget(LPCITEMIDLIST pidl, LPVOID *ppvOut) { HRESULT hr;

1 0

[bfreisen] 68742: [MSPAINT] rename source directory
by bfreisen＠svn.reactos.org 17 Aug '15

17 Aug '15

Author: bfreisen Date: Mon Aug 17 15:01:53 2015 New Revision: 68742 URL: http://svn.reactos.org/svn/reactos?rev=68742&view=rev Log: [MSPAINT] rename source directory Added: trunk/reactos/base/applications/mspaint/ - copied from r68741, trunk/reactos/base/applications/mspaint_new/ Removed: trunk/reactos/base/applications/mspaint_new/ Modified: trunk/reactos/base/applications/CMakeLists.txt Modified: trunk/reactos/base/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/CMakeLis… ============================================================================== --- trunk/reactos/base/applications/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/CMakeLists.txt [iso-8859-1] Mon Aug 17 15:01:53 2015 @@ -19,7 +19,7 @@ add_subdirectory(mplay32) add_subdirectory(msconfig) add_subdirectory(mscutils) -add_subdirectory(mspaint_new) +add_subdirectory(mspaint) add_subdirectory(mstsc) add_subdirectory(network) add_subdirectory(notepad)

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