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
January 2013
----- 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
736 discussions
Start a n
N
ew thread
Huw Davies : riched20: Avoid an unnecessary string duplication.
by Alexandre Julliard
22 Jan '13
22 Jan '13
Module: wine Branch: master Commit: 7a27ffb28ccadb611e623bf0e7c20595a48ee7dc URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7a27ffb28ccadb611e623bf0e…
Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 22 14:04:08 2013 +0000 riched20: Avoid an unnecessary string duplication. --- dlls/riched20/caret.c | 25 ++++++++----------------- dlls/riched20/undo.c | 2 +- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 7decff2..490f39c 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -361,6 +361,7 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, else { ME_Cursor cursor; + ME_UndoItem *undo; int nCharsToDelete = min(nChars, c.nOffset); int i; @@ -378,25 +379,15 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, nCharsToDelete, nChars, c.nOffset, debugstr_w(run->strText->szData), run->strText->nLen); - if (!c.nOffset && run->strText->nLen == nCharsToDelete) + undo = ME_AddUndoItem(editor, diUndoInsertRun, c.pRun); + if (undo) { - /* undo = reinsert whole run */ - /* nOfs is a character offset (from the start of the document - to the current (deleted) run */ - ME_UndoItem *pUndo = ME_AddUndoItem(editor, diUndoInsertRun, c.pRun); - if (pUndo) - pUndo->di.member.run.nCharOfs = nOfs+nChars; - } - else - { - /* undo = reinsert partial run */ - ME_UndoItem *pUndo = ME_AddUndoItem(editor, diUndoInsertRun, c.pRun); - if (pUndo) { - ME_DestroyString(pUndo->di.member.run.strText); - pUndo->di.member.run.nCharOfs = nOfs+nChars; - pUndo->di.member.run.strText = ME_MakeStringN(run->strText->szData+c.nOffset, nCharsToDelete); - } + /* nOfs is a character offset (from the start of the document + to the current (deleted) run */ + undo->di.member.run.nCharOfs = nOfs + nChars; + undo->di.member.run.strText = ME_MakeStringN(run->strText->szData + c.nOffset, nCharsToDelete); } + TRACE("Post deletion string: %s (%d)\n", debugstr_w(run->strText->szData), run->strText->nLen); TRACE("Shift value: %d\n", shift); ME_StrDeleteV(run->strText, c.nOffset, nCharsToDelete); diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index a101cc1..af27238 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -73,7 +73,7 @@ ME_UndoItem *ME_AddUndoItem(ME_TextEditor *editor, ME_DIType type, const ME_Disp case diUndoInsertRun: assert(pdi); pItem->member.run = pdi->member.run; - pItem->member.run.strText = ME_StrDup(pItem->member.run.strText); + pItem->member.run.strText = NULL; ME_AddRefStyle(pItem->member.run.style); if (pdi->member.run.ole_obj) {
1
0
0
0
Piotr Caban : vbscript: Fixed typo in vbsregexp55.idl.
by Alexandre Julliard
22 Jan '13
22 Jan '13
Module: wine Branch: master Commit: 2cb3df606f5659b0fac648fe4da0410b0e4e8cc2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2cb3df606f5659b0fac648fe4…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 22 13:55:54 2013 +0100 vbscript: Fixed typo in vbsregexp55.idl. --- dlls/vbscript/vbsregexp55.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/vbsregexp55.idl b/dlls/vbscript/vbsregexp55.idl index 0e016b2..c0cf683 100644 --- a/dlls/vbscript/vbsregexp55.idl +++ b/dlls/vbscript/vbsregexp55.idl @@ -122,7 +122,7 @@ library VBScript_RegExp_55 [id(DISPID_REGEXP_REPLACE)] HRESULT Replace( [in] BSTR sourceString, - [in] VARIANT *replaceVar, + [in] VARIANT replaceVar, [out, retval] BSTR *pDestString); }
1
0
0
0
André Hentschel : netstat: Implement the UDP stats output.
by Alexandre Julliard
22 Jan '13
22 Jan '13
Module: wine Branch: master Commit: b372044c398c74af562e2489e8ca0a2140895d91 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b372044c398c74af562e2489e…
Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 21 21:12:47 2013 +0100 netstat: Implement the UDP stats output. --- po/ar.po | 20 ++++++++++++++++++++ po/bg.po | 24 ++++++++++++++++++++++++ po/ca.po | 26 ++++++++++++++++++++++++++ po/cs.po | 22 ++++++++++++++++++++++ po/da.po | 26 ++++++++++++++++++++++++++ po/de.po | 26 ++++++++++++++++++++++++++ po/el.po | 22 ++++++++++++++++++++++ po/en.po | 20 ++++++++++++++++++++ po/en_US.po | 20 ++++++++++++++++++++ po/eo.po | 24 ++++++++++++++++++++++++ po/es.po | 26 ++++++++++++++++++++++++++ po/fa.po | 20 ++++++++++++++++++++ po/fi.po | 26 ++++++++++++++++++++++++++ po/fr.po | 26 ++++++++++++++++++++++++++ po/he.po | 24 ++++++++++++++++++++++++ po/hi.po | 20 ++++++++++++++++++++ po/hu.po | 26 ++++++++++++++++++++++++++ po/it.po | 26 ++++++++++++++++++++++++++ po/ja.po | 26 ++++++++++++++++++++++++++ po/ko.po | 26 ++++++++++++++++++++++++++ po/lt.po | 26 ++++++++++++++++++++++++++ po/ml.po | 20 ++++++++++++++++++++ po/nb_NO.po | 26 ++++++++++++++++++++++++++ po/nl.po | 26 ++++++++++++++++++++++++++ po/or.po | 20 ++++++++++++++++++++ po/pa.po | 20 ++++++++++++++++++++ po/pl.po | 26 ++++++++++++++++++++++++++ po/pt_BR.po | 26 ++++++++++++++++++++++++++ po/pt_PT.po | 26 ++++++++++++++++++++++++++ po/rm.po | 20 ++++++++++++++++++++ po/ro.po | 24 ++++++++++++++++++++++++ po/ru.po | 26 ++++++++++++++++++++++++++ po/sk.po | 22 ++++++++++++++++++++++ po/sl.po | 26 ++++++++++++++++++++++++++ po/sr_RS(a)cyrillic.po | 24 ++++++++++++++++++++++++ po/sr_RS(a)latin.po | 24 ++++++++++++++++++++++++ po/sv.po | 26 ++++++++++++++++++++++++++ po/te.po | 20 ++++++++++++++++++++ po/th.po | 22 ++++++++++++++++++++++ po/tr.po | 24 ++++++++++++++++++++++++ po/uk.po | 26 ++++++++++++++++++++++++++ po/wa.po | 20 ++++++++++++++++++++ po/wine.pot | 20 ++++++++++++++++++++ po/zh_CN.po | 24 ++++++++++++++++++++++++ po/zh_TW.po | 26 ++++++++++++++++++++++++++ programs/netstat/netstat.c | 25 +++++++++++++++++++++++++ programs/netstat/netstat.h | 5 +++++ programs/netstat/netstat.rc | 5 +++++ 48 files changed, 1101 insertions(+), 0 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=b372044c398c74af562e2…
1
0
0
0
André Hentschel : netstat: Implement the TCP stats output.
by Alexandre Julliard
22 Jan '13
22 Jan '13
Module: wine Branch: master Commit: 709b9ee819557d447055f645469728f6a1284cf2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=709b9ee819557d447055f6454…
Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 21 21:12:36 2013 +0100 netstat: Implement the TCP stats output. --- po/ar.po | 40 +++++++++++++++++++++++++++++++++++ po/bg.po | 44 +++++++++++++++++++++++++++++++++++++++ po/ca.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/cs.po | 40 +++++++++++++++++++++++++++++++++++ po/da.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/de.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/el.po | 40 +++++++++++++++++++++++++++++++++++ po/en.po | 36 ++++++++++++++++++++++++++++++++ po/en_US.po | 36 ++++++++++++++++++++++++++++++++ po/eo.po | 44 +++++++++++++++++++++++++++++++++++++++ po/es.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/fa.po | 40 +++++++++++++++++++++++++++++++++++ po/fi.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/fr.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/he.po | 44 +++++++++++++++++++++++++++++++++++++++ po/hi.po | 36 ++++++++++++++++++++++++++++++++ po/hu.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/it.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/ja.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/ko.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/lt.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/ml.po | 36 ++++++++++++++++++++++++++++++++ po/nb_NO.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/nl.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/or.po | 36 ++++++++++++++++++++++++++++++++ po/pa.po | 36 ++++++++++++++++++++++++++++++++ po/pl.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/pt_BR.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/pt_PT.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/rm.po | 36 ++++++++++++++++++++++++++++++++ po/ro.po | 44 +++++++++++++++++++++++++++++++++++++++ po/ru.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/sk.po | 44 +++++++++++++++++++++++++++++++++++++++ po/sl.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/sr_RS(a)cyrillic.po | 44 +++++++++++++++++++++++++++++++++++++++ po/sr_RS(a)latin.po | 44 +++++++++++++++++++++++++++++++++++++++ po/sv.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/te.po | 36 ++++++++++++++++++++++++++++++++ po/th.po | 40 +++++++++++++++++++++++++++++++++++ po/tr.po | 44 +++++++++++++++++++++++++++++++++++++++ po/uk.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/wa.po | 36 ++++++++++++++++++++++++++++++++ po/wine.pot | 36 ++++++++++++++++++++++++++++++++ po/zh_CN.po | 44 +++++++++++++++++++++++++++++++++++++++ po/zh_TW.po | 48 +++++++++++++++++++++++++++++++++++++++++++ programs/netstat/netstat.c | 33 +++++++++++++++++++++++++++++ programs/netstat/netstat.h | 9 ++++++++ programs/netstat/netstat.rc | 9 ++++++++ 48 files changed, 2015 insertions(+), 0 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=709b9ee819557d447055f…
1
0
0
0
Christian Costa : d3dx9_36: Implement ID3DXFileDataImpl_IsReference.
by Alexandre Julliard
22 Jan '13
22 Jan '13
Module: wine Branch: master Commit: 8f6eee5a731d3789e72cd961f3240a6498f0ce35 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=8f6eee5a731d3789e72cd961f…
Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jan 22 08:36:28 2013 +0100 d3dx9_36: Implement ID3DXFileDataImpl_IsReference. --- dlls/d3dx9_36/xfile.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index 82c7495..81f9da3 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -235,9 +235,11 @@ static HRESULT WINAPI ID3DXFileDataImpl_GetType(ID3DXFileData *iface, GUID *guid static BOOL WINAPI ID3DXFileDataImpl_IsReference(ID3DXFileData *iface) { - TRACE("(%p)->(): stub\n", iface); + ID3DXFileDataImpl *This = impl_from_ID3DXFileData(iface); - return E_NOTIMPL; + TRACE("(%p)->()\n", iface); + + return This->reference; } @@ -320,6 +322,7 @@ static HRESULT ID3DXFileDataImpl_Create(IDirectXFileObject *dxfile_object, ID3DX HeapFree(GetProcessHeap(), 0, object); return E_FAIL; } + object->reference = TRUE; } else {
1
0
0
0
Christian Costa : d3dx9_36: Implement ID3DXFileData_GetChildren and ID3DXFileData_GetChild.
by Alexandre Julliard
22 Jan '13
22 Jan '13
Module: wine Branch: master Commit: 5db342168d7e362af544e57792b31cfd0cf78a9d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5db342168d7e362af544e5779…
Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jan 22 08:36:19 2013 +0100 d3dx9_36: Implement ID3DXFileData_GetChildren and ID3DXFileData_GetChild. --- dlls/d3dx9_36/xfile.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index 8020467..82c7495 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -243,17 +243,32 @@ static BOOL WINAPI ID3DXFileDataImpl_IsReference(ID3DXFileData *iface) static HRESULT WINAPI ID3DXFileDataImpl_GetChildren(ID3DXFileData *iface, SIZE_T *children) { - TRACE("(%p)->(%p): stub\n", iface, children); + ID3DXFileDataImpl *This = impl_from_ID3DXFileData(iface); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", iface, children); + + if (!children) + return E_POINTER; + + *children = This->nb_children; + + return S_OK; } static HRESULT WINAPI ID3DXFileDataImpl_GetChild(ID3DXFileData *iface, SIZE_T id, ID3DXFileData **object) { - TRACE("(%p)->(%lu, %p): stub\n", iface, id, object); + ID3DXFileDataImpl *This = impl_from_ID3DXFileData(iface); - return E_NOTIMPL; + TRACE("(%p)->(%lu, %p)\n", iface, id, object); + + if (!object) + return E_POINTER; + + *object = This->children[id]; + (*object)->lpVtbl->AddRef(*object); + + return S_OK; }
1
0
0
0
Christian Costa : dmusic: Add support for loading articulations.
by Alexandre Julliard
22 Jan '13
22 Jan '13
Module: wine Branch: master Commit: 2562969804782c043f6e676339c742cac5a11a1c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2562969804782c043f6e67633…
Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jan 22 08:35:56 2013 +0100 dmusic: Add support for loading articulations. --- dlls/dmusic/dmusic_private.h | 7 ++++ dlls/dmusic/instrument.c | 69 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 75 insertions(+), 1 deletions(-) diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index ff16833..badc2df 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -85,6 +85,11 @@ typedef struct instrument_region { BOOL loop_present; } instrument_region; +typedef struct instrument_articulation { + CONNECTIONLIST connections_list; + CONNECTION *connections; +} instrument_articulation; + /***************************************************************************** * ClassFactory */ @@ -245,6 +250,8 @@ struct IDirectMusicInstrumentImpl { /* instrument data */ BOOL loaded; instrument_region *regions; + ULONG nb_articulations; + instrument_articulation *articulations; }; static inline IDirectMusicInstrumentImpl *impl_from_IDirectMusicInstrument(IDirectMusicInstrument *iface) diff --git a/dlls/dmusic/instrument.c b/dlls/dmusic/instrument.c index d6de0db..9df3e0c 100644 --- a/dlls/dmusic/instrument.c +++ b/dlls/dmusic/instrument.c @@ -76,7 +76,12 @@ static ULONG WINAPI IDirectMusicInstrumentImpl_Release(LPDIRECTMUSICINSTRUMENT i if (!ref) { + ULONG i; + HeapFree(GetProcessHeap(), 0, This->regions); + for (i = 0; i < This->nb_articulations; i++) + HeapFree(GetProcessHeap(), 0, This->articulations->connections); + HeapFree(GetProcessHeap(), 0, This->articulations); HeapFree(GetProcessHeap(), 0, This); } @@ -243,6 +248,42 @@ static HRESULT load_region(IDirectMusicInstrumentImpl *This, IStream *stream, in return S_OK; } +static HRESULT load_articulation(IDirectMusicInstrumentImpl *This, IStream *stream, ULONG length) +{ + HRESULT ret; + instrument_articulation *articulation; + + if (!This->articulations) + This->articulations = HeapAlloc(GetProcessHeap(), 0, sizeof(*This->articulations)); + else + This->articulations = HeapReAlloc(GetProcessHeap(), 0, This->articulations, sizeof(*This->articulations) * (This->nb_articulations + 1)); + if (!This->articulations) + return E_OUTOFMEMORY; + + articulation = &This->articulations[This->nb_articulations]; + + ret = read_from_stream(stream, &articulation->connections_list, sizeof(CONNECTIONLIST)); + if (FAILED(ret)) + return ret; + + articulation->connections = HeapAlloc(GetProcessHeap(), 0, sizeof(CONNECTION) * articulation->connections_list.cConnections); + if (!articulation->connections) + return E_OUTOFMEMORY; + + ret = read_from_stream(stream, articulation->connections, sizeof(CONNECTION) * articulation->connections_list.cConnections); + if (FAILED(ret)) + { + HeapFree(GetProcessHeap(), 0, articulation->connections); + return ret; + } + + subtract_bytes(length, sizeof(CONNECTIONLIST) + sizeof(CONNECTION) * articulation->connections_list.cConnections); + + This->nb_articulations++; + + return S_OK; +} + /* Function that loads all instrument data and which is called from IDirectMusicCollection_GetInstrument as in native */ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, IStream *stream) { @@ -323,7 +364,7 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt if (chunk.fccID == FOURCC_RGN) { - TRACE("RGN chunk (region list): %u bytes\n", chunk.dwSize); + TRACE("RGN chunk (region): %u bytes\n", chunk.dwSize); hr = load_region(This, stream, &This->regions[i++], chunk.dwSize - sizeof(chunk.fccID)); } else @@ -338,6 +379,32 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt } break; + case FOURCC_LART: + TRACE("LART chunk (articulations list): %u bytes\n", size); + + while (size) + { + hr = read_from_stream(stream, &chunk, sizeof(chunk)); + if (FAILED(hr)) + goto error; + + if (chunk.fccID == FOURCC_ART1) + { + TRACE("ART1 chunk (level 1 articulation): %u bytes\n", chunk.dwSize); + hr = load_articulation(This, stream, chunk.dwSize); + } + else + { + TRACE("Unknown chunk %s: %u bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); + hr = advance_stream(stream, chunk.dwSize); + } + if (FAILED(hr)) + goto error; + + size = subtract_bytes(size, chunk.dwSize + sizeof(chunk)); + } + break; + default: TRACE("Unknown chunk %s: %u bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize);
1
0
0
0
Henri Verbeet : wined3d: Get rid of CheckSrgbReadCapability().
by Alexandre Julliard
22 Jan '13
22 Jan '13
Module: wine Branch: master Commit: c90a1e5e218705c225e91f7d0f0df3fbc44e2334 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c90a1e5e218705c225e91f7d0…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 22 11:34:09 2013 +0100 wined3d: Get rid of CheckSrgbReadCapability(). --- dlls/wined3d/directx.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f763c12..aa11116 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3527,11 +3527,6 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, return FALSE; } -static BOOL CheckSrgbReadCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) -{ - return format->flags & WINED3DFMT_FLAG_SRGB_READ; -} - /* Check if a format support blending in combination with pixel shaders */ static BOOL CheckPostPixelShaderBlendingCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) @@ -3998,7 +3993,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_SRGBREAD) { - if (!CheckSrgbReadCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_SRGB_READ)) { TRACE("[FAILED] - No sRGB read support.\n"); return WINED3DERR_NOTAVAILABLE; @@ -4164,7 +4159,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_SRGBREAD) { - if (!CheckSrgbReadCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_SRGB_READ)) { TRACE("[FAILED] - No sRGB read support.\n"); return WINED3DERR_NOTAVAILABLE; @@ -4332,7 +4327,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_SRGBREAD) { - if (!CheckSrgbReadCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_SRGB_READ)) { TRACE("[FAILED] - No sRGB read support.\n"); return WINED3DERR_NOTAVAILABLE;
1
0
0
0
Henri Verbeet : wined3d: Properly set WINED3DFMT_FLAG_SRGB_WRITE in init_format_texture_info().
by Alexandre Julliard
22 Jan '13
22 Jan '13
Module: wine Branch: master Commit: 9307327ede0107458ba030bf6d0a284ac2b637e0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9307327ede0107458ba030bf6…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 22 11:34:08 2013 +0100 wined3d: Properly set WINED3DFMT_FLAG_SRGB_WRITE in init_format_texture_info(). --- dlls/wined3d/directx.c | 33 ++++----------------------------- dlls/wined3d/utils.c | 21 +++++++++++++++++---- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 22 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 18ea67d..f763c12 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3532,31 +3532,6 @@ static BOOL CheckSrgbReadCapability(const struct wined3d_adapter *adapter, const return format->flags & WINED3DFMT_FLAG_SRGB_READ; } -static BOOL CheckSrgbWriteCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) -{ - /* Only offer SRGB writing on X8R8G8B8/A8R8G8B8 when we use ARB or GLSL shaders as we are - * doing the color fixup in shaders. - * Note Windows drivers (at least on the Geforce 8800) also offer this on R5G6B5. */ - if (format->flags & WINED3DFMT_FLAG_SRGB_WRITE) - { - struct fragment_caps fragment_caps; - struct shader_caps shader_caps; - - adapter->fragment_pipe->get_caps(&adapter->gl_info, &fragment_caps); - adapter->shader_backend->shader_get_caps(&adapter->gl_info, &shader_caps); - - if ((fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_SRGB_WRITE) - && (shader_caps.wined3d_caps & WINED3D_SHADER_CAP_SRGB_WRITE)) - { - TRACE("[OK]\n"); - return TRUE; - } - } - - TRACE("[FAILED] - sRGB writes not supported by format %s.\n", debug_d3dformat(format->id)); - return FALSE; -} - /* Check if a format support blending in combination with pixel shaders */ static BOOL CheckPostPixelShaderBlendingCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) @@ -4033,7 +4008,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_SRGBWRITE) { - if (!CheckSrgbWriteCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_SRGB_WRITE)) { TRACE("[FAILED] - No sRGB write support.\n"); return WINED3DERR_NOTAVAILABLE; @@ -4199,7 +4174,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_SRGBWRITE) { - if (!CheckSrgbWriteCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_SRGB_WRITE)) { TRACE("[FAILED] - No sRGB write support.\n"); return WINED3DERR_NOTAVAILABLE; @@ -4367,7 +4342,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_SRGBWRITE) { - if (!CheckSrgbWriteCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_SRGB_WRITE)) { TRACE("[FAILED] - No sRGB write support.\n"); return WINED3DERR_NOTAVAILABLE; @@ -5546,7 +5521,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal) return FALSE; } - if (!initPixelFormats(&adapter->gl_info, adapter->driver_info.vendor)) + if (!wined3d_adapter_init_format_info(adapter)) { ERR("Failed to initialize GL format info.\n"); WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 95a826e..6caeee6 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1243,10 +1243,18 @@ static void init_format_fbo_compat_info(struct wined3d_gl_info *gl_info) gl_info->fbo_ops.glDeleteFramebuffers(1, &fbo); } -static BOOL init_format_texture_info(struct wined3d_gl_info *gl_info) +static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct wined3d_gl_info *gl_info) { + struct fragment_caps fragment_caps; + struct shader_caps shader_caps; + BOOL srgb_write; unsigned int i; + adapter->fragment_pipe->get_caps(gl_info, &fragment_caps); + adapter->shader_backend->shader_get_caps(gl_info, &shader_caps); + srgb_write = (fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_SRGB_WRITE) + && (shader_caps.wined3d_caps & WINED3D_SHADER_CAP_SRGB_WRITE); + for (i = 0; i < sizeof(format_texture_info) / sizeof(*format_texture_info); ++i) { int fmt_idx = getFmtIdx(format_texture_info[i].id); @@ -1293,6 +1301,9 @@ static BOOL init_format_texture_info(struct wined3d_gl_info *gl_info) } } + if ((format->flags & WINED3DFMT_FLAG_SRGB_WRITE) && !srgb_write) + format->flags &= ~WINED3DFMT_FLAG_SRGB_WRITE; + /* Texture conversion stuff */ format->convert = format_texture_info[i].convert; format->conv_byte_count = format_texture_info[i].conv_byte_count; @@ -1645,17 +1656,19 @@ BOOL initPixelFormatsNoGL(struct wined3d_gl_info *gl_info) } /* Context activation is done by the caller. */ -BOOL initPixelFormats(struct wined3d_gl_info *gl_info, enum wined3d_pci_vendor vendor) +BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter) { + struct wined3d_gl_info *gl_info = &adapter->gl_info; + if (!init_format_base_info(gl_info)) return FALSE; if (!init_format_block_info(gl_info)) goto fail; - if (!init_format_texture_info(gl_info)) goto fail; + if (!init_format_texture_info(adapter, gl_info)) goto fail; if (!init_format_vertex_info(gl_info)) goto fail; apply_format_fixups(gl_info); init_format_fbo_compat_info(gl_info); - init_format_filter_info(gl_info, vendor); + init_format_filter_info(gl_info, adapter->driver_info.vendor); return TRUE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c66374a..b6ecfa9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1592,9 +1592,9 @@ struct wined3d_adapter const struct blit_shader *blitter; }; +BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter) DECLSPEC_HIDDEN; unsigned int adapter_adjust_memory(struct wined3d_adapter *adapter, int amount) DECLSPEC_HIDDEN; -BOOL initPixelFormats(struct wined3d_gl_info *gl_info, enum wined3d_pci_vendor vendor) DECLSPEC_HIDDEN; BOOL initPixelFormatsNoGL(struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; extern void add_gl_compat_wrappers(struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN;
1
0
0
0
Henri Verbeet : wined3d: Add sRGB writes to the shader backend and fragment pipe caps.
by Alexandre Julliard
22 Jan '13
22 Jan '13
Module: wine Branch: master Commit: 5ce220eb2fdac8dccde181e8ad1b3f5983bc5f62 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5ce220eb2fdac8dccde181e8a…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 22 11:34:07 2013 +0100 wined3d: Add sRGB writes to the shader backend and fragment pipe caps. --- dlls/wined3d/arb_program_shader.c | 5 +++-- dlls/wined3d/directx.c | 11 +++++++---- dlls/wined3d/glsl_shader.c | 9 +++++++-- dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0d0db64..2df18cd 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5062,7 +5062,7 @@ static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct sh caps->ps_1x_max_value = 0.0f; } - caps->wined3d_caps = 0; + caps->wined3d_caps = WINED3D_SHADER_CAP_SRGB_WRITE; if (use_nv_clip(gl_info)) caps->wined3d_caps |= WINED3D_SHADER_CAP_VS_CLIPPING; } @@ -5738,7 +5738,8 @@ static void arbfp_free(struct wined3d_device *device) static void arbfp_get_caps(const struct wined3d_gl_info *gl_info, struct fragment_caps *caps) { - caps->wined3d_caps = WINED3D_FRAGMENT_CAP_PROJ_CONTROL; + caps->wined3d_caps = WINED3D_FRAGMENT_CAP_PROJ_CONTROL + | WINED3D_FRAGMENT_CAP_SRGB_WRITE; caps->PrimitiveMiscCaps = WINED3DPMISCCAPS_TSSARGTEMP; caps->TextureOpCaps = WINED3DTEXOPCAPS_DISABLE | WINED3DTEXOPCAPS_SELECTARG1 | diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e442734..18ea67d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3539,11 +3539,14 @@ static BOOL CheckSrgbWriteCapability(const struct wined3d_adapter *adapter, cons * Note Windows drivers (at least on the Geforce 8800) also offer this on R5G6B5. */ if (format->flags & WINED3DFMT_FLAG_SRGB_WRITE) { - int vs_selected_mode; - int ps_selected_mode; - select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); + struct fragment_caps fragment_caps; + struct shader_caps shader_caps; - if ((ps_selected_mode == SHADER_ARB) || (ps_selected_mode == SHADER_GLSL)) + adapter->fragment_pipe->get_caps(&adapter->gl_info, &fragment_caps); + adapter->shader_backend->shader_get_caps(&adapter->gl_info, &shader_caps); + + if ((fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_SRGB_WRITE) + && (shader_caps.wined3d_caps & WINED3D_SHADER_CAP_SRGB_WRITE)) { TRACE("[OK]\n"); return TRUE; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a9ca2cd..9b000b6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6205,7 +6205,11 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s */ caps->ps_1x_max_value = 8.0; - caps->wined3d_caps = WINED3D_SHADER_CAP_VS_CLIPPING; + /* Ideally we'd only set caps like sRGB writes here if supported by both + * the shader backend and the fragment pipe, but we can get called before + * shader_glsl_alloc(). */ + caps->wined3d_caps = WINED3D_SHADER_CAP_VS_CLIPPING + | WINED3D_SHADER_CAP_SRGB_WRITE; } static BOOL shader_glsl_color_fixup_supported(struct color_fixup_desc fixup) @@ -6392,7 +6396,8 @@ static void glsl_fragment_pipe_enable(const struct wined3d_gl_info *gl_info, BOO static void glsl_fragment_pipe_get_caps(const struct wined3d_gl_info *gl_info, struct fragment_caps *caps) { - caps->wined3d_caps = WINED3D_FRAGMENT_CAP_PROJ_CONTROL; + caps->wined3d_caps = WINED3D_FRAGMENT_CAP_PROJ_CONTROL + | WINED3D_FRAGMENT_CAP_SRGB_WRITE; caps->PrimitiveMiscCaps = WINED3DPMISCCAPS_TSSARGTEMP; caps->TextureOpCaps = WINED3DTEXOPCAPS_DISABLE | WINED3DTEXOPCAPS_SELECTARG1 diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f59a736..c66374a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -715,6 +715,7 @@ extern const struct wined3d_shader_frontend sm4_shader_frontend DECLSPEC_HIDDEN; typedef void (*SHADER_HANDLER)(const struct wined3d_shader_instruction *); #define WINED3D_SHADER_CAP_VS_CLIPPING 0x00000001 +#define WINED3D_SHADER_CAP_SRGB_WRITE 0x00000002 struct shader_caps { @@ -1175,6 +1176,7 @@ struct StateEntryTemplate }; #define WINED3D_FRAGMENT_CAP_PROJ_CONTROL 0x00000001 +#define WINED3D_FRAGMENT_CAP_SRGB_WRITE 0x00000002 struct fragment_caps {
1
0
0
0
← Newer
1
...
20
21
22
23
24
25
26
...
74
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
73
74
Results per page:
10
25
50
100
200