January 2012 - Wine-Commits

Hans Leidekker : msi: Accept a missing left backquote in SQL identifiers.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: 4def593456d720252ee319b2a561113cd55767d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4def593456d720252ee319b2a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 3 13:53:14 2012 +0100 msi: Accept a missing left backquote in SQL identifiers. --- dlls/msi/query.h | 2 +- dlls/msi/sql.y | 5 +++-- dlls/msi/tests/db.c | 30 ++++++++++++++++++++++++++++++ dlls/msi/tokenize.c | 5 ++++- 4 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/msi/query.h b/dlls/msi/query.h index 8f8a244..ca34b4c 100644 --- a/dlls/msi/query.h +++ b/dlls/msi/query.h @@ -131,7 +131,7 @@ UINT STORAGES_CreateView( MSIDATABASE *db, MSIVIEW **view ) DECLSPEC_HIDDEN; UINT DROP_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR name ) DECLSPEC_HIDDEN; -int sqliteGetToken(const WCHAR *z, int *tokenType) DECLSPEC_HIDDEN; +int sqliteGetToken(const WCHAR *z, int *tokenType, int *skip) DECLSPEC_HIDDEN; MSIRECORD *msi_query_merge_record( UINT fields, const column_info *vl, MSIRECORD *rec ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index 548e142..ead7743 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -797,7 +797,7 @@ static column_info *parser_alloc_column( void *info, LPCWSTR table, LPCWSTR colu static int sql_lex( void *SQL_lval, SQL_input *sql ) { - int token; + int token, skip; struct sql_str * str = SQL_lval; do @@ -807,11 +807,12 @@ static int sql_lex( void *SQL_lval, SQL_input *sql ) return 0; /* end of input */ /* TRACE("string : %s\n", debugstr_w(&sql->command[sql->n])); */ - sql->len = sqliteGetToken( &sql->command[sql->n], &token ); + sql->len = sqliteGetToken( &sql->command[sql->n], &token, &skip ); if( sql->len==0 ) break; str->data = &sql->command[sql->n]; str->len = sql->len; + sql->n += skip; } while( token == TK_SPACE ); diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 6ecd642..d33eb0c 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -727,6 +727,36 @@ static void test_msibadqueries(void) r = try_query( hdb, "select * from 'c'"); ok(r == ERROR_BAD_QUERY_SYNTAX, "query failed\n"); + r = try_query( hdb, "select `c`.`b` from `c` order by `c`.`order`"); + ok( r == ERROR_BAD_QUERY_SYNTAX, "query failed: %u\n", r ); + + r = try_query( hdb, "select `c`.b` from `c`"); + ok( r == ERROR_SUCCESS, "query failed: %u\n", r ); + + r = try_query( hdb, "select `c`.`b from `c`"); + ok( r == ERROR_BAD_QUERY_SYNTAX, "query failed: %u\n", r ); + + r = try_query( hdb, "select `c`.b from `c`"); + ok( r == ERROR_SUCCESS, "query failed: %u\n", r ); + + r = try_query( hdb, "select `c.`b` from `c`"); + ok( r == ERROR_BAD_QUERY_SYNTAX, "query failed: %u\n", r ); + + r = try_query( hdb, "select c`.`b` from `c`"); + ok( r == ERROR_SUCCESS, "query failed: %u\n", r ); + + r = try_query( hdb, "select c.`b` from `c`"); + ok( r == ERROR_SUCCESS, "query failed: %u\n", r ); + + r = try_query( hdb, "select `c`.`b` from c`"); + ok( r == ERROR_SUCCESS, "query failed: %u\n", r ); + + r = try_query( hdb, "select `c`.`b` from `c"); + ok( r == ERROR_BAD_QUERY_SYNTAX, "query failed: %u\n", r ); + + r = try_query( hdb, "select `c`.`b` from c"); + ok( r == ERROR_SUCCESS, "query failed: %u\n", r ); + r = try_query( hdb, "CREATE TABLE `\5a` (`b` CHAR NOT NULL PRIMARY KEY `b`)" ); ok( r == ERROR_SUCCESS , "query failed: %u\n", r ); diff --git a/dlls/msi/tokenize.c b/dlls/msi/tokenize.c index 64e14b8..c432888 100644 --- a/dlls/msi/tokenize.c +++ b/dlls/msi/tokenize.c @@ -190,8 +190,10 @@ static const char isIdChar[] = { ** -1 if the token is (or might be) incomplete. Store the token ** type in *tokenType before returning. */ -int sqliteGetToken(const WCHAR *z, int *tokenType){ +int sqliteGetToken(const WCHAR *z, int *tokenType, int *skip){ int i; + + *skip = 0; switch( *z ){ case ' ': case '\t': case '\n': case '\f': for(i=1; isspace(z[i]) && z[i] != '\r'; i++){} @@ -280,6 +282,7 @@ int sqliteGetToken(const WCHAR *z, int *tokenType){ } for(i=1; isIdChar[z[i]]; i++){} *tokenType = sqliteKeywordCode(z, i); + if( *tokenType == TK_ID && z[i] == '`' ) *skip = 1; return i; } *tokenType = TK_ILLEGAL;

1 0

Aric Stewart : usp10: Cache feature lookups.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: f7a21f8cba067ec41214b35947bdeb82a1671fcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7a21f8cba067ec41214b3594… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 3 06:51:33 2012 -0600 usp10: Cache feature lookups. --- dlls/usp10/shape.c | 53 +++++++++++++++++++++++------------------- dlls/usp10/usp10.c | 5 ++++ dlls/usp10/usp10_internal.h | 2 + 3 files changed, 36 insertions(+), 24 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 1240739..b51e982 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1089,18 +1089,23 @@ static INT GSUB_apply_lookup(const GSUB_LookupList* lookup, INT lookup_index, WO return GSUB_E_NOGLYPH; } -static INT GSUB_apply_feature_all_lookups(const GSUB_Header * header, const GSUB_Feature* feature, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) +static INT apply_GSUB_lookup(LPCVOID table, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) +{ + const GSUB_Header *header = (const GSUB_Header *)table; + const GSUB_LookupList *lookup = (const GSUB_LookupList*)((const BYTE*)header + GET_BE_WORD(header->LookupList)); + + return GSUB_apply_lookup(lookup, lookup_index, glyphs, glyph_index, write_dir, glyph_count); +} + +static INT GSUB_apply_feature_all_lookups(LPCVOID header, LoadedFeature *feature, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) { int i; int out_index = GSUB_E_NOGLYPH; - const GSUB_LookupList *lookup; - lookup = (const GSUB_LookupList*)((const BYTE*)header + GET_BE_WORD(header->LookupList)); - - TRACE("%i lookups\n", GET_BE_WORD(feature->LookupCount)); - for (i = 0; i < GET_BE_WORD(feature->LookupCount); i++) + TRACE("%i lookups\n", feature->lookup_count); + for (i = 0; i < feature->lookup_count; i++) { - out_index = GSUB_apply_lookup(lookup, GET_BE_WORD(feature->LookupListIndex[i]), glyphs, glyph_index, write_dir, glyph_count); + out_index = apply_GSUB_lookup(header, feature->lookups[i], glyphs, glyph_index, write_dir, glyph_count); if (out_index != GSUB_E_NOGLYPH) break; } @@ -1202,7 +1207,7 @@ static INT apply_GSUB_feature_to_glyph(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCach return GSUB_E_NOFEATURE; TRACE("applying feature %s\n",feat); - return GSUB_apply_feature_all_lookups(psc->GSUB_Table, feature->feature, glyphs, index, write_dir, glyph_count); + return GSUB_apply_feature_all_lookups(psc->GSUB_Table, feature, glyphs, index, write_dir, glyph_count); } static VOID *load_gsub_table(HDC hdc) @@ -1469,22 +1474,15 @@ static int apply_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, W { if (psc->GSUB_Table) { - LoadedFeature *load_feature; - const GSUB_Feature *feature; - const GSUB_LookupList *lookup; - const GSUB_Header *header = psc->GSUB_Table; - int lookup_index, lookup_count; + LoadedFeature *feature; + int lookup_index; - load_feature = load_GSUB_feature(hdc, psa, psc, feat); - if (!load_feature) + feature = load_GSUB_feature(hdc, psa, psc, feat); + if (!feature) return GSUB_E_NOFEATURE; - feature = load_feature->feature; - TRACE("applying feature %s\n",debugstr_an(feat,4)); - lookup = (const GSUB_LookupList*)((const BYTE*)header + GET_BE_WORD(header->LookupList)); - lookup_count = GET_BE_WORD(feature->LookupCount); - TRACE("%i lookups\n", lookup_count); - for (lookup_index = 0; lookup_index < lookup_count; lookup_index++) + TRACE("applying feature %s: %i lookups\n",debugstr_an(feat,4),feature->lookup_count); + for (lookup_index = 0; lookup_index < feature->lookup_count; lookup_index++) { int i; @@ -1492,13 +1490,13 @@ static int apply_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, W i = 0; else i = *pcGlyphs-1; - TRACE("applying lookup (%i/%i)\n",lookup_index,lookup_count); + TRACE("applying lookup (%i/%i)\n",lookup_index,feature->lookup_count); while(i < *pcGlyphs && i >= 0) { INT nextIndex; INT prevCount = *pcGlyphs; - nextIndex = GSUB_apply_lookup(lookup, GET_BE_WORD(feature->LookupListIndex[lookup_index]), pwOutGlyphs, i, write_dir, pcGlyphs); + nextIndex = apply_GSUB_lookup(psc->GSUB_Table, feature->lookups[lookup_index], pwOutGlyphs, i, write_dir, pcGlyphs); if (*pcGlyphs != prevCount) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, write_dir, cChars, pwLogClust); @@ -2200,7 +2198,7 @@ static void Apply_Indic_BasicForm(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps { INT nextIndex; INT prevCount = *pcGlyphs; - nextIndex = GSUB_apply_feature_all_lookups(psc->GSUB_Table, feature->feature, pwOutGlyphs, index, 1, pcGlyphs); + nextIndex = GSUB_apply_feature_all_lookups(psc->GSUB_Table, feature, pwOutGlyphs, index, 1, pcGlyphs); if (nextIndex > GSUB_E_NOGLYPH) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, 1, cChars, pwLogClust); @@ -3855,10 +3853,17 @@ static void GSUB_initialize_feature_cache(LPCVOID table, LoadedLanguage *languag for (i = 0; i < language->feature_count; i++) { + const GSUB_Feature *feature; + int j; int index = GET_BE_WORD(lang->FeatureIndex[i]); language->features[i].tag = MS_MAKE_TAG(feature_list->FeatureRecord[index].FeatureTag[0], feature_list->FeatureRecord[index].FeatureTag[1], feature_list->FeatureRecord[index].FeatureTag[2], feature_list->FeatureRecord[index].FeatureTag[3]); language->features[i].feature = ((const BYTE*)feature_list + GET_BE_WORD(feature_list->FeatureRecord[index].Feature)); + feature = (const GSUB_Feature*)language->features[i].feature; + language->features[i].lookup_count = GET_BE_WORD(feature->LookupCount); + language->features[i].lookups = HeapAlloc(GetProcessHeap(),0,sizeof(WORD) * language->features[i].lookup_count); + for (j = 0; j < language->features[i].lookup_count; j++) + language->features[i].lookups[j] = GET_BE_WORD(feature->LookupListIndex[j]); } } } diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 1479b7c..9ddff1b 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -929,7 +929,12 @@ HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc) { int j; for (j = 0; j < ((ScriptCache *)*psc)->scripts[i].language_count; j++) + { + int k; + for (k = 0; k < ((ScriptCache *)*psc)->scripts[i].languages[j].feature_count; k++) + heap_free(((ScriptCache *)*psc)->scripts[i].languages[j].features[k].lookups); heap_free(((ScriptCache *)*psc)->scripts[i].languages[j].features); + } heap_free(((ScriptCache *)*psc)->scripts[i].languages); } heap_free(((ScriptCache *)*psc)->scripts); diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 6df9b50..c606389 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -128,6 +128,8 @@ typedef struct { OPENTYPE_TAG tag; LPCVOID feature; + INT lookup_count; + WORD *lookups; } LoadedFeature; typedef struct {

1 0

Aric Stewart : usp10: Have load_GSUB_feature return LoadedFeature*.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: c632f71e085fc1cf9ba3b35de7abb814939509c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c632f71e085fc1cf9ba3b35de… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 3 06:51:30 2012 -0600 usp10: Have load_GSUB_feature return LoadedFeature*. --- dlls/usp10/shape.c | 44 +++++++++++++++++++------------------------- 1 files changed, 19 insertions(+), 25 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 2358e53..1240739 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1159,7 +1159,7 @@ static OPENTYPE_TAG get_opentype_script(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCac } } -static LPCVOID load_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc, const char* feat) +static LoadedFeature* load_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc, const char* feat) { LoadedFeature *feature = NULL; @@ -1189,28 +1189,20 @@ static LPCVOID load_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc GSUB_GetFontFeatureTags(psc, MS_MAKE_TAG('l','a','t','n'), MS_MAKE_TAG('d','f','l','t'), FALSE, MS_MAKE_TAG(feat[0],feat[1],feat[2],feat[3]), 1, &tags, &cTags, &feature); } - if (feature) - { - TRACE("Feature %s located at %p\n",debugstr_an(feat,4),feature->feature); - return feature->feature; - } - else - { - TRACE("Feature %s not located\n",debugstr_an(feat,4)); - return NULL; - } + TRACE("Feature %s located at %p\n",debugstr_an(feat,4),feature); + return feature; } static INT apply_GSUB_feature_to_glyph(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, WORD *glyphs, INT index, INT write_dir, INT* glyph_count, const char* feat) { - const GSUB_Feature *feature; + LoadedFeature *feature; feature = load_GSUB_feature(hdc, psa, psc, feat); if (!feature) return GSUB_E_NOFEATURE; TRACE("applying feature %s\n",feat); - return GSUB_apply_feature_all_lookups(psc->GSUB_Table, feature, glyphs, index, write_dir, glyph_count); + return GSUB_apply_feature_all_lookups(psc->GSUB_Table, feature->feature, glyphs, index, write_dir, glyph_count); } static VOID *load_gsub_table(HDC hdc) @@ -1477,14 +1469,16 @@ static int apply_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, W { if (psc->GSUB_Table) { + LoadedFeature *load_feature; const GSUB_Feature *feature; const GSUB_LookupList *lookup; const GSUB_Header *header = psc->GSUB_Table; int lookup_index, lookup_count; - feature = load_GSUB_feature(hdc, psa, psc, feat); - if (!feature) + load_feature = load_GSUB_feature(hdc, psa, psc, feat); + if (!load_feature) return GSUB_E_NOFEATURE; + feature = load_feature->feature; TRACE("applying feature %s\n",debugstr_an(feat,4)); lookup = (const GSUB_LookupList*)((const BYTE*)header + GET_BE_WORD(header->LookupList)); @@ -2195,7 +2189,7 @@ static inline void shift_syllable_glyph_indexs(IndicSyllable *glyph_index, INT i glyph_index->pref+= shift; } -static void Apply_Indic_BasicForm(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwChars, INT cChars, IndicSyllable *syllable, WORD *pwOutGlyphs, INT* pcGlyphs, WORD *pwLogClust, lexical_function lexical, IndicSyllable *glyph_index, const GSUB_Feature *feature ) +static void Apply_Indic_BasicForm(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwChars, INT cChars, IndicSyllable *syllable, WORD *pwOutGlyphs, INT* pcGlyphs, WORD *pwLogClust, lexical_function lexical, IndicSyllable *glyph_index, LoadedFeature *feature ) { int index = glyph_index->start; @@ -2206,7 +2200,7 @@ static void Apply_Indic_BasicForm(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps { INT nextIndex; INT prevCount = *pcGlyphs; - nextIndex = GSUB_apply_feature_all_lookups(psc->GSUB_Table, feature, pwOutGlyphs, index, 1, pcGlyphs); + nextIndex = GSUB_apply_feature_all_lookups(psc->GSUB_Table, feature->feature, pwOutGlyphs, index, 1, pcGlyphs); if (nextIndex > GSUB_E_NOGLYPH) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, 1, cChars, pwLogClust); @@ -2332,13 +2326,13 @@ static void ShapeIndicSyllables(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, { int c; int overall_shift = 0; - const GSUB_Feature *locl = (modern)?load_GSUB_feature(hdc, psa, psc, "locl"):NULL; - const GSUB_Feature *nukt = load_GSUB_feature(hdc, psa, psc, "nukt"); - const GSUB_Feature *akhn = load_GSUB_feature(hdc, psa, psc, "akhn"); - const GSUB_Feature *rkrf = (modern)?load_GSUB_feature(hdc, psa, psc, "rkrf"):NULL; - const GSUB_Feature *pstf = load_GSUB_feature(hdc, psa, psc, "pstf"); - const GSUB_Feature *vatu = (!rkrf)?load_GSUB_feature(hdc, psa, psc, "vatu"):NULL; - const GSUB_Feature *cjct = (modern)?load_GSUB_feature(hdc, psa, psc, "cjct"):NULL; + LoadedFeature *locl = (modern)?load_GSUB_feature(hdc, psa, psc, "locl"):NULL; + LoadedFeature *nukt = load_GSUB_feature(hdc, psa, psc, "nukt"); + LoadedFeature *akhn = load_GSUB_feature(hdc, psa, psc, "akhn"); + LoadedFeature *rkrf = (modern)?load_GSUB_feature(hdc, psa, psc, "rkrf"):NULL; + LoadedFeature *pstf = load_GSUB_feature(hdc, psa, psc, "pstf"); + LoadedFeature *vatu = (!rkrf)?load_GSUB_feature(hdc, psa, psc, "vatu"):NULL; + LoadedFeature *cjct = (modern)?load_GSUB_feature(hdc, psa, psc, "cjct"):NULL; BOOL rphf = (load_GSUB_feature(hdc, psa, psc, "rphf") != NULL); BOOL pref = (load_GSUB_feature(hdc, psa, psc, "pref") != NULL); BOOL blwf = (load_GSUB_feature(hdc, psa, psc, "blwf") != NULL); @@ -3592,7 +3586,7 @@ rpRangeProperties = &ShapingData[psa->eScript].defaultTextRange; HRESULT SHAPE_CheckFontForRequiredFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa) { - const GSUB_Feature *feature; + LoadedFeature *feature; int i; if (!ShapingData[psa->eScript].requiredFeatures)

1 0

Frédéric Delanoy : cmd: Avoid unreachable code ( Coverity).
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: 0b358703ca54fa2fbb0769ac20cb46e5c39bf2ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b358703ca54fa2fbb0769ac2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jan 3 18:29:40 2012 +0100 cmd: Avoid unreachable code (Coverity). --- programs/cmd/wcmdmain.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 67a524d..6330ef6 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -725,8 +725,6 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, WCMD_strsubstW(start, endOfVar + 1, startCopy, substrlength); } - return start; - /* search and replace manipulation */ } else { WCHAR *equalspos = strstrW(colonpos, equalW); @@ -786,9 +784,8 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, HeapFree(GetProcessHeap(), 0, s); HeapFree(GetProcessHeap(), 0, searchIn); HeapFree(GetProcessHeap(), 0, searchFor); - return start; } - return start+1; + return start; } /*****************************************************************************

1 0

Alistair Leslie-Hughes : mscoree: Implement CLRRuntimeHost_ExecuteInDefaultAppDomain.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: acaa258054ab2a79efcb2b99595ab6a771401288 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acaa258054ab2a79efcb2b995… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Dec 16 09:15:11 2011 +1100 mscoree: Implement CLRRuntimeHost_ExecuteInDefaultAppDomain. --- dlls/mscoree/corruntimehost.c | 83 +++++++++++++++++++++++++++++++++++++++- dlls/mscoree/metahost.c | 1 + dlls/mscoree/mscoree_private.h | 2 + 3 files changed, 84 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index b7e4f5f..04482be 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -534,9 +534,88 @@ static HRESULT WINAPI CLRRuntimeHost_ExecuteInDefaultAppDomain(ICLRRuntimeHost* LPCWSTR pwzAssemblyPath, LPCWSTR pwzTypeName, LPCWSTR pwzMethodName, LPCWSTR pwzArgument, DWORD *pReturnValue) { - FIXME("(%p,%s,%s,%s,%s)\n", iface, debugstr_w(pwzAssemblyPath), + RuntimeHost *This = impl_from_ICLRRuntimeHost( iface ); + HRESULT hr; + MonoDomain *domain; + MonoAssembly *assembly; + MonoImage *image; + MonoClass *klass; + MonoMethod *method; + MonoObject *result; + MonoString *str; + void *args[2]; + char *filenameA = NULL, *classA = NULL, *methodA = NULL; + char *argsA = NULL, *ns; + + TRACE("(%p,%s,%s,%s,%s)\n", iface, debugstr_w(pwzAssemblyPath), debugstr_w(pwzTypeName), debugstr_w(pwzMethodName), debugstr_w(pwzArgument)); - return E_NOTIMPL; + + hr = RuntimeHost_GetDefaultDomain(This, &domain); + if(hr != S_OK) + { + ERR("Couldn't get Default Domain\n"); + return hr; + } + + hr = E_FAIL; + + filenameA = WtoA(pwzAssemblyPath); + assembly = This->mono->mono_domain_assembly_open(domain, filenameA); + if (!assembly) + { + ERR("Cannot open assembly %s\n", filenameA); + goto cleanup; + } + + image = This->mono->mono_assembly_get_image(assembly); + if (!image) + { + ERR("Couldn't get assembly image\n"); + goto cleanup; + } + + classA = WtoA(pwzTypeName); + ns = strrchr(classA, '.'); + *ns = '\0'; + klass = This->mono->mono_class_from_name(image, classA, ns+1); + if (!klass) + { + ERR("Couldn't get class from image\n"); + goto cleanup; + } + + methodA = WtoA(pwzMethodName); + method = This->mono->mono_class_get_method_from_name(klass, methodA, 1); + if (!method) + { + ERR("Couldn't get method from class\n"); + goto cleanup; + } + + argsA = WtoA(pwzArgument); + str = This->mono->mono_string_new(domain, argsA); + args[0] = &str; + args[1] = NULL; + result = This->mono->mono_runtime_invoke(method, NULL, args, NULL); + if (!result) + ERR("Couldn't get result pointer\n"); + else + { + *pReturnValue = *(DWORD*)This->mono->mono_object_unbox(result); + hr = S_OK; + } + +cleanup: + if(filenameA) + HeapFree(GetProcessHeap(), 0, filenameA); + if(classA) + HeapFree(GetProcessHeap(), 0, classA); + if(argsA) + HeapFree(GetProcessHeap(), 0, argsA); + if(methodA) + HeapFree(GetProcessHeap(), 0, methodA); + + return hr; } static const struct ICLRRuntimeHostVtbl CLRHostVtbl = diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index d9e36a8..454a653 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -185,6 +185,7 @@ static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) LOAD_MONO_FUNCTION(mono_runtime_quit); LOAD_MONO_FUNCTION(mono_set_dirs); LOAD_MONO_FUNCTION(mono_stringify_assembly_name); + LOAD_MONO_FUNCTION(mono_string_new); /* GLib imports obsoleted by the 2.0 ABI */ if (This->mono_abi_version == 1) diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 71bf738..a45a405 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -41,6 +41,7 @@ typedef struct _MonoType MonoType; typedef struct _MonoImage MonoImage; typedef struct _MonoClass MonoClass; typedef struct _MonoObject MonoObject; +typedef struct _MonoString MonoString; typedef struct _MonoMethod MonoMethod; typedef struct _MonoProfiler MonoProfiler; @@ -161,6 +162,7 @@ struct loaded_mono void (CDECL *mono_thread_pool_cleanup)(void); void (CDECL *mono_thread_suspend_all_other_threads)(void); void (CDECL *mono_threads_set_shutting_down)(void); + MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str); }; /* loaded runtime interfaces */

1 0

Michael Stefaniuc : jscript: Remove break after return (Smatch).
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: 158c8b76cbb6e216589ddb5027d8d2e217d51437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=158c8b76cbb6e216589ddb502… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 2 22:23:48 2012 +0100 jscript: Remove break after return (Smatch). --- dlls/jscript/jsutils.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 2463a0b..b145d8a 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -571,10 +571,8 @@ HRESULT to_string(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, BSTR *str) case VT_I4: *str = int_to_bstr(V_I4(v)); break; - case VT_R8: { + case VT_R8: return double_to_bstr(V_R8(v), str); - break; - } case VT_BSTR: *str = SysAllocString(V_BSTR(v)); break;

1 0

Marcus Meissner : gdi32: Check return value of REGION_UnionRectWithRegion ( Coverity).
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: 15162ddf3c58ab33b7a5704bf0a2338648996ee8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15162ddf3c58ab33b7a5704bf… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Dec 31 16:21:48 2011 +0100 gdi32: Check return value of REGION_UnionRectWithRegion (Coverity). --- dlls/gdi32/region.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 4daf88c..66ca1c3 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -1271,11 +1271,12 @@ static BOOL REGION_UnionRectWithRegion(const RECT *rect, WINEREGION *rgn) BOOL add_rect_to_region( HRGN rgn, const RECT *rect ) { RGNOBJ *obj = GDI_GetObjPtr( rgn, OBJ_REGION ); + BOOL ret; if (!obj) return FALSE; - REGION_UnionRectWithRegion( rect, &obj->rgn ); + ret = REGION_UnionRectWithRegion( rect, &obj->rgn ); GDI_ReleaseObj( rgn ); - return TRUE; + return ret; } /***********************************************************************

1 0

Pierre Schweitzer : taskmgr: Fix handle leaks.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: 4f18f4d2c32b0a27cd41bffe46a14496d82d390f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f18f4d2c32b0a27cd41bffe4… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Fri Dec 30 21:56:00 2011 +0100 taskmgr: Fix handle leaks. --- programs/taskmgr/applpage.c | 2 +- programs/taskmgr/perfpage.c | 2 +- programs/taskmgr/procpage.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/taskmgr/applpage.c b/programs/taskmgr/applpage.c index 3a51dd8..52d08f1 100644 --- a/programs/taskmgr/applpage.c +++ b/programs/taskmgr/applpage.c @@ -891,7 +891,7 @@ ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) UpdateApplicationListControlViewSetting(); /* Start our refresh thread */ - CreateThread(NULL, 0, ApplicationPageRefreshThread, NULL, 0, NULL); + CloseHandle( CreateThread(NULL, 0, ApplicationPageRefreshThread, NULL, 0, NULL)); return TRUE; diff --git a/programs/taskmgr/perfpage.c b/programs/taskmgr/perfpage.c index 5b1fd41..8d52091 100644 --- a/programs/taskmgr/perfpage.c +++ b/programs/taskmgr/perfpage.c @@ -343,7 +343,7 @@ PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) GraphCtrl_SetPlotColor(&PerformancePageMemUsageHistoryGraph, 0, RGB(255, 255, 0)) ; /* Start our refresh thread */ #ifdef RUN_PERF_PAGE - CreateThread(NULL, 0, PerformancePageRefreshThread, NULL, 0, NULL); + CloseHandle( CreateThread(NULL, 0, PerformancePageRefreshThread, NULL, 0, NULL)); #endif /* diff --git a/programs/taskmgr/procpage.c b/programs/taskmgr/procpage.c index 7941d5c..dce76f3 100644 --- a/programs/taskmgr/procpage.c +++ b/programs/taskmgr/procpage.c @@ -483,7 +483,7 @@ ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) OldProcessListWndProc = (WNDPROC)SetWindowLongPtrW(hProcessPageListCtrl, GWLP_WNDPROC, (LONG_PTR)ProcessListWndProc); /* Start our refresh thread */ - CreateThread(NULL, 0, ProcessPageRefreshThread, NULL, 0, NULL); + CloseHandle( CreateThread(NULL, 0, ProcessPageRefreshThread, NULL, 0, NULL)); return TRUE;

1 0

Michael Stefaniuc : ddraw: Fix two memory leaks (Smatch).
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: f1f5536d8ffdd9bd2f8caf5fc5931dea9bfc28a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1f5536d8ffdd9bd2f8caf5fc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 2 22:27:07 2012 +0100 ddraw: Fix two memory leaks (Smatch). --- dlls/ddraw/surface.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d110acc..2f92edf 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1353,6 +1353,7 @@ static HRESULT ddraw_surface_blt_clipped(IDirectDrawSurfaceImpl *dst_surface, co &dst_rect, clip_list, &clip_list_size))) { WARN("Failed to get clip list, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, clip_list); return hr; } @@ -1386,6 +1387,7 @@ static HRESULT ddraw_surface_blt_clipped(IDirectDrawSurfaceImpl *dst_surface, co } } + HeapFree(GetProcessHeap(), 0, clip_list); return hr; }

1 0

Pierre Schweitzer : dplayx: Fix handle leak.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: 2d14f89fea8fa7d7819e5c22ace94dbf41411601 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d14f89fea8fa7d7819e5c22a… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Fri Dec 30 21:54:16 2011 +0100 dplayx: Fix handle leak. --- dlls/dplayx/dplayx_messages.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/dplayx/dplayx_messages.c b/dlls/dplayx/dplayx_messages.c index 2e34950..8b9320d 100644 --- a/dlls/dplayx/dplayx_messages.c +++ b/dlls/dplayx/dplayx_messages.c @@ -58,6 +58,7 @@ DWORD CreateLobbyMessageReceptionThread( HANDLE hNotifyEvent, HANDLE hStart, { DWORD dwMsgThreadId; LPMSGTHREADINFO lpThreadInfo; + HANDLE hThread; lpThreadInfo = HeapAlloc( GetProcessHeap(), 0, sizeof( *lpThreadInfo ) ); if( lpThreadInfo == NULL ) @@ -83,21 +84,20 @@ DWORD CreateLobbyMessageReceptionThread( HANDLE hNotifyEvent, HANDLE hStart, lpThreadInfo->hDeath = hDeath; lpThreadInfo->hSettingRead = hConnRead; - if( !CreateThread( NULL, /* Security attribs */ - 0, /* Stack */ - DPL_MSG_ThreadMain, /* Msg reception function */ - lpThreadInfo, /* Msg reception func parameter */ - 0, /* Flags */ - &dwMsgThreadId /* Updated with thread id */ - ) - ) + hThread = CreateThread( NULL, /* Security attribs */ + 0, /* Stack */ + DPL_MSG_ThreadMain, /* Msg reception function */ + lpThreadInfo, /* Msg reception func parameter */ + 0, /* Flags */ + &dwMsgThreadId /* Updated with thread id */ + ); + if ( hThread == NULL ) { ERR( "Unable to create msg thread\n" ); goto error; } - /* FIXME: Should I be closing the handle to the thread or does that - terminate the thread? */ + CloseHandle(hThread); return dwMsgThreadId;

1 0