From 2dc2ec9de359e4d6c31b6f61ba305e4323db8ddd Mon Sep 17 00:00:00 2001
From: Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
Date: Wed, 22 Apr 2020 23:08:56 +0900
Subject: [PATCH] [MYDOCS] Follow-up of #2624

Use HIDA_GetPIDLFolder and HIDA_GetPIDLItem.
CORE-12562
---
 dll/shellext/mydocs/CMyDocsDropHandler.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dll/shellext/mydocs/CMyDocsDropHandler.cpp b/dll/shellext/mydocs/CMyDocsDropHandler.cpp
index c21be8964b9..cd74af6d016 100644
--- a/dll/shellext/mydocs/CMyDocsDropHandler.cpp
+++ b/dll/shellext/mydocs/CMyDocsDropHandler.cpp
@@ -95,12 +95,11 @@ CMyDocsDropHandler::Drop(IDataObject *pDataObject, DWORD dwKeyState,
     // for all source items
     CStringW strSrcList;
     WCHAR szSrc[MAX_PATH];
-    const BYTE *pb = reinterpret_cast<BYTE *>(pida);
-    PCIDLIST_ABSOLUTE pidlParent = reinterpret_cast<PCIDLIST_ABSOLUTE>(pb + pida->aoffset[0]);
+    PCIDLIST_ABSOLUTE pidlParent = HIDA_GetPIDLFolder(pida);
     for (iItem = 0; iItem < cItems; ++iItem)
     {
         // query source pidl
-        PCITEMID_CHILD pidlChild = reinterpret_cast<PCITEMID_CHILD>(pb + pida->aoffset[iItem + 1]);
+        PCITEMID_CHILD pidlChild = HIDA_GetPIDLItem(pida, iItem);
         CComHeapPtr<ITEMIDLIST> pidl(ILCombine(pidlParent, pidlChild));
 
         // can get path?