March 2013 - Wine-commits - list.winehq.org

Nikolay Sivov : msxml3: Escape value for attribute in put_value().
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: c9563be542a8bbdb918efcbb4270ba0fe54c854b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9563be542a8bbdb918efcbb4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 1 00:09:25 2013 +0400 msxml3: Escape value for attribute in put_value(). --- dlls/msxml3/attribute.c | 2 +- dlls/msxml3/tests/domdoc.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index d461ce1..9ab3035 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -603,7 +603,7 @@ static HRESULT WINAPI domattr_put_value( TRACE("(%p)->(%s)\n", This, debugstr_variant(&value)); - return node_put_value(&This->node, &value); + return node_put_value_escaped(&This->node, &value); } static const struct IXMLDOMAttributeVtbl domattr_vtbl = diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 2ff78c2..c1bfc1a 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8046,10 +8046,15 @@ static void test_put_nodeTypedValue(void) static void test_get_xml(void) { static const char xmlA[] = "<?xml version=\"1.0\" encoding=\"UTF-16\"?>\r\n<a>test</a>\r\n"; + static const char attrA[] = "attr=\""a & b"\""; + static const char attr2A[] = "\"a & b\""; + static const char attr3A[] = "attr=\"&quot;a\""; + static const char attr4A[] = ""a"; static const char fooA[] = "<foo/>"; IXMLDOMProcessingInstruction *pi; IXMLDOMNode *first; IXMLDOMElement *elem = NULL; + IXMLDOMAttribute *attr; IXMLDOMDocument *doc; VARIANT_BOOL b; VARIANT v; @@ -8105,6 +8110,51 @@ static void test_get_xml(void) SysFreeString(xml); IXMLDOMElement_Release(elem); + + /* attribute node */ + hr = IXMLDOMDocument_createAttribute(doc, _bstr_("attr"), &attr); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = _bstr_("\"a & b\""); + hr = IXMLDOMAttribute_put_value(attr, v); + ok(hr == S_OK, "got 0x%08x\n", hr); + + xml = NULL; + hr = IXMLDOMAttribute_get_xml(attr, &xml); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!memcmp(xml, _bstr_(attrA), (sizeof(attrA)-1)*sizeof(WCHAR)), "got %s\n", wine_dbgstr_w(xml)); + SysFreeString(xml); + + VariantInit(&v); + hr = IXMLDOMAttribute_get_value(attr, &v); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&v) == VT_BSTR, "got type %d\n", V_VT(&v)); + ok(!memcmp(V_BSTR(&v), _bstr_(attr2A), (sizeof(attr2A)-1)*sizeof(WCHAR)), + "got %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = _bstr_(""a"); + hr = IXMLDOMAttribute_put_value(attr, v); + ok(hr == S_OK, "got 0x%08x\n", hr); + + xml = NULL; + hr = IXMLDOMAttribute_get_xml(attr, &xml); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!memcmp(xml, _bstr_(attr3A), (sizeof(attr3A)-1)*sizeof(WCHAR)), "got %s\n", wine_dbgstr_w(xml)); + SysFreeString(xml); + + VariantInit(&v); + hr = IXMLDOMAttribute_get_value(attr, &v); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&v) == VT_BSTR, "got type %d\n", V_VT(&v)); + ok(!memcmp(V_BSTR(&v), _bstr_(attr4A), (sizeof(attr4A)-1)*sizeof(WCHAR)), + "got %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + IXMLDOMAttribute_Release(attr); + IXMLDOMDocument_Release(doc); free_bstrs();

1 0

Nikolay Sivov : msxml3: Don' t make a variant copy if no need to for setting node value.
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: d4d92616b9ebc0c93354ebb2c435a85264ec8b1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4d92616b9ebc0c93354ebb2c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 1 09:02:49 2013 +0400 msxml3: Don't make a variant copy if no need to for setting node value. --- dlls/msxml3/node.c | 48 ++++++++++++++++++++++++++++++------------------ 1 files changed, 30 insertions(+), 18 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 4508609..be47a75 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -282,36 +282,48 @@ static HRESULT node_set_content_escaped(xmlnode *This, LPCWSTR value) HRESULT node_put_value(xmlnode *This, VARIANT *value) { - VARIANT string_value; HRESULT hr; - VariantInit(&string_value); - hr = VariantChangeType(&string_value, value, 0, VT_BSTR); - if(FAILED(hr)) { - WARN("Couldn't convert to VT_BSTR\n"); - return hr; - } + if (V_VT(value) != VT_BSTR) + { + VARIANT string_value; + + VariantInit(&string_value); + hr = VariantChangeType(&string_value, value, 0, VT_BSTR); + if(FAILED(hr)) { + WARN("Couldn't convert to VT_BSTR\n"); + return hr; + } - hr = node_set_content(This, V_BSTR(&string_value)); - VariantClear(&string_value); + hr = node_set_content(This, V_BSTR(&string_value)); + VariantClear(&string_value); + } + else + hr = node_set_content(This, V_BSTR(value)); return hr; } HRESULT node_put_value_escaped(xmlnode *This, VARIANT *value) { - VARIANT string_value; HRESULT hr; - VariantInit(&string_value); - hr = VariantChangeType(&string_value, value, 0, VT_BSTR); - if(FAILED(hr)) { - WARN("Couldn't convert to VT_BSTR\n"); - return hr; - } + if (V_VT(value) != VT_BSTR) + { + VARIANT string_value; + + VariantInit(&string_value); + hr = VariantChangeType(&string_value, value, 0, VT_BSTR); + if(FAILED(hr)) { + WARN("Couldn't convert to VT_BSTR\n"); + return hr; + } - hr = node_set_content_escaped(This, V_BSTR(&string_value)); - VariantClear(&string_value); + hr = node_set_content_escaped(This, V_BSTR(&string_value)); + VariantClear(&string_value); + } + else + hr = node_set_content_escaped(This, V_BSTR(value)); return hr; }

1 0

Nikolay Sivov : msxml3: Avoid unneeded variant copy in setAttribute(), leak fixed as a side effect.
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: 2907ad98c03090377a810346bececf1cd992f4bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2907ad98c03090377a810346b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 1 09:08:33 2013 +0400 msxml3: Avoid unneeded variant copy in setAttribute(), leak fixed as a side effect. --- dlls/msxml3/element.c | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 4892920..929830b 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1228,7 +1228,6 @@ static HRESULT WINAPI domelem_setAttribute( xmlChar *xml_name, *xml_value, *local, *prefix; xmlNodePtr element; HRESULT hr; - VARIANT var; TRACE("(%p)->(%s %s)\n", This, debugstr_w(name), debugstr_variant(&value)); @@ -1236,16 +1235,25 @@ static HRESULT WINAPI domelem_setAttribute( if ( !element ) return E_FAIL; - VariantInit(&var); - hr = VariantChangeType(&var, &value, 0, VT_BSTR); - if(hr != S_OK) + if (V_VT(&value) != VT_BSTR) { - FIXME("VariantChangeType failed\n"); - return hr; + VARIANT var; + + VariantInit(&var); + hr = VariantChangeType(&var, &value, 0, VT_BSTR); + if (hr != S_OK) + { + FIXME("VariantChangeType failed\n"); + return hr; + } + + xml_value = xmlchar_from_wchar(V_BSTR(&var)); + VariantClear(&var); } + else + xml_value = xmlchar_from_wchar(V_BSTR(&value)); xml_name = xmlchar_from_wchar( name ); - xml_value = xmlchar_from_wchar( V_BSTR(&var) ); if ((local = xmlSplitQName2(xml_name, &prefix))) { @@ -1268,7 +1276,6 @@ static HRESULT WINAPI domelem_setAttribute( heap_free(xml_value); heap_free(xml_name); - VariantClear(&var); return hr; }

1 0

Alessandro Pignotti : quartz: Use the moniker to create the filter directly .
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: 1ebed65e924f1981601e56abe3997cbadb3aecc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ebed65e924f1981601e56abe… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Sun Feb 24 23:13:45 2013 +0100 quartz: Use the moniker to create the filter directly. --- dlls/quartz/filtergraph.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 985e568..acd6dca 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1394,13 +1394,13 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, IPin *ppinOut) ULONG pin; hr = GetFilterInfo(pMoniker, &clsid, &var); - IMoniker_Release(pMoniker); if (FAILED(hr)) { WARN("Unable to retrieve filter info (%x)\n", hr); goto error; } - hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&pfilter); + hr = IMoniker_BindToObject(pMoniker, NULL, NULL, &IID_IBaseFilter, (LPVOID*)&pfilter); + IMoniker_Release(pMoniker); if (FAILED(hr)) { WARN("Unable to create filter (%x), trying next one\n", hr);

1 0

Alessandro Pignotti : quartz: Get the CLSID directly from the filter.
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: 3271406502115910454d1838570e9d13daa71bc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3271406502115910454d18385… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Sun Feb 24 23:21:48 2013 +0100 quartz: Get the CLSID directly from the filter. --- dlls/quartz/filtergraph.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index acd6dca..6b53d72 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1025,14 +1025,28 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, IAMGraphBuilderCallback *callback = NULL; hr = GetFilterInfo(pMoniker, &clsid, &var); - IMoniker_Release(pMoniker); if (FAILED(hr)) { WARN("Unable to retrieve filter info (%x)\n", hr); goto error; } + hr = IMoniker_BindToObject(pMoniker, NULL, NULL, &IID_IBaseFilter, (LPVOID*)&pfilter); + IMoniker_Release(pMoniker); + if (FAILED(hr)) { + WARN("Unable to create filter (%x), trying next one\n", hr); + goto error; + } + + hr = IBaseFilter_GetClassID(pfilter, &clsid); + if (FAILED(hr)) + { + IBaseFilter_Release(pfilter); + goto error; + } + if (IsEqualGUID(&clsid, &FilterCLSID)) { /* Skip filter (same as the one the output pin belongs to) */ + IBaseFilter_Release(pfilter); goto error; } @@ -1052,12 +1066,6 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, } } - hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&pfilter); - if (FAILED(hr)) { - WARN("Unable to create filter (%x), trying next one\n", hr); - goto error; - } - if (callback) { HRESULT rc;

1 0

Alessandro Pignotti : quartz: It' s not guaranteed that filters have a GUID in the property bag.
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: d1ff1c049550aeead52dabb87ce269eb0aa8123a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1ff1c049550aeead52dabb87… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Sun Feb 24 23:26:48 2013 +0100 quartz: It's not guaranteed that filters have a GUID in the property bag. --- dlls/quartz/filtergraph.c | 18 ++++-------------- 1 files changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 6b53d72..53556cf 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -808,9 +808,8 @@ static HRESULT WINAPI FilterGraph2_SetDefaultSyncSource(IFilterGraph2 *iface) return hr; } -static HRESULT GetFilterInfo(IMoniker* pMoniker, GUID* pclsid, VARIANT* pvar) +static HRESULT GetFilterInfo(IMoniker* pMoniker, VARIANT* pvar) { - static const WCHAR wszClsidName[] = {'C','L','S','I','D',0}; static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; IPropertyBag * pPropBagCat = NULL; HRESULT hr; @@ -820,18 +819,10 @@ static HRESULT GetFilterInfo(IMoniker* pMoniker, GUID* pclsid, VARIANT* pvar) hr = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (LPVOID*)&pPropBagCat); if (SUCCEEDED(hr)) - hr = IPropertyBag_Read(pPropBagCat, wszClsidName, pvar, NULL); - - if (SUCCEEDED(hr)) - hr = CLSIDFromString(V_UNION(pvar, bstrVal), pclsid); - - VariantClear(pvar); - - if (SUCCEEDED(hr)) hr = IPropertyBag_Read(pPropBagCat, wszFriendlyName, pvar, NULL); if (SUCCEEDED(hr)) - TRACE("Moniker = %s - %s\n", debugstr_guid(pclsid), debugstr_w(V_UNION(pvar, bstrVal))); + TRACE("Moniker = %s\n", debugstr_w(V_UNION(pvar, bstrVal))); if (pPropBagCat) IPropertyBag_Release(pPropBagCat); @@ -1024,7 +1015,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, IBaseFilter* pfilter = NULL; IAMGraphBuilderCallback *callback = NULL; - hr = GetFilterInfo(pMoniker, &clsid, &var); + hr = GetFilterInfo(pMoniker, &var); if (FAILED(hr)) { WARN("Unable to retrieve filter info (%x)\n", hr); goto error; @@ -1395,13 +1386,12 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, IPin *ppinOut) while (IEnumMoniker_Next(pEnumMoniker, 1, &pMoniker, &nb) == S_OK) { VARIANT var; - GUID clsid; IPin* ppinfilter; IBaseFilter* pfilter = NULL; IEnumPins* penumpins = NULL; ULONG pin; - hr = GetFilterInfo(pMoniker, &clsid, &var); + hr = GetFilterInfo(pMoniker, &var); if (FAILED(hr)) { WARN("Unable to retrieve filter info (%x)\n", hr); goto error;

1 0

Dmitry Timoshkov : fonts: Add an initial version of Wingdings font.
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: 1b17f0fd5ded290a332260cad963dac53c08609f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b17f0fd5ded290a332260cad… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 1 18:01:58 2013 +0900 fonts: Add an initial version of Wingdings font. This version contains just 3 glyphs which were copied from OpenSymbol font. --- fonts/Makefile.in | 3 +- fonts/wingding.sfd | 166 ++++++++++++++++++++++++++++++++++++++++++++++++++++ fonts/wingding.ttf | Bin 0 -> 4332 bytes 3 files changed, 168 insertions(+), 1 deletions(-) diff --git a/fonts/Makefile.in b/fonts/Makefile.in index 47fb8aa..0a9d7a7 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -54,7 +54,8 @@ TRUETYPE_FONTS = \ marlett.ttf \ symbol.ttf \ tahoma.ttf \ - tahomabd.ttf + tahomabd.ttf \ + wingding.ttf FONTS = $(BITMAP_FONTS) $(TRUETYPE_FONTS) diff --git a/fonts/wingding.sfd b/fonts/wingding.sfd new file mode 100644 index 0000000..33573e5 --- /dev/null +++ b/fonts/wingding.sfd @@ -0,0 +1,166 @@ +SplineFontDB: 3.0 +FontName: WineWingdings +FullName: Wingdings +FamilyName: Wingdings +Weight: Regular +Copyright: Copyright (C) 2013 Dmitry Timoshkov +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: -170 +UnderlineWidth: 130 +Ascent: 1638 +Descent: 410 +LayerCount: 2 +Layer: 0 1 "Back" 1 +Layer: 1 1 "Fore" 0 +NeedsXUIDChange: 1 +FSType: 0 +OS2Version: 0 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 0 +PfmFamily: 81 +TTFWeight: 400 +TTFWidth: 5 +LineGap: 0 +VLineGap: 0 +Panose: 0 0 0 0 0 0 0 0 0 0 +OS2TypoAscent: 0 +OS2TypoAOffset: 1 +OS2TypoDescent: 0 +OS2TypoDOffset: 1 +OS2TypoLinegap: 0 +OS2WinAscent: 0 +OS2WinAOffset: 1 +OS2WinDescent: 0 +OS2WinDOffset: 1 +HheadAscent: 0 +HheadAOffset: 1 +HheadDescent: 0 +HheadDOffset: 1 +OS2Vendor: 'Wine' +DEI: 91125 +ShortTable: cvt 2 + 68 + 1297 +EndShort +LangName: 1033 "" "" "" "" "" "" "" "" "" "" "" "http://www.winehq.org" "" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoACgAA-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoACgAA-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA+AAoA" "http://www.gnu.org/licenses/lgpl.html" +Encoding: Symbol +UnicodeInterp: none +NameList: Adobe Glyph List +DisplaySize: -48 +AntiAlias: 1 +FitToEm: 1 +WinInfo: 0 33 12 +TeXData: 1 0 0 708670 354335 236222 1342177 -2147484 236222 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 +BeginChars: 256 4 + +StartChar: f020 +Encoding: 0 61472 0 +AltUni2: 000000.ffffffff.0 +Width: 1024 +Flags: W +LayerCount: 2 +Fore +SplineSet +41 41 m 1,0,-1 + 819 41 l 1,1,-1 + 819 1324 l 1,2,-1 + 41 1324 l 1,3,-1 + 41 41 l 1,0,-1 +0 0 m 1,4,-1 + 0 1365 l 1,5,-1 + 860 1365 l 1,6,-1 + 860 0 l 1,7,-1 + 0 0 l 1,4,-1 +EndSplineSet +EndChar + +StartChar: ogonek +Encoding: 254 731 1 +Width: 1896 +Flags: W +LayerCount: 2 +Fore +SplineSet +1652 0 m 1,0,-1 + 172 0 l 1,1,-1 + 172 1482 l 1,2,-1 + 1600 1482 l 1,3,-1 + 1732 1560 l 1,4,-1 + 1768 1510 l 1,5,6 + 1729 1487 1729 1487 1652 1416 c 1,7,-1 + 1652 0 l 1,0,-1 +1506 1270 m 1,8,9 + 1113 841 1113 841 902 398 c 1,10,-1 + 700 252 l 1,11,12 + 565 696 565 696 390 768 c 1,13,14 + 489 882 489 882 588 882 c 0,15,16 + 674 882 674 882 790 602 c 1,17,18 + 976 917 976 917 1410 1336 c 1,19,-1 + 320 1336 l 1,20,-1 + 320 148 l 1,21,-1 + 1506 148 l 1,22,-1 + 1506 1270 l 1,8,9 +EndSplineSet +EndChar + +StartChar: registered +Encoding: 168 174 2 +Width: 1884 +Flags: W +LayerCount: 2 +Fore +SplineSet +322 148 m 1,0,-1 + 1506 148 l 1,1,-1 + 1506 1332 l 1,2,-1 + 322 1332 l 1,3,-1 + 322 148 l 1,0,-1 +172 0 m 1,4,-1 + 172 1480 l 1,5,-1 + 1652 1480 l 1,6,-1 + 1652 0 l 1,7,-1 + 172 0 l 1,4,-1 +EndSplineSet +EndChar + +StartChar: G +Encoding: 71 71 3 +Width: 1581 +Flags: HW +LayerCount: 2 +Fore +SplineSet +446 -52 m 0,0,1 + 446 -119 446 -119 566 -150 c 0,2,3 + 647 -172 647 -172 744 -172 c 0,4,5 + 831 -172 831 -172 926 -142 c 0,6,7 + 1052 -103 1052 -103 1052 -40 c 0,8,9 + 1052 -9 1052 -9 1026 6 c 1,10,11 + 1021 -62 1021 -62 906 -96 c 0,12,13 + 824 -120 824 -120 730 -120 c 0,14,15 + 480 -120 480 -120 480 -6 c 1,16,17 + 446 -17 446 -17 446 -52 c 0,0,1 +408 428 m 0,18,19 + 408 347 408 347 504 162 c 1,20,-1 + 516 6 l 1,21,22 + 563 -70 563 -70 760 -70 c 0,23,24 + 868 -70 868 -70 912 -46 c 0,25,26 + 947 -24 947 -24 964 32 c 2,27,-1 + 1010 170 l 1,28,-1 + 1138 492 l 1,29,30 + 1137 665 1137 665 1082 928 c 0,31,32 + 1010 1268 1010 1268 910 1268 c 0,33,34 + 883 1268 883 1268 864 1226 c 0,35,36 + 848 1194 848 1194 848 1164 c 0,37,38 + 848 1087 848 1087 896 818 c 1,39,40 + 856 884 856 884 796 884 c 0,41,42 + 718 884 718 884 706 790 c 1,43,44 + 690 832 690 832 638 832 c 0,45,46 + 580 832 580 832 556 770 c 1,47,-1 + 526 776 l 2,48,49 + 408 776 408 776 408 428 c 0,18,19 +EndSplineSet +EndChar +EndChars +EndSplineFont diff --git a/fonts/wingding.ttf b/fonts/wingding.ttf new file mode 100644 index 0000000..0c963c0 Binary files /dev/null and b/fonts/wingding.ttf differ

1 0

Vincent Povirk : mscoree: Keep a reference to mscoree when shutting down.
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: 276d202e792d78c1298795fa72a95c47a182160a URL: http://source.winehq.org/git/wine.git/?a=commit;h=276d202e792d78c1298795fa7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 28 15:43:25 2013 -0600 mscoree: Keep a reference to mscoree when shutting down. --- dlls/mscoree/metahost.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 143494c..6906075 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -313,6 +313,12 @@ static HRESULT CLRRuntimeInfo_GetRuntimeHost(CLRRuntimeInfo *This, RuntimeHost * void unload_all_runtimes(void) { int i; + HMODULE handle; + + /* If the only references to mscoree are through dll's that were loaded by + * Mono, shutting down the Mono runtime will free mscoree, so take a + * reference to prevent that from happening. */ + GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR *)&unload_all_runtimes, &handle); for (i=0; i<NUM_ABI_VERSIONS; i++) {

1 0

Jörg Höhle : winealsa: Reword some MIDI log messages.
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: 2bc23b0c55fc50a468959c8bc4334a2e15d1a98e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bc23b0c55fc50a468959c8bc… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Jan 19 20:43:09 2013 +0100 winealsa: Reword some MIDI log messages. --- dlls/winealsa.drv/midi.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index ee975e3..11b0f30 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -118,9 +118,6 @@ static HANDLE hThread; * Low level MIDI implementation * *======================================================================*/ -static int midiOpenSeq(int); -static int midiCloseSeq(void); - #if 0 /* Debug Purpose */ static void error_handler(const char* file, int line, const char* function, int err, const char* fmt, ...) { @@ -246,21 +243,21 @@ static int midiOpenSeq(int create_client) if (port_out < 0) TRACE("Unable to create output port\n"); else - TRACE("Outport port created successfully (%d)\n", port_out); + TRACE("Outport port %d created successfully\n", port_out); #else port_out = snd_seq_create_simple_port(midiSeq, "WINE ALSA Output", SND_SEQ_PORT_CAP_READ, SND_SEQ_PORT_TYPE_APPLICATION); if (port_out < 0) TRACE("Unable to create output port\n"); else - TRACE("Outport port created successfully (%d)\n", port_out); + TRACE("Outport port %d created successfully\n", port_out); port_in = snd_seq_create_simple_port(midiSeq, "WINE ALSA Input", SND_SEQ_PORT_CAP_WRITE, SND_SEQ_PORT_TYPE_APPLICATION); if (port_in < 0) TRACE("Unable to create input port\n"); else - TRACE("Input port created successfully (%d)\n", port_in); + TRACE("Input port %d created successfully\n", port_in); #endif } } @@ -413,7 +410,7 @@ static DWORD WINAPI midRecThread(LPVOID arg) break; } if (toSend != 0) { - TRACE("Sending event %08x (from %d %d)\n", toSend, ev->source.client, ev->source.port); + TRACE("Received event %08x from %d:%d\n", toSend, ev->source.client, ev->source.port); MIDI_NotifyClient(wDevID, MIM_DATA, toSend, dwTime); } } @@ -485,7 +482,7 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) if (snd_seq_connect_from(midiSeq, port_in, MidiInDev[wDevID].addr.client, MidiInDev[wDevID].addr.port) < 0) return MMSYSERR_NOTENABLED; - TRACE("input port connected %d %d %d\n",port_in,MidiInDev[wDevID].addr.client,MidiInDev[wDevID].addr.port); + TRACE("Input port :%d connected %d:%d\n",port_in,MidiInDev[wDevID].addr.client,MidiInDev[wDevID].addr.port); if (numStartedMidiIn++ == 0) { end_thread = 0; @@ -761,8 +758,9 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) if (snd_seq_connect_to(midiSeq, port_out, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port) < 0) return MMSYSERR_NOTENABLED; + TRACE("Output port :%d connected %d:%d\n",port_out,MidiOutDev[wDevID].addr.client,MidiOutDev[wDevID].addr.port); + MIDI_NotifyClient(wDevID, MOM_OPEN, 0L, 0L); - TRACE("Successful !\n"); return MMSYSERR_NOERROR; } @@ -999,7 +997,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) snd_seq_ev_set_direct(&event); snd_seq_ev_set_source(&event, port_out); snd_seq_ev_set_dest(&event, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); - TRACE("client = %d port = %d\n", MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); + TRACE("destination %d:%d\n", MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); snd_seq_ev_set_sysex(&event, lpMidiHdr->dwBufferLength + len_add, lpNewData ? lpNewData : lpData); snd_seq_event_output_direct(midiSeq, &event); HeapFree(GetProcessHeap(), 0, lpNewData);

1 0

Jörg Höhle : wineoss: Add midi MTC Quarter Frame support (on output).
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: 702fe6738b1091eb6f58735ed75e8c67d58f76f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=702fe6738b1091eb6f58735ed… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Feb 26 11:18:36 2013 +0100 wineoss: Add midi MTC Quarter Frame support (on output). --- dlls/wineoss.drv/midi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 11b7c91..2b3d433 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -1445,7 +1445,6 @@ static DWORD modData(WORD wDevID, DWORD dwParam) switch (evt & 0x0F) { case 0x00: /* System Exclusive, don't do it on modData, * should require modLongData*/ - case 0x01: /* Undefined */ case 0x04: /* Undefined. */ case 0x05: /* Undefined. */ case 0x07: /* End of Exclusive. */ @@ -1470,6 +1469,7 @@ static DWORD modData(WORD wDevID, DWORD dwParam) SEQ_MIDIOUT(dev, 0x01); SEQ_MIDIOUT(dev, 0xf7); break; + case 0x01: /* MTC Quarter frame */ case 0x03: /* Song Select. */ SEQ_MIDIOUT(dev, evt); SEQ_MIDIOUT(dev, d1);

1 0