Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 72052: [USER32] - Add missing NULL-pointer checkes in rect functions - Small coding-style fixes
by dchapyshev＠svn.reactos.org 30 Jul '16

30 Jul '16

Author: dchapyshev Date: Sat Jul 30 11:31:33 2016 New Revision: 72052 URL: http://svn.reactos.org/svn/reactos?rev=72052&view=rev Log: [USER32] - Add missing NULL-pointer checkes in rect functions - Small coding-style fixes Modified: trunk/reactos/win32ss/user/user32/windows/rect.c Modified: trunk/reactos/win32ss/user/user32/windows/rect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/rect.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/rect.c [iso-8859-1] Sat Jul 30 11:31:33 2016 @@ -41,11 +41,12 @@ CopyRect(LPRECT lprcDst, CONST RECT *lprcSrc) { - if(lprcDst == NULL || lprcSrc == NULL) - return(FALSE); + if (lprcDst == NULL || lprcSrc == NULL) + return FALSE; *lprcDst = *lprcSrc; - return(TRUE); + + return TRUE; } @@ -74,11 +75,15 @@ int dx, int dy) { + if (rect == NULL) + return FALSE; + rect->left -= dx; rect->top -= dy; rect->right += dx; rect->bottom += dy; - return(TRUE); + + return TRUE; } @@ -91,6 +96,9 @@ CONST RECT *lprcSrc1, CONST RECT *lprcSrc2) { + if (lprcDst == NULL || lprcSrc1 == NULL || lprcSrc2 == NULL) + return FALSE; + if (IsRectEmpty(lprcSrc1) || IsRectEmpty(lprcSrc2) || lprcSrc1->left >= lprcSrc2->right || lprcSrc2->left >= lprcSrc1->right || @@ -98,13 +106,15 @@ lprcSrc2->top >= lprcSrc1->bottom) { SetRectEmpty(lprcDst); - return(FALSE); - } + return FALSE; + } + lprcDst->left = max(lprcSrc1->left, lprcSrc2->left); lprcDst->right = min(lprcSrc1->right, lprcSrc2->right); lprcDst->top = max(lprcSrc1->top, lprcSrc2->top); lprcDst->bottom = min(lprcSrc1->bottom, lprcSrc2->bottom); - return(TRUE); + + return TRUE; } @@ -115,7 +125,10 @@ WINAPI IsRectEmpty(CONST RECT *lprc) { - return((lprc->left >= lprc->right) || (lprc->top >= lprc->bottom)); + if (lprc == NULL) + return TRUE; + + return ((lprc->left >= lprc->right) || (lprc->top >= lprc->bottom)); } @@ -128,14 +141,15 @@ int dx, int dy) { - if(rect == NULL) - return(FALSE); + if (rect == NULL) + return FALSE; rect->left += dx; rect->top += dy; rect->right += dx; rect->bottom += dy; - return(TRUE); + + return TRUE; } @@ -147,6 +161,9 @@ PtInRect(CONST RECT *lprc, POINT pt) { + if (lprc == NULL) + return FALSE; + return((pt.x >= lprc->left) && (pt.x < lprc->right) && (pt.y >= lprc->top) && (pt.y < lprc->bottom)); } @@ -159,7 +176,7 @@ int xRight, int yBottom) { - if (!lprc) + if (lprc == NULL) return FALSE; lprc->left = xLeft; @@ -178,8 +195,12 @@ WINAPI SetRectEmpty(LPRECT lprc) { + if (lprc == NULL) + return FALSE; + lprc->left = lprc->right = lprc->top = lprc->bottom = 0; - return(TRUE); + + return TRUE; } @@ -194,13 +215,13 @@ { RECT tempRect; - if(lprcDst == NULL || lprcSrc1 == NULL || lprcSrc2 == NULL) - return(FALSE); - - if(!IntersectRect(&tempRect, lprcSrc1, lprcSrc2)) + if (lprcDst == NULL || lprcSrc1 == NULL || lprcSrc2 == NULL) + return FALSE; + + if (!IntersectRect(&tempRect, lprcSrc1, lprcSrc2)) { *lprcDst = *lprcSrc1; - return(TRUE); + return TRUE; } if (EqualRect(&tempRect, lprcSrc1)) @@ -211,22 +232,22 @@ *lprcDst = *lprcSrc1; - if(lprcDst->top == tempRect.top && lprcDst->bottom == tempRect.bottom) - { - if(lprcDst->left == tempRect.left) + if (lprcDst->top == tempRect.top && lprcDst->bottom == tempRect.bottom) + { + if (lprcDst->left == tempRect.left) lprcDst->left = tempRect.right; - else if(lprcDst->right == tempRect.right) + else if (lprcDst->right == tempRect.right) lprcDst->right = tempRect.left; } - else if(lprcDst->left == tempRect.left && lprcDst->right == tempRect.right) - { - if(lprcDst->top == tempRect.top) + else if (lprcDst->left == tempRect.left && lprcDst->right == tempRect.right) + { + if (lprcDst->top == tempRect.top) lprcDst->top = tempRect.bottom; - else if(lprcDst->bottom == tempRect.bottom) + else if (lprcDst->bottom == tempRect.bottom) lprcDst->bottom = tempRect.top; } - return(TRUE); + return TRUE; } @@ -239,12 +260,15 @@ CONST RECT *lprcSrc1, CONST RECT *lprcSrc2) { + if (lprcDst == NULL || lprcSrc1 == NULL || lprcSrc2 == NULL) + return FALSE; + if (IsRectEmpty(lprcSrc1)) { if (IsRectEmpty(lprcSrc2)) { SetRectEmpty(lprcDst); - return(FALSE); + return FALSE; } else { @@ -266,5 +290,5 @@ } } - return(TRUE); -} + return TRUE; +}

