Ros-diffs December 2008

ros-diffs@reactos.org

31 participants
710 discussions

[tkreuzer] 38234: Add prototype for __globallocalestatus, it's going to be removed from crt headers later.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Dec 21 10:55:29 2008 New Revision: 38234 URL: http://svn.reactos.org/svn/reactos?rev=38234&view=rev Log: Add prototype for __globallocalestatus, it's going to be removed from crt headers later. Modified: trunk/reactos/lib/3rdparty/mingw/internal.h Modified: trunk/reactos/lib/3rdparty/mingw/internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/interna… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/internal.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/internal.h [iso-8859-1] Sun Dec 21 10:55:29 2008 @@ -163,6 +163,8 @@ PIMAGE_SECTION_HEADER __cdecl _FindPESection (PBYTE pImageBase, DWORD_PTR rva); BOOL __cdecl _IsNonwritableInCurrentImage (PBYTE pTarget); + extern int __globallocalestatus; + #ifdef __cplusplus } #endif

15 years, 9 months

[mjmartin] 38233: - Preform the if (!Adapter) check before setting adapter to 0. Fixes Debug message reporting that the adapter was rejected.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Sun Dec 21 10:36:03 2008 New Revision: 38233 URL: http://svn.reactos.org/svn/reactos?rev=38233&view=rev Log: - Preform the if (!Adapter) check before setting adapter to 0. Fixes Debug message reporting that the adapter was rejected. Modified: trunk/reactos/base/services/dhcp/adapter.c Modified: trunk/reactos/base/services/dhcp/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/adapter… ============================================================================== --- trunk/reactos/base/services/dhcp/adapter.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/adapter.c [iso-8859-1] Sun Dec 21 10:36:03 2008 @@ -288,12 +288,14 @@ Adapter->DhclientInfo.next = ifi; ifi = &Adapter->DhclientInfo; InsertTailList( &AdapterList, &Adapter->ListEntry ); - } else { free( Adapter ); Adapter = 0; } - } else { free( Adapter ); Adapter = 0; } + } + } if( !Adapter ) DH_DbgPrint(MID_TRACE,("Adapter %d was rejected\n", Table->table[i].dwIndex)); + free( Adapter ); + Adapter = 0; } DH_DbgPrint(MID_TRACE,("done with AdapterInit\n"));

15 years, 9 months

