[XMLLITE] Sync with Wine Staging 4.18. CORE-16441

[reactos.git] / dll / win32 / xmllite / xmllite_private.h

diff --git a/dll/win32/xmllite/xmllite_private.h b/dll/win32/xmllite/xmllite_private.h
index b08755f..10f4376 100644 (file)
--- a/dll/win32/xmllite/xmllite_private.h
+++ b/dll/win32/xmllite/xmllite_private.h
@@ -21,39 +21,7 @@
 #ifndef __XMLLITE_PRIVATE__
 #define __XMLLITE_PRIVATE__
 
-#include <config.h>
-
-#include <stdarg.h>
-
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
-#include <xmllite.h>
-
-#include <wine/debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(xmllite);
-
-/* memory allocation functions */
-static inline void *heap_alloc(size_t len)
-{
-    return HeapAlloc(GetProcessHeap(), 0, len);
-}
-
-static inline void *heap_realloc(void *mem, size_t len)
-{
-    return HeapReAlloc(GetProcessHeap(), 0, mem, len);
-}
-
-static inline BOOL heap_free(void *mem)
-{
-    return HeapFree(GetProcessHeap(), 0, mem);
-}
+#include "wine/heap.h"
 
 static inline void *m_alloc(IMalloc *imalloc, size_t len)
 {
@@ -63,6 +31,14 @@ static inline void *m_alloc(IMalloc *imalloc, size_t len)
         return heap_alloc(len);
 }
 
+static inline void *m_realloc(IMalloc *imalloc, void *mem, size_t len)
+{
+    if (imalloc)
+        return IMalloc_Realloc(imalloc, mem, len);
+    else
+        return heap_realloc(mem, len);
+}
+
 static inline void m_free(IMalloc *imalloc, void *mem)
 {
     if (imalloc)
@@ -73,11 +49,20 @@ static inline void m_free(IMalloc *imalloc, void *mem)
 
 typedef enum
 {
+    XmlEncoding_USASCII,
     XmlEncoding_UTF16,
     XmlEncoding_UTF8,
     XmlEncoding_Unknown
 } xml_encoding;
 
-xml_encoding parse_encoding_name(const WCHAR *name, int len) DECLSPEC_HIDDEN;
+xml_encoding parse_encoding_name(const WCHAR*,int) DECLSPEC_HIDDEN;
+HRESULT get_code_page(xml_encoding,UINT*) DECLSPEC_HIDDEN;
+const WCHAR *get_encoding_name(xml_encoding) DECLSPEC_HIDDEN;
+xml_encoding get_encoding_from_codepage(UINT) DECLSPEC_HIDDEN;
+
+BOOL is_ncnamechar(WCHAR ch) DECLSPEC_HIDDEN;
+BOOL is_pubchar(WCHAR ch) DECLSPEC_HIDDEN;
+BOOL is_namestartchar(WCHAR ch) DECLSPEC_HIDDEN;
+BOOL is_namechar(WCHAR ch) DECLSPEC_HIDDEN;
 
 #endif /* __XMLLITE_PRIVATE__ */