dlls: Replace the remaining CONSTs.
Michael Stefaniuc
mstefani at redhat.de
Wed Sep 25 03:39:19 CDT 2013
---
dlls/comctl32/imagelist.c | 2 +-
dlls/d3dxof/tests/d3dxof.c | 4 ++--
dlls/dmusic/tests/dmusic.c | 2 +-
dlls/kernel32/console.c | 2 +-
dlls/kernel32/tests/console.c | 2 +-
dlls/krnl386.exe16/registry.c | 4 ++--
dlls/ntdll/rtl.c | 2 +-
dlls/ntoskrnl.exe/ntoskrnl.c | 2 +-
dlls/ole32/comcat.c | 3 +--
dlls/secur32/tests/schannel.c | 2 +-
dlls/serialui/confdlg.c | 2 +-
dlls/user.exe16/message.c | 4 ++--
dlls/wininet/tests/internet.c | 4 ++--
13 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c
index 76d5709..ec8d08a 100644
--- a/dlls/comctl32/imagelist.c
+++ b/dlls/comctl32/imagelist.c
@@ -3160,7 +3160,7 @@ static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT count)
*/
UINT WINAPI
-ImageList_SetColorTable (HIMAGELIST himl, UINT uStartIndex, UINT cEntries, CONST RGBQUAD * prgb)
+ImageList_SetColorTable(HIMAGELIST himl, UINT uStartIndex, UINT cEntries, const RGBQUAD *prgb)
{
return SetDIBColorTable(himl->hdcImage, uStartIndex, cEntries, prgb);
}
diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c
index f115eb3..f4ab68a 100644
--- a/dlls/d3dxof/tests/d3dxof.c
+++ b/dlls/d3dxof/tests/d3dxof.c
@@ -40,7 +40,7 @@
#define SEMICOLON_5X TOKEN_SEMICOLON, TOKEN_SEMICOLON, TOKEN_SEMICOLON, TOKEN_SEMICOLON, TOKEN_SEMICOLON
-static inline void debugstr_guid( char* buf, CONST GUID *id )
+static inline void debugstr_guid( char *buf, const GUID *id )
{
sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
id->Data1, id->Data2, id->Data3,
@@ -1119,7 +1119,7 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int level)
HRESULT hr;
char name[100];
GUID clsid;
- CONST GUID* clsid_type = NULL;
+ const GUID *clsid_type = NULL;
char str_clsid[40];
char str_clsid_type[40];
DWORD len = 100;
diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c
index 8d070b7..3174685 100644
--- a/dlls/dmusic/tests/dmusic.c
+++ b/dlls/dmusic/tests/dmusic.c
@@ -29,7 +29,7 @@
#include "dmusici.h"
#include "dmksctrl.h"
-static inline const char* debugstr_guid(CONST GUID *id)
+static inline const char* debugstr_guid(const GUID *id)
{
static char string[39];
sprintf(string, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c
index 8405f4f..9f2f528 100644
--- a/dlls/kernel32/console.c
+++ b/dlls/kernel32/console.c
@@ -690,7 +690,7 @@ BOOL WINAPI WriteConsoleOutputCharacterA( HANDLE hConsoleOutput, LPCSTR str, DWO
* Failure: FALSE
*
*/
-BOOL WINAPI WriteConsoleOutputAttribute( HANDLE hConsoleOutput, CONST WORD *attr, DWORD length,
+BOOL WINAPI WriteConsoleOutputAttribute( HANDLE hConsoleOutput, const WORD *attr, DWORD length,
COORD coord, LPDWORD lpNumAttrsWritten )
{
BOOL ret;
diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c
index df752f4..b02e723 100644
--- a/dlls/kernel32/tests/console.c
+++ b/dlls/kernel32/tests/console.c
@@ -2001,7 +2001,7 @@ static void test_WriteConsoleOutputAttribute(HANDLE output_handle)
const struct
{
HANDLE hConsoleOutput;
- CONST WORD *attr;
+ const WORD *attr;
DWORD length;
COORD coord;
LPDWORD lpNumAttrsWritten;
diff --git a/dlls/krnl386.exe16/registry.c b/dlls/krnl386.exe16/registry.c
index f64e490..397296a 100644
--- a/dlls/krnl386.exe16/registry.c
+++ b/dlls/krnl386.exe16/registry.c
@@ -42,7 +42,7 @@ static DWORD (WINAPI *pRegOpenKeyA)(HKEY,LPCSTR,PHKEY);
static DWORD (WINAPI *pRegQueryValueA)(HKEY,LPCSTR,LPSTR,LPLONG);
static DWORD (WINAPI *pRegQueryValueExA)(HKEY,LPCSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
static DWORD (WINAPI *pRegSetValueA)(HKEY,LPCSTR,DWORD,LPCSTR,DWORD);
-static DWORD (WINAPI *pRegSetValueExA)(HKEY,LPCSTR,DWORD,DWORD,CONST BYTE*,DWORD);
+static DWORD (WINAPI *pRegSetValueExA)(HKEY,LPCSTR,DWORD,DWORD,const BYTE*,DWORD);
static HMODULE advapi32;
@@ -194,7 +194,7 @@ DWORD WINAPI RegQueryValueEx16( HKEY hkey, LPCSTR name, LPDWORD reserved, LPDWOR
* RegSetValueEx [KERNEL.226]
*/
DWORD WINAPI RegSetValueEx16( HKEY hkey, LPCSTR name, DWORD reserved, DWORD type,
- CONST BYTE *data, DWORD count )
+ const BYTE *data, DWORD count )
{
if (!advapi32) init_func_ptrs();
fix_win16_hkey( &hkey );
diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c
index bbcd454..abf2ba8 100644
--- a/dlls/ntdll/rtl.c
+++ b/dlls/ntdll/rtl.c
@@ -450,7 +450,7 @@ ULONG RtlNumberGenericTableElements(PVOID pTable)
* Nothing.
*/
#undef RtlMoveMemory
-VOID WINAPI RtlMoveMemory( VOID *Destination, CONST VOID *Source, SIZE_T Length )
+VOID WINAPI RtlMoveMemory( void *Destination, const void *Source, SIZE_T Length )
{
memmove(Destination, Source, Length);
}
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
index 2d8db4b..67feed0 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
@@ -712,7 +712,7 @@ NTSTATUS WINAPI IoDeleteSymbolicLink( UNICODE_STRING *name )
/***********************************************************************
* IoGetDeviceInterfaces (NTOSKRNL.EXE.@)
*/
-NTSTATUS WINAPI IoGetDeviceInterfaces( CONST GUID *InterfaceClassGuid,
+NTSTATUS WINAPI IoGetDeviceInterfaces( const GUID *InterfaceClassGuid,
PDEVICE_OBJECT PhysicalDeviceObject,
ULONG Flags, PWSTR *SymbolicLinkList )
{
diff --git a/dlls/ole32/comcat.c b/dlls/ole32/comcat.c
index 2882890..925938a 100644
--- a/dlls/ole32/comcat.c
+++ b/dlls/ole32/comcat.c
@@ -348,8 +348,7 @@ static HRESULT WINAPI COMCAT_ICatRegister_RegisterCategories(
/* Set the value for this locale's description. */
wsprintfW(valname, fmt, rgci->lcid);
- RegSetValueExW(cat_key, valname, 0, REG_SZ,
- (CONST BYTE*)(rgci->szDescription),
+ RegSetValueExW(cat_key, valname, 0, REG_SZ, (const BYTE*)rgci->szDescription,
(lstrlenW(rgci->szDescription) + 1) * sizeof(WCHAR));
RegCloseKey(cat_key);
diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c
index e0d550c..34f2524 100644
--- a/dlls/secur32/tests/schannel.c
+++ b/dlls/secur32/tests/schannel.c
@@ -49,7 +49,7 @@ static PCCERT_CONTEXT (WINAPI *pCertEnumCertificatesInStore)(HCERTSTORE,PCCERT_C
static BOOL (WINAPI *pCryptAcquireContextW)(HCRYPTPROV*, LPCWSTR, LPCWSTR, DWORD, DWORD);
static BOOL (WINAPI *pCryptDestroyKey)(HCRYPTKEY);
-static BOOL (WINAPI *pCryptImportKey)(HCRYPTPROV,CONST BYTE*,DWORD,HCRYPTKEY,DWORD,HCRYPTKEY*);
+static BOOL (WINAPI *pCryptImportKey)(HCRYPTPROV,const BYTE*,DWORD,HCRYPTKEY,DWORD,HCRYPTKEY*);
static BOOL (WINAPI *pCryptReleaseContext)(HCRYPTPROV,ULONG_PTR);
static const BYTE bigCert[] = { 0x30, 0x7a, 0x02, 0x01, 0x01, 0x30, 0x02, 0x06,
diff --git a/dlls/serialui/confdlg.c b/dlls/serialui/confdlg.c
index 2b92dac..da14472 100644
--- a/dlls/serialui/confdlg.c
+++ b/dlls/serialui/confdlg.c
@@ -102,7 +102,7 @@ BOOL WINAPI EnumPropPages(LPDEVICE_INFO pdi, LPFNADDPROPSHEETPAGE pfnAdd, LPARAM
typedef struct tagPARAM2STRDATA
{
DWORD val;
- CONST CHAR *name;
+ const CHAR *name;
} PARAM2STRDATA, *LPPARAM2STRDATA;
typedef struct tagPARAM2STR
diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c
index 89692c9..48799ab 100644
--- a/dlls/user.exe16/message.c
+++ b/dlls/user.exe16/message.c
@@ -1849,7 +1849,7 @@ BOOL16 WINAPI IsDialogMessage16( HWND16 hwndDlg, MSG16 *msg16 )
/***********************************************************************
* MsgWaitForMultipleObjects (USER.640)
*/
-DWORD WINAPI MsgWaitForMultipleObjects16( DWORD count, CONST HANDLE *handles,
+DWORD WINAPI MsgWaitForMultipleObjects16( DWORD count, const HANDLE *handles,
BOOL wait_all, DWORD timeout, DWORD mask )
{
return MsgWaitForMultipleObjectsEx( count, handles, timeout, mask,
@@ -2632,7 +2632,7 @@ static LRESULT static_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam,
/***********************************************************************
* wait_message16
*/
-static DWORD wait_message16( DWORD count, CONST HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags )
+static DWORD wait_message16( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags )
{
DWORD lock, ret;
diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c
index bf5723c..fb24b15 100644
--- a/dlls/wininet/tests/internet.c
+++ b/dlls/wininet/tests/internet.c
@@ -34,8 +34,8 @@ static BOOL (WINAPI *pCreateUrlCacheContainerA)(DWORD, DWORD, DWORD, DWORD,
DWORD, DWORD, DWORD, DWORD);
static BOOL (WINAPI *pCreateUrlCacheContainerW)(DWORD, DWORD, DWORD, DWORD,
DWORD, DWORD, DWORD, DWORD);
-static BOOL (WINAPI *pInternetTimeFromSystemTimeA)(CONST SYSTEMTIME *,DWORD ,LPSTR ,DWORD);
-static BOOL (WINAPI *pInternetTimeFromSystemTimeW)(CONST SYSTEMTIME *,DWORD ,LPWSTR ,DWORD);
+static BOOL (WINAPI *pInternetTimeFromSystemTimeA)(const SYSTEMTIME *, DWORD, LPSTR, DWORD);
+static BOOL (WINAPI *pInternetTimeFromSystemTimeW)(const SYSTEMTIME *, DWORD, LPWSTR, DWORD);
static BOOL (WINAPI *pInternetTimeToSystemTimeA)(LPCSTR ,SYSTEMTIME *,DWORD);
static BOOL (WINAPI *pInternetTimeToSystemTimeW)(LPCWSTR ,SYSTEMTIME *,DWORD);
static BOOL (WINAPI *pIsDomainLegalCookieDomainW)(LPCWSTR, LPCWSTR);
--
1.8.3.1
More information about the wine-patches
mailing list