comctl32: Remove superfluous const from DPA/DSA function signatures.
Thomas Faber
thomas.faber at reactos.org
Sat Sep 28 10:31:29 CDT 2013
MSVC warns for most of these since they don't match with the header
file:
warning C4028: formal parameter 1 different from declaration
-------------- next part --------------
From 7ddfb3284f6f6d188f7b60aa37478ba330255321 Mon Sep 17 00:00:00 2001
From: Thomas Faber <thomas.faber at reactos.org>
Date: Sat, 28 Sep 2013 17:18:03 +0200
Subject: comctl32: Remove superfluous const from DPA/DSA function signatures.
---
dlls/comctl32/dpa.c | 20 ++++++++++----------
dlls/comctl32/dsa.c | 14 +++++++-------
dlls/comctl32/tests/dpa.c | 20 ++++++++++----------
3 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c
index dbe9bf8..11dd14f 100644
--- a/dlls/comctl32/dpa.c
+++ b/dlls/comctl32/dpa.c
@@ -174,7 +174,7 @@ HRESULT WINAPI DPA_LoadStream (HDPA *phDpa, PFNDPASTREAM loadProc,
* NOTES
* No more information available yet!
*/
-HRESULT WINAPI DPA_SaveStream (const HDPA hDpa, PFNDPASTREAM saveProc,
+HRESULT WINAPI DPA_SaveStream (HDPA hDpa, PFNDPASTREAM saveProc,
IStream *pStream, LPVOID pData)
{
LARGE_INTEGER position;
@@ -397,7 +397,7 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags,
* Success: TRUE
* Failure: FALSE
*/
-BOOL WINAPI DPA_Destroy (const HDPA hdpa)
+BOOL WINAPI DPA_Destroy (HDPA hdpa)
{
TRACE("(%p)\n", hdpa);
@@ -471,7 +471,7 @@ BOOL WINAPI DPA_Grow (HDPA hdpa, INT nGrow)
* - If 'hdpa' is a NULL-Pointer, the original implementation crashes,
* this implementation just returns NULL.
*/
-HDPA WINAPI DPA_Clone (const HDPA hdpa, const HDPA hdpaNew)
+HDPA WINAPI DPA_Clone (const HDPA hdpa, HDPA hdpaNew)
{
INT nNewItems, nSize;
HDPA hdpaTemp;
@@ -528,7 +528,7 @@ HDPA WINAPI DPA_Clone (const HDPA hdpa, const HDPA hdpaNew)
* Success: pointer
* Failure: NULL
*/
-LPVOID WINAPI DPA_GetPtr (const HDPA hdpa, INT nIndex)
+LPVOID WINAPI DPA_GetPtr (HDPA hdpa, INT nIndex)
{
TRACE("(%p %d)\n", hdpa, nIndex);
@@ -592,7 +592,7 @@ INT WINAPI DPA_GetPtrIndex (HDPA hdpa, LPCVOID p)
* Success: index of the inserted pointer
* Failure: -1
*/
-INT WINAPI DPA_InsertPtr (const HDPA hdpa, INT i, LPVOID p)
+INT WINAPI DPA_InsertPtr (HDPA hdpa, INT i, LPVOID p)
{
TRACE("(%p %d %p)\n", hdpa, i, p);
@@ -627,7 +627,7 @@ INT WINAPI DPA_InsertPtr (const HDPA hdpa, INT i, LPVOID p)
* Success: TRUE
* Failure: FALSE
*/
-BOOL WINAPI DPA_SetPtr (const HDPA hdpa, INT i, LPVOID p)
+BOOL WINAPI DPA_SetPtr (HDPA hdpa, INT i, LPVOID p)
{
LPVOID *lpTemp;
@@ -678,7 +678,7 @@ BOOL WINAPI DPA_SetPtr (const HDPA hdpa, INT i, LPVOID p)
* Success: deleted pointer
* Failure: NULL
*/
-LPVOID WINAPI DPA_DeletePtr (const HDPA hdpa, INT i)
+LPVOID WINAPI DPA_DeletePtr (HDPA hdpa, INT i)
{
LPVOID *lpDest, *lpSrc, lpTemp = NULL;
INT nSize;
@@ -731,7 +731,7 @@ LPVOID WINAPI DPA_DeletePtr (const HDPA hdpa, INT i)
* Success: TRUE
* Failure: FALSE
*/
-BOOL WINAPI DPA_DeleteAllPtrs (const HDPA hdpa)
+BOOL WINAPI DPA_DeleteAllPtrs (HDPA hdpa)
{
TRACE("(%p)\n", hdpa);
@@ -814,7 +814,7 @@ static VOID DPA_QuickSort (LPVOID *lpPtrs, INT l, INT r,
* Success: TRUE
* Failure: FALSE
*/
-BOOL WINAPI DPA_Sort (const HDPA hdpa, PFNDPACOMPARE pfnCompare, LPARAM lParam)
+BOOL WINAPI DPA_Sort (HDPA hdpa, PFNDPACOMPARE pfnCompare, LPARAM lParam)
{
if (!hdpa || !pfnCompare)
return FALSE;
@@ -846,7 +846,7 @@ BOOL WINAPI DPA_Sort (const HDPA hdpa, PFNDPACOMPARE pfnCompare, LPARAM lParam)
* Success: index of the pointer in the array.
* Failure: -1
*/
-INT WINAPI DPA_Search (const HDPA hdpa, LPVOID pFind, INT nStart,
+INT WINAPI DPA_Search (HDPA hdpa, LPVOID pFind, INT nStart,
PFNDPACOMPARE pfnCompare, LPARAM lParam, UINT uOptions)
{
if (!hdpa || !pfnCompare || !pFind)
diff --git a/dlls/comctl32/dsa.c b/dlls/comctl32/dsa.c
index 13f63e2..71837db 100644
--- a/dlls/comctl32/dsa.c
+++ b/dlls/comctl32/dsa.c
@@ -100,7 +100,7 @@ HDSA WINAPI DSA_Create (INT nSize, INT nGrow)
* Success: TRUE
* Failure: FALSE
*/
-BOOL WINAPI DSA_Destroy (const HDSA hdsa)
+BOOL WINAPI DSA_Destroy (HDSA hdsa)
{
TRACE("(%p)\n", hdsa);
@@ -128,7 +128,7 @@ BOOL WINAPI DSA_Destroy (const HDSA hdsa)
* Success: TRUE
* Failure: FALSE
*/
-BOOL WINAPI DSA_GetItem (const HDSA hdsa, INT nIndex, LPVOID pDest)
+BOOL WINAPI DSA_GetItem (HDSA hdsa, INT nIndex, LPVOID pDest)
{
LPVOID pSrc;
@@ -159,7 +159,7 @@ BOOL WINAPI DSA_GetItem (const HDSA hdsa, INT nIndex, LPVOID pDest)
* Success: pointer to an item
* Failure: NULL
*/
-LPVOID WINAPI DSA_GetItemPtr (const HDSA hdsa, INT nIndex)
+LPVOID WINAPI DSA_GetItemPtr (HDSA hdsa, INT nIndex)
{
LPVOID pSrc;
@@ -192,7 +192,7 @@ LPVOID WINAPI DSA_GetItemPtr (const HDSA hdsa, INT nIndex)
* Success: TRUE
* Failure: FALSE
*/
-BOOL WINAPI DSA_SetItem (const HDSA hdsa, INT nIndex, LPVOID pSrc)
+BOOL WINAPI DSA_SetItem (HDSA hdsa, INT nIndex, LPVOID pSrc)
{
INT nSize, nNewItems;
LPVOID pDest, lpTemp;
@@ -248,7 +248,7 @@ BOOL WINAPI DSA_SetItem (const HDSA hdsa, INT nIndex, LPVOID pSrc)
* Success: position of the new item
* Failure: -1
*/
-INT WINAPI DSA_InsertItem (const HDSA hdsa, INT nIndex, LPVOID pSrc)
+INT WINAPI DSA_InsertItem (HDSA hdsa, INT nIndex, LPVOID pSrc)
{
INT nNewItems, nSize;
LPVOID lpTemp, lpDest;
@@ -309,7 +309,7 @@ INT WINAPI DSA_InsertItem (const HDSA hdsa, INT nIndex, LPVOID pSrc)
* Success: number of the deleted element
* Failure: -1
*/
-INT WINAPI DSA_DeleteItem (const HDSA hdsa, INT nIndex)
+INT WINAPI DSA_DeleteItem (HDSA hdsa, INT nIndex)
{
LPVOID lpDest,lpSrc;
INT nSize;
@@ -361,7 +361,7 @@ INT WINAPI DSA_DeleteItem (const HDSA hdsa, INT nIndex)
* Success: TRUE
* Failure: FALSE
*/
-BOOL WINAPI DSA_DeleteAllItems (const HDSA hdsa)
+BOOL WINAPI DSA_DeleteAllItems (HDSA hdsa)
{
TRACE("(%p)\n", hdsa);
diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c
index e359139..644f3aa 100644
--- a/dlls/comctl32/tests/dpa.c
+++ b/dlls/comctl32/tests/dpa.c
@@ -40,24 +40,24 @@ typedef struct _STREAMDATA
DWORD dwItems;
} STREAMDATA, *PSTREAMDATA;
-static HDPA (WINAPI *pDPA_Clone)(const HDPA,const HDPA);
+static HDPA (WINAPI *pDPA_Clone)(const HDPA,HDPA);
static HDPA (WINAPI *pDPA_Create)(INT);
static HDPA (WINAPI *pDPA_CreateEx)(INT,HANDLE);
-static PVOID (WINAPI *pDPA_DeleteAllPtrs)(const HDPA);
-static PVOID (WINAPI *pDPA_DeletePtr)(const HDPA,INT);
-static BOOL (WINAPI *pDPA_Destroy)(const HDPA);
+static PVOID (WINAPI *pDPA_DeleteAllPtrs)(HDPA);
+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)(const HDPA,INT);
-static INT (WINAPI *pDPA_GetPtrIndex)(const HDPA,PVOID);
+static INT (WINAPI *pDPA_GetPtr)(HDPA,INT);
+static INT (WINAPI *pDPA_GetPtrIndex)(HDPA,PVOID);
static BOOL (WINAPI *pDPA_Grow)(HDPA,INT);
-static INT (WINAPI *pDPA_InsertPtr)(const HDPA,INT,PVOID);
+static INT (WINAPI *pDPA_InsertPtr)(HDPA,INT,PVOID);
static HRESULT (WINAPI *pDPA_LoadStream)(HDPA*,PFNDPASTREAM,IStream*,LPVOID);
-static BOOL (WINAPI *pDPA_Merge)(const HDPA,const HDPA,DWORD,PFNDPACOMPARE,PFNDPAMERGE,LPARAM);
+static BOOL (WINAPI *pDPA_Merge)(HDPA,HDPA,DWORD,PFNDPACOMPARE,PFNDPAMERGE,LPARAM);
static HRESULT (WINAPI *pDPA_SaveStream)(HDPA,PFNDPASTREAM,IStream*,LPVOID);
static INT (WINAPI *pDPA_Search)(HDPA,PVOID,INT,PFNDPACOMPARE,LPARAM,UINT);
-static BOOL (WINAPI *pDPA_SetPtr)(const HDPA,INT,PVOID);
-static BOOL (WINAPI *pDPA_Sort)(const HDPA,PFNDPACOMPARE,LPARAM);
+static BOOL (WINAPI *pDPA_SetPtr)(HDPA,INT,PVOID);
+static BOOL (WINAPI *pDPA_Sort)(HDPA,PFNDPACOMPARE,LPARAM);
#define COMCTL32_GET_PROC(func, ord) \
((p ## func = (PVOID)GetProcAddress(hcomctl32,(LPCSTR)ord)) ? 1 \
--
1.7.11.msysgit.1
More information about the wine-patches
mailing list