Ros-diffs March 2008

ros-diffs@reactos.org

22 participants
269 discussions

[gbrunmar] 32541: Implemented IDirect3D:CheckDeviceFormat()

by gbrunmar＠svn.reactos.org

Author: gbrunmar Date: Sun Mar 2 06:29:35 2008 New Revision: 32541 URL: http://svn.reactos.org/svn/reactos?rev=3D32541&view=3Drev Log: Implemented IDirect3D:CheckDeviceFormat() Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c trunk/reactos/dll/directx/d3d9/d3d9_private.h trunk/reactos/dll/directx/d3d9/format.c trunk/reactos/dll/directx/d3d9/format.h trunk/reactos/include/psdk/d3d9types.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=3D32541&r1=3D32540&r2=3D32541&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 Sun Mar 2 06:29:35 2008 @@ -363,7 +363,7 @@ * One of the D3DFORMAT enum members except D3DFMT_UNKNOWN for the display = adapter mode to be checked. * * @param D3DFORMAT BackBufferFormat -* One of the D3DFORMAT enum membersfor the render target mode to be checke= d. D3DFMT_UNKNOWN is only allowed in windowed mode. +* One of the D3DFORMAT enum members for the render target mode to be check= ed. D3DFMT_UNKNOWN is only allowed in windowed mode. * * @param BOOL Windowed * If this value is TRUE, the D3DFORMAT check will be done for windowed mod= e and FALSE equals fullscreen mode. @@ -426,19 +426,200 @@ return D3DERR_NOTAVAILABLE; } = - hResult =3D CheckDeviceFormat(&This->DisplayAdapters[Adapter].DriverCa= ps, DisplayFormat, BackBufferFormat, Windowed); + hResult =3D CheckDeviceType(&This->DisplayAdapters[Adapter].DriverCaps= , DisplayFormat, BackBufferFormat, Windowed); = UNLOCK_D3D9(); return hResult; } = + +/*++ +* @name IDirect3D9::CheckDeviceFormat +* @implemented +* +* The function IDirect3D9Impl_CheckDeviceFormat checks if a specific D3DFO= RMAT +* can be used for a specific purpose like texture, depth/stencil buffer or= as a render target +* 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 for the display = adapter mode to be checked. +* +* @param DWORD Usage +* Valid values are any of the D3DUSAGE_QUERY constants or any of these D3D= USAGE constants: +* D3DUSAGE_AUTOGENMIPMAP, D3DUSAGE_DEPTHSTENCIL, D3DUSAGE_DMAP, D3DUSAGE_D= YNAMIC, +* D3DUSAGE_NONSECURE, D3DUSAGE_RENDERTARGET and D3DUSAGE_SOFTWAREPROCESSIN= G. +* +* @param D3DRESOURCETYPE RType +* One of the D3DRESOURCETYPE enum members. Specifies what format will be u= sed for. +* +* @param D3DFORMAT CheckFormat +* One of the D3DFORMAT enum members for the surface format to be checked. +* +* @return HRESULT +* If the format is compatible with the specified usage and resource type, = the method returns D3D_OK. +* If the format isn't compatible with the specified usage and resource typ= e - the return value will be D3DERR_NOTAVAILABLE. +* If Adapter is out of range, DeviceType is invalid, AdapterFormat or Chec= kFormat is invalid, +* Usage and RType isn't compatible - the return value will be D3DERR_INVAL= IDCALL. +* +*/ static HRESULT WINAPI IDirect3D9Impl_CheckDeviceFormat(LPDIRECT3D9 iface, = UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT AdapterFo= rmat, DWORD Usage, D3DRESOURCETYPE RType, D3DFORMAT CheckForm= at) { - UNIMPLEMENTED - - return D3D_OK; + LPD3D9_DRIVERCAPS pDriverCaps; + BOOL bIsTextureRType =3D FALSE; + 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 || + CheckFormat =3D=3D D3DFMT_UNKNOWN) + { + DPRINT1("Invalid D3DFORMAT specified"); + UNLOCK_D3D9(); + return D3DERR_NOTAVAILABLE; + } + + if ((Usage & (D3DUSAGE_DONOTCLIP | D3DUSAGE_NPATCHES | D3DUSAGE_POINTS= | D3DUSAGE_RTPATCHES | D3DUSAGE_TEXTAPI | D3DUSAGE_WRITEONLY)) !=3D 0) + { + DPRINT1("Invalid Usage specified"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if (RType =3D=3D D3DRTYPE_TEXTURE || + RType =3D=3D D3DRTYPE_VOLUMETEXTURE || + RType =3D=3D D3DRTYPE_CUBETEXTURE) + { + bIsTextureRType =3D TRUE; + } + else if (RType =3D=3D D3DRTYPE_SURFACE && + (Usage & (D3DUSAGE_DEPTHSTENCIL | D3DUSAGE_RENDERTARGET)) =3D= =3D 0 && + Usage !=3D 0) + { + DPRINT1("When RType is set to D3DRTYPE_SURFACE, Usage must be 0 or= have set D3DUSAGE_DEPTHSTENCIL or D3DUSAGE_RENDERTARGET"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if ((Usage & D3DUSAGE_DEPTHSTENCIL) !=3D 0) + { + if (FALSE =3D=3D IsZBufferFormat(CheckFormat)) + { + DPRINT1("Invalid CheckFormat Z-Buffer format"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if ((Usage & D3DUSAGE_AUTOGENMIPMAP) !=3D 0) + { + DPRINT1("Invalid Usage specified, D3DUSAGE_DEPTHSTENCIL and D3= DUSAGE_AUTOGENMIPMAP can't be combined."); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + } + + if (FALSE =3D=3D bIsTextureRType && + RType !=3D D3DRTYPE_SURFACE && + RType !=3D D3DRTYPE_VOLUME) + { + DPRINT1("Invalid RType specified"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if ((Usage & (D3DUSAGE_AUTOGENMIPMAP | D3DUSAGE_DEPTHSTENCIL | D3DUSAG= E_RENDERTARGET)) !=3D 0) + { + if (RType =3D=3D D3DRTYPE_VOLUME || RType =3D=3D D3DRTYPE_VOLUMETE= XTURE) + { + DPRINT1("Invalid Usage specified, D3DUSAGE_AUTOGENMIPMAP, D3DU= SAGE_DEPTHSTENCIL and D3DUSAGE_RENDERTARGET can't be combined with RType D3= DRTYPE_VOLUME or D3DRTYPE_VOLUMETEXTURE"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + } + + if (FALSE =3D=3D bIsTextureRType && + (Usage & D3DUSAGE_QUERY_VERTEXTEXTURE) !=3D 0) + { + DPRINT1("Invalid Usage specified, D3DUSAGE_QUERY_VERTEXTEXTURE can= only be used with a texture RType"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if ((Usage & D3DUSAGE_AUTOGENMIPMAP) !=3D 0 && + TRUE =3D=3D IsMultiElementFormat(CheckFormat)) + { + DPRINT1("Invalid Usage specified, D3DUSAGE_AUTOGENMIPMAP can't be = used with a multi-element format"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + pDriverCaps =3D &This->DisplayAdapters[Adapter].DriverCaps; + if ((Usage & D3DUSAGE_DYNAMIC) !=3D 0 && bIsTextureRType =3D=3D TRUE) + { + if ((pDriverCaps->DriverCaps9.Caps2 & D3DCAPS2_DYNAMICTEXTURES) = =3D=3D 0) + { + DPRINT1("Driver doesn't support dynamic textures"); + UNLOCK_D3D9(); + return D3DERR_NOTAVAILABLE; + } + + if ((Usage & (D3DUSAGE_DEPTHSTENCIL | D3DUSAGE_RENDERTARGET)) !=3D= 0) + { + DPRINT1("Invalid Usage specified, D3DUSAGE_DEPTHSTENCIL and D3= DUSAGE_RENDERTARGET can't be combined with D3DUSAGE_DYNAMIC and a texture R= Type"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + } + + if ((Usage & D3DUSAGE_DMAP) !=3D 0) + { + if ((pDriverCaps->DriverCaps9.DevCaps2 & (D3DDEVCAPS2_PRESAMPLEDDM= APNPATCH | D3DDEVCAPS2_DMAPNPATCH)) =3D=3D 0) + { + DPRINT1("Driver doesn't support displacement mapping"); + UNLOCK_D3D9(); + return D3DERR_NOTAVAILABLE; + } + + if (RType !=3D D3DRTYPE_TEXTURE) + { + DPRINT1("Invalid Usage speficied, D3DUSAGE_DMAP must be combin= ed with RType D3DRTYPE_TEXTURE"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + } + + hResult =3D CheckDeviceFormat(pDriverCaps, AdapterFormat, Usage, RType= , CheckFormat); + + UNLOCK_D3D9(); + return hResult; } = static HRESULT WINAPI IDirect3D9Impl_CheckDeviceMultiSampleType(LPDIRECT3D= 9 iface, UINT Adapter, D3DDEVTYPE DeviceType, Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9= _private.h?rev=3D32541&r1=3D32540&r2=3D32541&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_private.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h Sun Mar 2 06:29:35 2008 @@ -222,8 +222,8 @@ /* 0x227c */ DWORD unknown002207; /* 0x2280 */ DWORD unknown002208; /* 0x2284 */ DWORD unknown002209; -/* 0x2288 */ DWORD unknown002210; -/* 0x228c */ DWORD unknown002211; +/* 0x2288 */ DWORD NumSupportedRefFormatOps; +/* 0x228c */ LPDDSURFACEDESC pSupportedRefFormatOps; /* 0x2290 */ DWORD unknown002212; /* 0x2294 */ DWORD unknown002213; /* 0x2298 */ DWORD unknown002214; @@ -1286,8 +1286,8 @@ /* 0x331c */ DWORD unknown003271; /* 0x3320 */ DWORD unknown003272; /* 0x3324 */ DWORD unknown003273; -/* 0x3328 */ DWORD unknown003274; -/* 0x332c */ DWORD unknown003275; +/* 0x3328 */ DWORD NumSupportedSoftwareFormatOps; +/* 0x332c */ LPDDSURFACEDESC pSupportedSoftwareFormatOps; /* 0x3330 */ DWORD unknown003276; /* 0x3334 */ DWORD unknown003277; /* 0x3338 */ DWORD unknown003278; Modified: trunk/reactos/dll/directx/d3d9/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/form= at.c?rev=3D32541&r1=3D32540&r2=3D32541&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 Sun Mar 2 06:29:35 2008 @@ -8,6 +8,7 @@ = #include "format.h" #include <ddrawi.h> +#include <debug.h> = BOOL IsBackBufferFormat(D3DFORMAT Format) { @@ -18,6 +19,18 @@ BOOL IsExtendedFormat(D3DFORMAT Format) { return (Format =3D=3D D3DFMT_A2R10G10B10); +} + +BOOL IsZBufferFormat(D3DFORMAT Format) +{ + UNIMPLEMENTED + + return TRUE; +} + +BOOL IsMultiElementFormat(D3DFORMAT Format) +{ + return (Format =3D=3D D3DFMT_MULTI2_ARGB8); } = BOOL IsSupportedFormatOp(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT DisplayF= ormat, DWORD FormatOp) @@ -38,7 +51,7 @@ return FALSE; } = -HRESULT CheckDeviceFormat(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT Display= Format, D3DFORMAT BackBufferFormat, BOOL Windowed) +HRESULT CheckDeviceType(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT DisplayFo= rmat, D3DFORMAT BackBufferFormat, BOOL Windowed) { if (FALSE =3D=3D IsSupportedFormatOp(pDriverCaps, DisplayFormat, D3DFO= RMAT_OP_DISPLAYMODE | D3DFORMAT_OP_3DACCELERATION)) { @@ -89,3 +102,222 @@ = return D3D_OK; } + +static D3DFORMAT GetStencilFormat(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT= CheckFormat) +{ + switch (CheckFormat) + { + case D3DFMT_D15S1: + case D3DFMT_D24S8: + case D3DFMT_D24X8: + case D3DFMT_D24X4S4: + if (IsSupportedFormatOp(pDriverCaps, CheckFormat - 1, 0)) + return CheckFormat - 1; + break; + + case D3DFMT_D16: + if (IsSupportedFormatOp(pDriverCaps, CheckFormat, 0)) + return CheckFormat; + else + return D3DFMT_D16_LOCKABLE; + + default: + /* StencilFormat same as CheckFormat */ + break; + } + + return CheckFormat; +} + +static D3DFORMAT RemoveAlphaChannel(D3DFORMAT CheckFormat) +{ + switch (CheckFormat) + { + case D3DFMT_A8R8G8B8: + return D3DFMT_X8R8G8B8; + + case D3DFMT_A1R5G5B5: + return D3DFMT_X1R5G5B5; + + case D3DFMT_A4R4G4B4: + return D3DFMT_X4R4G4B4; + + case D3DFMT_A8B8G8R8: + return D3DFMT_X8B8G8R8; + + default: + /* CheckFormat has not relevant alpha channel */ + break; + } + + return CheckFormat; +} + +HRESULT CheckDeviceFormat(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT Adapter= Format, DWORD Usage, D3DRESOURCETYPE RType, D3DFORMAT CheckFormat) +{ + const DWORD NumFormatOps =3D pDriverCaps->NumSupportedFormatOps; + DWORD NonCompatibleOperations =3D 0, MustSupportOperations =3D 0; + BOOL bSupportedWithAutogen =3D FALSE; + DWORD FormatOpIndex; + + if (FALSE =3D=3D IsSupportedFormatOp(pDriverCaps, AdapterFormat, D3DFO= RMAT_OP_DISPLAYMODE | D3DFORMAT_OP_3DACCELERATION)) + { + return D3DERR_NOTAVAILABLE; + } + + /* Check for driver auto generated mip map support if requested */ + if ((Usage & (D3DUSAGE_AUTOGENMIPMAP)) !=3D 0) + { + switch (RType) + { + case D3DRTYPE_TEXTURE: + if ((pDriverCaps->DriverCaps9.TextureCaps & D3DPTEXTURECAPS_MI= PMAP) =3D=3D 0) + return D3DERR_NOTAVAILABLE; + + break; + + case D3DRTYPE_VOLUME: + case D3DRTYPE_VOLUMETEXTURE: + if ((pDriverCaps->DriverCaps9.TextureCaps & D3DPTEXTURECAPS_MI= PVOLUMEMAP) =3D=3D 0) + return D3DERR_NOTAVAILABLE; + + break; + + case D3DRTYPE_CUBETEXTURE: + if ((pDriverCaps->DriverCaps9.TextureCaps & D3DPTEXTURECAPS_MI= PCUBEMAP) =3D=3D 0) + return D3DERR_NOTAVAILABLE; + + break; + + default: + /* Do nothing */ + break; + } + + MustSupportOperations |=3D D3DFORMAT_OP_AUTOGENMIPMAP; + } + + /* Translate from RType and Usage parameters to FormatOps */ + switch (RType) + { + case D3DRTYPE_TEXTURE: + MustSupportOperations |=3D D3DFORMAT_OP_TEXTURE; + break; + + case D3DRTYPE_VOLUME: + case D3DRTYPE_VOLUMETEXTURE: + MustSupportOperations |=3D D3DFORMAT_OP_VOLUMETEXTURE; + break; + + case D3DRTYPE_CUBETEXTURE: + MustSupportOperations |=3D D3DFORMAT_OP_CUBETEXTURE; + break; + + default: + /* Do nothing */ + break; + } + + if (Usage =3D=3D 0 && RType =3D=3D D3DRTYPE_SURFACE) + { + MustSupportOperations |=3D D3DFORMAT_OP_OFFSCREENPLAIN; + } + + if ((Usage & D3DUSAGE_DEPTHSTENCIL) !=3D 0) + { + MustSupportOperations |=3D D3DFORMAT_OP_ZSTENCIL; + } + + if ((Usage & D3DUSAGE_DMAP) !=3D 0) + { + MustSupportOperations |=3D D3DFORMAT_OP_DMAP; + } + + if ((Usage & D3DUSAGE_QUERY_LEGACYBUMPMAP) !=3D 0) + { + MustSupportOperations |=3D D3DFORMAT_OP_BUMPMAP; + } + + if ((Usage & D3DUSAGE_QUERY_SRGBREAD) !=3D 0) + { + MustSupportOperations |=3D D3DFORMAT_OP_SRGBREAD; + } + + if ((Usage & D3DUSAGE_QUERY_SRGBWRITE) !=3D 0) + { + MustSupportOperations |=3D D3DFORMAT_OP_SRGBWRITE; + } + + if ((Usage & D3DUSAGE_QUERY_VERTEXTEXTURE) !=3D 0) + { + MustSupportOperations |=3D D3DFORMAT_OP_VERTEXTEXTURE; + } + + CheckFormat =3D GetStencilFormat(pDriverCaps, CheckFormat); + + if ((Usage & D3DUSAGE_RENDERTARGET) !=3D 0) + { + if (AdapterFormat =3D=3D CheckFormat) + { + MustSupportOperations |=3D D3DFORMAT_OP_SAME_FORMAT_RENDERTARG= ET; + } + else + { + D3DFORMAT NonAlphaAdapterFormat; + D3DFORMAT NonAlphaCheckFormat; + + NonAlphaAdapterFormat =3D RemoveAlphaChannel(AdapterFormat); + NonAlphaCheckFormat =3D RemoveAlphaChannel(CheckFormat); + + if (NonAlphaAdapterFormat =3D=3D NonAlphaCheckFormat && + NonAlphaCheckFormat !=3D D3DFMT_UNKNOWN) + { + MustSupportOperations |=3D D3DFORMAT_OP_SAME_FORMAT_UP_TO_= ALPHA_RENDERTARGET; + } + else + { + MustSupportOperations |=3D D3DFORMAT_OP_OFFSCREEN_RENDERTA= RGET; + } + } + } + + if ((Usage & D3DUSAGE_QUERY_FILTER) !=3D 0) + { + NonCompatibleOperations |=3D D3DFORMAT_OP_OFFSCREENPLAIN; + } + + if ((Usage & D3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING) !=3D 0) + { + NonCompatibleOperations |=3D D3DFORMAT_OP_NOALPHABLEND; + } + + if ((Usage & D3DUSAGE_QUERY_WRAPANDMIP) !=3D 0) + { + NonCompatibleOperations |=3D D3DFORMAT_OP_NOTEXCOORDWRAPNORMIP; + } + + for (FormatOpIndex =3D 0; FormatOpIndex < NumFormatOps; FormatOpIndex+= +) + { + DWORD dwOperations; + LPDDSURFACEDESC pSurfaceDesc =3D &pDriverCaps->pSupportedFormatOps= [FormatOpIndex]; + + if (pSurfaceDesc->ddpfPixelFormat.dwFourCC !=3D CheckFormat) + continue; + + dwOperations =3D pSurfaceDesc->ddpfPixelFormat.dwOperations; + + if ((dwOperations & NonCompatibleOperations) !=3D 0) + continue; + + if ((dwOperations & MustSupportOperations) =3D=3D MustSupportOpera= tions) + return D3D_OK; + = + if (((dwOperations & MustSupportOperations) | D3DFORMAT_OP_AUTOGEN= MIPMAP) =3D=3D MustSupportOperations) + bSupportedWithAutogen =3D TRUE; + } + + if (TRUE =3D=3D bSupportedWithAutogen) + return D3DOK_NOAUTOGEN; + + return D3DERR_NOTAVAILABLE; +} Modified: trunk/reactos/dll/directx/d3d9/format.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/form= at.h?rev=3D32541&r1=3D32540&r2=3D32541&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 Sun Mar 2 06:29:35 2008 @@ -12,12 +12,25 @@ #include <d3d9.h> #include "d3d9_private.h" = +#define D3DFORMAT_OP_DMAP 0x00020000L + +/* MSVC compile fix */ +#ifndef D3DFORMAT_OP_NOTEXCOORDWRAPNORMIP +#define D3DFORMAT_OP_NOTEXCOORDWRAPNORMIP 0x01000000L +#endif + BOOL IsBackBufferFormat(D3DFORMAT Format); = BOOL IsExtendedFormat(D3DFORMAT Format); = +BOOL IsZBufferFormat(D3DFORMAT Format); + +BOOL IsMultiElementFormat(D3DFORMAT Format); + BOOL IsSupportedFormatOp(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT DisplayF= ormat, DWORD FormatOp); = -HRESULT CheckDeviceFormat(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT Display= Format, D3DFORMAT BackBufferFormat, BOOL Windowed); +HRESULT CheckDeviceType(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT DisplayFo= rmat, D3DFORMAT BackBufferFormat, BOOL Windowed); + +HRESULT CheckDeviceFormat(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT Adapter= Format, DWORD Usage, D3DRESOURCETYPE RType, D3DFORMAT CheckFormat); = #endif // _FORMAT_H_ Modified: trunk/reactos/include/psdk/d3d9types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d9type= s.h?rev=3D32541&r1=3D32540&r2=3D32541&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/psdk/d3d9types.h (original) +++ trunk/reactos/include/psdk/d3d9types.h Sun Mar 2 06:29:35 2008 @@ -110,6 +110,9 @@ #define D3DUSAGE_DYNAMIC 0x00000200L #define D3DUSAGE_AUTOGENMIPMAP 0x00000400L #define D3DUSAGE_DMAP 0x00004000L +#ifndef D3D_DISABLE_9EX +#define D3DUSAGE_TEXTAPI 0x10000000L +#endif = #define D3DUSAGE_QUERY_FILTER 0x00020000L #define D3DUSAGE_QUERY_LEGACYBUMPMAP 0x00008000L

16 years, 9 months

[greatlrd] 32545: Fixed all known issue with DdCreateSurface in gdi32, it works with more that one surface now.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Mar 2 12:19:08 2008 New Revision: 32545 URL: http://svn.reactos.org/svn/reactos?rev=3D32545&view=3Drev Log: Fixed all known issue with DdCreateSurface in gdi32, it works with more tha= t one surface now. Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/= gdientry.c?rev=3D32545&r1=3D32544&r2=3D32545&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/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Sun Mar 2 12:19:08 2008 @@ -274,11 +274,11 @@ (PDD_CANCREATESURFACEDATA)CanCreateSurf= ace); } = - - - - -/* TODO : finish all fixme */ = +/* + * @implemented + * + * DdCreateSurface + */ DWORD WINAPI DdCreateSurface(LPDDHAL_CREATESURFACEDATA pCreateSurface) @@ -301,6 +301,24 @@ PHANDLE phSurface =3D NULL, puhSurface =3D NULL; ULONG i; LPDDSURFACEDESC pSurfaceDesc =3D NULL; + + /* TODO : Speed optimze, most games/dx apps/program does not want 1 su= rface, they want lest 2 + * so we need incress the stack so it can contain 2 surface instead of= one, this will incress = + * the speed of the apps when it trying alloc buffer. How to incress t= he surface stack space + * we need create a own struct for DD_SURFACE_LOCAL DdSurfaceLocal, DD= _SURFACE_MORE DdSurfaceMore + * DD_SURFACE_GLOBAL DdSurfaceGlobal. HANDLE hPrevSurface, hSurface. l= ike + * struct { DD_SURFACE_LOCAL DdSurfaceLocal1, DD_SURFACE_LOCAL DdSurfa= ceLocal2 } + * lest so it contain two surface. maybe 4. we need watch what is most= common here before = + * we create the size activate this IF when you start doing the optim= ze and please also + * take report from user which value they got here + */ = +#if 0 + { + char buffer[1024]; \ + sprintf ( buffer, "Function %s : Optimze max to %d Surface ? (%s:%= d)\n", __FUNCTION__,SurfaceCount,__FILE__,__LINE__ ); + OutputDebugStringA(buffer); + } +#endif = /* Check how many surfaces there are */ if (SurfaceCount !=3D 1) @@ -475,12 +493,11 @@ lcl->lpSurfMore->ddsCapsEx.dwCaps3 =3D ptmpDdSurfaceMore->= ddsCapsEx.dwCaps3; lcl->lpSurfMore->ddsCapsEx.dwCaps4 =3D ptmpDdSurfaceMore->= ddsCapsEx.dwCaps4; } - /* FIXME count to next SurfaceCount for - ptmpDdSurfaceGlobal =3D pDdSurfaceGlobal; - ptmpDdSurfaceLocal =3D pDdSurfaceLocal; - ptmpDdSurfaceMore =3D pDdSurfaceMore; - we only support one surface create at moment - */ + + /* count to next SurfaceCount */ + ptmpDdSurfaceGlobal =3D (PDD_SURFACE_GLOBAL) (((PBYTE) ((ULONG= _PTR) ptmpDdSurfaceGlobal)) + sizeof(DD_SURFACE_GLOBAL)); + ptmpDdSurfaceLocal =3D (PDD_SURFACE_LOCAL) (((PBYTE) ((ULONG_P= TR) ptmpDdSurfaceLocal)) + sizeof(DD_SURFACE_LOCAL)); + ptmpDdSurfaceMore =3D (PDD_SURFACE_MORE) (((PBYTE) ((ULONG_PTR= ) ptmpDdSurfaceMore)) + sizeof(DD_SURFACE_MORE)); } } =

16 years, 9 months

