Ros-diffs March 2008

ros-diffs@reactos.org

22 participants
269 discussions

[cwittich] 32567: #define inline __inline for msvc

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Mar 5 09:09:56 2008 New Revision: 32567 URL: http://svn.reactos.org/svn/reactos?rev=3D32567&view=3Drev Log: #define inline __inline for msvc Modified: trunk/reactos/include/reactos/wine/config.h Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/= config.h?rev=3D32567&r1=3D32566&r2=3D32567&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/reactos/wine/config.h (original) +++ trunk/reactos/include/reactos/wine/config.h Wed Mar 5 09:09:56 2008 @@ -986,3 +986,7 @@ #ifndef __cplusplus /* #undef inline */ #endif + +#if defined(_MSC_VER) +#define inline __inline +#endif

16 years, 7 months

[cwittich] 32566: don't include unistd.h in msvc builds add some x64 declarations from wine to port.h

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Mar 5 09:06:17 2008 New Revision: 32566 URL: http://svn.reactos.org/svn/reactos?rev=3D32566&view=3Drev Log: don't include unistd.h in msvc builds add some x64 declarations from wine to port.h Modified: trunk/reactos/include/reactos/wine/config.h trunk/reactos/include/reactos/wine/port.h Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/= config.h?rev=3D32566&r1=3D32565&r2=3D32566&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/reactos/wine/config.h (original) +++ trunk/reactos/include/reactos/wine/config.h Wed Mar 5 09:06:17 2008 @@ -780,7 +780,9 @@ /* #undef HAVE_UNICODE_UBIDI_H */ = /* Define to 1 if you have the <unistd.h> header file. */ +#if !defined(_MSC_VER) #define HAVE_UNISTD_H 1 +#endif = /* Define to 1 if you have the `usleep' function. */ /* #undef HAVE_USLEEP */ Modified: trunk/reactos/include/reactos/wine/port.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/= port.h?rev=3D32566&r1=3D32565&r2=3D32566&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/reactos/wine/port.h (original) +++ trunk/reactos/include/reactos/wine/port.h Wed Mar 5 09:06:17 2008 @@ -48,6 +48,14 @@ /**************************************************************** * Type definitions */ + +#if !defined(_MSC_VER) && !defined(__int64) +# if defined(__x86_64__) || defined(_WIN64) +# define __int64 long +# else +# define __int64 long long +# endif +#endif = #ifndef HAVE_MODE_T typedef int mode_t;

16 years, 7 months

[cwittich] 32565: msvc compat fix

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Mar 5 09:02:02 2008 New Revision: 32565 URL: http://svn.reactos.org/svn/reactos?rev=3D32565&view=3Drev Log: msvc compat fix Modified: trunk/reactos/include/reactos/wine/config.h Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/= config.h?rev=3D32565&r1=3D32564&r2=3D32565&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/reactos/wine/config.h (original) +++ trunk/reactos/include/reactos/wine/config.h Wed Mar 5 09:02:02 2008 @@ -441,7 +441,9 @@ #define HAVE_PCLOSE 1 = /* Define to 1 if the system has the type `pid_t'. */ +#if !defined(_MSC_VER) #define HAVE_PID_T 1 +#endif = /* Define to 1 if you have the <poll.h> header file. */ /* #undef HAVE_POLL_H */

16 years, 7 months

