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
March 2019
----- 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
1097 discussions
Start a n
N
ew thread
Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetTechniqueDesc() helper.
by Alexandre Julliard
05 Mar '19
05 Mar '19
Module: wine Branch: master Commit: 10aa0819138f4aaf0f872de74eaf953326afe997 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=10aa0819138f4aaf0f872de7…
Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Mar 4 23:16:03 2019 +0100 d3dx9: Merge the d3dx_effect_GetTechniqueDesc() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index eaaae04..473bb93 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1014,24 +1014,6 @@ static HRESULT d3dx9_base_effect_get_parameter_desc(struct d3dx9_base_effect *ba return D3D_OK; } -static HRESULT d3dx9_base_effect_get_technique_desc(struct d3dx9_base_effect *base, - D3DXHANDLE technique, D3DXTECHNIQUE_DESC *desc) -{ - struct d3dx_technique *tech = technique ? get_valid_technique(base, technique) : &base->techniques[0]; - - if (!desc || !tech) - { - WARN("Invalid argument specified.\n"); - return D3DERR_INVALIDCALL; - } - - desc->Name = tech->name; - desc->Passes = tech->pass_count; - desc->Annotations = tech->annotation_count; - - return D3D_OK; -} - static HRESULT d3dx9_get_param_value_ptr(struct d3dx_pass *pass, struct d3dx_state *state, void **param_value, struct d3dx_parameter **out_param, BOOL update_all, BOOL *param_dirty) @@ -3208,10 +3190,21 @@ static HRESULT WINAPI d3dx_effect_GetTechniqueDesc(ID3DXEffect *iface, D3DXHANDL D3DXTECHNIQUE_DESC *desc) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_technique *tech = technique ? get_valid_technique(&effect->base_effect, technique) : &effect->base_effect.techniques[0]; TRACE("iface %p, technique %p, desc %p.\n", iface, technique, desc); - return d3dx9_base_effect_get_technique_desc(&effect->base_effect, technique, desc); + if (!desc || !tech) + { + WARN("Invalid argument specified.\n"); + return D3DERR_INVALIDCALL; + } + + desc->Name = tech->name; + desc->Passes = tech->pass_count; + desc->Annotations = tech->annotation_count; + + return D3D_OK; } static HRESULT WINAPI d3dx_effect_GetPassDesc(ID3DXEffect *iface, D3DXHANDLE pass, D3DXPASS_DESC *desc)
1
0
0
0
Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetPassByName() helper.
by Alexandre Julliard
05 Mar '19
05 Mar '19
Module: wine Branch: master Commit: 730e44ebe224c1b70e9f6eaf6a9aaeb8bc38a20b URL:
https://source.winehq.org/git/wine.git/?a=commit;h=730e44ebe224c1b70e9f6eaf…
Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Mar 4 23:16:02 2019 +0100 d3dx9: Merge the d3dx_effect_GetPassByName() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 47 ++++++++++++++++++++--------------------------- 1 file changed, 20 insertions(+), 27 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c9aeb87..eaaae04 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1204,32 +1204,6 @@ static D3DXHANDLE d3dx9_base_effect_get_technique_by_name(struct d3dx9_base_effe return NULL; } -static D3DXHANDLE d3dx9_base_effect_get_pass_by_name(struct d3dx9_base_effect *base, - D3DXHANDLE technique, const char *name) -{ - struct d3dx_technique *tech = get_valid_technique(base, technique); - - if (tech && name) - { - unsigned int i; - - for (i = 0; i < tech->pass_count; ++i) - { - struct d3dx_pass *pass = &tech->passes[i]; - - if (!strcmp(pass->name, name)) - { - TRACE("Returning pass %p\n", pass); - return get_pass_handle(pass); - } - } - } - - WARN("Pass not found.\n"); - - return NULL; -} - static unsigned int get_annotation_from_object(struct d3dx_effect *effect, D3DXHANDLE object, struct d3dx_parameter **annotations) { @@ -3438,10 +3412,29 @@ static D3DXHANDLE WINAPI d3dx_effect_GetPass(ID3DXEffect *iface, D3DXHANDLE tech static D3DXHANDLE WINAPI d3dx_effect_GetPassByName(ID3DXEffect *iface, D3DXHANDLE technique, const char *name) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_technique *tech = get_valid_technique(&effect->base_effect, technique); TRACE("iface %p, technique %p, name %s.\n", iface, technique, debugstr_a(name)); - return d3dx9_base_effect_get_pass_by_name(&effect->base_effect, technique, name); + if (tech && name) + { + unsigned int i; + + for (i = 0; i < tech->pass_count; ++i) + { + struct d3dx_pass *pass = &tech->passes[i]; + + if (!strcmp(pass->name, name)) + { + TRACE("Returning pass %p\n", pass); + return get_pass_handle(pass); + } + } + } + + WARN("Pass not found.\n"); + + return NULL; } static D3DXHANDLE WINAPI d3dx_effect_GetFunction(ID3DXEffect *iface, UINT index)
1
0
0
0
Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetPass() helper.
by Alexandre Julliard
05 Mar '19
05 Mar '19
Module: wine Branch: master Commit: e419ac91ba5bd295b596f334951657b54dba3e99 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=e419ac91ba5bd295b596f334…
Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Mar 4 23:16:01 2019 +0100 d3dx9: Merge the d3dx_effect_GetPass() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c621b21..c9aeb87 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1204,22 +1204,6 @@ static D3DXHANDLE d3dx9_base_effect_get_technique_by_name(struct d3dx9_base_effe return NULL; } -static D3DXHANDLE d3dx9_base_effect_get_pass(struct d3dx9_base_effect *base, - D3DXHANDLE technique, UINT index) -{ - struct d3dx_technique *tech = get_valid_technique(base, technique); - - if (tech && index < tech->pass_count) - { - TRACE("Returning pass %p\n", &tech->passes[index]); - return get_pass_handle(&tech->passes[index]); - } - - WARN("Pass not found.\n"); - - return NULL; -} - static D3DXHANDLE d3dx9_base_effect_get_pass_by_name(struct d3dx9_base_effect *base, D3DXHANDLE technique, const char *name) { @@ -3436,10 +3420,19 @@ static D3DXHANDLE WINAPI d3dx_effect_GetTechniqueByName(ID3DXEffect *iface, cons static D3DXHANDLE WINAPI d3dx_effect_GetPass(ID3DXEffect *iface, D3DXHANDLE technique, UINT index) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_technique *tech = get_valid_technique(&effect->base_effect, technique); TRACE("iface %p, technique %p, index %u.\n", iface, technique, index); - return d3dx9_base_effect_get_pass(&effect->base_effect, technique, index); + if (tech && index < tech->pass_count) + { + TRACE("Returning pass %p\n", &tech->passes[index]); + return get_pass_handle(&tech->passes[index]); + } + + WARN("Pass not found.\n"); + + return NULL; } static D3DXHANDLE WINAPI d3dx_effect_GetPassByName(ID3DXEffect *iface, D3DXHANDLE technique, const char *name)
1
0
0
0
Michael Stefaniuc : d3dx9: Pass a struct d3dx_effect to get_annotation_from_object().
by Alexandre Julliard
05 Mar '19
05 Mar '19
Module: wine Branch: master Commit: 89941842affb0fec7068a8bd7adca77d8c036032 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=89941842affb0fec7068a8bd…
Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Mar 4 23:16:00 2019 +0100 d3dx9: Pass a struct d3dx_effect to get_annotation_from_object(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index e7b8b86..c621b21 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1246,9 +1246,10 @@ static D3DXHANDLE d3dx9_base_effect_get_pass_by_name(struct d3dx9_base_effect *b return NULL; } -static UINT get_annotation_from_object(struct d3dx9_base_effect *base, - D3DXHANDLE object, struct d3dx_parameter **annotations) +static unsigned int get_annotation_from_object(struct d3dx_effect *effect, D3DXHANDLE object, + struct d3dx_parameter **annotations) { + struct d3dx9_base_effect *base = &effect->base_effect; struct d3dx_parameter *param = get_valid_parameter(base, object); struct d3dx_pass *pass = get_valid_pass(base, object); struct d3dx_technique *technique = get_valid_technique(base, object); @@ -3472,7 +3473,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetAnnotation(ID3DXEffect *iface, D3DXHANDL TRACE("iface %p, object %p, index %u.\n", iface, object, index); - annotation_count = get_annotation_from_object(&effect->base_effect, object, &annotations); + annotation_count = get_annotation_from_object(effect, object, &annotations); if (index < annotation_count) { @@ -3501,7 +3502,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetAnnotationByName(ID3DXEffect *iface, D3D return NULL; } - annotation_count = get_annotation_from_object(&effect->base_effect, object, &annotations); + annotation_count = get_annotation_from_object(effect, object, &annotations); annotation = get_annotation_by_name(&effect->base_effect, annotation_count, annotations, name); if (annotation)
1
0
0
0
Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetAnnotationByName() helper.
by Alexandre Julliard
05 Mar '19
05 Mar '19
Module: wine Branch: master Commit: 1dd9104724b333fe27c2a1b7e57b31c29a252420 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=1dd9104724b333fe27c2a1b7…
Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Mar 4 23:15:59 2019 +0100 d3dx9: Merge the d3dx_effect_GetAnnotationByName() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 49 +++++++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ea35631..e7b8b86 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1286,33 +1286,6 @@ static UINT get_annotation_from_object(struct d3dx9_base_effect *base, } } -static D3DXHANDLE d3dx9_base_effect_get_annotation_by_name(struct d3dx9_base_effect *base, - D3DXHANDLE object, const char *name) -{ - struct d3dx_parameter *annotation = NULL; - struct d3dx_parameter *annotations = NULL; - UINT annotation_count = 0; - - if (!name) - { - WARN("Invalid argument specified\n"); - return NULL; - } - - annotation_count = get_annotation_from_object(base, object, &annotations); - - annotation = get_annotation_by_name(base, annotation_count, annotations, name); - if (annotation) - { - TRACE("Returning parameter %p\n", annotation); - return get_parameter_handle(annotation); - } - - WARN("Annotation not found.\n"); - - return NULL; -} - static BOOL walk_parameter_tree(struct d3dx_parameter *param, walk_parameter_dep_func param_func, void *data) { @@ -3516,10 +3489,30 @@ static D3DXHANDLE WINAPI d3dx_effect_GetAnnotationByName(ID3DXEffect *iface, D3D const char *name) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *annotation = NULL; + struct d3dx_parameter *annotations = NULL; + unsigned int annotation_count; TRACE("iface %p, object %p, name %s.\n", iface, object, debugstr_a(name)); - return d3dx9_base_effect_get_annotation_by_name(&effect->base_effect, object, name); + if (!name) + { + WARN("Invalid argument specified\n"); + return NULL; + } + + annotation_count = get_annotation_from_object(&effect->base_effect, object, &annotations); + + annotation = get_annotation_by_name(&effect->base_effect, annotation_count, annotations, name); + if (annotation) + { + TRACE("Returning parameter %p\n", annotation); + return get_parameter_handle(annotation); + } + + WARN("Annotation not found.\n"); + + return NULL; } static HRESULT WINAPI d3dx_effect_SetValue(ID3DXEffect *iface, D3DXHANDLE parameter,
1
0
0
0
Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetAnnotation() helper.
by Alexandre Julliard
05 Mar '19
05 Mar '19
Module: wine Branch: master Commit: 7a1df2b0069bde1a9a022c6454fb8b3e06181fd0 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=7a1df2b0069bde1a9a022c64…
Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Mar 4 23:15:58 2019 +0100 d3dx9: Merge the d3dx_effect_GetAnnotation() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index dda460d..ea35631 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1286,25 +1286,6 @@ static UINT get_annotation_from_object(struct d3dx9_base_effect *base, } } -static D3DXHANDLE d3dx9_base_effect_get_annotation(struct d3dx9_base_effect *base, - D3DXHANDLE object, UINT index) -{ - struct d3dx_parameter *annotations = NULL; - UINT annotation_count = 0; - - annotation_count = get_annotation_from_object(base, object, &annotations); - - if (index < annotation_count) - { - TRACE("Returning parameter %p\n", &annotations[index]); - return get_parameter_handle(&annotations[index]); - } - - WARN("Annotation not found.\n"); - - return NULL; -} - static D3DXHANDLE d3dx9_base_effect_get_annotation_by_name(struct d3dx9_base_effect *base, D3DXHANDLE object, const char *name) { @@ -3513,10 +3494,22 @@ static D3DXHANDLE WINAPI d3dx_effect_GetFunctionByName(ID3DXEffect *iface, const static D3DXHANDLE WINAPI d3dx_effect_GetAnnotation(ID3DXEffect *iface, D3DXHANDLE object, UINT index) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *annotations = NULL; + unsigned int annotation_count; TRACE("iface %p, object %p, index %u.\n", iface, object, index); - return d3dx9_base_effect_get_annotation(&effect->base_effect, object, index); + annotation_count = get_annotation_from_object(&effect->base_effect, object, &annotations); + + if (index < annotation_count) + { + TRACE("Returning parameter %p\n", &annotations[index]); + return get_parameter_handle(&annotations[index]); + } + + WARN("Annotation not found.\n"); + + return NULL; } static D3DXHANDLE WINAPI d3dx_effect_GetAnnotationByName(ID3DXEffect *iface, D3DXHANDLE object,
1
0
0
0
Vijay Kiran Kamuju : wmvcore: Add stub WMCreateBackupRestorer functions.
by Alexandre Julliard
05 Mar '19
05 Mar '19
Module: wine Branch: master Commit: e06d90fa3feadd5bbcf6e69f1fb7e45abff5e202 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=e06d90fa3feadd5bbcf6e69f…
Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Mon Mar 4 23:35:59 2019 +0100 wmvcore: Add stub WMCreateBackupRestorer functions. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=37325
Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/wmvcore.spec | 4 ++-- dlls/wmvcore/wmvcore_main.c | 12 ++++++++++++ include/wmsdkidl.idl | 4 ++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/wmvcore/wmvcore.spec b/dlls/wmvcore/wmvcore.spec index 66e5f20..65e0807 100644 --- a/dlls/wmvcore/wmvcore.spec +++ b/dlls/wmvcore/wmvcore.spec @@ -1,10 +1,10 @@ @ stdcall WMCheckURLExtension(wstr) @ stdcall WMCheckURLScheme(wstr) -@ stub WMCreateBackupRestorerPrivate +@ stdcall WMCreateBackupRestorerPrivate(ptr ptr) WMCreateBackupRestorer @ stub WMIsAvailableOffline @ stub WMValidateData @ stdcall -private DllRegisterServer() -@ stub WMCreateBackupRestorer +@ stdcall WMCreateBackupRestorer(ptr ptr) @ stdcall WMCreateEditor(ptr) @ stub WMCreateIndexer @ stdcall WMCreateProfileManager(ptr) diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index d7eb1eb..10ed18a 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -74,6 +74,18 @@ HRESULT WINAPI WMCreateEditor(IWMMetadataEditor **editor) return E_NOTIMPL; } +HRESULT WINAPI WMCreateBackupRestorer(IUnknown *callback, IWMLicenseBackup **licBackup) +{ + FIXME("(%p %p): stub\n", callback, licBackup); + + if (!callback) + return E_INVALIDARG; + + *licBackup = NULL; + + return E_NOTIMPL; +} + typedef struct { IWMProfileManager IWMProfileManager_iface; LONG ref; diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 8798f22..4ee166a 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -1893,6 +1893,10 @@ cpp_quote("HRESULT WINAPI WMCheckURLScheme(LPCWSTR);") cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") cpp_quote("HRESULT WINAPI WMCreateReader(IUnknown*,DWORD,IWMReader**);") cpp_quote("HRESULT WINAPI WMCreateSyncReader(IUnknown*,DWORD,IWMSyncReader**);") +cpp_quote("HRESULT WINAPI WMCreateEditor(IWMMetadataEditor**);") +cpp_quote("HRESULT WINAPI WMCreateBackupRestorer(IUnknown*,IWMLicenseBackup**);") +cpp_quote("HRESULT WINAPI WMCreateProfileManager(IWMProfileManager**);") + cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_Base, 0x00000000,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") cpp_quote("EXTERN_GUID(WMMEDIATYPE_Video, 0x73646976,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);")
1
0
0
0
Nikolay Sivov : mfplat: Implement buffer collection for sample.
by Alexandre Julliard
05 Mar '19
05 Mar '19
Module: wine Branch: master Commit: 851113b06fcde958782eeb342631794299bed924 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=851113b06fcde958782eeb34…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 5 10:49:42 2019 +0300 mfplat: Implement buffer collection for sample. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 127 +++++++++++++++++++++++++++++++++++++------ dlls/mfplat/main.c | 28 ---------- dlls/mfplat/mediatype.c | 1 - dlls/mfplat/mfplat_private.h | 29 ++++++++++ dlls/mfplat/queue.c | 1 - dlls/mfplat/tests/mfplat.c | 74 ++++++++++++++++++++++++- 6 files changed, 209 insertions(+), 51 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=851113b06fcde958782e…
1
0
0
0
Nikolay Sivov : mfplat: Move sample implementation together with buffers.
by Alexandre Julliard
05 Mar '19
05 Mar '19
Module: wine Branch: master Commit: 7343fc9e699ab72e0ad836ed71ce457c28d6467e URL:
https://source.winehq.org/git/wine.git/?a=commit;h=7343fc9e699ab72e0ad836ed…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 5 10:49:41 2019 +0300 mfplat: Move sample implementation together with buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 409 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/main.c | 444 --------------------------------------------------- 2 files changed, 409 insertions(+), 444 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=7343fc9e699ab72e0ad8…
1
0
0
0
Nikolay Sivov : mfplat: Move buffer implementation to separate file.
by Alexandre Julliard
05 Mar '19
05 Mar '19
Module: wine Branch: master Commit: 4fd32ad0543e312e52a49d6bff9ef311fe697432 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=4fd32ad0543e312e52a49d6b…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 5 10:49:40 2019 +0300 mfplat: Move buffer implementation to separate file. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/Makefile.in | 1 + dlls/mfplat/buffer.c | 216 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/main.c | 174 ------------------------------------ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 52 ++++++++--- include/mfapi.h | 16 ++++ 6 files changed, 273 insertions(+), 188 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=4fd32ad0543e312e52a4…
1
0
0
0
← Newer
1
...
82
83
84
85
86
87
88
...
110
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
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
Results per page:
10
25
50
100
200