Ros-diffs

ros-diffs@reactos.org

81390 discussions

[khornicek] 38230: - avoid crash, pszExt is null when creating a link to a file without extension
by khornicek＠svn.reactos.org 21 Dec '08

21 Dec '08

Author: khornicek Date: Sun Dec 21 06:17:36 2008 New Revision: 38230 URL: http://svn.reactos.org/svn/reactos?rev=38230&view=rev Log: - avoid crash, pszExt is null when creating a link to a file without extension Modified: trunk/reactos/dll/win32/shell32/shv_def_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_def_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_def_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] Sun Dec 21 06:17:36 2008 @@ -1202,11 +1202,9 @@ if (StrRetToBufW(&strFile, This->dcm.apidl[0], szPath, MAX_PATH) != S_OK) return E_FAIL; - pszExt = wcsrchr(szPath, L'.'); - pszExt[0] = 0; - - if (!wcsicmp(pszExt + 1, szLnk)) + + if (pszExt && !wcsicmp(pszExt + 1, szLnk)) { if (!GetUniqueFileName(szPath, pszExt + 1, szTarget, TRUE)) return E_FAIL; @@ -1231,7 +1229,7 @@ { return E_FAIL; } - pszExt[0] = '.'; + if (SUCCEEDED(IShellLinkW_SetPath(nLink, szPath))) { if (SUCCEEDED(IShellLinkW_QueryInterface(nLink, &IID_IPersistFile, (LPVOID*)&ipf)))

1 0

[amunger] 38229: Fix packmgr linkage.
by amunger＠svn.reactos.org 21 Dec '08

21 Dec '08

Author: amunger Date: Sun Dec 21 03:22:46 2008 New Revision: 38229 URL: http://svn.reactos.org/svn/reactos?rev=38229&view=rev Log: Fix packmgr linkage. Modified: trunk/rosapps/applications/packmgr/lib/package.rbuild Modified: trunk/rosapps/applications/packmgr/lib/package.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/packmgr/lib/p… ============================================================================== --- trunk/rosapps/applications/packmgr/lib/package.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/packmgr/lib/package.rbuild [iso-8859-1] Sun Dec 21 03:22:46 2008 @@ -1,4 +1,4 @@ -<module name="package" type="win32dll" installbase="system32" installname="package.dll" allowwarnings="true" stdlib="host"> +<module name="package" type="win32dll" installbase="system32" installname="package.dll" allowwarnings="true" stdlib="host" crt="msvcrt"> <importlibrary definition="package.def" /> <include base="package">.</include>

1 0

[sginsberg] 38228: - _popen/_wpopen: When overriding the default standard input/output handles, don't set 2/3 to 0 -- use the standard handles instead (fix by kjk). Fixes the 'CsrGetObject returning invalid handle' errors
by sginsberg＠svn.reactos.org 21 Dec '08

21 Dec '08

Author: sginsberg Date: Sun Dec 21 02:30:41 2008 New Revision: 38228 URL: http://svn.reactos.org/svn/reactos?rev=38228&view=rev Log: - _popen/_wpopen: When overriding the default standard input/output handles, don't set 2/3 to 0 -- use the standard handles instead (fix by kjk). Fixes the 'CsrGetObject returning invalid handle' errors Modified: trunk/reactos/lib/sdk/crt/stdio/popen.c Modified: trunk/reactos/lib/sdk/crt/stdio/popen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/popen.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/popen.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/popen.c [iso-8859-1] Sun Dec 21 02:30:41 2008 @@ -77,13 +77,18 @@ StartupInfo.cb = sizeof(STARTUPINFO); if (*md == 'r' ) { + StartupInfo.hStdInput = GetStdHandle(STD_INPUT_HANDLE); StartupInfo.hStdOutput = hWritePipe; StartupInfo.dwFlags |= STARTF_USESTDHANDLES; } else if ( *md == 'w' ) { StartupInfo.hStdInput = hReadPipe; + StartupInfo.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE); StartupInfo.dwFlags |= STARTF_USESTDHANDLES; } + + if (StartupInfo.dwFlags & STARTF_USESTDHANDLES) + StartupInfo.hStdError = GetStdHandle(STD_ERROR_HANDLE); result = CreateProcess(szComSpec, szCmdLine,

1 0

[gbrunmar] 38227: Implemented IDirect3DDevice9::GetFrontBufferData()
by gbrunmar＠svn.reactos.org 21 Dec '08

21 Dec '08

Author: gbrunmar Date: Sun Dec 21 02:26:47 2008 New Revision: 38227 URL: http://svn.reactos.org/svn/reactos?rev=38227&view=rev Log: Implemented IDirect3DDevice9::GetFrontBufferData() Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c 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 Dec 21 02:26:47 2008 @@ -880,11 +880,54 @@ return D3D_OK; } +/*++ +* @name IDirect3DDevice9::GetFrontBufferData +* @implemented +* +* The function IDirect3DDevice9Base_GetFrontBufferData copies the content of +* the display device's front buffer in a system memory surface buffer. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3DDevice9 object returned from IDirect3D9::CreateDevice(). +* +* @param UINT iSwapChain +* Swap chain index to get object for. +* The maximum value for this is the value returned by IDirect3DDevice9::GetNumberOfSwapChains() - 1. +* +* @param IDirect3DSurface9* pDestSurface +* Pointer to a IDirect3DSurface9 to receive front buffer content +* +* @return HRESULT +* If the method successfully fills the pDestSurface buffer, the return value is D3D_OK. +* If iSwapChain is out of range or pDestSurface is a bad pointer, the return value +* will be D3DERR_INVALIDCALL. +*/ HRESULT WINAPI IDirect3DDevice9Base_GetFrontBufferData(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, IDirect3DSurface9* pDestSurface) { - UNIMPLEMENTED - - return D3D_OK; + HRESULT hResult; + IDirect3DSwapChain9* pSwapChain = NULL; + LPDIRECT3DDEVICE9_INT This = IDirect3DDevice9ToImpl(iface); + LOCK_D3DDEVICE9(); + + IDirect3DDevice9Base_GetSwapChain(iface, iSwapChain, &pSwapChain); + if (NULL == pSwapChain) + { + DPRINT1("Invalid iSwapChain parameter specified"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDCALL; + } + + if (NULL == pDestSurface) + { + DPRINT1("Invalid pDestSurface parameter specified"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDCALL; + } + + hResult = IDirect3DSwapChain9_GetFrontBufferData(pSwapChain, pDestSurface); + + UNLOCK_D3DDEVICE9(); + return hResult; } HRESULT WINAPI IDirect3DDevice9Base_StretchRect(LPDIRECT3DDEVICE9 iface, IDirect3DSurface9* pSourceSurface, CONST RECT* pSourceRect, IDirect3DSurface9* pDestSurface, CONST RECT* pDestRect, D3DTEXTUREFILTERTYPE Filter)

1 0

[gbrunmar] 38226: * Implemented IDirect3D9Device::SetGammaRamp() * Added stub for IDirect3DSwapChain9::SetGammaRamp()
by gbrunmar＠svn.reactos.org 21 Dec '08

21 Dec '08