[greatlrd] 32564: Implemented : DxEngLockHdev, DxEngUnlockHdev Thanks jimtabor for the help with these two.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Mar 5 00:35:01 2008 New Revision: 32564 URL: http://svn.reactos.org/svn/reactos?rev=3D32564&view=3Drev Log: Implemented : DxEngLockHdev, DxEngUnlockHdev = Thanks jimtabor for the help with these two. = Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drive= rs/directx/dxeng.h?rev=3D32564&r1=3D32563&r2=3D32564&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/reactos/drivers/directx/dxeng.h (original) +++ trunk/reactos/include/reactos/drivers/directx/dxeng.h Wed Mar 5 00:35:= 01 2008 @@ -87,14 +87,15 @@ DWORD DxEngGetHdevData(HDEV, DXEGSHDEVDATA); BOOLEAN DxEngSetHdevData(HDEV, DXEGSHDEVDATA, DWORD); BOOLEAN DxEngIncDispUniq(); +BOOLEAN DxEngLockHdev(HDEV hdev); +BOOLEAN DxEngUnlockHdev(HDEV hdev); = /* prototypes are not done yet, I need gather all my notes * to make them correct */ DWORD DxEngCreateMemoryDC(DWORD x1); DWORD DxEngScreenAccessCheck(); -DWORD DxEngLockHdev(DWORD x1); -DWORD DxEngUnlockHdev(DWORD x1); + DWORD DxEngReferenceHdev(DWORD x1); DWORD DxEngIsHdevLockedByCurrentThread(DWORD x1); DWORD DxEngUnreferenceHdev(DWORD x1); Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/ntddraw/dxeng.c?rev=3D32564&r1=3D32563&r2=3D32564&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Wed Mar 5 00:35:= 01 2008 @@ -465,6 +465,67 @@ return TRUE; } = +/*++ +* @name DxEngLockHdev +* @implemented +* +* The function DxEngLockHdev lock the internal PDEV +* +* @param HDEV type +* it is a pointer to win32k internal pdev struct known as PGDIDEVICE + +* @return +* This function returns TRUE no matter what. +* +* @remarks. +* none +* +*--*/ +BOOLEAN = +DxEngLockHdev(HDEV hDev) +{ + PGDIDEVICE pPDev =3D (PGDIDEVICE)hDev; + PERESOURCE Resource =3D pPDev->hsemDevLock; + + if (Resource) + { + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite( Resource , TRUE); // Lock monitor. + } + return TRUE; +} + +/*++ +* @name DxEngUnlockHdev +* @implemented +* +* The function DxEngUnlockHdev unlock the internal PDEV +* +* @param HDEV type +* it is a pointer to win32k internal pdev struct known as PGDIDEVICE + +* @return +* This function returns TRUE no matter what. +* +* @remarks. +* none +* +*--*/ +BOOLEAN = +DxEngUnlockHdev(HDEV hDev) +{ + PGDIDEVICE pPDev =3D (PGDIDEVICE)hDev; + PERESOURCE Resource =3D pPDev->hsemDevLock; + + if (Resource) + { + ExReleaseResourceLite( Resource ); + KeLeaveCriticalRegion(); + } + return TRUE; +} + + /************************************************************************/ /* DxEngNUIsTermSrv */ /************************************************************************/ @@ -532,23 +593,7 @@ return FALSE; } = -/************************************************************************/ -/* DxEngLockHdev */ -/************************************************************************/ -DWORD DxEngLockHdev(DWORD x1) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngUnlockHdev */ -/************************************************************************/ -DWORD DxEngUnlockHdev(DWORD x1) -{ - UNIMPLEMENTED; - return FALSE; -} + = /************************************************************************/ /* DxEngReferenceHdev */

16 years, 7 months

[cwittich] 32563: only destroy objects which are valid

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Mar 4 21:41:59 2008 New Revision: 32563 URL: http://svn.reactos.org/svn/reactos?rev=3D32563&view=3Drev Log: only destroy objects which are valid Modified: trunk/reactos/base/applications/msconfig/msconfig.c Modified: trunk/reactos/base/applications/msconfig/msconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msc= onfig/msconfig.c?rev=3D32563&r1=3D32562&r2=3D32563&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/applications/msconfig/msconfig.c (original) +++ trunk/reactos/base/applications/msconfig/msconfig.c Tue Mar 4 21:41:59= 2008 @@ -184,13 +184,20 @@ break; = case WM_DESTROY: - DestroyWindow(hToolsPage); - DestroyWindow(hGeneralPage); - DestroyWindow(hServicesPage); - DestroyWindow(hStartupPage); - DestroyWindow(hFreeLdrPage); - DestroyWindow(hSystemPage); - DestroyIcon(hIcon); + if (hToolsPage) + DestroyWindow(hToolsPage); + if (hGeneralPage) + DestroyWindow(hGeneralPage); + if (hServicesPage) + DestroyWindow(hServicesPage); + if (hStartupPage) + DestroyWindow(hStartupPage); + if (hFreeLdrPage) + DestroyWindow(hFreeLdrPage); + if (hSystemPage) + DestroyWindow(hSystemPage); + if (hIcon) + DestroyIcon(hIcon); return DefWindowProc(hDlg, message, wParam, lParam); } =

16 years, 7 months

[gbrunmar] 32562: Implemented IDirect3D::CheckDepthStencilMatch()

by gbrunmar＠svn.reactos.org