[sginsberg] 38232: - Make advapi32 Winetest do a basic check instead of assuming that the routine won't fail

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sun Dec 21 10:29:23 2008 New Revision: 38232 URL: http://svn.reactos.org/svn/reactos?rev=38232&view=rev Log: - Make advapi32 Winetest do a basic check instead of assuming that the routine won't fail Modified: trunk/rostests/winetests/advapi32/roshack.diff trunk/rostests/winetests/advapi32/security.c Modified: trunk/rostests/winetests/advapi32/roshack.diff URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/roshac… ============================================================================== --- trunk/rostests/winetests/advapi32/roshack.diff [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/roshack.diff [iso-8859-1] Sun Dec 21 10:29:23 2008 @@ -3,21 +3,46 @@ --- security.c (revision 37998) +++ security.c (working copy) @@ -2665,13 +2665,17 @@ - return; - } - -+ /* ReactOS Hack: ros' Security Descriptor string parsing sucks */ -+ skip("ROS-HACK: Skipping 'test_PrivateObjectSecurity' -- ros' SID string parsing sucks\n"); -+ return; -+ - ok(pConvertStringSecurityDescriptorToSecurityDescriptorA( - "O:SY" - "G:S-1-5-21-93476-23408-4576" - "D:(A;NP;GAGXGWGR;;;SU)(A;IOID;CCDC;;;SU)" - "(D;OICI;0xffffffff;;;S-1-5-21-93476-23408-4576)" - "S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)(AU;NPSA;0x12019f;;;SU)", -- SDDL_REVISION_1, &sec, &dwDescSize), "Creating descriptor failed\n"); -+ SDDL_REVISION_1, &sec, &dwDescSize), "Creating descriptor failed\n"); // FIXME: ConvertStringSecurityDescriptorToSecurityDescriptor fails and 'sec' isn't set - - test_SetSecurityDescriptorControl(sec); - + return; + } + ++ /* ReactOS Hack: ros' Security Descriptor string parsing sucks */ ++ skip("ROS-HACK: Skipping 'test_PrivateObjectSecurity' -- ros' SID string parsing sucks\n"); ++ return; ++ + ok(pConvertStringSecurityDescriptorToSecurityDescriptorA( + "O:SY" + "G:S-1-5-21-93476-23408-4576" + "D:(A;NP;GAGXGWGR;;;SU)(A;IOID;CCDC;;;SU)" + "(D;OICI;0xffffffff;;;S-1-5-21-93476-23408-4576)" + "S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)(AU;NPSA;0x12019f;;;SU)", +- SDDL_REVISION_1, &sec, &dwDescSize), "Creating descriptor failed\n"); ++ SDDL_REVISION_1, &sec, &dwDescSize), "Creating descriptor failed\n"); // FIXME: ConvertStringSecurityDescriptorToSecurityDescriptor fails and 'sec' isn't set + + test_SetSecurityDescriptorControl(sec); + +=================================================================== +--- security.c (revision 38229) ++++ security.c (working copy) +@@ -2840,6 +2840,7 @@ + + /* If we don't ask for the security descriptor, Windows will still give us + the other stuff, leaving us no way to free it. */ ++ dacl = NULL; + ret = pGetSecurityInfo(obj, SE_FILE_OBJECT, + OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + &owner, &group, &dacl, NULL, NULL); +@@ -2847,8 +2848,12 @@ + ok(owner != NULL, "GetSecurityInfo\n"); + ok(group != NULL, "GetSecurityInfo\n"); + ok(dacl != NULL, "GetSecurityInfo\n"); +- ok(IsValidAcl(dacl), "GetSecurityInfo\n"); + ++ if (dacl != NULL) ++ { ++ ok(IsValidAcl(dacl), "GetSecurityInfo\n"); ++ } ++ + CloseHandle(obj); + } + Modified: trunk/rostests/winetests/advapi32/security.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/securi… ============================================================================== --- trunk/rostests/winetests/advapi32/security.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/security.c [iso-8859-1] Sun Dec 21 10:29:23 2008 @@ -2840,6 +2840,7 @@ /* If we don't ask for the security descriptor, Windows will still give us the other stuff, leaving us no way to free it. */ + dacl = NULL; ret = pGetSecurityInfo(obj, SE_FILE_OBJECT, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, &owner, &group, &dacl, NULL, NULL); @@ -2847,7 +2848,11 @@ ok(owner != NULL, "GetSecurityInfo\n"); ok(group != NULL, "GetSecurityInfo\n"); ok(dacl != NULL, "GetSecurityInfo\n"); - ok(IsValidAcl(dacl), "GetSecurityInfo\n"); + + if (dacl != NULL) + { + ok(IsValidAcl(dacl), "GetSecurityInfo\n"); + } CloseHandle(obj); }

15 years, 9 months

[fireball] 38231: Olaf Siejka <olaf_siejka@o2.pl> - Fix NSWPAT=1 build.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Dec 21 06:47:01 2008 New Revision: 38231 URL: http://svn.reactos.org/svn/reactos?rev=38231&view=rev Log: Olaf Siejka <olaf_siejka(a)o2.pl> - Fix NSWPAT=1 build. Modified: trunk/reactos/dll/3rdparty/dxtn/dxtn.rbuild Modified: trunk/reactos/dll/3rdparty/dxtn/dxtn.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/dxtn.rbu… ============================================================================== --- trunk/reactos/dll/3rdparty/dxtn/dxtn.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/dxtn/dxtn.rbuild [iso-8859-1] Sun Dec 21 06:47:01 2008 @@ -1,4 +1,4 @@ -<module name="dxtn" type="win32dll" entrypoint="0" installbase="system32" installname="dxtn.dll" allowwarnings="true"> +<module name="dxtn" type="win32dll" entrypoint="0" installbase="system32" installname="dxtn.dll" allowwarnings="true" crt="msvcrt"> <importlibrary definition="dxtn.def" /> <include base="dxtn">.</include> <define name="__USE_W32API" />

15 years, 9 months

[khornicek] 38230: - avoid crash, pszExt is null when creating a link to a file without extension

by khornicek＠svn.reactos.org

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)))

15 years, 9 months

[amunger] 38229: Fix packmgr linkage.

by amunger＠svn.reactos.org

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>

15 years, 9 months

[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

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,

15 years, 9 months

[gbrunmar] 38227: Implemented IDirect3DDevice9::GetFrontBufferData()

by gbrunmar＠svn.reactos.org

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)

15 years, 9 months

[gbrunmar] 38226: * Implemented IDirect3D9Device::SetGammaRamp() * Added stub for IDirect3DSwapChain9::SetGammaRamp()

by gbrunmar＠svn.reactos.org

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_

15 years, 9 months

[gbrunmar] 38225: * Implemented IDirect3DDevice9::Present()

by gbrunmar＠svn.reactos.org

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; }

15 years, 9 months

← Newer
1
...
24
25
26
27
28
29
30
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2008