Module: wine Branch: master Commit: b1480630319c3ae30e8ab59cc79601ff478b5475 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1480630319c3ae30e8ab59cc7...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Mon Jan 23 07:28:21 2012 +0300
msxml3: Replace macro with another enum entry.
---
dlls/msxml3/element.c | 2 ++ dlls/msxml3/msxml_private.h | 4 ++-- dlls/msxml3/schema.c | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 2d920cd..e760c84 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -644,6 +644,8 @@ static inline HRESULT variant_from_dt(XDR_DT dt, xmlChar* str, VARIANT* v) return E_OUTOFMEMORY; handled = TRUE; break; + default: + WARN("unknown type %d\n", dt); }
if (!handled) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 813584a..6c9edfe 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -124,9 +124,9 @@ typedef enum _XDR_DT { DT_UI4, DT_UI8, DT_URI, - DT_UUID + DT_UUID, + LAST_DT } XDR_DT; -#define DT__N_TYPES (DT_UUID+1)
extern HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) DECLSPEC_HIDDEN; extern void release_typelib(void) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index a147105..9de3768 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -391,7 +391,7 @@ static DWORD dt_hash_bstr(OLECHAR const* bstr, int len /* calculated if -1 */) return hval; }
-static const xmlChar *const DT_string_table[DT__N_TYPES] = +static const xmlChar *const DT_string_table[LAST_DT] = { DT_bin_base64, DT_bin_hex, @@ -431,7 +431,7 @@ static const xmlChar *const DT_string_table[DT__N_TYPES] = DT_uuid };
-static const WCHAR *const DT_wstring_table[DT__N_TYPES] = +static const WCHAR *const DT_wstring_table[LAST_DT] = { wDT_bin_base64, wDT_bin_hex,