September 2010 - Wine-commits

Roderick Colenbrander : wined3d: Store amount of video memory in gpu_description_table.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 192e0dc433b6e9369dab7eba88dd22851255639b URL: http://source.winehq.org/git/wine.git/?a=commit;h=192e0dc433b6e9369dab7eba8… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sat Sep 11 03:59:47 2010 +0200 wined3d: Store amount of video memory in gpu_description_table. --- dlls/wined3d/directx.c | 269 +++++++++++++--------------------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 90 insertions(+), 180 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=192e0dc433b6e9369dab7…

1 0

Aric Stewart : usp10: Improve handling of spaces during Itemization.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 29d2c5a208fa88afb49512e516dc3b91f82d81dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d2c5a208fa88afb49512e51… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Sep 9 15:27:43 2010 -0500 usp10: Improve handling of spaces during Itemization. --- dlls/usp10/tests/usp10.c | 32 ++++++++++++++++++++++++++++++++ dlls/usp10/usp10.c | 23 ++++++++++++++++++++--- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index d04b536..57f3c26 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -78,6 +78,8 @@ static inline void _test_items_ok(LPCWSTR string, DWORD cchString, todo_wine winetest_ok(outpItems[x].a.s.uBidiLevel == items[x].uBidiLevel, "%i:Wrong BidiLevel\n",x); else winetest_ok(outpItems[x].a.s.uBidiLevel == items[x].uBidiLevel, "%i:Wrong BidiLevel(%i)\n",x,outpItems[x].a.s.uBidiLevel); + if (x != outnItems) + winetest_ok(outpItems[x].a.eScript != SCRIPT_UNDEFINED, "%i: Undefined script\n",x); } } @@ -90,6 +92,10 @@ static void test_ScriptItemize( void ) static const itemTest t11[2] = {{{0,0,0,0},0,0,0,0},{{0,0,0,0},4,0,0,0}}; static const itemTest t12[2] = {{{0,0,0,0},0,0,0,2},{{0,0,0,0},4,0,0,0}}; + static const WCHAR test1b[] = {' ', ' ', ' ', ' ',0}; + static const itemTest t1b1[2] = {{{0,0,0,0},0,0,0,0},{{0,0,0,0},4,0,0,0}}; + static const itemTest t1b2[2] = {{{0,0,0,0},0,1,1,1},{{0,0,0,0},4,0,0,0}}; + /* Arabic, English*/ static const WCHAR test2[] = {'1','2','3','-','5','2',0x064a,0x064f,0x0633,0x0627,0x0648,0x0650,0x064a,'7','1','.',0}; static const itemTest t21[7] = {{{0,0,0,0},0,0,0,0},{{0,0,0,0},3,0,0,0},{{0,0,0,0},4,0,0,0},{{0,0,0,0},6,1,1,1},{{0,0,0,0},13,0,0,0},{{0,0,0,0},15,0,0,0},{{0,0,0,0},16,0,0,0}}; @@ -101,6 +107,20 @@ static void test_ScriptItemize( void ) static const itemTest t2b2[5] = {{{0,0,0,0},0,0,0,2},{{0,0,0,0},3,0,0,2},{{0,0,0,0},4,0,0,2},{{0,0,0,0},7,1,1,1},{{0,0,0,0},11,0,0,0}}; static const itemTest t2b3[3] = {{{0,0,0,0},0,0,0,2},{{0,0,0,0},7,1,1,1},{{0,0,0,0},11,0,0,0}}; + /* leading space */ + static const WCHAR test2c[] = {' ',0x0621,0x0623,0x0624,'A','B','C','-','D','E','F',0}; + static const itemTest t2c1[5] = {{{0,0,0,0},0,1,1,1},{{0,0,0,0},4,0,0,0},{{0,0,0,0},7,0,0,0},{{0,0,0,0},8,0,0,0},{{0,0,0,0},11,0,0,0}}; + static const itemTest t2c2[6] = {{{0,0,0,0},0,0,0,0},{{0,0,0,0},1,1,1,1},{{0,0,0,0},4,0,0,0},{{0,0,0,0},7,0,0,0},{{0,0,0,0},8,0,0,0},{{0,0,0,0},11,0,0,0}}; + static const itemTest t2c3[5] = {{{0,0,0,0},0,1,1,1},{{0,0,0,0},4,0,0,2},{{0,0,0,0},7,0,0,2},{{0,0,0,0},8,0,0,2},{{0,0,0,0},11,0,0,0}}; + static const itemTest t2c4[3] = {{{0,0,0,0},0,1,1,1},{{0,0,0,0},4,0,0,2},{{0,0,0,0},11,0,0,0}}; + + /* trailing space */ + static const WCHAR test2d[] = {'A','B','C','-','D','E','F',0x0621,0x0623,0x0624,' ',0}; + static const itemTest t2d1[5] = {{{0,0,0,0},0,0,0,0},{{0,0,0,0},3,0,0,0},{{0,0,0,0},4,0,0,0},{{0,0,0,0},7,1,1,1},{{0,0,0,0},11,0,0,0}}; + static const itemTest t2d2[6] = {{{0,0,0,0},0,0,0,0},{{0,0,0,0},3,0,0,0},{{0,0,0,0},4,0,0,0},{{0,0,0,0},7,1,1,1},{{0,0,0,0},10,0,0,0},{{0,0,0,0},11,0,0,0}}; + static const itemTest t2d3[5] = {{{0,0,0,0},0,0,0,2},{{0,0,0,0},3,0,0,2},{{0,0,0,0},4,0,0,2},{{0,0,0,0},7,1,1,1},{{0,0,0,0},11,0,0,0}}; + static const itemTest t2d4[3] = {{{0,0,0,0},0,0,0,2},{{0,0,0,0},7,1,1,1},{{0,0,0,0},11,0,0,0}}; + /* Thai */ static const WCHAR test3[] = {0x0e04,0x0e27,0x0e32,0x0e21,0x0e1e,0x0e22,0x0e32,0x0e22,0x0e32, 0x0e21 @@ -168,8 +188,11 @@ static void test_ScriptItemize( void ) ok (hr == E_INVALIDARG, "ScriptItemize should return E_INVALIDARG if cInChars is 0\n"); test_items_ok(test1,4,NULL,NULL,1,t11,FALSE,0); + test_items_ok(test1b,4,NULL,NULL,1,t1b1,FALSE,0); test_items_ok(test2,16,NULL,NULL,6,t21,FALSE,0); test_items_ok(test2b,11,NULL,NULL,4,t2b1,FALSE,0); + test_items_ok(test2c,11,NULL,NULL,4,t2c1,FALSE,0); + test_items_ok(test2d,11,NULL,NULL,4,t2d1,FALSE,0); test_items_ok(test3,41,NULL,NULL,1,t31,FALSE,0); test_items_ok(test4,12,NULL,NULL,5,t41,FALSE,0); test_items_ok(test5,38,NULL,NULL,1,t51,FALSE,0); @@ -181,8 +204,11 @@ static void test_ScriptItemize( void ) State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); + test_items_ok(test1b,4,&Control,&State,1,t1b1,FALSE,0); test_items_ok(test2,16,&Control,&State,4,t22,FALSE,0); test_items_ok(test2b,11,&Control,&State,4,t2b1,FALSE,0); + test_items_ok(test2c,11,&Control,&State,5,t2c2,FALSE,0); + test_items_ok(test2d,11,&Control,&State,5,t2d2,FALSE,0); test_items_ok(test3,41,&Control,&State,1,t31,FALSE,0); test_items_ok(test4,12,&Control,&State,5,t41,FALSE,0); test_items_ok(test5,38,&Control,&State,1,t51,FALSE,0); @@ -194,8 +220,11 @@ static void test_ScriptItemize( void ) State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); + test_items_ok(test1b,4,&Control,&State,1,t1b2,FALSE,0); test_items_ok(test2,16,&Control,&State,4,t23,FALSE,0); test_items_ok(test2b,11,&Control,&State,4,t2b2,FALSE,0); + test_items_ok(test2c,11,&Control,&State,4,t2c3,FALSE,0); + test_items_ok(test2d,11,&Control,&State,4,t2d3,FALSE,0); test_items_ok(test3,41,&Control,&State,1,t32,FALSE,0); test_items_ok(test4,12,&Control,&State,4,t42,FALSE,0); test_items_ok(test5,38,&Control,&State,1,t51,FALSE,0); @@ -208,8 +237,11 @@ static void test_ScriptItemize( void ) State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); + test_items_ok(test1b,4,&Control,&State,1,t1b2,FALSE,0); test_items_ok(test2,16,&Control,&State,4,t23,FALSE,0); test_items_ok(test2b,11,&Control,&State,2,t2b3,FALSE,4); + test_items_ok(test2c,11,&Control,&State,2,t2c4,FALSE,4); + test_items_ok(test2d,11,&Control,&State,2,t2d4,FALSE,4); test_items_ok(test3,41,&Control,&State,1,t32,FALSE,0); test_items_ok(test4,12,&Control,&State,3,t43,FALSE,4); test_items_ok(test5,38,&Control,&State,1,t51,FALSE,0); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 64b9f11..c9ad77c 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -638,9 +638,22 @@ HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItem } } + while (pwcInChars[cnt] == Numeric_space && cnt < cInChars) + cnt++; + + if (cnt == cInChars) /* All Spaces */ + { + cnt = 0; + New_Script = get_char_script(pwcInChars[cnt]); + } + pItems[index].iCharPos = 0; pItems[index].a = scriptInformation[get_char_script(pwcInChars[cnt])].a; + if (strength) + str = strength[cnt]; + + cnt = 0; if (levels) { pItems[index].a.fRTL = odd(levels[cnt]); @@ -654,9 +667,6 @@ HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItem pItems[index].a.fRTL = odd(baselevel); } - if (strength) - str = strength[0]; - TRACE("New_Level=%i New_Strength=%i New_Script=%d, eScript=%d index=%d cnt=%d iCharPos=%d\n", levels?levels[cnt]:-1, str, New_Script, pItems[index].a.eScript, index, cnt, pItems[index].iCharPos); @@ -668,6 +678,13 @@ HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItem if(pwcInChars[cnt] != Numeric_space) New_Script = get_char_script(pwcInChars[cnt]); + else if (levels) + { + int j = 1; + while (cnt + j < cInChars - 1 && pwcInChars[cnt+j] == Numeric_space) + j++; + New_Script = get_char_script(pwcInChars[cnt+j]); + } if ((levels && (levels[cnt] != pItems[index].a.s.uBidiLevel || (strength && (strength[cnt] != str)))) || New_Script != pItems[index].a.eScript || New_Script == Script_Control) {

1 0

Aric Stewart : usp10: Check font for required features and report error if missing.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 7bf4db877ae402de72a4f1e7bf0f4f27b5b4fa67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bf4db877ae402de72a4f1e7b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Sep 9 15:27:57 2010 -0500 usp10: Check font for required features and report error if missing. --- dlls/usp10/shape.c | 98 ++++++++++++++++++++++++++++++++---------- dlls/usp10/usp10.c | 5 ++- dlls/usp10/usp10_internal.h | 1 + 3 files changed, 79 insertions(+), 25 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index e370e33..a2cbd2a 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -273,6 +273,15 @@ static OPENTYPE_FEATURE_RECORD arabic_features[] = { 0x7465736d /*mset*/, 1}, }; +static const char* required_arabic_features[] = +{ + "fina", + "init", + "medi", + "rlig", + NULL +}; + static OPENTYPE_FEATURE_RECORD hebrew_features[] = { { 0x67696c64 /*dlig*/, 1}, @@ -286,6 +295,18 @@ static OPENTYPE_FEATURE_RECORD syriac_features[] = { 0x67696c64 /*dlig*/, 1}, }; +static const char* required_syriac_features[] = +{ + "fina", + "fin2", + "fin3", + "init", + "medi", + "med2", + "rlig", + NULL +}; + static OPENTYPE_FEATURE_RECORD sinhala_features[] = { /* Base forms */ @@ -310,8 +331,15 @@ static OPENTYPE_FEATURE_RECORD thai_features[] = { 0x706d6363 /*ccmp*/, 1}, }; +static const char* required_lao_features[] = +{ + "ccmp", + NULL +}; + typedef struct ScriptShapeDataTag { TEXTRANGE_PROPERTIES defaultTextRange; + const char** requiredFeatures; CHAR otTag[5]; ContextualShapingProc contextProc; } ScriptShapeData; @@ -319,30 +347,30 @@ typedef struct ScriptShapeDataTag { /* in order of scripts */ static const ScriptShapeData ShapingData[] = { - {{ standard_features, 2}, "", NULL}, - {{ standard_features, 2}, "latn", NULL}, - {{ standard_features, 2}, "latn", NULL}, - {{ standard_features, 2}, "latn", NULL}, - {{ standard_features, 2}, "" , NULL}, - {{ standard_features, 2}, "latn", NULL}, - {{ arabic_features, 6}, "arab", ContextualShape_Arabic}, - {{ arabic_features, 6}, "arab", ContextualShape_Arabic}, - {{ hebrew_features, 1}, "hebr", NULL}, - {{ syriac_features, 4}, "syrc", ContextualShape_Syriac}, - {{ arabic_features, 6}, "arab", ContextualShape_Arabic}, - {{ NULL, 0}, "thaa", NULL}, - {{ standard_features, 2}, "grek", NULL}, - {{ standard_features, 2}, "cyrl", NULL}, - {{ standard_features, 2}, "armn", NULL}, - {{ standard_features, 2}, "geor", NULL}, - {{ sinhala_features, 7}, "sinh", NULL}, - {{ tibetan_features, 2}, "tibt", NULL}, - {{ tibetan_features, 2}, "tibt", NULL}, - {{ tibetan_features, 2}, "phag", ContextualShape_Phags_pa}, - {{ thai_features, 1}, "thai", NULL}, - {{ thai_features, 1}, "thai", NULL}, - {{ thai_features, 1}, "lao", NULL}, - {{ thai_features, 1}, "lao", NULL}, + {{ standard_features, 2}, NULL, "", NULL}, + {{ standard_features, 2}, NULL, "latn", NULL}, + {{ standard_features, 2}, NULL, "latn", NULL}, + {{ standard_features, 2}, NULL, "latn", NULL}, + {{ standard_features, 2}, NULL, "" , NULL}, + {{ standard_features, 2}, NULL, "latn", NULL}, + {{ arabic_features, 6}, required_arabic_features, "arab", ContextualShape_Arabic}, + {{ arabic_features, 6}, required_arabic_features, "arab", ContextualShape_Arabic}, + {{ hebrew_features, 1}, NULL, "hebr", NULL}, + {{ syriac_features, 4}, required_syriac_features, "syrc", ContextualShape_Syriac}, + {{ arabic_features, 6}, required_arabic_features, "arab", ContextualShape_Arabic}, + {{ NULL, 0}, NULL, "thaa", NULL}, + {{ standard_features, 2}, NULL, "grek", NULL}, + {{ standard_features, 2}, NULL, "cyrl", NULL}, + {{ standard_features, 2}, NULL, "armn", NULL}, + {{ standard_features, 2}, NULL, "geor", NULL}, + {{ sinhala_features, 7}, NULL, "sinh", NULL}, + {{ tibetan_features, 2}, NULL, "tibt", NULL}, + {{ tibetan_features, 2}, NULL, "tibt", NULL}, + {{ tibetan_features, 2}, NULL, "phag", ContextualShape_Phags_pa}, + {{ thai_features, 1}, NULL, "thai", NULL}, + {{ thai_features, 1}, NULL, "thai", NULL}, + {{ thai_features, 1}, required_lao_features, "lao", NULL}, + {{ thai_features, 1}, required_lao_features, "lao", NULL}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) @@ -1308,3 +1336,25 @@ rpRangeProperties = &ShapingData[psa->eScript].defaultTextRange; SHAPE_ApplyOpenTypeFeatures(hdc, psc, psa, pwOutGlyphs, pcGlyphs, cMaxGlyphs, cChars, rpRangeProperties, pwLogClust); } + +HRESULT SHAPE_CheckFontForRequiredFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa) +{ + const GSUB_Feature *feature; + int i; + + if (!ShapingData[psa->eScript].requiredFeatures) + return S_OK; + + if (!psc->GSUB_Table) + psc->GSUB_Table = load_gsub_table(hdc); + + i = 0; + while (ShapingData[psa->eScript].requiredFeatures[i]) + { + feature = load_GSUB_feature(hdc, psa, psc, ShapingData[psa->eScript].requiredFeatures[i]); + if (!feature) + return USP_E_SCRIPT_NOT_IN_FONT; + i++; + } + return S_OK; +} diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index c9ad77c..c103cef 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1290,7 +1290,10 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, if (!psa->fNoGlyphIndex) { - WCHAR *rChars = heap_alloc(sizeof(WCHAR) * cChars); + WCHAR *rChars; + if ((hr = SHAPE_CheckFontForRequiredFeatures(hdc, (ScriptCache *)*psc, psa)) != S_OK) return hr; + + rChars = heap_alloc(sizeof(WCHAR) * cChars); if (!rChars) return E_OUTOFMEMORY; for (i = 0; i < cChars; i++) { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index b314c4c..fe5d852 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -75,3 +75,4 @@ INT BIDI_ReorderV2lLevel(int level, int *pIndexs, const BYTE* plevel, int cch, B INT BIDI_ReorderL2vLevel(int level, int *pIndexs, const BYTE* plevel, int cch, BOOL fReverse); void SHAPE_ContextualShaping(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); void SHAPE_ApplyDefaultOpentypeFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, INT cChars, WORD *pwLogClust); +HRESULT SHAPE_CheckFontForRequiredFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa);

1 0

Aric Stewart : gdi32: Silence a common and expected error.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 5c581f079eb8ed5f329b05e0db3852cfac2bd220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c581f079eb8ed5f329b05e0d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Sep 9 15:28:15 2010 -0500 gdi32: Silence a common and expected error. --- dlls/gdi32/bidi.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 7d748fd..4ef0e99 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -622,7 +622,10 @@ BOOL BIDI_Reorder( } if (res) { - FIXME("Unable to shape string (%x)\n",res); + if (res == USP_E_SCRIPT_NOT_IN_FONT) + TRACE("Unable to shape with currently selected font\n"); + else + FIXME("Unable to shape string (%x)\n",res); j = nItems; doGlyphs = FALSE; HeapFree(GetProcessHeap(), 0, *lpGlyphs);

1 0

Alistair Leslie-Hughes : mshtml: Correct test for another unknown dispID.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: ea451adf5873310dfa3facbbaf8134bcd3dc4fe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea451adf5873310dfa3facbba… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 9 20:23:23 2010 +1000 mshtml: Correct test for another unknown dispID. --- dlls/mshtml/tests/htmldoc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index d1d02f0..641153b 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -837,6 +837,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D case 3000028: case 3000029: case 3000030: + case 3000031: /* TODO */ return S_OK; }

1 0

Alistair Leslie-Hughes : msxml: Added support to create msxml4/6 interfaces .
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 5e5cd71ff10cb17d00c6e6559b8afc5910bffb9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e5cd71ff10cb17d00c6e6559… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 9 20:21:21 2010 +1000 msxml: Added support to create msxml4/6 interfaces. --- dlls/msxml3/factory.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index 46d8249..5e2039f 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -154,8 +154,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) { cf = (IClassFactory*) &domdoccf.lpVtbl; } - else if( IsEqualCLSID( rclsid, &CLSID_XMLSchemaCache ) || - IsEqualCLSID( rclsid, &CLSID_XMLSchemaCache30 ) ) + else if( IsEqualCLSID( rclsid, &CLSID_XMLSchemaCache ) || + IsEqualCLSID( rclsid, &CLSID_XMLSchemaCache30 ) || + IsEqualCLSID( rclsid, &CLSID_XMLSchemaCache40 ) || + IsEqualCLSID( rclsid, &CLSID_XMLSchemaCache60 )) { cf = (IClassFactory*) &schemacf.lpVtbl; } @@ -173,7 +175,8 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) } else if( IsEqualCLSID( rclsid, &CLSID_SAXXMLReader) || IsEqualCLSID( rclsid, &CLSID_SAXXMLReader30 ) || - IsEqualCLSID( rclsid, &CLSID_SAXXMLReader40 )) + IsEqualCLSID( rclsid, &CLSID_SAXXMLReader40 ) || + IsEqualCLSID( rclsid, &CLSID_SAXXMLReader60 )) { cf = (IClassFactory*) &saxreadcf.lpVtbl; }