Author: gbrunmar Date: Sun Dec 21 02:09:25 2008 New Revision: 38226 URL: http://svn.reactos.org/svn/reactos?rev=38226&view=rev Log: * Implemented IDirect3D9Device::SetGammaRamp() * Added stub for IDirect3DSwapChain9::SetGammaRamp() Modified: 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_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 Dec 21 02:09:25 2008 @@ -650,16 +650,11 @@ return D3D_OK; } -VOID WINAPI IDirect3DDevice9Base_SetGammaRamp(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, DWORD Flags, CONST D3DGAMMARAMP* pRamp) -{ - UNIMPLEMENTED -} - -/*++ -* @name IDirect3DDevice9::GetGammaRamp -* @implemented -* -* The function IDirect3DDevice9Base_GetGammaRamp retrieves the gamma correction ramp values +/*++ +* @name IDirect3DDevice9::SetGammaRamp +* @implemented +* +* The function IDirect3DDevice9Base_SetGammaRamp sets the gamma correction ramp values * for the specified swap chain. * * @param LPDIRECT3D iface @@ -669,6 +664,59 @@ * Swap chain index to get object for. * The maximum value for this is the value returned by IDirect3DDevice9::GetNumberOfSwapChains() - 1. * +* @param UINT Flags +* Can be on of the following: +* D3DSGR_CALIBRATE - Detects if a gamma calibrator is installed and if so modifies the values to correspond to +* the monitor and system settings before sending them to the display device. +* D3DSGR_NO_CALIBRATION - The gamma calibrations values are sent directly to the display device without +* any modification. +* +* @param CONST D3DGAMMARAMP* pRamp +* Pointer to a D3DGAMMARAMP representing the gamma correction ramp values to be set. +* +*/ +VOID WINAPI IDirect3DDevice9Base_SetGammaRamp(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, DWORD Flags, CONST D3DGAMMARAMP* pRamp) +{ + IDirect3DSwapChain9* pSwapChain = NULL; + Direct3DSwapChain9_INT* pSwapChain_INT; + LPDIRECT3DDEVICE9_INT This = IDirect3DDevice9ToImpl(iface); + LOCK_D3DDEVICE9(); + + IDirect3DDevice9Base_GetSwapChain(iface, iSwapChain, &pSwapChain); + if (NULL == pSwapChain) + { + DPRINT1("Invalid iSwapChain parameter specified"); + UNLOCK_D3DDEVICE9(); + return; + } + + if (NULL == pRamp) + { + DPRINT1("Invalid pRamp parameter specified"); + UNLOCK_D3DDEVICE9(); + return; + } + + pSwapChain_INT = IDirect3DSwapChain9ToImpl(pSwapChain); + Direct3DSwapChain9_SetGammaRamp(pSwapChain_INT, Flags, pRamp); + + UNLOCK_D3DDEVICE9(); +} + +/*++ +* @name IDirect3DDevice9::GetGammaRamp +* @implemented +* +* The function IDirect3DDevice9Base_GetGammaRamp retrieves the gamma correction ramp values +* for the specified swap chain. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3DDevice9 object returned from IDirect3D9::CreateDevice(). +* +* @param UINT iSwapChain +* Swap chain index to get object for. +* The maximum value for this is the value returned by IDirect3DDevice9::GetNumberOfSwapChains() - 1. +* * @param D3DGAMMARAMP* pRamp * Pointer to a D3DGAMMARAMP to receive the gamma correction ramp values. * 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 Dec 21 02:09:25 2008 @@ -249,3 +249,8 @@ { memcpy(pRamp, &pThisSwapChain->GammaRamp, sizeof(D3DGAMMARAMP)); } + +VOID Direct3DSwapChain9_SetGammaRamp(Direct3DSwapChain9_INT* pThisSwapChain, DWORD Flags, CONST D3DGAMMARAMP* pRamp) +{ + UNIMPLEMENTED +} 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 Dec 21 02:09:25 2008 @@ -78,5 +78,6 @@ HRESULT Direct3DSwapChain9_Init(Direct3DSwapChain9_INT* pThisSwapChain, D3DPRESENT_PARAMETERS* pPresentationParameters); HRESULT Direct3DSwapChain9_Reset(Direct3DSwapChain9_INT* pThisSwapChain, D3DPRESENT_PARAMETERS* pPresentationParameters); VOID Direct3DSwapChain9_GetGammaRamp(Direct3DSwapChain9_INT* pThisSwapChain, D3DGAMMARAMP* pRamp); +VOID Direct3DSwapChain9_SetGammaRamp(Direct3DSwapChain9_INT* pThisSwapChain, DWORD Flags, CONST D3DGAMMARAMP* pRamp); #endif // _D3D9_SWAPCHAIN_H_

1 0

[gbrunmar] 38225: * Implemented IDirect3DDevice9::Present()
by gbrunmar＠svn.reactos.org 21 Dec '08

21 Dec '08

Author: gbrunmar Date: Sun Dec 21 01:56:38 2008 New Revision: 38225 URL: http://svn.reactos.org/svn/reactos?rev=38225&view=rev Log: * Implemented IDirect3DDevice9::Present() Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c 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 Dec 21 01:56:38 2008 @@ -472,10 +472,70 @@ return D3D_OK; } +/*++ +* @name IDirect3DDevice9::Present +* @implemented +* +* The function IDirect3DDevice9Base_Present displays the content of the next +* back buffer in sequence for the device. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3DDevice9 object returned from IDirect3D9::CreateDevice(). +* +* @param CONST RECT* pSourceRect +* A pointer to a RECT structure representing an area of the back buffer to display where +* NULL means the whole back buffer. This parameter MUST be NULL unless the back buffer +* was created with the D3DSWAPEFFECT_COPY flag. +* +* @param CONST RECT* pDestRect +* A pointer to a RECT structure representing an area of the back buffer where the content +* will be displayed where NULL means the whole back buffer starting at (0,0). +* This parameter MUST be NULL unless the back buffer was created with the D3DSWAPEFFECT_COPY flag. +* +* @param HWND hDestWindowOverride +* A destination window where NULL means the window specified in the hWndDeviceWindow of the +* D3DPRESENT_PARAMETERS structure. +* +* @param CONST RGNDATA* pDirtyRegion +* A pointer to a RGNDATA structure representing an area of the back buffer to display where +* NULL means the whole back buffer. This parameter MUST be NULL unless the back buffer +* was created with the D3DSWAPEFFECT_COPY flag. This is an opimization region only. +* +* @return HRESULT +* If the method successfully displays the back buffer content, the return value is D3D_OK. +* If no swap chains are available, the return value will be D3DERR_INVALIDCALL. +*/ HRESULT WINAPI IDirect3DDevice9Base_Present(LPDIRECT3DDEVICE9 iface, CONST RECT* pSourceRect, CONST RECT* pDestRect, HWND hDestWindowOverride, CONST RGNDATA* pDirtyRegion) { - UNIMPLEMENTED - + UINT i; + UINT iNumSwapChains; + LPDIRECT3DDEVICE9_INT This = IDirect3DDevice9ToImpl(iface); + LOCK_D3DDEVICE9(); + + iNumSwapChains = IDirect3DDevice9Base_GetNumberOfSwapChains(iface); + if (0 == iNumSwapChains) + { + DPRINT1("Not enough swap chains, Present() fails"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDCALL; + } + + for (i = 0; i < iNumSwapChains; i++) + { + HRESULT hResult; + IDirect3DSwapChain9* pSwapChain; + + IDirect3DDevice9Base_GetSwapChain(iface, i, &pSwapChain); + hResult = IDirect3DSwapChain9_Present(pSwapChain, pSourceRect, pDestRect, hDestWindowOverride, pDirtyRegion, 0); + + if (FAILED(hResult)) + { + UNLOCK_D3DDEVICE9(); + return hResult; + } + } + + UNLOCK_D3DDEVICE9(); return D3D_OK; }

1 0

[gbrunmar] 38224: * Implemented IDirect3DDevice9::GetBackBuffer() * Forgotten documentation for IDirect3DDevice9::GetRasterStatus()
by gbrunmar＠svn.reactos.org 21 Dec '08

