ReactOS.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
2024
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
List overview
Download
Ros-diffs
August 2008
----- 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
ros-diffs@reactos.org
27 participants
853 discussions
Start a n
N
ew thread
[gbrunmar] 35594: D3D9: * Implemented IDirect3DSwapChain9::GetDevice() and GetPresentParameters() * Added helper function to D3D9BaseObject to convert IUnknown* to IDirect3D9Device* * Fixed behavior in IDirect3DDevice9::GetSwapChain() when an invalid index was specified
by gbrunmar@svn.reactos.org
Author: gbrunmar Date: Sun Aug 24 06:18:30 2008 New Revision: 35594 URL:
http://svn.reactos.org/svn/reactos?rev=35594&view=rev
Log: D3D9: * Implemented IDirect3DSwapChain9::GetDevice() and GetPresentParameters() * Added helper function to D3D9BaseObject to convert IUnknown* to IDirect3D9Device* * Fixed behavior in IDirect3DDevice9::GetSwapChain() when an invalid index was specified Modified: trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h trunk/reactos/dll/directx/d3d9/d3d9_device.c trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c trunk/reactos/dll/directx/d3d9/d3d9_swapchain.h Modified: trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_base…
============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c [iso-8859-1] Sun Aug 24 06:18:30 2008 @@ -61,3 +61,13 @@ return Ref; } + +HRESULT D3D9BaseObject_GetDevice(D3D9BaseObject* pBaseObject, IDirect3DDevice9** ppDevice) +{ + if (pBaseObject->pUnknown) + { + return pBaseObject->pUnknown->lpVtbl->QueryInterface((IUnknown*) &pBaseObject->pUnknown->lpVtbl, &IID_IDirect3DDevice9, (void**)ppDevice); + } + + return E_NOINTERFACE; +} Modified: trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_base…
============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h [iso-8859-1] Sun Aug 24 06:18:30 2008 @@ -9,6 +9,9 @@ #define _D3D9_BASEOBJECT_H_ #include "d3d9_common.h" +#include <d3d9.h> + +struct _D3D9BaseObject; enum REF_TYPE { @@ -38,5 +41,6 @@ ULONG D3D9BaseObject_AddRef(D3D9BaseObject* pBaseObject); ULONG D3D9BaseObject_Release(D3D9BaseObject* pBaseObject); +HRESULT D3D9BaseObject_GetDevice(D3D9BaseObject* pBaseObject, IDirect3DDevice9** ppDevice); #endif // _D3D9_BASEOBJECT_H_ Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_devi…
============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] Sun Aug 24 06:18:30 2008 @@ -341,16 +341,18 @@ LPDIRECT3DDEVICE9_INT This = impl_from_IDirect3DDevice9(iface); LOCK_D3DDEVICE9(); + if (IsBadWritePtr(ppSwapChain, sizeof(IDirect3DSwapChain9*))) + { + DPRINT1("Invalid ppSwapChain parameter specified"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDCALL; + } + + *ppSwapChain = NULL; + if (iSwapChain >= IDirect3DDevice9_GetNumberOfSwapChains(iface)) { DPRINT1("Invalid iSwapChain parameter specified"); - UNLOCK_D3DDEVICE9(); - return D3DERR_INVALIDCALL; - } - - if (IsBadWritePtr(ppSwapChain, sizeof(IDirect3DSwapChain9*))) - { - DPRINT1("Invalid ppSwapChain parameter specified"); UNLOCK_D3DDEVICE9(); return D3DERR_INVALIDCALL; } Modified: trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_swap…
============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c [iso-8859-1] Sun Aug 24 06:18:30 2008 @@ -13,6 +13,11 @@ #include "d3d9_helpers.h" #include "d3d9_device.h" +#define LOCK_D3DDEVICE9() if (This->BaseObject.pUnknown && ((LPDIRECT3DDEVICE9_INT)This->BaseObject.pUnknown)->bLockDevice) \ + EnterCriticalSection(&((LPDIRECT3DDEVICE9_INT)This->BaseObject.pUnknown)->CriticalSection); +#define UNLOCK_D3DDEVICE9() if (This->BaseObject.pUnknown && ((LPDIRECT3DDEVICE9_INT)This->BaseObject.pUnknown)->bLockDevice) \ + LeaveCriticalSection(&((LPDIRECT3DDEVICE9_INT)This->BaseObject.pUnknown)->CriticalSection); + /* Convert a IDirect3DSwapChain9 pointer safely to the internal implementation struct */ static LPDIRECT3DSWAPCHAIN9_INT IDirect3DSwapChain9ToImpl(LPDIRECT3DSWAPCHAIN9 iface) { @@ -81,15 +86,81 @@ return D3D_OK; } +/*++ +* @name IDirect3DSwapChain9::GetDevice +* @implemented +* +* The function Direct3DSwapChain9_GetDevice sets the ppDevice argument +* to the device connected to create the swap chain. +* +* @param LPDIRECT3DSWAPCHAIN9 iface +* Pointer to a IDirect3DSwapChain9 object returned from IDirect3D9Device::GetSwapChain() +* +* @param IDirect3DDevice9** ppDevice +* Pointer to a IDirect3DDevice9* structure to be set to the device object. +* +* @return HRESULT +* If the method successfully sets the ppDevice value, the return value is D3D_OK. +* If ppDevice is a bad pointer the return value will be D3DERR_INVALIDCALL. +* If the swap chain didn't contain any device, the return value will be D3DERR_INVALIDDEVICE. +* +*/ static HRESULT WINAPI Direct3DSwapChain9_GetDevice(LPDIRECT3DSWAPCHAIN9 iface, IDirect3DDevice9** ppDevice) { - UNIMPLEMENTED - return D3D_OK; -} - + LPDIRECT3DSWAPCHAIN9_INT This = IDirect3DSwapChain9ToImpl(iface); + LOCK_D3DDEVICE9(); + + if (IsBadWritePtr(ppDevice, sizeof(IDirect3DDevice9**))) + { + DPRINT1("Invalid ppDevice parameter specified"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDCALL; + } + + if (FAILED(D3D9BaseObject_GetDevice(&This->BaseObject, ppDevice))) + { + DPRINT1("Invalid This parameter speficied"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDDEVICE; + } + + UNLOCK_D3DDEVICE9(); + return D3D_OK; +} + +/*++ +* @name IDirect3DSwapChain9::GetPresentParameters +* @implemented +* +* The function Direct3DSwapChain9_GetPresentParameters fills the pPresentationParameters +* argument with the D3DPRESENT_PARAMETERS parameters that was used to create the swap chain. +* +* @param LPDIRECT3DSWAPCHAIN9 iface +* Pointer to a IDirect3DSwapChain9 object returned from IDirect3D9Device::GetSwapChain() +* +* @param D3DPRESENT_PARAMETERS* pPresentationParameters +* Pointer to a D3DPRESENT_PARAMETERS structure to be filled with the creation parameters. +* +* @return HRESULT +* If the method successfully fills the pPresentationParameters structure, the return value is D3D_OK. +* If pPresentationParameters is a bad pointer the return value will be D3DERR_INVALIDCALL. +* +*/ static HRESULT WINAPI Direct3DSwapChain9_GetPresentParameters(LPDIRECT3DSWAPCHAIN9 iface, D3DPRESENT_PARAMETERS* pPresentationParameters) { - UNIMPLEMENTED + LPDIRECT3DSWAPCHAIN9_INT This = IDirect3DSwapChain9ToImpl(iface); + LOCK_D3DDEVICE9(); + + if (IsBadWritePtr(pPresentationParameters, sizeof(D3DPRESENT_PARAMETERS))) + { + DPRINT1("Invalid pPresentationParameters parameter specified"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDCALL; + } + + *pPresentationParameters = This->PresentParameters; + + UNLOCK_D3DDEVICE9(); return D3D_OK; } Modified: trunk/reactos/dll/directx/d3d9/d3d9_swapchain.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_swap…
============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_swapchain.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_swapchain.h [iso-8859-1] Sun Aug 24 06:18:30 2008 @@ -12,6 +12,8 @@ #include <d3d9.h> #include <ddraw.h> #include "d3d9_baseobject.h" + +struct _Direct3DDevice9_INT; typedef struct _Direct3DSwapChain9_INT {
16 years, 1 month
1
0
0
0
[gbrunmar] 35593: D3D9: * Replace D3D9BaseObject's dependency on Direct3DDevice9 * More HAL device init stuff
by gbrunmar@svn.reactos.org
Author: gbrunmar Date: Sun Aug 24 05:15:44 2008 New Revision: 35593 URL:
http://svn.reactos.org/svn/reactos?rev=35593&view=rev
Log: D3D9: * Replace D3D9BaseObject's dependency on Direct3DDevice9 * More HAL device init stuff Modified: trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c trunk/reactos/dll/directx/d3d9/device.c Modified: trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_base…
============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c [iso-8859-1] Sun Aug 24 05:15:44 2008 @@ -25,18 +25,18 @@ D3D9BaseObject_Destroy }; -VOID InitD3D9BaseObject(D3D9BaseObject* pBaseObject, enum REF_TYPE RefType, struct _Direct3DDevice9_INT* pBaseDevice) +VOID InitD3D9BaseObject(D3D9BaseObject* pBaseObject, enum REF_TYPE RefType, IUnknown* pUnknown) { pBaseObject->lpVtbl = &D3D9BaseObject_Vtbl; pBaseObject->RefType = RefType; - pBaseObject->pBaseDevice = pBaseDevice; + pBaseObject->pUnknown = pUnknown; } ULONG D3D9BaseObject_AddRef(D3D9BaseObject* pBaseObject) { - if (pBaseObject->pBaseDevice) + if (pBaseObject->pUnknown) { - pBaseObject->pBaseDevice->lpVtbl->AddRef((IDirect3DDevice9*)&pBaseObject->pBaseDevice->lpVtbl); + pBaseObject->pUnknown->lpVtbl->AddRef((IUnknown*) &pBaseObject->pUnknown->lpVtbl); } return InterlockedIncrement(&pBaseObject->lRefCnt); @@ -52,9 +52,9 @@ if (Ref == 0) { - if (pBaseObject->pBaseDevice) + if (pBaseObject->pUnknown) { - pBaseObject->pBaseDevice->lpVtbl->Release((IDirect3DDevice9*)&pBaseObject->pBaseDevice->lpVtbl); + pBaseObject->pUnknown->lpVtbl->Release((IUnknown*) &pBaseObject->pUnknown->lpVtbl); } } } Modified: trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_base…
============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h [iso-8859-1] Sun Aug 24 05:15:44 2008 @@ -27,14 +27,14 @@ /* 0x0000 */ ID3D9BaseObjectVtbl* lpVtbl; /* 0x0004 */ LONG lRefCnt; /* 0x0008 */ DWORD dwNumUsed; -/* 0x000c */ struct _Direct3DDevice9_INT* pBaseDevice; +/* 0x000c */ IUnknown* pUnknown; /* 0x0010 */ DWORD dwUnknown0010; // Index? Unique id? /* 0x0014 */ HANDLE hKernelHandle; /* 0x0018 */ LPDWORD dwUnknown0018; /* 0x001c */ enum REF_TYPE RefType; } D3D9BaseObject; -VOID InitD3D9BaseObject(D3D9BaseObject* pBaseObject, enum REF_TYPE RefType, struct _Direct3DDevice9_INT* pBaseDevice); +VOID InitD3D9BaseObject(D3D9BaseObject* pBaseObject, enum REF_TYPE RefType, IUnknown* pUnknown); ULONG D3D9BaseObject_AddRef(D3D9BaseObject* pBaseObject); ULONG D3D9BaseObject_Release(D3D9BaseObject* pBaseObject); Modified: trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_swap…
============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c [iso-8859-1] Sun Aug 24 05:15:44 2008 @@ -119,7 +119,7 @@ return NULL; } - InitD3D9BaseObject((D3D9BaseObject*) &pThisSwapChain->BaseObject.lpVtbl, RefType, pBaseDevice); + InitD3D9BaseObject((D3D9BaseObject*) &pThisSwapChain->BaseObject.lpVtbl, RefType, (IUnknown*) &pBaseDevice->lpVtbl); pThisSwapChain->lpVtbl = &Direct3DSwapChain9_Vtbl; @@ -149,6 +149,7 @@ } pThisSwapChain->PresentParameters = pPresentationParameters[pThisSwapChain->ChainIndex]; + pThisSwapChain->SwapEffect = pPresentationParameters->SwapEffect; return Direct3DSwapChain9_Reset(pThisSwapChain, pPresentationParameters); } Modified: trunk/reactos/dll/directx/d3d9/device.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/device.c?…
============================================================================== --- trunk/reactos/dll/directx/d3d9/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/device.c [iso-8859-1] Sun Aug 24 05:15:44 2008 @@ -51,6 +51,10 @@ pThisBaseDevice->lpVtbl = &Direct3DDevice9_Vtbl; pThisBaseDevice->lRefCnt = 1; + pThisBaseDevice->dwProcessId = GetCurrentThreadId(); + pThisBaseDevice->pUnknown = (IUnknown*) &pThisBaseDevice->lpVtbl; + InitializeCriticalSection(&pThisBaseDevice->CriticalSection); + pThisBaseDevice->pDirect3D9 = pDirect3D9; pThisBaseDevice->DeviceType = DeviceType; pThisBaseDevice->hWnd = hFocusWindow;
16 years, 1 month
1
0
0
0
[gbrunmar] 35592: D3D9: * Fixed incomplete HAL device * Fixed IDirect3DSwapChain9 and D3D9BaseObject ref counting
by gbrunmar@svn.reactos.org
Author: gbrunmar Date: Sun Aug 24 04:34:16 2008 New Revision: 35592 URL:
http://svn.reactos.org/svn/reactos?rev=35592&view=rev
Log: D3D9: * Fixed incomplete HAL device * Fixed IDirect3DSwapChain9 and D3D9BaseObject ref counting Modified: trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c trunk/reactos/dll/directx/d3d9/device.c Modified: trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_base…
============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c [iso-8859-1] Sun Aug 24 04:34:16 2008 @@ -9,9 +9,14 @@ #include "d3d9_device.h" #include <debug.h> +#include "d3d9_helpers.h" -VOID D3D9BaseObject_Destroy() +VOID D3D9BaseObject_Destroy(D3D9BaseObject* pBaseObject, BOOL bFreeThis) { + if (bFreeThis) + { + AlignedFree((LPVOID*) pBaseObject); + } } ID3D9BaseObjectVtbl D3D9BaseObject_Vtbl = @@ -22,7 +27,6 @@ VOID InitD3D9BaseObject(D3D9BaseObject* pBaseObject, enum REF_TYPE RefType, struct _Direct3DDevice9_INT* pBaseDevice) { - // TODO: Add dtor to vtbl pBaseObject->lpVtbl = &D3D9BaseObject_Vtbl; pBaseObject->RefType = RefType; pBaseObject->pBaseDevice = pBaseDevice; @@ -30,14 +34,30 @@ ULONG D3D9BaseObject_AddRef(D3D9BaseObject* pBaseObject) { - // TODO: Implement ref counting - UNIMPLEMENTED - return 1; + if (pBaseObject->pBaseDevice) + { + pBaseObject->pBaseDevice->lpVtbl->AddRef((IDirect3DDevice9*)&pBaseObject->pBaseDevice->lpVtbl); + } + + return InterlockedIncrement(&pBaseObject->lRefCnt); } ULONG D3D9BaseObject_Release(D3D9BaseObject* pBaseObject) { - // TODO: Implement ref counting - UNIMPLEMENTED - return 0; + ULONG Ref = 0; + + if (pBaseObject) + { + Ref = InterlockedDecrement(&pBaseObject->lRefCnt); + + if (Ref == 0) + { + if (pBaseObject->pBaseDevice) + { + pBaseObject->pBaseDevice->lpVtbl->Release((IDirect3DDevice9*)&pBaseObject->pBaseDevice->lpVtbl); + } + } + } + + return Ref; } Modified: trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_base…
============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h [iso-8859-1] Sun Aug 24 04:34:16 2008 @@ -19,14 +19,14 @@ typedef struct _D3D9BaseObjectVtbl { - VOID (*Destroy)(); + VOID (*Destroy)(struct _D3D9BaseObject* pBaseObject, BOOL bFreeThis); } ID3D9BaseObjectVtbl; typedef struct _D3D9BaseObject { /* 0x0000 */ ID3D9BaseObjectVtbl* lpVtbl; -/* 0x0004 */ DWORD dwUnknown0004; -/* 0x0008 */ DWORD dwUnknown0008; +/* 0x0004 */ LONG lRefCnt; +/* 0x0008 */ DWORD dwNumUsed; /* 0x000c */ struct _Direct3DDevice9_INT* pBaseDevice; /* 0x0010 */ DWORD dwUnknown0010; // Index? Unique id? /* 0x0014 */ HANDLE hKernelHandle; Modified: trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_swap…
============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c [iso-8859-1] Sun Aug 24 04:34:16 2008 @@ -41,15 +41,13 @@ static ULONG WINAPI Direct3DSwapChain9_AddRef(LPDIRECT3DSWAPCHAIN9 iface) { LPDIRECT3DSWAPCHAIN9_INT This = IDirect3DSwapChain9ToImpl(iface); - D3D9BaseObject* BaseObject = (D3D9BaseObject*)((ULONG_PTR)This - FIELD_OFFSET(Direct3DSwapChain9_INT, lpVtbl) - FIELD_OFFSET(Direct3DSwapChain9_INT, BaseObject)); - return D3D9BaseObject_AddRef(BaseObject); + return D3D9BaseObject_AddRef((D3D9BaseObject*) &This->BaseObject.lpVtbl); } static ULONG WINAPI Direct3DSwapChain9_Release(LPDIRECT3DSWAPCHAIN9 iface) { LPDIRECT3DSWAPCHAIN9_INT This = IDirect3DSwapChain9ToImpl(iface); - D3D9BaseObject* BaseObject = (D3D9BaseObject*)((ULONG_PTR)This - FIELD_OFFSET(Direct3DSwapChain9_INT, lpVtbl) - FIELD_OFFSET(Direct3DSwapChain9_INT, BaseObject)); - return D3D9BaseObject_Release(BaseObject); + return D3D9BaseObject_Release((D3D9BaseObject*) &This->BaseObject.lpVtbl); } /* IDirect3DSwapChain9 interface */ @@ -121,7 +119,7 @@ return NULL; } - InitD3D9BaseObject(&pThisSwapChain->BaseObject, RefType, pBaseDevice); + InitD3D9BaseObject((D3D9BaseObject*) &pThisSwapChain->BaseObject.lpVtbl, RefType, pBaseDevice); pThisSwapChain->lpVtbl = &Direct3DSwapChain9_Vtbl; Modified: trunk/reactos/dll/directx/d3d9/device.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/device.c?…
============================================================================== --- trunk/reactos/dll/directx/d3d9/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/device.c [iso-8859-1] Sun Aug 24 04:34:16 2008 @@ -49,6 +49,8 @@ pThisBaseDevice->pResourceManager = pResourceManager; + pThisBaseDevice->lpVtbl = &Direct3DDevice9_Vtbl; + pThisBaseDevice->lRefCnt = 1; pThisBaseDevice->pDirect3D9 = pDirect3D9; pThisBaseDevice->DeviceType = DeviceType; pThisBaseDevice->hWnd = hFocusWindow;
16 years, 1 month
1
0
0
0
[janderwald] 35591: - Use the name of the cpl as the mutex name - The mutex name is a unicode buffer, pass it to CreateMutexW function - fixes bug 3489
by janderwald@svn.reactos.org
Author: janderwald Date: Sun Aug 24 03:37:25 2008 New Revision: 35591 URL:
http://svn.reactos.org/svn/reactos?rev=35591&view=rev
Log: - Use the name of the cpl as the mutex name - The mutex name is a unicode buffer, pass it to CreateMutexW function - fixes bug 3489 Modified: trunk/reactos/dll/win32/shell32/control.c Modified: trunk/reactos/dll/win32/shell32/control.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/control.…
============================================================================== --- trunk/reactos/dll/win32/shell32/control.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/control.c [iso-8859-1] Sun Aug 24 03:37:25 2008 @@ -348,21 +348,34 @@ LPWSTR beg = NULL; LPWSTR end; WCHAR ch; - LPWSTR ptr; + LPWSTR ptr, ptr2; + WCHAR szName[MAX_PATH]; unsigned sp = 0; LPWSTR extraPmts = NULL; int quoted = 0; BOOL spSet = FALSE; - HANDLE hMutex; - - hMutex = CreateMutex(NULL, FALSE, (LPCTSTR) wszCmd); + HANDLE hMutex; + UINT Length; + + ptr = wcsrchr(wszCmd, L'\\'); + ptr2 = wcsrchr(wszCmd, L','); + if (!ptr || !ptr2) + return; + + Length = (ptr2 - ptr - 1); + if (Length >= MAX_PATH) + return; + + memcpy(szName, ptr + 1, Length * sizeof(WCHAR)); + szName[Length] = L'\0'; + hMutex = CreateMutexW(NULL, FALSE, szName); + if ((!hMutex) || (GetLastError() == ERROR_ALREADY_EXISTS)) return; buffer = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(wszCmd) + 1) * sizeof(*wszCmd)); if (!buffer) return; end = lstrcpyW(buffer, wszCmd); - for (;;) { ch = *end; if (ch == '"') quoted = !quoted;
16 years, 1 month
1
0
0
0
[martinf] 35590: update XMLStorage: correctly handle dots and colons in attribute names
by martinf@svn.reactos.org
Author: martinf Date: Sun Aug 24 01:58:19 2008 New Revision: 35590 URL:
http://svn.reactos.org/svn/reactos?rev=35590&view=rev
Log: update XMLStorage: correctly handle dots and colons in attribute names Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit…
============================================================================== --- trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp [iso-8859-1] Sun Aug 24 01:58:19 2008 @@ -666,9 +666,10 @@ for(; *p; ++p) { char c = *p; + // NameChar ::= Letter | Digit | '.' | '-' | '_' | ':' | CombiningChar | Extender if (c == '\xC3') // UTF-8 escape character ++p; //TODO only continue on umlaut characters - else if (!isalnum(c) && c!='_' && c!='-') + else if (!isalnum(c) && c!='.' && c!='-' && c!='_' && c!=':') break; }
16 years, 1 month
1
0
0
0
[cgutman] 35589: - Set *ConnectionInfo to NULL if we can't allocate memory for ConnInfo
by cgutman@svn.reactos.org
Author: cgutman Date: Sat Aug 23 21:55:26 2008 New Revision: 35589 URL:
http://svn.reactos.org/svn/reactos?rev=35589&view=rev
Log: - Set *ConnectionInfo to NULL if we can't allocate memory for ConnInfo Modified: branches/aicom-network-fixes/drivers/network/afd/afd/tdiconn.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/tdiconn.c URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net…
============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/tdiconn.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/tdiconn.c [iso-8859-1] Sat Aug 23 21:55:26 2008 @@ -122,8 +122,10 @@ ExAllocatePool(NonPagedPool, sizeof(TDI_CONNECTION_INFORMATION) + TdiAddressSize); - if (!ConnInfo) - return STATUS_INSUFFICIENT_RESOURCES; + if (!ConnInfo) { + *ConnectionInfo = NULL; + return STATUS_INSUFFICIENT_RESOURCES; + } Status = TdiBuildNullConnectionInfoInPlace( ConnInfo, Type );
16 years, 1 month
1
0
0
0
[tkreuzer] 35588: Fix KeGetCurrentPrcb()
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Sat Aug 23 21:47:44 2008 New Revision: 35588 URL:
http://svn.reactos.org/svn/reactos?rev=35588&view=rev
Log: Fix KeGetCurrentPrcb() Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] Sat Aug 23 21:47:44 2008 @@ -794,7 +794,7 @@ struct _KPRCB * KeGetCurrentPrcb(VOID) { - return (struct _KPRCB *)(ULONG_PTR)__readgsqword(FIELD_OFFSET(KIPCR, Prcb)); + return (struct _KPRCB *)__readgsqword(FIELD_OFFSET(KIPCR, CurrentPrcb)); } #endif
16 years, 1 month
1
0
0
0
[tkreuzer] 35587: Fix __readgsqword, it was using a long internally. Add volatile keyword to segment addressing intrinsics. Add "memory" to clobber list on all those that do write.
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Sat Aug 23 21:44:29 2008 New Revision: 35587 URL:
http://svn.reactos.org/svn/reactos?rev=35587&view=rev
Log: Fix __readgsqword, it was using a long internally. Add volatile keyword to segment addressing intrinsics. Add "memory" to clobber list on all those that do write. Modified: branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h [iso-8859-1] Sat Aug 23 21:44:29 2008 @@ -589,168 +589,168 @@ static __inline__ __attribute__((always_inline)) void __writegsbyte(const unsigned long Offset, const unsigned char Data) { - __asm__("movb %b[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data)); + __asm__ __volatile__("movb %b[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); } static __inline__ __attribute__((always_inline)) void __writegsword(const unsigned long Offset, const unsigned short Data) { - __asm__("movw %w[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data)); + __asm__ __volatile__("movw %w[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); } static __inline__ __attribute__((always_inline)) void __writegsdword(const unsigned long Offset, const unsigned long Data) { - __asm__("movl %k[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data)); + __asm__ __volatile__("movl %k[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); } static __inline__ __attribute__((always_inline)) void __writegsqword(const unsigned long Offset, const unsigned __int64 Data) { - __asm__("movq %q[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data)); + __asm__ __volatile__("movq %q[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); } static __inline__ __attribute__((always_inline)) unsigned char __readgsbyte(const unsigned long Offset) { unsigned char value; - __asm__("movb %%gs:%a[Offset], %b[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); + __asm__ __volatile__("movb %%gs:%a[Offset], %b[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); return value; } static __inline__ __attribute__((always_inline)) unsigned short __readgsword(const unsigned long Offset) { unsigned short value; - __asm__("movw %%gs:%a[Offset], %w[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); + __asm__ __volatile__("movw %%gs:%a[Offset], %w[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); return value; } static __inline__ __attribute__((always_inline)) unsigned long __readgsdword(const unsigned long Offset) { unsigned long value; - __asm__("movl %%gs:%a[Offset], %k[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); + __asm__ __volatile__("movl %%gs:%a[Offset], %k[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); return value; } static __inline__ __attribute__((always_inline)) unsigned __int64 __readgsqword(const unsigned long Offset) { - unsigned long value; - __asm__("movq %%gs:%a[Offset], %q[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); + unsigned __int64 value; + __asm__ __volatile__("movq %%gs:%a[Offset], %q[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); return value; } static __inline__ __attribute__((always_inline)) void __incgsbyte(const unsigned long Offset) { - __asm__("incb %%gs:%a[Offset]" : : [Offset] "ir" (Offset)); + __asm__ __volatile__("incb %%gs:%a[Offset]" : : [Offset] "ir" (Offset) : "memory"); } static __inline__ __attribute__((always_inline)) void __incgsword(const unsigned long Offset) { - __asm__("incw %%gs:%a[Offset]" : : [Offset] "ir" (Offset)); + __asm__ __volatile__("incw %%gs:%a[Offset]" : : [Offset] "ir" (Offset) : "memory"); } static __inline__ __attribute__((always_inline)) void __incgsdword(const unsigned long Offset) { - __asm__("incl %%gs:%a[Offset]" : : [Offset] "ir" (Offset)); + __asm__ __volatile__("incl %%gs:%a[Offset]" : : [Offset] "ir" (Offset) : "memory"); } /* NOTE: the bizarre implementation of __addgsxxx mimics the broken Visual C++ behavior */ static __inline__ __attribute__((always_inline)) void __addgsbyte(const unsigned long Offset, const unsigned char Data) { if(!__builtin_constant_p(Offset)) - __asm__("addb %k[Offset], %%gs:%a[Offset]" : : [Offset] "r" (Offset)); + __asm__ __volatile__("addb %k[Offset], %%gs:%a[Offset]" : : [Offset] "r" (Offset) : "memory"); else - __asm__("addb %b[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data)); + __asm__ __volatile__("addb %b[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); } static __inline__ __attribute__((always_inline)) void __addgsword(const unsigned long Offset, const unsigned short Data) { if(!__builtin_constant_p(Offset)) - __asm__("addw %k[Offset], %%gs:%a[Offset]" : : [Offset] "r" (Offset)); + __asm__ __volatile__("addw %k[Offset], %%gs:%a[Offset]" : : [Offset] "r" (Offset) : "memory"); else - __asm__("addw %w[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data)); + __asm__ __volatile__("addw %w[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); } static __inline__ __attribute__((always_inline)) void __addgsdword(const unsigned long Offset, const unsigned int Data) { if(!__builtin_constant_p(Offset)) - __asm__("addl %k[Offset], %%gs:%a[Offset]" : : [Offset] "r" (Offset)); + __asm__ __volatile__("addl %k[Offset], %%gs:%a[Offset]" : : [Offset] "r" (Offset) : "memory"); else - __asm__("addl %k[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data)); + __asm__ __volatile__("addl %k[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); } #else /*** FS segment addressing ***/ static __inline__ __attribute__((always_inline)) void __writefsbyte(const unsigned long Offset, const unsigned char Data) { - __asm__("movb %b[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data)); + __asm__ __volatile__("movb %b[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); } static __inline__ __attribute__((always_inline)) void __writefsword(const unsigned long Offset, const unsigned short Data) { - __asm__("movw %w[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data)); + __asm__ __volatile__("movw %w[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); } static __inline__ __attribute__((always_inline)) void __writefsdword(const unsigned long Offset, const unsigned long Data) { - __asm__("movl %k[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data)); + __asm__ __volatile__("movl %k[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); } static __inline__ __attribute__((always_inline)) unsigned char __readfsbyte(const unsigned long Offset) { unsigned char value; - __asm__("movb %%fs:%a[Offset], %b[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); + __asm__ __volatile__("movb %%fs:%a[Offset], %b[value]" : [value] "=q" (value) : [Offset] "irm" (Offset) : "memory"); return value; } static __inline__ __attribute__((always_inline)) unsigned short __readfsword(const unsigned long Offset) { unsigned short value; - __asm__("movw %%fs:%a[Offset], %w[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); + __asm__ __volatile__("movw %%fs:%a[Offset], %w[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); return value; } static __inline__ __attribute__((always_inline)) unsigned long __readfsdword(const unsigned long Offset) { unsigned long value; - __asm__("movl %%fs:%a[Offset], %k[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); + __asm__ __volatile__("movl %%fs:%a[Offset], %k[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); return value; } static __inline__ __attribute__((always_inline)) void __incfsbyte(const unsigned long Offset) { - __asm__("incb %%fs:%a[Offset]" : : [Offset] "ir" (Offset)); + __asm__ __volatile__("incb %%fs:%a[Offset]" : : [Offset] "ir" (Offset) : "memory"); } static __inline__ __attribute__((always_inline)) void __incfsword(const unsigned long Offset) { - __asm__("incw %%fs:%a[Offset]" : : [Offset] "ir" (Offset)); + __asm__ __volatile__("incw %%fs:%a[Offset]" : : [Offset] "ir" (Offset) : "memory"); } static __inline__ __attribute__((always_inline)) void __incfsdword(const unsigned long Offset) { - __asm__("incl %%fs:%a[Offset]" : : [Offset] "ir" (Offset)); + __asm__ __volatile__("incl %%fs:%a[Offset]" : : [Offset] "ir" (Offset) : "memory"); } /* NOTE: the bizarre implementation of __addfsxxx mimics the broken Visual C++ behavior */ static __inline__ __attribute__((always_inline)) void __addfsbyte(const unsigned long Offset, const unsigned char Data) { if(!__builtin_constant_p(Offset)) - __asm__("addb %k[Offset], %%fs:%a[Offset]" : : [Offset] "r" (Offset)); + __asm__ __volatile__("addb %k[Offset], %%fs:%a[Offset]" : : [Offset] "r" (Offset) : "memory"); else - __asm__("addb %b[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data)); + __asm__ __volatile__("addb %b[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); } static __inline__ __attribute__((always_inline)) void __addfsword(const unsigned long Offset, const unsigned short Data) { if(!__builtin_constant_p(Offset)) - __asm__("addw %k[Offset], %%fs:%a[Offset]" : : [Offset] "r" (Offset)); + __asm__ __volatile__("addw %k[Offset], %%fs:%a[Offset]" : : [Offset] "r" (Offset) : "memory"); else - __asm__("addw %w[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data)); + __asm__ __volatile__("addw %w[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); } static __inline__ __attribute__((always_inline)) void __addfsdword(const unsigned long Offset, const unsigned int Data) { if(!__builtin_constant_p(Offset)) - __asm__("addl %k[Offset], %%fs:%a[Offset]" : : [Offset] "r" (Offset)); + __asm__ __volatile__("addl %k[Offset], %%fs:%a[Offset]" : : [Offset] "r" (Offset) : "memory"); else - __asm__("addl %k[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data)); + __asm__ __volatile__("addl %k[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); } #endif
16 years, 1 month
1
0
0
0
[tkreuzer] 35586: stub out SEH, for real this time ; -)
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Sat Aug 23 21:41:12 2008 New Revision: 35586 URL:
http://svn.reactos.org/svn/reactos?rev=35586&view=rev
Log: stub out SEH, for real this time ;-) Modified: branches/ros-amd64-bringup/reactos/include/reactos/libs/pseh/framebased.h Modified: branches/ros-amd64-bringup/reactos/include/reactos/libs/pseh/framebased.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/libs/pseh/framebased.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/libs/pseh/framebased.h [iso-8859-1] Sat Aug 23 21:41:12 2008 @@ -172,7 +172,7 @@ STMT_; \ } -#if defined(_ARM_) || defined(_x86_64) +#if defined(_ARM_) || defined(_M_AMD64) #define _SEH_TRY \ for(;;) \
16 years, 1 month
1
0
0
0
[cgutman] 35585: - Add myself to credits :)
by cgutman@svn.reactos.org
Author: cgutman Date: Sat Aug 23 20:56:56 2008 New Revision: 35585 URL:
http://svn.reactos.org/svn/reactos?rev=35585&view=rev
Log: - Add myself to credits :) Modified: trunk/reactos/CREDITS Modified: trunk/reactos/CREDITS URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/CREDITS?rev=35585&r1=35584…
============================================================================== --- trunk/reactos/CREDITS [iso-8859-1] (original) +++ trunk/reactos/CREDITS [iso-8859-1] Sat Aug 23 20:56:56 2008 @@ -9,6 +9,7 @@ Ariadne Brandon Turner <turnerb7(a)msu.edu> Brian Palmer <brianp(a)sginet.com> +Cameron M. Gutman <cgutman(a)reactos.org> Casper S. Hornstrup <chorns(a)users.sourceforge.net> Christoph von Wittich <christoph_vw(a)reactos.org> Daniel Reimer <reimer.daniel(a)freenet.de>
16 years, 1 month
1
0
0
0
← Newer
1
...
23
24
25
26
27
28
29
...
86
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
Results per page:
10
25
50
100
200