1 0

[zhu] 72051: Major rewrite of address.c, completely restructuring internal data. No longer maintaining linked list of connection endpoints; their references are handed off to lwIP to keep track of ...
by zhu＠svn.reactos.org 29 Jul '16

29 Jul '16

Author: zhu Date: Fri Jul 29 16:28:01 2016 New Revision: 72051 URL: http://svn.reactos.org/svn/reactos?rev=72051&view=rev Log: Major rewrite of address.c, completely restructuring internal data. No longer maintaining linked list of connection endpoints; their references are handed off to lwIP to keep track of in protocol control blocks. Scrapped redundant functions in duplicate address checking code in favor of exposing lwIP's free-port checking function and letting lwIP handle address collisions when binding. Added a custom mutex that allows only one execution context to access each connection endpoint (TCP_CONTEXT). Massively improved coding style consistency. Server side can handle multiple incoming connections in series without crashing, but there is an undiagnosed issue that causes frequent crashes on repeated attempts to connect to a server. The crash always happens after a call to tcp_connect() has been made, and before it returns. No attempted solution to the lwIP multi-threading problem in this commit. Modified: branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/main.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/core/tcp.c branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/core/udp.c branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/include/lwip/tcp.h branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/include/lwip/udp.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/base/appli… Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Modified: branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/core/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/sdk/lib/dr… Modified: branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/core/udp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/sdk/lib/dr… Modified: branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/include/lwip/tcp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/sdk/lib/dr… Modified: branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/include/lwip/udp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/sdk/lib/dr…

1 0

[hbelusca] 72050: [PCIX] Fix Device_SaveCurrentSettings: do not reference BarArray too soon if the index is out of bounds (in that case it means we are handling a ROM "BAR"). CID 716153, reported b...
by hbelusca＠svn.reactos.org 29 Jul '16

29 Jul '16

Author: hbelusca Date: Fri Jul 29 13:44:37 2016 New Revision: 72050 URL: http://svn.reactos.org/svn/reactos?rev=72050&view=rev Log: [PCIX] Fix Device_SaveCurrentSettings: do not reference BarArray too soon if the index is out of bounds (in that case it means we are handling a ROM "BAR"). CID 716153, reported by Victor Martinez Calvo. CORE-11215 #resolve Modified: trunk/reactos/drivers/bus/pcix/device.c Modified: trunk/reactos/drivers/bus/pcix/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/device.c?… ============================================================================== --- trunk/reactos/drivers/bus/pcix/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/device.c [iso-8859-1] Fri Jul 29 13:44:37 2016 @@ -46,12 +46,12 @@ CmDescriptor->u.Generic.Start.HighPart = 0; CmDescriptor->u.Generic.Length = IoDescriptor->u.Generic.Length; - /* Read the actual BAR value */ - Bar = BarArray[i]; - - /* Check which BAR is being processed now */ - if (i != PCI_TYPE0_ADDRESSES) - { + /* Check if we're handling PCI BARs, or the ROM BAR */ + if (i < PCI_TYPE0_ADDRESSES) + { + /* Read the actual BAR value */ + Bar = BarArray[i]; + /* Check if this is an I/O BAR */ if (Bar & PCI_ADDRESS_IO_SPACE) {

1 0

[hbelusca] 72049: [XDK] - Move the PCI_COMMON_HEADER_LAYOUT next to the structures that use it. - Add IRP flags description comments.
by hbelusca＠svn.reactos.org 29 Jul '16

29 Jul '16