[greatlrd] 32543: started adding support for more that one surface in DdCreateSurface

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Mar 2 10:28:54 2008 New Revision: 32543 URL: http://svn.reactos.org/svn/reactos?rev=3D32543&view=3Drev Log: started adding support for more that one surface in DdCreateSurface Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/= gdientry.c?rev=3D32543&r1=3D32542&r2=3D32543&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/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Sun Mar 2 10:28:54 2008 @@ -274,6 +274,10 @@ (PDD_CANCREATESURFACEDATA)CanCreateSurf= ace); } = + + + + /* TODO : finish all fixme */ = DWORD WINAPI @@ -286,7 +290,6 @@ DD_SURFACE_GLOBAL DdSurfaceGlobal; = HANDLE hPrevSurface, hSurface; - = PDD_SURFACE_LOCAL pDdSurfaceLocal =3D NULL; PDD_SURFACE_MORE pDdSurfaceMore =3D NULL; @@ -302,8 +305,40 @@ /* Check how many surfaces there are */ if (SurfaceCount !=3D 1) { - /* We'll have to allocate more data, our stack isn't big enough */ - + /* We got more that one surface so we need alloc memory for them */ + pDdSurfaceLocal =3D (PDD_SURFACE_LOCAL) HeapAlloc(GetProcessHeap()= , HEAP_ZERO_MEMORY, (sizeof(DD_SURFACE_LOCAL) * SurfaceCount )); + pDdSurfaceMore =3D (PDD_SURFACE_MORE) HeapAlloc(GetProcessHeap(), = HEAP_ZERO_MEMORY, (sizeof(DD_SURFACE_MORE) * SurfaceCount )); + pDdSurfaceGlobal =3D (PDD_SURFACE_GLOBAL) HeapAlloc(GetProcessHea= p(), HEAP_ZERO_MEMORY, (sizeof(DD_SURFACE_GLOBAL) * SurfaceCount )); + phSurface =3D HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (sizeo= f(HANDLE) * SurfaceCount )); + puhSurface =3D HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (size= of(HANDLE) * SurfaceCount )); + + /* check if we sueese alloc all memory we need */ + if ((pDdSurfaceLocal =3D=3D NULL) || (pDdSurfaceMore =3D=3D NULL) = || (pDdSurfaceGlobal =3D=3D NULL) || (phSurface =3D=3D NULL) || (puhSurface= =3D=3D NULL)) + { + pCreateSurface->ddRVal =3D DDERR_OUTOFMEMORY; + + if ( pDdSurfaceLocal !=3D NULL ) + { + HeapFree(GetProcessHeap(), 0, pDdSurfaceLocal); + } + + if ( pDdSurfaceMore !=3D NULL ) + { + HeapFree(GetProcessHeap(), 0, pDdSurfaceMore); + } + + if ( phSurface !=3D NULL ) + { + HeapFree(GetProcessHeap(), 0, phSurface); + } + + if ( puhSurface !=3D NULL ) + { + HeapFree(GetProcessHeap(), 0, puhSurface); + } + + return DDHAL_DRIVER_HANDLED; + } } else { @@ -455,7 +490,25 @@ /* Check if we have to free all our local allocations */ if (SurfaceCount > 1) { - /* FIXME: */ + if ( pDdSurfaceLocal !=3D NULL ) + { + HeapFree(GetProcessHeap(), 0, pDdSurfaceLocal); + } + + if ( pDdSurfaceMore !=3D NULL ) + { + HeapFree(GetProcessHeap(), 0, pDdSurfaceMore); + } + + if ( phSurface !=3D NULL ) + { + HeapFree(GetProcessHeap(), 0, phSurface); + } + + if ( puhSurface !=3D NULL ) + { + HeapFree(GetProcessHeap(), 0, puhSurface); + } } = /* Return */ @@ -1094,9 +1147,7 @@ * ReactOS keep this behoir to be compatible with * Windows XP */ - pData->ddRVal =3D retValue; - = - + pData->ddRVal =3D retValue; = } = /* D3D Callbacks version 2 check and setup for DirectX/ ReactX */

16 years, 9 months

[hpoussin] 32538: Clean up generated makefile.auto

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Feb 29 10:02:54 2008 New Revision: 32538 URL: http://svn.reactos.org/svn/reactos?rev=3D32538&view=3Drev Log: Clean up generated makefile.auto Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/rule.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/= mingw/modulehandler.cpp?rev=3D32538&r1=3D32537&r2=3D32538&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/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Fri Feb 29 1= 0:02:54 2008 @@ -611,7 +611,7 @@ } fprintf ( fMakefile, " 2>$(NUL)\n" ); = - if( ProxyMakefile::GenerateProxyMakefile(module) ) + if( ProxyMakefile::GenerateProxyMakefile(module) ) { DirectoryLocation root; = @@ -770,11 +770,7 @@ { CompilerFlag& compilerFlag =3D *compilerFlags[i]; if ( compilerFlag.compiler =3D=3D type ) - { - if ( parameters.length () > 0 ) - parameters +=3D " "; - parameters +=3D compilerFlag.flag; - } + parameters +=3D " " + compilerFlag.flag; } return parameters; } @@ -855,7 +851,7 @@ { fprintf ( fMakefile, - " %s", + "%s", compilerParameters.c_str () ); } } @@ -1250,21 +1246,21 @@ Rule arRule2 ( "\t$(ECHO_AR)\n" "\t${ar} -rc $@ $($(module_name)_OBJS)\n", NULL ); -Rule gasRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t)_$(module_name).o: $(source) $(dependencies) | $(INTERMEDIATE)$(SEP)$(sou= rce_dir)\n" +Rule gasRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(sour= ce_dir)\n" "\t$(ECHO_GAS)\n" "\t${gcc} -x assembler-with-cpp -c $< -o $@ -D__ASM__ $($(m= odule_name)_CFLAGS)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t)_$(module_name).o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule bootRule ( "$(module_output): $(source) $(dependencies) | $(OUTPUT)$(= SEP)$(source_dir)\n" +Rule bootRule ( "$(module_output): $(source)$(dependencies) | $(OUTPUT)$(S= EP)$(source_dir)\n" "\t$(ECHO_NASM)\n" "\t$(Q)${nasm} -f win32 $< -o $@ $($(module_name)_NASMFLAG= S)\n", "$(OUTPUT)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule nasmRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noe= xt)_$(module_name).o: $(source) $(dependencies) | $(INTERMEDIATE)$(SEP)$(so= urce_dir)\n" +Rule nasmRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noe= xt)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(sou= rce_dir)\n" "\t$(ECHO_NASM)\n" "\t$(Q)${nasm} -f win32 $< -o $@ $($(module_name)_NASMFLAG= S)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noe= xt)_$(module_name).o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule windresRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_= noext)_$(module_name).coff: $(source) $(dependencies) $(WRC_TARGET) | $(INT= ERMEDIATE)$(SEP)$(source_dir) $(TEMPORARY)\n" +Rule windresRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_= noext)_$(module_name).coff: $(source)$(dependencies) $(WRC_TARGET) | $(INTE= RMEDIATE)$(SEP)$(source_dir) $(TEMPORARY)\n" "\t$(ECHO_WRC)\n" "\t${gcc} -xc -E -DRC_INVOKED ${$(module_name)_RCFLAGS}= $(source) > $(TEMPORARY)$(SEP)$(module_name).$(source_name_noext).rci.tmp\= n" "\t$(Q)$(WRC_TARGET) ${$(module_name)_RCFLAGS} $(TEMPOR= ARY)$(SEP)$(module_name).$(source_name_noext).rci.tmp $(TEMPORARY)$(SEP)$(m= odule_name).$(source_name_noext).res.tmp\n" @@ -1277,71 +1273,71 @@ "\t$(ECHO_WMC)\n" "\t$(Q)$(WMC_TARGET) -i -H $(INTERMEDIATE)$(SEP)include$(SE= P)reactos$(SEP)$(source_name_noext).h -o $(INTERMEDIATE)$(SEP)$(source_dir)= $(SEP)$(source_name_noext).rc $(source)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t).rc", "$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext= ).h", NULL ); -Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).spec.def: $(source) $(dependencies) $(WINEBUILD_TARGET) | $(INTERM= EDIATE)$(SEP)$(source_dir)\n" +Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERME= DIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WINEBLD)\n" "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(IN= TERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E= $(source_path)$(SEP)$(source_name_noext).spec\n" "$(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_na= me_noext).stubs.c: $(source_path)$(SEP)$(source_name_noext).spec $(WINEBUIL= D_TARGET)\n" "\t$(ECHO_WINEBLD)\n" "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(IN= TERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).stubs.c --pedll $= (source_path)$(SEP)$(source_name_noext).spec\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).stubs.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noe= xt).stubs.c $(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).stubs.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noe= xt).stubs.c$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" "\t${gcc} -c $< -o $@ $($(module_name)_CFLAGS)$(compi= ler_flags)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).spec.def", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).stubs.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).stubs.o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule widlHeaderRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext).h: $(source) $(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SE= P)$(source_dir)\n" +Rule widlHeaderRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext).h: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP= )$(source_dir)\n" "\t$(ECHO_WIDL)\n" - "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -= h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).h $(sourc= e)\n", + "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h= -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).h $(source= )\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext).h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule widlServerRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_s.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_= s.h: $(source) $(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(sour= ce_dir)\n" +Rule widlServerRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_s.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_= s.h: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(sourc= e_dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h= -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h -s -S = $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c $(source)\= n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_s.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)= _s.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h $(dep= endencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_s.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)= _s.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h$(depe= ndencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" "\t${gcc} -c $< -o $@ $($(module_name)_CFLAGS)$(comp= iler_flags)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_s.h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_s.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_s.o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule widlClientRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_c.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_= c.h: $(source) $(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(sour= ce_dir)\n" +Rule widlClientRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_c.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_= c.h: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(sourc= e_dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h= -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h -c -C = $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c $(source)\= n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_c.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)= _c.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h $(dep= endencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_c.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)= _c.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h$(depe= ndencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" "\t${gcc} -c $< -o $@ $($(module_name)_CFLAGS)$(comp= iler_flags)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_c.h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_c.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_c.o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule widlProxyRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext)_p.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p= .h: $(source) $(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(sourc= e_dir)\n" +Rule widlProxyRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext)_p.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p= .h: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source= _dir)\n" "\t$(ECHO_WIDL)\n" - "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h= -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h -p -P = $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(source)\= n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext)_p.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_= p.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h $(depe= ndencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h = -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h -p -P $= (INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(source)\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext)_p.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_= p.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h$(depen= dencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" "\t${gcc} -c $< -o $@ $($(module_name)_CFLAGS)$(comp= iler_flags)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext)_p.h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext)_p.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext)_p.o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule widlTlbRule ( "$(OUTPUT)$(SEP)$(source_dir)$(SEP)$(module_name).tlb: = $(source) $(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_di= r)\n" +Rule widlTlbRule ( "$(OUTPUT)$(SEP)$(source_dir)$(SEP)$(module_name).tlb: = $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir= )\n" "\t$(ECHO_WIDL)\n" - "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -t -= T $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).tlb $(source= )\n", + "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -t -T= $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).tlb $(source)= \n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule gccRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t)_$(module_name).o: $(source) $(dependencies) | $(INTERMEDIATE)$(SEP)$(sou= rce_dir)\n" +Rule gccRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(sour= ce_dir)\n" "\t$(ECHO_CC)\n" "\t${gcc} -c $< -o $@ $($(module_name)_CFLAGS)$(compiler_fl= ags)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t)_$(module_name).o", NULL ); -Rule gccHostRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_= noext)_$(module_name).o: $(source) $(dependencies) | $(INTERMEDIATE)$(SEP)$= (source_dir)\n" +Rule gccHostRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_= noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(= source_dir)\n" "\t$(ECHO_CC)\n" "\t${host_gcc} -c $< -o $@ $($(module_name)_CFLAGS)$(co= mpiler_flags)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_= noext)_$(module_name).o", NULL ); -Rule gppRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t)_$(module_name).o: $(source) $(dependencies) | $(INTERMEDIATE)$(SEP)$(sou= rce_dir)\n" +Rule gppRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(sour= ce_dir)\n" "\t$(ECHO_CC)\n" "\t${gpp} -c $< -o $@ $($(module_name)_CFLAGS)$(compiler_fl= ags)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t)_$(module_name).o", NULL ); -Rule gppHostRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_= noext)_$(module_name).o: $(source) $(dependencies) | $(INTERMEDIATE)$(SEP)$= (source_dir)\n" +Rule gppHostRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_= noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(= source_dir)\n" "\t$(ECHO_CC)\n" "\t${host_gpp} -c $< -o $@ $($(module_name)_CFLAGS)$(co= mpiler_flags)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_= noext)_$(module_name).o", NULL ); @@ -1359,15 +1355,9 @@ string flags; string extension =3D GetExtension ( *sourceFile ); if ( extension =3D=3D ".cc" || extension =3D=3D ".cpp" || extension =3D= =3D ".cxx" ) - { flags =3D GenerateCompilerParametersFromVector ( module.non_if_data.comp= ilerFlags, CompilerTypeCPP ); - } else - { flags =3D GenerateCompilerParametersFromVector ( module.non_if_data.comp= ilerFlags, CompilerTypeCC ); - } - if ( flags !=3D "" ) - flags =3D " " + flags; = if ( pchFilename ) { @@ -1378,7 +1368,8 @@ /* WIDL generated headers may be used */ vector<FileLocation> rpcDependencies; GetRpcHeaderDependencies ( rpcDependencies ); - dependencies +=3D " " + v2s ( backend, rpcDependencies, 5 ); + if ( rpcDependencies.size () > 0 ) + dependencies +=3D " " + v2s ( backend, rpcDependencies, 5 ); = rule->Execute ( fMakefile, backend, module, generatedSourceFileName, clea= n_files, dependencies, flags ); = @@ -1488,7 +1479,7 @@ break; } = - if ( extension =3D=3D ".c" || extension =3D=3D ".cc" || extension =3D=3D = ".cpp" || extension =3D=3D ".cxx" ) + if ( extension =3D=3D ".c" || extension =3D=3D ".cc" || extension =3D=3D = ".cpp" || extension =3D=3D ".cxx" ) { GenerateGccCommand ( &sourceFile, customRule, @@ -1658,7 +1649,7 @@ = string linkerScriptArgument; if ( module.linkerScript !=3D NULL ) - linkerScriptArgument =3D ssprintf ( "-Wl,-T,%s", backend->GetFullName ( = module.linkerScript->file ).c_str () ); + linkerScriptArgument =3D ssprintf ( " -Wl,-T,%s", backend->GetFullName (= module.linkerScript->file ).c_str () ); else linkerScriptArgument =3D ""; = @@ -1674,7 +1665,7 @@ if ( !module.IsDLL () ) { fprintf ( fMakefile, - "\t%s %s %s -o %s %s %s %s\n", + "\t%s %s%s -o %s %s %s %s\n", linker.c_str (), linkerParameters.c_str (), linkerScriptArgument.c_str (), @@ -1691,15 +1682,15 @@ CLEAN_FILE ( temp_exp ); = fprintf ( fMakefile, - "\t${dlltool} --dllname %s --def %s --output-exp %s %s %s\n", + "\t${dlltool} --dllname %s --def %s --output-exp %s%s%s\n", targetName.c_str (), backend->GetFullName ( *definitionFilename ).c_str (), backend->GetFullName ( temp_exp ).c_str (), - module.mangledSymbols ? "" : "--kill-at", - module.underscoreSymbols ? "--add-underscore" : "" ); + module.mangledSymbols ? "" : " --kill-at", + module.underscoreSymbols ? " --add-underscore" : "" ); = fprintf ( fMakefile, - "\t%s %s %s %s -o %s %s %s %s\n", + "\t%s %s%s %s -o %s %s %s %s\n", linker.c_str (), linkerParameters.c_str (), linkerScriptArgument.c_str (), @@ -1710,7 +1701,7 @@ GetLinkerMacro ().c_str () ); = fprintf ( fMakefile, - "\t$(Q)$(PEFIXUP_TARGET) %s -exports %s\n", + "\t$(Q)$(PEFIXUP_TARGET) %s -exports%s\n", target_macro.c_str (), pefixupParameters.c_str() ); = @@ -1727,7 +1718,7 @@ //printf ( "%s will have all its functions exported\n", // module.target->name.c_str () ); fprintf ( fMakefile, - "\t%s %s %s -o %s %s %s %s\n", + "\t%s %s%s -o %s %s %s %s\n", linker.c_str (), linkerParameters.c_str (), linkerScriptArgument.c_str (), @@ -1822,7 +1813,8 @@ /* WIDL generated headers may be used */ vector<FileLocation> rpcDependencies; GetRpcHeaderDependencies ( rpcDependencies ); - dependencies +=3D " " + v2s ( backend, rpcDependencies, 5 ); + if ( rpcDependencies.size () > 0 ) + dependencies +=3D " " + v2s ( backend, rpcDependencies, 5 ); fprintf ( fMakefile, "%s: %s | %s\n", backend->GetFullName ( *pchFilename ).c_str(), @@ -1855,11 +1847,11 @@ const FileLocation *definitionFilename =3D GetDefinitionFilename (); = fprintf ( fMakefile, - "\t${dlltool} --dllname %s --def %s --output-lib $@ %s %s\n", + "\t${dlltool} --dllname %s --def %s --output-lib $@%s%s\n", module.importLibrary->dllname.c_str (), backend->GetFullName ( *definitionFilename ).c_str (), - module.mangledSymbols ? "" : "--kill-at", - module.underscoreSymbols ? "--add-underscore" : "" ); + module.mangledSymbols ? "" : " --kill-at", + module.underscoreSymbols ? " --add-underscore" : "" ); = delete definitionFilename; } @@ -2284,7 +2276,7 @@ string extension =3D GetExtension ( sourceFile ); if (extension =3D=3D ".mc" || extension =3D=3D ".MC" ) { - string dependency =3D ssprintf ( " $(%s_MCHEADERS)", m.name.c_str () ); + string dependency =3D ssprintf ( "$(%s_MCHEADERS)", m.name.c_str () ); dependencies.push_back ( dependency ); } } @@ -2383,12 +2375,12 @@ fprintf ( fMakefile, "\t$(ECHO_DLLTOOL)\n" ); = fprintf ( fMakefile, - "\t${dlltool} --dllname %s --def %s --output-lib %s %s %s\n\n", + "\t${dlltool} --dllname %s --def %s --output-lib %s%s%s\n\n", module.output->name.c_str (), backend->GetFullName ( *defFilename ).c_str (), backend->GetFullName ( *library_target ).c_str (), - module.mangledSymbols ? "" : "--kill-at", - module.underscoreSymbols ? "--add-underscore" : "" ); + module.mangledSymbols ? "" : " --kill-at", + module.underscoreSymbols ? " --add-underscore" : "" ); = delete defFilename; delete library_target; @@ -2575,7 +2567,7 @@ = GenerateLinkerCommand ( dependencies, linkerParameters + " $(NTOSKRNL_SHARED)", - "-sections" ); + " -sections" ); } else { @@ -2677,7 +2669,7 @@ module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, linkerParameters, - "-sections" ); + " -sections" ); } else { @@ -2726,7 +2718,7 @@ module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, linkerParameters, - "-sections" ); + " -sections" ); } else { @@ -3134,24 +3126,24 @@ = fprintf ( fMakefile, "\t$(ECHO_LD)\n" ); = - if (Environment::GetArch() =3D=3D "arm") - { - fprintf ( fMakefile, - "\t${gcc} -Wl,--subsystem,native -Wl,--section-start,star= tup=3D0x8000 -o %s %s %s %s\n", - backend->GetFullName ( junk_tmp ).c_str (), - objectsMacro.c_str (), - linkDepsMacro.c_str (), - GetLinkerMacro ().c_str ()); - } - else - { - fprintf ( fMakefile, - "\t${gcc} -Wl,--subsystem,native -Wl,-Ttext,0x8000 -o %s = %s %s %s\n", - backend->GetFullName ( junk_tmp ).c_str (), - objectsMacro.c_str (), - linkDepsMacro.c_str (), - GetLinkerMacro ().c_str ()); - } + if (Environment::GetArch() =3D=3D "arm") + { + fprintf ( fMakefile, + "\t${gcc} -Wl,--subsystem,native -Wl,--section-start,startup=3D= 0x8000 -o %s %s %s %s\n", + backend->GetFullName ( junk_tmp ).c_str (), + objectsMacro.c_str (), + linkDepsMacro.c_str (), + GetLinkerMacro ().c_str ()); + } + else + { + fprintf ( fMakefile, + "\t${gcc} -Wl,--subsystem,native -Wl,-Ttext,0x8000 -o %s %s %s = %s\n", + backend->GetFullName ( junk_tmp ).c_str (), + objectsMacro.c_str (), + linkDepsMacro.c_str (), + GetLinkerMacro ().c_str ()); + } fprintf ( fMakefile, "\t${objcopy} -O binary %s $@\n", backend->GetFullName ( junk_tmp ).c_str () ); @@ -3439,12 +3431,12 @@ FileLocation reactosInf ( bootcdReactos.directory, bootcdReactos.relative_path, "reactos.inf" ); - FileLocation vgafontsCab( bootcdReactos.directory, - bootcdReactos.relative_path, - "vgafonts.cab"); - FileLocation vgafontsDir( SourceDirectory, - "media" + sSep + "vgafonts", - "" ); + FileLocation vgafontsCab( bootcdReactos.directory, + bootcdReactos.relative_path, + "vgafonts.cab"); + FileLocation vgafontsDir( SourceDirectory, + "media" + sSep + "vgafonts", + "" ); = vSourceFiles.push_back ( reactosDff ); = @@ -3474,10 +3466,10 @@ cdFiles.c_str (), cdDirectories.c_str () ); fprintf ( fMakefile, "\t$(ECHO_CABMAN)\n" ); - fprintf ( fMakefile, - "\t$(Q)$(CABMAN_TARGET) -M raw -S %s %s\\*.bin\n", // E= scape the asterisk for Make - backend->GetFullName ( vgafontsCab ).c_str (), - backend->GetFullName ( vgafontsDir ).c_str ()); + fprintf ( fMakefile, + "\t$(Q)$(CABMAN_TARGET) -M raw -S %s %s\\*.bin\n", // Esca= pe the asterisk for Make + backend->GetFullName ( vgafontsCab ).c_str (), + backend->GetFullName ( vgafontsDir ).c_str ()); fprintf ( fMakefile, "\t$(Q)$(CABMAN_TARGET) -C %s -L %s -I -P $(OUTPUT)\n", backend->GetFullName ( reactosDff ).c_str (), Modified: trunk/reactos/tools/rbuild/backend/mingw/rule.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/= mingw/rule.cpp?rev=3D32538&r1=3D32537&r2=3D32538&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/tools/rbuild/backend/mingw/rule.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/rule.cpp Fri Feb 29 10:02:54 2= 008 @@ -40,10 +40,8 @@ const std::string& additional_dependencies, const std::string&= compiler_flags ) { string ret =3D str; - string dep =3D ""; + string dep =3D additional_dependencies; = - if ( additional_dependencies.length () > 0 ) - dep +=3D additional_dependencies; dep +=3D " " + module.xmlbuildFile; = if ( source )

16 years, 9 months

