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 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
972 discussions
Start a n
N
ew thread
Nikolay Sivov : msxml3: Stub lexical handler support for MXWriter.
by Alexandre Julliard
27 Jan '12
27 Jan '12
Module: wine Branch: master Commit: 32c96e6329e1a35fd8505edaacfff74238601ddc URL:
http://source.winehq.org/git/wine.git/?a=commit;h=32c96e6329e1a35fd8505edaa…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 27 14:45:21 2012 +0300 msxml3: Stub lexical handler support for MXWriter. --- dlls/msxml3/mxwriter.c | 159 +++++++++++++++++++++++++++++++++-------- dlls/msxml3/tests/saxreader.c | 21 +++++- 2 files changed, 146 insertions(+), 34 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=32c96e6329e1a35fd8505…
1
0
0
0
Nikolay Sivov : msxml3: Support comment nodes in MXWriter.
by Alexandre Julliard
27 Jan '12
27 Jan '12
Module: wine Branch: master Commit: ac96be9c08f28c05af330ea4586cb5f2f88d33f0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ac96be9c08f28c05af330ea45…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 27 15:13:54 2012 +0300 msxml3: Support comment nodes in MXWriter. --- dlls/msxml3/mxwriter.c | 19 ++++++++++++-- dlls/msxml3/tests/saxreader.c | 55 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 82f7ebd..a94fa51 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1155,11 +1155,24 @@ static HRESULT WINAPI SAXLexicalHandler_endCDATA(ISAXLexicalHandler *iface) return E_NOTIMPL; } -static HRESULT WINAPI SAXLexicalHandler_comment(ISAXLexicalHandler *iface, const WCHAR *chars, int len) +static HRESULT WINAPI SAXLexicalHandler_comment(ISAXLexicalHandler *iface, const WCHAR *chars, int nchars) { mxwriter *This = impl_from_ISAXLexicalHandler( iface ); - FIXME("(%p)->(%s): stub\n", This, debugstr_wn(chars, len)); - return E_NOTIMPL; + static const WCHAR copenW[] = {'<','!','-','-'}; + static const WCHAR ccloseW[] = {'-','-','>','\r','\n'}; + + TRACE("(%p)->(%s:%d)\n", This, debugstr_wn(chars, nchars), nchars); + + if (!chars) return E_INVALIDARG; + + close_element_starttag(This); + + write_output_buffer(This->buffer, copenW, sizeof(copenW)/sizeof(WCHAR)); + if (nchars) + write_output_buffer(This->buffer, chars, nchars); + write_output_buffer(This->buffer, ccloseW, sizeof(ccloseW)/sizeof(WCHAR)); + + return S_OK; } static const struct ISAXLexicalHandlerVtbl SAXLexicalHandlerVtbl = diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 33eefff..d05596e 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2851,6 +2851,60 @@ static void test_mxwriter_dispex(void) IMXWriter_Release(writer); } +static void test_mxwriter_comment(void) +{ + static const WCHAR commentW[] = {'c','o','m','m','e','n','t',0}; + ISAXContentHandler *content; + ISAXLexicalHandler *lexical; + IMXWriter *writer; + VARIANT dest; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXLexicalHandler, (void**)&lexical); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_put_omitXMLDeclaration(writer, VARIANT_TRUE); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startDocument(content); + EXPECT_HR(hr, S_OK); + + hr = ISAXLexicalHandler_comment(lexical, NULL, 0); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXLexicalHandler_comment(lexical, commentW, 0); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("<!---->\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + hr = ISAXLexicalHandler_comment(lexical, commentW, sizeof(commentW)/sizeof(WCHAR)-1); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("<!---->\r\n<!--comment-->\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + ISAXContentHandler_Release(content); + ISAXLexicalHandler_Release(lexical); + IMXWriter_Release(writer); + free_bstrs(); +} + START_TEST(saxreader) { ISAXXMLReader *reader; @@ -2886,6 +2940,7 @@ START_TEST(saxreader) test_mxwriter_startenddocument(); test_mxwriter_startendelement(); test_mxwriter_characters(); + test_mxwriter_comment(); test_mxwriter_properties(); test_mxwriter_flush(); test_mxwriter_stream();
1
0
0
0
Jacek Caban : jscript: Get rid of unused SET_CALLED macro.
by Alexandre Julliard
27 Jan '12
27 Jan '12
Module: wine Branch: master Commit: 2830a21e1daadd511099802d3a0f6c4f1a587691 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2830a21e1daadd511099802d3…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 11:45:46 2012 +0100 jscript: Get rid of unused SET_CALLED macro. --- dlls/jscript/tests/activex.c | 3 --- dlls/jscript/tests/jscript.c | 3 --- dlls/jscript/tests/run.c | 3 --- 3 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/tests/activex.c b/dlls/jscript/tests/activex.c index 1508ca0..dc90d91 100644 --- a/dlls/jscript/tests/activex.c +++ b/dlls/jscript/tests/activex.c @@ -39,9 +39,6 @@ static const CLSID CLSID_JScript = #define SET_EXPECT(func) \ expect_ ## func = TRUE -#define SET_CALLED(func) \ - called_ ## func = TRUE - #define CHECK_EXPECT2(func) \ do { \ ok(expect_ ##func, "unexpected call " #func "\n"); \ diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 7c81328..c453971 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -38,9 +38,6 @@ static const CLSID CLSID_JScript = #define SET_EXPECT(func) \ expect_ ## func = TRUE -#define SET_CALLED(func) \ - called_ ## func = TRUE - #define CHECK_EXPECT2(func) \ do { \ ok(expect_ ##func, "unexpected call " #func "\n"); \ diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index e5bd072..f83cedd 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -36,9 +36,6 @@ static const CLSID CLSID_JScript = #define SET_EXPECT(func) \ expect_ ## func = TRUE -#define SET_CALLED(func) \ - called_ ## func = TRUE - #define CHECK_EXPECT2(func) \ do { \ ok(expect_ ##func, "unexpected call " #func "\n"); \
1
0
0
0
Jacek Caban : vbscript: Get rid of unused SET_CALLED macro.
by Alexandre Julliard
27 Jan '12
27 Jan '12
Module: wine Branch: master Commit: 613c276ca3e37d195caa70565ee6acb10111ba93 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=613c276ca3e37d195caa70565…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 11:43:12 2012 +0100 vbscript: Get rid of unused SET_CALLED macro. --- dlls/vbscript/tests/createobj.c | 3 --- dlls/vbscript/tests/run.c | 3 --- dlls/vbscript/tests/vbscript.c | 3 --- 3 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/vbscript/tests/createobj.c b/dlls/vbscript/tests/createobj.c index b869d07..bbf53ee 100644 --- a/dlls/vbscript/tests/createobj.c +++ b/dlls/vbscript/tests/createobj.c @@ -38,9 +38,6 @@ extern const CLSID CLSID_VBScript; #define SET_EXPECT(func) \ expect_ ## func = TRUE -#define SET_CALLED(func) \ - called_ ## func = TRUE - #define CHECK_EXPECT2(func) \ do { \ ok(expect_ ##func, "unexpected call " #func "\n"); \ diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 9fa4240..43c9be4 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -35,9 +35,6 @@ extern const CLSID CLSID_VBScript; #define SET_EXPECT(func) \ expect_ ## func = TRUE -#define SET_CALLED(func) \ - called_ ## func = TRUE - #define CHECK_EXPECT2(func) \ do { \ ok(expect_ ##func, "unexpected call " #func "\n"); \ diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index 431f815..d4c4ec5 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -35,9 +35,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #define SET_EXPECT(func) \ expect_ ## func = TRUE -#define SET_CALLED(func) \ - called_ ## func = TRUE - #define CHECK_EXPECT2(func) \ do { \ ok(expect_ ##func, "unexpected call " #func "\n"); \
1
0
0
0
Jacek Caban : wscript: Properly handle CreateProcess failure.
by Alexandre Julliard
27 Jan '12
27 Jan '12
Module: wine Branch: master Commit: 9f7da94a3d02a82ff61e0c134f428857ebaa467f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9f7da94a3d02a82ff61e0c134…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 11:43:02 2012 +0100 wscript: Properly handle CreateProcess failure. --- programs/wscript/tests/run.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index 163be22..315f51f 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -34,8 +34,8 @@ #define SET_EXPECT(func) \ expect_ ## func = TRUE -#define SET_CALLED(func) \ - called_ ## func = TRUE +#define CLEAR_CALLED(func) \ + expect_ ## func = called_ ## func = FALSE #define CHECK_EXPECT2(func) \ do { \ @@ -355,7 +355,7 @@ static void run_test(const char *file_name) bres = CreateProcessA(NULL, command, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi); if(!bres) { win_skip("script.exe is not available\n"); - SET_CALLED(reportSuccess); + CLEAR_CALLED(reportSuccess); return; }
1
0
0
0
Olli-Pekka Wallin : winscard: Add new stub methods.
by Alexandre Julliard
27 Jan '12
27 Jan '12
Module: wine Branch: master Commit: e8e45b3454de40681c00a00225fda706e55a19ea URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e8e45b3454de40681c00a0022…
Author: Olli-Pekka Wallin <extolli-pekka.wallin(a)ixonos.com> Date: Wed Jan 25 09:44:00 2012 +0200 winscard: Add new stub methods. --- dlls/winscard/winscard.c | 14 ++++++++++++++ dlls/winscard/winscard.spec | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index 412299c..473d5f3 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -116,6 +116,20 @@ LONG WINAPI SCardReleaseContext(SCARDCONTEXT context) return SCARD_F_INTERNAL_ERROR; } +LONG WINAPI SCardStatusA(SCARDHANDLE context, LPSTR szReaderName, LPDWORD pcchReaderLen, LPDWORD pdwState, LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen) +{ + FIXME("(%lx) stub\n", context); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_INTERNAL_ERROR; +} + +LONG WINAPI SCardStatusW(SCARDHANDLE context, LPWSTR szReaderName, LPDWORD pcchReaderLen, LPDWORD pdwState,LPDWORD pdwProtocol,LPBYTE pbAtr,LPDWORD pcbArtLen) +{ + FIXME("(%lx) stub\n", context); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_INTERNAL_ERROR; +} + void WINAPI SCardReleaseStartedEvent(void) { FIXME("stub\n"); diff --git a/dlls/winscard/winscard.spec b/dlls/winscard/winscard.spec index 1bd6ef1..8ecf988 100644 --- a/dlls/winscard/winscard.spec +++ b/dlls/winscard/winscard.spec @@ -55,8 +55,8 @@ @ stub SCardSetCardTypeProviderNameA @ stub SCardSetCardTypeProviderNameW @ stub SCardState -@ stub SCardStatusA -@ stub SCardStatusW +@ stdcall SCardStatusA (long str long long long ptr long ) +@ stdcall SCardStatusW (long wstr long long long ptr long ) @ stub SCardTransmit @ extern g_rgSCardRawPci @ extern g_rgSCardT0Pci
1
0
0
0
Rico Schüller : d3dx9/tests: Add invalid parameter test for ID3DXEffect.
by Alexandre Julliard
27 Jan '12
27 Jan '12
Module: wine Branch: master Commit: 49ebbd023058ad5e502fc6d8872bc24cbe4643c6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=49ebbd023058ad5e502fc6d88…
Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Jan 27 10:31:49 2012 +0100 d3dx9/tests: Add invalid parameter test for ID3DXEffect. --- dlls/d3dx9_36/tests/effect.c | 156 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 156 insertions(+), 0 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=49ebbd023058ad5e502fc…
1
0
0
0
Rico Schüller : d3dx9/tests: Add effect parameter value SetMatrixTransposeArray() test.
by Alexandre Julliard
27 Jan '12
27 Jan '12
Module: wine Branch: master Commit: cf512fdf13ab596aa29105576160e7633cb6fe17 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=cf512fdf13ab596aa29105576…
Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Jan 27 10:31:43 2012 +0100 d3dx9/tests: Add effect parameter value SetMatrixTransposeArray() test. --- dlls/d3dx9_36/tests/effect.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 5ff41a2..d0f2f00 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -2005,6 +2005,47 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) } test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); + + /* SetMatrixTransposeArray */ + for (element = 0; element < res_desc->Elements + 1; ++element) + { + fvalue = 1.33; + for (l = 0; l < element * 16; ++l) + { + *(input_value + l) = *(DWORD *)&fvalue; + fvalue += 1.12; + } + memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); + hr = effect->lpVtbl->SetMatrixTransposeArray(effect, parameter, (D3DXMATRIX *)input_value, element); + if (res_desc->Class == D3DXPC_MATRIX_ROWS && element <= res_desc->Elements) + { + UINT n; + + for (n = 0; n < element; ++n) + { + for (l = 0; l < 4; ++l) + { + UINT m; + + for (m = 0; m < 4; ++m) + { + if (m < res_desc->Rows && l < res_desc->Columns) + set_number(expected_value + l + m * res_desc->Columns + n * res_desc->Columns * res_desc->Rows, + res_desc->Type, input_value + l * 4 + m + n * 16, D3DXPT_FLOAT); + } + + } + } + ok(hr == D3D_OK, "%u - %s: SetMatrixTransposeArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixTransposeArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + } + test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); + test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); + } } count = effect->lpVtbl->Release(effect);
1
0
0
0
Rico Schüller : d3dx9/tests: Add effect parameter value SetMatrixTranspose() test.
by Alexandre Julliard
27 Jan '12
27 Jan '12
Module: wine Branch: master Commit: 0ae7c573b1529b1b6a7929319f4af6e19348d263 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0ae7c573b1529b1b6a7929319…
Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Jan 27 10:31:38 2012 +0100 d3dx9/tests: Add effect parameter value SetMatrixTranspose() test. --- dlls/d3dx9_36/tests/effect.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 31edcb6..5ff41a2 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1972,6 +1972,39 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); } + + /* SetMatrixTranspose */ + fvalue = 1.33; + for (l = 0; l < 16; ++l) + { + *(input_value + l) = *(DWORD *)&fvalue; + fvalue += 1.12; + } + memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); + hr = effect->lpVtbl->SetMatrixTranspose(effect, parameter, (D3DXMATRIX *)input_value); + if (!res_desc->Elements && res_desc->Class == D3DXPC_MATRIX_ROWS) + { + for (l = 0; l < 4; ++l) + { + UINT m; + + for (m = 0; m < 4; ++m) + { + if (m < res_desc->Rows && l < res_desc->Columns) + set_number(expected_value + l + m * res_desc->Columns, res_desc->Type, + input_value + l * 4 + m, D3DXPT_FLOAT); + } + + } + ok(hr == D3D_OK, "%u - %s: SetMatrixTranspose failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixTranspose failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + } + test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); + test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);
1
0
0
0
Austin English : advapi32: Add a stub for EnumerateTraceGuids.
by Alexandre Julliard
27 Jan '12
27 Jan '12
Module: wine Branch: master Commit: 5930590ed220345695cb5111de536fa87192793e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5930590ed220345695cb5111d…
Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jan 26 14:35:25 2012 -0800 advapi32: Add a stub for EnumerateTraceGuids. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/eventlog.c | 10 ++++++++++ include/evntrace.h | 9 +++++++++ 3 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 89e628e..68a5384 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -214,7 +214,7 @@ @ stdcall EnumServicesStatusExA(long long long long ptr long ptr ptr ptr str) @ stdcall EnumServicesStatusExW(long long long long ptr long ptr ptr ptr wstr) @ stdcall EnumServicesStatusW (long long long ptr long ptr ptr ptr) -# @ stub EnumerateTraceGuids +@ stdcall EnumerateTraceGuids(ptr long ptr) # @ stub EqualDomainSid @ stdcall EqualPrefixSid(ptr ptr) @ stdcall EqualSid(ptr ptr) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 8e1a9da..8ec5cd2 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -917,3 +917,13 @@ ULONG WINAPI CloseTrace( TRACEHANDLE handle ) FIXME("%s: stub\n", wine_dbgstr_longlong(handle)); return ERROR_INVALID_HANDLE; } + +/****************************************************************************** + * EnumerateTraceGuids [ADVAPI32.@] + */ +ULONG WINAPI EnumerateTraceGuids(PTRACE_GUID_PROPERTIES *propertiesarray, + ULONG arraycount, PULONG guidcount) +{ + FIXME("%p %d %p: stub\n", propertiesarray, arraycount, guidcount); + return ERROR_INVALID_PARAMETER; +} diff --git a/include/evntrace.h b/include/evntrace.h index e0c3f21..1516485 100644 --- a/include/evntrace.h +++ b/include/evntrace.h @@ -49,6 +49,15 @@ typedef struct _TRACE_GUID_REGISTRATION HANDLE RegHandle; } TRACE_GUID_REGISTRATION, *PTRACE_GUID_REGISTRATION; +typedef struct _TRACE_GUID_PROPERTIES { + GUID Guid; + ULONG GuidType; + ULONG LoggerId; + ULONG EnableLevel; + ULONG EnableFlags; + BOOLEAN IsEnable; +} TRACE_GUID_PROPERTIES, *PTRACE_GUID_PROPERTIES; + typedef struct _EVENT_TRACE_HEADER { USHORT Size;
1
0
0
0
← Newer
1
...
6
7
8
9
10
11
12
...
98
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
Results per page:
10
25
50
100
200