April 2012 - Wine-Commits - list.winehq.org

Henri Verbeet : d3d8: Properly retrieve an interface pointer in IDirect3DDevice8Impl_GetDepthStencilSurface ().
by Alexandre Julliard April 23, 2012

April 23, 2012

Module: wine Branch: master Commit: 7024ffac9af3c94e16158c19e28ad77854d13218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7024ffac9af3c94e16158c19e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 22 22:47:41 2012 +0200 d3d8: Properly retrieve an interface pointer in IDirect3DDevice8Impl_GetDepthStencilSurface(). --- dlls/d3d8/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e10c83c..d50acd5 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1172,6 +1172,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetDepthStencilSurface(IDirect3DDevic { IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); struct wined3d_surface *wined3d_surface; + IDirect3DSurface8Impl *surface_impl; HRESULT hr; TRACE("iface %p, depth_stencil %p.\n", iface, ppZStencilSurface); @@ -1184,7 +1185,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetDepthStencilSurface(IDirect3DDevic hr = wined3d_device_get_depth_stencil(This->wined3d_device, &wined3d_surface); if (SUCCEEDED(hr)) { - *ppZStencilSurface = wined3d_surface_get_parent(wined3d_surface); + surface_impl = wined3d_surface_get_parent(wined3d_surface); + *ppZStencilSurface = &surface_impl->IDirect3DSurface8_iface; IDirect3DSurface8_AddRef(*ppZStencilSurface); wined3d_surface_decref(wined3d_surface); }

1 0

Henri Verbeet : d3d9: Get rid of IDirect3DCubeTexture9Impl.
by Alexandre Julliard April 23, 2012

April 23, 2012

Module: wine Branch: master Commit: 21c65893c950402b8bb6fa096a5b513dcf78e2cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=21c65893c950402b8bb6fa096… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 22 22:47:44 2012 +0200 d3d9: Get rid of IDirect3DCubeTexture9Impl. --- dlls/d3d9/cubetexture.c | 229 ++++++++++++++++++++++----------------------- dlls/d3d9/d3d9_private.h | 19 +---- dlls/d3d9/device.c | 6 +- dlls/d3d9/texture.c | 4 +- 4 files changed, 119 insertions(+), 139 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=21c65893c950402b8bb6f…

1 0

Lauri Kenttä : po: Update Swedish translation.
by Alexandre Julliard April 23, 2012

April 23, 2012

Module: wine Branch: master Commit: 9095669cc592a16c3ffd72464c97c6b8f78caec2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9095669cc592a16c3ffd72464… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sun Apr 22 13:29:47 2012 +0300 po: Update Swedish translation. --- po/sv.po | 26 ++++++++------------------ 1 files changed, 8 insertions(+), 18 deletions(-) diff --git a/po/sv.po b/po/sv.po index 93f1f73..62186cd 100644 --- a/po/sv.po +++ b/po/sv.po @@ -3521,16 +3521,12 @@ msgid "URI to be decoded is incorrect" msgstr "Den URI som ska avkodas är felaktig" #: jscript.rc:57 -#, fuzzy -#| msgid "Enumeration value out of range.\n" msgid "Number of fraction digits is out of range" -msgstr "Uppräkningsvärde utanför giltigt intervall.\n" +msgstr "Antal decimaler är utanför giltigt intervall" #: jscript.rc:58 -#, fuzzy -#| msgid "Subscript out of range" msgid "Precision is out of range" -msgstr "Index utanför giltigt intervall" +msgstr "Precision är utanför giltigt intervall" #: jscript.rc:59 msgid "Array length must be a finite positive integer" @@ -7907,14 +7903,12 @@ msgid "Links" msgstr "Länkar" #: shell32.rc:223 -#, fuzzy msgid "Slide Shows" -msgstr "Bilder\\Slide Shows" +msgstr "Bildspel" #: shell32.rc:224 -#, fuzzy msgid "Playlists" -msgstr "Musik\\Playlists" +msgstr "Spellistor" #: shell32.rc:148 taskmgr.rc:326 msgid "Status" @@ -7929,24 +7923,20 @@ msgid "Model" msgstr "Modell" #: shell32.rc:225 -#, fuzzy msgid "Sample Music" -msgstr "Musik\\Sample Music" +msgstr "Exempelmusik" #: shell32.rc:226 -#, fuzzy msgid "Sample Pictures" -msgstr "Bilder\\Sample Pictures" +msgstr "Exempelbilder" #: shell32.rc:227 -#, fuzzy msgid "Sample Playlists" -msgstr "Musik\\Sample Playlists" +msgstr "Exempelspellistor" #: shell32.rc:228 -#, fuzzy msgid "Sample Videos" -msgstr "Videoklipp\\Sample Videos" +msgstr "Exempelvideoklipp" #: shell32.rc:229 msgid "Saved Games"

1 0

Dmitry Timoshkov : include/wine/test.h: Fix tests compilation with a PSDK compiler.
by Alexandre Julliard April 23, 2012

April 23, 2012

Module: wine Branch: master Commit: 3068ae8bce32f3d41d8b88057e59e07284274ca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3068ae8bce32f3d41d8b88057… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 20 16:14:45 2012 +0900 include/wine/test.h: Fix tests compilation with a PSDK compiler. --- include/wine/test.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index bee9c23..b3113a8 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -590,7 +590,9 @@ static LONG CALLBACK exc_filter( EXCEPTION_POINTERS *ptrs ) return EXCEPTION_EXECUTE_HANDLER; } +#ifdef __GNUC__ void _fpreset(void) {} /* override the mingw fpu init code */ +#endif /* main function */ int main( int argc, char **argv )

1 0

Nikolay Sivov : msxml3: Added getValueFromName() for IMXAttributes.
by Alexandre Julliard April 23, 2012

April 23, 2012

Module: wine Branch: master Commit: 9a509594f934474de7e686736ddfa8cc03297659 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a509594f934474de7e686736… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 23 00:00:24 2012 +0400 msxml3: Added getValueFromName() for IMXAttributes. --- dlls/msxml3/mxwriter.c | 21 ++++++++++++++++----- dlls/msxml3/tests/saxreader.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 603517e..2378de4 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1934,13 +1934,24 @@ static HRESULT WINAPI SAXAttributes_getValue(ISAXAttributes *iface, int index, c return S_OK; } -static HRESULT WINAPI SAXAttributes_getValueFromName(ISAXAttributes *iface, const WCHAR * pUri, - int nUri, const WCHAR * pLocalName, int nLocalName, const WCHAR ** pValue, int * nValue) +static HRESULT WINAPI SAXAttributes_getValueFromName(ISAXAttributes *iface, const WCHAR *uri, + int uri_len, const WCHAR *name, int name_len, const WCHAR **value, int *value_len) { mxattributes *This = impl_from_ISAXAttributes( iface ); - FIXME("(%p)->(%s:%d %s:%d %p %p): stub\n", This, debugstr_wn(pUri, nUri), nUri, - debugstr_wn(pLocalName, nLocalName), nLocalName, pValue, nValue); - return E_NOTIMPL; + HRESULT hr; + int index; + + TRACE("(%p)->(%s:%d %s:%d %p %p)\n", This, debugstr_wn(uri, uri_len), uri_len, + debugstr_wn(name, name_len), name_len, value, value_len); + + if (!uri || !name || !value || !value_len) + return (This->class_version == MSXML_DEFAULT || This->class_version == MSXML3) ? E_POINTER : E_INVALIDARG; + + hr = ISAXAttributes_getIndexFromName(iface, uri, uri_len, name, name_len, &index); + if (hr == S_OK) + hr = ISAXAttributes_getValue(iface, index, value, value_len); + + return hr; } static HRESULT WINAPI SAXAttributes_getValueFromQName(ISAXAttributes *iface, const WCHAR *qname, diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 5db2d11..340bdd0 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -4193,6 +4193,15 @@ static void test_mxattr_addAttribute(void) hr = ISAXAttributes_getValueFromQName(saxattr, _bstr_(table->qname), 0, &value, NULL); EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getValueFromName(saxattr, NULL, 0, NULL, 0, NULL, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getValueFromName(saxattr, _bstr_(table->uri), 0, NULL, 0, NULL, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getValueFromName(saxattr, _bstr_(table->uri), 0, NULL, 0, &value, NULL); + EXPECT_HR(hr, E_INVALIDARG); } else { @@ -4211,10 +4220,41 @@ static void test_mxattr_addAttribute(void) hr = ISAXAttributes_getValueFromQName(saxattr, _bstr_(table->qname), strlen(table->qname), NULL, &len); EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getValueFromName(saxattr, NULL, 0, NULL, 0, NULL, NULL); + EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getValueFromName(saxattr, _bstr_(table->uri), 0, NULL, 0, NULL, NULL); + EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getValueFromName(saxattr, _bstr_(table->uri), 0, NULL, 0, &value, NULL); + EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getValueFromName(saxattr, _bstr_(table->uri), 0, _bstr_(table->local), 0, &value, NULL); + EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getValueFromName(saxattr, _bstr_(table->uri), 0, _bstr_(table->local), 0, NULL, &len); + EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getValueFromName(saxattr, _bstr_(table->uri), strlen(table->uri), _bstr_(table->local), + strlen(table->local), NULL, NULL); + EXPECT_HR(hr, E_POINTER); } hr = ISAXAttributes_getValueFromQName(saxattr, _bstr_(table->qname), strlen(table->qname), &value, &len); EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(_bstr_(table->value), value), "%d: got %s, expected %s\n", i, wine_dbgstr_w(value), + table->value); + ok(lstrlenW(value) == len, "%d: got wrong value length %d\n", i, len); + + if (table->uri) { + hr = ISAXAttributes_getValueFromName(saxattr, _bstr_(table->uri), strlen(table->uri), + _bstr_(table->local), strlen(table->local), &value, &len); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(_bstr_(table->value), value), "%d: got %s, expected %s\n", i, wine_dbgstr_w(value), + table->value); + ok(lstrlenW(value) == len, "%d: got wrong value length %d\n", i, len); + } } len = -1;

1 0

Dmitry Timoshkov : gdiplus: Avoid saving negative values in pixel_size and emSize.
by Alexandre Julliard April 23, 2012

April 23, 2012

Module: wine Branch: master Commit: 9b5b04c1c1a7b32dd3e1e453b6d739082c4ccede URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b5b04c1c1a7b32dd3e1e453b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 19 21:43:51 2012 +0900 gdiplus: Avoid saving negative values in pixel_size and emSize. --- dlls/gdiplus/font.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 169e28f..1ac7604 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -190,9 +190,6 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc, (*font)->lfw.lfUnderline = logfont->lfUnderline; (*font)->lfw.lfStrikeOut = logfont->lfStrikeOut; - (*font)->pixel_size = (*font)->emSize = logfont->lfHeight; - (*font)->unit = UnitPixel; - hfont = CreateFontIndirectW(&(*font)->lfw); oldfont = SelectObject(hdc, hfont); GetTextMetricsW(hdc, &textmet); @@ -201,6 +198,8 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc, (*font)->lfw.lfWeight = textmet.tmWeight; (*font)->lfw.lfCharSet = textmet.tmCharSet; + (*font)->pixel_size = (*font)->emSize = textmet.tmHeight; + (*font)->unit = UnitPixel; (*font)->height = 1; /* FIXME: need NEWTEXTMETRIC.ntmSizeEM here */ (*font)->line_spacing = textmet.tmAscent + textmet.tmDescent + textmet.tmExternalLeading;