21 Dec '08

Author: gbrunmar Date: Sun Dec 21 01:11:30 2008 New Revision: 38224 URL: http://svn.reactos.org/svn/reactos?rev=38224&view=rev Log: * Implemented IDirect3DDevice9::GetBackBuffer() * Forgotten documentation for IDirect3DDevice9::GetRasterStatus() Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c 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 Dec 21 01:11:30 2008 @@ -479,19 +479,12 @@ return D3D_OK; } -HRESULT WINAPI IDirect3DDevice9Base_GetBackBuffer(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, UINT iBackBuffer, D3DBACKBUFFER_TYPE Type, IDirect3DSurface9** ppBackBuffer) -{ - UNIMPLEMENTED - - return D3D_OK; -} - -/*++ -* @name IDirect3DDevice9::GetRasterStatus -* @implemented -* -* The function IDirect3DDevice9Base_GetRasterStatus retrieves raster information -* of the monitor for the specified swap chain. +/*++ +* @name IDirect3DDevice9::GetBackBuffer +* @implemented +* +* The function IDirect3DDevice9Base_GetBackBuffer retrieves the back buffer +* for the specified swap chain. * * @param LPDIRECT3D iface * Pointer to the IDirect3DDevice9 object returned from IDirect3D9::CreateDevice(). @@ -500,11 +493,19 @@ * Swap chain index to get object for. * The maximum value for this is the value returned by IDirect3DDevice9::GetNumberOfSwapChains() - 1. * -* @param D3DRASTER_STATUS* pRasterStatus -* Pointer to a D3DRASTER_STATUS to receive the raster information -* -*/ -HRESULT WINAPI IDirect3DDevice9Base_GetRasterStatus(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, D3DRASTER_STATUS* pRasterStatus) +* @param UINT iBackBuffer +* Back buffer index to get object for. +* The maximum value for this is the the total number of back buffers - 1, as indexing starts at 0. +* +* @param IDirect3DSurface9** ppBackBuffer +* Pointer to a IDirect3DSurface9* to receive the back buffer object +* +* @return HRESULT +* If the method successfully sets the ppBackBuffer pointer, the return value is D3D_OK. +* If iSwapChain or iBackBuffer is out of range, Type is invalid or ppBackBuffer is a bad pointer, +* the return value will be D3DERR_INVALIDCALL. +*/ +HRESULT WINAPI IDirect3DDevice9Base_GetBackBuffer(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, UINT iBackBuffer, D3DBACKBUFFER_TYPE Type, IDirect3DSurface9** ppBackBuffer) { HRESULT hResult; IDirect3DSwapChain9* pSwapChain = NULL; @@ -519,37 +520,25 @@ return D3DERR_INVALIDCALL; } - if (NULL == pRasterStatus) - { - DPRINT1("Invalid pRasterStatus parameter specified"); - UNLOCK_D3DDEVICE9(); - return D3DERR_INVALIDCALL; - } - - hResult = IDirect3DSwapChain9_GetRasterStatus(pSwapChain, pRasterStatus); + if (NULL == ppBackBuffer) + { + DPRINT1("Invalid ppBackBuffer parameter specified"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDCALL; + } + + hResult = IDirect3DSwapChain9_GetBackBuffer(pSwapChain, iBackBuffer, Type, ppBackBuffer); UNLOCK_D3DDEVICE9(); return hResult; } -HRESULT WINAPI IDirect3DDevice9Base_SetDialogBoxMode(LPDIRECT3DDEVICE9 iface, BOOL bEnableDialogs) -{ - UNIMPLEMENTED - - return D3D_OK; -} - -VOID WINAPI IDirect3DDevice9Base_SetGammaRamp(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, DWORD Flags, CONST D3DGAMMARAMP* pRamp) -{ - UNIMPLEMENTED -} - -/*++ -* @name IDirect3DDevice9::GetGammaRamp -* @implemented -* -* The function IDirect3DDevice9Base_GetGammaRamp retrieves the gamma correction ramp values -* for the specified swap chain. +/*++ +* @name IDirect3DDevice9::GetRasterStatus +* @implemented +* +* The function IDirect3DDevice9Base_GetRasterStatus retrieves raster information +* of the monitor for the specified swap chain. * * @param LPDIRECT3D iface * Pointer to the IDirect3DDevice9 object returned from IDirect3D9::CreateDevice(). @@ -558,6 +547,68 @@ * Swap chain index to get object for. * The maximum value for this is the value returned by IDirect3DDevice9::GetNumberOfSwapChains() - 1. * +* @param D3DRASTER_STATUS* pRasterStatus +* Pointer to a D3DRASTER_STATUS to receive the raster information +* +* @return HRESULT +* If the method successfully fills the pRasterStatus structure, the return value is D3D_OK. +* If iSwapChain is out of range or pRasterStatus is a bad pointer, the return value +* will be D3DERR_INVALIDCALL. +*/ +HRESULT WINAPI IDirect3DDevice9Base_GetRasterStatus(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, D3DRASTER_STATUS* pRasterStatus) +{ + HRESULT hResult; + IDirect3DSwapChain9* pSwapChain = NULL; + LPDIRECT3DDEVICE9_INT This = IDirect3DDevice9ToImpl(iface); + LOCK_D3DDEVICE9(); + + IDirect3DDevice9Base_GetSwapChain(iface, iSwapChain, &pSwapChain); + if (NULL == pSwapChain) + { + DPRINT1("Invalid iSwapChain parameter specified"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDCALL; + } + + if (NULL == pRasterStatus) + { + DPRINT1("Invalid pRasterStatus parameter specified"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDCALL; + } + + hResult = IDirect3DSwapChain9_GetRasterStatus(pSwapChain, pRasterStatus); + + UNLOCK_D3DDEVICE9(); + return hResult; +} + +HRESULT WINAPI IDirect3DDevice9Base_SetDialogBoxMode(LPDIRECT3DDEVICE9 iface, BOOL bEnableDialogs) +{ + UNIMPLEMENTED + + return D3D_OK; +} + +VOID WINAPI IDirect3DDevice9Base_SetGammaRamp(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, DWORD Flags, CONST D3DGAMMARAMP* pRamp) +{ + UNIMPLEMENTED +} + +/*++ +* @name IDirect3DDevice9::GetGammaRamp +* @implemented +* +* The function IDirect3DDevice9Base_GetGammaRamp retrieves the gamma correction ramp values +* for the specified swap chain. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3DDevice9 object returned from IDirect3D9::CreateDevice(). +* +* @param UINT iSwapChain +* Swap chain index to get object for. +* The maximum value for this is the value returned by IDirect3DDevice9::GetNumberOfSwapChains() - 1. +* * @param D3DGAMMARAMP* pRamp * Pointer to a D3DGAMMARAMP to receive the gamma correction ramp values. *

1 0

[mjmartin] 38223: - Add missing break in ExDereferenceCallBackBlock so ExReleaseRundownProtection does not get called more than once.
by mjmartin＠svn.reactos.org 21 Dec '08

21 Dec '08

Author: mjmartin Date: Sun Dec 21 00:01:23 2008 New Revision: 38223 URL: http://svn.reactos.org/svn/reactos?rev=38223&view=rev Log: - Add missing break in ExDereferenceCallBackBlock so ExReleaseRundownProtection does not get called more than once. Modified: trunk/reactos/ntoskrnl/ex/callback.c Modified: trunk/reactos/ntoskrnl/ex/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/callback.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/callback.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/callback.c [iso-8859-1] Sun Dec 21 00:01:23 2008 @@ -137,6 +137,9 @@ { /* Release rundown protection */ ExReleaseRundownProtection(&CallbackRoutineBlock->RundownProtect); + + /* We're all done */ + break; } } }