[greatlrd] 32539: finish implemented of DvpVideoport, misc, misc2, Color Control, NT callbacks not tested to 100% yet stub up almost all callbacks that DdGetDriverInfo setup, mark out where DirectX DdBltAlphaBlend are ReactOS gdi32.dll was tested in windows xp and it seam working fine with dx1-7 at moment, even not everything are finish.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Mar 1 11:28:44 2008 New Revision: 32539 URL: http://svn.reactos.org/svn/reactos?rev=3D32539&view=3Drev Log: finish implemented of DvpVideoport, misc, misc2, Color Control, NT callback= s not tested to 100% yet stub up almost all callbacks that DdGetDriverInfo setup, mark out where Dir= ectX DdBltAlphaBlend are = ReactOS gdi32.dll was tested in windows xp and it seam working fine with d= x1-7 at moment, even not everything are finish. = Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/= gdientry.c?rev=3D32539&r1=3D32538&r2=3D32539&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/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Sat Mar 1 11:28:44 2008 @@ -603,7 +603,7 @@ WINAPI DvpWaitForVideoPortSync(LPDDHAL_WAITFORVPORTSYNCDATA pDvdWaitForVideoPortS= ync) { - return NtGdiDvpWaitForVideoPortSync(pDvdWaitForVideoPortSync->lpVideoP= ort->hDDVideoPort, (PDD_WAITFORVPORTSYNCDATA) pDvdWaitForVideoPortSync); + return NtGdiDvpWaitForVideoPortSync(pDvdWaitForVideoPortSync->lpVideoP= ort->hDDVideoPort, (PDD_WAITFORVPORTSYNCDATA) pDvdWaitForVideoPortSync); } = /* @@ -670,121 +670,485 @@ return NtGdiDvpUpdateVideoPort(pDvdUpdateVideoPort->lpVideoPort->hDDVi= deoPort,phSurfaceVideo,phSurfaceVbi, (PDD_UPDATEVPORTDATA)pDvdUpdateVideoPo= rt); } = +/* + * @implemented + * + * DvpWaitForVideoPortSync + */ +DWORD +WINAPI +DvpGetVideoPortField(LPDDHAL_FLIPVPORTDATA pDvdGetVideoPortField) +{ + return NtGdiDvpGetVideoPortField(pDvdGetVideoPortField->lpVideoPort->h= DDVideoPort, (PDD_GETVPORTFIELDDATA)pDvdGetVideoPortField); +} + +/* + * @implemented + * + * DvpWaitForVideoPortSync + */ +DWORD +WINAPI +DvpGetVideoPortInputFormats(LPDDHAL_GETVPORTINPUTFORMATDATA pDvdGetVideoPo= rtInputFormat) +{ + return NtGdiDvpGetVideoPortInputFormats(pDvdGetVideoPortInputFormat->l= pVideoPort->hDDVideoPort, (PDD_GETVPORTINPUTFORMATDATA) pDvdGetVideoPortInp= utFormat); +} + + +/* + * @implemented + * + * DvpGetVideoPortLine + */ +DWORD +WINAPI +DvpGetVideoPortLine(LPDDHAL_GETVPORTLINEDATA pDvdGetVideoPortLine) +{ + return NtGdiDvpGetVideoPortLine(pDvdGetVideoPortLine->lpVideoPort->hDD= VideoPort, (PDD_GETVPORTLINEDATA)pDvdGetVideoPortLine); +} + +/* + * @implemented + * + * DvpGetVideoPortOutputFormats + */ +DWORD +WINAPI +DvpGetVideoPortOutputFormats(LPDDHAL_GETVPORTLINEDATA pDvdGetVideoPortOutp= utFormat) +{ + return NtGdiDvpGetVideoPortLine(pDvdGetVideoPortOutputFormat->lpVideoP= ort->hDDVideoPort, (PDD_GETVPORTLINEDATA)pDvdGetVideoPortOutputFormat); +} + + +/* + * @implemented + * + * DvpGetVideoPortConnectInfo + */ +DWORD +WINAPI +DvpGetVideoPortConnectInfo(LPDDHAL_GETVPORTCONNECTDATA pDvdGetVideoPortInf= o) +{ + return NtGdiDvpGetVideoPortConnectInfo( GetDdHandle( pDvdGetVideoPortI= nfo->lpDD->lpGbl->hDD) , (PDD_GETVPORTCONNECTDATA) pDvdGetVideoPortInfo); +} + +/* + * @implemented + * + * DdGetAvailDriverMemory + */ +DWORD +WINAPI +DdGetAvailDriverMemory(LPDDHAL_GETAVAILDRIVERMEMORYDATA pDdGetAvailDriverM= emory) +{ + return NtGdiDdGetAvailDriverMemory(GetDdHandle( pDdGetAvailDriverMemory-= >lpDD->hDD), (PDD_GETAVAILDRIVERMEMORYDATA) pDdGetAvailDriverMemory); +} + +/* + * @implemented + * + * DdAlphaBlt + */ +DWORD +WINAPI +DdAlphaBlt(LPDDHAL_BLTDATA pDdAlphaBlt) +{ + HANDLE hDDSrcSurface =3D 0; = + + if (pDdAlphaBlt->lpDDSrcSurface !=3D 0) + { + hDDSrcSurface =3D (HANDLE) pDdAlphaBlt->lpDDSrcSurface->hDDSurface= ; = + } + = + return NtGdiDdAlphaBlt((HANDLE)pDdAlphaBlt->lpDDDestSurface->hDDSurfac= e, hDDSrcSurface, (PDD_BLTDATA)&pDdAlphaBlt); +} + +/* + * @implemented + * + * DdCreateSurfaceEx + */ +DWORD +WINAPI +DdCreateSurfaceEx(LPDDHAL_CREATESURFACEEXDATA pDdCreateSurfaceEx) +{ + pDdCreateSurfaceEx->ddRVal =3D NtGdiDdCreateSurfaceEx( GetDdHandle(pDd= CreateSurfaceEx->lpDDLcl->lpGbl->hDD), + (HANDLE)pDdCreate= SurfaceEx->lpDDSLcl->hDDSurface, = + pDdCreateSurfaceE= x->lpDDSLcl->lpSurfMore->dwSurfaceHandle); = + return TRUE; +} + +/* + * @implemented + * + * DdColorControl + */ +DWORD +WINAPI +DdColorControl(LPDDHAL_COLORCONTROLDATA pDdColorControl) +{ + return NtGdiDdColorControl( (HANDLE) pDdColorControl->lpDDSurface->hDD= Surface, (PDD_COLORCONTROLDATA) &pDdColorControl); +} + + +/* + * @implemented + * + * DdSetExclusiveMode + */ +DWORD +WINAPI +DdSetExclusiveMode(LPDDHAL_SETEXCLUSIVEMODEDATA pDdSetExclusiveMode) +{ + return NtGdiDdSetExclusiveMode( GetDdHandle(pDdSetExclusiveMode->lpDD-= >hDD), (PDD_SETEXCLUSIVEMODEDATA) &pDdSetExclusiveMode); +} + +/* + * @implemented + * + * DdFlipToGDISurface + */ +DWORD +WINAPI +DdFlipToGDISurface(LPDDHAL_FLIPTOGDISURFACEDATA pDdFlipToGDISurface) +{ + return NtGdiDdFlipToGDISurface( GetDdHandle(pDdFlipToGDISurface->lpDD-= >hDD), (PDD_FLIPTOGDISURFACEDATA) &pDdFlipToGDISurface); +} + + + + /* TODO */ - DWORD WINAPI DdGetDriverInfo(LPDDHAL_GETDRIVERINFODATA pData) -{ - HANDLE hDD =3D GetDdHandle(pData->dwContext); - - /* Get videoport callbacks */ - if (IsEqualGUID(&pData->guidInfo, &GUID_VideoPortCallbacks)) - { - DDHAL_GETDRIVERINFODATA pDvdPortInfo; - DDHAL_DDVIDEOPORTCALLBACKS pDvdPort; - DDHAL_DDVIDEOPORTCALLBACKS* pUserDvdPort =3D (DDHAL_DDVIDEOPORTCAL= LBACKS *)pData->lpvData; - DWORD retValue; +{ = + DDHAL_GETDRIVERINFODATA pDrvInfoData; + DWORD retValue =3D DDHAL_DRIVER_NOTHANDLED; + HANDLE hDD; + + /* FIXME add SEH around this functions */ + + RtlZeroMemory(&pDrvInfoData, sizeof (DDHAL_GETDRIVERINFODATA)); = = + RtlCopyMemory(&pDrvInfoData.guidInfo, &pData->guidInfo, sizeof(GUI= D)); + = + hDD =3D GetDdHandle(pData->dwContext); + + pDrvInfoData.dwSize =3D sizeof (DDHAL_GETDRIVERINFODATA); + pDrvInfoData.ddRVal =3D DDERR_GENERIC; = + pDrvInfoData.dwContext =3D (ULONG_PTR)hDD; = - /* Clear user out buffer */ - RtlZeroMemory(pUserDvdPort, DDVIDEOPORTCALLBACKSSIZE); = - - /* Clear internal out buffer and set it up*/ - RtlZeroMemory(&pDvdPort, DDVIDEOPORTCALLBACKSSIZE); - pDvdPort.dwSize =3D DDVIDEOPORTCALLBACKSSIZE; - - /* Clear internal in buffer and set it up*/ - RtlZeroMemory(&pDvdPortInfo, sizeof (DDHAL_GETDRIVERINFODATA)); = = - pDvdPortInfo.dwSize =3D sizeof (DDHAL_GETDRIVERINFODATA); - pDvdPortInfo.guidInfo =3D GUID_VideoPortCallbacks; - pDvdPortInfo.lpvData =3D (PVOID)&pDvdPort; - pDvdPortInfo.ddRVal =3D DDERR_GENERIC; - pDvdPortInfo.dwExpectedSize =3D DDVIDEOPORTCALLBACKSSIZE ; = - pDvdPortInfo.dwContext =3D (ULONG_PTR) hDD; + = + /* Videoport Callbacks check and setup for DirectX/ ReactX */ + if (IsEqualGUID(&pData->guidInfo, &GUID_VideoPortCallbacks)) + { = + DDHAL_DDVIDEOPORTCALLBACKS pDvdPort; + DDHAL_DDVIDEOPORTCALLBACKS* pUserDvdPort =3D (DDHAL_DDVIDEOPOR= TCALLBACKS *)pData->lpvData; = + + /* Clear internal out buffer and set it up*/ + RtlZeroMemory(&pDvdPort, DDVIDEOPORTCALLBACKSSIZE); + pDvdPort.dwSize =3D DDVIDEOPORTCALLBACKSSIZE; + + /* set up internal buffer */ = = + pDrvInfoData.lpvData =3D (PVOID)&pDvdPort; = + pDrvInfoData.dwExpectedSize =3D DDVIDEOPORTCALLBACKSSIZE ; = + = + /* Call win32k */ + retValue =3D NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)= &pDrvInfoData); + + /* Setup user out buffer and convert kmode callbacks to user m= ode */ + pUserDvdPort->dwSize =3D DDVIDEOPORTCALLBACKSSIZE; = + pUserDvdPort->dwFlags =3D pDrvInfoData.dwFlags =3D 0; + = + pUserDvdPort->dwFlags =3D (pDrvInfoData.dwFlags & ~(DDHAL_VPOR= T32_CREATEVIDEOPORT | DDHAL_VPORT32_FLIP | + DDHAL_VPORT3= 2_DESTROY | DDHAL_VPORT32_UPDATE | DDHAL_VPORT32_WAITFORSYNC)) | + (DDHAL_VPORT3= 2_CREATEVIDEOPORT | DDHAL_VPORT32_FLIP | + DDHAL_VPORT3= 2_DESTROY | DDHAL_VPORT32_UPDATE); + + pData->dwActualSize =3D DDVIDEOPORTCALLBACKSSIZE; = + pUserDvdPort->CreateVideoPort =3D (LPDDHALVPORTCB_CREATEVIDEOP= ORT) DvpCreateVideoPort; + pUserDvdPort->FlipVideoPort =3D (LPDDHALVPORTCB_FLIP) DvpFlipV= ideoPort; + pUserDvdPort->DestroyVideoPort =3D (LPDDHALVPORTCB_DESTROYVPOR= T) DvpDestroyVideoPort; + pUserDvdPort->UpdateVideoPort =3D (LPDDHALVPORTCB_UPDATE) DvpU= pdateVideoPort; + + if (pDvdPort.CanCreateVideoPort) + { + pUserDvdPort->CanCreateVideoPort =3D (LPDDHALVPORTCB_CANCR= EATEVIDEOPORT) DvpCanCreateVideoPort; + } + + if (pDvdPort.GetVideoPortBandwidth) + { + pUserDvdPort->GetVideoPortBandwidth =3D (LPDDHALVPORTCB_GE= TBANDWIDTH) DvpGetVideoPortBandwidth; + } + + if (pDvdPort.GetVideoPortInputFormats) + { + pUserDvdPort->GetVideoPortInputFormats =3D (LPDDHALVPORTCB= _GETINPUTFORMATS) DvpGetVideoPortInputFormats; + } + + if (pDvdPort.GetVideoPortOutputFormats) + { + pUserDvdPort->GetVideoPortOutputFormats =3D (LPDDHALVPORTC= B_GETOUTPUTFORMATS) DvpGetVideoPortOutputFormats; + } + + if (pDvdPort.GetVideoPortField) + { + pUserDvdPort->GetVideoPortField =3D (LPDDHALVPORTCB_GETFIE= LD) DvpGetVideoPortField; = + } + + if (pDvdPort.GetVideoPortLine) + { + pUserDvdPort->GetVideoPortLine =3D (LPDDHALVPORTCB_GETLINE= ) DvpGetVideoPortLine; + } + + if (pDvdPort.GetVideoPortConnectInfo) + { + pUserDvdPort->GetVideoPortConnectInfo =3D (LPDDHALVPORTCB_= GETVPORTCONNECT) DvpGetVideoPortConnectInfo; + } + + if (pDvdPort.GetVideoPortFlipStatus) + { + pUserDvdPort->GetVideoPortFlipStatus =3D (LPDDHALVPORTCB_G= ETFLIPSTATUS) DvpGetVideoPortFlipStatus; + } = - /* Call win32k */ - retValue =3D NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)&pDv= dPortInfo); - - /* Setup user out buffer and convert kmode callbacks to user mode = */ - pUserDvdPort->dwSize =3D DDVIDEOPORTCALLBACKSSIZE; = - = - pUserDvdPort->dwFlags =3D (pDvdPortInfo.dwFlags & ~(DDHAL_VPORT32_= CREATEVIDEOPORT | DDHAL_VPORT32_FLIP | - DDHAL_VPORT32_DE= STROY | DDHAL_VPORT32_UPDATE )) | - (DDHAL_VPORT32_CR= EATEVIDEOPORT | DDHAL_VPORT32_FLIP | - DDHAL_VPORT32_DE= STROY | DDHAL_VPORT32_UPDATE); - - pData->dwActualSize =3D DDVIDEOPORTCALLBACKSSIZE; = - pUserDvdPort->CreateVideoPort =3D (LPDDHALVPORTCB_CREATEVIDEOPORT)= DvpCreateVideoPort; - pUserDvdPort->FlipVideoPort =3D (LPDDHALVPORTCB_FLIP) DvpFlipVideo= Port; - pUserDvdPort->DestroyVideoPort =3D (LPDDHALVPORTCB_DESTROYVPORT) D= vpDestroyVideoPort; - pUserDvdPort->UpdateVideoPort =3D (LPDDHALVPORTCB_UPDATE) DvpUpdat= eVideoPort; - - if (pDvdPort.CanCreateVideoPort) - { - pUserDvdPort->CanCreateVideoPort =3D (LPDDHALVPORTCB_CANCREAT= EVIDEOPORT) DvpCanCreateVideoPort; - } - - if (pDvdPort.GetVideoPortBandwidth) - { - pUserDvdPort->GetVideoPortBandwidth =3D (LPDDHALVPORTCB_GETBAN= DWIDTH) DvpGetVideoPortBandwidth; - } - - if (pDvdPort.GetVideoPortInputFormats) - { - pUserDvdPort->GetVideoPortInputFormats =3D (LPDDHALVPORTCB_GET= INPUTFORMATS) NULL; // FIXME : DvpGetVideoPortInputFormats - } - - if (pDvdPort.GetVideoPortOutputFormats) - { - pUserDvdPort->GetVideoPortOutputFormats =3D (LPDDHALVPORTCB_GE= TOUTPUTFORMATS) NULL; // FIXME : DvpGetVideoPortInputFormats - } - - if (pDvdPort.GetVideoPortField) - { - pUserDvdPort->GetVideoPortField =3D (LPDDHALVPORTCB_GETFIELD) = NULL; // FIXME : DvpGetVideoPortField = - } - - if (pDvdPort.GetVideoPortLine) - { - pUserDvdPort->GetVideoPortLine =3D (LPDDHALVPORTCB_GETLINE) NU= LL; // FIXME : DvpGetVideoPortLine - } - - if (pDvdPort.GetVideoPortConnectInfo) - { - pUserDvdPort->GetVideoPortConnectInfo =3D (LPDDHALVPORTCB_GETV= PORTCONNECT) NULL; // FIXME : DvpGetVideoPortConnectInfo - } - - if (pDvdPort.GetVideoPortFlipStatus) - { - pUserDvdPort->GetVideoPortFlipStatus =3D (LPDDHALVPORTCB_GETFL= IPSTATUS) DvpGetVideoPortFlipStatus; - } - = - if (pDvdPort.WaitForVideoPortSync) - { - pUserDvdPort->WaitForVideoPortSync =3D (LPDDHALVPORTCB_WAITFOR= SYNC) DvpWaitForVideoPortSync; = - } - - if (pDvdPort.GetVideoSignalStatus) - { - pUserDvdPort->GetVideoSignalStatus =3D (LPDDHALVPORTCB_GETSIGN= ALSTATUS) DvpGetVideoSignalStatus; - } - - if (pDvdPort.ColorControl) - { - pUserDvdPort->ColorControl =3D (LPDDHALVPORTCB_COLORCONTROL) D= vpColorControl; - } - - /* Windows XP never repot back the true return value, = - * it only report back if we have a driver or not - * ReactOS keep this behoir to be compatible with - * Windows XP - */ - pData->ddRVal =3D retValue; - return retValue; - } - - /* FIXME not supported yet */ - return 0; + if (pDvdPort.WaitForVideoPortSync) + { + pUserDvdPort->WaitForVideoPortSync =3D (LPDDHALVPORTCB_WAI= TFORSYNC) DvpWaitForVideoPortSync; = + } + + if (pDvdPort.GetVideoSignalStatus) + { + pUserDvdPort->GetVideoSignalStatus =3D (LPDDHALVPORTCB_GET= SIGNALSTATUS) DvpGetVideoSignalStatus; + } + + if (pDvdPort.ColorControl) + { + pUserDvdPort->ColorControl =3D (LPDDHALVPORTCB_COLORCONTRO= L) DvpColorControl; + } + + /* Windows XP never repot back the true return value, = + * it only report back if we have a driver or not + * ReactOS keep this behoir to be compatible with + * Windows XP + */ + pData->ddRVal =3D retValue; + } + + /* Color Control Callbacks check and setup for DirectX/ ReactX */ + if (IsEqualGUID(&pData->guidInfo, &GUID_ColorControlCallbacks)) + { + DDHAL_DDCOLORCONTROLCALLBACKS pColorControl; + DDHAL_DDCOLORCONTROLCALLBACKS* pUserColorControl =3D (DDHAL_DD= COLORCONTROLCALLBACKS *)pData->lpvData; + = + /* Clear internal out buffer and set it up*/ + RtlZeroMemory(&pColorControl, DDCOLORCONTROLCALLBACKSSIZE); + pColorControl.dwSize =3D DDCOLORCONTROLCALLBACKSSIZE; + + /* set up internal buffer */ = = + pDrvInfoData.lpvData =3D (PVOID)&pColorControl; = + pDrvInfoData.dwExpectedSize =3D DDCOLORCONTROLCALLBACKSSIZE ; = + = + /* Call win32k */ + retValue =3D NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)= &pDrvInfoData); + = + pData->dwActualSize =3D DDCOLORCONTROLCALLBACKSSIZE; + pData->dwFlags =3D pDrvInfoData.dwFlags; + + pUserColorControl->dwSize =3D DDCOLORCONTROLCALLBACKSSIZE; + pUserColorControl->dwFlags =3D pUserColorControl->dwFlags; + = + if (pColorControl.ColorControl !=3D NULL) + { + pUserColorControl->ColorControl =3D (LPDDHALCOLORCB_COLORC= ONTROL) DdColorControl; + } + + /* Windows XP never repot back the true return value, = + * it only report back if we have a driver or not + * ReactOS keep this behoir to be compatible with + * Windows XP + */ + pData->ddRVal =3D retValue; + } + + /* Misc Callbacks check and setup for DirectX/ ReactX */ + else if (IsEqualGUID(&pData->guidInfo, &GUID_MiscellaneousCallback= s)) + { + DDHAL_DDMISCELLANEOUSCALLBACKS pMisc; + DDHAL_DDMISCELLANEOUSCALLBACKS* pUserMisc =3D (DDHAL_DDMISCELL= ANEOUSCALLBACKS *)pData->lpvData; + = + /* Clear internal out buffer and set it up*/ + RtlZeroMemory(&pMisc, DDMISCELLANEOUSCALLBACKSSIZE); + pMisc.dwSize =3D DDMISCELLANEOUSCALLBACKSSIZE; + + /* set up internal buffer */ = = + pDrvInfoData.lpvData =3D (PVOID)&pMisc; = + pDrvInfoData.dwExpectedSize =3D DDMISCELLANEOUSCALLBACKSSIZE ;= = + = + /* Call win32k */ + retValue =3D NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)= &pDrvInfoData); + + pData->dwActualSize =3D DDMISCELLANEOUSCALLBACKSSIZE; + + /* Only one callbacks are supported */ = + pUserMisc->dwFlags =3D pMisc.dwFlags & DDHAL_MISCCB32_GETAVAIL= DRIVERMEMORY; + pUserMisc->GetAvailDriverMemory =3D (LPDDHAL_GETAVAILDRIVERMEM= ORY) DdGetAvailDriverMemory; + + /* This callbacks are only for win9x and theirfor it is not lo= nger use in NT or ReactOS + * pUserMisc->UpdateNonLocalHeap; + * pUserMisc->GetHeapAlignment; + * pUserMisc->GetSysmemBltStatus; */ + + /* Windows XP never repot back the true return value, = + * it only report back if we have a driver or not + * ReactOS keep this behoir to be compatible with + * Windows XP + */ + pData->ddRVal =3D retValue; + } + + /* Misc 2 Callbacks check and setup for DirectX/ ReactX */ + else if (IsEqualGUID(&pData->guidInfo, &GUID_Miscellaneous2Callbac= ks)) + { + DDHAL_DDMISCELLANEOUS2CALLBACKS pMisc; + DDHAL_DDMISCELLANEOUS2CALLBACKS* pUserMisc =3D (DDHAL_DDMISCEL= LANEOUS2CALLBACKS *)pData->lpvData; + = + /* Clear internal out buffer and set it up*/ + RtlZeroMemory(&pMisc, DDMISCELLANEOUS2CALLBACKSSIZE); + pMisc.dwSize =3D DDMISCELLANEOUS2CALLBACKSSIZE; + + /* set up internal buffer */ = = + pDrvInfoData.lpvData =3D (PVOID)&pMisc; = + pDrvInfoData.dwExpectedSize =3D DDMISCELLANEOUS2CALLBACKSSIZE = ; = + = + /* Call win32k */ + retValue =3D NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)= &pDrvInfoData); + + pData->dwActualSize =3D DDMISCELLANEOUS2CALLBACKSSIZE; + + pUserMisc->dwFlags =3D pMisc.dwFlags; + + /* This functions are not documneted in MSDN for this struct, = here is directx/reactx alpha blend */ = + if ( pMisc.Reserved ) + { + pUserMisc->Reserved =3D (LPVOID) DdAlphaBlt; + } + + if ( pMisc.CreateSurfaceEx ) + { + pUserMisc->CreateSurfaceEx =3D (LPDDHAL_CREATESURFACEEX) D= dCreateSurfaceEx; + } + + if ( pMisc.GetDriverState ) + { + pUserMisc->GetDriverState =3D (LPDDHAL_GETDRIVERSTATE) NtG= diDdGetDriverState; + } + + /* NOTE : pUserMisc->DestroyDDLocal is outdated and are not be= ign tuch */ + + /* Windows XP never repot back the true return value, = + * it only report back if we have a driver or not + * ReactOS keep this behoir to be compatible with + * Windows XP + */ + pData->ddRVal =3D retValue; + } + + /* NT Callbacks check and setup for DirectX/ ReactX */ + else if (IsEqualGUID(&pData->guidInfo, &GUID_NTCallbacks)) + { + /* MS does not have DHAL_* version of this callbacks = + * so we are force using PDD_* callbacks here = + */ + DD_NTCALLBACKS pNtKernel; + PDD_NTCALLBACKS pUserNtKernel =3D (PDD_NTCALLBACKS)pData->lpvD= ata; + = + /* Clear internal out buffer and set it up*/ + RtlZeroMemory(&pNtKernel, sizeof(DD_NTCALLBACKS)); + pNtKernel.dwSize =3D sizeof(DD_NTCALLBACKS); + + /* set up internal buffer */ = = + pDrvInfoData.lpvData =3D (PVOID)&pNtKernel; = + pDrvInfoData.dwExpectedSize =3D sizeof(DD_NTCALLBACKS) ; = + = + /* Call win32k */ + retValue =3D NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)= &pDrvInfoData); + + pData->dwActualSize =3D sizeof(DD_NTCALLBACKS); + + pUserNtKernel->dwSize =3D sizeof(DD_NTCALLBACKS); + pUserNtKernel->dwFlags =3D pNtKernel.dwFlags; = + pUserNtKernel->FreeDriverMemory =3D 0; + = + if (pNtKernel.SetExclusiveMode) + { = + pUserNtKernel->SetExclusiveMode =3D (PDD_SETEXCLUSIVEMODE)= DdSetExclusiveMode; = + } + + if (pNtKernel.FlipToGDISurface) + { + pUserNtKernel->FlipToGDISurface =3D (PDD_FLIPTOGDISURFACE)= DdFlipToGDISurface; + } + + /* Windows XP never repot back the true return value, = + * it only report back if we have a driver or not + * ReactOS keep this behoir to be compatible with + * Windows XP + */ + pData->ddRVal =3D retValue; + = + + } + + /* D3D Callbacks version 2 check and setup for DirectX/ ReactX */ + else if (IsEqualGUID(&pData->guidInfo, &GUID_D3DCallbacks2)) + { + // FIXME GUID_D3DCallbacks2 + } + + /* D3D Callbacks version 3 check and setup for DirectX/ ReactX */ + else if (IsEqualGUID(&pData->guidInfo, &GUID_D3DCallbacks3)) + { + // FIXME GUID_D3DCallbacks3 + } + + /* D3DParseUnknownCommand Callbacks check and setup for DirectX/ R= eactX */ + else if (IsEqualGUID(&pData->guidInfo, &GUID_D3DParseUnknownComman= dCallback)) + { + // FIXME GUID_D3DParseUnknownCommandCallback + } + + /* MotionComp Callbacks check and setup for DirectX/ ReactX */ + else if (IsEqualGUID(&pData->guidInfo, &GUID_MotionCompCallbacks)) + { + // FIXME GUID_MotionCompCallbacks + } + + /* FIXME VPE2 Callbacks check and setup for DirectX/ ReactX */ + //else if (IsEqualGUID(&pData->guidInfo, &GUID_VPE2Callbacks)) + //{ + // FIXME GUID_VPE2Callbacks + //} + else + { + /* set up internal buffer */ = + pDrvInfoData.dwExpectedSize =3D pData->dwExpectedSize; = + pDrvInfoData.lpvData =3D pData->lpvData; + + /* We do not cover all callbacks for user mode, they are only = cover by kmode */ + retValue =3D NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)= &pDrvInfoData); + + /* Setup return data */ = + pData->dwActualSize =3D pDrvInfoData.dwActualSize; + pData->lpvData =3D pDrvInfoData.lpvData; = + /* Windows XP never repot back the true return value, = + * it only report back if we have a driver or not + * ReactOS keep this behoir to be compatible with + * Windows XP + */ + pData->ddRVal =3D retValue; + } + + return retValue; } = = @@ -1594,3 +1958,4 @@ = = = +

16 years, 9 months

[gbrunmar] 32542: * Implemented IDirect3D::CheckDeviceFormatConversion() * Replaced all LocalAlloc() with HeapAlloc() and LocalFree() with HeapFree() on recommendation from GreatLord

by gbrunmar＠svn.reactos.org