Author: hbelusca Date: Fri Jul 29 13:17:58 2016 New Revision: 72049 URL: http://svn.reactos.org/svn/reactos?rev=72049&view=rev Log: [XDK] - Move the PCI_COMMON_HEADER_LAYOUT next to the structures that use it. - Add IRP flags description comments. Modified: trunk/reactos/sdk/include/xdk/iotypes.h Modified: trunk/reactos/sdk/include/xdk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/xdk/iotypes.h?… ============================================================================== --- trunk/reactos/sdk/include/xdk/iotypes.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/xdk/iotypes.h [iso-8859-1] Fri Jul 29 13:17:58 2016 @@ -498,80 +498,6 @@ ULONG SharedDelete; } SHARE_ACCESS, *PSHARE_ACCESS; -/* While MS WDK uses inheritance in C++, we cannot do this with gcc, as - inheritance, even from a struct renders the type non-POD. So we use - this hack */ -#define PCI_COMMON_HEADER_LAYOUT \ - USHORT VendorID; \ - USHORT DeviceID; \ - USHORT Command; \ - USHORT Status; \ - UCHAR RevisionID; \ - UCHAR ProgIf; \ - UCHAR SubClass; \ - UCHAR BaseClass; \ - UCHAR CacheLineSize; \ - UCHAR LatencyTimer; \ - UCHAR HeaderType; \ - UCHAR BIST; \ - union { \ - struct _PCI_HEADER_TYPE_0 { \ - ULONG BaseAddresses[PCI_TYPE0_ADDRESSES]; \ - ULONG CIS; \ - USHORT SubVendorID; \ - USHORT SubSystemID; \ - ULONG ROMBaseAddress; \ - UCHAR CapabilitiesPtr; \ - UCHAR Reserved1[3]; \ - ULONG Reserved2; \ - UCHAR InterruptLine; \ - UCHAR InterruptPin; \ - UCHAR MinimumGrant; \ - UCHAR MaximumLatency; \ - } type0; \ - struct _PCI_HEADER_TYPE_1 { \ - ULONG BaseAddresses[PCI_TYPE1_ADDRESSES]; \ - UCHAR PrimaryBus; \ - UCHAR SecondaryBus; \ - UCHAR SubordinateBus; \ - UCHAR SecondaryLatency; \ - UCHAR IOBase; \ - UCHAR IOLimit; \ - USHORT SecondaryStatus; \ - USHORT MemoryBase; \ - USHORT MemoryLimit; \ - USHORT PrefetchBase; \ - USHORT PrefetchLimit; \ - ULONG PrefetchBaseUpper32; \ - ULONG PrefetchLimitUpper32; \ - USHORT IOBaseUpper16; \ - USHORT IOLimitUpper16; \ - UCHAR CapabilitiesPtr; \ - UCHAR Reserved1[3]; \ - ULONG ROMBaseAddress; \ - UCHAR InterruptLine; \ - UCHAR InterruptPin; \ - USHORT BridgeControl; \ - } type1; \ - struct _PCI_HEADER_TYPE_2 { \ - ULONG SocketRegistersBaseAddress; \ - UCHAR CapabilitiesPtr; \ - UCHAR Reserved; \ - USHORT SecondaryStatus; \ - UCHAR PrimaryBus; \ - UCHAR SecondaryBus; \ - UCHAR SubordinateBus; \ - UCHAR SecondaryLatency; \ - struct { \ - ULONG Base; \ - ULONG Limit; \ - } Range[PCI_TYPE2_ADDRESSES-1]; \ - UCHAR InterruptLine; \ - UCHAR InterruptPin; \ - USHORT BridgeControl; \ - } type2; \ - } u; - typedef enum _CREATE_FILE_TYPE { CreateFileTypeNone, CreateFileTypeNamedPipe, @@ -1836,7 +1762,7 @@ #define VPB_RAW_MOUNT 0x0010 #define VPB_DIRECT_WRITES_ALLOWED 0x0020 -/* IRP.Flags */ +/* IO_STACK_LOCATION.Flags */ #define SL_FORCE_ACCESS_CHECK 0x01 #define SL_OPEN_PAGING_FILE 0x02 @@ -1876,6 +1802,8 @@ $endif (_WDMDDK_ || _DEVIOCTL_) $if (_WDMDDK_) + +/* IRP.Flags */ #define IRP_NOCACHE 0x00000001 #define IRP_PAGING_IO 0x00000002 #define IRP_MOUNT_COMPLETION 0x00000002 @@ -1896,6 +1824,7 @@ #define IRP_RETRY_IO_COMPLETION 0x00004000 #define IRP_CLASS_CACHE_OPERATION 0x00008000 +/* IRP.AllocationFlags */ #define IRP_QUOTA_CHARGED 0x01 #define IRP_ALLOCATED_MUST_SUCCEED 0x02 #define IRP_ALLOCATED_FIXED_SIZE 0x04 @@ -3181,6 +3110,80 @@ #define PCI_TYPE1_ADDRESSES 2 #define PCI_TYPE2_ADDRESSES 5 +/* While MS WDK uses inheritance in C++, we cannot do this with gcc, as + inheritance, even from a struct renders the type non-POD. So we use + this hack */ +#define PCI_COMMON_HEADER_LAYOUT \ + USHORT VendorID; \ + USHORT DeviceID; \ + USHORT Command; \ + USHORT Status; \ + UCHAR RevisionID; \ + UCHAR ProgIf; \ + UCHAR SubClass; \ + UCHAR BaseClass; \ + UCHAR CacheLineSize; \ + UCHAR LatencyTimer; \ + UCHAR HeaderType; \ + UCHAR BIST; \ + union { \ + struct _PCI_HEADER_TYPE_0 { \ + ULONG BaseAddresses[PCI_TYPE0_ADDRESSES]; \ + ULONG CIS; \ + USHORT SubVendorID; \ + USHORT SubSystemID; \ + ULONG ROMBaseAddress; \ + UCHAR CapabilitiesPtr; \ + UCHAR Reserved1[3]; \ + ULONG Reserved2; \ + UCHAR InterruptLine; \ + UCHAR InterruptPin; \ + UCHAR MinimumGrant; \ + UCHAR MaximumLatency; \ + } type0; \ + struct _PCI_HEADER_TYPE_1 { \ + ULONG BaseAddresses[PCI_TYPE1_ADDRESSES]; \ + UCHAR PrimaryBus; \ + UCHAR SecondaryBus; \ + UCHAR SubordinateBus; \ + UCHAR SecondaryLatency; \ + UCHAR IOBase; \ + UCHAR IOLimit; \ + USHORT SecondaryStatus; \ + USHORT MemoryBase; \ + USHORT MemoryLimit; \ + USHORT PrefetchBase; \ + USHORT PrefetchLimit; \ + ULONG PrefetchBaseUpper32; \ + ULONG PrefetchLimitUpper32; \ + USHORT IOBaseUpper16; \ + USHORT IOLimitUpper16; \ + UCHAR CapabilitiesPtr; \ + UCHAR Reserved1[3]; \ + ULONG ROMBaseAddress; \ + UCHAR InterruptLine; \ + UCHAR InterruptPin; \ + USHORT BridgeControl; \ + } type1; \ + struct _PCI_HEADER_TYPE_2 { \ + ULONG SocketRegistersBaseAddress; \ + UCHAR CapabilitiesPtr; \ + UCHAR Reserved; \ + USHORT SecondaryStatus; \ + UCHAR PrimaryBus; \ + UCHAR SecondaryBus; \ + UCHAR SubordinateBus; \ + UCHAR SecondaryLatency; \ + struct { \ + ULONG Base; \ + ULONG Limit; \ + } Range[PCI_TYPE2_ADDRESSES-1]; \ + UCHAR InterruptLine; \ + UCHAR InterruptPin; \ + USHORT BridgeControl; \ + } type2; \ + } u; + typedef struct _PCI_COMMON_HEADER { PCI_COMMON_HEADER_LAYOUT } PCI_COMMON_HEADER, *PPCI_COMMON_HEADER;

1 0

[gadamopoulos] 72048: Fix build.
by gadamopoulos＠svn.reactos.org 29 Jul '16

29 Jul '16

Author: gadamopoulos Date: Fri Jul 29 12:59:16 2016 New Revision: 72048 URL: http://svn.reactos.org/svn/reactos?rev=72048&view=rev Log: Fix build. Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.h Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.h [iso-8859-1] Fri Jul 29 12:59:16 2016 @@ -97,15 +97,6 @@ END_COM_MAP() }; -struct _DoDropData { - CFSDropTarget *This; - IStream *pStream; - DWORD dwKeyState; - POINTL pt; - DWORD pdwEffect; -}; - - class CFSDropTarget : public CComObjectRootEx<CComMultiThreadModelNoCS>, public IDropTarget @@ -142,4 +133,12 @@ }; +struct _DoDropData { + CFSDropTarget *This; + IStream *pStream; + DWORD dwKeyState; + POINTL pt; + DWORD pdwEffect; +}; + #endif /* _CFSFOLDER_H_ */

1 0

[gadamopoulos] 72047: [SHELL32] - Factor CFSDropTarget out of CFSFolder. - For now their code is mixed (no code was moved), until we decide where exactly is should be kept.
by gadamopoulos＠svn.reactos.org 29 Jul '16

29 Jul '16

