Commit 2a39cb37 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard

dlls: Replace the remaining CONSTs.

parent 0f965d16
...@@ -3160,7 +3160,7 @@ static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT count) ...@@ -3160,7 +3160,7 @@ static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT count)
*/ */
UINT WINAPI 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); return SetDIBColorTable(himl->hdcImage, uStartIndex, cEntries, prgb);
} }
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#define SEMICOLON_5X TOKEN_SEMICOLON, TOKEN_SEMICOLON, TOKEN_SEMICOLON, TOKEN_SEMICOLON, TOKEN_SEMICOLON #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}", sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
id->Data1, id->Data2, id->Data3, id->Data1, id->Data2, id->Data3,
...@@ -1119,7 +1119,7 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int level) ...@@ -1119,7 +1119,7 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int level)
HRESULT hr; HRESULT hr;
char name[100]; char name[100];
GUID clsid; GUID clsid;
CONST GUID* clsid_type = NULL; const GUID *clsid_type = NULL;
char str_clsid[40]; char str_clsid[40];
char str_clsid_type[40]; char str_clsid_type[40];
DWORD len = 100; DWORD len = 100;
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "dmusici.h" #include "dmusici.h"
#include "dmksctrl.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]; static char string[39];
sprintf(string, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", sprintf(string, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
......
...@@ -690,7 +690,7 @@ BOOL WINAPI WriteConsoleOutputCharacterA( HANDLE hConsoleOutput, LPCSTR str, DWO ...@@ -690,7 +690,7 @@ BOOL WINAPI WriteConsoleOutputCharacterA( HANDLE hConsoleOutput, LPCSTR str, DWO
* Failure: FALSE * 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 ) COORD coord, LPDWORD lpNumAttrsWritten )
{ {
BOOL ret; BOOL ret;
......
...@@ -2001,7 +2001,7 @@ static void test_WriteConsoleOutputAttribute(HANDLE output_handle) ...@@ -2001,7 +2001,7 @@ static void test_WriteConsoleOutputAttribute(HANDLE output_handle)
const struct const struct
{ {
HANDLE hConsoleOutput; HANDLE hConsoleOutput;
CONST WORD *attr; const WORD *attr;
DWORD length; DWORD length;
COORD coord; COORD coord;
LPDWORD lpNumAttrsWritten; LPDWORD lpNumAttrsWritten;
......
...@@ -42,7 +42,7 @@ static DWORD (WINAPI *pRegOpenKeyA)(HKEY,LPCSTR,PHKEY); ...@@ -42,7 +42,7 @@ static DWORD (WINAPI *pRegOpenKeyA)(HKEY,LPCSTR,PHKEY);
static DWORD (WINAPI *pRegQueryValueA)(HKEY,LPCSTR,LPSTR,LPLONG); static DWORD (WINAPI *pRegQueryValueA)(HKEY,LPCSTR,LPSTR,LPLONG);
static DWORD (WINAPI *pRegQueryValueExA)(HKEY,LPCSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD); static DWORD (WINAPI *pRegQueryValueExA)(HKEY,LPCSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
static DWORD (WINAPI *pRegSetValueA)(HKEY,LPCSTR,DWORD,LPCSTR,DWORD); 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; static HMODULE advapi32;
...@@ -194,7 +194,7 @@ DWORD WINAPI RegQueryValueEx16( HKEY hkey, LPCSTR name, LPDWORD reserved, LPDWOR ...@@ -194,7 +194,7 @@ DWORD WINAPI RegQueryValueEx16( HKEY hkey, LPCSTR name, LPDWORD reserved, LPDWOR
* RegSetValueEx [KERNEL.226] * RegSetValueEx [KERNEL.226]
*/ */
DWORD WINAPI RegSetValueEx16( HKEY hkey, LPCSTR name, DWORD reserved, DWORD type, 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(); if (!advapi32) init_func_ptrs();
fix_win16_hkey( &hkey ); fix_win16_hkey( &hkey );
......
...@@ -450,7 +450,7 @@ ULONG RtlNumberGenericTableElements(PVOID pTable) ...@@ -450,7 +450,7 @@ ULONG RtlNumberGenericTableElements(PVOID pTable)
* Nothing. * Nothing.
*/ */
#undef RtlMoveMemory #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); memmove(Destination, Source, Length);
} }
......
...@@ -712,7 +712,7 @@ NTSTATUS WINAPI IoDeleteSymbolicLink( UNICODE_STRING *name ) ...@@ -712,7 +712,7 @@ NTSTATUS WINAPI IoDeleteSymbolicLink( UNICODE_STRING *name )
/*********************************************************************** /***********************************************************************
* IoGetDeviceInterfaces (NTOSKRNL.EXE.@) * IoGetDeviceInterfaces (NTOSKRNL.EXE.@)
*/ */
NTSTATUS WINAPI IoGetDeviceInterfaces( CONST GUID *InterfaceClassGuid, NTSTATUS WINAPI IoGetDeviceInterfaces( const GUID *InterfaceClassGuid,
PDEVICE_OBJECT PhysicalDeviceObject, PDEVICE_OBJECT PhysicalDeviceObject,
ULONG Flags, PWSTR *SymbolicLinkList ) ULONG Flags, PWSTR *SymbolicLinkList )
{ {
......
...@@ -348,8 +348,7 @@ static HRESULT WINAPI COMCAT_ICatRegister_RegisterCategories( ...@@ -348,8 +348,7 @@ static HRESULT WINAPI COMCAT_ICatRegister_RegisterCategories(
/* Set the value for this locale's description. */ /* Set the value for this locale's description. */
wsprintfW(valname, fmt, rgci->lcid); wsprintfW(valname, fmt, rgci->lcid);
RegSetValueExW(cat_key, valname, 0, REG_SZ, RegSetValueExW(cat_key, valname, 0, REG_SZ, (const BYTE*)rgci->szDescription,
(CONST BYTE*)(rgci->szDescription),
(lstrlenW(rgci->szDescription) + 1) * sizeof(WCHAR)); (lstrlenW(rgci->szDescription) + 1) * sizeof(WCHAR));
RegCloseKey(cat_key); RegCloseKey(cat_key);
......
...@@ -49,7 +49,7 @@ static PCCERT_CONTEXT (WINAPI *pCertEnumCertificatesInStore)(HCERTSTORE,PCCERT_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 *pCryptAcquireContextW)(HCRYPTPROV*, LPCWSTR, LPCWSTR, DWORD, DWORD);
static BOOL (WINAPI *pCryptDestroyKey)(HCRYPTKEY); 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 BOOL (WINAPI *pCryptReleaseContext)(HCRYPTPROV,ULONG_PTR);
static const BYTE bigCert[] = { 0x30, 0x7a, 0x02, 0x01, 0x01, 0x30, 0x02, 0x06, static const BYTE bigCert[] = { 0x30, 0x7a, 0x02, 0x01, 0x01, 0x30, 0x02, 0x06,
......
...@@ -102,7 +102,7 @@ BOOL WINAPI EnumPropPages(LPDEVICE_INFO pdi, LPFNADDPROPSHEETPAGE pfnAdd, LPARAM ...@@ -102,7 +102,7 @@ BOOL WINAPI EnumPropPages(LPDEVICE_INFO pdi, LPFNADDPROPSHEETPAGE pfnAdd, LPARAM
typedef struct tagPARAM2STRDATA typedef struct tagPARAM2STRDATA
{ {
DWORD val; DWORD val;
CONST CHAR *name; const CHAR *name;
} PARAM2STRDATA, *LPPARAM2STRDATA; } PARAM2STRDATA, *LPPARAM2STRDATA;
typedef struct tagPARAM2STR typedef struct tagPARAM2STR
......
...@@ -1849,7 +1849,7 @@ BOOL16 WINAPI IsDialogMessage16( HWND16 hwndDlg, MSG16 *msg16 ) ...@@ -1849,7 +1849,7 @@ BOOL16 WINAPI IsDialogMessage16( HWND16 hwndDlg, MSG16 *msg16 )
/*********************************************************************** /***********************************************************************
* MsgWaitForMultipleObjects (USER.640) * 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 ) BOOL wait_all, DWORD timeout, DWORD mask )
{ {
return MsgWaitForMultipleObjectsEx( count, handles, timeout, mask, return MsgWaitForMultipleObjectsEx( count, handles, timeout, mask,
...@@ -2632,7 +2632,7 @@ static LRESULT static_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, ...@@ -2632,7 +2632,7 @@ static LRESULT static_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam,
/*********************************************************************** /***********************************************************************
* wait_message16 * 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; DWORD lock, ret;
......
...@@ -34,8 +34,8 @@ static BOOL (WINAPI *pCreateUrlCacheContainerA)(DWORD, DWORD, DWORD, DWORD, ...@@ -34,8 +34,8 @@ static BOOL (WINAPI *pCreateUrlCacheContainerA)(DWORD, DWORD, DWORD, DWORD,
DWORD, DWORD, DWORD, DWORD); DWORD, DWORD, DWORD, DWORD);
static BOOL (WINAPI *pCreateUrlCacheContainerW)(DWORD, DWORD, DWORD, DWORD, static BOOL (WINAPI *pCreateUrlCacheContainerW)(DWORD, DWORD, DWORD, DWORD,
DWORD, DWORD, DWORD, DWORD); DWORD, DWORD, DWORD, DWORD);
static BOOL (WINAPI *pInternetTimeFromSystemTimeA)(CONST SYSTEMTIME *,DWORD ,LPSTR ,DWORD); static BOOL (WINAPI *pInternetTimeFromSystemTimeA)(const SYSTEMTIME *, DWORD, LPSTR, DWORD);
static BOOL (WINAPI *pInternetTimeFromSystemTimeW)(CONST SYSTEMTIME *,DWORD ,LPWSTR ,DWORD); static BOOL (WINAPI *pInternetTimeFromSystemTimeW)(const SYSTEMTIME *, DWORD, LPWSTR, DWORD);
static BOOL (WINAPI *pInternetTimeToSystemTimeA)(LPCSTR ,SYSTEMTIME *,DWORD); static BOOL (WINAPI *pInternetTimeToSystemTimeA)(LPCSTR ,SYSTEMTIME *,DWORD);
static BOOL (WINAPI *pInternetTimeToSystemTimeW)(LPCWSTR ,SYSTEMTIME *,DWORD); static BOOL (WINAPI *pInternetTimeToSystemTimeW)(LPCWSTR ,SYSTEMTIME *,DWORD);
static BOOL (WINAPI *pIsDomainLegalCookieDomainW)(LPCWSTR, LPCWSTR); static BOOL (WINAPI *pIsDomainLegalCookieDomainW)(LPCWSTR, LPCWSTR);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment