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
Henri Verbeet : wined3d: Get rid of the surface_type parameter to wined3d_check_device_format().
by Alexandre Julliard
17 Jan '13
17 Jan '13
Module: wine Branch: master Commit: 1249976eb69343b086ac4d0c1f332ee8b4051c7c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1249976eb69343b086ac4d0c1…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 17 10:24:28 2013 +0100 wined3d: Get rid of the surface_type parameter to wined3d_check_device_format(). --- dlls/d3d8/directx.c | 2 +- dlls/d3d9/directx.c | 2 +- dlls/ddraw/ddraw.c | 34 +++++++++++++++------------------- dlls/ddraw/ddraw_private.h | 14 +++++++------- dlls/ddraw/device.c | 17 +++++++---------- dlls/ddraw/main.c | 10 +++++----- dlls/wined3d/directx.c | 22 ++++++++++------------ dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 9 +-------- 9 files changed, 48 insertions(+), 64 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=1249976eb69343b086ac4…
1
0
0
0
Henri Verbeet : wined3d: Get rid of the surface_type parameter to wined3d_surface_create().
by Alexandre Julliard
17 Jan '13
17 Jan '13
Module: wine Branch: master Commit: ce912d5149d6e0b0cb7903400f82e6b54fcffbdc URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ce912d5149d6e0b0cb7903400…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 17 10:24:27 2013 +0100 wined3d: Get rid of the surface_type parameter to wined3d_surface_create(). --- dlls/d3d10core/device.c | 3 +- dlls/d3d8/surface.c | 2 +- dlls/d3d9/surface.c | 2 +- dlls/ddraw/ddraw.c | 6 ++-- dlls/ddraw/surface.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 45 +++++++++++---------------------------- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 1 - include/wine/wined3d.h | 5 +-- 10 files changed, 24 insertions(+), 46 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=ce912d5149d6e0b0cb790…
1
0
0
0
Henri Verbeet : ddraw: Avoid LPD3DCLIPSTATUS.
by Alexandre Julliard
17 Jan '13
17 Jan '13
Module: wine Branch: master Commit: aa4b4e8ab2d353adde4829da6205731941f306d7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=aa4b4e8ab2d353adde4829da6…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 17 10:24:26 2013 +0100 ddraw: Avoid LPD3DCLIPSTATUS. --- include/d3d.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 2ee638e..b3d765d 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -1056,8 +1056,8 @@ DECLARE_INTERFACE_(IDirect3DDevice2,IUnknown) STDMETHOD(MultiplyTransform)(THIS_ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) PURE; STDMETHOD(DrawPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, D3DVERTEXTYPE d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, DWORD dwFlags) PURE; STDMETHOD(DrawIndexedPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, D3DVERTEXTYPE d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, LPWORD dwIndices, DWORD dwIndexCount, DWORD dwFlags) PURE; - STDMETHOD(SetClipStatus)(THIS_ LPD3DCLIPSTATUS lpD3DClipStatus) PURE; - STDMETHOD(GetClipStatus)(THIS_ LPD3DCLIPSTATUS lpD3DClipStatus) PURE; + STDMETHOD(SetClipStatus)(THIS_ D3DCLIPSTATUS *clip_status) PURE; + STDMETHOD(GetClipStatus)(THIS_ D3DCLIPSTATUS *clip_status) PURE; }; #undef INTERFACE @@ -1175,8 +1175,8 @@ DECLARE_INTERFACE_(IDirect3DDevice3,IUnknown) STDMETHOD(MultiplyTransform)(THIS_ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) PURE; STDMETHOD(DrawPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, DWORD d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, DWORD dwFlags) PURE; STDMETHOD(DrawIndexedPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, DWORD d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, LPWORD dwIndices, DWORD dwIndexCount, DWORD dwFlags) PURE; - STDMETHOD(SetClipStatus)(THIS_ LPD3DCLIPSTATUS lpD3DClipStatus) PURE; - STDMETHOD(GetClipStatus)(THIS_ LPD3DCLIPSTATUS lpD3DClipStatus) PURE; + STDMETHOD(SetClipStatus)(THIS_ D3DCLIPSTATUS *clip_status) PURE; + STDMETHOD(GetClipStatus)(THIS_ D3DCLIPSTATUS *clip_status) PURE; STDMETHOD(DrawPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexType,LPD3DDRAWPRIMITIVESTRIDEDDATA lpD3DDrawPrimStrideData,DWORD dwVertexCount,DWORD dwFlags) PURE; STDMETHOD(DrawIndexedPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexType,LPD3DDRAWPRIMITIVESTRIDEDDATA lpD3DDrawPrimStrideData,DWORD dwVertexCount,LPWORD lpIndex,DWORD dwIndexCount,DWORD dwFlags) PURE; STDMETHOD(DrawPrimitiveVB)(THIS_ D3DPRIMITIVETYPE primitive_type, struct IDirect3DVertexBuffer *vb, @@ -1320,8 +1320,8 @@ DECLARE_INTERFACE_(IDirect3DDevice7,IUnknown) STDMETHOD(PreLoad)(THIS_ IDirectDrawSurface7 *surface) PURE; STDMETHOD(DrawPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, DWORD d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, DWORD dwFlags) PURE; STDMETHOD(DrawIndexedPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, DWORD d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, LPWORD dwIndices, DWORD dwIndexCount, DWORD dwFlags) PURE; - STDMETHOD(SetClipStatus)(THIS_ LPD3DCLIPSTATUS lpD3DClipStatus) PURE; - STDMETHOD(GetClipStatus)(THIS_ LPD3DCLIPSTATUS lpD3DClipStatus) PURE; + STDMETHOD(SetClipStatus)(THIS_ D3DCLIPSTATUS *clip_status) PURE; + STDMETHOD(GetClipStatus)(THIS_ D3DCLIPSTATUS *clip_status) PURE; STDMETHOD(DrawPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexType,LPD3DDRAWPRIMITIVESTRIDEDDATA lpD3DDrawPrimStrideData,DWORD dwVertexCount,DWORD dwFlags) PURE; STDMETHOD(DrawIndexedPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexType,LPD3DDRAWPRIMITIVESTRIDEDDATA lpD3DDrawPrimStrideData,DWORD dwVertexCount,LPWORD lpIndex,DWORD dwIndexCount,DWORD dwFlags) PURE; STDMETHOD(DrawPrimitiveVB)(THIS_ D3DPRIMITIVETYPE primitive_type, struct IDirect3DVertexBuffer7 *vb,
1
0
0
0
Henri Verbeet : ddraw: Avoid LPD3DSTATUS.
by Alexandre Julliard
17 Jan '13
17 Jan '13
Module: wine Branch: master Commit: 8e7590e22fdd941a5fd895096acab49bbc37ed06 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=8e7590e22fdd941a5fd895096…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 17 10:24:25 2013 +0100 ddraw: Avoid LPD3DSTATUS. --- dlls/ddraw/executebuffer.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index b86495f..2925cfa 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -512,13 +512,11 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, DWORD i; TRACE("SETSTATUS (%d)\n", count); - for (i = 0; i < count; i++) { - LPD3DSTATUS ci = (LPD3DSTATUS) instr; - - buffer->data.dsStatus = *ci; - - instr += size; - } + for (i = 0; i < count; ++i) + { + buffer->data.dsStatus = *(D3DSTATUS *)instr; + instr += size; + } } break; default:
1
0
0
0
Damjan Jovanovic : quartz: return the IMemAllocator so the BaseOutputPin can store it and use it, avoiding a NULL pointer crash.
by Alexandre Julliard
17 Jan '13
17 Jan '13
Module: wine Branch: master Commit: 4bb45afc3fc8387b9726c6315888a6902fcafa06 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4bb45afc3fc8387b9726c6315…
Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jan 17 07:40:39 2013 +0200 quartz: return the IMemAllocator so the BaseOutputPin can store it and use it, avoiding a NULL pointer crash. --- dlls/quartz/parser.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index da9b4b1..f0b1b93 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -595,7 +595,14 @@ static HRESULT WINAPI Parser_OutputPin_DecideAllocator(BaseOutputPin *iface, IMe *pAlloc = NULL; if (This->alloc) + { hr = IMemInputPin_NotifyAllocator(pPin, This->alloc, This->readonly); + if (SUCCEEDED(hr)) + { + *pAlloc = This->alloc; + IMemAllocator_AddRef(*pAlloc); + } + } else hr = VFW_E_NO_ALLOCATOR; @@ -661,6 +668,8 @@ static ULONG WINAPI Parser_OutputPin_Release(IPin * iface) FreeMediaType(This->pmt); CoTaskMemFree(This->pmt); FreeMediaType(&This->pin.pin.mtCurrent); + if (This->pin.pAllocator) + IMemAllocator_Release(This->pin.pAllocator); CoTaskMemFree(This); return 0; }
1
0
0
0
Damjan Jovanovic : Return the IMemAllocator so the BaseOutputPin can store it and use it, avoiding a NULL pointer crash.
by Alexandre Julliard
17 Jan '13
17 Jan '13
Module: wine Branch: master Commit: 8337959c78c815593904f0ff920354e50be19dc7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=8337959c78c815593904f0ff9…
Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jan 17 07:39:17 2013 +0200 Return the IMemAllocator so the BaseOutputPin can store it and use it, avoiding a NULL pointer crash. --- dlls/wineqtdecoder/qtsplitter.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index a3cd91f..03cc8a9 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -1352,6 +1352,8 @@ static ULONG WINAPI QTOutPin_Release(IPin *iface) { DeleteMediaType(This->pmt); FreeMediaType(&This->pin.pin.mtCurrent); + if (This->pin.pAllocator) + IMemAllocator_Release(This->pin.pAllocator); CoTaskMemFree(This); return 0; } @@ -1384,7 +1386,14 @@ static HRESULT WINAPI QTOutPin_DecideAllocator(BaseOutputPin *iface, IMemInputPi *pAlloc = NULL; if (QTfilter->pInputPin.pAlloc) + { hr = IMemInputPin_NotifyAllocator(pPin, QTfilter->pInputPin.pAlloc, FALSE); + if (SUCCEEDED(hr)) + { + *pAlloc = QTfilter->pInputPin.pAlloc; + IMemAllocator_AddRef(*pAlloc); + } + } else hr = VFW_E_NO_ALLOCATOR;
1
0
0
0
Damjan Jovanovic : winegstreamer: return the IMemAllocator so the BaseOutputPin can store it and use it, avoiding a NULL pointer crash.
by Alexandre Julliard
17 Jan '13
17 Jan '13
Module: wine Branch: master Commit: 4bdfa7f864553c478890fd9607c742f20f24034b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4bdfa7f864553c478890fd960…
Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jan 17 07:38:12 2013 +0200 winegstreamer: return the IMemAllocator so the BaseOutputPin can store it and use it, avoiding a NULL pointer crash. --- dlls/winegstreamer/gstdemux.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 41158ff..52935d0 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1478,6 +1478,8 @@ static ULONG WINAPI GSTOutPin_Release(IPin *iface) { DeleteMediaType(This->pmt); FreeMediaType(&This->pin.pin.mtCurrent); gst_segment_free(This->segment); + if (This->pin.pAllocator) + IMemAllocator_Release(This->pin.pAllocator); CoTaskMemFree(This); return 0; } @@ -1510,7 +1512,14 @@ static HRESULT WINAPI GSTOutPin_DecideAllocator(BaseOutputPin *iface, IMemInputP *pAlloc = NULL; if (GSTfilter->pInputPin.pAlloc) + { hr = IMemInputPin_NotifyAllocator(pPin, GSTfilter->pInputPin.pAlloc, FALSE); + if (SUCCEEDED(hr)) + { + *pAlloc = GSTfilter->pInputPin.pAlloc; + IMemAllocator_AddRef(*pAlloc); + } + } else hr = VFW_E_NO_ALLOCATOR;
1
0
0
0
Alexandre Julliard : libport: Always include the interlocked_cmpxchg128 fallback.
by Alexandre Julliard
17 Jan '13
17 Jan '13
Module: wine Branch: master Commit: 3a4281708ad05d1bab8752f2c79640e160778cfb URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3a4281708ad05d1bab8752f2c…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 17 12:21:14 2013 +0100 libport: Always include the interlocked_cmpxchg128 fallback. --- libs/port/interlocked.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/libs/port/interlocked.c b/libs/port/interlocked.c index 135bfc1..576714a 100644 --- a/libs/port/interlocked.c +++ b/libs/port/interlocked.c @@ -343,7 +343,6 @@ int interlocked_xchg_add( int *dest, int incr ) return retv; } -#ifdef _WIN64 int interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ) { int retv; @@ -363,6 +362,5 @@ int interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high, __int64 xchg_low, pthread_mutex_unlock( &interlocked_mutex ); return retv; } -#endif #endif
1
0
0
0
Detlef Riekenberg : ntdll/tests: Fix SYSTEM_CACHE_INFORMATION failures.
by Alexandre Julliard
17 Jan '13
17 Jan '13
Module: wine Branch: master Commit: 3e162934d172d8099cfc1dbbe90bf6564f023f15 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3e162934d172d8099cfc1dbbe…
Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jan 16 23:56:43 2013 +0100 ntdll/tests: Fix SYSTEM_CACHE_INFORMATION failures. --- dlls/ntdll/tests/info.c | 53 ++++++++++++++++++++++++++++++++++++++-------- include/winternl.h | 3 +- 2 files changed, 45 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 47e5587..87f3c9c 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -505,18 +505,51 @@ static void test_query_cache(void) { NTSTATUS status; ULONG ReturnLength; - SYSTEM_CACHE_INFORMATION sci; - - status = pNtQuerySystemInformation(SystemCacheInformation, &sci, 0, &ReturnLength); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + BYTE buffer[128]; + SYSTEM_CACHE_INFORMATION *sci = (SYSTEM_CACHE_INFORMATION *) buffer; + ULONG expected; + INT i; + + /* the large SYSTEM_CACHE_INFORMATION on WIN64 is not documented */ + expected = sizeof(SYSTEM_CACHE_INFORMATION); + for (i = sizeof(buffer); i>= expected; i--) + { + ReturnLength = 0xdeadbeef; + status = pNtQuerySystemInformation(SystemCacheInformation, sci, i, &ReturnLength); + ok(!status && (ReturnLength == expected), + "%d: got 0x%x and %u (expected STATUS_SUCCESS and %u)\n", i, status, ReturnLength, expected); + } - status = pNtQuerySystemInformation(SystemCacheInformation, &sci, sizeof(sci), &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( sizeof(sci) == ReturnLength, "Inconsistent length %d\n", ReturnLength); + /* buffer too small for the full result. + Up to win7, the function succeeds with a partial result. */ + status = pNtQuerySystemInformation(SystemCacheInformation, sci, i, &ReturnLength); + if (!status) + { + expected = offsetof(SYSTEM_CACHE_INFORMATION, MinimumWorkingSet); + for (; i>= expected; i--) + { + ReturnLength = 0xdeadbeef; + status = pNtQuerySystemInformation(SystemCacheInformation, sci, i, &ReturnLength); + ok(!status && (ReturnLength == expected), + "%d: got 0x%x and %u (expected STATUS_SUCCESS and %u)\n", i, status, ReturnLength, expected); + } + } - status = pNtQuerySystemInformation(SystemCacheInformation, &sci, sizeof(sci) + 2, &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( sizeof(sci) == ReturnLength, "Inconsistent length %d\n", ReturnLength); + /* buffer too small for the result, this call will always fail */ + ReturnLength = 0xdeadbeef; + status = pNtQuerySystemInformation(SystemCacheInformation, sci, i, &ReturnLength); + ok( status == STATUS_INFO_LENGTH_MISMATCH && + ((ReturnLength == expected) || broken(!ReturnLength) || broken(ReturnLength == 0xfffffff0)), + "%d: got 0x%x and %u (expected STATUS_INFO_LENGTH_MISMATCH and %u)\n", i, status, ReturnLength, expected); + + if (0) { + /* this crashes on some vista / win7 machines */ + ReturnLength = 0xdeadbeef; + status = pNtQuerySystemInformation(SystemCacheInformation, sci, 0, &ReturnLength); + ok( status == STATUS_INFO_LENGTH_MISMATCH && + ((ReturnLength == expected) || broken(!ReturnLength) || broken(ReturnLength == 0xfffffff0)), + "0: got 0x%x and %u (expected STATUS_INFO_LENGTH_MISMATCH and %u)\n", status, ReturnLength, expected); + } } static void test_query_interrupt(void) diff --git a/include/winternl.h b/include/winternl.h index 79078f0..b45a56c 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1287,10 +1287,11 @@ typedef struct _SYSTEM_CACHE_INFORMATION { ULONG CurrentSize; ULONG PeakSize; ULONG PageFaultCount; -#ifndef _WIN64 ULONG MinimumWorkingSet; ULONG MaximumWorkingSet; ULONG unused[4]; +#ifdef _WIN64 + ULONG unknown64[7]; #endif } SYSTEM_CACHE_INFORMATION, *PSYSTEM_CACHE_INFORMATION;
1
0
0
0
Rico Schüller : d3dx9/tests: Use D3DXFloat16To32Array( ) instead of a custom function.
by Alexandre Julliard
17 Jan '13
17 Jan '13
Module: wine Branch: master Commit: 2fb6dcb3f220158756c4571e7c7298d2f803dff5 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2fb6dcb3f220158756c4571e7…
Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jan 16 22:12:51 2013 +0100 d3dx9/tests: Use D3DXFloat16To32Array() instead of a custom function. --- dlls/d3dx9_36/tests/texture.c | 24 ++---------------------- 1 files changed, 2 insertions(+), 22 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 28fb47e..5f51db1 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -106,24 +106,6 @@ static inline void expect_vec4_(unsigned int line, const D3DXVECTOR4 *expected, got->x, got->y, got->z, got->w); } -static inline float float_16_to_32(unsigned short in) -{ - unsigned short s = (in & 0x8000); - unsigned short e = (in & 0x7C00) >> 10; - unsigned short m = in & 0x3FF; - float sgn = (s ? -1.0f : 1.0f); - - if (e == 0) - { - if (m == 0) return sgn * 0.0f; /* +0.0 or -0.0 */ - else return sgn * powf(2, -14.0f) * (m / 1024.0f); - } - else - { - return sgn * powf(2, e - 15.0f) * (1.0f + (m / 1024.0f)); - } -} - static BOOL is_autogenmipmap_supported(IDirect3DDevice9 *device, D3DRESOURCETYPE resource_type) { HRESULT hr; @@ -1071,10 +1053,8 @@ static void test_D3DXFillTexture(IDirect3DDevice9 *device) { D3DXVECTOR4 got, expected; - got.x = float_16_to_32(*ptr++); - got.y = float_16_to_32(*ptr++); - got.z = float_16_to_32(*ptr++); - got.w = float_16_to_32(*ptr++); + D3DXFloat16To32Array((FLOAT *)&got, (D3DXFLOAT16 *)ptr, 4); + ptr += 4; expected.x = (x + 0.5f) / 4.0f; expected.y = (y + 0.5f) / 4.0f;
1
0
0
0
← Newer
1
...
32
33
34
35
36
37
38
...
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