Author: gadamopoulos Date: Fri Jul 29 12:56:06 2016 New Revision: 72047 URL: http://svn.reactos.org/svn/reactos?rev=72047&view=rev Log: [SHELL32] - Factor CFSDropTarget out of CFSFolder. - For now their code is mixed (no code was moved), until we decide where exactly is should be kept. Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp trunk/reactos/dll/win32/shell32/folders/CFSFolder.h Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] Fri Jul 29 12:56:06 2016 @@ -62,25 +62,11 @@ return CreateFolderEnumList(sPathTarget, dwFlags); } -/************************************************************************** -* registers clipboardformat once -*/ -void CFSFolder::SF_RegisterClipFmt() -{ - TRACE ("(%p)\n", this); - - if (!cfShellIDList) - cfShellIDList = RegisterClipboardFormatW(CFSTR_SHELLIDLIST); -} - CFSFolder::CFSFolder() { pclsid = (CLSID *)&CLSID_ShellFSFolder; sPathTarget = NULL; pidlRoot = NULL; - cfShellIDList = 0; - SF_RegisterClipFmt(); - fAcceptFmt = FALSE; m_bGroupPolicyActive = 0; } @@ -378,7 +364,7 @@ *ppvOut = NULL; if (IsEqualIID (riid, IID_IDropTarget)) - hr = this->QueryInterface (IID_IDropTarget, ppvOut); + hr = ShellObjectCreatorInit<CFSDropTarget>(sPathTarget, riid, ppvOut); else if (IsEqualIID (riid, IID_IContextMenu)) { FIXME ("IContextMenu not implemented\n"); @@ -524,7 +510,7 @@ if (cidl != 1 || FAILED(hr = this->_GetDropTarget(apidl[0], (LPVOID*) &pObj))) { IDropTarget * pDt = NULL; - hr = this->QueryInterface(IID_PPV_ARG(IDropTarget, &pDt)); + hr = ShellObjectCreatorInit<CFSDropTarget>(sPathTarget, riid, ppvOut); pObj = pDt; } } @@ -871,11 +857,11 @@ } /**************************************************************************** - * CFSFolder::CopyItems + * CFSDropTarget::CopyItems * * copies items to this folder */ -HRESULT WINAPI CFSFolder::CopyItems(IShellFolder * pSFFrom, UINT cidl, +HRESULT WINAPI CFSDropTarget::CopyItems(IShellFolder * pSFFrom, UINT cidl, LPCITEMIDLIST * apidl, BOOL bCopy) { CComPtr<IPersistFolder2> ppf2 = NULL; @@ -1136,8 +1122,34 @@ return E_NOTIMPL; } +CFSDropTarget::CFSDropTarget(): + cfShellIDList(0), + fAcceptFmt(FALSE), + sPathTarget(NULL) +{ +} + +HRESULT WINAPI CFSDropTarget::Initialize(LPWSTR PathTarget) +{ + cfShellIDList = RegisterClipboardFormatW(CFSTR_SHELLIDLIST); + if (!cfShellIDList) + return E_FAIL; + + sPathTarget = (WCHAR *)SHAlloc((wcslen(PathTarget) + 1) * sizeof(WCHAR)); + if (!sPathTarget) + return E_OUTOFMEMORY; + wcscpy(sPathTarget, PathTarget); + + return S_OK; +} + +CFSDropTarget::~CFSDropTarget() +{ + SHFree(sPathTarget); +} + BOOL -CFSFolder::GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut) +CFSDropTarget::GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut) { WCHAR wszLink[40]; @@ -1166,7 +1178,7 @@ /**************************************************************************** * IDropTarget implementation */ -BOOL CFSFolder::QueryDrop(DWORD dwKeyState, LPDWORD pdwEffect) +BOOL CFSDropTarget::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. */ @@ -1189,8 +1201,8 @@ return FALSE; } -HRESULT WINAPI CFSFolder::DragEnter(IDataObject *pDataObject, - DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) +HRESULT WINAPI CFSDropTarget::DragEnter(IDataObject *pDataObject, + DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) { TRACE("(%p)->(DataObject=%p)\n", this, pDataObject); FORMATETC fmt; @@ -1209,8 +1221,8 @@ return S_OK; } -HRESULT WINAPI CFSFolder::DragOver(DWORD dwKeyState, POINTL pt, - DWORD *pdwEffect) +HRESULT WINAPI CFSDropTarget::DragOver(DWORD dwKeyState, POINTL pt, + DWORD *pdwEffect) { TRACE("(%p)\n", this); @@ -1222,7 +1234,7 @@ return S_OK; } -HRESULT WINAPI CFSFolder::DragLeave() +HRESULT WINAPI CFSDropTarget::DragLeave() { TRACE("(%p)\n", this); @@ -1231,8 +1243,8 @@ return S_OK; } -HRESULT WINAPI CFSFolder::Drop(IDataObject *pDataObject, - DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) +HRESULT WINAPI CFSDropTarget::Drop(IDataObject *pDataObject, + DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) { TRACE("(%p) object dropped, effect %u\n", this, *pdwEffect); @@ -1259,15 +1271,15 @@ data->pt = pt; // Need to dereference as pdweffect gets freed. data->pdwEffect = *pdwEffect; - SHCreateThread(CFSFolder::_DoDropThreadProc, data, NULL, NULL); + SHCreateThread(CFSDropTarget::_DoDropThreadProc, data, NULL, NULL); return S_OK; } } return this->_DoDrop(pDataObject, dwKeyState, pt, pdwEffect); } -HRESULT WINAPI CFSFolder::_DoDrop(IDataObject *pDataObject, - DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) +HRESULT WINAPI CFSDropTarget::_DoDrop(IDataObject *pDataObject, + DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) { TRACE("(%p) performing drop, effect %u\n", this, *pdwEffect); FORMATETC fmt; @@ -1315,17 +1327,6 @@ CComPtr<IShellFolder> psfDesktop; CComPtr<IShellFolder> psfFrom = NULL; - CComPtr<IShellFolder> psfTarget = NULL; - - hr = this->QueryInterface(IID_PPV_ARG(IShellFolder, &psfTarget)); - if (FAILED(hr)) - { - ERR("psfTarget setting failed\n"); - SHFree(pidl); - _ILFreeaPidl(apidl, lpcida->cidl); - ReleaseStgMedium(&medium); - return E_FAIL; - } /* Grab the desktop shell folder */ hr = SHGetDesktopFolder(&psfDesktop); @@ -1359,32 +1360,11 @@ if (bLinking) { - CComPtr<IPersistFolder2> ppf2 = NULL; - STRRET strFile; WCHAR wszTargetPath[MAX_PATH]; - LPITEMIDLIST targetpidl; WCHAR wszPath[MAX_PATH]; WCHAR wszTarget[MAX_PATH]; - hr = this->QueryInterface(IID_PPV_ARG(IPersistFolder2, &ppf2)); - if (SUCCEEDED(hr)) - { - hr = ppf2->GetCurFolder(&targetpidl); - if (SUCCEEDED(hr)) - { - hr = psfDesktop->GetDisplayNameOf(targetpidl, SHGDN_FORPARSING, &strFile); - ILFree(targetpidl); - if (SUCCEEDED(hr)) - { - hr = StrRetToBufW(&strFile, NULL, wszTargetPath, _countof(wszTargetPath)); - } - } - } - - if (FAILED(hr)) - { - ERR("Error obtaining target path"); - } + wcscpy(wszTargetPath, sPathTarget); TRACE("target path = %s", debugstr_w(wszTargetPath)); @@ -1415,7 +1395,7 @@ LPWSTR pwszFileName = PathFindFileNameW(wszPath); LPWSTR pwszExt = PathFindExtensionW(wszPath); - LPWSTR placementPath = PathCombineW(lpStr1, wszTargetPath, pwszFileName); + LPWSTR placementPath = PathCombineW(lpStr1, sPathTarget, pwszFileName); CComPtr<IPersistFile> ppf; //Check to see if it's already a link. @@ -1428,7 +1408,7 @@ hr = E_FAIL; break; } - hr = IShellLink_ConstructFromFile(this, apidl[i], IID_PPV_ARG(IPersistFile, &ppf)); + hr = IShellLink_ConstructFromPath(wszPath, IID_PPV_ARG(IPersistFile, &ppf)); if (FAILED(hr)) { ERR("Error constructing link from file"); break; @@ -1495,41 +1475,13 @@ InitFormatEtc (fmt2, CF_HDROP, TYMED_HGLOBAL); if (SUCCEEDED(pDataObject->GetData(&fmt2, &medium)) /* && SUCCEEDED(pDataObject->GetData(&fmt2, &medium))*/) { - CComPtr<IPersistFolder2> ppf2 = NULL; - STRRET strFile; WCHAR wszTargetPath[MAX_PATH + 1]; LPWSTR pszSrcList; - LPITEMIDLIST targetpidl; - CComPtr<IShellFolder> psfDesktop = NULL; - hr = SHGetDesktopFolder(&psfDesktop); - if (FAILED(hr)) - { - ERR("SHGetDesktopFolder failed\n"); - return E_FAIL; - } - - hr = this->QueryInterface(IID_PPV_ARG(IPersistFolder2, &ppf2)); - if (SUCCEEDED(hr)) - { - hr = ppf2->GetCurFolder(&targetpidl); - if (SUCCEEDED(hr)) - { - hr = psfDesktop->GetDisplayNameOf(targetpidl, SHGDN_FORPARSING, &strFile); - ILFree(targetpidl); - if (SUCCEEDED(hr)) - { - hr = StrRetToBufW(&strFile, NULL, wszTargetPath, _countof(wszTargetPath)); - //Double NULL terminate. - wszTargetPath[wcslen(wszTargetPath) + 1] = '\0'; - } - } - } - if (FAILED(hr)) - { - ERR("Error obtaining target path"); - return E_FAIL; - } - + + wcscpy(wszTargetPath, sPathTarget); + //Double NULL terminate. + wszTargetPath[wcslen(wszTargetPath) + 1] = '\0'; + LPDROPFILES lpdf = (LPDROPFILES) GlobalLock(medium.hGlobal); if (!lpdf) { @@ -1561,7 +1513,8 @@ return hr; } -DWORD WINAPI CFSFolder::_DoDropThreadProc(LPVOID lpParameter) { +DWORD WINAPI CFSDropTarget::_DoDropThreadProc(LPVOID lpParameter) +{ CoInitialize(NULL); _DoDropData *data = static_cast<_DoDropData*>(lpParameter); CComPtr<IDataObject> pDataObject; @@ -1591,7 +1544,14 @@ TRACE("CFSFolder::_GetDropTarget entered\n"); if (_ILIsFolder (pidl)) - return this->BindToObject(pidl, NULL, IID_IDropTarget, ppvOut); + { + CComPtr<IShellFolder> psfChild; + hr = this->BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, &psfChild)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return psfChild->CreateViewObject(NULL, IID_IDropTarget, ppvOut); + } STRRET strFile; hr = this->GetDisplayNameOf(pidl, SHGDN_FORPARSING, &strFile); Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.h [iso-8859-1] Fri Jul 29 12:56:06 2016 @@ -29,8 +29,7 @@ public CComCoClass<CFSFolder, &CLSID_ShellFSFolder>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IShellFolder2, - public IPersistFolder3, - public IDropTarget + public IPersistFolder3 { private: CLSID *pclsid; @@ -40,24 +39,15 @@ LPITEMIDLIST pidlRoot; /* absolute pidl */ - UINT cfShellIDList; /* clipboardformat for IDropTarget */ - BOOL fAcceptFmt; /* flag for pending Drop */ - BOOL QueryDrop (DWORD dwKeyState, LPDWORD pdwEffect); DWORD m_bGroupPolicyActive; - void SF_RegisterClipFmt(); - BOOL GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut); - static DWORD WINAPI _DoDropThreadProc(LPVOID lpParameter); - virtual HRESULT WINAPI _DoDrop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); virtual HRESULT WINAPI _GetDropTarget(LPCITEMIDLIST pidl, LPVOID *ppvOut); virtual HRESULT WINAPI _LoadDynamicDropTargetHandlerForKey(HKEY hRootKey, LPCWSTR pwcsname, LPVOID *ppvOut); virtual HRESULT WINAPI _LoadDynamicDropTargetHandler(const CLSID *pclsid, LPCWSTR pwcsname, LPVOID *ppvOut); - virtual HRESULT WINAPI CopyItems(IShellFolder *pSFFrom, UINT cidl, LPCITEMIDLIST *apidl, BOOL bCopy); public: CFSFolder(); ~CFSFolder(); - // IShellFolder virtual HRESULT WINAPI ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes); virtual HRESULT WINAPI EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList); @@ -92,12 +82,6 @@ virtual HRESULT WINAPI InitializeEx(IBindCtx *pbc, LPCITEMIDLIST pidlRoot, const PERSIST_FOLDER_TARGET_INFO *ppfti); virtual HRESULT WINAPI GetFolderTargetInfo(PERSIST_FOLDER_TARGET_INFO *ppfti); - // 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); - DECLARE_REGISTRY_RESOURCEID(IDR_SHELLFSFOLDER) DECLARE_NOT_AGGREGATABLE(CFSFolder) @@ -110,16 +94,52 @@ COM_INTERFACE_ENTRY_IID(IID_IPersistFolder2, IPersistFolder2) COM_INTERFACE_ENTRY_IID(IID_IPersistFolder3, IPersistFolder3) COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) - COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget) END_COM_MAP() }; struct _DoDropData { - CFSFolder *This; + CFSDropTarget *This; IStream *pStream; DWORD dwKeyState; POINTL pt; DWORD pdwEffect; }; + +class CFSDropTarget : + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IDropTarget +{ + private: + UINT cfShellIDList; /* clipboardformat for IDropTarget */ + BOOL fAcceptFmt; /* flag for pending Drop */ + LPWSTR sPathTarget; + + BOOL QueryDrop (DWORD dwKeyState, LPDWORD pdwEffect); + virtual HRESULT WINAPI _DoDrop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); + virtual HRESULT WINAPI CopyItems(IShellFolder *pSFFrom, UINT cidl, LPCITEMIDLIST *apidl, BOOL bCopy); + BOOL GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut); + static DWORD WINAPI _DoDropThreadProc(LPVOID lpParameter); + + public: + CFSDropTarget(); + ~CFSDropTarget(); + HRESULT WINAPI Initialize(LPWSTR PathTarget); + + // 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); + + DECLARE_NOT_AGGREGATABLE(CFSDropTarget) + + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CFSDropTarget) + COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget) + END_COM_MAP() + +}; + #endif /* _CFSFOLDER_H_ */