1 0

Dmitry Timoshkov : gdiplus: Use Tahoma instead of Arial for gdiplus font tests.
by Alexandre Julliard April 23, 2012

April 23, 2012

Module: wine Branch: master Commit: 4b9e1db09f43c3fee4f9743accc1782262944918 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b9e1db09f43c3fee4f9743ac… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 20 16:44:17 2012 +0900 gdiplus: Use Tahoma instead of Arial for gdiplus font tests. --- dlls/gdiplus/tests/font.c | 96 +++++++++++++++++---------------------------- 1 files changed, 36 insertions(+), 60 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 98c4114..f63819a 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -24,10 +24,9 @@ #include "gdiplus.h" #include "wine/test.h" -#define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) -#define expectf(expected, got) ok(fabs(expected - got) < 0.0001, "Expected %.2f, got %.2f\n", expected, got) +#define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) +#define expectf(expected, got) ok(fabs(expected - got) < 0.0001, "Expected %f, got %f\n", expected, got) -static const WCHAR arial[] = {'A','r','i','a','l','\0'}; static const WCHAR nonexistent[] = {'T','h','i','s','F','o','n','t','s','h','o','u','l','d','N','o','t','E','x','i','s','t','\0'}; static const WCHAR MSSansSerif[] = {'M','S',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; static const WCHAR MicrosoftSansSerif[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; @@ -50,12 +49,7 @@ static void test_createfont(void) expect (FontFamilyNotFound, stat); stat = GdipDeleteFont(font); expect (InvalidParameter, stat); - stat = GdipCreateFontFamilyFromName(arial, NULL, &fontfamily); - if(stat == FontFamilyNotFound) - { - skip("Arial not installed\n"); - return; - } + stat = GdipCreateFontFamilyFromName(Tahoma, NULL, &fontfamily); expect (Ok, stat); stat = GdipCreateFont(fontfamily, 12, FontStyleRegular, UnitPoint, &font); expect (Ok, stat); @@ -67,7 +61,7 @@ static void test_createfont(void) expect(Ok, stat); stat = GdipGetFamilyName(fontfamily2, familyname, 0); expect(Ok, stat); - ok (lstrcmpiW(arial, familyname) == 0, "Expected arial, got %s\n", + ok (lstrcmpiW(Tahoma, familyname) == 0, "Expected Tahoma, got %s\n", wine_dbgstr_w(familyname)); stat = GdipDeleteFontFamily(fontfamily2); expect(Ok, stat); @@ -110,14 +104,9 @@ static void test_logfont(void) stat = GdipCreateFontFromLogfontA(hdc, &lfa, &font); expect(NotTrueTypeFont, stat); - lstrcpyA(lfa.lfFaceName, "Arial"); + lstrcpyA(lfa.lfFaceName, "Tahoma"); stat = GdipCreateFontFromLogfontA(hdc, &lfa, &font); - if (stat == FileNotFound) - { - skip("Arial not installed.\n"); - return; - } expect(Ok, stat); stat = GdipGetLogFontA(font, graphics, &lfa2); expect(Ok, stat); @@ -146,7 +135,7 @@ static void test_logfont(void) lfa.lfItalic = lfa.lfUnderline = lfa.lfStrikeOut = TRUE; memset(&lfa2, 0xff, sizeof(LOGFONTA)); - lstrcpyA(lfa.lfFaceName, "Arial"); + lstrcpyA(lfa.lfFaceName, "Tahoma"); stat = GdipCreateFontFromLogfontA(hdc, &lfa, &font); expect(Ok, stat); @@ -186,7 +175,7 @@ static void test_fontfamily (void) GpStatus stat; /* FontFamily cannot be NULL */ - stat = GdipCreateFontFamilyFromName (arial , NULL, NULL); + stat = GdipCreateFontFamilyFromName (Tahoma , NULL, NULL); expect (InvalidParameter, stat); /* FontFamily must be able to actually find the family. @@ -200,17 +189,12 @@ static void test_fontfamily (void) expect (FontFamilyNotFound, stat); if(stat == Ok) GdipDeleteFontFamily(family); - stat = GdipCreateFontFamilyFromName (arial, NULL, &family); - if(stat == FontFamilyNotFound) - { - skip("Arial not installed\n"); - return; - } + stat = GdipCreateFontFamilyFromName (Tahoma, NULL, &family); expect (Ok, stat); stat = GdipGetFamilyName (family, itsName, LANG_NEUTRAL); expect (Ok, stat); - expect (0, lstrcmpiW(itsName, arial)); + expect (0, lstrcmpiW(itsName, Tahoma)); if (0) { @@ -226,7 +210,7 @@ static void test_fontfamily (void) GdipDeleteFontFamily(family); stat = GdipGetFamilyName(clonedFontFamily, itsName, LANG_NEUTRAL); expect(Ok, stat); - expect(0, lstrcmpiW(itsName, arial)); + expect(0, lstrcmpiW(itsName, Tahoma)); GdipDeleteFontFamily(clonedFontFamily); } @@ -237,28 +221,25 @@ static void test_fontfamily_properties (void) GpStatus stat; UINT16 result = 0; - stat = GdipCreateFontFamilyFromName(arial, NULL, &FontFamily); - if(stat == FontFamilyNotFound) - skip("Arial not installed\n"); - else - { - stat = GdipGetLineSpacing(FontFamily, FontStyleRegular, &result); - expect(Ok, stat); - ok (result == 2355, "Expected 2355, got %d\n", result); - result = 0; - stat = GdipGetEmHeight(FontFamily, FontStyleRegular, &result); - expect(Ok, stat); - ok(result == 2048, "Expected 2048, got %d\n", result); - result = 0; - stat = GdipGetCellAscent(FontFamily, FontStyleRegular, &result); - expect(Ok, stat); - ok(result == 1854, "Expected 1854, got %d\n", result); - result = 0; - stat = GdipGetCellDescent(FontFamily, FontStyleRegular, &result); - expect(Ok, stat); - ok(result == 434, "Expected 434, got %d\n", result); - GdipDeleteFontFamily(FontFamily); - } + stat = GdipCreateFontFamilyFromName(Tahoma, NULL, &FontFamily); + expect(Ok, stat); + + stat = GdipGetLineSpacing(FontFamily, FontStyleRegular, &result); + expect(Ok, stat); + ok (result == 2472, "Expected 2472, got %d\n", result); + result = 0; + stat = GdipGetEmHeight(FontFamily, FontStyleRegular, &result); + expect(Ok, stat); + ok(result == 2048, "Expected 2048, got %d\n", result); + result = 0; + stat = GdipGetCellAscent(FontFamily, FontStyleRegular, &result); + expect(Ok, stat); + ok(result == 2049, "Expected 2049, got %d\n", result); + result = 0; + stat = GdipGetCellDescent(FontFamily, FontStyleRegular, &result); + expect(Ok, stat); + ok(result == 423, "Expected 423, got %d\n", result); + GdipDeleteFontFamily(FontFamily); stat = GdipCreateFontFamilyFromName(TimesNewRoman, NULL, &FontFamily); if(stat == FontFamilyNotFound) @@ -363,12 +344,7 @@ static void test_heightgivendpi(void) GpFontFamily* fontfamily = NULL; REAL height; - stat = GdipCreateFontFamilyFromName(arial, NULL, &fontfamily); - if(stat == FontFamilyNotFound) - { - skip("Arial not installed\n"); - return; - } + stat = GdipCreateFontFamilyFromName(Tahoma, NULL, &fontfamily); expect(Ok, stat); stat = GdipCreateFont(fontfamily, 30, FontStyleRegular, UnitPixel, &font); @@ -382,7 +358,7 @@ static void test_heightgivendpi(void) stat = GdipGetFontHeightGivenDPI(font, 96, &height); expect(Ok, stat); - expectf((REAL)34.497070, height); + expectf(36.210938, height); GdipDeleteFont(font); height = 12345; @@ -390,7 +366,7 @@ static void test_heightgivendpi(void) expect(Ok, stat); stat = GdipGetFontHeightGivenDPI(font, 96, &height); expect(Ok, stat); - expectf((REAL)34.497070, height); + expectf(36.210938, height); GdipDeleteFont(font); height = 12345; @@ -398,7 +374,7 @@ static void test_heightgivendpi(void) expect(Ok, stat); stat = GdipGetFontHeightGivenDPI(font, 96, &height); expect(Ok, stat); - expectf((REAL)45.996094, height); + expectf(48.281250, height); GdipDeleteFont(font); height = 12345; @@ -406,7 +382,7 @@ static void test_heightgivendpi(void) expect(Ok, stat); stat = GdipGetFontHeightGivenDPI(font, 96, &height); expect(Ok, stat); - expectf((REAL)3311.718750, height); + expectf(3476.250000, height); GdipDeleteFont(font); height = 12345; @@ -414,7 +390,7 @@ static void test_heightgivendpi(void) expect(Ok, stat); stat = GdipGetFontHeightGivenDPI(font, 96, &height); expect(Ok, stat); - expectf((REAL)11.039062, height); + expectf(11.587500, height); GdipDeleteFont(font); height = 12345; @@ -422,7 +398,7 @@ static void test_heightgivendpi(void) expect(Ok, stat); stat = GdipGetFontHeightGivenDPI(font, 96, &height); expect(Ok, stat); - expectf((REAL)130.382614, height); + expectf(136.860245, height); GdipDeleteFont(font); GdipDeleteFontFamily(fontfamily);

