2013-01-08  Jean-Baptiste Kempf  <jb@videolan.org>
	Kai Tietz  <ktietz@redhat.com>

	* winnls.h (IDN_ALLOW_UNASSIGNED): New macro.
	(IDN_USE_STD3_ASCII_RULES): Likewise.
	(NORM_FORM): Reformat.
	(IsNormalizedString): Add prototype.
	(NormalizeString): Remove duplicate.


git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@5531 4407c894-4637-0410-b4f5-ada5f102cad1

mingw-w64-headers/include/ChangeLog

diff --git a/mingw-w64-headers/include/ChangeLog b/mingw-w64-headers/include/ChangeLog
index e9961e9..4767a03 100644
--- a/mingw-w64-headers/include/ChangeLog
+++ b/mingw-w64-headers/include/ChangeLog
@@ -1,4 +1,13 @@
 2013-01-08  Jean-Baptiste Kempf  <jb@videolan.org>
+	Kai Tietz  <ktietz@redhat.com>
+
+	* winnls.h (IDN_ALLOW_UNASSIGNED): New macro.
+	(IDN_USE_STD3_ASCII_RULES): Likewise.
+	(NORM_FORM): Reformat.
+	(IsNormalizedString): Add prototype.
+	(NormalizeString): Remove duplicate.
+
+2013-01-08  Jean-Baptiste Kempf  <jb@videolan.org>
 
 	* winbase.h (CREATE_MUTEX_INITIAL_OWNER): New define.
 	(CRITICAL_SECTION_NO_DEBUG_INFO): New define.

mingw-w64-headers/include/winnls.h

diff --git a/mingw-w64-headers/include/winnls.h b/mingw-w64-headers/include/winnls.h
index a95f568..0eeee1d 100644
--- a/mingw-w64-headers/include/winnls.h
+++ b/mingw-w64-headers/include/winnls.h
@@ -475,6 +475,9 @@
 #define IS_LOW_SURROGATE(c) (((c) & 0xFC00) == 0xDC00)
 #define IS_SURROGATE_PAIR(hc,lc) (IS_HIGH_SURROGATE(hc) && IS_LOW_SURROGATE(lc))
 
+#define IDN_ALLOW_UNASSIGNED        0x1
+#define IDN_USE_STD3_ASCII_RULES    0x2
+
   typedef DWORD LGRPID;
   typedef DWORD LCTYPE;
   typedef DWORD CALTYPE;
@@ -581,12 +584,12 @@
   };
   
   typedef enum  _NORM_FORM  {
-  NormalizationOther   = 0,
-  NormalizationC       = 0x1,
-  NormalizationD       = 0x2,
-  NormalizationKC      = 0x5,
-  NormalizationKD      = 0x6 
-} NORM_FORM;
+    NormalizationOther   = 0,
+    NormalizationC       = 0x1,
+    NormalizationD       = 0x2,
+    NormalizationKC      = 0x5,
+    NormalizationKD      = 0x6 
+  } NORM_FORM;
 
   typedef WINBOOL (CALLBACK *LANGUAGEGROUP_ENUMPROCA)(LGRPID,LPSTR,LPSTR,DWORD,LONG_PTR);
   typedef WINBOOL (CALLBACK *LANGGROUPLOCALE_ENUMPROCA)(LGRPID,LCID,LPSTR,LONG_PTR);
@@ -726,6 +729,8 @@
   WINBASEAPI int WINAPI IdnToNameprepUnicode(DWORD dwFlags,LPCWSTR lpUnicodeCharStr,int cchUnicodeChar,LPWSTR lpNameprepCharStr,int cchNameprepChar);
   WINBASEAPI int WINAPI IdnToUnicode(DWORD dwFlags,LPCWSTR lpASCIICharStr,int cchASCIIChar,LPWSTR lpUnicodeCharStr,int cchUnicodeChar);
 
+  WINBASEAPI BOOL WINAPI IsNormalizedString(NORM_FORM,LPCWSTR,INT);
+
 WINBASEAPI LANGID WINAPI SetThreadUILanguage(
   LANGID LangId
 );
@@ -1019,14 +1024,6 @@
   DWORD dwFlags
 );
 
-WINBASEAPI int WINAPI NormalizeString(
-  NORM_FORM NormForm,
-  LPCWSTR lpSrcString,
-  int cwSrcLength,
-  LPWSTR lpDstString,
-  int cwDstLength
-);
-
 WINBASEAPI WINBOOL WINAPI RtlIsValidLocaleName(
   LPCWSTR LocaleName,
   ULONG Flags