1 0

[rnaumann] 72046: [BROWSEUI] - explorerband: get the caption string from resource file instead of hardcoding it
by rnaumann＠svn.reactos.org 29 Jul '16

29 Jul '16

Author: rnaumann Date: Fri Jul 29 12:05:06 2016 New Revision: 72046 URL: http://svn.reactos.org/svn/reactos?rev=72046&view=rev Log: [BROWSEUI] - explorerband: get the caption string from resource file instead of hardcoding it Modified: trunk/reactos/dll/win32/browseui/explorerband.cpp Modified: trunk/reactos/dll/win32/browseui/explorerband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/explore… ============================================================================== --- trunk/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] Fri Jul 29 12:05:06 2016 @@ -673,7 +673,8 @@ if (pdbi->dwMask & DBIM_TITLE) { - lstrcpyW(pdbi->wszTitle, L"Explorer"); + if (!LoadStringW(_AtlBaseModule.GetResourceInstance(), IDS_FOLDERSLABEL, pdbi->wszTitle, _countof(pdbi->wszTitle))) + return HRESULT_FROM_WIN32(GetLastError()); } if (pdbi->dwMask & DBIM_MODEFLAGS)

1 0

[gadamopoulos] 72045: [SHELL32] - CDefView: Add a missing error check. CORE-11594
by gadamopoulos＠svn.reactos.org 29 Jul '16