Author: gbrunmar Date: Sun Mar 2 08:12:24 2008 New Revision: 32542 URL: http://svn.reactos.org/svn/reactos?rev=3D32542&view=3Drev Log: * Implemented IDirect3D::CheckDeviceFormatConversion() * Replaced all LocalAlloc() with HeapAlloc() and LocalFree() with HeapFree(= ) on recommendation from GreatLord Modified: trunk/reactos/dll/directx/d3d9/adapter.c trunk/reactos/dll/directx/d3d9/d3d9_create.c trunk/reactos/dll/directx/d3d9/d3d9_helpers.c trunk/reactos/dll/directx/d3d9/d3d9_impl.c trunk/reactos/dll/directx/d3d9/d3d9_private.h trunk/reactos/dll/directx/d3d9/format.c trunk/reactos/dll/directx/d3d9/format.h Modified: trunk/reactos/dll/directx/d3d9/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/adap= ter.c?rev=3D32542&r1=3D32541&r2=3D32542&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/adapter.c (original) +++ trunk/reactos/dll/directx/d3d9/adapter.c Sun Mar 2 08:12:24 2008 @@ -86,7 +86,7 @@ if (DriverFileSize > 0) { VS_FIXEDFILEINFO* FixedFileInfo =3D NULL; - LPVOID pBlock =3D LocalAlloc(LMEM_ZEROINIT, DriverFileSize); + LPVOID pBlock =3D HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Dr= iverFileSize); = if (TRUE =3D=3D GetFileVersionInfoA(pIdentifier->Driver, 0, Driver= FileSize, pBlock)) { @@ -97,7 +97,7 @@ } } = - LocalFree(pBlock); + HeapFree(GetProcessHeap(), 0, pBlock); } = if (bIsWow64) @@ -292,7 +292,7 @@ return Format; } = - pBitmapInfo =3D LocalAlloc(LMEM_ZEROINIT, sizeof(BITMAPINFOHEADER) + 4= * sizeof(RGBQUAD)); + pBitmapInfo =3D HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(B= ITMAPINFOHEADER) + 4 * sizeof(RGBQUAD)); if (NULL =3D=3D pBitmapInfo) { DeleteObject(hBitmap); @@ -316,7 +316,7 @@ } } = - LocalFree(pBitmapInfo); + HeapFree(GetProcessHeap(), 0, pBitmapInfo); DeleteObject(hBitmap); DeleteDC(hDC); = Modified: trunk/reactos/dll/directx/d3d9/d3d9_create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9= _create.c?rev=3D32542&r1=3D32541&r2=3D32542&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_create.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_create.c Sun Mar 2 08:12:24 2008 @@ -65,7 +65,7 @@ if (NULL =3D=3D (hDC =3D CreateDCA(NULL, pDisplayAdapter->szDeviceName= , NULL, NULL))) return FALSE; = - pDeviceData =3D LocalAlloc(LMEM_ZEROINIT, sizeof(D3D9_DEVICEDATA)); + pDeviceData =3D HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(D= 3D9_DEVICEDATA)); if (NULL =3D=3D pDeviceData) { DPRINT1("Out of memory, could not initialize Direct3D adapter"); Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9= _helpers.c?rev=3D32542&r1=3D32541&r2=3D32542&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_helpers.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.c Sun Mar 2 08:12:24 2008 @@ -64,7 +64,7 @@ = dwSize +=3D MEM_ALIGNMENT; = - AlignedPtr =3D (CHAR *)LocalAlloc(LMEM_ZEROINIT, dwSize); + AlignedPtr =3D (CHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, d= wSize); = if (AlignedPtr =3D=3D 0) return DDERR_OUTOFMEMORY; @@ -91,5 +91,5 @@ = NonAlignedPtr -=3D *(AlignedPtr - 1); = - LocalFree(NonAlignedPtr); + HeapFree(GetProcessHeap(), 0, NonAlignedPtr); } 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=3D32542&r1=3D32541&r2=3D32542&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 Sun Mar 2 08:12:24 2008 @@ -640,12 +640,79 @@ return D3D_OK; } = + +/*++ +* @name IDirect3D9::CheckDeviceFormatConversion +* @implemented +* +* The function IDirect3D9Impl_CheckDeviceFormatConversion checks if a spec= ific D3DFORMAT +* can be converted to another 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. Only D3DDEVTYPE_HAL can potentially = return D3D_OK. +* +* @param D3DFORMAT SourceFormat +* One of the D3DFORMAT enum members except D3DFMT_UNKNOWN for the display = adapter mode to be converted from. +* +* @param D3DFORMAT TargetFormat +* One of the D3DFORMAT enum members except D3DFMT_UNKNOWN for the display = adapter mode to be converted to. +* +* @return HRESULT +* If the SourceFormat can be converted to the TargetFormat, the method ret= urns D3D_OK. +* If the SourceFormat can NOT be converted to the TargetFormat, the method= returns D3DERR_NOTAVAILABLE. +* If Adapter is out of range, DeviceType is invalid, +* SourceFormat or TargetFormat is invalid, the method returns D3DERR_INVAL= IDCALL. +* +*/ static HRESULT WINAPI IDirect3D9Impl_CheckDeviceFormatConversion(LPDIRECT3= D9 iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT= SourceFormat, D3DFORMAT TargetFormat) { - 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 (SourceFormat =3D=3D D3DFMT_UNKNOWN || + TargetFormat =3D=3D D3DFMT_UNKNOWN) + { + DPRINT1("Invalid D3DFORMAT specified"); + UNLOCK_D3D9(); + return D3DERR_NOTAVAILABLE; + } + + if (DeviceType =3D=3D D3DDEVTYPE_HAL) + { + hResult =3D CheckDeviceFormatConversion(&This->DisplayAdapters[Ada= pter].DriverCaps, SourceFormat, TargetFormat); + } + else + { + hResult =3D D3DERR_NOTAVAILABLE; + } + + UNLOCK_D3D9(); + return hResult; } = = Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9= _private.h?rev=3D32542&r1=3D32541&r2=3D32542&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_private.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h Sun Mar 2 08:12:24 2008 @@ -89,7 +89,7 @@ /* 0x0220 */ CHAR szDeviceName[CCHDEVICENAME]; /* 0x0240 */ HDC hDC; /* 0x0244 */ GUID DisplayGuid; -/* 0x0254 */ LPDWORD pUnknown0254; //D3D9_Unknown6BC_INT* pUnknown6BC; = // hDirectDrawLocal = +/* 0x0254 */ LPDWORD pUnknown0254; //D3D9_Unknown6BC_INT* pUnknown6BC; /* 0x0258 */ D3DDEVTYPE DeviceType; /* 0x025c */ HMODULE hD3DRefDll; /* 0x0260 */ DWORD unknown0152; @@ -103,7 +103,7 @@ /* 0x0118 */ BOOL bInUseFlag; /* 0x011c */ DWORD MasterAdapterIndex; /* 0x0120 */ DWORD AdapterIndexInGroup; -/* 0x0124 */ DWORD NumAdaptersInGroup; /* 0x00000001 */ +/* 0x0124 */ DWORD NumAdaptersInGroup; /* 0x0128 */ DWORD NumSupportedD3DFormats; /* 0x012c */ DWORD NumSupportedD3DExtendedFormats; /* 0x0130 */ D3DDISPLAYMODE* pSupportedD3DFormats; @@ -116,7 +116,7 @@ = typedef struct _tagDIRECT3D9_INT_ { -/* 0x0000 */ struct IDirect3D9Vtbl *lpVtbl; /* LPDIRECTD3D9 functoions = table */ +/* 0x0000 */ struct IDirect3D9Vtbl *lpVtbl; /* LPDIRECTD3D9 function ta= ble */ /* 0x0004 */ CRITICAL_SECTION d3d9_cs; /* 0x001c */ DWORD unknown000007; /* 0x00000001 */ /* 0x0020 */ DWORD dwProcessId; Modified: trunk/reactos/dll/directx/d3d9/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/form= at.c?rev=3D32542&r1=3D32541&r2=3D32542&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 Sun Mar 2 08:12:24 2008 @@ -31,6 +31,20 @@ BOOL IsMultiElementFormat(D3DFORMAT Format) { return (Format =3D=3D D3DFMT_MULTI2_ARGB8); +} + +BOOL IsFourCCFormat(D3DFORMAT Format) +{ + CHAR* cFormat =3D (CHAR*)&Format; + if (isalnum(cFormat[0]) && + isalnum(cFormat[1]) && + isalnum(cFormat[2]) && + isalnum(cFormat[3])) + { + return TRUE; + } + + return FALSE; } = BOOL IsSupportedFormatOp(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT DisplayF= ormat, DWORD FormatOp) @@ -321,3 +335,47 @@ = return D3DERR_NOTAVAILABLE; } + +HRESULT CheckDeviceFormatConversion(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORM= AT SourceFormat, D3DFORMAT TargetFormat) +{ + D3DFORMAT NonAlphaSourceFormat; + D3DFORMAT NonAlphaTargetFormat; + + NonAlphaSourceFormat =3D RemoveAlphaChannel(SourceFormat); + NonAlphaTargetFormat =3D RemoveAlphaChannel(TargetFormat); + + if (NonAlphaSourceFormat =3D=3D NonAlphaTargetFormat) + { + return D3D_OK; + } + + if (FALSE =3D=3D IsFourCCFormat(SourceFormat)) + { + switch (SourceFormat) + { + case D3DFMT_A8R8G8B8: + case D3DFMT_X8R8G8B8: + case D3DFMT_R5G6B5: + case D3DFMT_X1R5G5B5: + case D3DFMT_A1R5G5B5: + case D3DFMT_A2R10G10B10: + /* Do nothing, valid SourceFormat */ + break; + + default: + return D3DERR_NOTAVAILABLE; + } + } + else if (pDriverCaps->DriverCaps9.DevCaps2 =3D=3D 0) + { + return D3D_OK; + } + + if (FALSE =3D=3D IsSupportedFormatOp(pDriverCaps, SourceFormat, D3DFOR= MAT_OP_CONVERT_TO_ARGB) || + FALSE =3D=3D IsSupportedFormatOp(pDriverCaps, TargetFormat, D3DFOR= MAT_MEMBEROFGROUP_ARGB)) + { + 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=3D32542&r1=3D32541&r2=3D32542&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 Sun Mar 2 08:12:24 2008 @@ -33,4 +33,6 @@ = HRESULT CheckDeviceFormat(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT Adapter= Format, DWORD Usage, D3DRESOURCETYPE RType, D3DFORMAT CheckFormat); = +HRESULT CheckDeviceFormatConversion(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORM= AT SourceFormat, D3DFORMAT TargetFormat); + #endif // _FORMAT_H_

16 years, 9 months

[jimtabor] 32771: Question is what is its?

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Mar 26 20:41:27 2008 New Revision: 32771 URL: http://svn.reactos.org/svn/reactos?rev=32771&view=rev Log: Question is what is its? Modified: trunk/reactos/ntoskrnl/ex/handle.c Modified: trunk/reactos/ntoskrnl/ex/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] Wed Mar 26 20:41:27 2008 @@ -874,7 +874,7 @@ for (;;) { /* Get the current value and check if it's locked */ - OldValue = *(volatile LONG_PTRits *)&HandleTableEntry->Object; + OldValue = *(volatile LONG_PTR *)&HandleTableEntry->Object; if (OldValue & EXHANDLE_TABLE_ENTRY_LOCK_BIT) { /* It's not locked, remove the lock bit to lock it */

16 years, 9 months

[hyperion] 32770: Fix some serious handle table bugs which led to memory corruption and stale values (which led to more memory corruption). Patch by Alex Ionescu.

by hyperion＠svn.reactos.org

Author: hyperion Date: Wed Mar 26 20:13:24 2008 New Revision: 32770 URL: http://svn.reactos.org/svn/reactos?rev=32770&view=rev Log: Fix some serious handle table bugs which led to memory corruption and stale values (which led to more memory corruption). Patch by Alex Ionescu. Modified: trunk/reactos/ntoskrnl/ex/handle.c Modified: trunk/reactos/ntoskrnl/ex/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] Wed Mar 26 20:13:24 2008 @@ -17,7 +17,7 @@ LIST_ENTRY HandleTableListHead; EX_PUSH_LOCK HandleTableListLock; -#define SizeOfHandle(x) (sizeof(HANDLE) * x) +#define SizeOfHandle(x) (sizeof(HANDLE) * (x)) /* PRIVATE FUNCTIONS *********************************************************/ @@ -43,11 +43,11 @@ /* Clear the tag bits and check what the next handle is */ Handle.TagBits = 0; - NextHandle = HandleTable->NextHandleNeedingPool; + NextHandle = *(volatile ULONG*)&HandleTable->NextHandleNeedingPool; if (Handle.Value >= NextHandle) return NULL; /* Get the table code */ - TableBase = (ULONG_PTR)HandleTable->TableCode; + TableBase = *(volatile ULONG_PTR*)&HandleTable->TableCode; /* Extract the table level and actual table base */ TableLevel = (ULONG)(TableBase & 3); @@ -734,7 +734,7 @@ ExAcquirePushLockShared(&HandleTable->HandleTableLock[i]); /* Check if the value changed after acquiring the lock */ - if (OldValue != HandleTable->FirstFree) + if (OldValue != *(volatile ULONG*)&HandleTable->FirstFree) { /* It did, so try again */ ExReleasePushLockShared(&HandleTable->HandleTableLock[i]); @@ -743,7 +743,7 @@ } /* Now get the next value and do the compare */ - NewValue = Entry->NextFreeTableEntry; + NewValue = *(volatile ULONG*)&Entry->NextFreeTableEntry; NewValue1 = InterlockedCompareExchange((PLONG) &HandleTable->FirstFree, NewValue, OldValue); @@ -874,7 +874,7 @@ for (;;) { /* Get the current value and check if it's locked */ - OldValue = (LONG_PTR)HandleTableEntry->Object; + OldValue = *(volatile LONG_PTRits *)&HandleTableEntry->Object; if (OldValue & EXHANDLE_TABLE_ENTRY_LOCK_BIT) { /* It's not locked, remove the lock bit to lock it */

16 years, 9 months