Author: gbrunmar Date: Tue Mar 4 18:39:33 2008 New Revision: 32562 URL: http://svn.reactos.org/svn/reactos?rev=3D32562&view=3Drev Log: Implemented IDirect3D::CheckDepthStencilMatch() Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c trunk/reactos/dll/directx/d3d9/format.c trunk/reactos/dll/directx/d3d9/format.h Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9= _impl.c?rev=3D32562&r1=3D32561&r2=3D32562&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/directx/d3d9/d3d9_impl.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_impl.c Tue Mar 4 18:39:33 2008 @@ -504,7 +504,7 @@ { DPRINT1("Invalid D3DFORMAT specified"); UNLOCK_D3D9(); - return D3DERR_NOTAVAILABLE; + return D3DERR_INVALIDCALL; } = if ((Usage & (D3DUSAGE_DONOTCLIP | D3DUSAGE_NPATCHES | D3DUSAGE_POINTS= | D3DUSAGE_RTPATCHES | D3DUSAGE_TEXTAPI | D3DUSAGE_WRITEONLY)) !=3D 0) @@ -631,13 +631,81 @@ return D3D_OK; } = + +/*++ +* @name IDirect3D9::CheckDepthStencilMatch +* @implemented +* +* The function IDirect3D9Impl_CheckDepthStencilMatch checks if a specific = combination +* of a render target D3DFORMAT and a depth-stencil D3DFORMAT can be used w= ith a specified +* D3DFORMAT on the specified display adapter. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3D object returned from Direct3DCreate9() +* +* @param UINT Adapter +* Adapter index to get information about. D3DADAPTER_DEFAULT is the primar= y display. +* The maximum value for this is the value returned by IDirect3D::GetAdapte= rCount(). +* +* @param D3DDEVTYPE DeviceType +* One of the D3DDEVTYPE enum members. +* +* @param D3DFORMAT AdapterFormat +* One of the D3DFORMAT enum members except D3DFMT_UNKNOWN that the display= adapter mode where the test should occurr. +* +* @param D3DFORMAT RenderTargetFormat +* One of the D3DFORMAT enum members except D3DFMT_UNKNOWN for the display = adapter mode's render target format to be tested. +* +* @param D3DFORMAT DepthStencilFormat +* One of the D3DFORMAT enum members except D3DFMT_UNKNOWN for the display = adapter mode's depth-stencil format to be tested. +* +* @return HRESULT +* If the DepthStencilFormat can be used with the RenderTargetFormat under = the specified AdapterFormat, +* the method returns D3D_OK. +* If the DepthStencilFormat can NOT used with the RenderTargetFormat under= the specified AdapterFormat, +* the method returns D3DERR_NOTAVAILABLE. +* If Adapter is out of range, DeviceType is invalid, +* AdapterFormat, RenderTargetFormat or DepthStencilFormat is invalid, the = method returns D3DERR_INVALIDCALL. +* +*/ static HRESULT WINAPI IDirect3D9Impl_CheckDepthStencilMatch(LPDIRECT3D9 if= ace, UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT Adap= terFormat, D3DFORMAT RenderTargetFormat, D3DFORMAT Dept= hStencilFormat) { - UNIMPLEMENTED - - return D3D_OK; + HRESULT hResult; + + LPDIRECT3D9_INT This =3D impl_from_IDirect3D9(iface); + LOCK_D3D9(); + + if (Adapter >=3D This->NumDisplayAdapters) + { + DPRINT1("Invalid Adapter number specified"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if (DeviceType !=3D D3DDEVTYPE_HAL && + DeviceType !=3D D3DDEVTYPE_REF && + DeviceType !=3D D3DDEVTYPE_SW) + { + DPRINT1("Invalid DeviceType specified"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if (AdapterFormat =3D=3D D3DFMT_UNKNOWN || + RenderTargetFormat =3D=3D D3DFMT_UNKNOWN || + DepthStencilFormat =3D=3D D3DFMT_UNKNOWN) + { + DPRINT1("Invalid D3DFORMAT specified"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + hResult =3D CheckDepthStencilMatch(&This->DisplayAdapters[Adapter].Dri= verCaps, AdapterFormat, RenderTargetFormat, DepthStencilFormat); + + UNLOCK_D3D9(); + return hResult; } = = Modified: trunk/reactos/dll/directx/d3d9/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/form= at.c?rev=3D32562&r1=3D32561&r2=3D32562&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/directx/d3d9/format.c (original) +++ trunk/reactos/dll/directx/d3d9/format.c Tue Mar 4 18:39:33 2008 @@ -45,6 +45,161 @@ } = return FALSE; +} + +BOOL IsStencilFormat(D3DFORMAT Format) +{ + switch (Format) + { + case D3DFMT_D15S1: + case D3DFMT_D24S8: + case D3DFMT_D24X4S4: + case D3DFMT_D24FS8: + return TRUE; + + default: + return FALSE; + } +} + +DWORD GetBytesPerPixel(D3DFORMAT Format) +{ + switch (Format) + { + case D3DFMT_R3G3B2: + case D3DFMT_A8: + return 1; + + case D3DFMT_R5G6B5: + case D3DFMT_X1R5G5B5: + case D3DFMT_A1R5G5B5: + case D3DFMT_A4R4G4B4: + case D3DFMT_A8R3G3B2: + case D3DFMT_X4R4G4B4: + return 2; + + case D3DFMT_R8G8B8: + return 3; + + case D3DFMT_A8R8G8B8: + case D3DFMT_X8R8G8B8: + case D3DFMT_A2B10G10R10: + case D3DFMT_A8B8G8R8: + case D3DFMT_X8B8G8R8: + case D3DFMT_G16R16: + case D3DFMT_A2R10G10B10: + return 4; + + case D3DFMT_A16B16G16R16: + return 8; + + + case D3DFMT_P8: + case D3DFMT_L8: + case D3DFMT_A4L4: + return 1; + + case D3DFMT_A8P8: + case D3DFMT_A8L8: + return 2; + + + case D3DFMT_V8U8: + case D3DFMT_L6V5U5: + return 2; + + case D3DFMT_X8L8V8U8: + case D3DFMT_Q8W8V8U8: + case D3DFMT_V16U16: + case D3DFMT_A2W10V10U10: + return 4; + + + case D3DFMT_S8_LOCKABLE: + return 1; + + case D3DFMT_D16_LOCKABLE: + case D3DFMT_D15S1: + case D3DFMT_D16: + return 2; + + case D3DFMT_D32: + case D3DFMT_D24S8: + case D3DFMT_D24X8: + case D3DFMT_D24X4S4: + case D3DFMT_D32F_LOCKABLE: + case D3DFMT_D24FS8: + case D3DFMT_D32_LOCKABLE: + return 4; + + + case D3DFMT_L16: + return 2; + + /* TODO: Handle D3DFMT_VERTEXDATA? */ + case D3DFMT_INDEX16: + return 2; + case D3DFMT_INDEX32: + return 4; + + + case D3DFMT_Q16W16V16U16: + return 8; + + + case D3DFMT_R16F: + return 2; + case D3DFMT_G16R16F: + return 4; + case D3DFMT_A16B16G16R16F: + return 8; + + + case D3DFMT_R32F: + return 4; + case D3DFMT_G32R32F: + return 8; + case D3DFMT_A32B32G32R32F: + return 16; + + case D3DFMT_CxV8U8: + return 2; + + + /* Known FourCC formats */ + case D3DFMT_UYVY: + case D3DFMT_R8G8_B8G8: + case D3DFMT_YUY2: + case D3DFMT_G8R8_G8B8: + return 2; + + case D3DFMT_DXT1: + return 0xFFFFFFF8; + + case D3DFMT_DXT2: + case D3DFMT_DXT3: + case D3DFMT_DXT4: + case D3DFMT_DXT5: + return 0xFFFFFFF0; + + case D3DFMT_MULTI2_ARGB8: + return 8; + + default: + return 0; + } +} + +DWORD GetPixelStride(D3DFORMAT Format) +{ + DWORD Bpp =3D GetBytesPerPixel(Format); + + if (0 =3D=3D Bpp) + { + /* TODO: Handle unknown formats here */ + } + + return Bpp; } = BOOL IsSupportedFormatOp(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT DisplayF= ormat, DWORD FormatOp) @@ -379,3 +534,74 @@ = return D3D_OK; } + +HRESULT CheckDepthStencilMatch(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT Ad= apterFormat, D3DFORMAT RenderTargetFormat, D3DFORMAT DepthStencilFormat) +{ + const DWORD NumFormatOps =3D pDriverCaps->NumSupportedFormatOps; + BOOL bRenderTargetAvailable =3D FALSE; + BOOL bDepthStencilAvailable =3D FALSE; + BOOL bForceSameDepthStencilBits =3D FALSE; + DWORD FormatIndex; + + if (FALSE =3D=3D IsSupportedFormatOp(pDriverCaps, AdapterFormat, D3DFO= RMAT_OP_DISPLAYMODE | D3DFORMAT_OP_3DACCELERATION)) + { + return D3DERR_NOTAVAILABLE; + } + = + if (DepthStencilFormat !=3D D3DFMT_D16_LOCKABLE && + DepthStencilFormat !=3D D3DFMT_D32F_LOCKABLE) + { + if (TRUE =3D=3D IsStencilFormat(DepthStencilFormat)) + { + bForceSameDepthStencilBits =3D TRUE; + } + } + + if (FALSE =3D=3D bForceSameDepthStencilBits && + (DepthStencilFormat =3D=3D D3DFMT_D32 || DepthStencilFormat =3D=3D= D3DFMT_D24X8)) + { + bForceSameDepthStencilBits =3D TRUE; + } + + DepthStencilFormat =3D GetStencilFormat(pDriverCaps, DepthStencilForma= t); + + /* Observe the multiple conditions */ + for (FormatIndex =3D 0; FormatIndex < NumFormatOps && (bRenderTargetAv= ailable =3D=3D FALSE || bDepthStencilAvailable =3D=3D FALSE); FormatIndex++) + { + const LPDDSURFACEDESC pSurfaceDesc =3D &pDriverCaps->pSupportedFor= matOps[FormatIndex]; + const DWORD FourCC =3D pSurfaceDesc->ddpfPixelFormat.dwFourCC; + const DWORD FormatOperations =3D pSurfaceDesc->ddpfPixelFormat.dwO= perations; + + if (FALSE =3D=3D bRenderTargetAvailable && + FourCC =3D=3D RenderTargetFormat && + (FormatOperations & D3DFORMAT_OP_SAME_FORMAT_RENDERTARGET) != =3D 0) + { + bRenderTargetAvailable =3D TRUE; + } + + if (FALSE =3D=3D bDepthStencilAvailable && + FourCC =3D=3D DepthStencilFormat && + (FormatOperations & D3DFORMAT_OP_ZSTENCIL) !=3D 0) + { + bDepthStencilAvailable =3D TRUE; + + if ((FormatOperations & D3DFORMAT_OP_ZSTENCIL_WITH_ARBITRARY_C= OLOR_DEPTH) !=3D 0) + { + bForceSameDepthStencilBits =3D FALSE; + } + } + } + + if (FALSE =3D=3D bRenderTargetAvailable || FALSE =3D=3D bDepthStencilA= vailable) + { + return D3DERR_INVALIDCALL; + } + + if (TRUE =3D=3D bForceSameDepthStencilBits) + { + if (GetPixelStride(RenderTargetFormat) !=3D GetPixelStride(DepthSt= encilFormat)) + return D3DERR_NOTAVAILABLE; + } + + return D3D_OK; +} Modified: trunk/reactos/dll/directx/d3d9/format.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/form= at.h?rev=3D32562&r1=3D32561&r2=3D32562&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/directx/d3d9/format.h (original) +++ trunk/reactos/dll/directx/d3d9/format.h Tue Mar 4 18:39:33 2008 @@ -35,4 +35,6 @@ = HRESULT CheckDeviceFormatConversion(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORM= AT SourceFormat, D3DFORMAT TargetFormat); = +HRESULT CheckDepthStencilMatch(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT Ad= apterFormat, D3DFORMAT RenderTargetFormat, D3DFORMAT DepthStencilFormat); + #endif // _FORMAT_H_

16 years, 7 months

[cwittich] 32561: fix resource file compilation with ms rc

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Mar 4 14:14:34 2008 New Revision: 32561 URL: http://svn.reactos.org/svn/reactos?rev=3D32561&view=3Drev Log: fix resource file compilation with ms rc Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/en-US.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/fr-FR.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/uk-UA.rc Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/config/lang/de-DE.rc?rev=3D32561&r1=3D32560&r2=3D32561&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc Tue Mar 4 1= 4:14:34 2008 @@ -5,8 +5,8 @@ CAPTION "RosBE Einstellungen" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Pfad zu MinGW/GCC", 0x0, 10, 107, 100, 15 - LTEXT "Hintergrundfarbe", 0x0, 10, 10, 75, 12 + LTEXT "Pfad zu MinGW/GCC", -1, 10, 107, 100, 15 + LTEXT "Hintergrundfarbe", -1, 10, 10, 75, 12 COMBOBOX IDC_BACK, 100, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP= | WS_VSCROLL | CBS_DROPDOWNLIST LTEXT "Schriftfarbe", 0x0, 10, 35, 75, 12 COMBOBOX IDC_FONT, 100, 35, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP= | WS_VSCROLL | CBS_DROPDOWNLIST Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/config/lang/en-US.rc?rev=3D32561&r1=3D32560&r2=3D32561&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/en-US.rc (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/en-US.rc Tue Mar 4 1= 4:14:34 2008 @@ -5,8 +5,8 @@ CAPTION "ReactOS Build Environment Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Path to MinGW/GCC", 0x0, 10, 107, 100, 15 - LTEXT "Background Color", 0x0, 10, 10, 75, 12 + LTEXT "Path to MinGW/GCC", -1, 10, 107, 100, 15 + LTEXT "Background Color", -1, 10, 10, 75, 12 COMBOBOX IDC_BACK, 100, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP= | WS_VSCROLL | CBS_DROPDOWNLIST LTEXT "Font Color", 0x0, 10, 35, 75, 12 COMBOBOX IDC_FONT, 100, 35, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP= | WS_VSCROLL | CBS_DROPDOWNLIST Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/config/lang/fr-FR.rc?rev=3D32561&r1=3D32560&r2=3D32561&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/fr-FR.rc (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/fr-FR.rc Tue Mar 4 1= 4:14:34 2008 @@ -5,8 +5,8 @@ CAPTION "Param=C3=A8tres de l'Environnement de Compilation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Chemin vers MinGW/GCC", 0x0, 10, 107, 110, 15 - LTEXT "Couleur d'arri=C3=A8re plan", 0x0, 10, 10, 75, 12 + LTEXT "Chemin vers MinGW/GCC", -1, 10, 107, 110, 15 + LTEXT "Couleur d'arri=C3=A8re plan", -1, 10, 10, 75, 12 COMBOBOX IDC_BACK, 100, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP= | WS_VSCROLL | CBS_DROPDOWNLIST LTEXT "Couleur de la police", 0x0, 10, 35, 75, 12 COMBOBOX IDC_FONT, 100, 35, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP= | WS_VSCROLL | CBS_DROPDOWNLIST Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/config/lang/ru-RU.rc?rev=3D32561&r1=3D32560&r2=3D32561&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc Tue Mar 4 1= 4:14:34 2008 @@ -7,8 +7,8 @@ CAPTION "=C3=93=C3=B1=C3=B2=C3=A0=C3=AD=C3=AE=C3=A2=C3=AA=C3=A8 =C3=AF=C3= =A5=C3=B0=C3=A5=C3=AC=C3=A5=C3=AD=C3=AD=C3=BB=C3=B5 =C3=AA=C3=AE=C3=AC=C3= =AF=C3=A8=C3=AB=C3=BF=C3=B2=C3=AE=C3=B0=C3=A0 ReactOS" FONT 8,"MS Sans Serif",0,0 BEGIN - LTEXT "=C3=8F=C3=B3=C3=B2=C3=BC =C3=AA =C3=AA=C3=AE=C3=AC=C3=AF=C3=A8=C3= =AB=C3=BF=C3=B2=C3=AE=C3=B0=C3=B3 GCC", 0x0, 10, 107, 100, 15 - LTEXT "=C3=96=C3=A2=C3=A5=C3=B2 =C3=B4=C3=AE=C3=AD=C3=A0", 0x0, 10, 10, = 75, 12 + LTEXT "=C3=8F=C3=B3=C3=B2=C3=BC =C3=AA =C3=AA=C3=AE=C3=AC=C3=AF=C3=A8=C3= =AB=C3=BF=C3=B2=C3=AE=C3=B0=C3=B3 GCC", -1, 10, 107, 100, 15 + LTEXT "=C3=96=C3=A2=C3=A5=C3=B2 =C3=B4=C3=AE=C3=AD=C3=A0", -1, 10, 10, 7= 5, 12 COMBOBOX IDC_BACK, 100, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP= | WS_VSCROLL | CBS_DROPDOWNLIST LTEXT "=C3=96=C3=A2=C3=A5=C3=B2 =C3=B8=C3=B0=C3=A8=C3=B4=C3=B2=C3=A0", 0= x0, 10, 35, 75, 12 COMBOBOX IDC_FONT, 100, 35, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP= | WS_VSCROLL | CBS_DROPDOWNLIST Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/config/lang/uk-UA.rc?rev=3D32561&r1=3D32560&r2=3D32561&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/uk-UA.rc (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/uk-UA.rc Tue Mar 4 1= 4:14:34 2008 @@ -13,8 +13,8 @@ CAPTION "=C3=93=C3=B1=C3=B2=C3=A0=C3=AD=C3=AE=C3=A2=C3=AA=C3=A8 =C3=A7=C3= =AC=C2=B3=C3=AD=C3=AD=C3=A8=C3=B5 =C3=AA=C3=AE=C3=AC=C3=AF=C2=B3=C3=AB=C3= =BF=C3=B2=C3=AE=C3=B0=C3=A0 ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "=C3=98=C3=AB=C3=BF=C3=B5 =C3=A4=C3=AE MinGW/GCC", 0x0, 10, 107, 1= 00, 15 - LTEXT "=C3=8A=C3=AE=C3=AB=C2=B3=C3=B0 =C3=B4=C3=AE=C3=AD=C3=B3", 0x0, 10= , 10, 75, 12 + LTEXT "=C3=98=C3=AB=C3=BF=C3=B5 =C3=A4=C3=AE MinGW/GCC", -1, 10, 107, 10= 0, 15 + LTEXT "=C3=8A=C3=AE=C3=AB=C2=B3=C3=B0 =C3=B4=C3=AE=C3=AD=C3=B3", -1, 10,= 10, 75, 12 COMBOBOX IDC_BACK, 100, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP= | WS_VSCROLL | CBS_DROPDOWNLIST LTEXT "=C3=8A=C3=AE=C3=AB=C2=B3=C3=B0 =C3=B8=C3=B0=C3=A8=C3=B4=C3=B2=C3= =B3", 0x0, 10, 35, 75, 12 COMBOBOX IDC_FONT, 100, 35, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP= | WS_VSCROLL | CBS_DROPDOWNLIST

16 years, 7 months

[cwittich] 32560: don't try to free non-allocated memory fix a resource leak fix some warnings

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Mar 4 14:14:07 2008 New Revision: 32560 URL: http://svn.reactos.org/svn/reactos?rev=3D32560&view=3Drev Log: don't try to free non-allocated memory fix a resource leak fix some warnings Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/config/options.c?rev=3D32560&r1=3D32559&r2=3D32560&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c Tue Mar 4 14:14= :07 2008 @@ -159,10 +159,8 @@ else if (wcscmp(ptr, L"_ROSBE_OUTPATH") =3D=3D 0) wcsncpy(LoadedSettings->outdir, ptr2, wcslen(ptr2)-1); } - free(WTempLine); } fclose(pFile); - free(WTempLine); LoadString(hInstance, MSG_SETLOADSUC, SBTitle, 256); SetDlgItemText(infoPtr->hwndDlg, ID_STATUSBAR, SBTitle); } @@ -259,7 +257,7 @@ case BFFM_INITIALIZED: { WCHAR ActualPath[MAX_PATH]; - GetDlgItemText(hwndParent, lParam, ActualPath, MAX_PATH); + GetDlgItemText(hwndParent, (INT) lParam, ActualPath, MAX_PATH); SendMessage(Dlg, BFFM_SETSELECTION, TRUE, (LPARAM)ActualPath); break; } @@ -283,7 +281,7 @@ } else { - SetDlgItemText(hwndParent, lParam, (LPWSTR)wParam); + SetDlgItemText(hwndParent, (INT) lParam, (LPWSTR)w= Param); } } } @@ -488,7 +486,7 @@ BOOL WriteLogSet; INT Dialog1 =3D ID_BROWSE; INT Dialog2 =3D ID_LOGDIR; - WriteLogSet =3D (SendDlgItemMessageW(Dlg, wParam, = BM_GETCHECK, 0, 0) =3D=3D BST_CHECKED); + WriteLogSet =3D (SendDlgItemMessageW(Dlg, (INT)wPa= ram, BM_GETCHECK, 0, 0) =3D=3D BST_CHECKED); if (wParam =3D=3D ID_OTHEROBJ) { Dialog1 =3D ID_BROWSEOBJ; @@ -533,6 +531,9 @@ { if (infoPtr->hIcon) DestroyIcon(infoPtr->hIcon); + if (infoPtr->hFont) + DeleteObject(infoPtr->hFont); + } = case WM_CLOSE: @@ -553,7 +554,7 @@ OptionsDlgInfo =3D HeapAlloc(GetProcessHeap(), 0, sizeof(*OptionsDlgIn= fo)); if (OptionsDlgInfo !=3D NULL) { - ZeroMemory(OptionsDlgInfo, sizeof(*OptionsDlgInfo)); + ZeroMemory(OptionsDlgInfo, sizeof(OPTIONS_DLG)); DialogBoxParam(hInst, MAKEINTRESOURCE(ID_DIALOG), 0, DlgProc, (LPA= RAM)OptionsDlgInfo); HeapFree(GetProcessHeap(), 0, OptionsDlgInfo); }

16 years, 7 months

[cwittich] 32559: oops, missed one

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Mar 4 13:57:29 2008 New Revision: 32559 URL: http://svn.reactos.org/svn/reactos?rev=3D32559&view=3Drev Log: oops, missed one Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/config/options.c?rev=3D32559&r1=3D32558&r2=3D32559&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c Tue Mar 4 13:57= :29 2008 @@ -394,7 +394,7 @@ lf.lfItalic, lf.lfUnderline, lf.lfStrikeOut, lf.lfCharSet, lf= .lfOutPrecision, lf.lfClipPrecision, lf.lfQuality, lf.lfPitchAndFamily, lf.lfF= aceName); = - for(j =3D 0; j < 16; i++) + for(j =3D 0; j < 16; j++) { LoadString(hInstance, j, TempColor, 256); SendDlgItemMessageW(Dlg, IDC_BACK, CB_ADDSTRING, 0, (LPARA= M) TempColor);

16 years, 7 months

[cwittich] 32558: fix some warnings

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Mar 4 12:36:27 2008 New Revision: 32558 URL: http://svn.reactos.org/svn/reactos?rev=3D32558&view=3Drev Log: fix some warnings Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too= ls/config/options.c?rev=3D32558&r1=3D32557&r2=3D32558&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c Tue Mar 4 12:36= :27 2008 @@ -53,8 +53,8 @@ strip =3D (SendDlgItemMessageW(infoPtr->hwndDlg, ID_STRIP, BM_GETCHECK= , 0, 0) =3D=3D BST_CHECKED); objstate =3D (SendDlgItemMessage(infoPtr->hwndDlg, ID_OTHEROBJ, BM_GET= CHECK, 0, 0) =3D=3D BST_CHECKED); outstate =3D (SendDlgItemMessageW(infoPtr->hwndDlg, ID_OTHEROUT, BM_GE= TCHECK, 0, 0) =3D=3D BST_CHECKED); - foreground =3D SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, CB_GETC= URSEL, 0, 0); - background =3D SendDlgItemMessageW(infoPtr->hwndDlg, IDC_BACK, CB_GETC= URSEL, 0, 0); + foreground =3D (INT) SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, C= B_GETCURSEL, 0, 0); + background =3D (INT) SendDlgItemMessageW(infoPtr->hwndDlg, IDC_BACK, C= B_GETCURSEL, 0, 0); GetDlgItemTextW(infoPtr->hwndDlg, ID_LOGDIR, logdir, MAX_PATH); GetDlgItemTextW(infoPtr->hwndDlg, ID_MGWDIR, mingwpath, MAX_PATH); GetDlgItemTextW(infoPtr->hwndDlg, ID_OBJDIR, objdir, MAX_PATH); @@ -222,8 +222,8 @@ strip =3D (SendDlgItemMessageW(infoPtr->hwndDlg, ID_STRIP, BM_GETCHECK= , 0, 0) =3D=3D BST_CHECKED); objstate =3D (SendDlgItemMessageW(infoPtr->hwndDlg, ID_OTHEROBJ, BM_GE= TCHECK, 0, 0) =3D=3D BST_CHECKED); outstate =3D (SendDlgItemMessageW(infoPtr->hwndDlg, ID_OTHEROUT, BM_GE= TCHECK, 0, 0) =3D=3D BST_CHECKED); - foreground =3D SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, CB_GETC= URSEL, 0, 0); - background =3D SendDlgItemMessageW(infoPtr->hwndDlg, IDC_BACK, CB_GETC= URSEL, 0, 0); + foreground =3D (INT) SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, C= B_GETCURSEL, 0, 0); + background =3D (INT) SendDlgItemMessageW(infoPtr->hwndDlg, IDC_BACK, C= B_GETCURSEL, 0, 0); GetDlgItemTextW(infoPtr->hwndDlg, ID_LOGDIR, logdir, MAX_PATH); GetDlgItemTextW(infoPtr->hwndDlg, ID_MGWDIR, mingwpath, MAX_PATH); GetDlgItemTextW(infoPtr->hwndDlg, ID_OBJDIR, objdir, MAX_PATH); @@ -268,7 +268,7 @@ if (lParam !=3D ID_MGWDIR) { WCHAR BoxMsg[256], BoxTitle[128]; - INT PathLen; + size_t PathLen; LoadString(hInstance, MSG_WARNINGBOX, BoxTitle, 128); LoadString(hInstance, MSG_INVALIDDIR, BoxMsg, 256); if (MessageBox(Dlg, BoxMsg, BoxTitle, MB_ICONWARNING | MB_= YESNO) =3D=3D IDYES) @@ -354,6 +354,7 @@ {ID_CANCEL, HLP_QUITBUTTON}, }; int i; + UINT j; LOGFONT lf; WCHAR TempColor[256]; = @@ -393,9 +394,9 @@ lf.lfItalic, lf.lfUnderline, lf.lfStrikeOut, lf.lfCharSet, lf= .lfOutPrecision, lf.lfClipPrecision, lf.lfQuality, lf.lfPitchAndFamily, lf.lfF= aceName); = - for(UINT i =3D 0; i < 16; i++) - { - LoadString(hInstance, i, TempColor, 256); + for(j =3D 0; j < 16; i++) + { + LoadString(hInstance, j, TempColor, 256); SendDlgItemMessageW(Dlg, IDC_BACK, CB_ADDSTRING, 0, (LPARA= M) TempColor); SendDlgItemMessageW(Dlg, IDC_FONT, CB_ADDSTRING, 0, (LPARA= M) TempColor); } @@ -523,7 +524,7 @@ hFontOld =3D SelectObject((HDC)wParam, infoPtr->hFont); SetTextColor((HDC)wParam, ColorsRGB[SendDlgItemMessageW(Dl= g, IDC_FONT, CB_GETCURSEL, 0, 0)]); SetBkColor((HDC)wParam, ColorsRGB[SendDlgItemMessageW(Dlg,= IDC_BACK, CB_GETCURSEL, 0, 0)]); - return (LONG)CreateSolidBrush(ColorsRGB[SendDlgItemMessage= W(Dlg, IDC_BACK, CB_GETCURSEL, 0, 0)]); + return (INT_PTR)CreateSolidBrush(ColorsRGB[SendDlgItemMess= ageW(Dlg, IDC_BACK, CB_GETCURSEL, 0, 0)]); } break; }

16 years, 7 months

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 March 2008