29 Jul '16

Author: gadamopoulos Date: Fri Jul 29 12:03:20 2016 New Revision: 72045 URL: http://svn.reactos.org/svn/reactos?rev=72045&view=rev Log: [SHELL32] - CDefView: Add a missing error check. CORE-11594 Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Fri Jul 29 12:03:20 2016 @@ -2315,7 +2315,13 @@ else if (IsEqualIID(riid, IID_IDispatch)) { if (m_pShellFolderViewDual == NULL) + { hr = CDefViewDual_Constructor(riid, (LPVOID*)&m_pShellFolderViewDual); + if (FAILED_UNEXPECTEDLY(hr)) + { + return hr; + } + } hr = m_pShellFolderViewDual->QueryInterface(riid, ppvOut); } break;

1 0

[pschweitzer] 72044: [EXT2] Reduce driver verbosity
by pschweitzer＠svn.reactos.org 29 Jul '16

29 Jul '16

Author: pschweitzer Date: Fri Jul 29 11:54:08 2016 New Revision: 72044 URL: http://svn.reactos.org/svn/reactos?rev=72044&view=rev Log: [EXT2] Reduce driver verbosity Modified: trunk/reactos/drivers/filesystems/ext2/inc/ext2fs.h Modified: trunk/reactos/drivers/filesystems/ext2/inc/ext2fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/inc/ext2fs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/inc/ext2fs.h [iso-8859-1] Fri Jul 29 11:54:08 2016 @@ -1399,13 +1399,7 @@ #define DL_PNP 0x00010000 /* pnp */ #define DL_IO 0x00020000 /* file i/o */ -#define DL_ALL (DL_ERR|DL_VIT|DL_DBG|DL_INF|DL_FUN|DL_LOW|DL_REN|DL_RES|DL_BLK|DL_CP|DL_EXT|DL_MAP|DL_JNL|DL_HTI|DL_WRN|DL_BH|DL_PNP|DL_IO) - -#if EXT2_DEBUG && defined(__REACTOS__) - #define DL_DEFAULT (DL_ERR|DL_VIT|DL_DBG|DL_INF|DL_FUN|DL_LOW|DL_WRN) -#else - #define DL_DEFAULT (DL_ERR|DL_VIT) -#endif +#define DL_DEFAULT (DL_ERR|DL_VIT) #if EXT2_DEBUG extern ULONG DebugFilter;