1 0

Jacek Caban : msxml3: Don't use xmlnode's IXMLDOMNode iface in get_[ previous|next]Sibling implementations.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 55175042eb84af7af383e8cbe5c911519a32e291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55175042eb84af7af383e8cbe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 10 16:53:48 2010 +0200 msxml3: Don't use xmlnode's IXMLDOMNode iface in get_[previous|next]Sibling implementations. --- dlls/msxml3/attribute.c | 10 ++++++- dlls/msxml3/cdata.c | 10 ++++++- dlls/msxml3/comment.c | 10 ++++++- dlls/msxml3/docfrag.c | 10 ++++++- dlls/msxml3/domdoc.c | 10 ++++++- dlls/msxml3/element.c | 10 ++++++- dlls/msxml3/entityref.c | 10 ++++++- dlls/msxml3/msxml_private.h | 2 + dlls/msxml3/node.c | 58 +++++++++++++++--------------------------- dlls/msxml3/pi.c | 10 ++++++- dlls/msxml3/text.c | 10 ++++++- 11 files changed, 95 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=55175042eb84af7af383e…

1 0

Jacek Caban : msxml3: Don't use xmlnode' s IXMLDOMNode iface in get_attributes implementations.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: e9ebd8c964feb83c3a9fd09ac47c68e4a0423576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9ebd8c964feb83c3a9fd09ac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 10 16:54:06 2010 +0200 msxml3: Don't use xmlnode's IXMLDOMNode iface in get_attributes implementations. --- dlls/msxml3/attribute.c | 5 ++++- dlls/msxml3/cdata.c | 7 +++++-- dlls/msxml3/comment.c | 5 ++++- dlls/msxml3/docfrag.c | 5 ++++- dlls/msxml3/domdoc.c | 5 ++++- dlls/msxml3/element.c | 6 +++++- dlls/msxml3/entityref.c | 5 ++++- dlls/msxml3/msxml_private.h | 8 ++++++++ dlls/msxml3/node.c | 31 ++++++------------------------- dlls/msxml3/pi.c | 6 +++++- dlls/msxml3/text.c | 5 ++++- 11 files changed, 53 insertions(+), 35 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 823234f..5607a03 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -293,7 +293,10 @@ static HRESULT WINAPI domattr_get_attributes( IXMLDOMNamedNodeMap** attributeMap) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(&This->node), attributeMap ); + + TRACE("(%p)->(%p)\n", This, attributeMap); + + return return_null_ptr((void**)attributeMap); } static HRESULT WINAPI domattr_insertBefore( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index e537858..98e77c5 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -303,8 +303,11 @@ static HRESULT WINAPI domcdata_get_attributes( IXMLDOMCDATASection *iface, IXMLDOMNamedNodeMap** attributeMap) { - domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(&This->node), attributeMap ); + domcdata *This = impl_from_IXMLDOMCDATASection( iface ); + + TRACE("(%p)->(%p)\n", This, attributeMap); + + return return_null_ptr((void**)attributeMap); } static HRESULT WINAPI domcdata_insertBefore( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index bc53dde..dee94b2 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -297,7 +297,10 @@ static HRESULT WINAPI domcomment_get_attributes( IXMLDOMNamedNodeMap** attributeMap) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(&This->node), attributeMap ); + + TRACE("(%p)->(%p)\n", This, attributeMap); + + return return_null_ptr((void**)attributeMap); } static HRESULT WINAPI domcomment_insertBefore( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 9c6c903..0c1b9ae 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -299,7 +299,10 @@ static HRESULT WINAPI domfrag_get_attributes( IXMLDOMNamedNodeMap** attributeMap) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(&This->node), attributeMap ); + + TRACE("(%p)->(%p)\n", This, attributeMap); + + return return_null_ptr((void**)attributeMap); } static HRESULT WINAPI domfrag_insertBefore( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 3e1cf90..fbdc280 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -812,7 +812,10 @@ static HRESULT WINAPI domdoc_get_attributes( IXMLDOMNamedNodeMap** attributeMap ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(&This->node), attributeMap ); + + TRACE("(%p)->(%p)\n", This, attributeMap); + + return return_null_ptr((void**)attributeMap); } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 7983720..1081ed4 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -308,7 +308,11 @@ static HRESULT WINAPI domelem_get_attributes( IXMLDOMNamedNodeMap** attributeMap) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(&This->node), attributeMap ); + + TRACE("(%p)->(%p)\n", This, attributeMap); + + *attributeMap = create_nodemap((IXMLDOMNode*)&This->lpVtbl); + return S_OK; } static HRESULT WINAPI domelem_insertBefore( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 8598cdf..cf0b800 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -295,7 +295,10 @@ static HRESULT WINAPI entityref_get_attributes( IXMLDOMNamedNodeMap** attributeMap) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(&This->node), attributeMap ); + + TRACE("(%p)->(%p)\n", This, attributeMap); + + return return_null_ptr((void**)attributeMap); } static HRESULT WINAPI entityref_insertBefore( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 901a374..211300e 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -212,6 +212,14 @@ static inline HRESULT return_null_node(IXMLDOMNode **p) return S_FALSE; } +static inline HRESULT return_null_ptr(void **p) +{ + if(!p) + return E_INVALIDARG; + *p = NULL; + return S_FALSE; +} + #endif void* libxslt_handle; diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index f72d064..5d25761 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -369,30 +369,8 @@ static HRESULT WINAPI xmlnode_get_attributes( IXMLDOMNode *iface, IXMLDOMNamedNodeMap** attributeMap) { - xmlnode *This = impl_from_IXMLDOMNode( iface ); - TRACE("(%p)->(%p)\n", This, attributeMap); - - if (!attributeMap) - return E_INVALIDARG; - - switch( This->node->type ) - { - /* Attribute, CDataSection, Comment, Documents, Documents Fragments, - Entity and Text Nodes does not support get_attributes */ - case XML_ATTRIBUTE_NODE: - case XML_CDATA_SECTION_NODE: - case XML_COMMENT_NODE: - case XML_DOCUMENT_NODE: - case XML_DOCUMENT_FRAG_NODE: - case XML_ENTITY_NODE: - case XML_ENTITY_REF_NODE: - case XML_TEXT_NODE: - *attributeMap = NULL; - return S_FALSE; - default: - *attributeMap = create_nodemap( This->iface ); - return S_OK; - } + ERR("Should not be called\n"); + return E_NOTIMPL; } static HRESULT WINAPI xmlnode_insertBefore( @@ -1852,7 +1830,10 @@ static HRESULT WINAPI unknode_get_attributes( IXMLDOMNamedNodeMap** attributeMap) { unknode *This = impl_from_unkIXMLDOMNode( iface ); - return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(&This->node), attributeMap ); + + FIXME("(%p)->(%p)\n", This, attributeMap); + + return return_null_ptr((void**)attributeMap); } static HRESULT WINAPI unknode_insertBefore( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index a42c2d7..446b1a7 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -310,7 +310,11 @@ static HRESULT WINAPI dom_pi_get_attributes( IXMLDOMNamedNodeMap** attributeMap) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(&This->node), attributeMap ); + + TRACE("(%p)->(%p)\n", This, attributeMap); + + *attributeMap = create_nodemap((IXMLDOMNode*)&This->lpVtbl); + return S_OK; } static HRESULT WINAPI dom_pi_insertBefore( diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 3ce9190..b236c54 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -310,7 +310,10 @@ static HRESULT WINAPI domtext_get_attributes( IXMLDOMNamedNodeMap** attributeMap) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(&This->node), attributeMap ); + + TRACE("(%p)->(%p)\n", This, attributeMap); + + return return_null_ptr((void**)attributeMap); } static HRESULT WINAPI domtext_insertBefore(