1 0

[mjmartin] 38222: - As per http://msdn.microsoft.com/en-us/library/ms802952.aspx, call ExDoCallBack with correct parameters.
by mjmartin＠svn.reactos.org 21 Dec '08

21 Dec '08

Author: mjmartin Date: Sat Dec 20 23:08:18 2008 New Revision: 38222 URL: http://svn.reactos.org/svn/reactos?rev=38222&view=rev Log: - As per http://msdn.microsoft.com/en-us/library/ms802952.aspx, call ExDoCallBack with correct parameters. Modified: trunk/reactos/ntoskrnl/include/internal/ps_x.h Modified: trunk/reactos/ntoskrnl/include/internal/ps_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ps_x.h [iso-8859-1] Sat Dec 20 23:08:18 2008 @@ -73,8 +73,8 @@ /* Do the callback */ ExDoCallBack(&PspProcessNotifyRoutine[i], CurrentProcess->InheritedFromUniqueProcessId, - (PVOID)(ULONG_PTR)Create, - NULL); + CurrentProcess->UniqueProcessId, + (PVOID)(ULONG_PTR)Create); } } }

1 0

[hyperion] 38221: modified include/reactos/wine/exception.h Farewell Wine exception handling macros. You won't be missed modified dll/win32/icmp/icmp_main.c Removed gratuitous use of _getpid Winsock APIs don't set errno, they set the last error As a consequence, icmp.dll no longer depends on msvcrt.dll modified tools/rbuild/module.cpp Link DLLs to ntdll's CRT instead of msvcrt's by default (most DLLs don't actually need msvcrt) Everything else: Set crt attribute of <module> to "msvcrt" if ntdll
by hyperion＠svn.reactos.org 21 Dec '08

21 Dec '08

Author: hyperion Date: Sat Dec 20 21:58:19 2008 New Revision: 38221 URL: http://svn.reactos.org/svn/reactos?rev=38221&view=rev Log: modified include/reactos/wine/exception.h Farewell Wine exception handling macros. You won't be missed modified dll/win32/icmp/icmp_main.c Removed gratuitous use of _getpid Winsock APIs don't set errno, they set the last error As a consequence, icmp.dll no longer depends on msvcrt.dll modified tools/rbuild/module.cpp Link DLLs to ntdll's CRT instead of msvcrt's by default (most DLLs don't actually need msvcrt) Everything else: Set crt attribute of <module> to "msvcrt" if ntdll isn't good enough Link to pseh if necessary Modified: trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild trunk/reactos/dll/cpl/desk/desk.rbuild trunk/reactos/dll/cpl/intl/intl.rbuild trunk/reactos/dll/cpl/main/main.rbuild trunk/reactos/dll/cpl/mmsys/mmsys.rbuild trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild trunk/reactos/dll/directx/ddraw/ddraw.rbuild trunk/reactos/dll/directx/dsound/dsound.rbuild trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild trunk/reactos/dll/win32/crypt32/crypt32.rbuild trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild trunk/reactos/dll/win32/dnsapi/dnsapi.rbuild trunk/reactos/dll/win32/gdiplus/gdiplus.rbuild trunk/reactos/dll/win32/glu32/glu32.rbuild trunk/reactos/dll/win32/icmp/icmp_main.c trunk/reactos/dll/win32/iphlpapi/iphlpapi.rbuild trunk/reactos/dll/win32/jscript/jscript.rbuild trunk/reactos/dll/win32/msi/msi.rbuild trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild trunk/reactos/dll/win32/msxml3/msxml3.rbuild trunk/reactos/dll/win32/odbc32/odbc32.rbuild trunk/reactos/dll/win32/ole32/ole32.rbuild trunk/reactos/dll/win32/oleaut32/oleaut32.rbuild trunk/reactos/dll/win32/opengl32/opengl32.rbuild trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild trunk/reactos/dll/win32/rsaenh/rsaenh.rbuild trunk/reactos/dll/win32/setupapi/setupapi.rbuild trunk/reactos/dll/win32/shell32/shell32.rbuild trunk/reactos/dll/win32/syssetup/syssetup.rbuild trunk/reactos/dll/win32/twain_32/twain_32.rbuild trunk/reactos/dll/win32/winhttp/winhttp.rbuild trunk/reactos/dll/win32/wininet/wininet.rbuild trunk/reactos/dll/win32/winmm/winmm.rbuild trunk/reactos/dll/win32/wintrust/wintrust.rbuild trunk/reactos/include/reactos/wine/exception.h trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/mesa32… ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="mesa32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MESA32}" installbase="system32" installname="mesa32.dll" allowwarnings="true"> +<module name="mesa32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MESA32}" installbase="system32" installname="mesa32.dll" allowwarnings="true" crt="msvcrt"> <importlibrary definition="src/drivers/windows/icd/mesa.def" /> <linkerflag>-enable-stdcall-fixup</linkerflag> <library>ntdll</library> Modified: trunk/reactos/dll/cpl/desk/desk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rbuild?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/desk.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="desk" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_DESK}" installbase="system32" installname="desk.cpl" unicode="yes"> +<module name="desk" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_DESK}" installbase="system32" installname="desk.cpl" unicode="yes" crt="msvcrt"> <importlibrary definition="desk.def" /> <include base="desk">.</include> <define name="_WIN32" /> Modified: trunk/reactos/dll/cpl/intl/intl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rbuild?r… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/intl.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="intl" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_INTL}" installbase="system32" installname="intl.cpl" unicode="yes"> +<module name="intl" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_INTL}" installbase="system32" installname="intl.cpl" unicode="yes" crt="msvcrt"> <importlibrary definition="intl.def" /> <include base="intl">.</include> <library>kernel32</library> Modified: trunk/reactos/dll/cpl/main/main.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/main.rbuild?r… ============================================================================== --- trunk/reactos/dll/cpl/main/main.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/main.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="main" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MAIN}" installbase="system32" installname="main.cpl" unicode="yes"> +<module name="main" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MAIN}" installbase="system32" installname="main.cpl" unicode="yes" crt="msvcrt"> <importlibrary definition="main.def" /> <include base="main">.</include> <library>kernel32</library> Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="mmsys" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MMSYS}" installbase="system32" installname="mmsys.cpl" unicode="yes"> +<module name="mmsys" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MMSYS}" installbase="system32" installname="mmsys.cpl" unicode="yes" crt="msvcrt"> <importlibrary definition="mmsys.spec" /> <include base="mmsys">.</include> <library>kernel32</library> Modified: trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.rbui… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="usrmgr" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_USRMGR}" installbase="system32" installname="usrmgr.cpl" unicode="yes"> +<module name="usrmgr" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_USRMGR}" installbase="system32" installname="usrmgr.cpl" unicode="yes" crt="msvcrt"> <importlibrary definition="usrmgr.def" /> <include base="usrmgr">.</include> <library>kernel32</library> Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rb… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll" allowwarnings ="true" unicode="yes"> +<module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll" allowwarnings ="true" unicode="yes" crt="msvcrt"> <importlibrary definition="ddraw.def" /> <include base="ddraw">.</include> <library>kernel32</library> Modified: trunk/reactos/dll/directx/dsound/dsound.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/dsound.… ============================================================================== --- trunk/reactos/dll/directx/dsound/dsound.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound/dsound.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="dsound" type="win32dll" baseaddress="${BASEADDRESS_DSOUND}" installbase="system32" installname="dsound.dll" allowwarnings ="true"> +<module name="dsound" type="win32dll" baseaddress="${BASEADDRESS_DSOUND}" installbase="system32" installname="dsound.dll" allowwarnings ="true" crt="msvcrt"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="dsound.spec" /> <include base="dsound">.</include> Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="wined3d" type="win32dll" installbase="system32" installname="wined3d.dll" allowwarnings ="true"> +<module name="wined3d" type="win32dll" installbase="system32" installname="wined3d.dll" allowwarnings ="true" crt="msvcrt"> <importlibrary definition="wined3d.def" /> <include base="wined3d">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: trunk/reactos/dll/win32/crypt32/crypt32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,4 +1,4 @@ -<module name="crypt32" type="win32dll" baseaddress="${BASEADDRESS_CRYPT32}" installbase="system32" installname="crypt32.dll" allowwarnings="true"> +<module name="crypt32" type="win32dll" baseaddress="${BASEADDRESS_CRYPT32}" installbase="system32" installname="crypt32.dll" allowwarnings="true" crt="msvcrt"> <importlibrary definition="crypt32.spec" /> <include base="crypt32">.</include> <include base="ReactOS">include/reactos/wine</include> @@ -10,6 +10,7 @@ <library>kernel32</library> <library>ntdll</library> <library>imagehlp</library> + <library>pseh</library> <file>base64.c</file> <file>cert.c</file> <file>chain.c</file> @@ -35,4 +36,6 @@ <file>ctl.c</file> <file>message.c</file> <file>crypt32.rc</file> +  + <compilerflag>-fno-unit-at-a-time</compilerflag> </module> Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="dbghelp" type="win32dll" baseaddress="${BASEADDRESS_DBGHELP}" installbase="system32" installname="dbghelp.dll" allowwarnings="true"> +<module name="dbghelp" type="win32dll" baseaddress="${BASEADDRESS_DBGHELP}" installbase="system32" installname="dbghelp.dll" allowwarnings="true" crt="msvcrt"> <importlibrary definition="dbghelp.spec" /> <include base="dbghelp">.</include> <include base="ReactOS">include/reactos/wine</include> @@ -31,5 +31,6 @@ <library>kernel32</library> <library>version</library> <library>ntdll</library> + <library>pseh</library> </module> </group> Modified: trunk/reactos/dll/win32/dnsapi/dnsapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi.rb… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,4 +1,4 @@ -<module name="dnsapi" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_DNSAPI}" installbase="system32" installname="dnsapi.dll"> +<module name="dnsapi" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_DNSAPI}" installbase="system32" installname="dnsapi.dll" crt="msvcrt"> <importlibrary definition="dnsapi.def" /> <include base="dnsapi">include</include> <include base="adns">src</include> Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="gdiplus" type="win32dll" baseaddress="${BASEADDRESS_GDIPLUS}" installbase="system32" installname="gdiplus.dll" allowwarnings="true"> +<module name="gdiplus" type="win32dll" baseaddress="${BASEADDRESS_GDIPLUS}" installbase="system32" installname="gdiplus.dll" allowwarnings="true" crt="msvcrt"> <importlibrary definition="gdiplus.spec" /> <include base="gdiplus">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: trunk/reactos/dll/win32/glu32/glu32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/glu32.rbui… ============================================================================== --- trunk/reactos/dll/win32/glu32/glu32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/glu32.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,4 +1,4 @@ -<module name="glu32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_GLU32}" installbase="system32" installname="glu32.dll" allowwarnings="true"> +<module name="glu32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_GLU32}" installbase="system32" installname="glu32.dll" allowwarnings="true" crt="msvcrt"> <importlibrary definition="glu32.def" /> <include base="glu32">include</include> <include base="glu32">libnurbs/internals</include> Modified: trunk/reactos/dll/win32/icmp/icmp_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/icmp/icmp_main.c… ============================================================================== --- trunk/reactos/dll/win32/icmp/icmp_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/icmp/icmp_main.c [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -231,7 +231,7 @@ /* check the request size against SO_MAX_MSG_SIZE using getsockopt */ /* Prepare the request */ - id=_getpid() & 0xFFFF; + id=GetCurrentProcessId() & 0xFFFF; seq=InterlockedIncrement(&icmp_sequence) & 0xFFFF; reqsize=ICMP_MINLEN+RequestSize; @@ -319,18 +319,18 @@ res=sendto(icp->sid, reqbuf, reqsize, 0, (struct sockaddr*)&addr, sizeof(addr)); HeapFree(GetProcessHeap (), 0, reqbuf); if (res<0) { - if (errno==EMSGSIZE) + if (WSAGetLastError()==WSAEMSGSIZE) SetLastError(IP_PACKET_TOO_BIG); else { - switch (errno) { - case ENETUNREACH: + switch (WSAGetLastError()) { + case WSAENETUNREACH: SetLastError(IP_DEST_NET_UNREACHABLE); break; - case EHOSTUNREACH: + case WSAEHOSTUNREACH: SetLastError(IP_DEST_HOST_UNREACHABLE); break; default: - TRACE("unknown error: errno=%d\n",errno); + TRACE("unknown error: errno=%d\n",WSAGetLastError()); SetLastError(IP_GENERAL_FAILURE); } } Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,4 +1,4 @@ -<module name="iphlpapi" type="win32dll" baseaddress="${BASEADDRESS_IPHLPAPI}" installbase="system32" installname="iphlpapi.dll" allowwarnings="true" unicode="yes"> +<module name="iphlpapi" type="win32dll" baseaddress="${BASEADDRESS_IPHLPAPI}" installbase="system32" installname="iphlpapi.dll" allowwarnings="true" unicode="yes" crt="msvcrt"> <importlibrary definition="iphlpapi.spec" /> <include base="iphlpapi">include</include> <include base="ReactOS">include/reactos/wine</include> Modified: trunk/reactos/dll/win32/jscript/jscript.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript.… ============================================================================== --- trunk/reactos/dll/win32/jscript/jscript.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/jscript.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,5 +1,5 @@ <group> -<module name="jscript" type="win32dll" baseaddress="${BASEADDRESS_JSCRIPT}" installbase="system32" installname="jscript.dll" allowwarnings="true"> +<module name="jscript" type="win32dll" baseaddress="${BASEADDRESS_JSCRIPT}" installbase="system32" installname="jscript.dll" allowwarnings="true" crt="msvcrt"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="jscript.spec" /> <include base="jscript">.</include> Modified: trunk/reactos/dll/win32/msi/msi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="msi" type="win32dll" baseaddress="${BASEADDRESS_MSI}" installbase="system32" installname="msi.dll" allowwarnings="true"> +<module name="msi" type="win32dll" baseaddress="${BASEADDRESS_MSI}" installbase="system32" installname="msi.dll" allowwarnings="true" crt="msvcrt"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="msi.spec" /> <include base="msi">.</include> @@ -69,6 +69,7 @@ <library>kernel32</library> <library>odbccp32</library> <library>ntdll</library> + <library>pseh</library> <dependency>msiserver</dependency> <dependency>msiheader</dependency> </module> Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.rb… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -20,6 +20,7 @@ <library>wine</library> <library>kernel32</library> <library>ntdll</library> + <library>pseh</library> <pch>precomp.h</pch> <file>dllmain.c</file> <file>msvcrt.rc</file> Modified: trunk/reactos/dll/win32/msxml3/msxml3.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml3.rb… ============================================================================== --- trunk/reactos/dll/win32/msxml3/msxml3.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/msxml3.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,5 +1,5 @@ <group> -<module name="msxml3" type="win32dll" baseaddress="${BASEADDRESS_MSXML3}" installbase="system32" installname="msxml3.dll" allowwarnings="true"> +<module name="msxml3" type="win32dll" baseaddress="${BASEADDRESS_MSXML3}" installbase="system32" installname="msxml3.dll" allowwarnings="true" crt="msvcrt"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="msxml3.spec" /> <include base="msxml3">.</include> Modified: trunk/reactos/dll/win32/odbc32/odbc32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbc32/odbc32.rb… ============================================================================== --- trunk/reactos/dll/win32/odbc32/odbc32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/odbc32/odbc32.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="odbc32" type="win32dll" baseaddress="${BASEADDRESS_ODBC32}" installbase="system32" installname="odbc32.dll" allowwarnings="true" > +<module name="odbc32" type="win32dll" baseaddress="${BASEADDRESS_ODBC32}" installbase="system32" installname="odbc32.dll" allowwarnings="true" crt="msvcrt"> <importlibrary definition="odbc32.spec" /> <include base="odbc32">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: trunk/reactos/dll/win32/ole32/ole32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.rbui… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole32.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="ole32" type="win32dll" baseaddress="${BASEADDRESS_OLE32}" installbase="system32" installname="ole32.dll" allowwarnings="true"> +<module name="ole32" type="win32dll" baseaddress="${BASEADDRESS_OLE32}" installbase="system32" installname="ole32.dll" allowwarnings="true" crt="msvcrt"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="ole32.spec" /> <include base="ole32">.</include> @@ -61,6 +61,8 @@ <file>dcom.idl</file> <file>irot.idl</file> <include base="ole32" root="intermediate">.</include> +  + <compilerflag>-fno-unit-at-a-time</compilerflag> </module> <module name="ole32_irot_server" type="rpcserver"> <file>irot.idl</file> Modified: trunk/reactos/dll/win32/oleaut32/oleaut32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/oleaut32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/oleaut32.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="oleaut32" type="win32dll" baseaddress="${BASEADDRESS_OLEAUT32}" installbase="system32" installname="oleaut32.dll" allowwarnings="true"> +<module name="oleaut32" type="win32dll" baseaddress="${BASEADDRESS_OLEAUT32}" installbase="system32" installname="oleaut32.dll" allowwarnings="true" crt="msvcrt"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="oleaut32.spec" /> <include base="oleaut32">.</include> Modified: trunk/reactos/dll/win32/opengl32/opengl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… ============================================================================== --- trunk/reactos/dll/win32/opengl32/opengl32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/opengl32.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,4 +1,4 @@ -<module name="opengl32" type="win32dll" baseaddress="${BASEADDRESS_OPENGL32}" installbase="system32" installname="opengl32.dll" unicode="yes"> +<module name="opengl32" type="win32dll" baseaddress="${BASEADDRESS_OPENGL32}" installbase="system32" installname="opengl32.dll" unicode="yes" crt="msvcrt"> <importlibrary definition="opengl32.def" /> <define name="_DISABLE_TIDENTS" /> <library>ntdll</library> Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.rb… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,4 +1,4 @@ -<module name="rpcrt4" type="win32dll" baseaddress="${BASEADDRESS_RPCRT4}" installbase="system32" installname="rpcrt4.dll" allowwarnings="true"> +<module name="rpcrt4" type="win32dll" baseaddress="${BASEADDRESS_RPCRT4}" installbase="system32" installname="rpcrt4.dll" allowwarnings="true" crt="msvcrt"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="rpcrt4.spec" /> <include base="rpcrt4">.</include> @@ -39,6 +39,8 @@ <file>rpcrt4.rc</file> <file>epm.idl</file> <include base="rpcrt4" root="intermediate">.</include> +  + <compilerflag>-fno-unit-at-a-time</compilerflag> </module> <module name="rpcrt4_epm_client" type="rpcclient"> <file>epm.idl</file> Modified: trunk/reactos/dll/win32/rsaenh/rsaenh.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/rsaenh.rb… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/rsaenh.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/rsaenh.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="rsaenh" type="win32dll" baseaddress="${BASEADDRESS_RSAENH}" installbase="system32" installname="rsaenh.dll" allowwarnings="true"> +<module name="rsaenh" type="win32dll" baseaddress="${BASEADDRESS_RSAENH}" installbase="system32" installname="rsaenh.dll" allowwarnings="true" crt="msvcrt"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="rsaenh.spec" /> <include base="rsaenh">.</include> Modified: trunk/reactos/dll/win32/setupapi/setupapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="setupapi" type="win32dll" baseaddress="${BASEADDRESS_SETUPAPI}" installbase="system32" installname="setupapi.dll" allowwarnings="true" unicode="yes"> +<module name="setupapi" type="win32dll" baseaddress="${BASEADDRESS_SETUPAPI}" installbase="system32" installname="setupapi.dll" allowwarnings="true" unicode="yes" crt="msvcrt"> <importlibrary definition="setupapi.spec" /> <include base="setupapi">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,4 +1,4 @@ -<module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}" installbase="system32" installname="shell32.dll"> +<module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}" installbase="system32" installname="shell32.dll" crt="msvcrt"> <autoregister infsection="OleControlDlls" type="Both" /> <importlibrary definition="shell32.spec" /> <include base="shell32">.</include> Modified: trunk/reactos/dll/win32/syssetup/syssetup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/syssetup.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,4 +1,4 @@ -<module name="syssetup" type="win32dll" baseaddress="${BASEADDRESS_SYSSETUP}" installbase="system32" installname="syssetup.dll" unicode="yes" allowwarnings="true"> +<module name="syssetup" type="win32dll" baseaddress="${BASEADDRESS_SYSSETUP}" installbase="system32" installname="syssetup.dll" unicode="yes" allowwarnings="true" crt="msvcrt"> <importlibrary definition="syssetup.def" /> <include base="syssetup">.</include> <library>pseh</library> Modified: trunk/reactos/dll/win32/twain_32/twain_32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/twain_32/twain_3… ============================================================================== --- trunk/reactos/dll/win32/twain_32/twain_32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/twain_32/twain_32.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,4 +1,4 @@ -<module name="twain_32" type="win32dll" baseaddress="${BASEADDRESS_TWAIN_32}" installbase="system32" installname="twain_32.dll" allowwarnings="true"> +<module name="twain_32" type="win32dll" baseaddress="${BASEADDRESS_TWAIN_32}" installbase="system32" installname="twain_32.dll" allowwarnings="true" crt="msvcrt"> <importlibrary definition="twain_32.def" /> <include base="twain_32">.</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/win32/winhttp/winhttp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/winhttp.… ============================================================================== --- trunk/reactos/dll/win32/winhttp/winhttp.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/winhttp.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="winhttp" type="win32dll" baseaddress="${BASEADDRESS_WINHTTP}" installbase="system32" installname="winhttp.dll" allowwarnings="true"> +<module name="winhttp" type="win32dll" baseaddress="${BASEADDRESS_WINHTTP}" installbase="system32" installname="winhttp.dll" allowwarnings="true" crt="msvcrt"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="winhttp.spec" /> <include base="winhttp">.</include> Modified: trunk/reactos/dll/win32/wininet/wininet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet.… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/wininet.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="wininet" type="win32dll" baseaddress="${BASEADDRESS_WININET}" installbase="system32" installname="wininet.dll" allowwarnings="true"> +<module name="wininet" type="win32dll" baseaddress="${BASEADDRESS_WININET}" installbase="system32" installname="wininet.dll" allowwarnings="true" crt="msvcrt"> <autoregister infsection="OleControlDlls" type="DllInstall" /> <importlibrary definition="wininet.spec" /> <include base="wininet">.</include> Modified: trunk/reactos/dll/win32/winmm/winmm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm.rbui… ============================================================================== --- trunk/reactos/dll/win32/winmm/winmm.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/winmm.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -7,7 +7,7 @@ <directory name="wavemap"> <xi:include href="wavemap/wavemap.rbuild" /> </directory> -<module name="winmm" type="win32dll" baseaddress="${BASEADDRESS_WINMM}" installbase="system32" installname="winmm.dll" allowwarnings="true"> +<module name="winmm" type="win32dll" baseaddress="${BASEADDRESS_WINMM}" installbase="system32" installname="winmm.dll" allowwarnings="true" crt="msvcrt"> <importlibrary definition="winmm.spec" /> <include base="winmm">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: trunk/reactos/dll/win32/wintrust/wintrust.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrus… ============================================================================== --- trunk/reactos/dll/win32/wintrust/wintrust.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/wintrust.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,4 +1,4 @@ -<module name="wintrust" type="win32dll" baseaddress="${BASEADDRESS_WINTRUST}" installbase="system32" installname="wintrust.dll" allowwarnings="true"> +<module name="wintrust" type="win32dll" baseaddress="${BASEADDRESS_WINTRUST}" installbase="system32" installname="wintrust.dll" allowwarnings="true" crt="msvcrt"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="wintrust.spec" /> <include base="wintrust">.</include> @@ -11,10 +11,13 @@ <library>kernel32</library> <library>imagehlp</library> <library>ntdll</library> + <library>pseh</library> <file>crypt.c</file> <file>register.c</file> <file>wintrust_main.c</file> <file>asn.c</file> <file>softpub.c</file> <file>version.rc</file> +  + <compilerflag>-fno-unit-at-a-time</compilerflag> </module> Modified: trunk/reactos/include/reactos/wine/exception.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/excep… ============================================================================== --- trunk/reactos/include/reactos/wine/exception.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/exception.h [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,342 +1,66 @@ -/* - * Wine exception handling - * - * Copyright (c) 1999 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - #ifndef __WINE_WINE_EXCEPTION_H #define __WINE_WINE_EXCEPTION_H -#include <setjmp.h> -#include <windef.h> -#include <excpt.h> +#include <intrin.h> +#include <pseh/pseh2.h> +#include <pseh/excpt.h> #ifdef __cplusplus extern "C" { #endif -/* The following definitions allow using exceptions in Wine and Winelib code - * - * They should be used like this: - * - * __TRY - * { - * do some stuff that can raise an exception - * } - * __EXCEPT(filter_func,param) - * { - * handle the exception here - * } - * __ENDTRY - * - * or - * - * __TRY - * { - * do some stuff that can raise an exception - * } - * __FINALLY(finally_func,param) - * - * The filter_func must be defined with the WINE_EXCEPTION_FILTER - * macro, and return one of the EXCEPTION_* code; it can use - * GetExceptionInformation and GetExceptionCode to retrieve the - * exception info. - * - * The finally_func must be defined with the WINE_FINALLY_FUNC macro. - * - * Warning: inside a __TRY or __EXCEPT block, 'break' or 'continue' statements - * break out of the current block. You cannot use 'return', 'goto' - * or 'longjmp' to leave a __TRY block, as this will surely crash. - * You can use them to leave a __EXCEPT block though. - * - * -- AJ - */ +struct _EXCEPTION_REGISTRATION_RECORD; +typedef struct _EXCEPTION_REGISTRATION_RECORD EXCEPTION_REGISTRATION_RECORD, *PEXCEPTION_REGISTRATION_RECORD; -typedef struct _EXCEPTION_REGISTRATION_RECORD +struct _EXCEPTION_REGISTRATION_RECORD { - struct _EXCEPTION_REGISTRATION_RECORD *Prev; + struct _EXCEPTION_REGISTRATION_RECORD * Prev; PEXCEPTION_HANDLER Handler; -} EXCEPTION_REGISTRATION_RECORD, *PEXCEPTION_REGISTRATION_RECORD; +}; -/* Define this if you want to use your compiler built-in __try/__except support. - * This is only useful when compiling to a native Windows binary, as the built-in - * compiler exceptions will most certainly not work under Winelib. - */ -#ifdef USE_COMPILER_EXCEPTIONS +#define __TRY _SEH2_TRY +#define __EXCEPT(func) _SEH2_EXCEPT(func(_SEH2_GetExceptionInformation())) +#define __EXCEPT_PAGE_FAULT _SEH2_EXCEPT(_SEH2_GetExceptionCode() == STATUS_ACCESS_VIOLATION) +#define __EXCEPT_ALL _SEH2_EXCEPT(_SEH_EXECUTE_HANDLER) +#define __ENDTRY _SEH2_END +#define __FINALLY(func) _SEH2_FINALLY { func(!_SEH2_AbnormalTermination()); } -#define __TRY __try -#define __EXCEPT(func) __except((func)(GetExceptionInformation())) -#define __FINALLY(func) __finally { (func)(!AbnormalTermination()); } -#define __ENDTRY /*nothing*/ -#define __EXCEPT_PAGE_FAULT __except(GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) -#define __EXCEPT_ALL __except(EXCEPTION_EXECUTE_HANDLER) - -#else /* USE_COMPILER_EXCEPTIONS */ - -#ifndef __GNUC__ -#define __attribute__(x) /* nothing */ +#ifndef GetExceptionCode +#define GetExceptionCode() _SEH2_GetExceptionCode() #endif -#if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__REACTOS__) -#define sigjmp_buf jmp_buf -#define sigsetjmp(buf,sigs) setjmp(buf) -#define siglongjmp(buf,val) longjmp(buf,val) +#ifndef GetExceptionInformation +#define GetExceptionInformation() _SEH2_GetExceptionInformation() #endif -#define __TRY \ - do { __WINE_FRAME __f; \ - int __first = 1; \ - for (;;) if (!__first) \ - { \ - do { +#ifndef AbnormalTermination +#define AbnormalTermination() _SEH2_AbnormalTermination() +#endif -#define __EXCEPT(func) \ - } while(0); \ - __wine_pop_frame( &__f.frame ); \ - break; \ - } else { \ - __f.frame.Handler = __wine_exception_handler; \ - __f.u.filter = (func); \ - if (sigsetjmp( __f.jmp, 0 )) { \ - const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ - do { +#define EXCEPTION_WINE_STUB 0x80000100 +#define EXCEPTION_WINE_ASSERTION 0x80000101 -/* convenience handler for page fault exceptions */ -#define __EXCEPT_PAGE_FAULT \ - } while(0); \ - __wine_pop_frame( &__f.frame ); \ - break; \ - } else { \ - __f.frame.Handler = __wine_exception_handler_page_fault; \ - if (sigsetjmp( __f.jmp, 0 )) { \ - const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ - do { - -/* convenience handler for all exception */ -#define __EXCEPT_ALL \ - } while(0); \ - __wine_pop_frame( &__f.frame ); \ - break; \ - } else { \ - __f.frame.Handler = __wine_exception_handler_all; \ - if (sigsetjmp( __f.jmp, 0 )) { \ - const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ - do { - -#define __ENDTRY \ - } while (0); \ - break; \ - } \ - __wine_push_frame( &__f.frame ); \ - __first = 0; \ - } \ - } while (0); - -#define __FINALLY(func) \ - } while(0); \ - __wine_pop_frame( &__f.frame ); \ - (func)(1); \ - break; \ - } else { \ - __f.frame.Handler = __wine_finally_handler; \ - __f.u.finally_func = (func); \ - __wine_push_frame( &__f.frame ); \ - __first = 0; \ - } \ - } while (0); - - -typedef LONG (CALLBACK *__WINE_FILTER)(PEXCEPTION_POINTERS); -typedef void (CALLBACK *__WINE_FINALLY)(BOOL); - -#define GetExceptionInformation() (__eptr) -#define GetExceptionCode() (__eptr->ExceptionRecord->ExceptionCode) - -#undef AbnormalTermination -#define AbnormalTermination() (!__normal) - -typedef struct __tagWINE_FRAME -{ - EXCEPTION_REGISTRATION_RECORD frame; - union - { - /* exception data */ - __WINE_FILTER filter; - /* finally data */ - __WINE_FINALLY finally_func; - } u; - sigjmp_buf jmp; - /* hack to make GetExceptionCode() work in handler */ - DWORD ExceptionCode; - const struct __tagWINE_FRAME *ExceptionRecord; -} __WINE_FRAME; - -#endif /* USE_COMPILER_EXCEPTIONS */ +#define EXCEPTION_VM86_INTx 0x80000110 +#define EXCEPTION_VM86_STI 0x80000111 +#define EXCEPTION_VM86_PICRETURN 0x80000112 static inline EXCEPTION_REGISTRATION_RECORD *__wine_push_frame( EXCEPTION_REGISTRATION_RECORD *frame ) { -#if defined(__GNUC__) && defined(__i386__) - EXCEPTION_REGISTRATION_RECORD *prev; - __asm__ __volatile__(".byte 0x64\n\tmovl (0),%0" - "\n\tmovl %0,(%1)" - "\n\t.byte 0x64\n\tmovl %1,(0)" - : "=&r" (prev) : "r" (frame) : "memory" ); - return prev; -#else - NT_TIB *teb = (NT_TIB *)NtCurrentTeb(); - frame->Prev = teb->ExceptionList; - teb->ExceptionList = frame; + frame->Prev = (struct _EXCEPTION_REGISTRATION_RECORD *)__readfsdword(0); + __writefsdword(0, (unsigned long)frame); return frame->Prev; -#endif } static inline EXCEPTION_REGISTRATION_RECORD *__wine_pop_frame( EXCEPTION_REGISTRATION_RECORD *frame ) { -#if defined(__GNUC__) && defined(__i386__) - __asm__ __volatile__(".byte 0x64\n\tmovl %0,(0)" - : : "r" (frame->Prev) : "memory" ); + __writefsdword(0, (unsigned long)frame->Prev); return frame->Prev; - -#else - NT_TIB *teb = (NT_TIB *)NtCurrentTeb(); - teb->ExceptionList = frame->Prev; - return frame->Prev; -#endif } -/* Exception handling flags - from OS/2 2.0 exception handling */ - -/* Win32 seems to use the same flags as ExceptionFlags in an EXCEPTION_RECORD */ -#define EH_NONCONTINUABLE 0x01 -#define EH_UNWINDING 0x02 -#define EH_EXIT_UNWIND 0x04 -#define EH_STACK_INVALID 0x08 -#define EH_NESTED_CALL 0x10 - -/* Wine-specific exceptions codes */ - -#define EXCEPTION_WINE_STUB 0x80000100 /* stub entry point called */ -#define EXCEPTION_WINE_ASSERTION 0x80000101 /* assertion failed */ - -/* unhandled return status from vm86 mode */ -#define EXCEPTION_VM86_INTx 0x80000110 -#define EXCEPTION_VM86_STI 0x80000111 -#define EXCEPTION_VM86_PICRETURN 0x80000112 - extern void __wine_enter_vm86( CONTEXT *context ); - -#ifndef USE_COMPILER_EXCEPTIONS - -/* wrapper for RtlUnwind since it clobbers registers on Windows */ -static inline void __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_RECORD *record ) -{ -#if defined(__GNUC__) && defined(__i386__) - int dummy1, dummy2, dummy3; - __asm__ __volatile__("pushl %%ebp\n\t" - "pushl %%ebx\n\t" - "pushl $0\n\t" - "pushl %2\n\t" - "pushl $0\n\t" - "pushl %1\n\t" - "call *%0\n\t" - "popl %%ebx\n\t" - "popl %%ebp" - : "=a" (dummy1), "=S" (dummy2), "=D" (dummy3) - : "0" (RtlUnwind), "1" (frame), "2" (record) - : "ecx", "edx", "memory" ); -#else - RtlUnwind( frame, 0, record, 0 ); -#endif -} - -static inline void DECLSPEC_NORETURN __wine_unwind_frame( EXCEPTION_RECORD *record, - EXCEPTION_REGISTRATION_RECORD *frame ) -{ - __WINE_FRAME *wine_frame = (__WINE_FRAME *)frame; - - /* hack to make GetExceptionCode() work in handler */ - wine_frame->ExceptionCode = record->ExceptionCode; - wine_frame->ExceptionRecord = wine_frame; - - __wine_rtl_unwind( frame, record ); - __wine_pop_frame( frame ); - siglongjmp( wine_frame->jmp, 1 ); -} - -static inline EXCEPTION_DISPOSITION -__wine_exception_handler( struct _EXCEPTION_RECORD *record, void *frame, - struct _CONTEXT *context, void *pdispatcher ) -{ - __WINE_FRAME *wine_frame = (__WINE_FRAME *)frame; - EXCEPTION_POINTERS ptrs; - - if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) - return ExceptionContinueSearch; - - ptrs.ExceptionRecord = record; - ptrs.ContextRecord = context; - switch(wine_frame->u.filter( &ptrs )) - { - case EXCEPTION_CONTINUE_SEARCH: - return ExceptionContinueSearch; - case EXCEPTION_CONTINUE_EXECUTION: - return ExceptionContinueExecution; - case EXCEPTION_EXECUTE_HANDLER: - break; - } - __wine_unwind_frame( record, frame ); -} - -static inline EXCEPTION_DISPOSITION -__wine_exception_handler_page_fault( struct _EXCEPTION_RECORD *record, void *frame, - struct _CONTEXT *context, void *pdispatcher ) -{ - if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) - return ExceptionContinueSearch; - if (record->ExceptionCode != STATUS_ACCESS_VIOLATION) - return ExceptionContinueSearch; - __wine_unwind_frame( record, frame ); -} - -static inline EXCEPTION_DISPOSITION -__wine_exception_handler_all( struct _EXCEPTION_RECORD *record, void *frame, - struct _CONTEXT *context, void *pdispatcher ) -{ - if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) - return ExceptionContinueSearch; - __wine_unwind_frame( record, frame ); -} - -static inline EXCEPTION_DISPOSITION -__wine_finally_handler( struct _EXCEPTION_RECORD *record, void *frame, - struct _CONTEXT *context, void *pdispatcher ) -{ - if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) - { - __WINE_FRAME *wine_frame = (__WINE_FRAME *)frame; - wine_frame->u.finally_func( FALSE ); - } - return ExceptionContinueSearch; -} - -#endif /* USE_COMPILER_EXCEPTIONS */ #ifdef __cplusplus } #endif -#endif /* __WINE_WINE_EXCEPTION_H */ +#endif Modified: trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/libxm… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="libxml2" type="staticlibrary" allowwarnings="true" crt="dll"> +<module name="libxml2" type="staticlibrary" allowwarnings="true" crt="dll" crt="msvcrt"> <define name="HAVE_CONFIG_H" /> <define name="WIN32" /> <define name="_WINDOWS" /> Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] Sat Dec 20 21:58:19 2008 @@ -1185,7 +1185,7 @@ return "static"; case Win32DLL: case Win32OCX: - return "msvcrt"; + return "ntdll"; case NativeDLL: case NativeCUI: return "ntdll";

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs