wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Piotr Caban : msvcp90: Free memory allocated by _get_current_locale function.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 0609fccf449fd5ae87674feff5032e75cc69af27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0609fccf449fd5ae87674feff… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Nov 10 00:00:08 2012 +0100 msvcp90: Free memory allocated by _get_current_locale function. --- dlls/msvcp90/tests/misc.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 5faa03c..19dcdde 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -50,6 +50,7 @@ typedef struct static void* (__cdecl *p_set_invalid_parameter_handler)(void*); static _locale_t (__cdecl *p__get_current_locale)(void); +static void (__cdecl *p__free_locale)(_locale_t); static void (__cdecl *p_free)(void*); static void (__cdecl *p_char_assign)(void*, const void*); @@ -174,8 +175,9 @@ static BOOL init(void) p_set_invalid_parameter_handler = (void*)GetProcAddress(msvcr, "_set_invalid_parameter_handler"); p__get_current_locale = (void*)GetProcAddress(msvcr, "_get_current_locale"); + p__free_locale = (void*)GetProcAddress(msvcr, "_free_locale"); p_free = (void*)GetProcAddress(msvcr, "free"); - if(!p_set_invalid_parameter_handler || !p__get_current_locale || !p_free) { + if(!p_set_invalid_parameter_handler || !p__get_current_locale || !p__free_locale || !p_free) { win_skip("Error setting tests environment\n"); return FALSE; } @@ -389,6 +391,7 @@ static void test_wctype(void) static void test__Getctype(void) { MSVCP__Ctypevec ret; + _locale_t locale; ok(p__Getctype(&ret) == &ret, "__Getctype returned incorrect pointer\n"); ok(ret.handle == 0, "ret.handle = %d\n", ret.handle); @@ -397,7 +400,9 @@ static void test__Getctype(void) ok(ret.table[0] == 32, "ret.table[0] = %d\n", ret.table[0]); p_free(ret.table); - p__get_current_locale()->locinfo->lc_handle[LC_COLLATE] = 0x1234567; + locale = p__get_current_locale(); + locale->locinfo->lc_handle[LC_COLLATE] = 0x1234567; + p__free_locale(locale); ok(p__Getctype(&ret) == &ret, "__Getctype returned incorrect pointer\n"); ok(ret.handle == 0x1234567, "ret.handle = %d\n", ret.handle); ok(ret.page == 0, "ret.page = %d\n", ret.page); @@ -409,13 +414,16 @@ static void test__Getctype(void) static void test__Getcoll(void) { ULONGLONG (__cdecl *p__Getcoll_arg)(MSVCP__Collvec*); + _locale_t locale; union { MSVCP__Collvec collvec; ULONGLONG ull; }ret; - p__get_current_locale()->locinfo->lc_handle[LC_COLLATE] = 0x7654321; + locale = p__get_current_locale(); + locale->locinfo->lc_handle[LC_COLLATE] = 0x7654321; + p__free_locale(locale); ret.ull = 0; p__Getcoll_arg = (void*)p__Getcoll; p__Getcoll_arg(&ret.collvec); @@ -462,12 +470,15 @@ static void test_virtual_call(void) { BYTE this[256]; basic_string_char bstr; + _locale_t locale; const char *p; char str1[] = "test"; char str2[] = "TEST"; int ret; - p__get_current_locale()->locinfo->lc_handle[LC_COLLATE] = 1; + locale = p__get_current_locale(); + locale->locinfo->lc_handle[LC_COLLATE] = 1; + p__free_locale(locale); call_func2(p_collate_char_ctor_refs, this, 0); ret = (int)call_func5(p_collate_char_compare, this, str1, str1+4, str1, str1+4); ok(ret == 0, "collate<char>::compare returned %d\n", ret);

1 0

Francois Gouget : shell32: Fix a buffer overflow in CommandLineToArgvW().
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 3b6b2107e2648b562c7266b17c66ab263c374c31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b6b2107e2648b562c7266b17… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Nov 10 01:00:54 2012 +0100 shell32: Fix a buffer overflow in CommandLineToArgvW(). --- dlls/shell32/shell32_main.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 7648dbb..1507d4a 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -227,15 +227,20 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) if (*s) s++; } - /* close the argument */ + /* close the executable path */ *d++=0; /* skip to the first argument and initialize it if any */ while (*s==' ' || *s=='\t') s++; - if (*s) - argv[argc++]=d; + if (!*s) + { + /* There are no parameters so we are all done */ + *numargs=argc; + return argv; + } /* Split and copy the remaining arguments */ + argv[argc++]=d; qcount=bcount=0; while (*s) {

1 0

Łukasz Wojniłowicz : Polish translation for release 1.5.17
by Jeremy Newman 12 Nov '12

12 Nov '12

Module: website Branch: master Commit: d97aede18aa7c1228997c36ca1340318b7624203 URL: http://source.winehq.org/git/website.git/?a=commit;h=d97aede18aa7c1228997c3… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Nov 10 07:28:36 2012 +0100 Polish translation for release 1.5.17 --- news/pl/2012110901.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2012110901.xml b/news/pl/2012110901.xml new file mode 100644 index 0000000..e10ec77 --- /dev/null +++ b/news/pl/2012110901.xml @@ -0,0 +1,17 @@ +<news> +<date>Listopad 9, 2012</date> +<title>Wydano Wine 1.5.17</title> +<body> + Wydanie rozwojowe Wine 1.5.17 jest już dostępne. + <a href="{$root}/announce/1.5.17">Co nowego</a> w tym wydaniu: +<ul> + <li>Międzypikselowe wygładzanie czcionek w silniku DIB.</li> + <li>Wsparcie dla samoczynnej instalacji elementów sterowania ActiveX.</li> + <li>Samoczynny powrót do TLS 1.0 dla zabezpieczonych połączeń.</li> + <li>Początki analizatora tekstu DirectWrite.</li> + <li>Lepsza obsługa zarysów czcionek w OpenGL.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.17.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.5.17
by Jeremy Newman 12 Nov '12

12 Nov '12

Module: website Branch: master Commit: 1eef770d1aeffd93f8bc530c782d46ee400b0056 URL: http://source.winehq.org/git/website.git/?a=commit;h=1eef770d1aeffd93f8bc53… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 9 21:09:47 2012 +0100 French translation for release 1.5.17 --- news/fr/2012110901.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/fr/2012110901.xml b/news/fr/2012110901.xml new file mode 100644 index 0000000..2ea1717 --- /dev/null +++ b/news/fr/2012110901.xml @@ -0,0 +1,16 @@ +<news> +<date>9 novembre 2012</date> +<title>Sortie de Wine 1.5.17</title> +<body> + La version de développement 1.5.17 de Wine est disponible. + <a href="{$root}/announce/1.5.17">Nouveautés</a> de cette version : +<ul> + <li>Anticrénelage sur éléments de pixel des fontes dans le moteur DIB.</li> + <li>Prise en charge de l'installation automatique des contrôles ActiveX.</li> + <li>Substitution automatique vers TLS 1.0 pour les connexions sécurisées.</li> + <li>Ébauche d'un analyseur de texte DirectWrite.</li> + <li>Meilleur traitement des polices contours dans OpenGL.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.17.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

André Hentschel : Wine 1.5.17 freigegeben
by Jeremy Newman 09 Nov '12

09 Nov '12

Module: website Branch: master Commit: 0ae35fc7d6b3891c1b2fc47d5d5f528041890e88 URL: http://source.winehq.org/git/website.git/?a=commit;h=0ae35fc7d6b3891c1b2fc4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 9 20:43:14 2012 +0100 Wine 1.5.17 freigegeben --- news/de/2012110901.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2012110901.xml b/news/de/2012110901.xml new file mode 100644 index 0000000..bc36730 --- /dev/null +++ b/news/de/2012110901.xml @@ -0,0 +1,17 @@ +<news> +<date>9. November 2012</date> +<title>Wine 1.5.17 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.17 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.17">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Subpixel Schrift Antialiasing in der DIB Engine.</li> + <li>Unterstützung für die automatische Installation von ActiveX-Steuerelementen.</li> + <li>Bei sicheren Verbindungen wird automatisch auf TLS 1.0 zurückgeschaltet.</li> + <li>Anfänge des DirectWrite Textanalysators.</li> + <li>Besseres Handling von Schriftkonturen in OpenGL.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.17.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.5.17
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: website Branch: master Commit: ec36f6748726ddbf8c0f8befa19a722dbfe8d185 URL: http://source.winehq.org/git/website.git/?a=commit;h=ec36f6748726ddbf8c0f8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 9 19:59:32 2012 +0100 Wine release 1.5.17 --- news/en/2012110901.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2012110901.xml b/news/en/2012110901.xml new file mode 100644 index 0000000..3cf992e --- /dev/null +++ b/news/en/2012110901.xml @@ -0,0 +1,17 @@ +<news> +<date>November 9, 2012</date> +<title>Wine 1.5.17 Released</title> +<body> + The Wine development release 1.5.17 is now available. + <a href="{$root}/announce/1.5.17">What's new</a> in this release: +<ul> + <li>Sub-pixel font anti-aliasing in the DIB engine.</li> + <li>Support for automatic installation of ActiveX controls.</li> + <li>Automatic fallback to TLS 1.0 for secure connections.</li> + <li>Beginnings of the DirectWrite text analyzer.</li> + <li>Better handling of font outlines in OpenGL.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.17.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.5.17 : Alexandre Julliard : Release 1.5.17
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: refs/tags/wine-1.5.17 Tag: 71461e3ede8285a1bce94881b6f51dfe077afed1 URL: http://source.winehq.org/git/wine.git/?a=tag;h=71461e3ede8285a1bce94881b6f5… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 9 19:46:40 2012 +0100 Release 1.5.17

1 0

Alexandre Julliard : Release 1.5.17.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: 1262f07609e6722a841f511445f145d941848800 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1262f07609e6722a841f51144… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 9 19:46:37 2012 +0100 Release 1.5.17. --- ANNOUNCE | 974 ++++++++++++++++++++++++++++--------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 452 insertions(+), 542 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1262f07609e6722a841f5…

1 0

Michael Stefaniuc : msi: Use FIELD_OFFSET to calculate the size of structs with variable length array .
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: 51013ad27844de2a176287b6f3edbeccd972ee68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51013ad27844de2a176287b6f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Nov 9 16:47:44 2012 +0100 msi: Use FIELD_OFFSET to calculate the size of structs with variable length array. --- dlls/msi/dialog.c | 4 ++-- dlls/msi/table.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 85d5859..c0ff204 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -309,7 +309,7 @@ static UINT msi_dialog_add_font( MSIRECORD *rec, LPVOID param ) /* create a font and add it to the list */ name = MSI_RecordGetString( rec, 1 ); - font = msi_alloc( sizeof *font + strlenW( name )*sizeof (WCHAR) ); + font = msi_alloc( FIELD_OFFSET( msi_font, name[strlenW( name ) + 1] )); strcpyW( font->name, name ); list_add_head( &dialog->fonts, &font->entry ); @@ -414,7 +414,7 @@ static msi_control *msi_dialog_create_window( msi_dialog *dialog, style |= WS_CHILD; - control = msi_alloc( sizeof *control + strlenW(name)*sizeof(WCHAR) ); + control = msi_alloc( FIELD_OFFSET( msi_control, name[strlenW( name ) + 1] )); if (!control) return NULL; diff --git a/dlls/msi/table.c b/dlls/msi/table.c index c5aa685..e2186fc 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2141,7 +2141,7 @@ UINT TABLE_CreateView( MSIDATABASE *db, LPCWSTR name, MSIVIEW **view ) else if ( !strcmpW( name, szStorages ) ) return STORAGES_CreateView( db, view ); - sz = sizeof *tv + lstrlenW(name)*sizeof name[0] ; + sz = FIELD_OFFSET( MSITABLEVIEW, name[lstrlenW( name ) + 1] ); tv = msi_alloc_zero( sz ); if( !tv ) return ERROR_FUNCTION_FAILED;

1 0

Hans Leidekker : msi: Avoid a string copy when comparing SQL keywords.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: 9c431b67379839d7792aa38549cbf547bb5444c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c431b67379839d7792aa3854… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 9 16:47:09 2012 +0100 msi: Avoid a string copy when comparing SQL keywords. --- dlls/msi/tokenize.c | 169 ++++++++++++++++++++++++++------------------------- 1 files changed, 86 insertions(+), 83 deletions(-) diff --git a/dlls/msi/tokenize.c b/dlls/msi/tokenize.c index 4798917..441a54a 100644 --- a/dlls/msi/tokenize.c +++ b/dlls/msi/tokenize.c @@ -32,103 +32,108 @@ */ typedef struct Keyword Keyword; struct Keyword { - const WCHAR *zName; /* The keyword name */ + const WCHAR *name; /* The keyword name */ + unsigned int len; int tokenType; /* The token value for this keyword */ }; #define MAX_TOKEN_LEN 11 -static const WCHAR ADD_W[] = { 'A','D','D',0 }; -static const WCHAR ALTER_W[] = { 'A','L','T','E','R',0 }; -static const WCHAR AND_W[] = { 'A','N','D',0 }; -static const WCHAR BY_W[] = { 'B','Y',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 CREATE_W[] = { 'C','R','E','A','T','E',0 }; -static const WCHAR DELETE_W[] = { 'D','E','L','E','T','E',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 FREE_W[] = { 'F','R','E','E',0 }; -static const WCHAR FROM_W[] = { 'F','R','O','M',0 }; -static const WCHAR HOLD_W[] = { 'H','O','L','D',0 }; -static const WCHAR INSERT_W[] = { 'I','N','S','E','R','T',0 }; -static const WCHAR INT_W[] = { 'I','N','T',0 }; -static const WCHAR INTEGER_W[] = { 'I','N','T','E','G','E','R',0 }; -static const WCHAR INTO_W[] = { 'I','N','T','O',0 }; -static const WCHAR IS_W[] = { 'I','S',0 }; -static const WCHAR KEY_W[] = { 'K','E','Y',0 }; -static const WCHAR LIKE_W[] = { 'L','I','K','E',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 NOT_W[] = { 'N','O','T',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 OR_W[] = { 'O','R',0 }; -static const WCHAR ORDER_W[] = { 'O','R','D','E','R',0 }; -static const WCHAR PRIMARY_W[] = { 'P','R','I','M','A','R','Y',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 TABLE_W[] = { 'T','A','B','L','E',0 }; -static const WCHAR TEMPORARY_W[] = { 'T','E','M','P','O','R','A','R','Y',0 }; -static const WCHAR UPDATE_W[] = { 'U','P','D','A','T','E',0 }; -static const WCHAR VALUES_W[] = { 'V','A','L','U','E','S',0 }; -static const WCHAR WHERE_W[] = { 'W','H','E','R','E',0 }; +static const WCHAR addW[] = {'A','D','D'}; +static const WCHAR alterW[] = {'A','L','T','E','R'}; +static const WCHAR andW[] = {'A','N','D'}; +static const WCHAR byW[] = {'B','Y'}; +static const WCHAR charW[] = {'C','H','A','R'}; +static const WCHAR characterW[] = {'C','H','A','R','A','C','T','E','R'}; +static const WCHAR createW[] = {'C','R','E','A','T','E'}; +static const WCHAR deleteW[] = {'D','E','L','E','T','E'}; +static const WCHAR distinctW[] = {'D','I','S','T','I','N','C','T'}; +static const WCHAR dropW[] = {'D','R','O','P'}; +static const WCHAR freeW[] = {'F','R','E','E'}; +static const WCHAR fromW[] = {'F','R','O','M'}; +static const WCHAR holdW[] = {'H','O','L','D'}; +static const WCHAR insertW[] = {'I','N','S','E','R','T'}; +static const WCHAR intW[] = {'I','N','T'}; +static const WCHAR integerW[] = {'I','N','T','E','G','E','R'}; +static const WCHAR intoW[] = {'I','N','T','O'}; +static const WCHAR isW[] = {'I','S'}; +static const WCHAR keyW[] = {'K','E','Y'}; +static const WCHAR likeW[] = {'L','I','K','E'}; +static const WCHAR localizableW[] = {'L','O','C','A','L','I','Z','A','B','L','E'}; +static const WCHAR longW[] = {'L','O','N','G'}; +static const WCHAR longcharW[] = {'L','O','N','G','C','H','A','R'}; +static const WCHAR notW[] = {'N','O','T'}; +static const WCHAR nullW[] = {'N','U','L','L'}; +static const WCHAR objectW[] = {'O','B','J','E','C','T'}; +static const WCHAR orW[] = {'O','R'}; +static const WCHAR orderW[] = {'O','R','D','E','R'}; +static const WCHAR primaryW[] = {'P','R','I','M','A','R','Y'}; +static const WCHAR selectW[] = {'S','E','L','E','C','T'}; +static const WCHAR setW[] = {'S','E','T'}; +static const WCHAR shortW[] = {'S','H','O','R','T'}; +static const WCHAR tableW[] = {'T','A','B','L','E'}; +static const WCHAR temporaryW[] = {'T','E','M','P','O','R','A','R','Y'}; +static const WCHAR updateW[] = {'U','P','D','A','T','E'}; +static const WCHAR valuesW[] = {'V','A','L','U','E','S'}; +static const WCHAR whereW[] = {'W','H','E','R','E'}; + +#define ARRAY_SIZE(array) (sizeof(array)/sizeof((array)[0])) /* ** These are the keywords ** They MUST be in alphabetical order */ static const Keyword aKeywordTable[] = { - { ADD_W, TK_ADD }, - { ALTER_W, TK_ALTER }, - { AND_W, TK_AND }, - { BY_W, TK_BY }, - { CHAR_W, TK_CHAR }, - { CHARACTER_W, TK_CHAR }, - { CREATE_W, TK_CREATE }, - { DELETE_W, TK_DELETE }, - { DISTINCT_W, TK_DISTINCT }, - { DROP_W, TK_DROP }, - { FREE_W, TK_FREE }, - { FROM_W, TK_FROM }, - { HOLD_W, TK_HOLD }, - { INSERT_W, TK_INSERT }, - { INT_W, TK_INT }, - { INTEGER_W, TK_INT }, - { INTO_W, TK_INTO }, - { IS_W, TK_IS }, - { KEY_W, TK_KEY }, - { LIKE_W, TK_LIKE }, - { LOCALIZABLE_W, TK_LOCALIZABLE }, - { LONG_W, TK_LONG }, - { LONGCHAR_W, TK_LONGCHAR }, - { NOT_W, TK_NOT }, - { NULL_W, TK_NULL }, - { OBJECT_W, TK_OBJECT }, - { OR_W, TK_OR }, - { ORDER_W, TK_ORDER }, - { PRIMARY_W, TK_PRIMARY }, - { SELECT_W, TK_SELECT }, - { SET_W, TK_SET }, - { SHORT_W, TK_SHORT }, - { TABLE_W, TK_TABLE }, - { TEMPORARY_W, TK_TEMPORARY }, - { UPDATE_W, TK_UPDATE }, - { VALUES_W, TK_VALUES }, - { WHERE_W, TK_WHERE }, + { addW, ARRAY_SIZE(addW), TK_ADD }, + { alterW, ARRAY_SIZE(alterW), TK_ALTER }, + { andW, ARRAY_SIZE(andW), TK_AND }, + { byW, ARRAY_SIZE(byW), TK_BY }, + { charW, ARRAY_SIZE(charW), TK_CHAR }, + { characterW, ARRAY_SIZE(characterW), TK_CHAR }, + { createW, ARRAY_SIZE(createW), TK_CREATE }, + { deleteW, ARRAY_SIZE(deleteW), TK_DELETE }, + { distinctW, ARRAY_SIZE(distinctW), TK_DISTINCT }, + { dropW, ARRAY_SIZE(dropW), TK_DROP }, + { freeW, ARRAY_SIZE(freeW), TK_FREE }, + { fromW, ARRAY_SIZE(fromW), TK_FROM }, + { holdW, ARRAY_SIZE(holdW), TK_HOLD }, + { insertW, ARRAY_SIZE(insertW), TK_INSERT }, + { intW, ARRAY_SIZE(intW), TK_INT }, + { integerW, ARRAY_SIZE(integerW), TK_INT }, + { intoW, ARRAY_SIZE(intoW), TK_INTO }, + { isW, ARRAY_SIZE(isW), TK_IS }, + { keyW, ARRAY_SIZE(keyW), TK_KEY }, + { likeW, ARRAY_SIZE(likeW), TK_LIKE }, + { localizableW, ARRAY_SIZE(localizableW), TK_LOCALIZABLE }, + { longW, ARRAY_SIZE(longW), TK_LONG }, + { longcharW, ARRAY_SIZE(longcharW), TK_LONGCHAR }, + { notW, ARRAY_SIZE(notW), TK_NOT }, + { nullW, ARRAY_SIZE(nullW), TK_NULL }, + { objectW, ARRAY_SIZE(objectW), TK_OBJECT }, + { orW, ARRAY_SIZE(orW), TK_OR }, + { orderW, ARRAY_SIZE(orderW), TK_ORDER }, + { primaryW, ARRAY_SIZE(primaryW), TK_PRIMARY }, + { selectW, ARRAY_SIZE(selectW), TK_SELECT }, + { setW, ARRAY_SIZE(setW), TK_SET }, + { shortW, ARRAY_SIZE(shortW), TK_SHORT }, + { tableW, ARRAY_SIZE(tableW), TK_TABLE }, + { temporaryW, ARRAY_SIZE(temporaryW), TK_TEMPORARY }, + { updateW, ARRAY_SIZE(updateW), TK_UPDATE }, + { valuesW, ARRAY_SIZE(valuesW), TK_VALUES }, + { whereW, ARRAY_SIZE(whereW), TK_WHERE }, }; -#define KEYWORD_COUNT ( sizeof aKeywordTable/sizeof (Keyword) ) - /* ** Comparison function for binary search. */ static int compKeyword(const void *m1, const void *m2){ const Keyword *k1 = m1, *k2 = m2; + int ret, len = min( k1->len, k2->len ); - return strcmpiW( k1->zName, k2->zName ); + if ((ret = memicmpW( k1->name, k2->name, len ))) return ret; + if (k1->len < k2->len) return -1; + else if (k1->len > k2->len) return 1; + return 0; } /* @@ -137,17 +142,15 @@ static int compKeyword(const void *m1, const void *m2){ ** returned. If the input is not a keyword, TK_ID is returned. */ static int sqliteKeywordCode(const WCHAR *z, int n){ - WCHAR str[MAX_TOKEN_LEN+1]; Keyword key, *r; if( n>MAX_TOKEN_LEN ) return TK_ID; - memcpy( str, z, n*sizeof (WCHAR) ); - str[n] = 0; key.tokenType = 0; - key.zName = str; - r = bsearch( &key, aKeywordTable, KEYWORD_COUNT, sizeof (Keyword), compKeyword ); + key.name = z; + key.len = n; + r = bsearch( &key, aKeywordTable, ARRAY_SIZE(aKeywordTable), sizeof(Keyword), compKeyword ); if( r ) return r->tokenType; return TK_ID;

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2012