1 0

[gadamopoulos] 72043: [BROWSEUI] - CExplorerBand: TranslateAcceleratorIO should return S_FALSE when it doesn't process the message in order to let other components process it. CORE-11709
by gadamopoulos＠svn.reactos.org 29 Jul '16

29 Jul '16

Author: gadamopoulos Date: Fri Jul 29 10:38:22 2016 New Revision: 72043 URL: http://svn.reactos.org/svn/reactos?rev=72043&view=rev Log: [BROWSEUI] - CExplorerBand: TranslateAcceleratorIO should return S_FALSE when it doesn't process the message in order to let other components process it. CORE-11709 Modified: trunk/reactos/dll/win32/browseui/explorerband.cpp Modified: trunk/reactos/dll/win32/browseui/explorerband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/explore… ============================================================================== --- trunk/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] Fri Jul 29 10:38:22 2016 @@ -799,11 +799,15 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::TranslateAcceleratorIO(LPMSG lpMsg) { - TranslateMessage(lpMsg); - DispatchMessage(lpMsg); - return S_OK; -} - + if (lpMsg->hwnd == m_hWnd) + { + TranslateMessage(lpMsg); + DispatchMessage(lpMsg); + return S_OK; + } + + return S_FALSE; +} // *** IPersist methods *** HRESULT STDMETHODCALLTYPE CExplorerBand::GetClassID(CLSID *pClassID)

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