winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
April 2012
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
718 discussions
Start a n
N
ew thread
Huw Davies : winspool: Initialise portname.
by Alexandre Julliard
03 Apr '12
03 Apr '12
Module: wine Branch: master Commit: 25f9d6e33e5f55143e5b7e63944fef901a34d550 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=25f9d6e33e5f55143e5b7e639…
Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 3 11:43:38 2012 +0100 winspool: Initialise portname. --- dlls/winspool.drv/info.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index c50a894..8e3fdf3 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2309,6 +2309,7 @@ BOOL WINAPI AddJobW(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPD len = strlenW(filename); job->filename = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); memcpy(job->filename, filename, (len + 1) * sizeof(WCHAR)); + job->portname = NULL; job->document_title = strdupW(default_doc_title); job->printer_name = strdupW(printer->name); job->devmode = dup_devmode( printer->devmode );
1
0
0
0
Jacek Caban : mshtml: Added IHTMLMetaElement::get_httpEquiv implementation.
by Alexandre Julliard
03 Apr '12
03 Apr '12
Module: wine Branch: master Commit: fe4cb8441a1465d616b39cd70b77e1a1a5e68ee7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=fe4cb8441a1465d616b39cd70…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 3 12:04:05 2012 +0200 mshtml: Added IHTMLMetaElement::get_httpEquiv implementation. --- dlls/mshtml/htmlmeta.c | 15 +++++++++++++-- dlls/mshtml/tests/dom.c | 17 +++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlmeta.c b/dlls/mshtml/htmlmeta.c index d75b7f4..00bb007 100644 --- a/dlls/mshtml/htmlmeta.c +++ b/dlls/mshtml/htmlmeta.c @@ -104,8 +104,19 @@ static HRESULT WINAPI HTMLMetaElement_put_httpEquiv(IHTMLMetaElement *iface, BST static HRESULT WINAPI HTMLMetaElement_get_httpEquiv(IHTMLMetaElement *iface, BSTR *p) { HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString httpequiv_str, val_str; + nsresult nsres; + + static const PRUnichar httpEquivW[] = {'h','t','t','p','-','e','q','u','i','v',0}; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_InitDepend(&httpequiv_str, httpEquivW); + nsAString_Init(&val_str, NULL); + nsres = nsIDOMHTMLElement_GetAttribute(This->element.nselem, &httpequiv_str, &val_str); + nsAString_Finish(&httpequiv_str); + + return return_nsstr(nsres, &val_str, p); } static HRESULT WINAPI HTMLMetaElement_put_content(IHTMLMetaElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c3927d2..267ac9e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3275,6 +3275,22 @@ static void _test_meta_content(unsigned line, IUnknown *unk, const char *exconte IHTMLMetaElement_Release(meta); } +#define test_meta_httpequiv(a,b) _test_meta_httpequiv(__LINE__,a,b) +static void _test_meta_httpequiv(unsigned line, IUnknown *unk, const char *exval) +{ + IHTMLMetaElement *meta; + BSTR val = NULL; + HRESULT hres; + + + meta = _get_metaelem_iface(line, unk); + hres = IHTMLMetaElement_get_httpEquiv(meta, &val); + ok_(__FILE__,line)(hres == S_OK, "get_httpEquiv failed: %08x\n", hres); + ok_(__FILE__,line)(!strcmp_wa(val, exval), "httpEquiv = %s, expected %s\n", wine_dbgstr_w(val), exval); + SysFreeString(val); + IHTMLMetaElement_Release(meta); +} + #define get_elem_doc(e) _get_elem_doc(__LINE__,e) static IHTMLDocument2 *_get_elem_doc(unsigned line, IUnknown *unk) { @@ -5306,6 +5322,7 @@ static void test_elems(IHTMLDocument2 *doc) if(elem) { test_meta_name((IUnknown*)elem, "meta name"); test_meta_content((IUnknown*)elem, "text/html; charset=utf-8"); + test_meta_httpequiv((IUnknown*)elem, "Content-Type"); IHTMLElement_Release(elem); }
1
0
0
0
Jacek Caban : mshtml: Added IHTMLMetaElement::get_content implementation.
by Alexandre Julliard
03 Apr '12
03 Apr '12
Module: wine Branch: master Commit: 5bbcdf7b9e59beacc00d8f2c4804e31c6558d664 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5bbcdf7b9e59beacc00d8f2c4…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 3 12:03:50 2012 +0200 mshtml: Added IHTMLMetaElement::get_content implementation. --- dlls/mshtml/htmlmeta.c | 15 +++++++++++++-- dlls/mshtml/tests/dom.c | 17 +++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlmeta.c b/dlls/mshtml/htmlmeta.c index ef222a9..d75b7f4 100644 --- a/dlls/mshtml/htmlmeta.c +++ b/dlls/mshtml/htmlmeta.c @@ -118,8 +118,19 @@ static HRESULT WINAPI HTMLMetaElement_put_content(IHTMLMetaElement *iface, BSTR static HRESULT WINAPI HTMLMetaElement_get_content(IHTMLMetaElement *iface, BSTR *p) { HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString content_str, val_str; + nsresult nsres; + + static const PRUnichar contentW[] = {'c','o','n','t','e','n','t',0}; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_InitDepend(&content_str, contentW); + nsAString_Init(&val_str, NULL); + nsres = nsIDOMHTMLElement_GetAttribute(This->element.nselem, &content_str, &val_str); + nsAString_Finish(&content_str); + + return return_nsstr(nsres, &val_str, p); } static HRESULT WINAPI HTMLMetaElement_put_name(IHTMLMetaElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 09b6586..c3927d2 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3259,6 +3259,22 @@ static void _test_meta_name(unsigned line, IUnknown *unk, const char *exname) IHTMLMetaElement_Release(meta); } +#define test_meta_content(a,b) _test_meta_content(__LINE__,a,b) +static void _test_meta_content(unsigned line, IUnknown *unk, const char *excontent) +{ + IHTMLMetaElement *meta; + BSTR content = NULL; + HRESULT hres; + + + meta = _get_metaelem_iface(line, unk); + hres = IHTMLMetaElement_get_content(meta, &content); + ok_(__FILE__,line)(hres == S_OK, "get_content failed: %08x\n", hres); + ok_(__FILE__,line)(!strcmp_wa(content, excontent), "content = %s, expected %s\n", wine_dbgstr_w(content), excontent); + SysFreeString(content); + IHTMLMetaElement_Release(meta); +} + #define get_elem_doc(e) _get_elem_doc(__LINE__,e) static IHTMLDocument2 *_get_elem_doc(unsigned line, IUnknown *unk) { @@ -5289,6 +5305,7 @@ static void test_elems(IHTMLDocument2 *doc) elem = get_doc_elem_by_id(doc, "metaid"); if(elem) { test_meta_name((IUnknown*)elem, "meta name"); + test_meta_content((IUnknown*)elem, "text/html; charset=utf-8"); IHTMLElement_Release(elem); }
1
0
0
0
Jacek Caban : mshtml: Added IHTMLMetaElement::get_name implementation.
by Alexandre Julliard
03 Apr '12
03 Apr '12
Module: wine Branch: master Commit: f4c20b02dbc99bf47668aa98a31074ac3c4012bc URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f4c20b02dbc99bf47668aa98a…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 3 12:03:37 2012 +0200 mshtml: Added IHTMLMetaElement::get_name implementation. --- dlls/mshtml/htmlmeta.c | 15 +++++++++++++-- dlls/mshtml/tests/dom.c | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlmeta.c b/dlls/mshtml/htmlmeta.c index e80ca13..ef222a9 100644 --- a/dlls/mshtml/htmlmeta.c +++ b/dlls/mshtml/htmlmeta.c @@ -132,8 +132,19 @@ static HRESULT WINAPI HTMLMetaElement_put_name(IHTMLMetaElement *iface, BSTR v) static HRESULT WINAPI HTMLMetaElement_get_name(IHTMLMetaElement *iface, BSTR *p) { HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString name_str, val_str; + nsresult nsres; + + static const PRUnichar nameW[] = {'n','a','m','e',0}; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_InitDepend(&name_str, nameW); + nsAString_Init(&val_str, NULL); + nsres = nsIDOMHTMLElement_GetAttribute(This->element.nselem, &name_str, &val_str); + nsAString_Finish(&name_str); + + return return_nsstr(nsres, &val_str, p); } static HRESULT WINAPI HTMLMetaElement_put_url(IHTMLMetaElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 37db092..09b6586 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -47,7 +47,7 @@ static const char range_test2_str[] = "<html><body>abc<hr />123<br /><hr />def</body></html>"; static const char elem_test_str[] = "<html><head><title>test</title><style id=\"styleid\">.body { margin-right: 0px; }</style>" - "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">" + "<meta id=\"metaid\" name=\"meta name\" http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">" "<body onload=\"Testing()\">text test<!-- a comment -->" "<a id=\"a\" href=\"
http://test\
" name=\"x\">link</a>" "<input id=\"in\" class=\"testclass\" tabIndex=\"2\" title=\"test title\" />" @@ -839,6 +839,17 @@ static IHTMLStyleElement *_get_style_iface(unsigned line, IUnknown *unk) return obj; } +#define get_metaelem_iface(u) _get_metaelem_iface(__LINE__,u) +static IHTMLMetaElement *_get_metaelem_iface(unsigned line, IUnknown *unk) +{ + IHTMLMetaElement *ret; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLMetaElement, (void**)&ret); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLMetaElement: %08x\n", hres); + return ret; +} + #define test_node_name(u,n) _test_node_name(__LINE__,u,n) static void _test_node_name(unsigned line, IUnknown *unk, const char *exname) { @@ -3232,6 +3243,22 @@ static void _test_form_elements(unsigned line, IUnknown *unk) IHTMLFormElement_Release(form); } +#define test_meta_name(a,b) _test_meta_name(__LINE__,a,b) +static void _test_meta_name(unsigned line, IUnknown *unk, const char *exname) +{ + IHTMLMetaElement *meta; + BSTR name = NULL; + HRESULT hres; + + + meta = _get_metaelem_iface(line, unk); + hres = IHTMLMetaElement_get_name(meta, &name); + ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08x\n", hres); + ok_(__FILE__,line)(!strcmp_wa(name, exname), "name = %s, expected %s\n", wine_dbgstr_w(name), exname); + SysFreeString(name); + IHTMLMetaElement_Release(meta); +} + #define get_elem_doc(e) _get_elem_doc(__LINE__,e) static IHTMLDocument2 *_get_elem_doc(unsigned line, IUnknown *unk) { @@ -5259,6 +5286,12 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + elem = get_doc_elem_by_id(doc, "metaid"); + if(elem) { + test_meta_name((IUnknown*)elem, "meta name"); + IHTMLElement_Release(elem); + } + elem = doc_get_body(doc); node = get_first_child((IUnknown*)elem);
1
0
0
0
Christian Costa : dmusic: Check return codes and display name from port caps when enumerating microsoft synthetizer .
by Alexandre Julliard
03 Apr '12
03 Apr '12
Module: wine Branch: master Commit: 31bfc380eef32c00d66f173e89d0815ca8ef112f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=31bfc380eef32c00d66f173e8…
Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Mar 29 08:52:54 2012 +0200 dmusic: Check return codes and display name from port caps when enumerating microsoft synthetizer. --- dlls/dmusic/dmusic.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index b0dd7c9..ba12f98 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -138,12 +138,16 @@ static HRESULT WINAPI IDirectMusic8Impl_EnumPort(LPDIRECTMUSIC8 iface, DWORD ind if (index == (nb_midi_in + nb_midi_out + 1)) { - IDirectMusicSynth8* synth; - TRACE("Enumerating port: 'Microsoft Software Synthesizer'\n"); - CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth8, (void**)&synth); - IDirectMusicSynth8_GetPortCaps(synth, port_caps); - IDirectMusicSynth8_Release(synth); - return S_OK; + IDirectMusicSynth8* synth = NULL; + HRESULT hr; + hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth8, (void**)&synth); + if (SUCCEEDED(hr)) + IDirectMusicSynth8_GetPortCaps(synth, port_caps); + if (SUCCEEDED(hr)) + TRACE("Enumerating port: %s\n", debugstr_w(port_caps->wszDescription)); + if (synth) + IDirectMusicSynth8_Release(synth); + return hr; } return S_FALSE;
1
0
0
0
Christian Costa : dmusic: Enumerate ports for midi out and midi in devices in EnumPort.
by Alexandre Julliard
03 Apr '12
03 Apr '12
Module: wine Branch: master Commit: f13806e185cc9e6b721d0335f6d6de8999e9f6f7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f13806e185cc9e6b721d0335f…
Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Mar 29 08:52:45 2012 +0200 dmusic: Enumerate ports for midi out and midi in devices in EnumPort. --- dlls/dmusic/Makefile.in | 2 +- dlls/dmusic/dmusic.c | 120 +++++++++++++++++++++++++++++++--------------- 2 files changed, 82 insertions(+), 40 deletions(-) diff --git a/dlls/dmusic/Makefile.in b/dlls/dmusic/Makefile.in index d863143..7522194 100644 --- a/dlls/dmusic/Makefile.in +++ b/dlls/dmusic/Makefile.in @@ -1,5 +1,5 @@ MODULE = dmusic.dll -IMPORTS = dxguid uuid ole32 advapi32 +IMPORTS = dxguid uuid ole32 advapi32 winmm C_SRCS = \ buffer.c \ diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index a36682c..b0dd7c9 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -16,6 +16,9 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include <stdio.h> + #include "dmusic_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dmusic); @@ -66,45 +69,84 @@ static ULONG WINAPI IDirectMusic8Impl_Release (LPDIRECTMUSIC8 iface) { } /* IDirectMusic8Impl IDirectMusic part: */ -static HRESULT WINAPI IDirectMusic8Impl_EnumPort(LPDIRECTMUSIC8 iface, DWORD dwIndex, LPDMUS_PORTCAPS pPortCaps) { - IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface; - TRACE("(%p, %d, %p)\n", This, dwIndex, pPortCaps); - if (NULL == pPortCaps) { return E_POINTER; } - /* i guess the first port shown is always software synthesizer */ - if (dwIndex == 0) - { - IDirectMusicSynth8* synth; - TRACE("enumerating 'Microsoft Software Synthesizer' port\n"); - CoCreateInstance (&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth8, (void**)&synth); - IDirectMusicSynth8_GetPortCaps (synth, pPortCaps); - IDirectMusicSynth8_Release (synth); - return S_OK; - } - -/* it seems that the rest of devices are obtained thru dmusic32.EnumLegacyDevices...*sigh*...which is undocumented*/ -#if 0 - int numMIDI = midiOutGetNumDevs(); - int numWAVE = waveOutGetNumDevs(); - int i; - /* then return digital sound ports */ - for (i = 1; i <= numWAVE; i++) - { - TRACE("enumerating 'digital sound' ports\n"); - if (i == dwIndex) - { - DirectSoundEnumerateA(register_waveport, pPortCaps); - return S_OK; - } - } - /* finally, list all *real* MIDI ports*/ - for (i = numWAVE + 1; i <= numWAVE + numMIDI; i++) - { - TRACE("enumerating 'real MIDI' ports\n"); - if (i == dwIndex) - FIXME("Found MIDI port, but *real* MIDI ports not supported yet\n"); - } -#endif - return S_FALSE; +static HRESULT WINAPI IDirectMusic8Impl_EnumPort(LPDIRECTMUSIC8 iface, DWORD index, LPDMUS_PORTCAPS port_caps) +{ + IDirectMusic8Impl *This = (IDirectMusic8Impl*)iface; + ULONG nb_midi_out; + ULONG nb_midi_in; + const WCHAR emulated[] = {' ','[','E','m','u','l','a','t','e','d',']',0}; + + TRACE("(%p, %d, %p)\n", This, index, port_caps); + + if (!port_caps) + return E_POINTER; + + /* NOTE: It seems some native versions get the rest of devices through dmusic32.EnumLegacyDevices...*sigh*...which is undocumented */ + + /* NOTE: Should we enum wave devices ? Native does not seem to */ + + /* Fill common port caps for winmm ports */ + port_caps->dwType = DMUS_PORT_WINMM_DRIVER; + port_caps->dwMemorySize = 0; + port_caps->dwMaxChannelGroups = 1; + port_caps->dwMaxVoices = 0; + port_caps->dwMaxAudioChannels = 0; + port_caps->dwEffectFlags = DMUS_EFFECT_NONE; + /* Fake port GUID */ + port_caps->guidPort = IID_IUnknown; + port_caps->guidPort.Data1 = index + 1; + + nb_midi_out = midiOutGetNumDevs(); + + if (index == 0) + { + MIDIOUTCAPSW caps; + midiOutGetDevCapsW(MIDI_MAPPER, &caps, sizeof(caps)); + strcpyW(port_caps->wszDescription, caps.szPname); + strcatW(port_caps->wszDescription, emulated); + port_caps->dwFlags = DMUS_PC_SHAREABLE; + port_caps->dwClass = DMUS_PC_OUTPUTCLASS; + TRACE("Enumerating port: %s\n", debugstr_w(port_caps->wszDescription)); + return S_OK; + } + + if (index < (nb_midi_out + 1)) + { + MIDIOUTCAPSW caps; + midiOutGetDevCapsW(index - 1, &caps, sizeof(caps)); + strcpyW(port_caps->wszDescription, caps.szPname); + strcatW(port_caps->wszDescription, emulated); + port_caps->dwFlags = DMUS_PC_SHAREABLE | DMUS_PC_EXTERNAL; + port_caps->dwClass = DMUS_PC_OUTPUTCLASS; + TRACE("Enumerating port: %s\n", debugstr_w(port_caps->wszDescription)); + return S_OK; + } + + nb_midi_in = midiInGetNumDevs(); + + if (index < (nb_midi_in + nb_midi_out + 1)) + { + MIDIINCAPSW caps; + midiInGetDevCapsW(index - nb_midi_out - 1, &caps, sizeof(caps)); + strcpyW(port_caps->wszDescription, caps.szPname); + strcatW(port_caps->wszDescription, emulated); + port_caps->dwFlags = DMUS_PC_EXTERNAL; + port_caps->dwClass = DMUS_PC_INPUTCLASS; + TRACE("Enumerating port: %s\n", debugstr_w(port_caps->wszDescription)); + return S_OK; + } + + if (index == (nb_midi_in + nb_midi_out + 1)) + { + IDirectMusicSynth8* synth; + TRACE("Enumerating port: 'Microsoft Software Synthesizer'\n"); + CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth8, (void**)&synth); + IDirectMusicSynth8_GetPortCaps(synth, port_caps); + IDirectMusicSynth8_Release(synth); + return S_OK; + } + + return S_FALSE; } static HRESULT WINAPI IDirectMusic8Impl_CreateMusicBuffer (LPDIRECTMUSIC8 iface, LPDMUS_BUFFERDESC pBufferDesc, LPDIRECTMUSICBUFFER** ppBuffer, LPUNKNOWN pUnkOuter) {
1
0
0
0
Aric Stewart : strmbase: COM cleanup for PosPassThru.
by Alexandre Julliard
03 Apr '12
03 Apr '12
Module: wine Branch: master Commit: 9846d0245726d3260ad0eafb99fd40947e7d5ea7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9846d0245726d3260ad0eafb9…
Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Apr 2 08:38:47 2012 -0500 strmbase: COM cleanup for PosPassThru. --- dlls/strmbase/pospass.c | 125 ++++++++++++++++++++++++++--------------------- 1 files changed, 69 insertions(+), 56 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=9846d0245726d3260ad0e…
1
0
0
0
Aric Stewart : quartz: Change VideoRenderer to use strmbase' s BaseControlVideo.
by Alexandre Julliard
03 Apr '12
03 Apr '12
Module: wine Branch: master Commit: dbf910b053eb3bc0db003536ecf3daec3a2a0c1b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=dbf910b053eb3bc0db003536e…
Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 30 20:09:22 2012 -0500 quartz: Change VideoRenderer to use strmbase's BaseControlVideo. --- dlls/quartz/videorenderer.c | 757 +++++++++++++------------------------------ 1 files changed, 221 insertions(+), 536 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=dbf910b053eb3bc0db003…
1
0
0
0
Aric Stewart : quartz: Convert VideoRenderer to use strmbase' s BaseControlWindow.
by Alexandre Julliard
03 Apr '12
03 Apr '12
Module: wine Branch: master Commit: 75300a7e32e198368893d06b7d6088850c614fe4 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=75300a7e32e198368893d06b7…
Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 30 20:09:14 2012 -0500 quartz: Convert VideoRenderer to use strmbase's BaseControlWindow. --- dlls/quartz/videorenderer.c | 731 ++++++------------------------------------- 1 files changed, 91 insertions(+), 640 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=75300a7e32e198368893d…
1
0
0
0
Aric Stewart : strmbase: Remove QualityControlImpl from the general strmbase.h.
by Alexandre Julliard
03 Apr '12
03 Apr '12
Module: wine Branch: master Commit: 56477075c257426575e870a231b23ff582ff6d4e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=56477075c257426575e870a23…
Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Apr 2 07:52:15 2012 -0500 strmbase: Remove QualityControlImpl from the general strmbase.h. Quality Control things are not part of the standard strmbase library set. --- dlls/quartz/dsoundrender.c | 2 +- dlls/strmbase/qualitycontrol.c | 14 ++++++++++- dlls/strmbase/renderer.c | 22 +++++++++------- dlls/strmbase/strmbase_private.h | 50 ++++++++++++++++++++++++++++++++++++++ dlls/strmbase/transform.c | 14 +++++++--- dlls/winegstreamer/gstdemux.c | 47 ++++++++++++++++++++++++++++------- dlls/winegstreamer/gsttffilter.c | 2 +- include/wine/strmbase.h | 35 ++------------------------ 8 files changed, 127 insertions(+), 59 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=56477075c257426575e87…
1
0
0
0
← Newer
1
...
61
62
63
64
65
66
67
...
72
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
Results per page:
10
25
50
100
200