msi: Use wide char strings for token values to avoid an unnecessary WideCharToMultiByte.
This commit is contained in:
Juan Lang
Alexandre Julliard
parent
715804999e
commit
5c850c6a40
|
|
@ -23,7 +23,7 @@
|
|||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "wine/debug.h"
|
||||
#include "winnls.h"
|
||||
#include "wine/unicode.h"
|
||||
#include "query.h"
|
||||
#include "sql.tab.h"
|
||||
|
||||
|
|
@ -35,120 +35,227 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi);
|
|||
*/
|
||||
typedef struct Keyword Keyword;
|
||||
struct Keyword {
|
||||
const char *zName; /* The keyword name */
|
||||
const WCHAR *zName; /* The keyword name */
|
||||
int tokenType; /* The token value for this keyword */
|
||||
};
|
||||
|
||||
static const WCHAR ABORT_W[] = { 'A','B','O','R','T',0 };
|
||||
static const WCHAR AFTER_W[] = { 'A','F','T','E','R',0 };
|
||||
static const WCHAR ALL_W[] = { 'A','L','L',0 };
|
||||
static const WCHAR AND_W[] = { 'A','N','D',0 };
|
||||
static const WCHAR AS_W[] = { 'A','S',0 };
|
||||
static const WCHAR ASC_W[] = { 'A','S','C',0 };
|
||||
static const WCHAR BEFORE_W[] = { 'B','E','F','O','R','E',0 };
|
||||
static const WCHAR BEGIN_W[] = { 'B','E','G','I','N','W',0 };
|
||||
static const WCHAR BETWEEN_W[] = { 'B','E','T','W','E','E','N',0 };
|
||||
static const WCHAR BY_W[] = { 'B','Y',0 };
|
||||
static const WCHAR CASCADE_W[] = { 'C','A','S','C','A','D','E',0 };
|
||||
static const WCHAR CASE_W[] = { 'C','A','S','E',0 };
|
||||
static const WCHAR CHAR_W[] = { 'C','H','A','R',0 };
|
||||
static const WCHAR CHARACTER_W[] = { 'C','H','A','R','A','C','T','E','R',0 };
|
||||
static const WCHAR CHECK_W[] = { 'C','H','E','C','K',0 };
|
||||
static const WCHAR CLUSTER_W[] = { 'C','L','U','S','T','E','R',0 };
|
||||
static const WCHAR COLLATE_W[] = { 'C','O','L','L','A','T','E',0 };
|
||||
static const WCHAR COMMIT_W[] = { 'C','O','M','M','I','T',0 };
|
||||
static const WCHAR CONFLICT_W[] = { 'C','O','N','F','L','I','C','T',0 };
|
||||
static const WCHAR CONSTRAINT_W[] = { 'C','O','N','S','T','R','A','I','N','T',0 };
|
||||
static const WCHAR COPY_W[] = { 'C','O','P','Y',0 };
|
||||
static const WCHAR CREATE_W[] = { 'C','R','E','A','T','E',0 };
|
||||
static const WCHAR CROSS_W[] = { 'C','R','O','S','S',0 };
|
||||
static const WCHAR DEFAULT_W[] = { 'D','E','F','A','U','L','T',0 };
|
||||
static const WCHAR DEFERRED_W[] = { 'D','E','F','E','R','R','E','D',0 };
|
||||
static const WCHAR DEFERRABLE_W[] = { 'D','E','F','E','R','R','A','B','L','E',0 };
|
||||
static const WCHAR DELETE_W[] = { 'D','E','L','E','T','E',0 };
|
||||
static const WCHAR DELIMITERS_W[] = { 'D','E','L','I','M','I','T','E','R','S',0 };
|
||||
static const WCHAR DESC_W[] = { 'D','E','S','C',0 };
|
||||
static const WCHAR DISTINCT_W[] = { 'D','I','S','T','I','N','C','T',0 };
|
||||
static const WCHAR DROP_W[] = { 'D','R','O','P',0 };
|
||||
static const WCHAR END_W[] = { 'E','N','D',0 };
|
||||
static const WCHAR EACH_W[] = { 'E','A','C','H',0 };
|
||||
static const WCHAR ELSE_W[] = { 'E','L','S','E',0 };
|
||||
static const WCHAR EXCEPT_W[] = { 'E','X','C','E','P','T',0 };
|
||||
static const WCHAR EXPLAIN_W[] = { 'E','X','P','L','A','I','N',0 };
|
||||
static const WCHAR FAIL_W[] = { 'F','A','I','L',0 };
|
||||
static const WCHAR FOR_W[] = { 'F','O','R',0 };
|
||||
static const WCHAR FOREIGN_W[] = { 'F','O','R','E','I','G','N',0 };
|
||||
static const WCHAR FROM_W[] = { 'F','R','O','M',0 };
|
||||
static const WCHAR FULL_W[] = { 'F','U','L','L',0 };
|
||||
static const WCHAR GLOB_W[] = { 'G','L','O','B',0 };
|
||||
static const WCHAR GROUP_W[] = { 'G','R','O','U','P',0 };
|
||||
static const WCHAR HAVING_W[] = { 'H','A','V','I','N','G',0 };
|
||||
static const WCHAR HOLD_W[] = { 'H','O','L','D',0 };
|
||||
static const WCHAR IGNORE_W[] = { 'I','G','N','O','R','E',0 };
|
||||
static const WCHAR IMMEDIATE_W[] = { 'I','M','M','E','D','I','A','T','E',0 };
|
||||
static const WCHAR IN_W[] = { 'I','N',0 };
|
||||
static const WCHAR INDEX_W[] = { 'I','N','D','E','X',0 };
|
||||
static const WCHAR INITIALLY_W[] = { 'I','N','I','T','I','A','L','L','Y',0 };
|
||||
static const WCHAR INNER_W[] = { 'I','N','N','E','R',0 };
|
||||
static const WCHAR INSERT_W[] = { 'I','N','S','E','R','T',0 };
|
||||
static const WCHAR INSTEAD_W[] = { 'I','N','S','T','E','A','D',0 };
|
||||
static const WCHAR INT_W[] = { 'I','N','T',0 };
|
||||
static const WCHAR INTERSECT_W[] = { 'I','N','T','E','R','S','E','C','T',0 };
|
||||
static const WCHAR INTO_W[] = { 'I','N','T','O',0 };
|
||||
static const WCHAR IS_W[] = { 'I','S',0 };
|
||||
static const WCHAR ISNULL_W[] = { 'I','S','N','U','L','L',0 };
|
||||
static const WCHAR JOIN_W[] = { 'J','O','I','N',0 };
|
||||
static const WCHAR KEY_W[] = { 'K','E','Y',0 };
|
||||
static const WCHAR LEFT_W[] = { 'L','E','F','T',0 };
|
||||
static const WCHAR LIKE_W[] = { 'L','I','K','E',0 };
|
||||
static const WCHAR LIMIT_W[] = { 'L','I','M','I','T',0 };
|
||||
static const WCHAR LOCALIZABLE_W[] = { 'L','O','C','A','L','I','Z','A','B','L','E',0 };
|
||||
static const WCHAR LONG_W[] = { 'L','O','N','G',0 };
|
||||
static const WCHAR LONGCHAR_W[] = { 'L','O','N','G','C','H','A','R',0 };
|
||||
static const WCHAR MATCH_W[] = { 'M','A','T','C','H',0 };
|
||||
static const WCHAR NATURAL_W[] = { 'N','A','T','U','R','A','L',0 };
|
||||
static const WCHAR NOT_W[] = { 'N','O','T',0 };
|
||||
static const WCHAR NOTNULL_W[] = { 'N','O','T','N','U','L','L',0 };
|
||||
static const WCHAR NULL_W[] = { 'N','U','L','L',0 };
|
||||
static const WCHAR OBJECT_W[] = { 'O','B','J','E','C','T',0 };
|
||||
static const WCHAR OF_W[] = { 'O','F',0 };
|
||||
static const WCHAR OFFSET_W[] = { 'O','F','F','S','E','T',0 };
|
||||
static const WCHAR ON_W[] = { 'O','N',0 };
|
||||
static const WCHAR OR_W[] = { 'O','R',0 };
|
||||
static const WCHAR ORDER_W[] = { 'O','R','D','E','R',0 };
|
||||
static const WCHAR OUTER_W[] = { 'O','U','T','E','R',0 };
|
||||
static const WCHAR PRAGMA_W[] = { 'P','R','A','G','M','A',0 };
|
||||
static const WCHAR PRIMARY_W[] = { 'P','R','I','M','A','R','Y',0 };
|
||||
static const WCHAR RAISE_W[] = { 'R','A','I','S','E',0 };
|
||||
static const WCHAR REFERENCES_W[] = { 'R','E','F','E','R','E','N','C','E','S',0 };
|
||||
static const WCHAR REPLACE_W[] = { 'R','E','P','L','A','C','E',0 };
|
||||
static const WCHAR RESTRICT_W[] = { 'R','E','S','T','R','I','C','T',0 };
|
||||
static const WCHAR RIGHT_W[] = { 'R','I','G','H','T',0 };
|
||||
static const WCHAR ROLLBACK_W[] = { 'R','O','L','L','B','A','C','K',0 };
|
||||
static const WCHAR ROW_W[] = { 'R','O','W',0 };
|
||||
static const WCHAR SELECT_W[] = { 'S','E','L','E','C','T',0 };
|
||||
static const WCHAR SET_W[] = { 'S','E','T',0 };
|
||||
static const WCHAR SHORT_W[] = { 'S','H','O','R','T',0 };
|
||||
static const WCHAR STATEMENT_W[] = { 'S','T','A','T','E','M','E','N','T',0 };
|
||||
static const WCHAR TABLE_W[] = { 'T','A','B','L','E',0 };
|
||||
static const WCHAR TEMP_W[] = { 'T','E','M','P',0 };
|
||||
static const WCHAR TEMPORARY_W[] = { 'T','E','M','P','O','R','A','R','Y',0 };
|
||||
static const WCHAR THEN_W[] = { 'T','H','E','N',0 };
|
||||
static const WCHAR TRANSACTION_W[] = { 'T','R','A','N','S','A','C','T','I','O','N',0 };
|
||||
static const WCHAR TRIGGER_W[] = { 'T','R','I','G','G','E','R',0 };
|
||||
static const WCHAR UNION_W[] = { 'U','N','I','O','N',0 };
|
||||
static const WCHAR UNIQUE_W[] = { 'U','N','I','Q','U','E',0 };
|
||||
static const WCHAR UPDATE_W[] = { 'U','P','D','A','T','E',0 };
|
||||
static const WCHAR USING_W[] = { 'U','S','I','N','G',0 };
|
||||
static const WCHAR VACUUM_W[] = { 'V','A','C','U','U','M',0 };
|
||||
static const WCHAR VALUES_W[] = { 'V','A','L','U','E','S',0 };
|
||||
static const WCHAR VIEW_W[] = { 'V','I','E','W',0 };
|
||||
static const WCHAR WHEN_W[] = { 'W','H','E','N',0 };
|
||||
static const WCHAR WHERE_W[] = { 'W','H','E','R','E',0 };
|
||||
|
||||
/*
|
||||
** These are the keywords
|
||||
*/
|
||||
static const Keyword aKeywordTable[] = {
|
||||
{ "ABORT", TK_ABORT },
|
||||
{ "AFTER", TK_AFTER },
|
||||
{ "ALL", TK_ALL },
|
||||
{ "AND", TK_AND },
|
||||
{ "AS", TK_AS },
|
||||
{ "ASC", TK_ASC },
|
||||
{ "BEFORE", TK_BEFORE },
|
||||
{ "BEGIN", TK_BEGIN },
|
||||
{ "BETWEEN", TK_BETWEEN },
|
||||
{ "BY", TK_BY },
|
||||
{ "CASCADE", TK_CASCADE },
|
||||
{ "CASE", TK_CASE },
|
||||
{ "CHAR", TK_CHAR },
|
||||
{ "CHARACTER", TK_CHAR },
|
||||
{ "CHECK", TK_CHECK },
|
||||
{ "CLUSTER", TK_CLUSTER },
|
||||
{ "COLLATE", TK_COLLATE },
|
||||
{ "COMMIT", TK_COMMIT },
|
||||
{ "CONFLICT", TK_CONFLICT },
|
||||
{ "CONSTRAINT", TK_CONSTRAINT },
|
||||
{ "COPY", TK_COPY },
|
||||
{ "CREATE", TK_CREATE },
|
||||
{ "CROSS", TK_JOIN_KW },
|
||||
{ "DEFAULT", TK_DEFAULT },
|
||||
{ "DEFERRED", TK_DEFERRED },
|
||||
{ "DEFERRABLE", TK_DEFERRABLE },
|
||||
{ "DELETE", TK_DELETE },
|
||||
{ "DELIMITERS", TK_DELIMITERS },
|
||||
{ "DESC", TK_DESC },
|
||||
{ "DISTINCT", TK_DISTINCT },
|
||||
{ "DROP", TK_DROP },
|
||||
{ "END", TK_END },
|
||||
{ "EACH", TK_EACH },
|
||||
{ "ELSE", TK_ELSE },
|
||||
{ "EXCEPT", TK_EXCEPT },
|
||||
{ "EXPLAIN", TK_EXPLAIN },
|
||||
{ "FAIL", TK_FAIL },
|
||||
{ "FOR", TK_FOR },
|
||||
{ "FOREIGN", TK_FOREIGN },
|
||||
{ "FROM", TK_FROM },
|
||||
{ "FULL", TK_JOIN_KW },
|
||||
{ "GLOB", TK_GLOB },
|
||||
{ "GROUP", TK_GROUP },
|
||||
{ "HAVING", TK_HAVING },
|
||||
{ "HOLD", TK_HOLD },
|
||||
{ "IGNORE", TK_IGNORE },
|
||||
{ "IMMEDIATE", TK_IMMEDIATE },
|
||||
{ "IN", TK_IN },
|
||||
{ "INDEX", TK_INDEX },
|
||||
{ "INITIALLY", TK_INITIALLY },
|
||||
{ "INNER", TK_JOIN_KW },
|
||||
{ "INSERT", TK_INSERT },
|
||||
{ "INSTEAD", TK_INSTEAD },
|
||||
{ "INT", TK_INT },
|
||||
{ "INTERSECT", TK_INTERSECT },
|
||||
{ "INTO", TK_INTO },
|
||||
{ "IS", TK_IS },
|
||||
{ "ISNULL", TK_ISNULL },
|
||||
{ "JOIN", TK_JOIN },
|
||||
{ "KEY", TK_KEY },
|
||||
{ "LEFT", TK_JOIN_KW },
|
||||
{ "LIKE", TK_LIKE },
|
||||
{ "LIMIT", TK_LIMIT },
|
||||
{ "LOCALIZABLE", TK_LOCALIZABLE },
|
||||
{ "LONG", TK_LONG },
|
||||
{ "LONGCHAR", TK_LONGCHAR },
|
||||
{ "MATCH", TK_MATCH },
|
||||
{ "NATURAL", TK_JOIN_KW },
|
||||
{ "NOT", TK_NOT },
|
||||
{ "NOTNULL", TK_NOTNULL },
|
||||
{ "NULL", TK_NULL },
|
||||
{ "OBJECT", TK_OBJECT },
|
||||
{ "OF", TK_OF },
|
||||
{ "OFFSET", TK_OFFSET },
|
||||
{ "ON", TK_ON },
|
||||
{ "OR", TK_OR },
|
||||
{ "ORDER", TK_ORDER },
|
||||
{ "OUTER", TK_JOIN_KW },
|
||||
{ "PRAGMA", TK_PRAGMA },
|
||||
{ "PRIMARY", TK_PRIMARY },
|
||||
{ "RAISE", TK_RAISE },
|
||||
{ "REFERENCES", TK_REFERENCES },
|
||||
{ "REPLACE", TK_REPLACE },
|
||||
{ "RESTRICT", TK_RESTRICT },
|
||||
{ "RIGHT", TK_JOIN_KW },
|
||||
{ "ROLLBACK", TK_ROLLBACK },
|
||||
{ "ROW", TK_ROW },
|
||||
{ "SELECT", TK_SELECT },
|
||||
{ "SET", TK_SET },
|
||||
{ "SHORT", TK_SHORT },
|
||||
{ "STATEMENT", TK_STATEMENT },
|
||||
{ "TABLE", TK_TABLE },
|
||||
{ "TEMP", TK_TEMP },
|
||||
{ "TEMPORARY", TK_TEMP },
|
||||
{ "THEN", TK_THEN },
|
||||
{ "TRANSACTION", TK_TRANSACTION },
|
||||
{ "TRIGGER", TK_TRIGGER },
|
||||
{ "UNION", TK_UNION },
|
||||
{ "UNIQUE", TK_UNIQUE },
|
||||
{ "UPDATE", TK_UPDATE },
|
||||
{ "USING", TK_USING },
|
||||
{ "VACUUM", TK_VACUUM },
|
||||
{ "VALUES", TK_VALUES },
|
||||
{ "VIEW", TK_VIEW },
|
||||
{ "WHEN", TK_WHEN },
|
||||
{ "WHERE", TK_WHERE },
|
||||
{ ABORT_W, TK_ABORT },
|
||||
{ AFTER_W, TK_AFTER },
|
||||
{ ALL_W, TK_ALL },
|
||||
{ AND_W, TK_AND },
|
||||
{ AS_W, TK_AS },
|
||||
{ ASC_W, TK_ASC },
|
||||
{ BEFORE_W, TK_BEFORE },
|
||||
{ BEGIN_W, TK_BEGIN },
|
||||
{ BETWEEN_W, TK_BETWEEN },
|
||||
{ BY_W, TK_BY },
|
||||
{ CASCADE_W, TK_CASCADE },
|
||||
{ CASE_W, TK_CASE },
|
||||
{ CHAR_W, TK_CHAR },
|
||||
{ CHARACTER_W, TK_CHAR },
|
||||
{ CHECK_W, TK_CHECK },
|
||||
{ CLUSTER_W, TK_CLUSTER },
|
||||
{ COLLATE_W, TK_COLLATE },
|
||||
{ COMMIT_W, TK_COMMIT },
|
||||
{ CONFLICT_W, TK_CONFLICT },
|
||||
{ CONSTRAINT_W, TK_CONSTRAINT },
|
||||
{ COPY_W, TK_COPY },
|
||||
{ CREATE_W, TK_CREATE },
|
||||
{ CROSS_W, TK_JOIN_KW },
|
||||
{ DEFAULT_W, TK_DEFAULT },
|
||||
{ DEFERRED_W, TK_DEFERRED },
|
||||
{ DEFERRABLE_W, TK_DEFERRABLE },
|
||||
{ DELETE_W, TK_DELETE },
|
||||
{ DELIMITERS_W, TK_DELIMITERS },
|
||||
{ DESC_W, TK_DESC },
|
||||
{ DISTINCT_W, TK_DISTINCT },
|
||||
{ DROP_W, TK_DROP },
|
||||
{ END_W, TK_END },
|
||||
{ EACH_W, TK_EACH },
|
||||
{ ELSE_W, TK_ELSE },
|
||||
{ EXCEPT_W, TK_EXCEPT },
|
||||
{ EXPLAIN_W, TK_EXPLAIN },
|
||||
{ FAIL_W, TK_FAIL },
|
||||
{ FOR_W, TK_FOR },
|
||||
{ FOREIGN_W, TK_FOREIGN },
|
||||
{ FROM_W, TK_FROM },
|
||||
{ FULL_W, TK_JOIN_KW },
|
||||
{ GLOB_W, TK_GLOB },
|
||||
{ GROUP_W, TK_GROUP },
|
||||
{ HAVING_W, TK_HAVING },
|
||||
{ HOLD_W, TK_HOLD },
|
||||
{ IGNORE_W, TK_IGNORE },
|
||||
{ IMMEDIATE_W, TK_IMMEDIATE },
|
||||
{ IN_W, TK_IN },
|
||||
{ INDEX_W, TK_INDEX },
|
||||
{ INITIALLY_W, TK_INITIALLY },
|
||||
{ INNER_W, TK_JOIN_KW },
|
||||
{ INSERT_W, TK_INSERT },
|
||||
{ INSTEAD_W, TK_INSTEAD },
|
||||
{ INT_W, TK_INT },
|
||||
{ INTERSECT_W, TK_INTERSECT },
|
||||
{ INTO_W, TK_INTO },
|
||||
{ IS_W, TK_IS },
|
||||
{ ISNULL_W, TK_ISNULL },
|
||||
{ JOIN_W, TK_JOIN },
|
||||
{ KEY_W, TK_KEY },
|
||||
{ LEFT_W, TK_JOIN_KW },
|
||||
{ LIKE_W, TK_LIKE },
|
||||
{ LIMIT_W, TK_LIMIT },
|
||||
{ LOCALIZABLE_W, TK_LOCALIZABLE },
|
||||
{ LONG_W, TK_LONG },
|
||||
{ LONGCHAR_W, TK_LONGCHAR },
|
||||
{ MATCH_W, TK_MATCH },
|
||||
{ NATURAL_W, TK_JOIN_KW },
|
||||
{ NOT_W, TK_NOT },
|
||||
{ NOTNULL_W, TK_NOTNULL },
|
||||
{ NULL_W, TK_NULL },
|
||||
{ OBJECT_W, TK_OBJECT },
|
||||
{ OF_W, TK_OF },
|
||||
{ OFFSET_W, TK_OFFSET },
|
||||
{ ON_W, TK_ON },
|
||||
{ OR_W, TK_OR },
|
||||
{ ORDER_W, TK_ORDER },
|
||||
{ OUTER_W, TK_JOIN_KW },
|
||||
{ PRAGMA_W, TK_PRAGMA },
|
||||
{ PRIMARY_W, TK_PRIMARY },
|
||||
{ RAISE_W, TK_RAISE },
|
||||
{ REFERENCES_W, TK_REFERENCES },
|
||||
{ REPLACE_W, TK_REPLACE },
|
||||
{ RESTRICT_W, TK_RESTRICT },
|
||||
{ RIGHT_W, TK_JOIN_KW },
|
||||
{ ROLLBACK_W, TK_ROLLBACK },
|
||||
{ ROW_W, TK_ROW },
|
||||
{ SELECT_W, TK_SELECT },
|
||||
{ SET_W, TK_SET },
|
||||
{ SHORT_W, TK_SHORT },
|
||||
{ STATEMENT_W, TK_STATEMENT },
|
||||
{ TABLE_W, TK_TABLE },
|
||||
{ TEMP_W, TK_TEMP },
|
||||
{ TEMPORARY_W, TK_TEMP },
|
||||
{ THEN_W, TK_THEN },
|
||||
{ TRANSACTION_W, TK_TRANSACTION },
|
||||
{ TRIGGER_W, TK_TRIGGER },
|
||||
{ UNION_W, TK_UNION },
|
||||
{ UNIQUE_W, TK_UNIQUE },
|
||||
{ UPDATE_W, TK_UPDATE },
|
||||
{ USING_W, TK_USING },
|
||||
{ VACUUM_W, TK_VACUUM },
|
||||
{ VALUES_W, TK_VALUES },
|
||||
{ VIEW_W, TK_VIEW },
|
||||
{ WHEN_W, TK_WHEN },
|
||||
{ WHERE_W, TK_WHERE },
|
||||
};
|
||||
|
||||
#define KEYWORD_COUNT ( sizeof aKeywordTable/sizeof (Keyword) )
|
||||
|
|
@ -159,17 +266,13 @@ static const Keyword aKeywordTable[] = {
|
|||
** returned. If the input is not a keyword, TK_ID is returned.
|
||||
*/
|
||||
static int sqliteKeywordCode(const WCHAR *z, int n){
|
||||
UINT i, len;
|
||||
char buffer[0x10];
|
||||
UINT i;
|
||||
|
||||
len = WideCharToMultiByte( CP_ACP, 0, z, n, buffer, sizeof buffer, NULL, NULL );
|
||||
for(i=0; i<len; i++)
|
||||
buffer[i] = toupper(buffer[i]);
|
||||
for(i=0; i<KEYWORD_COUNT; i++)
|
||||
{
|
||||
if(memcmp(buffer, aKeywordTable[i].zName, len))
|
||||
if(strncmpiW(z, aKeywordTable[i].zName, n))
|
||||
continue;
|
||||
if(strlen(aKeywordTable[i].zName) == len )
|
||||
if(lstrlenW(aKeywordTable[i].zName) == n )
|
||||
return aKeywordTable[i].tokenType;
|
||||
}
|
||||
return TK_ID;
|
||||
|
|
|
|||
Loading…
Reference in New Issue