[dreimer] 32769: Bug 3144, 3145, 3149, 3151 : Korean Translations by manatails007 (admin@manateeshome.com) Bug 3152 : Greek Update by Apostolos Alexiadis (djapal@gmail.com)

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Mar 26 21:21:55 2008 New Revision: 32769 URL: http://svn.reactos.org/svn/reactos?rev=32769&view=rev Log: Bug 3144, 3145, 3149, 3151 : Korean Translations by manatails007 (admin(a)manateeshome.com) Bug 3152 : Greek Update by Apostolos Alexiadis (djapal(a)gmail.com) Added: trunk/reactos/base/applications/cacls/lang/ko-KO.rc (with props) trunk/reactos/base/applications/calc/lang/ko-KO.rc (with props) trunk/reactos/base/applications/charmap/lang/ko-KO.rc (with props) trunk/reactos/base/applications/shutdown/lang/ko-KO.rc (with props) trunk/reactos/base/shell/cmd/lang/el-GR.rc (with props) trunk/reactos/base/system/format/lang/el-GR.rc (with props) trunk/reactos/boot/freeldr/fdebug/lang/el-GR.rc (with props) trunk/reactos/dll/cpl/input/lang/el-GR.rc (with props) trunk/reactos/dll/cpl/joy/lang/el-GR.rc (with props) Modified: trunk/reactos/base/applications/cacls/rsrc.rc trunk/reactos/base/applications/calc/rsrc.rc trunk/reactos/base/applications/charmap/rsrc.rc trunk/reactos/base/applications/shutdown/rsrc.rc trunk/reactos/base/shell/cmd/cmd.rc trunk/reactos/base/system/format/rsrc.rc trunk/reactos/boot/freeldr/fdebug/fdebug.rc trunk/reactos/dll/cpl/input/rsrc.rc trunk/reactos/dll/cpl/joy/rsrc.rc Added: trunk/reactos/base/applications/cacls/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… ============================================================================== --- trunk/reactos/base/applications/cacls/lang/ko-KO.rc (added) +++ trunk/reactos/base/applications/cacls/lang/ko-KO.rc [iso-8859-1] Wed Mar 26 21:21:55 2008 @@ -1,0 +1,77 @@ +/* + *Korean translation by manatails007(www.manatails007.org) + */ +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_HELP, "¾×¼¼½º ÄÁÆ®·Ñ ¸®½ºÆ®(ACLs)º¸±â, ¼öÁ¤\n\n\ +CACLS ÆÄÀÏ¸í [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\ + [/P user:perm [...]] [/D user [...]]\n\ + ÆÄÀÏ¸í ACL Ç¥½Ã\n\ + /T ÆÄÀÏÀÇ ACL ´ëÃ¼\n\ + Çö µð·ºÅä¸®¿Í ÇÏÀ§ µð·ºÅä¸®±îÁö Æ÷ÇÔ\n\ + /E ´ëÃ¼ÇÏ´Â ´ë½Å ACL ¼öÁ¤\n\ + /C ±ÇÇÑ ¾øÀ½ ¿¡·¯ ¹ß»ý½Ã ¹«½Ã\n\ + /G user:perm À¯Àú¿¡°Ô ¾×¼¼½º ±ÇÇÑ ÁÖ±â\n\ + Perm Àº: R ÀÐ±âÀü¿ë\n\ + W ¾²±â\n\ + C ¼öÁ¤\n\ + F ¸ðµç ±ÇÇÑ\n\ + /R user À¯ÀúÀÇ ±ÇÇÑ »¯±â (/E¿Í °°ÀÌ »ç¿ë).\n\ + /P user:perm ±ÇÇÑ ´ëÃ¼\n\ + Perm Àº: N ¾øÀ½\n\ + R ÀÐ±â\n\ + W ¾²±â\n\ + C ¼öÁ¤(¾²±â)\n\ + F ¸ðµç±ÇÇÑ\n\ + /D user ¾×¼¼½º Á¦ÇÑ\n\ +ÇÏ³ª ÀÌ»óÀÇ ÆÄÀÏÀ» ¿±â À§ÇØ ¿ÍÀÏµåÄ«µå »ç¿ë °¡´É\n\ +º¹¼öÀ¯Àú µ¿½Ã »ç¿ë°¡´É\n\n\ +´ÜÃàÅ°:\n\ + CI - Container Inherit.\n\ + ACE¸¦ µð·ºÅä¸®¿¡ Àû¿ë\n\ + OI - Object Inherit.\n\ + ACE¸¦ ÆÄÀÏ¿¡ Àû¿ë\n\ + IO - Inherit Only.\n\ + ACEÀû¿ë ¾ÈÇÔ\n" + +IDS_ABBR_CI, "(CI)" +IDS_ABBR_OI, "(OI)" +IDS_ABBR_IO, "(IO)" +IDS_ABBR_FULL, "F" +IDS_ABBR_READ, "R" +IDS_ABBR_WRITE, "W" +IDS_ABBR_CHANGE, "C" +IDS_ABBR_NONE, "N" +IDS_ALLOW, "" +IDS_DENY, "(DENY)" +IDS_SPECIAL_ACCESS, "(special access:)" +IDS_GENERIC_READ, "GENERIC_READ" +IDS_GENERIC_WRITE, "GENERIC_WRITE" +IDS_GENERIC_EXECUTE, "GENERIC_EXECUTE" +IDS_GENERIC_ALL, "GENERIC_ALL" +IDS_FILE_GENERIC_EXECUTE, "FILE_GENERIC_EXECUTE" +IDS_FILE_GENERIC_READ, "FILE_GENERIC_READ" +IDS_FILE_GENERIC_WRITE, "FILE_GENERIC_WRITE" +IDS_FILE_READ_DATA, "FILE_READ_DATA" +IDS_FILE_WRITE_DATA, "FILE_WRITE_DATA" +IDS_FILE_APPEND_DATA, "FILE_APPEND_DATA" +IDS_FILE_READ_EA, "FILE_READ_EA" +IDS_FILE_WRITE_EA, "FILE_WRITE_EA" +IDS_FILE_EXECUTE, "FILE_EXECUTE" +IDS_FILE_DELETE_CHILD, "FILE_DELETE_CHILD" +IDS_FILE_READ_ATTRIBUTES, "FILE_READ_ATTRIBUTES" +IDS_FILE_WRITE_ATTRIBUTES, "FILE_WRITE_ATTRIBUTES" +IDS_MAXIMUM_ALLOWED, "MAXIMUM_ALLOWED" +IDS_ACCESS_SYSTEM_SECURITY, "ACCESS_SYSTEM_SECURITY" +IDS_SPECIFIC_RIGHTS_ALL, "SPECIFIC_RIGHTS_ALL" +IDS_STANDARD_RIGHTS_REQUIRED, "STANDARD_RIGHTS_REQUIRED" +IDS_SYNCHRONIZE, "SYNCHRONIZE" +IDS_WRITE_OWNER, "WRITE_OWNER" +IDS_WRITE_DAC, "WRITE_DAC" +IDS_READ_CONTROL, "READ_CONTROL" +IDS_DELETE, "DELETE" +IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL" +END Propchange: trunk/reactos/base/applications/cacls/lang/ko-KO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cacls/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/rs… ============================================================================== --- trunk/reactos/base/applications/cacls/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cacls/rsrc.rc [iso-8859-1] Wed Mar 26 21:21:55 2008 @@ -10,6 +10,7 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/ko-KO.rc" #include "lang/nb-NO.rc" #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" Added: trunk/reactos/base/applications/calc/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ko-KO.rc (added) +++ trunk/reactos/base/applications/calc/lang/ko-KO.rc [iso-8859-1] Wed Mar 26 21:21:55 2008 @@ -1,0 +1,157 @@ +/* + * Korean translation by manatails007(www.manatails007.org) + */ + +#include "windows.h" +#include "resource.h" +#include "winecalc.h" + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME, "°è»ê±â" + + IDS_COPYRIGHT1, "°è»ê±â 5.0. LGPL 2¶óÀÌ¼¾½º ÀÌÇÏ »ç¿ë" + IDS_COPYRIGHT2 "Copyright 2003, James Briggs" + IDS_COPYRIGHT3 "San Jose, California, USA" + IDS_COPYRIGHT4 "james(a)ActionMessage.com" + IDS_COPYRIGHT5 "http://www.ActionMessage.com/winecalc/" + + IDS_BTN_BACKSPACE, "Backspace" + IDS_BTN_CLEAR_ENTRY, "CE" + IDS_BTN_CLEAR_ALL, "C" + IDS_BTN_MEM_CLEAR, "MC" + IDS_BTN_MEM_RECALL, "MR" + IDS_BTN_MEM_STORE, "MS" + IDS_BTN_MEM_PLUS, "M+" + IDS_BTN_MEM_STATUS_M, "M" + IDS_BTN_SQRT, "sqrt" + IDS_BTN_DEGREES, "Degrees" + IDS_BTN_RADIANS, "Radians" + IDS_BTN_GRADS, "Grads" + IDS_BTN_SHRT_HEX "Hex" + IDS_BTN_SHRT_DEC "Dec" + IDS_BTN_SHRT_OCT "Oct" + IDS_BTN_SHRT_BIN "Bin" + IDS_ERR_INVALID_INPUT, "ÇÔ¼ö¸¦ Àß¸ø ÀÔ·Â ÇÏ¼Ì½À´Ï´Ù." + IDS_ERR_DIVIDE_BY_ZERO, "0À¸·Î ³ª´¼ö ¾ø½À´Ï´Ù." + IDS_ERR_UNDEFINED, "ÇÔ¼ö °á°ú°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù." +END + +MAIN_MENU MENU DISCARDABLE +BEGIN + POPUP "ÆíÁý" + BEGIN + MENUITEM "º¹»ç Ctrl+C", IDM_COPY + MENUITEM "ºÙ¿©³Ö±â Ctrl+V", IDM_PASTE + END + POPUP "º¸±â" + BEGIN + MENUITEM "ÀÏ¹Ý", IDM_MODE_STANDARD + MENUITEM "°øÇÐ", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "ÀÚ¸®¼ö ±¸ºÐ ´ÜÀ§", IDM_DIGIT_GROUPING + END + POPUP "µµ¿ò¸»" + BEGIN + MENUITEM "µµ¿ò¸» Ç×¸ñ", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "°è»ê±â¿¡ ´ëÇØ", IDM_ABOUT + END +END + +SCIMS_MENU MENU DISCARDABLE +BEGIN + POPUP "ÆíÁý" + BEGIN + MENUITEM "º¹»ç Ctrl+C", IDM_COPY + MENUITEM "ºÙ¿©³Ö±â Ctrl+V", IDM_PASTE + END + POPUP "º¸±â" + BEGIN + MENUITEM "ÀÏ¹Ý", IDM_MODE_STANDARD + MENUITEM "°øÇÐ", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "Hex\tF5", ID_CALC_NS_HEX + MENUITEM "Decimal\tF6", ID_CALC_NS_DEC + MENUITEM "Octal\tF7", ID_CALC_NS_OCT + MENUITEM "Binary\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "Degrees\tF2", ID_CALC_MS_DEGREES + MENUITEM "Radians\tF3", ID_CALC_MS_RADIANS + MENUITEM "Grads\tF4", ID_CALC_MS_GRADS + MENUITEM SEPARATOR + MENUITEM "ÀÚ¸®¼ö ±¸ºÐ ´ÜÀ§", IDM_DIGIT_GROUPING + END + POPUP "µµ¿ò¸»" + BEGIN + MENUITEM "µµ¿ò¸» Ç×¸ñ", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "°è»ê±â¿¡ ´ëÇØ", IDM_ABOUT + END +END + +SCIWS_MENU MENU DISCARDABLE +BEGIN + POPUP "ÆíÁý" + BEGIN + MENUITEM "º¹»ç Ctrl+C", IDM_COPY + MENUITEM "ºÙ¿©³Ö±â Ctrl+V", IDM_PASTE + END + POPUP "º¸±â" + BEGIN + MENUITEM "ÀÏ¹Ý", IDM_MODE_STANDARD + MENUITEM "°øÇÐ", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "Hex\tF5", ID_CALC_NS_HEX + MENUITEM "Decimal\tF6", ID_CALC_NS_DEC + MENUITEM "Octal\tF7", ID_CALC_NS_OCT + MENUITEM "Binary\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "Qword\tF12", ID_CALC_WS_QWORD + MENUITEM "Dword\tF2", ID_CALC_WS_DWORD + MENUITEM "Word\tF3", ID_CALC_WS_WORD + MENUITEM "Byte\tF4", ID_CALC_WS_BYTE + MENUITEM SEPARATOR + MENUITEM "ÀÚ¸´¼ö ±¸ºÐ ´ÜÀ§", IDM_DIGIT_GROUPING + END + POPUP "µµ¿ò¸»" + BEGIN + MENUITEM "µµ¿ò¸» Ç×¸ñ", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "°è»ê±â¿¡ ´ëÇØ", IDM_ABOUT + END +END + +MAIN_MENU ACCELERATORS +BEGIN + VK_F1, IDV_HELP, VIRTKEY +END + +DLG_ABOUT DIALOGEX 12,0,175,90 +CAPTION "GNU winecalc¿¡ ´ëÇØ" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +BEGIN + DEFPUSHBUTTON "È®ÀÎ", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +WHATS_THIS_MENU MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "ÀÌ°Ô ¹¹¾ß?", IDM_WHATS_THIS + END +END + +DLG_STATS DIALOGEX 12,0,145,85 +CAPTION "»óÅÂ ¹Ú½º" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +BEGIN + DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&CD" ID_STATS_CD, 74, 52, 30, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "C&AD", ID_STATS_CAD, 109, 52, 30, 13, WS_TABSTOP | WS_GROUP +END Propchange: trunk/reactos/base/applications/calc/lang/ko-KO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/calc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/rsr… ============================================================================== --- trunk/reactos/base/applications/calc/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/rsrc.rc [iso-8859-1] Wed Mar 26 21:21:55 2008 @@ -38,6 +38,7 @@ #include "lang/id-ID.rc" #include "lang/it-IT.rc" #include "lang/ja-JP.rc" +#include "lang/ko-KO.rc" #include "lang/nb-NO.rc" #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" Added: trunk/reactos/base/applications/charmap/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/ko-KO.rc (added) +++ trunk/reactos/base/applications/charmap/lang/ko-KO.rc [iso-8859-1] Wed Mar 26 21:21:55 2008 @@ -1,0 +1,38 @@ +/* + *Korean translation by manatails007(www.manatails007.org) + */ +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 +CAPTION "¹®ÀÚÇ¥" +FONT 8,"MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +BEGIN + LTEXT "±Û²Ã:", IDC_STATIC, 6, 7, 24, 9 + COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS + PUSHBUTTON "µµ¿ò¸»", IDC_CMHELP, 249, 5, 35, 13 + CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 + LTEXT "º¹»çÇÒ ¹®ÀÚ:", IDC_STATIC, 6, 188, 66, 9 + EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "¼±ÅÃ", IDC_SELECT, 194, 186, 44, 13 + PUSHBUTTON "º¹»ç", IDC_COPY, 242, 186, 44, 13, WS_DISABLED + //AUTOCHECKBOX "È®Àå ¸ðµå", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP + //EDITTEXT IDC_DISPLAY, 8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY +END + +IDD_ABOUTBOX DIALOGEX 22,16,210,182 +CAPTION "¹®ÀÚÇ¥¿¡ ´ëÇÏ¿©" +FONT 8,"MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "Character Map v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 + PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 + ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." + IDS_ABOUT "Á¤º¸(&A)" +END Propchange: trunk/reactos/base/applications/charmap/lang/ko-KO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/charmap/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/rsrc.rc [iso-8859-1] Wed Mar 26 21:21:55 2008 @@ -14,6 +14,7 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/ko-KO.rc" #include "lang/lt-LT.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" Added: trunk/reactos/base/applications/shutdown/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/lang/ko-KO.rc (added) +++ trunk/reactos/base/applications/shutdown/lang/ko-KO.rc [iso-8859-1] Wed Mar 26 21:21:55 2008 @@ -1,0 +1,17 @@ +/* + * Korean translation by manatails007(www.manatails007.org) + */ +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "»ç¿ë¹ý: shutdown [-?] [-l | -s | -r] [-f]\n\n\ + Áö½Ã¹® ¾øÀ½ -?\tÀÌ ¸Þ¼¼Áö Ç¥½Ã\n\ + -l\t\t\t·Î±× ¿ÀÇÁ\n\ + -s\t\t\tÄÄÇ»ÅÍ ²ô±â\n\ + -r\t\t\tÄÄÇ»ÅÍ Àç½ÃÀÛ\n\ + -f\t\t\tÇÁ·Î¼¼½º °Á¦Á¾·á\n\ + \t\t\t¾Æ¹« ÆÄ¶ó¹ÌÅÍµµ ÀÔ·ÂÇÏÁö ¾ÊÀ¸½Ã¸é,\n\ + \t\t\t·Î±×¿ÀÇÁ µÉ °ÍÀÔ´Ï´Ù" +END Propchange: trunk/reactos/base/applications/shutdown/lang/ko-KO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/shutdown/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/shutdown/rsrc.rc [iso-8859-1] Wed Mar 26 21:21:55 2008 @@ -5,6 +5,7 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" +#include "lang/ko-KO.rc" #include "lang/lt-LT.rc" #include "lang/nb-NO.rc" #include "lang/pl-PL.rc" Modified: trunk/reactos/base/shell/cmd/cmd.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.rc?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.rc [iso-8859-1] Wed Mar 26 21:21:55 2008 @@ -9,6 +9,7 @@ #include <reactos/version.rc> #include "lang/de-DE.rc" +#include "lang/el-GR.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fr-FR.rc" @@ -42,3 +43,4 @@ + Added: trunk/reactos/base/shell/cmd/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/el-GR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/el-GR.rc (added) +++ trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] Wed Mar 26 21:21:55 2008 @@ -1,0 +1,697 @@ +#include "windows.h" +#include "resource.h" +/* + * Áñ÷éêÞ Ýêäïóç - ÇìéôåëÞò. + * ÅëëçíéêÞ ìåôÜöñáóç - Áðüóôïëïò ÁëåîéÜäçò + */ + +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +BEGIN + +STRING_ATTRIB_HELP, "ÐñïâïëÞ Þ áëëáãÞ ôùí ÷áñáêôçñéóôéêþí ôùí áñ÷åßùí.\n\n\ +ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ + [/S [/D]]\n\n\ + + Ïñéóìüò åíüò ÷áñáêôçñéóôéêïý.\n\ + - ÁðáëïéöÞ åíüò ÷áñáêôçñéóôéêïý.\n\ + R ×áñáêôçñéóôéêü áñ÷åßïõ ìüíï ãéá áíÜãíùóç.\n\ + A ×áñáêôçñéóôéêü öýëáîçò áñ÷åßïõ.\n\ + S ×áñáêôçñéóôéêü áñ÷åßïõ óõóôÞìáôïò.\n\ + H ×áñáêôçñéóôéêü êñõöïý áñ÷åßïõ.\n\ + /S Åðåîåñãáóßá ôùí áñ÷åßùí ðïõ ôáéñéÜæïõí óôïí ôñÝ÷ïíôá êáôÜëïãï\n\ + êáé óå üëïõò ôïõò õðïêáôáëüãïõò.\n\ + /D Åðåîåñãáóßá êáôáëüãùí åðßóçò.\n\n\ +ÐëçêôñïëïãÞóôå ATTRIB ÷ùñßò ðáñÜìåôñï, ãéá íá åìöáíéóôïýí ôá ÷áñáêôçñéóôéêÜ üëùí ôùí áñ÷åßùí.\n" + +STRING_ALIAS_HELP, "ÈÝôåé,áöáéñåß Þ åìöáíßæåé ôá aliases.\n\n\ +ALIAS [alias=[åíôïëÞ]]\n\n\ + alias ¼íïìá ãéá ôï alias.\n\ + command Êåßìåíï ðïõ èá áíôéêáôáóôáèåß ãéá ôï alias.\n\n\ +Ãéá íá åìöáíéóôïý üëá ôá aliases:\n\ + ALIAS\n\n\ +Ãéá íá èÝóåôå íÝï Þ íá åðåîåñãáóôåßôå Ýíá Þäç õðÜñ÷ïí alias:\n\ + ALIAS da=dir a:\n\n\ +Ãéá íá áöáéñÝóåôå Ýíá alias áðü ôç ëßóôá:\n\ + ALIAS da=" + +STRING_BEEP_HELP, "Beep the speaker.\n\nBEEP\n" + +STRING_CALL_HELP, "Calls one batch program from another.\n\n\ +CALL [drive:][path]filename [batch-parameter]\n\n\ + batch-parameter Specifies any command-line information required by the\n\ + batch program." + +STRING_CD_HELP, "ÅìöÜíéóç Þ áëëáãÞ ôïõ ôñÝ÷ïíôïò êáôáëüãïõ.\n\n\ +CHDIR [/D][äßóêïò:][äéáäñïìÞ]\n\ +CHDIR[..|.]\n\ +CD [/D][äßóêïò:][äéáäñïìÞ]\n\ +CD[..|.]\n\n\ + .. ãïíéêüò êáôÜëïãïò\n\ + . ôñÝ÷ùí êáôÜëïãïò\n\ + /D ÁëëáãÞ ôçò ôñÝ÷ïõóáò ìïíÜäáò äßóêïõ ðÝñáí ôçò áëëáãÞò ôñÝ÷ïíôïò êáôáëüãïõ ãéá ìéá ìïíÜäá äßóêïõ.\n\n\ +ÐëçêôñïëïãÞóôå CD äßóêïò:, ãéá íá åìöáíßóåôå ôïí ôñÝ÷ïíôá êáôÜëïãï óôç óõãêåêñéìÝíç ìïíÜäá äßóêïõ.\n\ +ÐëçêôñïëïãÞóôå CD ÷ùñéò ðáñÜìåôñï, ãéá íá åìöáíßóåôå ôïí ôñÝ÷ïíôá êáôÜëïãï óôçí ôñÝ÷ïõóá ìïíÜäá äßóêïõ.\n" + +STRING_CHCP_HELP, "Åìöáíßæåé Þ ïñßæåé ôïí áñéèìü ôçò åíåñãïý êùäéêïóåëßäáò.\n\n\ +CHCP [nnn]\n\n\ + nnn Êáèïñßæåé Ýíáí áñéèìü êùäéêïóåëßäáò.\n\n\ +ÐëçêôñïëïãÞóôå CHCP ÷ùñßò ðáñÜìåôñï, ãéá íá åìöáíéóôåß ï ôñÝ÷ùí áñéèìüò êùäéêïóåëßäáò.\n" + +STRING_CHOICE_HELP, "ÁíáìÝíåé áðü ôïí ÷ñÞóôç íá åðéëÝîåé ìßá áðü óåô åðéëïãþí.\n\n\ +CHOICE [/C[:]åðéëïãÝò][/N][/S][/T[:]c,nn][êåßìåíï]\n\n\ + /C[:]åðéëïãÝò Ðñïóäéïñßæåé åðéôñåðüìåíá êëåéäéÜ. Ôï ðñïêáèïñéóìÝíï åßíáé ôï YN.\n\ + /N Íá ìçí åìöáíßæïíôáé åðéëïãÝò êáé ? óôï ôÝëïò ôïõ êåéìÝíïõ ðñïôñïðÞò.\n\ + /S Ìåôá÷åßñéóç ôùí êëåéäéþí åðéëïãþí ìå ìåöáóç óôá êåöáëáßá.\n\ + /T[:]c,nn ÐñïêáèïñéóìÝíç åðéëïãÞ ç c ìåôÜ áðü nn äåõôåñüëåðôá.\n\ + êåßìåíï Êåßìåíï ðñïôñïðÞò ãéá åìöÜíéóç.\n\n\ +ERRORLEVEL is set to offset of key user presses in choices.\n" + +STRING_CLS_HELP, "ÅêêáèÜñéóç ôçò ïèüíçò.\n\nCLS\n" + +STRING_CMD_HELP1, "\nÄéáèÝóéìåò åóùôåñéêÝò åíôïëÝò:\n" + +STRING_CMD_HELP2, "\nÄéáèÝóéìá ÷áñáêôçñéóôéêÜ:" + +STRING_CMD_HELP3," [aliases]" + +STRING_CMD_HELP4," [éóôïñéêü]" + +STRING_CMD_HELP5," [unix filename completion]" + +STRING_CMD_HELP6," [directory stack]" + +STRING_CMD_HELP7," [redirections and piping]" + +STRING_CMD_HELP8, "Starts a new instance of the ReactOS command line interpreter.\n\n\ +CMD [/[C|K] åíôïëÞ][/P][/Q][/T:bf]\n\n\ + /C åíôïëÞ Åêôåëåß ôç óõãêåêñéìÝíç åíôïëÞ êáé ôåñìáôßæåé.\n\ + /K åíôïëÞ Åêôåëåß ôç óõãêåêñéìÝíç åíôïëÞ êáé ðáñáìÝíåé.\n\ + /P Ôï CMD ãßíåôáé ìüíéìï êáé åêôåëåß ôï autoexec.bat\n\ + (äå ìðïñåß íá ôåñìáôéóôåß).\n\ + /T:bf Ïñßæåé ôï ÷ñþìá öüíôïõ/ðñþôïõ ðëÜíïõ (âëÝðå ôçí COLOR åíôïëÞ).\n" + +STRING_COLOR_HELP1, "Ïñßæåé ôá ðñïåðéëåãìÝíá ÷ñþìáôá ðñþôïõ ðëÜíïõ êáé öüíôïõ ãéá ôçí êïíóüëá.\n\n\ +COLOR [÷áñáêôçñéóôéêü [/-F]] \n\n\ + ÷áñáêôçñéóôéêü Êáèïñßæåé ôï ÷áñáêôçñéóôéêü ÷ñþìáôïò ãéá ôçí Ýîïäï ôçò êïíóüëáò\n\ + /-F Does not fill the console blank space with color attribute\n\n\ +ÕðÜñ÷ïõí 3 ôñüðïé ãéá íá ïñéóôïýí ôá ÷ñþìáôá:\n\ +1) [áíïé÷ôü] üíïìá óå [áíïé÷ôü] üíïìá (ìüíï ôá ðñþôá ôñßá ãñÜììáôá áðáéôïýíôáé)\n\ +2) äåêáäéêü óå äåêáäéêü\n\ +3) äýï äåêáåîáäéêÜ øçößá\n\n\ +Colors are:\n\ +dec hex üíïìá dec hex üíïìá\n\ +0 0 Ìáýñï 8 8 Ãêñé (Bright black)\n\ +1 1 Ìðëå 9 9 Áíïé÷ôü ìðëå\n\ +2 2 ÐñÜóéíï 10 A Áíïé÷ôü ðñÜóéíï\n\ +3 3 Èáëáóóß 11 B Áíïé÷ôü èáëáóóß\n\ +4 4 Êüêêéíï 12 C Áíïé÷ôü êüêêéíï\n\ +5 5 Ìùâ 13 D Áíïé÷ôü ìùâ\n\ +6 6 Êßôñéíï 14 E Áíïé÷ôü êßôñéíï\n\ +7 7 Ëåõêü 15 F Áíïé÷ôü ëåõêü\n" + +STRING_COPY_HELP1, "Overwrite %s (Íáé/¼÷é/¼ëá)? " + +STRING_COPY_HELP2, "ÁíôãñÜöåé Ýíá Þ ðåñéóóüôåñá áñ÷åßá óå íÝá èÝóç.\n\n\ +COPY [/V][/Y|/-Y][/A|/B] ðñïÝëåõóç [/A|/B]\n\ + [+ source [/A|/B] [+ ...]] [ðñïïñéóìüò [/A|/B]]\n\n\ + ðñïÝëåõóç ÅðéëïãÞ ôïõ áñ÷åßïõ(ùí) ðñïò áíôéãñáöÞ.\n\ + /A Õðïäåéêíýåé Ýíá áñ÷åßï êåéìÝíïõ ASCII.\n\ + /B Õðïäåéêíýåé Ýíá äõáäéêü áñ÷åßï.\n\ + ðñïïñéóìüò Êáèïñßæåé ôïí êáôÜëïãï Þ/êáé üíïìá ôùí íÝùí áñ÷åßùí.\n\ + /V Åðáëçèåýåé ôç óùóôÞ åããñáöÞ ôùí íÝí áñ÷åßùí.\n\ + /Y Äåí åðéôñÝðåé ôçí åñþôçóç åðéâåâáßùóçò ôçò áíôéêáôÜóôáóÞò\n\ + óáò åíüò õðÜñ÷ïíôïò áñ÷åßïõ ðñïïñéóìïý.\n\ + /-Y Åîáóöáëßæåé ôçí åñþôçóç åðéâåâáßùóçò ôçò áíôéêáôÜóôáóÞò óáò\n\ + åíüò õðÜñ÷ïíôïò áñ÷åßïõ ðñïïñéóìïý.\n\n\ +Ï äéáêüðôçò /Y ìðïñåß íá ïñéóôåß áðü ðñéí óôç ìåôáâëçôÞ ðåñéâÜëëïíôïò COPYCMD.\n\ +...\n" + +STRING_DATE_HELP1, "\nÅéóÜãåôå íÝá çìåñïìçíßá (mm%cdd%cyyyy): " + +STRING_DATE_HELP2, "\nÅéóÜãåôå íÝá çìåñïìçíßá (dd%cmm%cyyyy): " + +STRING_DATE_HELP3, "\nÅéóÜãåôå íÝá çìåñïìçíßá (yyyy%cmm%cdd): " + +STRING_DATE_HELP4, "ÅìöÜíéóç Þ áëëáãÞ ôçò çìåñïìçíßáò.\n\n\ +DATE [/T][çìåñïìçíßá]\n\n\ + /T åìöÜíéóç ìüíï\n\n\ +ÐëçêôñïëïãÞóôå DATE ÷ùñßò ðáñáìÝôñïõò ãéá íá äåßôå ôçí ôùñéíÞ çìåñïìçíßá êáé\n\ +ìéá ðñïôñïðÞ ãéá íÝá. ÐáôÞóôå ENTER ãéá íá äéáôçñçèåß ç çìåñïìçíßá.\n" + +STRING_DEL_HELP1, "ÄéáãñÜöåé Ýíá Þ ðåñéóóüôåñá áñ÷åßá.\n\n\ +DEL [/N /P /T /Q /S /W /Y /Z /A[[:]÷áñáêôçñéóôéêÜ]] ïíüìáôá ...\n\ +DELETE [/N /P /T /Q /S /W /Y /Z /A[[:]÷áñáêôçñéóôéêÜ]] ïíüìáôá ...\n\ +ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]÷áñáêôçñéóôéêÜ]] ïíüìáôá ...\n\n\ + ïíüìáôá Êáèïñßæåé ôï áñ÷åßá(á) ðñïò äéáãñáöÞ.\n\n\ + /N Ôßðïôá.\n\ + /P ÆçôÜåé åðéâåâáßùóç ðñéí áðü ôç äéáãñáöÞ êÜèå áñ÷åßïõ.\n\ + /T Åìöáíßæåé ôï óýíïëï ôùí äéáãñáöÝíôùí áñ÷åßùí êáé ôïõ ÷þñïõ äßóêïõ ðïõ åëåõèåñþèçêå.\n\ + /Q Ëåéôïõñãßá ÷ùñßò ðáñÝìâáóç ÷ñÞóôç..\n\ + /W Wipe. Overwrite the file with random numbers before deleting it.\n\ + /Y Yes. Kill even *.* without asking.\n\ + /F ÅðéâÜëëåé ôç äéáãñáöÞ ôùí áñ÷åßùí ðïõ åßíáé ìüíï ãéá áíÜãíùóç.\n\ + /S ÄéáãñáöÞ êáèïñéóìÝíùí áñ÷åßùí áðü üëïõò ôïõò äåõôåñåýïíôåò êáôáëüãïõò.\n\ + /A ÅðéëÝãåé áñ÷åßá ãéá äéáãñáöÞ âÜóåé ÷áñáêôçñéóôéêþí.\n\ + R Áñ÷åßá ìüíï ãéá áÜãíùóç\n\ + S Áñ÷åßá óõóôÞìáôïò\n\ + A Áñ÷åßá Ýôïéìá ðñïò áñ÷åéïèÝôçóç\n\ + H ÊñõöÜ áñ÷åßá\n\ + - Ðñüèåìá ðïõ óçìáßíåé ü÷é\n" + +STRING_DEL_HELP2, "¼ëá ôá áñ÷åßá óôïí êáôÜëïãï èá äéáãñáöïýí!\nÅßóôå óßãïõñïé (Y/N)?" +STRING_DEL_HELP3, " %lu áñ÷åßï äéáãñÜöçêå\n" +STRING_DEL_HELP4, " %lu áñ÷åßá äéáãñÜöçêáí\n" + +STRING_DELAY_HELP, "ðáýóç ãéá n äåõôåñüëåðôá Þ ìéëéäåõôåñüëåðôá\n\ +DELAY [/m]n\n\n\ + /m specifiy than n are milliseconds\n\ + otherwise n are seconds\n" + +STRING_DIR_HELP1, "DIR [äßóêïò:][ìïíïðÜôé][áñ÷åßï] [/A[[:]÷áñáêôçñéóôéêÜ]] [/B] [/C] [/D] [/L] [/N]\n\ + [/O[[:]sortorder]] [/P] [/Q] [/S] [/T[[:]timefield]] [/W] [/X] [/4]\n\n\ + [äßóêïò:][ìïíïðÜôé][áñ÷åßï]\n\ + Êáèïñßæåé ìïíÜäá äßóêïõ, êáôÜëïãï Þ/êáé áñ÷åßá ðïõ èá ðáñáôåèïýí óå ëßóôá.\n\n\ + /A Åìöáíßæåé áñ÷åßá ìå ôá êáèïñéóìÝíá ÷áñáêôçñéóôéêÜ..\n\ + attributes D ÊáôÜëïãïé R Áñ÷åßá ìüíï ðñïò áíÜãíùóç\n\ + H ÊñõöÜ áñ÷åßá A Áñ÷åßá Ýôïéìá ðñïò áñ÷åéïèÝôçóç\n\ + S Áñ÷åßá óõóôÞìáôïò - Ðñüèåìá ðïõ óçìáßíåé ü÷é\n\ + /B ×ñçóéìïðïéåß áðëÞ ìïñöïðïßçóç (÷ùñßò ðëçñïöïñßåò åðéêåöáëßäáò Þ óýíïøç).\n\ + /C ÅìöÜíéóç ôïõ äéá÷ùñéóôéêïý ÷éëéÜäùí óôá ìåãÝèç áñ÷åßùí.\n\ + õôÞ åßíáé ç ðñïåðéëïãÞ. ×ñçóéìïðïéÞóôå ôï /-C ãéá íá áðåíåñãïðïéÞóåôå ôçí åìöÜíéóç ôïõ äéá÷ùñéóôéêïý.n\ + /D Ôï ßäéï üðùò êáé ç ëßóôá êáôÜ ðëÜôïò áëëÜ ôá áñ÷åßá ôáîéíïìïýíôáé áíÜ óôÞëç.\n\ + /L ×ñçóéìïðïéåß ðåæÜ ãñÜììáôá.\n\ + /N ÍÝá ìïñöïðïßçóç ìáêñéÜò ëßóôáò üðïõ ôá ïíüìáôá ôùí áñ÷åßùí åßíáé äåîéÜ.\n\ + /O Ëßóôá áñ÷åßùí óå ôáîéíïìçìÝíç óåéñÜ.\n\ + óåéñÜ ôáîéíüìçóçò N ÊáôÜ üíïìá (áëöáâçôéêÜ) S ÊáôÜ ìÝãåèïò (ðñþôá ôï ìéêñüôåñï)\n\ + E ÊáôÜ åðÝêôáóç (áëöáâçôéêÜ) D ÊáôÜ çìåñïìçíßá/þñá (ðñþôá ôá ðáëéüôåñá)\n\ + G Ðñþôá ïé êáôÜëïãïé ïìÜäùí - Ðñüèåìá ãéá áíôéóôñïöÞ ôçò óåéñÜò\n\ + /P ÓôáìáôÜåé üôáí ïé ðëçñïöïñßåò ãåìßóïõí ìßá ïèüíç.\n\ + /Q ÅìöÜíéóç ôïõ éäéïêôÞôç ôïõ áñ÷åßïõ.\n\ + /S Åìöáíßæåé ôá áñ÷åßá óôïí êáèïñéóìÝíï êáôÜëïãï êáé óå üëïõò ôïõò õðïêáôáëüãïõò.\n\ + /T ÅëÝã÷åé ðïéï ðåäßï ÷ñüíïõ èá åìöáíéóôåß Þ èá ÷ñçóéìïðïéçèåß ãéá ôçí ôáîéíüìçóç\n\ + ðåäßï ÷ñüíïõ C Äçìéïõñãßá\n\ + A Ôåëåõôáßá ðñüóâáóç\n\ + W Ôåëåõôáßá åããñáöÞ\n\ + /W ×ñçóéìïðïéåß ôç ìïñöÞ åõñåßáò ëßóôáò.\n\ + /X This displays the short names generated for non-8dot3 file\n\ + names. The format is that of /N with the short name inserted\n\ + before the long name. If no short name is present, blanks are\n\ + displayed in its place.\n\ + /4 Displays four-digit years\n\n\ +Switches may be preset in the DIRCMD environment variable. Override\n\ +preset switches by prefixing any switch with - (hyphen)--for example, /-W.\n" + +STRING_DIR_HELP2, " Volume in drive %c is %s\n" +STRING_DIR_HELP3, " Volume in drive %c has no label.\n" +STRING_DIR_HELP4, " Volume Serial Number is %04X-%04X\n" +STRING_DIR_HELP5, "\n Total Files Listed:\n%16i File(s)% 14s bytes\n" +STRING_DIR_HELP6, "%16i Dir(s)% 15s bytes free\n" +STRING_DIR_HELP7, "\n Directory of %s\n\n" +STRING_DIR_HELP8, "%16i File(s)% 14s bytes\n" + +STRING_DIRSTACK_HELP1, "Stores the current directory for use by the POPD command, then\n\ +changes to the specified directory.\n\n\ +PUSHD [path | ..]\n\n\ + path Specifies the directory to make the current directory\n" + +STRING_DIRSTACK_HELP2, "Changes to the directory stored by the PUSHD command.\n\nPOPD" + +STRING_DIRSTACK_HELP3, "Prints the contents of the directory stack.\n\nDIRS" + +STRING_DIRSTACK_HELP4, "Directory stack empty" + +STRING_ECHO_HELP1, "Display a messages without trailing carriage return and line feed.\n\n\ + ECHOS message" + +STRING_ECHO_HELP2, "Displays a message to the standard error output.\n\n\ + ECHOERR message\n\ + ECHOERR. prints an empty line" + +STRING_ECHO_HELP3, "Prints a messages to standard error output without trailing carriage return and line feed.\n\n\ + ECHOSERR message" + +STRING_ECHO_HELP4, "Displays a message or switches command echoing on or off.\n\n\ + ECHO [ON | OFF]\n\ + ECHO [message]\n\ + ECHO. prints an empty line\n\n\ +Type ECHO without a parameter to display the current ECHO setting." + +STRING_ECHO_HELP5, "ECHO is %s\n" + +STRING_EXIT_HELP, "Exits the command line interpreter.\n\nEXIT [/b] [ExitCode]\n\n\ + /B Exits a batch file only. \n\ + If run outside of a batch file it will exit cmd.exe\n\ + ExitCode This value will be assigned to ERRORLEVEL on exit\n" + +STRING_FOR_HELP1, "Runs a specified command for each file in a set of files\n\n\ +FOR %variable IN (set) DO command [parameters]\n\n\ + %variable Specifies a replaceable parameter.\n\ + (set) Specifies a set of one or more files. Wildcards may be used.\n\ + command Specifies the command to carry out for each file.\n\ + parameters Specifies parameters or switches for the specified command.\n\n\ +To use the FOR command in a batch program, specify %%variable instead of\n\ +%variable.\n" + +STRING_FREE_HELP1, "\nVolume in drive %s is %-11s\n\ + Serial number is %s\n\ + %16s bytes total disk space\n\ + %16s bytes used\n\ + %16s bytes free\n" + +STRING_FREE_HELP2, "Displays drive information.\n\nFREE [drive: ...]\n" + +STRING_IF_HELP1, "Performs conditional processing in batch programs.\n\n\ + IF [NOT] ERRORLEVEL number command\n\ + IF [NOT] string1==string2 command\n\ + IF [NOT] EXIST filename command\n\ + IF [NOT] DEFINED variable command\n\n\ +NOT Specifies that CMD should carry out the command only if\n\ + the condition is false\n\ +ERRORLEVEL number Specifies a true condition if the last program run returned\n\ + an exit code equal or greater than the number specified.\n\ +command Specifies the command to carry out if the condition is met.\n\ +string1==string2 Specifies a true condition if the specified text strings\n\ + match.\n\ +EXIST filename Specifies a true condition if the specified filename exists.\n\ +DEFINED variable Specifies a true condition if the specified variable is\n\ + defined.\n" + +STRING_GOTO_HELP1, "Directs CMD to a labeled line in a batch script.\n\n\ +GOTO label\n\n\ + label Specifies a text string used in a batch script as a label.\n\n\ +You type a label on a line by itself, beginning with a colon." + +STRING_LABEL_HELP1, "Displays or changes drive label.\n\nLABEL [drive:][label]\n" + +STRING_LABEL_HELP2, "Volume in drive %c: is %s\n" +STRING_LABEL_HELP3, "Volume in drive %c: has no label\n" +STRING_LABEL_HELP4, "Volume Serial Number is %04X-%04X\n" +STRING_LABEL_HELP5, "Drive label (11 Characters, ENTER if none)? " + +STRING_LOCALE_HELP1, "Current time is" + +STRING_MKDIR_HELP, "Creates a directory.\n\n\ +MKDIR [drive:]path\nMD [drive:]path" + +STRING_MEMMORY_HELP1, "Displays the amount of system memory.\n\nMEMORY" + +STRING_MEMMORY_HELP2, "\n %12s%% memory load.\n\n\ + %13s bytes total physical RAM.\n\ + %13s bytes available physical RAM.\n\n\ + %13s bytes total page file.\n\ + %13s bytes available page file.\n\n\ + %13s bytes total virtual memory.\n\ + %13s bytes available virtual memory.\n" + +STRING_MISC_HELP1, "Press a key to continue...\n" + +STRING_MOVE_HELP1, "Overwrite %s (Yes/No/All)? " + +STRING_MOVE_HELP2, "Moves files and renames files and directories.\n\n\ +To move one or more files:\n\ +MOVE [/N][drive:][path]filename1[,...] destination\n\n\ +To rename a directory:\n\ +MOVE [/N][drive:][path]dirname1 dirname2\n\n\ + [drive:][path]filename1 Specifies the location and name of the file\n\ + or files you want to move.\n\ + /N Nothing. Do everything but move files or directories.\n\n\ +Current limitations:\n\ + - You can't move a file or directory from one drive to another.\n" + +STRING_MSGBOX_HELP, "display a message box and return user responce\n\n\ +MSGBOX type ['title'] prompt\n\n\ +type button displayed\n\ + possible values are: OK, OKCANCEL,\n\ + YESNO, YESNOCANCEL\n\ +title title of message box\n\ +prompt text displayed by the message box\n\n\n\ +ERRORLEVEL is set according the button pressed:\n\n\ +YES : 10 | NO : 11\n\ +OK : 10 | CANCEL : 12\n" + +STRING_PATH_HELP1, "Displays or sets a search path for executable files.\n\n\ +PATH [[drive:]path[;...]]\nPATH ;\n\n\ +Type PATH ; to clear all search-path settings and direct the command shell\n\ +to search only in the current directory.\n\ +Type PATH without parameters to display the current path.\n" + +STRING_PROMPT_HELP1, "Changes the command prompt.\n\n\ +PROMPT [text]\n\n\ + text Specifies a new command prompt.\n\n\ +Prompt can be made up of normal characters and the following special codes:\n\n\ + $A & (Ampersand)\n\ + $B | (pipe)\n\ + $C ( (Left parenthesis)\n\ + $D Current date\n\ + $E Escape code (ASCII code 27)\n\ + $F ) (Right parenthesis)\n\ + $G > (greater-than sign)\n\ + $H Backspace (erases previous character)\n\ + $L < (less-than sign)\n\ + $N Current drive\n\ + $P Current drive and path\n\ + $Q = (equal sign)\n\ + $T Current time\n\ + $V OS version number\n\ + $_ Carriage return and linefeed\n\ + $$ $ (dollar sign)\n" + +STRING_PAUSE_HELP1, "Stops the execution of a batch file and shows the following message:\n\ +'Press any key to continue...' or a user defined message.\n\n\ +PAUSE [message]" + +STRING_PROMPT_HELP2, " $+ Displays the current depth of the directory stack" + +STRING_PROMPT_HELP3, "\nType PROMPT without parameters to reset the prompt to the default setting." + +STRING_REM_HELP, "Starts a comment line in a batch file.\n\nREM [Comment]" + +STRING_RMDIR_HELP, "Removes a directory.\n\n\ +RMDIR [drive:]path\nRD [drive:]path\n\ +/S Deletes all files and folders within target\n\ +/Q Doesnt prompt for user\n" +STRING_RMDIR_HELP2, "Directory is not empty!\n" + +STRING_REN_HELP1, "Renames a file/directory or files/directories.\n\n\ +RENAME [/E /N /P /Q /S /T] old_name ... new_name\n\ +REN [/E /N /P /Q /S /T] old_name ... new_name\n\n\ + /E No error messages.\n\ + /N Nothing.\n\ + /P Prompts for confirmation before renaming each file.\n\ + (Not implemented yet!)\n\ + /Q Quiet.\n\ + /S Rename subdirectories.\n\ + /T Display total number of renamed files.\n\n\ +Note that you cannot specify a new drive or path for your destination. Use\n\ +the MOVE command for that purpose.\n" + +STRING_REN_HELP2, " %lu file renamed\n" + +STRING_REN_HELP3, " %lu files renamed\n" + +STRING_REPLACE_HELP1, "Replaces files.\n\n\ +REPLACE [drive1:][path1]filename [drive2:][path2] [/A] [/P] [/R] [/W]\n\ +REPLACE [drive1:][path1]filename [drive2:][path2] [/P] [/R] [/S] [/W] [/U]\n\n\ + [drive1:][path1]filename Specifies the source file or files.\n\ + [drive2:][path2] Specifies the directory where files are to be\n\ + replaced.\n\ + /A Adds new files to destination directory. Cannot\n\ + use with /S or /U switches.\n\ + /P Prompts for confirmation before replacing a file or\n\ + adding a source file.\n\ + /R Replaces read-only files as well as unprotected\n\ + files.\n\ + /S Replaces files in all subdirectories of the\n\ + destination directory. Cannot use with the /A\n\ + switch.\n\ + /W Waits for you to insert a disk before beginning.\n\ + /U Replaces (updates) only files that are older than\n\ + source files. Cannot use with the /A switch.\n" + +STRING_REPLACE_HELP2, "Áðáéôåßôáé ôï ìïíïðÜôé-ðçãÞ\n" + +STRING_REPLACE_HELP3, "Äåí Ýãéíå áíôéêáôÜóôáóç áñ÷åßùí\n" + +STRING_REPLACE_HELP4, "%lu áñ÷åßï(á) áíôéêáôáóôÜèçêáí\n" + +STRING_REPLACE_HELP5, "Ãßíåôáé áíôéêáôÜóôáóç ôïõ %s\n" + +STRING_REPLACE_HELP6, "ÁíôéêáôÜóôáóç ôïõ %s\n" + +STRING_REPLACE_HELP7, "Äåí ðñïóôÝèçêáí áñ÷åßá\n" + +STRING_REPLACE_HELP8, "%lu áñ÷åßï(á) ðñïóôÝèçêáí\n" + +STRING_REPLACE_HELP9, "ÐñïóèÞêç %s (Y/N) " + +STRING_REPLACE_HELP10, "ÁíôéêáôÜóôáóç %s (Y/N) " + +STRING_REPLACE_HELP11, "Ãßíåôáé ðñïóèÞêç ôïõ %s\n" + + +STRING_SHIFT_HELP, "Changes the position of replaceable parameters in a batch file.\n\n\ +SHIFT [DOWN]" + +STRING_SCREEN_HELP, "move cursor and optionally print text\n\n\ +SCREEN row col [text]\n\n\ + row row to which move the cursor\n\ + col column to which move the cursor" + +STRING_SET_HELP, "Displays, sets, or removes environment variables.\n\n\ +SET [variable[=][string]]\n\n\ + variable Specifies the environment-variable name.\n\ + string Specifies a series of characters to assign to the variable.\n\n\ +Type SET without parameters to display the current environment variables.\n" + +STRING_START_HELP1, "ÎåêéíÜåé Ýíá îå÷ùñéóôü ðáñÜèõñï ãéá ôçí åêôÝëåóç åíüò êáèïñéóìÝíïõ ðñïãñÜììáôïò Þ åíôïëÞò.\n\n\ +START åíôïëÞ\n\n\ + åíôïëÞ Ðñïóäéïñßæåé ôçí åíôïëÞ ãéá åêôÝëåóç.\n\n\ +At the moment all commands are started asynchronously.\n" + +STRING_TITLE_HELP, "Sets the window title for the command prompt window.\n\n\ +TITLE [string]\n\n\ +string Specifies the title for the command prompt window.\n" + +STRING_TIME_HELP1, "Displays or sets the system time.\n\n\ +TIME [/T][time]\n\n\ + /T display only\n\n\ +Type TIME with no parameters to display the current time setting and a prompt\n\ +for a new one. Press ENTER to keep the same time.\n" + +STRING_TIME_HELP2, "ÅéóÜãåôå íÝá þñá: " + +STRING_TIMER_HELP1, "Elapsed %d msecs\n" + +STRING_TIMER_HELP2, "Elapsed %02d%c%02d%c%02d%c%02d\n" + +STRING_TIMER_HELP3, "allow the use of ten stopwatches.\n\n\ +TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n\ + ON set stopwatch ON\n\ + OFF set stopwatch OFF\n\ + /S Split time. Return stopwatch split\n\ + time without changing its value\n\ + /n Specifiy the stopwatch number.\n\ + Stopwatches available are 0 to 9\n\ + If it is not specified default is 1\n\ + /Fn Format for output\n\ + n can be:\n\ + 0 milliseconds\n\ + 1 hh%cmm%css%cdd\n\n\ +if none of ON, OFF or /S is specified the command\n\ +will toggle stopwatch state\n\n" + +STRING_TYPE_HELP1, "Displays the contents of text files.\n\nTYPE [drive:][path]filename \n\ + /P Shows one screen of output at a time.\n" + +STRING_VERIFY_HELP1, "This command is just a dummy!!\n\ +Sets whether to verify that your files are written correctly to a\n\ +disk.\n\n\ +VERIFY [ON | OFF]\n\n\ +Type VERIFY without a parameter to display the current VERIFY setting.\n" + +STRING_VERIFY_HELP2, "VERIFY is %s.\n" + +STRING_VERIFY_HELP3, "Must specify ON or OFF." + +STRING_VERSION_HELP1, "Åìöáíßæåé ðëçñïöïñßåò ôçò Ýêäïóçò ôïõ êåëýöïõò.\n\n\ +VER [/C][/R][/W]\n\n\ + /C Displays credits.\n\ + /R Displays redistribution information.\n\ + /W Displays warranty information." + +STRING_VERSION_HELP2, " comes with ABSOLUTELY NO WARRANTY; for details\n\ +type: `ver /w'. This is free software, and you are welcome to redistribute\n\ +it under certain conditions; type `ver /r' for details. Type `ver /c' for a\n\ +listing of credits." + +STRING_VERSION_HELP3, "\n This program is distributed in the hope that it will be useful,\n\ + but WITHOUT ANY WARRANTY; without even the implied warranty of\n\ + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\ + GNU General Public License for more details." + +STRING_VERSION_HELP4, "\n This program is free software; you can redistribute it and/or modify\n\ + it under the terms of the GNU General Public License as published by\n\ + the Free Software Foundation; either version 2 of the License, or\n\ + (at your option) any later version.\n" + +STRING_VERSION_HELP5, "\nSend bug reports to <ros-dev(a)reactos.org>.\n\ +Updates are available at: http://www.reactos.org" + +STRING_VERSION_HELP6, "\nFreeDOS version written by:\n" + +STRING_VERSION_HELP7, "\nReactOS version written by:\n" + +STRING_VOL_HELP1, " Volume in drive %c is %s\n" +STRING_VOL_HELP2, " Volume in drive %c has no label.\n" +STRING_VOL_HELP3, " Volume Serial Number is %04X-%04X\n" +STRING_VOL_HELP4, "Displays the disk volume label and serial number, if they exist.\n\nVOL [drive:]" + +STRING_WINDOW_HELP1, "change console window aspect\n\n\ +WINDOW [/POS[=]left,top,width,heigth]\n\ + [MIN|MAX|RESTORE] ['title']\n\n\ +/POS specify window placement and dimensions\n\ +MIN minimize the window\n\ +MAX maximize the window\n\ +RESTORE restore the window" + +STRING_WINDOW_HELP2, "change console window aspect\n\n\ +ACTIVATE 'window' [/POS[=]left,top,width,heigth]\n\ + [MIN|MAX|RESTORE] ['title']\n\n\ +window tile of window on which perform actions\n\ +/POS specify window placement and dimensions\n\ +MIN minimize the window\n\ +MAX maximize the window\n\ +RESTORE restore the window\n\ +title new title\n" + + +STRING_HELP1, "List of all available commands (+ description)\n\n\ + command /? For more information on a specific command\n\n\ +? List all available commands without description).\n\ +ALIAS Sets, removes or shows aliases.\n\ +ATTRIB Åìöáíßæåé Þ áëëÜæåé ôá ÷áñáêôçñéóôéêÜ áñ÷åßùí.\n\ +BEEP Beep the speaker.\n\ +CALL Êáëåß Ýíá ðñüãñáììá äÝóìçò áðü Ýíá Üëëï.\n\ +CD Åìöáíßæåé ôï üíïìá Þ ôéò áëëáãÝò ôïõ ôñÝ÷ïíôïò êáôáëüãïõ.\n\ +CHCP Åìöáíßæåé Þ ïñßæåé ôïí áñéèìü ôçò åíåñãÞò êùäéêïóåëßäáò.\n\ +CHOICE Waits for the user to choose one of a set of choices.\n\ +CLS Êáèáñßæåé ôçí ïèüíç.\n\ +CMD ÎåêéíÜ ìéá íÝá ðåñßïäï ëåéôïõñãßáò ôïõ åñìçíåõôÞ åíôïëþí ôïõ ReactOS.\n\ +COLOR Ïñßæåé ôá ðñïåðéëåãìÝíá ÷ñþìáôá ðñþôïõ ðëÜíïõ êáé ðáñáóêçíßïõ ôçò êïíóüëáò.\n\ +COPY ÁíôéãñÜöåé Ýíá Þ ðåñéóóüôåñá áñ÷åßá óå Üëëç èÝóç.\n\ +DATE Åìöáíßæåé Þ ñõèìßæåé ôçí çìåñïìçíßá.\n\ +DELETE ÄéáãñÜöåé Ýíá Þ ðåñéóóüôåñá áñ÷åßá.\n\ +DIR Åìöáíßæåé ëßóôá áñ÷åßùí êáé äåõôåñåõüíôùí êáôáëüãùí óå êáôÜëïãï.\n\ +ECHO Åìöáíßæåé ìçíýìáôá Þ åíåñãïðïéåß êáé áðåíåñãïðïéåß ôï echo åíôïëþí.\n\ +ERASE ÄéáãñÜöåé Ýíá Þ ðåñéóóüôåñá áñ÷åßá.\n\ +EXIT Ôåñìáôßæåé ôï ðñüãñáììá CMD.EXE (åñìçíåõôÞò åíôïëþí).\n\ +FOR Åêôåëåß ìéá êáèïñéóìÝíç åíôïëÞ ãéá êÜèå áñ÷åßï åíüò óõíüëïõ áñ÷åßùí.\n\ +FREE (free) disc space.\n\ +GOTO ÌåôáâéâÜæåé ôïí åñìçíåõôÞ åíôïëþí ôïõ ReactOS óå ìéá ãñáììÞ ìå\n\ + åôéêÝôá óå Ýíá ðñüãñáììá äÝóìçò.\n\ +HELP ÐáñÝ÷åé ðëçñïöïñßåò ÂïÞèåéáò ãéá åíôïëÝò ôïõ ReactOS.\n\ +HISTORY Åìöáíßæåé ëßóôá üëùí ôùí åíôïëþí ðïõ Ý÷ïõí ÷ñçóéìïðïéçèåß.\n\ +IF Åêôåëåß åðåîåñãáóßá õðü üñïõò óå ðñïãñÜììáôá äÝóìçò.\n\ +LABEL Äçìéïõñãåß, áëëÜæåé Þ äéáãñÜöåé ôçí åôéêÝôá ôüìïõ åíüò äßóêïõ.\n\ +MD Äçìéïõñãåß Ýíáí êáôÜëïãï.\n\ +MKDIR Äçìéïõñãåß Ýíáí êáôÜëïãï.\n\ +MOVE Ìåôáêéíåß Ýíá Þ ðåñéóóüôåñá áñ÷åßá áðü Ýíáí êáôÜëïãï óå Ýíáí Üëëï.\n\ +PATH Åìöáíßæåé Þ ïñßæåé ìéá äéáäñïìÞ áíáæÞôçóçò ãéá åêôåëÝóéìá áñ÷åßá.\n\ +PAUSE ÁíáóôÝëëåé ôçí åêôÝëåóç åíüò ðñïãñÜììáôïò äÝóìçò êáé åìöáíßæåé Ýíá ìÞíõìá.\n\ +POPD ÅðáíáöÝñåé ôçí ðñïçãïýìåíç ôéìÞ ôïõ ôñÝ÷ïíôá êáôáëüãïõ, ðïõ áðïèçêåýôçêå áðü ôçí PUSHD.\n\ +PROMPT ÁëëÜæåé ôç ãñáììÞ åíôïëþí.\n\ +PUSHD Áðïèçêåýåé ôïí ôñÝ÷ïíôá êáôÜëïãï êáé óôç óõíÝ÷åéá ôïí áëëÜæåé.\n\ +RD Êáôáñãåß Ýíáí êáôÜëïãï.\n\ +REM ÊáôáãñÜöåé ó÷üëéá (ðáñáôçñÞóåéò) óå áñ÷åßá äÝóìçò Þ óôï CONFIG.SYS.\n\ +REN ÌåôïíïìÜæåé Ýíá áñ÷åßï Þ áñ÷åßá.\n\ +RENAME ÌåôïíïìÜæåé Ýíá áñ÷åßï Þ áñ÷åßá.\n\ +REPLACE ÁíôéêáèéóôÜ áñ÷åßá.\n\ +RMDIR Êáôáñãåß Ýíáí êáôÜëïãï.\n\ +SCREEN Move cursor and optionally print text.\n\ +SET Åìöáíßæåé, ïñßæåé Þ êáôáñãåß ìåôáâëçôÝò ðåñéâÜëëïíôïò ôùí Windows.\n\ +SHIFT ÌåôáôñÝðåé ôç èÝóç ôùí ðáñáìÝôñùí ìå äõíáôüôçôá áíôéêáôÜóôáóçò óå áñ÷åßá äÝóìçò.\n" +STRING_HELP2, "START ÎåêéíÜ Ýíá äéáöïñåôéêü ðáñÜèõñï ãéá ôçí åêôÝëåóç åíüò êáèïñéóìÝíïõ ðñïãñÜììáôïò Þ åíôïëÞò.\n\ +TIME Åìöáíßæåé Þ ïñßæåé ôçí þñá ôïõ óõóôÞìáôïò.\n\ +TIMER Allow the use of ten stopwatches.\n\ +TITLE Ïñßæåé ôïí ôßôëï ðáñáèýñïõ ãéá ðåñßïäï ëåéôïõñãßáò CMD.EXE.\n\ +TYPE Åìöáíßæåé ôá ðåñéå÷üìåíá åíüò áñ÷åßïõ êåéìÝíïõ.\n\ +VER Åìöáíßæåé ôçí Ýêäïóç ôïõ ReactOS.\n\ +VERIFY Åíçìåñþíåé ôá Windows åÜí ðñÝðåé íá åîáêñéâùèåß üôé ç åããñáöÞ ôùí áñ÷åßùí óáò Ý÷åé ãßíåé óùóôÜ óå Ýíá äßóêï.\n\ +VOL Åìöáíßæåé ôçí åôéêÝôá êáé ôïí óåéñéáêü áñéèìü åíüò ôüìïõ óôï äßóêï.\n" + + +STRING_CHOICE_OPTION, "YN" +STRING_COPY_OPTION, "YNA" + + +STRING_ALIAS_ERROR, "Command line too long after alias expansion!\n" +STRING_BATCH_ERROR, "Error opening batch file\n" +STRING_CHCP_ERROR1, "Active code page: %u\n" +STRING_CHCP_ERROR4, "Invalid code page\n" +STRING_CHOICE_ERROR, "Ìç Ýãêõñç åðéëïãÞ. Expected format: /C[:]options" +STRING_CHOICE_ERROR_TXT, "Ìç Ýãêõñç åðéëïãÞ. Expected format: /T[:]c,nn" +STRING_CHOICE_ERROR_OPTION, "Illegal Option: %s" +STRING_MD_ERROR, "A subdirectory or file already exists.\n" +STRING_MD_ERROR2, "The path to the new folder does not exist.\n" +STRING_CMD_ERROR1, "Can't redirect input from file %s\n" +STRING_CMD_ERROR2, "Error creating temporary file for pipe data\n" +STRING_CMD_ERROR3, "Can't redirect to file %s\n" +STRING_CMD_ERROR4, "Åêôåëåßôáé ôï %s...\n" +STRING_CMD_ERROR5, "Running cmdexit.bat...\n" +STRING_COLOR_ERROR1, "Same colors error! (Background and foreground can't be the same color)" +STRING_COLOR_ERROR2, "error in color specification" +STRING_COLOR_ERROR3, "Color %x\n" +STRING_COLOR_ERROR4, "same colors error!" +STRING_CONSOLE_ERROR, "¢ãíùóôï óöÜëìá: %d\n" +STRING_COPY_ERROR1, "ÓöÜëìá: Äåí Þôáí äõíáôü ôï Üíïéãìá ôçò ðçãÞò - %s!\n" +STRING_COPY_ERROR2, "ÓöÜëìá: Can't copy onto itself!\n" +STRING_COPY_ERROR3, "ÓöÜëìá: writing destination!\n" +STRING_COPY_ERROR4, "ÓöÜëìá: Not implemented yet!\n" +STRING_DATE_ERROR, "Ìç Ýãêõñç çìåñïìçíßá." +STRING_DEL_ERROR5, "Ôï áñ÷åßï %s ðñüêåéôáé íá äéáãñáöåß! " +STRING_DEL_ERROR6, "Åßóôå óßãïõñïé (Y/N)?" +STRING_DEL_ERROR7, "Ãßíåôáé äéáãñáöÞ: %s\n" +STRING_ERROR_ERROR1, "¢ãíùóôï óöÜëìá! Êùäéêüò ëÜèïõò: 0x%lx\n" +STRING_ERROR_ERROR2, "ÓöÜëìá óýíôáîçò" +STRING_FOR_ERROR1, "'in' missing in for statement." +STRING_FOR_ERROR2, "no brackets found." +STRING_FOR_ERROR3, "'do' ëåßðåé." +STRING_FOR_ERROR4, "êáìßá åíôïëÞ ìåôÜ ôï 'do'." +STRING_FREE_ERROR1, "Ìç Ýãêõñïò äßóêïò" +STRING_FREE_ERROR2, "unlabeled" +STRING_GOTO_ERROR1, "No label specified for GOTO" +STRING_GOTO_ERROR2, "Label '%s' not found\n" + +STRING_MOVE_ERROR1, "[OK]\n" +STRING_MOVE_ERROR2, "[ÓöÜëìá]\n" + +STRING_REN_ERROR1, "MoveFile() failed. Error: %lu\n" + +STRING_START_ERROR1, "No batch support at the moment!" + +STRING_TIME_ERROR1, "Ìç Ýãêõñç þñá." + +STRING_TYPE_ERROR1, "Ìç Ýãêõñç åðéëïãÞ '/%s'\n" + +STRING_WINDOW_ERROR1, "ôï ðáñÜèõñï äå âñÝèçêå" + + +STRING_ERROR_PARAMETERF_ERROR, "Parameter format not correct - %c\n" +STRING_ERROR_INVALID_SWITCH, "Invalid switch - /%c\n" +STRING_ERROR_TOO_MANY_PARAMETERS, "ÐïëëÝò ðáñÜìåôñïé - %s\n" +STRING_ERROR_PATH_NOT_FOUND, "Äå âñÝèçêå ôï ìïíïðÜôé\n" +STRING_ERROR_FILE_NOT_FOUND, "Äå âñÝèçêå ôï áñ÷åßï\n" +STRING_ERROR_REQ_PARAM_MISSING, "Ëåßðåé áðáñáßôçôç ðáñÜìåôñïò\n" +STRING_ERROR_INVALID_DRIVE, "Invalid drive specification\n" +STRING_ERROR_INVALID_PARAM_FORMAT, "Ìç Ýãêõñï öïñìÜ ðáñáìÝôñïõ - %s\n" +STRING_ERROR_BADCOMMAND, "ÅóöáëìÝíç åíôïëÞ Þ üíïìá\n" +STRING_ERROR_OUT_OF_MEMORY, "Out of memory error.\n" +STRING_ERROR_CANNOTPIPE, "ÓöÜëìá! Cannot pipe! Cannot open temporary file!\n" +STRING_ERROR_D_PAUSEMSG, "ÐáôÞóôå ïðïéïäÞðïôå ðëÞêôñï ãéá óõíÝ÷åéá . . ." +STRING_ERROR_DRIVER_NOT_READY, "Ï äßóêïò äåí åßíáé Ýôïéìïò" + +STRING_PATH_ERROR, "CMD: Not in environment '%s'\n" + +STRING_REPLACE_ERROR1, "Invalid switch - %s\n" +STRING_REPLACE_ERROR2, "Äå âñÝèçêå ôï ìïíïðÜôé - %s\n" +STRING_REPLACE_ERROR3, "The filename, directory name, or volume label syntax is incorrect.\n" +STRING_REPLACE_ERROR4, "Invalid parameter combination\n" +STRING_REPLACE_ERROR5, "Äåí åðéôñÝðåôáé ç ðñüóâáóç - %s\n" +STRING_REPLACE_ERROR6, "Äå âñÝèçêáí áñ÷åßá - %s\n" +STRING_REPLACE_ERROR7, "Extended Error 32\n" + +STRING_CMD_SHELLINFO, "\nReactOS Command Line Interpreter" +STRING_VERSION_RUNVER, " running on %s" +STRING_COPY_FILE , " %d file(s) copied\n" +STRING_DELETE_WIPE, "wiped" +STRING_FOR_ERROR, "bad variable specification." +STRING_SCREEN_COL, "invalid value for col" +STRING_SCREEN_ROW, "invalid value for row" +STRING_TIMER_TIME "Timer %d is %s: " + +STRING_INVALID_OPERAND, "Invalid operand." +STRING_EXPECTED_CLOSE_PAREN, "Áíáìåíüôáí ')'." +STRING_EXPECTED_NUMBER_OR_VARIABLE,"Áíáìåíüôáí áñéèìüò Þ üíïìá ìåôáâëçôÞò." +STRING_SYNTAX_COMMAND_INCORRECT, "Ç óýíôáîç ôçò åíôïëÞò äåí åßíáé Ýããõñç." + +END Propchange: trunk/reactos/base/shell/cmd/lang/el-GR.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/system/format/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/el… ============================================================================== --- trunk/reactos/base/system/format/lang/el-GR.rc (added) +++ trunk/reactos/base/system/format/lang/el-GR.rc [iso-8859-1] Wed Mar 26 21:21:55 2008 @@ -1,0 +1,74 @@ +#include "resource.h" +/* + * + * ÅëëçíéêÞ ìåôÜöñáóç - Áðüóôïëïò ÁëåîéÜäçò + */ + +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +BEGIN +STRING_HELP, "×ñÞóç: %S ôüìïò: [-FS:óýóôçìá-áñ÷åßùí] [-V:åôéêÝôá] [-Q] [-A:ìÝãåèïò] [-C]\n\n\ + [ôüìïò:] Êáèïñßæåé ôï ãñÜììá ìïíÜäáò äßóêïõ ðñïò äéáìüñöùóç.\n\ + -FS:óýóôçìá-áñ÷åßùí Êáèïñßæåé ôïí ôýðï ôïõ óõóôÞìáôïò áñ÷åßùí FAT, FAT32 Þ NTFS (%s).\n\ + -V:label Êáèïñéóìüò ôçò åôéêÝôáò ôïõ ôüìïõ.\n\ + -Q ÅêôÝëåóç ãñÞãïñçò äéáìüñöùóçò.\n\ + -A:ìÝãåèïò ÐáñáêÜìðôåé ôï ðñïåðéëåãìÝíï ìÝãåèïò ìïíÜäáò åê÷þñçóçò.\n\ + Ãéá ãåíéêÞ ÷ñÞóç óõíéóôþíôáé éäéáßôåñá ïé ðñïåðéëåãìÝíåò\n\ + ñõèìßóåéò. Ôï NTFS õðïóôçñßæåé 512, 1024, 2048, 4096,\n\ + 8192, 16K, 32K, 64K. Ôï FAT õðïóôçñßæåé 512, 1024, 2048,\n\ + 4096, 8192, 16K, 32K, 64K, (128K, 256K ãéá ìÝãåèïò ôïìÝá\n\ + > 512 byte). Ôï FAT32 õðïóôçñßæåé 512, 1024, 2048,\n\ + 4096, 8192, 16K, 32K, 64K, (128K, 256K ãéá ìÝãåèïò ôïìÝá\n\ + > 512 byte).\n\ + -C Files created on the new volume will be compressed by\n\ + default.\n\n" + +STRING_COMPLETE "%lu ôïéò åêáôü ïëïêëçþèçêå.\r" + +STRING_FORMAT_FAIL "Ôï FormatEx äå ìðüñåóå íá ïëïêëçñùèåß åðéôõ÷þò.\n\n" + +STRING_NO_SUPPORT "Ç ëåéôïõñãßá äåí åßíáé õðïóôçñéæüìåíç" + +STRING_FMIFS_FAIL "Could not located FMIFS entry points.\n\n" + +STRING_UNKNOW_ARG "¢ãíùóôï üñéóìá: %S\n" + +STRING_DRIVE_PARM "Required drive parameter is missing.\n\n" + +STRING_ERROR_DRIVE_TYPE "Äåí Þôáí äõíáôÞ ç áíÜãíùóç ôïõ ôýðïõ ôïõ ôüìïõ." + +STRING_INSERT_DISK "ÅÉóÜãåôå ìéá íÝá äéóêÝôá óôï %C:\nêáé ðáôÞóôå Enter üôáí åßóôå Ýôïéìïé..." + +STRING_NO_VOLUME "Could not query volume" + +STRING_NO_VOLUME_SIZE "Could not query volume size" + +STRING_FILESYSTEM "Ï ôýðïò ôïõ óõóôÞìáôïò áñ÷åßùí åßíáé %S.\n" + +STRING_LABEL_NAME_EDIT "ÅéóÜãåôå ôçí ôñÝ÷ïõóá åôéêÝôá ãéá ôïí ôüìï %C: " + +STRING_ERROR_LABEL "Ìéá ìç Ýããõñç åôéêÝôá ðëçêôñïëïãÞèçêå ãéá áõôüí ôïí ôüìï.\n" + +STRING_YN_FORMAT "\nÐÑÏÅÉÄÏÐÏÉÇÓÇ, ÏËÁ ÔÁ ÄÅÄÏÌÅÍÁ ÓÔÏÍ NON_REMOVABLE ÄÉÓÊÏ\n\ +DRIVE %C: ÈÁ ×ÁÈÏÕÍ!\nÓõíÝ÷åéá ìå ôç äéáìüñöùóç (Y/N)? " + +STRING_YES_NO_FAQ "YN" + +STRING_VERIFYING "Ãßíåôáé ðéóôïðïßçóç" + +STRING_FAST_FMT "QuickFormatting" + +STRING_CREATE_FSYS "Creating file system structures.\n" + +STRING_FMT_COMPLETE "Ç äéáìüñöùóç ïëïêëçñþèçêå.\n" + +STRING_VOL_COMPRESS "Ï ôüìïò äåí õðïóôçñßæåé óõìðßåóç.\n" + +STRING_ENTER_LABEL "ÅôéêÝôá ôüìïõ (11 ÷áñáêôÞñåò, Enter ãéá êáíÝíá)? " + +STRING_NO_LABEL "Äåí Þôáí äõíáôÞ ç åéóáãùãÞ åôéêÝôáò ôïõ ôüìïõ" + +STRING_FREE_SPACE "\n%I64d bytes óõíïëéêüò ÷þñïò äßóêïõ.\n%I64d bytes äéáèÝóéìá óôï äßóêï.\n" + +STRING_SERIAL_NUMBER "\nÏ óåéñéáêüò áñéèìüò ôïõ ôüìïõ åßíáé ï %04X-%04X\n" +END Propchange: trunk/reactos/base/system/format/lang/el-GR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/format/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/rsrc.rc… ============================================================================== --- trunk/reactos/base/system/format/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/format/rsrc.rc [iso-8859-1] Wed Mar 26 21:21:55 2008 @@ -5,6 +5,7 @@ #include "lang/bg-BG.rc" #include "lang/de-DE.rc" +#include "lang/el-GR.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" #include "lang/hu-HU.rc" Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/fdebug.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/fdebug.rc [iso-8859-1] Wed Mar 26 21:21:55 2008 @@ -7,6 +7,7 @@ #include "lang/bg-BG.rc" #include "lang/de-DE.rc" +#include "lang/el-GR.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fr-FR.rc" Added: trunk/reactos/boot/freeldr/fdebug/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/e… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/el-GR.rc (added) +++ trunk/reactos/boot/freeldr/fdebug/lang/el-GR.rc [iso-8859-1] Wed Mar 26 21:21:55 2008 @@ -1,0 +1,191 @@ +///////////////////////////////////////////////////////////////////////////// +// Greek resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT +#pragma code_page(1253) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDC_FDEBUG MENU DISCARDABLE +BEGIN + POPUP "&Áñ÷åßï" + BEGIN + MENUITEM "&Óýíäåóç", IDM_FILE_CONNECT + MENUITEM "&Áðïóýíäåóç", IDM_FILE_DISCONNECT, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Êáèáñéóìüò ïèüíçò", IDM_FILE_CLEARDISPLAY + MENUITEM SEPARATOR + MENUITEM "&¸íáñîç Capture", IDM_FILE_STARTCAPTURE + MENUITEM "Ôå&ñìáôéóìüò Capture", IDM_FILE_STOPCAPTURE, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Local Echo", IDM_FILE_LOCALECHO + MENUITEM SEPARATOR + MENUITEM "¸&îïäïò", IDM_EXIT + END + POPUP "&ÂïÞèåéá" + BEGIN + MENUITEM "&Ó÷åôéêÜ...", IDM_ABOUT + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Accelerator +// + +IDC_FDEBUG ACCELERATORS MOVEABLE PURE +BEGIN + 63, IDM_ABOUT, ASCII, ALT // "?" + 47, IDM_ABOUT, ASCII, ALT // "/" +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""resource.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_ABOUTBOX, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 252 + TOPMARGIN, 7 + BOTTOMMARGIN, 203 + END + + IDD_CONNECTION, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 189 + TOPMARGIN, 7 + BOTTOMMARGIN, 93 + END + + IDD_CAPTURE, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 244 + TOPMARGIN, 7 + BOTTOMMARGIN, 88 + END +END +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ABOUTBOX DIALOGEX DISCARDABLE 22, 17, 259, 210 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Ó÷åôéêÜ ìå ôçí åêóöáëìÜôùóç ôïõ FreeLoader" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "FreeLoader Debugger v1.0\nCopyright (C) 2003\nby Brian Palmer (brianp(a)reactos.org)", + IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, + 122,26 + DEFPUSHBUTTON "OK",IDOK,183,189,44,14,WS_GROUP + ICON IDI_FDEBUG,IDC_STATIC,19,30,20,20 + EDITTEXT IDC_LICENSE_EDIT,53,63,174,107,ES_MULTILINE | + ES_READONLY | WS_VSCROLL +END + +IDD_CONNECTION DIALOGEX DISCARDABLE 0, 0, 196, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ÅðéëïãÝò óýíäåóçò" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ÅéóÜãåôå ôç èýñá COM (ð.÷. COM1):",IDC_STATIC,7,7,108,8 + EDITTEXT IDC_COMPORT,7,17,182,14,ES_AUTOHSCROLL + LTEXT "ÅéóÜãåôå ôï baud rate (ð.÷. 115200):",IDC_STATIC,7,38,114, + 8 + EDITTEXT IDC_BAUTRATE,7,48,182,14,ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,45,79,50,14 + PUSHBUTTON "¢êõñï",IDCANCEL,100,79,50,14 +END + +IDD_CAPTURE DIALOGEX DISCARDABLE 0, 0, 251, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Capture Áñ÷åßï" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Capture üíïìá áñ÷åßïõ:",IDC_STATIC,7,17,62,8 + EDITTEXT IDC_CAPTUREFILENAME,7,26,181,14,ES_AUTOHSCROLL + PUSHBUTTON "&ÁíáæÞôçóç",IDC_BROWSE,194,26,50,14 + DEFPUSHBUTTON "OK",IDOK,139,74,50,14 + PUSHBUTTON "¢êõñï",IDCANCEL,194,74,50,14 +END + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "fdebug" + IDS_HELLO "Hello World!" + IDC_FDEBUG "FDEBUG" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." +END + +#endif // Greek resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Propchange: trunk/reactos/boot/freeldr/fdebug/lang/el-GR.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/input/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/el-GR.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/el-GR.rc (added) +++ trunk/reactos/dll/cpl/input/lang/el-GR.rc [iso-8859-1] Wed Mar 26 21:21:55 2008 @@ -1,0 +1,224 @@ +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +IDD_PROPPAGESETTINGS DIALOGEX 0, 0, 254, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ñõèìßóåéò" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ÅðéëÝîôå ôéò õðçñåóßåò ðïõ èÝëåôå ãéá êÜèå ãëþóóá åéóáãùãÞò ðïõ åìöáíßæåôáé óôç ëßóôá.\n×ñçóéìïðïéÞóôå ôá êïõìðéÜ ÐñïóèÞêç êáé ÊáôÜñãçóç ãéá ôçí ôñïðïðïßçóç áõôÞò ôçò ëßóôáò.", -1, 9, 6, 238, 17 + CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SORTASCENDING | LVS_REPORT | 0x0000808D, 8, 28, 237, 109 + PUSHBUTTON "&Set Default", IDC_SET_DEFAULT, 101, 159, 144, 14 + PUSHBUTTON "Ð&ñïóèÞêç...", IDC_ADD_BUTTON, 27, 142, 70, 14 + PUSHBUTTON "&ÊáôÜñãçóç...", IDC_REMOVE_BUTTON, 101, 142, 70, 14 + PUSHBUTTON "&Éäéüôçôåò...", IDC_PROP_BUTTON, 175, 142, 70, 14 + GROUPBOX "ÐñïôéìÞóåéò", -1, 7, 185, 240, 36 + PUSHBUTTON "&Ñõèìßóåéò ðëÞêôñùí...", IDC_KEY_SET_BTN, 14, 198, 110, 14 +END + +IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ðñüóèåôåò ñõèìßóåéò êëåéäéïý" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ãéá áðåíåñãïðïßçóç ôïõ ðëÞêôñïõ Caps Lock", -1, 7, 7, 258, 26 + AUTORADIOBUTTON "ÐáôÞóôå ôï ðëÞêôñï CAPS &LOCK", IDC_PRESS_CL_KEY_RB, 14, 17, 120, 11, WS_GROUP + AUTORADIOBUTTON "ÐáôÞóôå ôï ðëÞêôñï SHI&FT", IDC_PRESS_SHIFT_KEY_RB, 144, 17, 120, 11, NOT WS_TABSTOP + GROUPBOX "ÐëÞêôñá ðñüóâáóçò ãéá ãëþóóåò åéóáãùãÞò", -1, 7, 37, 258, 95 + LTEXT "ÅíÝñãåéá", -1, 14, 47, 60, 9 + RTEXT "&Áêïëïõèßá ðëÞêôñùí", -1, 177, 47, 79, 9 + LISTBOX IDC_KEY_LISTBOX, 14, 57, 244, 52, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&ÁëëáãÞ áêïëïõèßáò ðëÞêôñùí...", IDC_CHANGE_KEY_SEQ_BTN, 152, 113, 106, 14, WS_GROUP + DEFPUSHBUTTON "OK", IDOK, 66, 140, 70, 14 + PUSHBUTTON "¢êõñï", IDCANCEL, 146, 140, 70, 14 +END + +IDD_ADD DIALOGEX 20, 20, 227, 90 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "ÐñïóèÞêç ãëþóóáò åéóáãùãÞò" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Ãëþóóá åéóáãùãÞò:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 110, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + LTEXT "&ÄéÜôáîç ðëçêôñïëïãßïõ/IME:", -1, 7, 36, 110, 10 + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 110, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 + PUSHBUTTON "¢êõñï", IDCANCEL, 169, 68, 50, 14 +END + +IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 194, 89 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "ÁëëáãÞ áêïëïõèßáò ðëÞêôñùí" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", 1240, 4, 5, 186, 10 + GROUPBOX "", -1, 7, 16, 179, 48 + AUTOCHECKBOX "Å&íáëëáãÞ äéÜôáîçò ðëçêôñïëïãßïõ", IDC_USE_SK, 12, 17, 135, 8 + CTEXT "SHIFT", -1, 68, 37, 27, 12 + CTEXT "+", -1, 57, 37, 8, 9 + AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "Áñéóôåñü A&LT", -1, 24, 45, 50, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 83, 70, 50, 14 + PUSHBUTTON "¢êõñï", IDCANCEL, 136, 70, 50, 14 +END + +IDD_INPUT_LANG_PROP DIALOGEX 20, 20, 227, 75 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Éäéüôçôåò ãëþóóáò åéóáãùãÞò" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ãëþóóá åéóáãùãÞò:", -1, 7, 7, 61, 8 + LTEXT "", -1, 73, 7, 129, 8 + LTEXT "&ÄéÜôáîç ðëçêôñïëïãßïõ/IME:", -1, 7, 21, 110, 10 + COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14 + PUSHBUTTON "¢êõñï", IDCANCEL, 169, 53, 52, 14 +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Õðçñåóßåò êåéìÝíïõ êáé ãëþóóåò åéóáãùãÞò" + IDS_CPLSYSTEMDESCRIPTION "Ðñïóáñìüæåé ôéò ñõèìßóåéò ãéá ôï êåßìåíï åéóáãùãÞò ôùí ãëùóóþí." + IDS_KEYBOARD "Ðëçêôñïëüãéï" + IDS_NONE "(ÊáíÝíá)" + IDS_UNKNOWN "(¢ãíùóôï)" + IDS_RESTART "ÈÝëåôå íá åðáíåêêéíÞóåôå ôïí õðïëïãéóôÞ óáò ôþñá;" + IDS_WHATS_THIS "Ôé åßíáé áõôü;" + IDS_LANGUAGE "Ãëþóóá" + IDS_LAYOUT "ÄéÜôáîç ðëçêôñïëïãßïõ" +END + +STRINGTABLE +BEGIN + IDS_US_LAYOUT, "US" + IDS_BELGIAN_LAYOUT, "ÂÝëãéêá (Period)" + IDS_BELGIAN_FRENCH_LAYOUT, "ÃáëëéêÜ (Âåëãßïõ)" + IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT, "Portuguese (Brazilian ABNT)" + IDS_CANADIAN_FRENCH_LAYOUT, "ÃáëëéêÜ (ÊáíáäÜ)" + IDS_CANADIAN_FRENCH_LEGACY_LAYOUT, "ÃáëëéêÜ (ÊáíáäÜ) (Legacy)" + IDS_DANISH_LAYOUT, "ÄáíéêÜ" + IDS_DUTCH_LAYOUT, "Dutch" + IDS_FINNISH_LAYOUT, "ÖéíëáíäéêÜ" + IDS_FRENCH_LAYOUT, "ÃáëëéêÜ" + IDS_GERMAN_LAYOUT, "ÃåñìáíéêÜ" + IDS_GERMAN_IBM_LAYOUT, "ÃåñìáíéêÜ (IBM)" + IDS_ICELANDIC_LAYOUT, "ÉóëáíäéêÜ" + IDS_IRISH_LAYOUT, "Irish" + IDS_ITALIAN_LAYOUT, "ÉôáëéêÜ" + IDS_ITALIAN_142_LAYOUT, "ÉôáëéêÜ (142)" + IDS_LATIN_AMERICAN_LAYOUT, "Latin American" + IDS_NORWEGIAN_LAYOUT, "ÍïñâçãéêÜ" + IDS_PORTUGUESE_LAYOUT, "ÐïñôïãáëéêÜ" + IDS_SPANISH_LAYOUT, "ÉóðáíéêÜ" + IDS_SPANISH_VARIANTION_LAYOUT, "Spanish Variation" + IDS_SWEDISH_LAYOUT, "ÓïõçäéêÜ" + IDS_SWISS_FRENCH_LAYOUT, "Swiss French" + IDS_SWISS_GERMAN_LAYOUT, "Swiss German" + IDS_UNITED_KINGDOM_LAYOUT, "ÇíùìÝíï Âáóßëåéï" + IDS_UNITED_STATES_INTERNATIONAL_LAYOUT, "United States-International" + IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT, "United States-Dvorak for left hand" + IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT, "United States-Dvorak for right hand" + IDS_ALBANIAN_LAYOUT, "ÁëâáíéêÜ" + IDS_CROATIAN_LAYOUT, "ÊñïÜôéêá" + IDS_CZECH_LAYOUT, "ÔóÝ÷éêá" + IDS_CZECH_QWERTY_LAYOUT, "ÔóÝ÷éêá (QWERTY)" + IDS_HUNGARIAN_LAYOUT, "Ïýããñéêá" + IDS_HUNGARIAN_101_KEY_LAYOUT, "Ïýããñéêá 101-ðëÞêôñá" + IDS_POLISH_LAYOUT, "ÐïëùíéêÜ (ÐñïãñáììáôéóôÝò)" + IDS_POLISH_214_LAYOUT, "ÐïëùíéêÜ (214)" + IDS_ROMANIAN_LAYOUT, "ÑïõìÜíéêá" + IDS_SERBIAN_LATIN_LAYOUT, "ÓÝñâéêá (ËáôéíéêÜ)" + IDS_SLOVAK_LAYOUT, "ÓëïâáêéêÜ" + IDS_SLOVAK_QWERTY_LAYOUT, "ÓëïâáêéêÜ (QWERTY)" + IDS_SLOVENIAN_LAYOUT, "ÓëïâÝíéêá" + IDS_ESTONIAN_LAYOUT, "ÅóèïíéêÜ" + IDS_LATVIAN_LAYOUT, "Latvian" + IDS_LATVIAN_QWERTY_LAYOUT, "Latvian (QWERTY)" + IDS_LITHUANIAN_IBM_LAYOUT, "ËéèïõáíéêÜ IBM" + IDS_GREEK_LAYOUT, "ÅëëçíéêÜ" + IDS_GREEK_LATIN_LAYOUT, "ÅëëçíéêÜ ËáôéíéêÜ" + IDS_GREEK_220_LAYOUT, "ÅëëçíéêÜ (220)" + IDS_GREEK_319_LAYOUT, "ÅëëçíéêÜ (319)" + IDS_GREEK_220_LATIN_LAYOUT, "ÅëëçíéêÜ (220) ËáôéíéêÜ" + IDS_GREEK_319_LATIN_LAYOUT, "ÅëëçíéêÜ (319) ËáôéíéêÜ" + IDS_BELARUSIAN_LAYOUT, "Belarusian" + IDS_BULGARIAN_LAYOUT, "ÂïõëãÜñéêá" + IDS_BULGARIAN_LATIN_LAYOUT, "ÂïõëãÜñéêá (ËáôéíéêÜ)" + IDS_RUSSIAN_LAYOUT, "Ñþóéêá" + IDS_RUSSIAN_TYPEWRITER_LAYOUT, "Ñþóéêá (Typewriter)" + IDS_SERBIAN_CYRILLIC_LAYOUT, "ÓÝñâéêá (ÊõñéëëéêÜ)" + IDS_UKRAINIAN_LAYOUT, "ÏõêñáíéêÜ" + IDS_TURKISH_F_LAYOUT, "Ôïýñêéêá F" + IDS_TURKISH_Q_LAYOUT, "Ôïýñêéêá Q" + IDS_JAPANESE_LAYOUT, "ÉáðùíéêÜ" + IDS_JAPANESE_INPUT_SYSTEM_MSIME2002_LAYOUT, "ÉáðùíéêÜ Input System (MS-IME2002)" + IDS_KOREAN_LAYOUT, "ÊïñåÜôéêá" + IDS_KOREAN_INPUT_SYSTEM_MSIME2002_LAYOUT, "ÊïñåÜôéêá Input System (MS-IME2002)" + IDS_CHINESE_TRADITIONAL_USKEYBOARD_LAYOUT, "ÊéíÝæéêá (ÐáñáäïóéáêÜ) - US Keyboard" + IDS_CHINESE_TRADITIONAL_PHONETIC_LAYOUT, "ÊéíÝæéêá (ÐáñáäïóéáêÜ) - Phonetic" + IDS_CHINESE_TRADITIONAL_CHANGJIE_LAYOUT, "ÊéíÝæéêá (ÐáñáäïóéáêÜ) - ChangJie" + IDS_CHINESE_TRADITIONAL_BIG5CODE_LAYOUT, "ÊéíÝæéêá (ÐáñáäïóéáêÜ) - Big5 Code" + IDS_CHINESE_TRADITIONAL_DAYI_LAYOUT, "ÊéíÝæéêá (ÐáñáäïóéáêÜ) - DaYi" + IDS_CHINESE_TRADITIONAL_UNICODE_LAYOUT, "ÊéíÝæéêá (ÐáñáäïóéáêÜ) - Unicode" + IDS_CHINESE_TRADITIONAL_ALPHANUMERIC_LAYOUT, "ÊéíÝæéêá (ÐáñáäïóéáêÜ) - Alphanumeric" + IDS_CHINESE_SIMPLIFIED_USKEYBOARD_LAYOUT, "ÊéíÝæéêá (ÁðëïðïéçìÝíá) - US Keyboard" + IDS_CHINESE_SIMPLIFIED_QUANPIN_LAYOUT, "ÊéíÝæéêá (ÁðëïðïéçìÝíá) - QuanPin" + IDS_CHINESE_SIMPLIFIED_SHUANGPIN_LAYOUT, "ÊéíÝæéêá (ÁðëïðïéçìÝíá) - ShuangPin" + IDS_CHINESE_SIMPLIFIED_ZHENGMA_LAYOUT, "ÊéíÝæéêá (ÁðëïðïéçìÝíá) - ZhengMa" + IDS_CHINESE_SIMPLIFIED_NEIMA_LAYOUT, "ÊéíÝæéêá (ÁðëïðïéçìÝíá) - NeiMa" + IDS_THAI_KEDMANEE_LAYOUT, "Thai Kedmanee" + IDS_THAI_PATTACHOTE_LAYOUT, "Thai Pattachote" + IDS_THAI_KEDMANEE_NONSHIFTLOCK_LAYOUT, "Thai Kedmanee (non-ShiftLock)" + IDS_THAI_PATTACHOTE_NONSHIFTLOCK_LAYOUT, "Thai Pattachote (non-ShiftLock)" + IDS_HEBREW_LAYOUT, "Hebrew" + IDS_ARABIC_101_LAYOUT, "Arabic (101)" + IDS_ARABIC_102_LAYOUT, "Arabic (102)" + IDS_ARABIC_102_AZERTY_LAYOUT, "Arabic (102) AZERTY" + IDS_CZECH_PROGRAMMERS_LAYOUT, "Czech Programmers" + IDS_LITHUANIAN_LAYOUT, "ËéèïõáíéêÜ" + IDS_BELGIAN_COMMA_LAYOUT, "Belgian (Comma)" + IDS_CHINESE_TRADITIONAL_NEWPHONETIC_LAYOUT, "ÊéíÝæéêá (ÐáñáäïóéáêÜ) - New Phonetic" + IDS_CHINESE_SIMPLIFIED_MSPINYINIME30_LAYOUT, "ÊéíÝæéêá (ÁðëïðïéçìÝíá) - Microsoft Pinyin IME 3.0" + IDS_UNITED_STATES_DVIRAK_LAYOUT, "United States-Dvorak" + IDS_CHINESE_TRADITIONAL_NEWCHANGJIE_LAYOUT, "ÊéíÝæéêá (ÐáñáäïóéáêÜ) - New ChangJie" + IDS_ASSAMESE_LAYOUT, "Assamese" + IDS_BENGALI_LAYOUT, "Bengali" + IDS_DEVANAGARI_INSCRIPT_LAYOUT, "Devanagari - INSCRIPT" + IDS_GUJARATI_LAYOUT, "Gujarati" + IDS_KANNADA_LAYOUT, "Kannada" + IDS_MALAYALAM_LAYOUT, "Malayalam" + IDS_ORIYA_LAYOUT, "Oriya" + IDS_PUNJABI_LAYOUT, "Punjabi" + IDS_TAMIL_LAYOUT, "Tamil" + IDS_TELUGU_LAYOUT, "Telugu" + IDS_MARATHI_LAYOUT, "Marathi" + IDS_HINDI_TRADITIONAL_LAYOUT, "Hindi Traditional" + IDS_CANTONESE_PHONETIC_LAYOUT, "Cantonese Phonetic" + IDS_FAEROESE_LAYOUT, "Faeroese" + IDS_FYRO_MACEDONIAN_LAYOUT, "FYRO Macedonian" + IDS_CANADIAN_MULTILINGUAL_STD_LAYOUT, "Canadian Multilingual Standard" + IDS_CHINESE_TRADITIONAL_QUICK_LAYOUT, "Chinese (Traditional) - Quick" + IDS_CHINESE_TRADITIONAL_ARRAY_LAYOUT, "Chinese (Traditional) - Array" + IDS_KAZAKH_LAYOUT, "Kazakh" + IDS_UZBEK_CYRILLIC_LAYOUT, "Uzbek ÊõñéëëéêÜ" + IDS_AZERI_CYRILLIC_LAYOUT, "Azeri ÊõñéëëéêÜ" + IDS_TATAR_LAYOUT, "Tatar" + IDS_AZERI_LATIN_LAYOUT, "Azeri ËáôéíéêÜ" + IDS_VIETNAMESE_LAYOUT, "Vietnamese" + IDS_GEORGIAN_LAYOUT, "ÃåùñãéáíÜ" + IDS_ARMENIAN_EASTERN_LAYOUT, "ÁñìåíéêÜ Eastern" + IDS_ARMENIAN_WESTERN_LAYOUT, "ÁñìåíéêÜ Western" + IDS_GREEK_POLYTONIC_LAYOUT, "ÅëëçíéêÜ ÐïëõôïíéêÜ" + IDS_USENG_TABLE_IBM_ARABIC238L_LAYOUT, "US English Table for IBM Arabic 238_L" + IDS_FARSI_LAYOUT, "Farsi" + IDS_GAELIC_LAYOUT, "Gaelic" + IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT, "ÐïñôïãáëéêÜ (Brazilian ABNT2)" + IDS_MONGOLIAN_CYRILLIC_LAYOUT, "Mongolian ÊõñéëëéêÜ" + IDS_KYRGYZ_CYRILLIC_LAYOUT, "Kyrgyz ÊõñéëëéêÜ" + IDS_URDU_LAYOUT, "Urdu" + IDS_SYRIAC_LAYOUT, "Syriac" + IDS_SYRIAC_PHONETIC_LAYOUT, "Syriac Phonetic" + IDS_DIVEHI_PHONETIC_LAYOUT, "Divehi Phonetic" + IDS_DIVEHI_TYPEWRITER_LAYOUT, "Divehi Typewriter" + IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT, "Bulgarian Phonetic (Classic)" + IDS_BULGARIAN_PHONETIC_BDS_LAYOUT, "Bulgarian Phonetic (BDS)" +END Propchange: trunk/reactos/dll/cpl/input/lang/el-GR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/input/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/rsrc.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/input/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/rsrc.rc [iso-8859-1] Wed Mar 26 21:21:55 2008 @@ -3,6 +3,7 @@ #include "lang/bg-BG.rc" #include "lang/de-DE.rc" +#include "lang/el-GR.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fr-FR.rc" Added: trunk/reactos/dll/cpl/joy/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/el-GR.rc?… ============================================================================== --- trunk/reactos/dll/cpl/joy/lang/el-GR.rc (added) +++ trunk/reactos/dll/cpl/joy/lang/el-GR.rc [iso-8859-1] Wed Mar 26 21:21:55 2008 @@ -1,0 +1,84 @@ +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +IDD_PROPPAGEMAIN DIALOGEX 0, 0, 252, 205 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "ÅëåãêôÝò ðáé÷íéäéþí" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CPLSYSTEM, -1, 7, 7, 20, 20 + LTEXT "ÁõôÝò ïé ñõèìßóåéò óáò âïçèïýí íá ñõèìßóåôå ôïõò åëåãêôÝò ðáé÷íéäéþí ðïõ âñßóêïíôáé åãêáôåóôçìÝíïé óôïí õðïëïãéóôÞ óáò.", -1, 33, 7, 214, 20, NOT WS_GROUP + GROUPBOX "Å&ãêáôåóôçìÝíïé åëåãêôÝò ðáé÷íéäéþí", -1, 7, 34, 238, 117 + CONTROL "List1", IDC_CONTROLLER_LIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000808D, 14, 44, 224, 80 + PUSHBUTTON "&ÐñïóèÞêç...", IDC_ADD_BUTTON, 35, 129, 65, 14 + PUSHBUTTON "&ÊáôÜñãçóç", IDC_REMOVE_BUTTON, 104, 129, 65, 14, WS_DISABLED + PUSHBUTTON "&Éäéüôçôåò", IDC_PROPERTIES_BUTTON, 173, 129, 65, 14, WS_DISABLED + PUSHBUTTON "Ãéá Ð&ñï÷ùñçìÝíïõò...", IDC_ADVANCED_BUTTON, 111, 157, 65, 14 + PUSHBUTTON "&Áíôéìåôþðéóç ðñïâëçìÜôùí...", IDC_TROUBLESHOOT_BUTTON, 180, 157, 65, 14 + PUSHBUTTON "OK", IDOK, 195, 185, 50, 14 +END + +IDD_ADD DIALOGEX 0, 0, 265, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "ÐñïóèÞêç åëåãêôÞ ðáé÷íéäéþí" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CPLSYSTEM, -1, 8, 7, 20, 20 + LTEXT "ÅðéëÝîôå Ýíáí åëåãêÞ ðáé÷íéäéþí áðü ôçí ðáñáêÜôù ëßóôá êáé êÜíôå êëéê óôï êïõìðß ÏÊ. ÅÜí ï åëåãêôÞò óáò äåí åìöáíßæåôáé óôç ëßóôá, êÜíôå êëéê óôï êïõìðß ÐñïóáñìïãÞ.", -1, 35, 7, 210, 33 + LTEXT "&ÅëåãêôÝò ðáé÷íéäéþí:", -1, 8, 45, 126, 8 + LISTBOX IDC_GAME_CONTROLLERS_LIST, 7, 55, 251, 57, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_TABSTOP + AUTOCHECKBOX "&Åíåñãïðïßçóç ðçäáëßïõ êáé ðåíôÜë", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 100, 10, WS_GROUP + LTEXT "&Game Port:", -1, 7, 134, 38, 8, NOT WS_VISIBLE + COMBOBOX IDC_GAME_PORT_COMBO, 7, 147, 140, 50, CBS_DROPDOWNLIST | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL + PUSHBUTTON "&ÐñïóáñìïãÞ...", IDC_CUSTOM_BUTTON, 208, 147, 50, 14 + CONTROL "", -25525, "STATIC", SS_ETCHEDHORZ, 7, 170, 251, 1 + DEFPUSHBUTTON "OK", IDOK, 155, 179, 50, 14 + PUSHBUTTON "¢êõñï", IDCANCEL, 208, 179, 50, 14 +END + +IDD_CUSTOM DIALOGEX 0, 0, 265, 183, 0 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "ÐñïóáñìïóìÝíïò åëåãêôÞò ðáé÷íéäéþí" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "ÅéäéêÜ ÷áñáêôçñéóôéêÜ", -1, 7, 7, 245, 52 + AUTORADIOBUTTON "&Joystick", IDC_JOYSTICK_RADIO, 17, 23, 55, 10 + AUTORADIOBUTTON "&×åéñéóôÞñéï ðôÞóçò", IDC_FLIGHT_YOKE_RADIO, 147, 23, 89, 10 + AUTORADIOBUTTON "&×åéñéóôÞñéï ðáé÷íéäéþí", IDC_GAME_PAD_RADIO, 17, 40, 65, 10 + AUTORADIOBUTTON "&×åéñéóôÞñéï áãùíéóôéêïý áõôïêéíÞôïõ", IDC_RACE_CAR_RADIO, 147, 40, 93, 10 + GROUPBOX "&Axes", -1, 7, 67, 116, 44, WS_GROUP + COMBOBOX IDC_AXES_COMBO, 37, 79, 48, 50, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTORADIOBUTTON "¢îïíåò", IDC_RUDDER_PEDALS_RADIO, 14, 97, 63, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Z Üîïíáò", IDC_Z_AXIS_RADIO, 81, 97, 35, 10, NOT WS_VISIBLE + GROUPBOX "&ÊïõìðéÜ", -1, 137, 67, 116, 44 + COMBOBOX IDC_BUTTONS_COMBO, 178, 79, 48, 50, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL, WS_EX_CLIENTEDGE + AUTOCHECKBOX "ÓõìðåñéëáìâÜíåé ÷åéñéóôÞñéï ñýèìéóçò ïðôéêÞò ãùíßáò", IDC_INC_POINT_CHECKBOX, 7, 123, 115, 10 + LTEXT "¼&íïìá åëåãêôÞ:", -1, 7, 139, 200, 9 + EDITTEXT IDC_CONTROLLER_NAME_EDIT, 7, 150, 116, 15, ES_AUTOHSCROLL, WS_EX_CLIENTEDGE | WS_EX_STATICEDGE + DEFPUSHBUTTON "OK", IDOK, 137, 150, 50, 14 + PUSHBUTTON "¢êõñï", IDCANCEL, 203, 150, 50, 14 +END + +IDD_ADVANCED DIALOGEX 0, 0, 220, 86 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Ñõèìßóåéò ãéá ðñï÷ñçìÝíïõò" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CPLSYSTEM, -1, 7, 24, 20, 20 + DEFPUSHBUTTON "OK", IDOK, 106, 65, 50, 14 + PUSHBUTTON "¢êõñï", IDCANCEL, 163, 65, 50, 14 + LTEXT "ÅðéëÝîôå ôç óõóêåõÞ ðïõ èÝëåôå íá ÷ñçóéìïðïéÞóåôå ìå ðáëáéüôåñá ðñïãñÜììáôá.", -1, 7, 7, 208, 10 + LTEXT "&Ðñïôéìþìåíç óõóêåõÞ:", -1, 34, 24, 70, 10 + COMBOBOX IDC_PREFERRED_DEV_COMBO, 34, 38, 179, 75, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "ÅëåãêôÝò ðáé÷íéäéþí" + IDS_CPLSYSTEMDESCRIPTION "ÐñïóèÞêç, êáôÜñãçóç êáé ñýèìéóç ôïõ õëéêïý åëåãêôþí ðáé÷íéäéþí üðùò joystick êáé ÷åéñéóôÞñéá ðáé÷íéäéþí." + IDS_CONTROLLER "Controller" + IDS_STATUS "Status" +END Propchange: trunk/reactos/dll/cpl/joy/lang/el-GR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/joy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/rsrc.rc?rev=32… ============================================================================== --- trunk/reactos/dll/cpl/joy/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/joy/rsrc.rc [iso-8859-1] Wed Mar 26 21:21:55 2008 @@ -3,6 +3,7 @@ #include "lang/bg-BG.rc" #include "lang/de-DE.rc" +#include "lang/el-GR.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fr-FR.rc"

