kernel32: Add a define for UNICODE_STRING_MAX_CHARS.

4d6b7475 · Paul Vriens · Alexandre Julliard · 9db754fe · 4d6b7475 · 4d6b7475
Commit 4d6b7475 authored Dec 14, 2009 by Paul Vriens Committed by Alexandre Julliard Dec 14, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

environ.c dlls/kernel32/environ.c +2 -2

winnt.h include/winnt.h +2 -0

No files found.
--- a/dlls/kernel32/environ.c
+++ b/dlls/kernel32/environ.c
@@ -364,8 +364,8 @@ DWORD WINAPI ExpandEnvironmentStringsW( LPCWSTR src, LPWSTR dst, DWORD len )
    RtlInitUnicodeString(&us_src, src);

    /* make sure we don't overflow the maximum UNICODE_STRING size */
-    if (len > 0x7fff)
-        len = 0x7fff;
+    if (len > UNICODE_STRING_MAX_CHARS)
+        len = UNICODE_STRING_MAX_CHARS;

    us_dst.Length = 0;
    us_dst.MaximumLength = len * sizeof(WCHAR);

--- a/include/winnt.h
+++ b/include/winnt.h
@@ -617,6 +617,8 @@ typedef struct _MEMORY_BASIC_INFORMATION
 #define MAXWORD       0xffff
 #define MAXDWORD      0xffffffff

+#define UNICODE_STRING_MAX_CHARS 32767
+
 #define FIELD_OFFSET(type, field) \
  ((LONG)(INT_PTR)&(((type *)0)->field))