1 0

Jacek Caban : msxml3: Don't use xmlnode' s IXMLDOMNode iface in insertBefore implementations.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: addefe4ce568c0da592a402c0ceee3379e019df6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=addefe4ce568c0da592a402c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 10 16:55:14 2010 +0200 msxml3: Don't use xmlnode's IXMLDOMNode iface in insertBefore implementations. --- dlls/msxml3/attribute.c | 7 +++- dlls/msxml3/cdata.c | 7 +++- dlls/msxml3/comment.c | 7 +++- dlls/msxml3/docfrag.c | 8 ++++- dlls/msxml3/domdoc.c | 5 +++- dlls/msxml3/element.c | 7 +++- dlls/msxml3/entityref.c | 7 +++- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 58 +++++++++++++++++++++++-------------------- dlls/msxml3/pi.c | 7 +++- dlls/msxml3/text.c | 7 +++- 11 files changed, 77 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=addefe4ce568c0da592a4…

1 0

Hans Leidekker : msi: Avoid pointer truncation in MSI_ViewFetch and MSI_ViewModify.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 7e9d50a122cca40cc1e538fdbf303cc5090f5dc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e9d50a122cca40cc1e538fdb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 10 17:30:05 2010 +0200 msi: Avoid pointer truncation in MSI_ViewFetch and MSI_ViewModify. --- dlls/msi/msipriv.h | 3 +++ dlls/msi/msiquery.c | 4 ++-- dlls/msi/record.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index a5d089e..ebfcae7 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -103,6 +103,7 @@ typedef struct tagMSIFIELD union { INT iVal; + INT_PTR pVal; LPWSTR szwVal; IStream *stream; } u; @@ -709,11 +710,13 @@ extern UINT MSI_RecordGetIStream( MSIRECORD *, UINT, IStream **); extern const WCHAR *MSI_RecordGetString( const MSIRECORD *, UINT ); extern MSIRECORD *MSI_CreateRecord( UINT ); extern UINT MSI_RecordSetInteger( MSIRECORD *, UINT, int ); +extern UINT MSI_RecordSetIntPtr( MSIRECORD *, UINT, INT_PTR ); extern UINT MSI_RecordSetStringW( MSIRECORD *, UINT, LPCWSTR ); extern BOOL MSI_RecordIsNull( MSIRECORD *, UINT ); extern UINT MSI_RecordGetStringW( MSIRECORD * , UINT, LPWSTR, LPDWORD); extern UINT MSI_RecordGetStringA( MSIRECORD *, UINT, LPSTR, LPDWORD); extern int MSI_RecordGetInteger( MSIRECORD *, UINT ); +extern INT_PTR MSI_RecordGetIntPtr( MSIRECORD *, UINT ); extern UINT MSI_RecordReadStream( MSIRECORD *, UINT, char *, LPDWORD); extern UINT MSI_RecordSetStream(MSIRECORD *, UINT, IStream *); extern UINT MSI_RecordGetFieldCount( const MSIRECORD *rec ); diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index c603e6a..cf69593 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -382,7 +382,7 @@ UINT MSI_ViewFetch(MSIQUERY *query, MSIRECORD **prec) if (r == ERROR_SUCCESS) { query->row ++; - MSI_RecordSetInteger(*prec, 0, (int)query); + MSI_RecordSetIntPtr(*prec, 0, (INT_PTR)query); } return r; @@ -617,7 +617,7 @@ UINT MSI_ViewModify( MSIQUERY *query, MSIMODIFY mode, MSIRECORD *rec ) if ( !view || !view->ops->modify) return ERROR_FUNCTION_FAILED; - if ( mode == MSIMODIFY_UPDATE && MSI_RecordGetInteger( rec, 0 ) != (int)query ) + if ( mode == MSIMODIFY_UPDATE && MSI_RecordGetIntPtr( rec, 0 ) != (INT_PTR)query ) return ERROR_FUNCTION_FAILED; r = view->ops->modify( view, mode, rec, query->row ); diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 45adbac..7bc8281 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -45,6 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); #define MSIFIELD_INT 1 #define MSIFIELD_WSTR 3 #define MSIFIELD_STREAM 4 +#define MSIFIELD_INTPTR 5 static void MSI_FreeField( MSIFIELD *field ) { @@ -52,6 +53,7 @@ static void MSI_FreeField( MSIFIELD *field ) { case MSIFIELD_NULL: case MSIFIELD_INT: + case MSIFIELD_INTPTR: break; case MSIFIELD_WSTR: msi_free( field->u.szwVal); @@ -177,6 +179,9 @@ UINT MSI_RecordCopyField( MSIRECORD *in_rec, UINT in_n, case MSIFIELD_INT: out->u.iVal = in->u.iVal; break; + case MSIFIELD_INTPTR: + out->u.pVal = in->u.pVal; + break; case MSIFIELD_WSTR: str = strdupW( in->u.szwVal ); if ( !str ) @@ -200,6 +205,32 @@ UINT MSI_RecordCopyField( MSIRECORD *in_rec, UINT in_n, return r; } +INT_PTR MSI_RecordGetIntPtr( MSIRECORD *rec, UINT iField ) +{ + int ret; + + TRACE( "%p %d\n", rec, iField ); + + if( iField > rec->count ) + return MININT_PTR; + + switch( rec->fields[iField].type ) + { + case MSIFIELD_INT: + return rec->fields[iField].u.iVal; + case MSIFIELD_INTPTR: + return rec->fields[iField].u.pVal; + case MSIFIELD_WSTR: + if( string2intW( rec->fields[iField].u.szwVal, &ret ) ) + return ret; + return MININT_PTR; + default: + break; + } + + return MININT_PTR; +} + int MSI_RecordGetInteger( MSIRECORD *rec, UINT iField) { int ret = 0; @@ -213,6 +244,8 @@ int MSI_RecordGetInteger( MSIRECORD *rec, UINT iField) { case MSIFIELD_INT: return rec->fields[iField].u.iVal; + case MSIFIELD_INTPTR: + return rec->fields[iField].u.pVal; case MSIFIELD_WSTR: if( string2intW( rec->fields[iField].u.szwVal, &ret ) ) return ret; @@ -267,6 +300,20 @@ UINT WINAPI MsiRecordClearData( MSIHANDLE handle ) return ERROR_SUCCESS; } +UINT MSI_RecordSetIntPtr( MSIRECORD *rec, UINT iField, INT_PTR pVal ) +{ + TRACE("%p %u %ld\n", rec, iField, pVal); + + if( iField > rec->count ) + return ERROR_INVALID_PARAMETER; + + MSI_FreeField( &rec->fields[iField] ); + rec->fields[iField].type = MSIFIELD_INTPTR; + rec->fields[iField].u.pVal = pVal; + + return ERROR_SUCCESS; +} + UINT MSI_RecordSetInteger( MSIRECORD *rec, UINT iField, int iVal ) { TRACE("%p %u %d\n", rec, iField, iVal);

1 0