ntdll: Constify some variables (2 of 2)

Andrew Talbot Andrew.Talbot at talbotville.com
Wed Jun 20 14:49:05 CDT 2007


Changelog:
    ntdll: Constify some variables.

diff -urN a/dlls/ntdll/env.c b/dlls/ntdll/env.c
--- a/dlls/ntdll/env.c	2006-09-20 19:27:54.000000000 +0100
+++ b/dlls/ntdll/env.c	2007-06-20 20:39:32.000000000 +0100
@@ -263,7 +263,7 @@
  *		RtlExpandEnvironmentStrings_U (NTDLL.@)
  *
  */
-NTSTATUS WINAPI RtlExpandEnvironmentStrings_U(PWSTR renv, const UNICODE_STRING* us_src,
+NTSTATUS WINAPI RtlExpandEnvironmentStrings_U(PCWSTR renv, const UNICODE_STRING* us_src,
                                               PUNICODE_STRING us_dst, PULONG plen)
 {
     DWORD src_len, len, count, total_size = 1;  /* 1 for terminating '\0' */
@@ -367,9 +367,9 @@
 }
 
 
-static inline void denormalize( void *base, WCHAR **ptr )
+static inline void denormalize( const void *base, WCHAR **ptr )
 {
-    if (*ptr) *ptr = (WCHAR *)(UINT_PTR)((char *)*ptr - (char *)base);
+    if (*ptr) *ptr = (WCHAR *)(UINT_PTR)((char *)*ptr - (const char *)base);
 }
 
 /******************************************************************************
diff -urN a/include/winternl.h b/include/winternl.h
--- a/include/winternl.h	2007-06-08 16:53:48.000000000 +0100
+++ b/include/winternl.h	2007-06-20 20:40:03.000000000 +0100
@@ -2057,7 +2057,7 @@
 BOOLEAN   WINAPI RtlEqualString(const STRING*,const STRING*,BOOLEAN);
 BOOLEAN   WINAPI RtlEqualUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN);
 void      DECLSPEC_NORETURN WINAPI RtlExitUserThread(ULONG);
-NTSTATUS  WINAPI RtlExpandEnvironmentStrings_U(PWSTR, const UNICODE_STRING*, UNICODE_STRING*, ULONG*);
+NTSTATUS  WINAPI RtlExpandEnvironmentStrings_U(PCWSTR, const UNICODE_STRING*, UNICODE_STRING*, ULONG*);
 LONGLONG  WINAPI RtlExtendedMagicDivide(LONGLONG,LONGLONG,INT);
 LONGLONG  WINAPI RtlExtendedIntegerMultiply(LONGLONG,INT);
 LONGLONG  WINAPI RtlExtendedLargeIntegerDivide(LONGLONG,INT,INT *);



More information about the wine-patches mailing list