1 0

André Hentschel : winevdm: Remove unneeded shadow variable.
by Alexandre Julliard April 23, 2012

April 23, 2012

Module: wine Branch: master Commit: 6fcb3b698e3fdd7b717fa6e512a41454de9f490c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fcb3b698e3fdd7b717fa6e51… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 22 19:04:57 2012 +0200 winevdm: Remove unneeded shadow variable. --- programs/winevdm/winevdm.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index b143cb8..d297551 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -452,7 +452,6 @@ static char *build_command_line( char **argv ) *p++='"'; if (has_quote) { int bcount; - char* a; bcount=0; a=*arg;

1 0

Nikolay Sivov : msxml3: getPrefix() should check all pushed contexts as well.
by Alexandre Julliard April 23, 2012

April 23, 2012

Module: wine Branch: master Commit: fd423937928b4d6cd9bb6ee195957840e6966648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd423937928b4d6cd9bb6ee19… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 22 23:37:47 2012 +0400 msxml3: getPrefix() should check all pushed contexts as well. --- dlls/msxml3/mxnamespace.c | 25 +++++++++++++------------ dlls/msxml3/tests/domdoc.c | 9 --------- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/dlls/msxml3/mxnamespace.c b/dlls/msxml3/mxnamespace.c index f7d4eb6..7ec3f6e 100644 --- a/dlls/msxml3/mxnamespace.c +++ b/dlls/msxml3/mxnamespace.c @@ -144,16 +144,20 @@ static HRESULT get_declared_prefix_idx(const struct nscontext *ctxt, LONG index, } /* returned stored pointer, caller needs to copy it */ -static HRESULT get_declared_prefix_uri(const struct nscontext *ctxt, const WCHAR *uri, BSTR *prefix) +static HRESULT get_declared_prefix_uri(const struct list *ctxts, const WCHAR *uri, BSTR *prefix) { - int i; + struct nscontext *ctxt; - for (i = 0; i < ctxt->count; i++) - if (!strcmpW(ctxt->ns[i].uri, uri)) - { - *prefix = ctxt->ns[i].prefix; - return S_OK; - } + LIST_FOR_EACH_ENTRY(ctxt, ctxts, struct nscontext, entry) + { + int i; + for (i = 0; i < ctxt->count; i++) + if (!strcmpW(ctxt->ns[i].uri, uri)) + { + *prefix = ctxt->ns[i].prefix; + return S_OK; + } + } *prefix = NULL; return E_FAIL; @@ -321,7 +325,6 @@ static HRESULT WINAPI namespacemanager_getPrefix(IMXNamespaceManager *iface, const WCHAR *uri, LONG index, WCHAR *prefix, int *prefix_len) { namespacemanager *This = impl_from_IMXNamespaceManager( iface ); - struct nscontext *ctxt; HRESULT hr; BSTR prfx; @@ -329,9 +332,7 @@ static HRESULT WINAPI namespacemanager_getPrefix(IMXNamespaceManager *iface, if (!uri || !*uri || !prefix_len) return E_INVALIDARG; - ctxt = LIST_ENTRY(list_head(&This->ctxts), struct nscontext, entry); - - hr = get_declared_prefix_uri(ctxt, uri, &prfx); + hr = get_declared_prefix_uri(&This->ctxts, uri, &prfx); if (hr == S_OK) { /* TODO: figure out what index argument is for */ diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index ccc2c64..d50a22e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10741,12 +10741,9 @@ todo_wine { len = 100; buffW[0] = 0x1; hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns1 uri"), 0, buffW, &len); -todo_wine EXPECT_HR(hr, S_OK); - if (hr == S_OK) { ok(!lstrcmpW(buffW, _bstr_("ns1")), "got %s\n", wine_dbgstr_w(buffW)); ok(len == 3, "got %d\n", len); - } hr = IMXNamespaceManager_declarePrefix(nsmgr, _bstr_("ns2"), _bstr_("ns2 uri")); EXPECT_HR(hr, S_OK); @@ -10766,22 +10763,16 @@ todo_wine len = 100; buffW[0] = 0x1; hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns2 uri"), 0, buffW, &len); -todo_wine EXPECT_HR(hr, S_OK); - if (hr == S_OK) { ok(!lstrcmpW(buffW, _bstr_("ns2")), "got %s\n", wine_dbgstr_w(buffW)); ok(len == 3, "got %d\n", len); - } len = 100; buffW[0] = 0x1; hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns1 uri"), 0, buffW, &len); -todo_wine EXPECT_HR(hr, S_OK); - if (hr == S_OK) { ok(!lstrcmpW(buffW, _bstr_("ns1")), "got %s\n", wine_dbgstr_w(buffW)); ok(len == 3, "got %d\n", len); - } hr = IMXNamespaceManager_popContext(nsmgr); EXPECT_HR(hr, S_OK);

1 0

Nikolay Sivov : msxml3: Added getName() for IMXAttributes.
by Alexandre Julliard April 23, 2012

April 23, 2012

Module: wine Branch: master Commit: 521467fd08254f8def11305b9b7a3264b02513a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=521467fd08254f8def11305b9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 23 00:08:54 2012 +0400 msxml3: Added getName() for IMXAttributes. --- dlls/msxml3/mxwriter.c | 28 +++++++++++++++++++++++----- 1 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 2378de4..e4224ed 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1818,13 +1818,31 @@ static HRESULT WINAPI SAXAttributes_getQName(ISAXAttributes *iface, int index, c return S_OK; } -static HRESULT WINAPI SAXAttributes_getName(ISAXAttributes *iface, int nIndex, const WCHAR **pUri, int *pUriLength, - const WCHAR ** pLocalName, int * pLocalNameSize, const WCHAR ** pQName, int * pQNameLength) +static HRESULT WINAPI SAXAttributes_getName(ISAXAttributes *iface, int index, const WCHAR **uri, int *uri_len, + const WCHAR **local, int *local_len, const WCHAR **qname, int *qname_len) { mxattributes *This = impl_from_ISAXAttributes( iface ); - FIXME("(%p)->(%d %p %p %p %p %p %p): stub\n", This, nIndex, pUri, pUriLength, pLocalName, pLocalNameSize, - pQName, pQNameLength); - return E_NOTIMPL; + + TRACE("(%p)->(%d %p %p %p %p %p %p)\n", This, index, uri, uri_len, local, local_len, qname, qname_len); + + if (index >= This->length || index < 0) + return E_INVALIDARG; + + if (!uri || !uri_len || !local || !local_len || !qname || !qname_len) + return E_POINTER; + + *uri_len = SysStringLen(This->attr[index].uri); + *uri = This->attr[index].uri; + + *local_len = SysStringLen(This->attr[index].local); + *local = This->attr[index].local; + + *qname_len = SysStringLen(This->attr[index].qname); + *qname = This->attr[index].qname; + + TRACE("(%s, %s, %s)\n", debugstr_w(*uri), debugstr_w(*local), debugstr_w(*qname)); + + return S_OK; } static HRESULT WINAPI SAXAttributes_getIndexFromName(ISAXAttributes *iface, const WCHAR *uri, int uri_len,

1 0