diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c
index 36b3a422e8c..6dce9575b59 100644
--- a/dlls/comctl32/dpa.c
+++ b/dlls/comctl32/dpa.c
@@ -524,9 +524,9 @@ HDPA WINAPI DPA_Clone (const HDPA hdpa, HDPA hdpaNew)
  *     Success: pointer
  *     Failure: NULL
  */
-LPVOID WINAPI DPA_GetPtr (HDPA hdpa, INT nIndex)
+LPVOID WINAPI DPA_GetPtr (HDPA hdpa, INT_PTR nIndex)
 {
-    TRACE("(%p %d)\n", hdpa, nIndex);
+    TRACE("(%p %ld)\n", hdpa, nIndex);
 
     if (!hdpa)
         return NULL;
@@ -535,7 +535,7 @@ LPVOID WINAPI DPA_GetPtr (HDPA hdpa, INT nIndex)
         return NULL;
     }
     if ((nIndex < 0) || (nIndex >= hdpa->nItemCount)) {
-        WARN("not enough pointers in array (%d vs %d).\n",nIndex,hdpa->nItemCount);
+        WARN("not enough pointers in array (%ld vs %d).\n",nIndex,hdpa->nItemCount);
         return NULL;
     }
 
diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c
index cbe3ab7fb2b..4a446a8e2c5 100644
--- a/dlls/comctl32/tests/dpa.c
+++ b/dlls/comctl32/tests/dpa.c
@@ -49,7 +49,7 @@ static PVOID   (WINAPI *pDPA_DeletePtr)(HDPA,INT);
 static BOOL    (WINAPI *pDPA_Destroy)(HDPA);
 static VOID    (WINAPI *pDPA_DestroyCallback)(HDPA,PFNDPAENUMCALLBACK,PVOID);
 static VOID    (WINAPI *pDPA_EnumCallback)(HDPA,PFNDPAENUMCALLBACK,PVOID); 
-static INT     (WINAPI *pDPA_GetPtr)(HDPA,INT);
+static PVOID   (WINAPI *pDPA_GetPtr)(HDPA,INT_PTR);
 static INT     (WINAPI *pDPA_GetPtrIndex)(HDPA,PVOID);
 static BOOL    (WINAPI *pDPA_Grow)(HDPA,INT);
 static INT     (WINAPI *pDPA_InsertPtr)(HDPA,INT,PVOID);
diff --git a/include/commctrl.h b/include/commctrl.h
index dfd2f4a37d2..97e2fcc4df0 100644
--- a/include/commctrl.h
+++ b/include/commctrl.h
@@ -5170,7 +5170,7 @@ BOOL   WINAPI DPA_Destroy(HDPA);
 LPVOID WINAPI DPA_DeletePtr(HDPA, INT);
 BOOL   WINAPI DPA_DeleteAllPtrs(HDPA);
 BOOL   WINAPI DPA_SetPtr(HDPA, INT, LPVOID);
-LPVOID WINAPI DPA_GetPtr(HDPA, INT);
+LPVOID WINAPI DPA_GetPtr(HDPA, INT_PTR);
 INT    WINAPI DPA_GetPtrIndex(HDPA, LPCVOID);
 ULONGLONG WINAPI DPA_GetSize(HDPA);
 BOOL   WINAPI DPA_Grow(HDPA, INT);