From df088c6949cdc851b88b4db6bcc0a4f7209b0499 Mon Sep 17 00:00:00 2001 From: Huw D M Davies Date: Sat, 10 Jul 1999 11:41:24 +0000 Subject: [PATCH] Added `const's to some registry API functions. --- include/winreg.h | 14 +++++++------- misc/registry.c | 32 ++++++++++++++++---------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/include/winreg.h b/include/winreg.h index 2dacb556615..9b5e4cfd5ee 100644 --- a/include/winreg.h +++ b/include/winreg.h @@ -150,10 +150,10 @@ DWORD WINAPI RegCreateKeyA(HKEY,LPCSTR,LPHKEY); DWORD WINAPI RegCreateKeyW(HKEY,LPCWSTR,LPHKEY); #define RegCreateKey WINELIB_NAME_AW(RegCreateKey) DWORD WINAPI RegDeleteKeyA(HKEY,LPCSTR); -DWORD WINAPI RegDeleteKeyW(HKEY,LPWSTR); +DWORD WINAPI RegDeleteKeyW(HKEY,LPCWSTR); #define RegDeleteKey WINELIB_NAME_AW(RegDeleteKey) -DWORD WINAPI RegDeleteValueA(HKEY,LPSTR); -DWORD WINAPI RegDeleteValueW(HKEY,LPWSTR); +DWORD WINAPI RegDeleteValueA(HKEY,LPCSTR); +DWORD WINAPI RegDeleteValueW(HKEY,LPCWSTR); #define RegDeleteValue WINELIB_NAME_AW(RegDeleteValue) DWORD WINAPI RegEnumKeyA(HKEY,DWORD,LPSTR,DWORD); DWORD WINAPI RegEnumKeyW(HKEY,DWORD,LPWSTR,DWORD); @@ -167,14 +167,14 @@ DWORD WINAPI RegOpenKeyW(HKEY,LPCWSTR,LPHKEY); DWORD WINAPI RegQueryValueA(HKEY,LPCSTR,LPSTR,LPLONG); DWORD WINAPI RegQueryValueW(HKEY,LPCWSTR,LPWSTR,LPLONG); #define RegQueryValue WINELIB_NAME_AW(RegQueryValue) -DWORD WINAPI RegQueryValueExA(HKEY,LPSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD); -DWORD WINAPI RegQueryValueExW(HKEY,LPWSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD); +DWORD WINAPI RegQueryValueExA(HKEY,LPCSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD); +DWORD WINAPI RegQueryValueExW(HKEY,LPCWSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD); #define RegQueryValueEx WINELIB_NAME_AW(RegQueryValueEx) DWORD WINAPI RegSetValueA(HKEY,LPCSTR,DWORD,LPCSTR,DWORD); DWORD WINAPI RegSetValueW(HKEY,LPCWSTR,DWORD,LPCWSTR,DWORD); #define RegSetValue WINELIB_NAME_AW(RegSetValue) -DWORD WINAPI RegSetValueExA(HKEY,LPSTR,DWORD,DWORD,LPBYTE,DWORD); -DWORD WINAPI RegSetValueExW(HKEY,LPWSTR,DWORD,DWORD,LPBYTE,DWORD); +DWORD WINAPI RegSetValueExA(HKEY,LPCSTR,DWORD,DWORD,CONST BYTE*,DWORD); +DWORD WINAPI RegSetValueExW(HKEY,LPCWSTR,DWORD,DWORD,CONST BYTE*,DWORD); #define RegSetValueEx WINELIB_NAME_AW(RegSetValueEx) #ifdef __cplusplus diff --git a/misc/registry.c b/misc/registry.c index 412b3bc294d..f2f1d7d45be 100644 --- a/misc/registry.c +++ b/misc/registry.c @@ -2442,9 +2442,9 @@ DWORD WINAPI RegCreateKey16( HKEY hkey, LPCSTR lpszSubKey, LPHKEY retkey ) * ERROR_MORE_DATA: !!! if the specified buffer is not big enough to hold the data * buffer is left untouched. The MS-documentation is wrong (js) !!! */ -DWORD WINAPI RegQueryValueExW( HKEY hkey, LPWSTR lpValueName, - LPDWORD lpdwReserved, LPDWORD lpdwType, - LPBYTE lpbData, LPDWORD lpcbData ) +DWORD WINAPI RegQueryValueExW( HKEY hkey, LPCWSTR lpValueName, + LPDWORD lpdwReserved, LPDWORD lpdwType, + LPBYTE lpbData, LPDWORD lpcbData ) { LPKEYSTRUCT lpkey; int i; @@ -2557,9 +2557,9 @@ DWORD WINAPI RegQueryValueW( HKEY hkey, LPCWSTR lpszSubKey, LPWSTR lpszData, * * FIXME: check returnvalue (len) for an empty key */ -DWORD WINAPI RegQueryValueExA( HKEY hkey, LPSTR lpszValueName, - LPDWORD lpdwReserved, LPDWORD lpdwType, - LPBYTE lpbData, LPDWORD lpcbData ) +DWORD WINAPI RegQueryValueExA( HKEY hkey, LPCSTR lpszValueName, + LPDWORD lpdwReserved, LPDWORD lpdwType, + LPBYTE lpbData, LPDWORD lpcbData ) { LPWSTR lpszValueNameW; LPBYTE mybuf = NULL; @@ -2709,9 +2709,9 @@ DWORD WINAPI RegQueryValue16( HKEY hkey, LPSTR lpszSubKey, LPSTR lpszData, * NOTES * win95 does not care about cbData for REG_SZ and finds out the len by itself (js) */ -DWORD WINAPI RegSetValueExW( HKEY hkey, LPWSTR lpszValueName, - DWORD dwReserved, DWORD dwType, LPBYTE lpbData, - DWORD cbData) +DWORD WINAPI RegSetValueExW( HKEY hkey, LPCWSTR lpszValueName, + DWORD dwReserved, DWORD dwType, + CONST BYTE *lpbData, DWORD cbData) { LPKEYSTRUCT lpkey; int i; @@ -2773,9 +2773,9 @@ DWORD WINAPI RegSetValueExW( HKEY hkey, LPWSTR lpszValueName, * NOTES * win95 does not care about cbData for REG_SZ and finds out the len by itself (js) */ -DWORD WINAPI RegSetValueExA( HKEY hkey, LPSTR lpszValueName, - DWORD dwReserved, DWORD dwType, LPBYTE lpbData, - DWORD cbData ) +DWORD WINAPI RegSetValueExA( HKEY hkey, LPCSTR lpszValueName, + DWORD dwReserved, DWORD dwType, + CONST BYTE *lpbData, DWORD cbData ) { LPBYTE buf; LPWSTR lpszValueNameW; @@ -2796,7 +2796,7 @@ DWORD WINAPI RegSetValueExA( HKEY hkey, LPSTR lpszValueName, cbData=2*cbData; } else - buf=lpbData; + buf=(LPBYTE)lpbData; if (lpszValueName) lpszValueNameW = strdupA2W(lpszValueName); @@ -3246,7 +3246,7 @@ DWORD WINAPI RegCloseKey( HKEY hkey ) * Success: ERROR_SUCCESS * Failure: Error code */ -DWORD WINAPI RegDeleteKeyW( HKEY hkey, LPWSTR lpszSubKey ) +DWORD WINAPI RegDeleteKeyW( HKEY hkey, LPCWSTR lpszSubKey ) { LPKEYSTRUCT *lplpPrevKey,lpNextKey,lpxkey; LPWSTR *wps; @@ -3362,7 +3362,7 @@ DWORD WINAPI RegDeleteKey16( HKEY hkey, LPCSTR lpszSubKey ) * * RETURNS */ -DWORD WINAPI RegDeleteValueW( HKEY hkey, LPWSTR lpszValue ) +DWORD WINAPI RegDeleteValueW( HKEY hkey, LPCWSTR lpszValue ) { DWORD i; LPKEYSTRUCT lpkey; @@ -3409,7 +3409,7 @@ DWORD WINAPI RegDeleteValueW( HKEY hkey, LPWSTR lpszValue ) /****************************************************************************** * RegDeleteValue32A [ADVAPI32.135] */ -DWORD WINAPI RegDeleteValueA( HKEY hkey, LPSTR lpszValue ) +DWORD WINAPI RegDeleteValueA( HKEY hkey, LPCSTR lpszValue ) { LPWSTR lpszValueW; DWORD ret; -- 2.11.4.GIT