16 years, 9 months

[gbrunmar] 32768: Renamed some internal D3D9 structs as only COM objects should be named _INT

by gbrunmar＠svn.reactos.org

Author: gbrunmar Date: Wed Mar 26 21:16:07 2008 New Revision: 32768 URL: http://svn.reactos.org/svn/reactos?rev=32768&view=rev Log: Renamed some internal D3D9 structs as only COM objects should be named _INT Modified: trunk/reactos/dll/directx/d3d9/adapter.c trunk/reactos/dll/directx/d3d9/adapter.h trunk/reactos/dll/directx/d3d9/d3d9_caps.c trunk/reactos/dll/directx/d3d9/d3d9_caps.h trunk/reactos/dll/directx/d3d9/d3d9_create.c trunk/reactos/dll/directx/d3d9/d3d9_private.h Modified: trunk/reactos/dll/directx/d3d9/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/adapter.c… ============================================================================== --- trunk/reactos/dll/directx/d3d9/adapter.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/adapter.c [iso-8859-1] Wed Mar 26 21:16:07 2008 @@ -230,7 +230,7 @@ pDstCaps->MaxPointSize = 1.0f; } -HRESULT GetAdapterCaps(const LPDIRECT3D9_DISPLAYADAPTER_INT pDisplayAdapter, D3DDEVTYPE DeviceType, D3DCAPS9* pDstCaps) +HRESULT GetAdapterCaps(const LPDIRECT3D9_DISPLAYADAPTER pDisplayAdapter, D3DDEVTYPE DeviceType, D3DCAPS9* pDstCaps) { HRESULT hResult = D3DERR_INVALIDDEVICE; D3DCAPS9* pDriverCaps = NULL; Modified: trunk/reactos/dll/directx/d3d9/adapter.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/adapter.h… ============================================================================== --- trunk/reactos/dll/directx/d3d9/adapter.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/adapter.h [iso-8859-1] Wed Mar 26 21:16:07 2008 @@ -13,7 +13,7 @@ BOOL GetAdapterMode(LPCSTR lpszDeviceName, D3DDISPLAYMODE* pMode); -HRESULT GetAdapterCaps(const LPDIRECT3D9_DISPLAYADAPTER_INT pDisplayAdapter, D3DDEVTYPE DeviceType, D3DCAPS9* pDstCaps); +HRESULT GetAdapterCaps(const LPDIRECT3D9_DISPLAYADAPTER pDisplayAdapter, D3DDEVTYPE DeviceType, D3DCAPS9* pDstCaps); HMONITOR GetAdapterMonitor(LPCSTR lpszDeviceName); Modified: trunk/reactos/dll/directx/d3d9/d3d9_caps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_caps… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_caps.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_caps.c [iso-8859-1] Wed Mar 26 21:16:07 2008 @@ -15,7 +15,7 @@ static INT g_NumDevices = 0; -void CreateDisplayModeList(LPCSTR lpszDeviceName, D3DDISPLAYMODE* pDisplayModes, DWORD* pNumDisplayModes, D3DFORMAT Default16BitFormat, D3D9_Unknown6BC_INT* pUnknown6BC) +void CreateDisplayModeList(LPCSTR lpszDeviceName, D3DDISPLAYMODE* pDisplayModes, DWORD* pNumDisplayModes, D3DFORMAT Default16BitFormat, D3D9_Unknown6BC* pUnknown6BC) { DEVMODEA DevMode; DWORD ModeIndex = 0; @@ -68,9 +68,9 @@ *pNumDisplayModes = ValidModes; } -static void CreateInternalDeviceData(HDC hDC, LPCSTR lpszDeviceName, D3D9_Unknown6BC_INT** ppUnknown, D3DDEVTYPE DeviceType, HMODULE* hD3DRefDll) +static void CreateInternalDeviceData(HDC hDC, LPCSTR lpszDeviceName, D3D9_Unknown6BC** ppUnknown, D3DDEVTYPE DeviceType, HMODULE* hD3DRefDll) { - D3D9_Unknown6BC_INT* pUnknown6BC; + D3D9_Unknown6BC* pUnknown6BC; DWORD ValueSize; if (ppUnknown) *ppUnknown = NULL; @@ -83,7 +83,7 @@ return; } - pUnknown6BC = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(D3D9_Unknown6BC_INT)); + pUnknown6BC = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(D3D9_Unknown6BC)); if (NULL == pUnknown6BC) { DPRINT1("Out of memory"); @@ -157,7 +157,7 @@ else { D3D9_DRIVERCAPS DriverCaps; - D3D9_UnknownA8h_INT unknownA8h; + D3D9_UnknownA8h unknownA8h; if (FALSE == CanReenableDirectDrawObject(pDeviceData->pUnknown6BC)) { @@ -297,7 +297,7 @@ -BOOL CanReenableDirectDrawObject(D3D9_Unknown6BC_INT* pUnknown) +BOOL CanReenableDirectDrawObject(D3D9_Unknown6BC* pUnknown) { BOOL bDisplayModeWasChanged; @@ -332,9 +332,9 @@ DrvInfo2->dwExpectedSize = dwExpectedSize; } -BOOL GetD3D9DriverInfo( D3D9_Unknown6BC_INT* pUnknown6BC, +BOOL GetD3D9DriverInfo( D3D9_Unknown6BC* pUnknown6BC, LPD3D9_DRIVERCAPS pDriverCaps, - D3D9_UnknownA8h_INT* pUnknownA8h, + D3D9_UnknownA8h* pUnknownA8h, LPCSTR lpszDeviceName, HMODULE hD3dRefDll, D3DHAL_GLOBALDRIVERDATA* pGblDriverData, Modified: trunk/reactos/dll/directx/d3d9/d3d9_caps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_caps… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_caps.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_caps.h [iso-8859-1] Wed Mar 26 21:16:07 2008 @@ -14,15 +14,15 @@ #define DX9_DDI_VERSION 4 -void CreateDisplayModeList(LPCSTR lpszDeviceName, D3DDISPLAYMODE* pDisplayModes, DWORD* pNumDisplayModes, D3DFORMAT DisplayFormat, D3D9_Unknown6BC_INT* pUnknown6BC); +void CreateDisplayModeList(LPCSTR lpszDeviceName, D3DDISPLAYMODE* pDisplayModes, DWORD* pNumDisplayModes, D3DFORMAT DisplayFormat, D3D9_Unknown6BC* pUnknown6BC); BOOL GetDeviceData(LPD3D9_DEVICEDATA pDeviceData); -BOOL CanReenableDirectDrawObject(D3D9_Unknown6BC_INT* ppUnknown); +BOOL CanReenableDirectDrawObject(D3D9_Unknown6BC* ppUnknown); -BOOL GetD3D9DriverInfo( D3D9_Unknown6BC_INT* pUnknown6BC, +BOOL GetD3D9DriverInfo( D3D9_Unknown6BC* pUnknown6BC, LPD3D9_DRIVERCAPS pDriverCaps, - D3D9_UnknownA8h_INT* pUnknownA8h, + D3D9_UnknownA8h* pUnknownA8h, LPCSTR lpszDeviceName, HMODULE hD3dRefDll, D3DHAL_GLOBALDRIVERDATA* pGblDriverData, Modified: trunk/reactos/dll/directx/d3d9/d3d9_create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_crea… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_create.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_create.c [iso-8859-1] Wed Mar 26 21:16:07 2008 @@ -36,7 +36,7 @@ return TRUE; } -static VOID SetAdapterInfo(IN OUT LPDIRECT3D9_DISPLAYADAPTER_INT pDisplayAdapter, IN LPDISPLAY_DEVICEA pDisplayDevice) +static VOID SetAdapterInfo(IN OUT LPDIRECT3D9_DISPLAYADAPTER pDisplayAdapter, IN LPDISPLAY_DEVICEA pDisplayDevice) { memcpy(&pDisplayAdapter->DisplayGuid, &DISPLAY_GUID, sizeof(GUID)); @@ -57,9 +57,9 @@ return FALSE; } -void GetDisplayAdapterFromDevice(IN OUT LPDIRECT3D9_DISPLAYADAPTER_INT pDisplayAdapters, IN DWORD AdapterIndex, IN LPD3D9_DEVICEDATA pDeviceData) -{ - LPDIRECT3D9_DISPLAYADAPTER_INT pDisplayAdapter = &pDisplayAdapters[AdapterIndex]; +void GetDisplayAdapterFromDevice(IN OUT LPDIRECT3D9_DISPLAYADAPTER pDisplayAdapters, IN DWORD AdapterIndex, IN LPD3D9_DEVICEDATA pDeviceData) +{ + LPDIRECT3D9_DISPLAYADAPTER pDisplayAdapter = &pDisplayAdapters[AdapterIndex]; DWORD FormatOpIndex; DWORD AdapterGroupId; DWORD NumAdaptersInGroup; @@ -113,11 +113,11 @@ } } -static BOOL GetDirect3D9AdapterInfo(IN OUT LPDIRECT3D9_DISPLAYADAPTER_INT pDisplayAdapters, IN DWORD AdapterIndex) +static BOOL GetDirect3D9AdapterInfo(IN OUT LPDIRECT3D9_DISPLAYADAPTER pDisplayAdapters, IN DWORD AdapterIndex) { HDC hDC; LPD3D9_DEVICEDATA pDeviceData; - LPDIRECT3D9_DISPLAYADAPTER_INT pDisplayAdapter = &pDisplayAdapters[AdapterIndex]; + LPDIRECT3D9_DISPLAYADAPTER pDisplayAdapter = &pDisplayAdapters[AdapterIndex]; /* Test DC creation for the display device */ if (NULL == (hDC = CreateDCA(NULL, pDisplayAdapter->szDeviceName, NULL, NULL))) Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_priv… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h [iso-8859-1] Wed Mar 26 21:16:07 2008 @@ -16,24 +16,22 @@ #define D3D9_INT_D3DCAPS8_VALID 1 #define D3D9_INT_D3DCAPS9_VALID 2 -typedef struct _D3D9Unknown6BC_INT_ +typedef struct _D3D9Unknown6BC_ { /* 0x0000 */ HANDLE hDD; /* 0x0004 */ LPDWORD pUnknown0004; -/* 0x0008 */ +/* 0x0008 */ DWORD dwUnknown0008; /* 0x000c */ CHAR szDeviceName[CCHDEVICENAME]; /* 0x002c */ HLOCAL swDDICreateDirectDrawObject; - /* 0x0030 */ DWORD dwUnknown0030; - /* 0x0034 */ ULONG DeviceUniq; - +/* 0x0038 */ DWORD dwUnknown0038; /* 0x0040 */ D3DFORMAT RawDisplayFormat; /* 0x0044 */ D3DFORMAT DisplayFormat; /* 0x0048 */ LONG lDisplayPitch; /* 0x004c */ DWORD MajorDxVersion; /* 0x0050 */ RECT DeviceRect; -/* 0x0060 */ +/* 0x0060 */ DWORD dwUnknown0060; /* 0x0064 */ DWORD unknown0064; // = 0 /* 0x0068 */ BOOL bIsXPorLater; /* 0x006c */ DWORD DevVenId; // DeviceId << 10 | VendorId @@ -45,15 +43,23 @@ #endif /* 0x0078 */ DWORD bForceDriverFlagsOn; /* 0x007c */ DWORD bForceDriverFlagsOff; - +/* 0x0080 */ DWORD dwUnknown0080; /* 0x0084 */ DWORD dwCaps; /* 0x0088 */ DWORD dwSVBCaps; /* 0x008c */ HMODULE _unknown0151; - +/* 0x0090 */ DWORD dwUnknown0090; /* 0x0094 */ D3DDEVTYPE DeviceType; - +/* 0x0098 */ DWORD dwUnknown0098; +/* 0x009c */ DWORD dwUnknown009c; +/* 0x00a0 */ DWORD dwUnknown00a0; +/* 0x00a4 */ DWORD dwUnknown00a4; +/* 0x00a8 */ DWORD dwUnknown00a8; +/* 0x00ac */ DWORD dwUnknown00ac; +/* 0x00b0 */ DWORD dwUnknown00b0; +/* 0x00b4 */ DWORD dwUnknown00b4; +/* 0x00b8 */ DWORD dwUnknown00b8; /* 0x00BC */ DDGAMMARAMP lpGammaRamp; -} D3D9_Unknown6BC_INT; +} D3D9_Unknown6BC; typedef struct _tagD3D9_DRIVERCAPS { @@ -78,7 +84,7 @@ /* 0x0174 */ D3DQUERYTYPE* pSupportedQueriesList; } D3D9_DRIVERCAPS, FAR *LPD3D9_DRIVERCAPS; -typedef struct _tagUnknownA8h +typedef struct _tagUnknownA8h_ { /* 0x0000 */ DWORD DdCreateSurface; /* 0x0004 */ DWORD DdDestroySurface; @@ -122,16 +128,16 @@ /* 0x009c */ DWORD DXVAExecute; /* 0x00a0 */ DWORD DXVAQueryStatus; /* 0x00a4 */ D3DDEVTYPE DeviceType; -} D3D9_UnknownA8h_INT; +} D3D9_UnknownA8h; -typedef struct _tagD3D9_DEVICEDATA +typedef struct _tagD3D9_DEVICEDATA_ { /* 0x0000 */ D3D9_DRIVERCAPS DriverCaps; -/* 0x0178 */ D3D9_UnknownA8h_INT _UnknownA8h; +/* 0x0178 */ D3D9_UnknownA8h _UnknownA8h; /* 0x0220 */ CHAR szDeviceName[CCHDEVICENAME]; /* 0x0240 */ HDC hDC; /* 0x0244 */ GUID DisplayGuid; -/* 0x0254 */ D3D9_Unknown6BC_INT* pUnknown6BC; +/* 0x0254 */ D3D9_Unknown6BC* pUnknown6BC; /* 0x0258 */ D3DDEVTYPE DeviceType; /* 0x025c */ HMODULE hD3DRefDll; /* 0x0260 */ DWORD unknown0152; @@ -154,7 +160,7 @@ /* 0x013c */ D3D9_DRIVERCAPS DriverCaps; /* 0x02b4 */ DWORD unknown000104; /* 0x02b8 */ DWORD unknown000105; -} Direct3D9DisplayAdapterInfo_INT, FAR* LPDIRECT3D9_DISPLAYADAPTER_INT; +} Direct3D9DisplayAdapterInfo, FAR* LPDIRECT3D9_DISPLAYADAPTER; typedef struct _tagDIRECT3D9_INT_ { @@ -165,7 +171,7 @@ /* 0x0024 */ struct _tagDIRECT3D9_INT_ *lpInt; /* 0x0028 */ LONG dwRefCnt; /* Increases and decreases by AddRef() and Release() */ /* 0x002c */ UINT NumDisplayAdapters; -/* 0x0030 */ Direct3D9DisplayAdapterInfo_INT DisplayAdapters[D3D9_INT_MAX_NUM_ADAPTERS]; +/* 0x0030 */ Direct3D9DisplayAdapterInfo DisplayAdapters[D3D9_INT_MAX_NUM_ADAPTERS]; /* 0x2100 */ DWORD unknown002112; /* 0x2104 */ DWORD unknown002113; /* 0x2108 */ DWORD unknown002114;

16 years, 9 months

← Newer
1
2
3
4
5
6
7
...
27
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 March 2008