Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gbrunmar] 32401: * Updated d3d headers to make it possible to include both d3d and d3d9 at the same time. * Updated d3dhal.h to support DirectX 9 * Fixed broken d3dnthal.h * Fixed missing structures in d3d8thk.h
by gbrunmar＠svn.reactos.org 17 Feb '08

17 Feb '08

Author: gbrunmar Date: Sun Feb 17 16:34:59 2008 New Revision: 32401 URL: http://svn.reactos.org/svn/reactos?rev=32401&view=rev Log: * Updated d3d headers to make it possible to include both d3d and d3d9 at the same time. * Updated d3dhal.h to support DirectX 9 * Fixed broken d3dnthal.h * Fixed missing structures in d3d8thk.h Modified: trunk/reactos/include/ddk/d3dhal.h trunk/reactos/include/ddk/d3dnthal.h trunk/reactos/include/ddk/ddrawi.h trunk/reactos/include/ddk/ddrawint.h trunk/reactos/include/psdk/d3d.h trunk/reactos/include/psdk/d3d9types.h trunk/reactos/include/psdk/d3dtypes.h trunk/reactos/include/reactos/dll/directx/d3d8thk.h Modified: trunk/reactos/include/ddk/d3dhal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/d3dhal.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/d3dhal.h (original) +++ trunk/reactos/include/ddk/d3dhal.h Sun Feb 17 16:34:59 2008 @@ -26,7 +26,25 @@ extern "C" { #endif +#include <ddraw.h> +#include <d3dtypes.h> +#include <d3dcaps.h> #include <d3d.h> + +#if (DIRECT3D_VERSION >= 0x0900) +#include <d3d9.h> +#endif + +#ifndef DDRAWI_DIRECTDRAW_DEFINED +typedef struct _DDRAWI_DIRECTDRAW_GBL FAR *LPDDRAWI_DIRECTDRAW_GBL; +typedef struct _DDRAWI_DIRECTDRAW_LCL FAR *LPDDRAWI_DIRECTDRAW_LCL; +#define DDRAWI_DIRECTDRAW_DEFINED +#endif + +#ifndef DDRAWI_DDRAWSURFACE_DEFINED +typedef struct _DDRAWI_DDRAWSURFACE_LCL FAR *LPDDRAWI_DDRAWSURFACE_LCL; +#define DDRAWI_DDRAWSURFACE_DEFINED +#endif #define D3DERR_COMMAND_UNPARSED 0x88760BB8; @@ -579,6 +597,155 @@ DWORD dwLOD; } D3DHAL_DP2SETTEXLOD,*LPD3DHAL_DP2SETTEXLOD; + +#if (DIRECT3D_VERSION >= 0x0900) + +#define DX9_DDI_VERSION 4 + +#ifndef D3DVTXPCAPS_NO_VSDT_UBYTE4 +#define D3DVTXPCAPS_NO_VSDT_UBYTE4 0x00000080 +#endif + +#define D3DPMISCCAPS_LINEPATTERNREP 0x00000004 + +#define D3DDEVCAPS_HWVERTEXBUFFER 0x02000000 +#define D3DDEVCAPS_HWINDEXBUFFER 0x04000000 +#define D3DDEVCAPS_SUBVOLUMELOCK 0x08000000 + +#ifndef D3DPMISCCAPS_FOGINFVF +#define D3DPMISCCAPS_FOGINFVF 0x00002000 +#endif + +#ifndef D3DFVF_FOG +#define D3DFVF_FOG 0x00002000 +#endif + +typedef struct _DD_GETDRIVERINFO2DATA +{ + DWORD dwReserved; + DWORD dwMagic; + DWORD dwType; + DWORD dwExpectedSize; +} DD_GETDRIVERINFO2DATA; + +/** + * A driver must check DD_GETDRIVERINFO2DATA.dwHeight for + * D3DGDI2_MAGIC to see if the passed GUID is GUID_GetDriverInfo2 + * or a GUID_DDStereoMode. + */ +#define GUID_GetDriverInfo2 GUID_DDStereoMode + +/** + * Magic number used in DD_GETDRIVERINFO2DATA.dwHeight when + * GUID_GetDriverInfo2/GUID_DDStereoMode is specified in a + * GetDriverInfo call. + */ +#define D3DGDI2_MAGIC 0xFFFFFFFF + +#define D3DGDI2_TYPE_GETD3DCAPS8 0x00000001 +#define D3DGDI2_TYPE_GETFORMATCOUNT 0x00000002 +#define D3DGDI2_TYPE_GETFORMAT 0x00000003 +#define D3DGDI2_TYPE_DXVERSION 0x00000004 /* Make driver aware of currently used DirectX version */ +#define D3DGDI2_TYPE_GETD3DCAPS9 0x00000010 +#define D3DGDI2_TYPE_GETEXTENDEDMODECOUNT 0x00000011 +#define D3DGDI2_TYPE_GETEXTENDEDMODE 0x00000012 +#define D3DGDI2_TYPE_GETADAPTERGROUP 0x00000013 +#define D3DGDI2_TYPE_GETMULTISAMPLEQUALITYLEVELS 0x00000016 +#define D3DGDI2_TYPE_DEFERRED_AGP_AWARE 0x00000018 +#define D3DGDI2_TYPE_FREE_DEFERRED_AGP 0x00000019 +#define D3DGDI2_TYPE_DEFER_AGP_FREES 0x00000020 +#define D3DGDI2_TYPE_GETD3DQUERYCOUNT 0x00000021 +#define D3DGDI2_TYPE_GETD3DQUERY 0x00000022 +#define D3DGDI2_TYPE_GETDDIVERSION 0x00000023 /* Returns DX9_DDI_VERSION, used to check which DDK version the driver is compiled against */ + +typedef struct _DD_GETFORMATCOUNTDATA +{ + DD_GETDRIVERINFO2DATA gdi2; + DWORD dwFormatCount; + DWORD dwReserved; +} DD_GETFORMATCOUNTDATA; + +typedef struct _DD_GETFORMATDATA +{ + DD_GETDRIVERINFO2DATA gdi2; + DWORD dwFormatIndex; + DDPIXELFORMAT format; +} DD_GETFORMATDATA; + +typedef struct _DD_DXVERSION +{ + DD_GETDRIVERINFO2DATA gdi2; + DWORD dwDXVersion; + DWORD dwReserved; +} DD_DXVERSION; + +typedef struct _DD_DEFERRED_AGP_AWARE_DATA +{ + DD_GETDRIVERINFO2DATA gdi2; +} DD_DEFERRED_AGP_AWARE_DATA; + +typedef struct _DD_FREE_DEFERRED_AGP_DATA +{ + DD_GETDRIVERINFO2DATA gdi2; + DWORD dwProcessId; +} DD_FREE_DEFERRED_AGP_DATA; + +typedef struct _DD_GETEXTENDEDMODECOUNTDATA +{ + DD_GETDRIVERINFO2DATA gdi2; + DWORD dwModeCount; + DWORD dwReserved; +} DD_GETEXTENDEDMODECOUNTDATA; + +typedef struct _DD_GETEXTENDEDMODEDATA +{ + DD_GETDRIVERINFO2DATA gdi2; + DWORD dwModeIndex; + D3DDISPLAYMODE mode; +} DD_GETEXTENDEDMODEDATA; + +typedef struct _DD_GETADAPTERGROUPDATA +{ + DD_GETDRIVERINFO2DATA gdi2; + ULONG_PTR ulUniqueAdapterGroupId; + DWORD dwReserved1; + DWORD dwReserved2; +} DD_GETADAPTERGROUPDATA; + +typedef struct _DD_MULTISAMPLEQUALITYLEVELSDATA +{ + DD_GETDRIVERINFO2DATA gdi2; + D3DFORMAT Format; + BOOL bFlip : 1; + D3DMULTISAMPLE_TYPE MSType : 31; + DWORD QualityLevels; +} DD_MULTISAMPLEQUALITYLEVELSDATA; + +typedef struct _DD_GETD3DQUERYCOUNTDATA +{ + DD_GETDRIVERINFO2DATA gdi2; + DWORD dwNumQueries; +} DD_GETD3DQUERYCOUNTDATA; + +typedef struct _DD_GETD3DQUERYDATA +{ + DD_GETDRIVERINFO2DATA gdi2; + union + { + DWORD dwQueryIndex; + D3DQUERYTYPE QueryType; + }; +} DD_GETD3DQUERYDATA; + +typedef struct _DD_GETDDIVERSIONDATA +{ + DD_GETDRIVERINFO2DATA gdi2; + DWORD dwDXVersion; + DWORD dwDDIVersion; +} DD_GETDDIVERSIONDATA; + +#endif /* (DIRECT3D_VERSION >= 0x0900) */ + #ifdef __cplusplus } /* extern "C" */ #endif Modified: trunk/reactos/include/ddk/d3dnthal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/d3dnthal.h?rev… ============================================================================== --- trunk/reactos/include/ddk/d3dnthal.h (original) +++ trunk/reactos/include/ddk/d3dnthal.h Sun Feb 17 16:34:59 2008 @@ -167,7 +167,18 @@ ULONG_PTR dwReserved9; } D3DNTHAL_CALLBACKS, *LPD3DNTHAL_CALLBACKS; + +typedef struct _D3DNTHAL_SETRENDERTARGETDATA +{ + ULONG_PTR dwhContext; + PDD_SURFACE_LOCAL lpDDS; + PDD_SURFACE_LOCAL lpDDSZ; + HRESULT ddrval; +} D3DNTHAL_SETRENDERTARGETDATA; +typedef D3DNTHAL_SETRENDERTARGETDATA *LPD3DNTHAL_SETRENDERTARGETDATA; + typedef DWORD (APIENTRY *LPD3DNTHAL_SETRENDERTARGETCB)(LPD3DNTHAL_SETRENDERTARGETDATA); + typedef struct _D3DNTHAL_CALLBACKS2 { @@ -181,6 +192,55 @@ LPVOID dwReserved4; } D3DNTHAL_CALLBACKS2, *LPD3DNTHAL_CALLBACKS2; + +typedef struct _D3DNTHAL_CLEAR2DATA +{ + ULONG_PTR dwhContext; + DWORD dwFlags; + DWORD dwFillColor; + D3DVALUE dvFillDepth; + DWORD dwFillStencil; + LPD3DRECT lpRects; + DWORD dwNumRects; + HRESULT ddrval; +} D3DNTHAL_CLEAR2DATA; +typedef D3DNTHAL_CLEAR2DATA FAR *LPD3DNTHAL_CLEAR2DATA; + +typedef struct _D3DNTHAL_VALIDATETEXTURESTAGESTATEDATA +{ + ULONG_PTR dwhContext; + DWORD dwFlags; + ULONG_PTR dwReserved; + DWORD dwNumPasses; + HRESULT ddrval; +} D3DNTHAL_VALIDATETEXTURESTAGESTATEDATA, FAR *LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA; + +typedef struct _D3DNTHAL_DRAWPRIMITIVES2DATA +{ + ULONG_PTR dwhContext; + DWORD dwFlags; + DWORD dwVertexType; + PDD_SURFACE_LOCAL lpDDCommands; + DWORD dwCommandOffset; + DWORD dwCommandLength; + union + { + PDD_SURFACE_LOCAL lpDDVertex; + LPVOID lpVertices; + }; + DWORD dwVertexOffset; + DWORD dwVertexLength; + DWORD dwReqVertexBufSize; + DWORD dwReqCommandBufSize; + LPDWORD lpdwRStates; + union + { + DWORD dwVertexSize; + HRESULT ddrval; + }; + DWORD dwErrorOffset; +} D3DNTHAL_DRAWPRIMITIVES2DATA, FAR *LPD3DNTHAL_DRAWPRIMITIVES2DATA; + typedef DWORD (APIENTRY *LPD3DNTHAL_CLEAR2CB)(LPD3DNTHAL_CLEAR2DATA); typedef DWORD (APIENTRY *LPD3DNTHAL_VALIDATETEXTURESTAGESTATECB)(LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA); typedef DWORD (APIENTRY *LPD3DNTHAL_DRAWPRIMITIVES2CB)(LPD3DNTHAL_DRAWPRIMITIVES2DATA); @@ -196,42 +256,6 @@ LPD3DNTHAL_DRAWPRIMITIVES2CB DrawPrimitives2; } D3DNTHAL_CALLBACKS3, *LPD3DNTHAL_CALLBACKS3; - -typedef struct _D3DNTHAL_VALIDATETEXTURESTAGESTATEDATA -{ - ULONG_PTR dwhContext; - DWORD dwFlags; - ULONG_PTR dwReserved; - DWORD dwNumPasses; - HRESULT ddrval; -} D3DNTHAL_VALIDATETEXTURESTAGESTATEDATA, FAR *LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA; - -typedef struct _D3DNTHAL_DRAWPRIMITIVES2DATA -{ - ULONG_PTR dwhContext; - DWORD dwFlags; - DWORD dwVertexType; - PDD_SURFACE_LOCAL lpDDCommands; - DWORD dwCommandOffset; - DWORD dwCommandLength; - union - { - PDD_SURFACE_LOCAL lpDDVertex; - LPVOID lpVertices; - }; - DWORD dwVertexOffset; - DWORD dwVertexLength; - DWORD dwReqVertexBufSize; - DWORD dwReqCommandBufSize; - LPDWORD lpdwRStates; - union - { - DWORD dwVertexSize; - HRESULT ddrval; - }; - DWORD dwErrorOffset; -} D3DNTHAL_DRAWPRIMITIVES2DATA, FAR *LPD3DNTHAL_DRAWPRIMITIVES2DATA; - #ifdef __cplusplus } /* extern "C" */ #endif Modified: trunk/reactos/include/ddk/ddrawi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddrawi.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/ddrawi.h (original) +++ trunk/reactos/include/ddk/ddrawi.h Sun Feb 17 16:34:59 2008 @@ -129,10 +129,20 @@ /* predeclare some structures */ typedef struct _DDHALINFO *LPDDHALINFO; typedef struct _DDRAWI_DIRECTDRAW_INT *LPDDRAWI_DIRECTDRAW_INT; + +#ifndef DDRAWI_DIRECTDRAW_DEFINED typedef struct _DDRAWI_DIRECTDRAW_LCL *LPDDRAWI_DIRECTDRAW_LCL; typedef struct _DDRAWI_DIRECTDRAW_GBL *LPDDRAWI_DIRECTDRAW_GBL; +#define DDRAWI_DIRECTDRAW_DEFINED +#endif + typedef struct _DDRAWI_DDRAWSURFACE_INT *LPDDRAWI_DDRAWSURFACE_INT; + +#ifndef DDRAWI_DDRAWSURFACE_DEFINED typedef struct _DDRAWI_DDRAWSURFACE_LCL *LPDDRAWI_DDRAWSURFACE_LCL; +#define DDRAWI_DDRAWSURFACE_DEFINED +#endif + typedef struct _DDRAWI_DDRAWSURFACE_GBL *LPDDRAWI_DDRAWSURFACE_GBL; typedef struct _DDRAWI_DDRAWSURFACE_MORE *LPDDRAWI_DDRAWSURFACE_MORE; typedef struct _DDRAWI_DDRAWSURFACE_GBL_MORE *LPDDRAWI_DDRAWSURFACE_GBL_MORE; Modified: trunk/reactos/include/ddk/ddrawint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddrawint.h?rev… ============================================================================== --- trunk/reactos/include/ddk/ddrawint.h (original) +++ trunk/reactos/include/ddk/ddrawint.h Sun Feb 17 16:34:59 2008 @@ -1451,15 +1451,6 @@ #define DDRAWI_VPORTGETCOLOR 0x0001 #define DDRAWI_VPORTSETCOLOR 0x0002 -#ifndef __DDRAWI_INCLUDED__ -#define VIDMEM_ISLINEAR 0x00000001 -#define VIDMEM_ISRECTANGULAR 0x00000002 -#define VIDMEM_ISHEAP 0x00000004 -#define VIDMEM_ISNONLOCAL 0x00000008 -#define VIDMEM_ISWC 0x00000010 -#define VIDMEM_ISDISABLED 0x00000020 -#endif - #ifdef __cplusplus } /* extern "C" */ Modified: trunk/reactos/include/psdk/d3d.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d.h?rev=324… ============================================================================== --- trunk/reactos/include/psdk/d3d.h (original) +++ trunk/reactos/include/psdk/d3d.h Sun Feb 17 16:34:59 2008 @@ -18,6 +18,12 @@ #ifndef __WINE_D3D_H #define __WINE_D3D_H + +#ifndef DIRECT3D_VERSION +#define DIRECT3D_VERSION 0x0700 +#endif + +#if (DIRECT3D_VERSION < 0x0800) #include <stdlib.h> @@ -1528,4 +1534,5 @@ #define IDirect3DVertexBuffer7_ProcessVerticesStrided(p,a,b,c,d,e,f,g) (p)->ProcessVerticesStrided(a,b,c,d,e,f,g) #endif +#endif /* (DIRECT3D_VERSION < 0x0800) */ #endif /* __WINE_D3D_H */ Modified: trunk/reactos/include/psdk/d3d9types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d9types.h?r… ============================================================================== --- trunk/reactos/include/psdk/d3d9types.h (original) +++ trunk/reactos/include/psdk/d3d9types.h Sun Feb 17 16:34:59 2008 @@ -875,7 +875,7 @@ D3DMULTISAMPLE_15_SAMPLES = 15, D3DMULTISAMPLE_16_SAMPLES = 16, - D3DMULTISAMPLE_FORCE_DWORD = 0xffffffff + D3DMULTISAMPLE_FORCE_DWORD = 0x7fffffff } D3DMULTISAMPLE_TYPE; #if 0 Modified: trunk/reactos/include/psdk/d3dtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3dtypes.h?re… ============================================================================== --- trunk/reactos/include/psdk/d3dtypes.h (original) +++ trunk/reactos/include/psdk/d3dtypes.h Sun Feb 17 16:34:59 2008 @@ -147,6 +147,7 @@ typedef DWORD D3DTEXTUREHANDLE, *LPD3DTEXTUREHANDLE; typedef DWORD D3DMATRIXHANDLE, *LPD3DMATRIXHANDLE; +#ifndef D3DCOLORVALUE_DEFINED typedef struct _D3DCOLORVALUE { union { D3DVALUE r; @@ -165,7 +166,9 @@ D3DVALUE dvA; } DUMMYUNIONNAME4; } D3DCOLORVALUE,*LPD3DCOLORVALUE; - +#endif + +#ifndef D3DRECT_DEFINED typedef struct _D3DRECT { union { LONG x1; @@ -183,7 +186,9 @@ LONG y2; LONG lY2; } DUMMYUNIONNAME4; -} D3DRECT, *LPD3DRECT; +} D3DRECT; +#endif +typedef struct _D3DRECT *LPD3DRECT; typedef struct _D3DHVERTEX { DWORD dwFlags; @@ -324,6 +329,7 @@ #endif } D3DVERTEX, *LPD3DVERTEX; +#ifndef D3DMATRIX_DEFINED typedef struct _D3DMATRIX { D3DVALUE _11, _12, _13, _14; D3DVALUE _21, _22, _23, _24; @@ -339,6 +345,7 @@ { return ((const D3DVALUE [4][4])&_11)[r][c]; } #endif } D3DMATRIX, *LPD3DMATRIX; +#endif #if defined(__cplusplus) && defined(D3D_OVERLOADS) #include <d3dvec.inl> @@ -534,6 +541,8 @@ } DUMMYUNIONNAME4; } D3DMATERIAL7, *LPD3DMATERIAL7; +#if (DIRECT3D_VERSION < 0x0800) + typedef enum { D3DLIGHT_POINT = 1, D3DLIGHT_SPOT = 2, @@ -542,6 +551,8 @@ D3DLIGHT_GLSPOT = 5, D3DLIGHT_FORCE_DWORD = 0x7fffffff } D3DLIGHTTYPE; + +#endif typedef struct _D3DLIGHT { DWORD dwSize; @@ -609,10 +620,17 @@ typedef DWORD D3DCOLORMODEL; - +#ifndef D3DCLEAR_TARGET #define D3DCLEAR_TARGET 0x00000001 +#endif + +#ifndef D3DCLEAR_ZBUFFER #define D3DCLEAR_ZBUFFER 0x00000002 +#endif + +#ifndef D3DCLEAR_STENCIL #define D3DCLEAR_STENCIL 0x00000004 +#endif typedef enum _D3DOPCODE { D3DOP_POINT = 1, @@ -651,6 +669,8 @@ D3DVALUE dvZ; } D3DPICKRECORD, *LPD3DPICKRECORD; +#if (DIRECT3D_VERSION < 0x0800) + typedef enum { D3DSHADE_FLAT = 1, D3DSHADE_GOURAUD = 2, @@ -669,6 +689,8 @@ WORD wRepeatFactor; WORD wLinePattern; } D3DLINEPATTERN; + +#endif /* (DIRECT3D_VERSION < 0x0800) */ typedef enum { D3DFILTER_NEAREST = 1, @@ -679,6 +701,8 @@ D3DFILTER_LINEARMIPLINEAR = 6, D3DFILTER_FORCE_DWORD = 0x7fffffff } D3DTEXTUREFILTER; + +#if (DIRECT3D_VERSION < 0x0800) typedef enum { D3DBLEND_ZERO = 1, @@ -697,6 +721,9 @@ D3DBLEND_FORCE_DWORD = 0x7fffffff } D3DBLEND; +#endif /* (DIRECT3D_VERSION < 0x0800) */ + + typedef enum { D3DTBLEND_DECAL = 1, D3DTBLEND_MODULATE = 2, @@ -709,6 +736,9 @@ D3DTBLEND_FORCE_DWORD = 0x7fffffff } D3DTEXTUREBLEND; + +#if (DIRECT3D_VERSION < 0x0800) + typedef enum _D3DTEXTUREADDRESS { D3DTADDRESS_WRAP = 1, D3DTADDRESS_MIRROR = 2, @@ -763,6 +793,8 @@ D3DZB_FORCE_DWORD = 0x7fffffff } D3DZBUFFERTYPE; +#endif /* (DIRECT3D_VERSION < 0x0800) */ + typedef enum _D3DANTIALIASMODE { D3DANTIALIAS_NONE = 0, D3DANTIALIAS_SORTDEPENDENT = 1, @@ -776,6 +808,8 @@ D3DVT_TLVERTEX = 3, D3DVT_FORCE_DWORD = 0x7fffffff } D3DVERTEXTYPE; + +#if (DIRECT3D_VERSION < 0x0800) typedef enum { D3DPT_POINTLIST = 1, @@ -787,9 +821,13 @@ D3DPT_FORCE_DWORD = 0x7fffffff } D3DPRIMITIVETYPE; +#endif /* (DIRECT3D_VERSION < 0x0800) */ + #define D3DSTATE_OVERRIDE_BIAS 256 #define D3DSTATE_OVERRIDE(type) (D3DRENDERSTATETYPE)(((DWORD) (type) + D3DSTATE_OVERRIDE_BIAS)) + +#if (DIRECT3D_VERSION < 0x0800) typedef enum _D3DTRANSFORMSTATETYPE { D3DTRANSFORMSTATE_WORLD = 1, @@ -809,6 +847,8 @@ D3DTRANSFORMSTATE_FORCE_DWORD = 0x7fffffff } D3DTRANSFORMSTATETYPE; +#endif /* (DIRECT3D_VERSION < 0x0800) */ + typedef enum { D3DLIGHTSTATE_MATERIAL = 1, D3DLIGHTSTATE_AMBIENT = 2, @@ -820,6 +860,8 @@ D3DLIGHTSTATE_COLORVERTEX = 8, D3DLIGHTSTATE_FORCE_DWORD = 0x7fffffff } D3DLIGHTSTATETYPE; + +#if (DIRECT3D_VERSION < 0x0800) typedef enum { D3DRENDERSTATE_TEXTUREHANDLE = 1, @@ -966,6 +1008,8 @@ #define D3DWRAPCOORD_2 0x00000004L #define D3DWRAPCOORD_3 0x00000008L +#endif /* (DIRECT3D_VERSION < 0x0800) */ + #define D3DRENDERSTATE_STIPPLEPATTERN(y) (D3DRENDERSTATE_STIPPLEPATTERN00 + (y)) typedef struct _D3DSTATE { @@ -1006,6 +1050,8 @@ #define D3DPROCESSVERTICES_UPDATEEXTENTS 0x00000008L #define D3DPROCESSVERTICES_NOCOLOR 0x00000010L + +#if (DIRECT3D_VERSION < 0x0800) typedef enum _D3DTEXTURESTAGESTATETYPE { @@ -1085,6 +1131,8 @@ #define D3DTA_COMPLEMENT 0x00000010 #define D3DTA_ALPHAREPLICATE 0x00000020 +#endif /* (DIRECT3D_VERSION < 0x0800) */ + typedef enum _D3DTEXTUREMAGFILTER { D3DTFG_POINT = 1, @@ -1230,6 +1278,8 @@ #define D3DVOP_TRANSFORM (1 << 0) #define D3DVOP_CLIP (1 << 2) #define D3DVOP_EXTENTS (1 << 3) + +#if (DIRECT3D_VERSION < 0x0800) #define D3DMAXNUMVERTICES ((1<<16) - 1) @@ -1264,6 +1314,8 @@ #define D3DFVF_TEX8 0x800 #define D3DFVF_RESERVED2 0xf000 + +#endif /* (DIRECT3D_VERSION < 0x0800) */ #define D3DFVF_VERTEX ( D3DFVF_XYZ | D3DFVF_NORMAL | D3DFVF_TEX1 ) #define D3DFVF_LVERTEX ( D3DFVF_XYZ | D3DFVF_RESERVED1 | D3DFVF_DIFFUSE | \ @@ -1316,6 +1368,9 @@ #define D3DVIS_MASK_NEAR (3 << 10) #define D3DVIS_MASK_FAR (3 << 12) + +#if (DIRECT3D_VERSION < 0x0800) + #define D3DDEVINFOID_TEXTUREMANAGER 1 #define D3DDEVINFOID_D3DTEXTUREMANAGER 2 #define D3DDEVINFOID_TEXTURING 3 @@ -1356,4 +1411,6 @@ #define D3DFVF_TEXCOORDSIZE4(CoordIndex) (D3DFVF_TEXTUREFORMAT4 << (CoordIndex*2 + 16)) #define D3DFVF_TEXCOORDSIZE1(CoordIndex) (D3DFVF_TEXTUREFORMAT1 << (CoordIndex*2 + 16)) -#endif +#endif /* (DIRECT3D_VERSION < 0x0800) */ + +#endif Modified: trunk/reactos/include/reactos/dll/directx/d3d8thk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/dll/direct… ============================================================================== --- trunk/reactos/include/reactos/dll/directx/d3d8thk.h (original) +++ trunk/reactos/include/reactos/dll/directx/d3d8thk.h Sun Feb 17 16:34:59 2008 @@ -9,40 +9,26 @@ extern "C" { #endif -/* FIXME missing PD3DNTHAL_CONTEXTCREATEDATA BOOL STDCALL OsThunkD3dContextCreate( HANDLE hDirectDrawLocal, HANDLE hSurfColor, HANDLE hSurfZ, - PD3DNTHAL_CONTEXTCREATEDATA pdcci + LPD3DNTHAL_CONTEXTDESTROYDATA pdcci ); DWORD STDCALL OsThunkD3dContextDestroy( - PD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData -); - -DWORD STDCALL - OsThunkD3dContextDestroyAll(PD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData); -*/ - -DWORD STDCALL OsThunkD3dContextDestroyAll(LPVOID); - -/* FIXME PD3DNTHAL_DRAWPRIMITIVES2DATA, PD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA missing -DWORD STDCALL OsThunkD3dDrawPrimitives2( - HANDLE hCmdBuf, - HANDLE hVBuf, - PD3DNTHAL_DRAWPRIMITIVES2DATA pded, - FLATPTR *pfpVidMemCmd, - DWORD *pdwSizeCmd, - FLATPTR *pfpVidMemVtx, - DWORD *pdwSizeVtx + LPD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData +); + +DWORD STDCALL OsThunkD3dContextDestroyAll( + LPD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData ); DWORD STDCALL OsThunkD3dValidateTextureStageState( - PD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA pData -); -*/ + LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA pData +); + DWORD STDCALL OsThunkDdAddAttachedSurface( HANDLE hSurface,

1 0

[fireball] 32400: - Zero early-allocated pages for PFN DB itself, as suggested on the ros-dev mailing list, and hyperspace mapping seems to work, at least on x86. Fixes the "warm reboot-bug" in 2nd stage.
by fireball＠svn.reactos.org 17 Feb '08

17 Feb '08

Author: fireball Date: Sun Feb 17 16:08:28 2008 New Revision: 32400 URL: http://svn.reactos.org/svn/reactos?rev=32400&view=rev Log: - Zero early-allocated pages for PFN DB itself, as suggested on the ros-dev mailing list, and hyperspace mapping seems to work, at least on x86. Fixes the "warm reboot-bug" in 2nd stage. Modified: trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Sun Feb 17 16:08:28 2008 @@ -242,11 +242,11 @@ MmAllocEarlyPage(VOID) { PFN_TYPE Pfn; - + /* Use one of our highest usable pages */ Pfn = MiFreeDescriptor->BasePage + MiFreeDescriptor->PageCount - 1; MiFreeDescriptor->PageCount--; - + /* Return it */ return Pfn; } @@ -285,7 +285,7 @@ { /* Use one of our highest usable pages */ Pfn = MmAllocEarlyPage(); - + /* Set the PFN */ Status = MmCreateVirtualMappingForKernel(Address, PAGE_READWRITE, @@ -303,7 +303,7 @@ MmSetPageProtect(NULL, Address, PAGE_READWRITE); } } - + /* Clear the PFN database */ RtlZeroMemory(MmPageArray, (MmPageArraySize + 1) * sizeof(PHYSICAL_PAGE)); @@ -386,8 +386,7 @@ MmStats.NrTotalPages = MmStats.NrFreePages + MmStats.NrSystemPages + MmStats.NrUserPages; MmInitializeBalancer(MmStats.NrFreePages, MmStats.NrSystemPages); } -#endif - +#else VOID NTAPI MmInitializePageList() @@ -427,9 +426,8 @@ if (!MmIsPagePresent(NULL, Address)) { /* Use one of our highest usable pages */ - Pfn = MiFreeDescriptor->BasePage + MiFreeDescriptor->PageCount - 1; - MiFreeDescriptor->PageCount--; - + Pfn = MmAllocEarlyPage(); + /* Set the PFN */ Status = MmCreateVirtualMappingForKernel(Address, PAGE_READWRITE, @@ -579,6 +577,7 @@ MmStats.NrTotalPages = MmStats.NrFreePages + MmStats.NrSystemPages + MmStats.NrUserPages; MmInitializeBalancer(MmStats.NrFreePages, MmStats.NrSystemPages); } +#endif VOID NTAPI @@ -945,7 +944,9 @@ { /* Allocate an early page -- we'll account for it later */ KeReleaseSpinLock(&PageListLock, oldIrql); - return MmAllocEarlyPage(); + PfnOffset = MmAllocEarlyPage(); + MiZeroPage(PfnOffset); + return PfnOffset; } DPRINT1("MmAllocPage(): Out of memory\n");

1 0

[cfinck] 32399: - Only add a command for deleting the proxy makefile, when one was really generated. Should fix all those "Error 1 (ignored)" warnings (if there aren't even more problems ; -) - Include <algorithm> in modulehandler.cpp. Fixes compilation with MSVC. - Add _CRT_SECURE_NO_WARNINGS to the MSVC project file to disable a bunch of MSVC warnings.
by cfinck＠svn.reactos.org 17 Feb '08

17 Feb '08

Author: cfinck Date: Sun Feb 17 02:45:23 2008 New Revision: 32399 URL: http://svn.reactos.org/svn/reactos?rev=32399&view=rev Log: - Only add a command for deleting the proxy makefile, when one was really generated. Should fix all those "Error 1 (ignored)" warnings (if there aren't even more problems ;-) - Include <algorithm> in modulehandler.cpp. Fixes compilation with MSVC. - Add _CRT_SECURE_NO_WARNINGS to the MSVC project file to disable a bunch of MSVC warnings. Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp trunk/reactos/tools/rbuild/rbuild.vcproj Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.h Sun Feb 17 02:45:23 2008 @@ -133,10 +133,11 @@ ~ProxyMakefile (); void GenerateProxyMakefiles ( bool verbose, std::string outputTree ); + static bool GenerateProxyMakefile ( const Module& module ); + private: std::string GeneratePathToParentDirectory ( int numberOfParentDirectories ); std::string GetPathToTopDirectory ( Module& module ); - bool GenerateProxyMakefile ( Module& module ); void GenerateProxyMakefileForModule ( Module& module, bool verbose, std::string outputTree ); Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Sun Feb 17 02:45:23 2008 @@ -18,6 +18,7 @@ */ #include "../../pch.h" #include <assert.h> +#include <algorithm> #include "../../rbuild.h" #include "mingw.h" @@ -615,13 +616,15 @@ } fprintf ( fMakefile, " 2>$(NUL)\n" ); - if ( module.name != "zlib" ) /* Avoid make warning */ + if( ProxyMakefile::GenerateProxyMakefile(module) ) { DirectoryLocation root; + if ( backend->configuration.GenerateProxyMakefilesInSourceTree ) root = SourceDirectory; else root = OutputDirectory; + FileLocation proxyMakefile ( root, module.output->relative_path, "GNUmakefile" ); Modified: trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp Sun Feb 17 02:45:23 2008 @@ -33,7 +33,7 @@ } bool -ProxyMakefile::GenerateProxyMakefile ( Module& module ) +ProxyMakefile::GenerateProxyMakefile ( const Module& module ) { return module.output->directory == OutputDirectory; } Modified: trunk/reactos/tools/rbuild/rbuild.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.vcproj… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.vcproj (original) +++ trunk/reactos/tools/rbuild/rbuild.vcproj Sun Feb 17 02:45:23 2008 @@ -133,7 +133,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..,../../lib/inflib,../../include/reactos;../../include" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;INFLIB_HOST" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;INFLIB_HOST;_CRT_SECURE_NO_WARNINGS" BasicRuntimeChecks="3" RuntimeLibrary="1" DefaultCharIsUnsigned="true"

1 0

[cfinck] 32398: [FORMATTING] - 2 spaces --> 4 spaces - some other changes to make the code style consistent with most ROS code - Change in the .rbuild file to treat warnings as errors (the lib currently doesn't spit out any warnings, so it shouldn't do in the future)
by cfinck＠svn.reactos.org 17 Feb '08

17 Feb '08

Author: cfinck Date: Sun Feb 17 02:07:40 2008 New Revision: 32398 URL: http://svn.reactos.org/svn/reactos?rev=32398&view=rev Log: [FORMATTING] - 2 spaces --> 4 spaces - some other changes to make the code style consistent with most ROS code - Change in the .rbuild file to treat warnings as errors (the lib currently doesn't spit out any warnings, so it shouldn't do in the future) Modified: trunk/reactos/lib/sdk/scrnsave/scrnsave.c trunk/reactos/lib/sdk/scrnsave/scrnsave.rbuild Modified: trunk/reactos/lib/sdk/scrnsave/scrnsave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/scrnsave/scrnsave.… ============================================================================== --- trunk/reactos/lib/sdk/scrnsave/scrnsave.c (original) +++ trunk/reactos/lib/sdk/scrnsave/scrnsave.c Sun Feb 17 02:07:40 2008 @@ -1,12 +1,13 @@ /* - Screen saver library by Anders Norlander <anorland(a)hem2.passagen.se> - - This library is (hopefully) compatible with Microsoft's - screen saver library. - - This is public domain software. + Screen saver library by Anders Norlander <anorland(a)hem2.passagen.se> + + This library is (hopefully) compatible with Microsoft's + screen saver library. + + This is public domain software. */ + #include <windows.h> #include <scrnsave.h> #include <regstr.h> @@ -15,16 +16,16 @@ #define CLASS_SCRNSAVE TEXT("WindowsScreenSaverClass") /* globals */ -HWND hMainWindow = NULL; -BOOL fChildPreview = FALSE; -HINSTANCE hMainInstance; -TCHAR szName[TITLEBARNAMELEN]; -TCHAR szAppName[APPNAMEBUFFERLEN]; -TCHAR szIniFile[MAXFILELEN]; -TCHAR szScreenSaver[22]; -TCHAR szHelpFile[MAXFILELEN]; -TCHAR szNoHelpMemory[BUFFLEN]; -UINT MyHelpMessage; +HWND hMainWindow = NULL; +BOOL fChildPreview = FALSE; +HINSTANCE hMainInstance; +TCHAR szName[TITLEBARNAMELEN]; +TCHAR szAppName[APPNAMEBUFFERLEN]; +TCHAR szIniFile[MAXFILELEN]; +TCHAR szScreenSaver[22]; +TCHAR szHelpFile[MAXFILELEN]; +TCHAR szNoHelpMemory[BUFFLEN]; +UINT MyHelpMessage; /* local house keeping */ static HINSTANCE hPwdLib = NULL; @@ -54,355 +55,383 @@ static int ISSPACE(char c) { - return (c == ' ' || c == '\t'); + return (c == ' ' || c == '\t'); } #define ISNUM(c) ((c) >= '0' && c <= '9') + static unsigned long _toul(const char *s) { - unsigned long res; - unsigned long n; - const char *p; - for (p = s; *p; p++) - if (!ISNUM(*p)) break; - p--; - res = 0; - for (n = 1; p >= s; p--, n *= 10) - res += (*p - '0') * n; - return res; + unsigned long res; + unsigned long n; + const char *p; + + for (p = s; *p; p++) + if (!ISNUM(*p)) + break; + + p--; + res = 0; + + for (n = 1; p >= s; p--, n *= 10) + res += (*p - '0') * n; + + return res; } /* screen saver entry point */ int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, - LPSTR CmdLine, int nCmdShow) -{ - LPSTR p; - OSVERSIONINFO vi; - - /* initialize */ - hMainInstance = hInst; - - vi.dwOSVersionInfoSize = sizeof(vi); - GetVersionEx(&vi); - /* check if we are going to check for passwords */ - if (vi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) - { - HKEY hKey; - /* we are using windows 95 */ - w95 = TRUE; - if (RegOpenKey(HKEY_CURRENT_USER, REGSTR_PATH_SCREENSAVE ,&hKey) == - ERROR_SUCCESS) + LPSTR CmdLine, int nCmdShow) +{ + LPSTR p; + OSVERSIONINFO vi; + + /* initialize */ + hMainInstance = hInst; + + vi.dwOSVersionInfoSize = sizeof(vi); + GetVersionEx(&vi); + /* check if we are going to check for passwords */ + if (vi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) + { + HKEY hKey; + /* we are using windows 95 */ + w95 = TRUE; + if (RegOpenKey(HKEY_CURRENT_USER, REGSTR_PATH_SCREENSAVE ,&hKey) == + ERROR_SUCCESS) { - DWORD check_pwd; - DWORD size = sizeof(DWORD); - DWORD type; - LONG res; - res = RegQueryValueEx(hKey, REGSTR_VALUE_USESCRPASSWORD, - NULL, &type, (PBYTE) &check_pwd, &size); - if (check_pwd && res == ERROR_SUCCESS) + DWORD check_pwd; + DWORD size = sizeof(DWORD); + DWORD type; + LONG res; + + res = RegQueryValueEx(hKey, REGSTR_VALUE_USESCRPASSWORD, + NULL, &type, (PBYTE) &check_pwd, &size); + + if (check_pwd && res == ERROR_SUCCESS) { - hPwdLib = LoadLibrary(TEXT("PASSWORD.CPL")); - if (hPwdLib) - VerifyScreenSavePwd = GetProcAddress(hPwdLib, szVerifyPassword); + hPwdLib = LoadLibrary(TEXT("PASSWORD.CPL")); + if (hPwdLib) + VerifyScreenSavePwd = GetProcAddress(hPwdLib, szVerifyPassword); } - RegCloseKey(hKey); + + RegCloseKey(hKey); } } - /* parse arguments */ - for (p = CmdLine; *p; p++) - { - switch (*p) + /* parse arguments */ + for (p = CmdLine; *p; p++) + { + switch (*p) { - case 'S': - case 's': - /* start screen saver */ - return LaunchScreenSaver(NULL); - - case 'P': - case 'p': - { - /* start screen saver in preview window */ - HWND hParent; - fChildPreview = TRUE; - while (ISSPACE(*++p)); - hParent = (HWND) _toul(p); - if (hParent && IsWindow(hParent)) - return LaunchScreenSaver(hParent); - } - return 0; - - case 'C': - case 'c': - /* display configure dialog */ - LaunchConfig(); - return 0; - - case 'A': - case 'a': - { - /* change screen saver password */ - HWND hParent; - while (ISSPACE(*++p)); - hParent = (HWND) _toul(p); - if (!hParent || !IsWindow(hParent)) - hParent = GetForegroundWindow(); - ScreenSaverChangePassword(hParent); - } - return 0; - - case '-': - case '/': - case ' ': - default: - break; + case 'S': + case 's': + /* start screen saver */ + return LaunchScreenSaver(NULL); + + case 'P': + case 'p': + { + /* start screen saver in preview window */ + HWND hParent; + fChildPreview = TRUE; + + while (ISSPACE(*++p)); + hParent = (HWND) _toul(p); + + if (hParent && IsWindow(hParent)) + return LaunchScreenSaver(hParent); + } + return 0; + + case 'C': + case 'c': + /* display configure dialog */ + LaunchConfig(); + return 0; + + case 'A': + case 'a': + { + /* change screen saver password */ + HWND hParent; + while (ISSPACE(*++p)); + hParent = (HWND) _toul(p); + + if (!hParent || !IsWindow(hParent)) + hParent = GetForegroundWindow(); + + ScreenSaverChangePassword(hParent); + } + return 0; + + case '-': + case '/': + case ' ': + default: + break; } } - LaunchConfig(); - return 0; + + LaunchConfig(); + + return 0; } static void LaunchConfig(void) { - /* FIXME: should this be called */ - RegisterDialogClasses(hMainInstance); - /* display configure dialog */ - DialogBox(hMainInstance, MAKEINTRESOURCE(DLG_SCRNSAVECONFIGURE), - GetForegroundWindow(), (DLGPROC) ScreenSaverConfigureDialog); -} - + /* FIXME: should this be called */ + RegisterDialogClasses(hMainInstance); + + /* display configure dialog */ + DialogBox(hMainInstance, MAKEINTRESOURCE(DLG_SCRNSAVECONFIGURE), + GetForegroundWindow(), (DLGPROC) ScreenSaverConfigureDialog); +} static int LaunchScreenSaver(HWND hParent) { - BOOL foo; - UINT style; - RECT rc; - MSG msg; - - /* don't allow other tasks to get into the foreground */ - if (w95 && !fChildPreview) - SystemParametersInfo(SPI_SCREENSAVERRUNNING, TRUE, &foo, 0); - - msg.wParam = 0; - - /* register classes, both user defined and classes used by screen saver - library */ - if (!RegisterClasses()) - { - MessageBox(NULL, TEXT("RegisterClasses() failed"), NULL, MB_ICONHAND); - goto restore; - } - - /* a slightly different approach needs to be used when displaying - in a preview window */ - if (hParent) - { - style = WS_CHILD; - GetClientRect(hParent, &rc); - } - else - { - style = WS_POPUP; - rc.right = GetSystemMetrics(SM_CXSCREEN); - rc.bottom = GetSystemMetrics(SM_CYSCREEN); - style |= WS_VISIBLE; - } - - /* create main screen saver window */ - hMainWindow = CreateWindowEx(hParent ? 0 : WS_EX_TOPMOST, CLASS_SCRNSAVE, - TEXT("SCREENSAVER"), style, - 0, 0, rc.right, rc.bottom, hParent, NULL, - hMainInstance, NULL); - - /* display window and start pumping messages */ - if (hMainWindow) - { - UpdateWindow(hMainWindow); - ShowWindow(hMainWindow, SW_SHOW); - - while (GetMessage(&msg, NULL, 0, 0) == TRUE) + BOOL foo; + UINT style; + RECT rc; + MSG msg; + + /* don't allow other tasks to get into the foreground */ + if (w95 && !fChildPreview) + SystemParametersInfo(SPI_SCREENSAVERRUNNING, TRUE, &foo, 0); + + msg.wParam = 0; + + /* register classes, both user defined and classes used by screen saver + library */ + if (!RegisterClasses()) + { + MessageBox(NULL, TEXT("RegisterClasses() failed"), NULL, MB_ICONHAND); + goto restore; + } + + /* a slightly different approach needs to be used when displaying + in a preview window */ + if (hParent) + { + style = WS_CHILD; + GetClientRect(hParent, &rc); + } + else + { + style = WS_POPUP; + rc.right = GetSystemMetrics(SM_CXSCREEN); + rc.bottom = GetSystemMetrics(SM_CYSCREEN); + style |= WS_VISIBLE; + } + + /* create main screen saver window */ + hMainWindow = CreateWindowEx(hParent ? 0 : WS_EX_TOPMOST, CLASS_SCRNSAVE, + TEXT("SCREENSAVER"), style, + 0, 0, rc.right, rc.bottom, hParent, NULL, + hMainInstance, NULL); + + /* display window and start pumping messages */ + if (hMainWindow) + { + UpdateWindow(hMainWindow); + ShowWindow(hMainWindow, SW_SHOW); + + while (GetMessage(&msg, NULL, 0, 0) == TRUE) { - TranslateMessage(&msg); - DispatchMessage(&msg); + TranslateMessage(&msg); + DispatchMessage(&msg); } } restore: - /* restore system */ - if (w95 && !fChildPreview) - SystemParametersInfo(SPI_SCREENSAVERRUNNING, FALSE, &foo, 0); - FreeLibrary(hPwdLib); - return msg.wParam; + /* restore system */ + if (w95 && !fChildPreview) + SystemParametersInfo(SPI_SCREENSAVERRUNNING, FALSE, &foo, 0); + + FreeLibrary(hPwdLib); + return msg.wParam; } /* this function takes care of *must* do tasks, like terminating screen saver */ -static LRESULT WINAPI SysScreenSaverProc(HWND hWnd, UINT msg, - WPARAM wParam, LPARAM lParam) -{ - switch (msg) - { - case WM_CREATE: - if (!fChildPreview) - SetCursor(NULL); - /* mouse is not supposed to move from this position */ - GetCursorPos(&pt_orig); - break; - case WM_DESTROY: - PostQuitMessage(0); - break; - case WM_TIMER: - if (closing) - return 0; - break; - case WM_PAINT: - if (closing) +static LRESULT WINAPI SysScreenSaverProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) + { + case WM_CREATE: + if (!fChildPreview) + SetCursor(NULL); + /* mouse is not supposed to move from this position */ + GetCursorPos(&pt_orig); + break; + + case WM_DESTROY: + PostQuitMessage(0); + break; + + case WM_TIMER: + if (closing) + return 0; + break; + + case WM_PAINT: + if (closing) + return DefWindowProc(hWnd, msg, wParam, lParam); + break; + + case WM_SYSCOMMAND: + if (!fChildPreview) + { + switch (wParam) + { + case SC_CLOSE: + case SC_SCREENSAVE: + case SC_NEXTWINDOW: + case SC_PREVWINDOW: + return FALSE; + } + } + break; + + case WM_MOUSEMOVE: + case WM_LBUTTONDOWN: + case WM_RBUTTONDOWN: + case WM_MBUTTONDOWN: + case WM_KEYDOWN: + case WM_SYSKEYDOWN: + case WM_NCACTIVATE: + case WM_ACTIVATE: + case WM_ACTIVATEAPP: + if (closing) + return DefWindowProc(hWnd, msg, wParam, lParam); + + break; + } + + return ScreenSaverProc(hWnd, msg, wParam, lParam); +} + +LONG WINAPI DefScreenSaverProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + /* don't do any special processing when in preview mode */ + if (fChildPreview || closing) return DefWindowProc(hWnd, msg, wParam, lParam); - break; - case WM_SYSCOMMAND: - if (!fChildPreview) - switch (wParam) - { - case SC_CLOSE: - case SC_SCREENSAVE: - case SC_NEXTWINDOW: - case SC_PREVWINDOW: - return FALSE; - } - break; - case WM_MOUSEMOVE: - case WM_LBUTTONDOWN: - case WM_RBUTTONDOWN: - case WM_MBUTTONDOWN: - case WM_KEYDOWN: - case WM_SYSKEYDOWN: - case WM_NCACTIVATE: - case WM_ACTIVATE: - case WM_ACTIVATEAPP: - if (closing) - return DefWindowProc(hWnd, msg, wParam, lParam); - break; - } - return ScreenSaverProc(hWnd, msg, wParam, lParam); -} - -LONG WINAPI DefScreenSaverProc(HWND hWnd, UINT msg, - WPARAM wParam, LPARAM lParam) -{ - /* don't do any special processing when in preview mode */ - if (fChildPreview || closing) + + switch (msg) + { + case WM_CLOSE: + TerminateScreenSaver(hWnd); + /* do NOT pass this to DefWindowProc; it will terminate even if + an invalid password was given. + */ + return 0; + + case SCRM_VERIFYPW: + /* verify password or return TRUE if password checking is turned off */ + if (VerifyScreenSavePwd) + return VerifyScreenSavePwd(hWnd); + else + return TRUE; + + case WM_SETCURSOR: + if (checking_pwd) + break; + SetCursor(NULL); + return TRUE; + + case WM_NCACTIVATE: + case WM_ACTIVATE: + case WM_ACTIVATEAPP: + if (wParam != FALSE) + break; + + case WM_MOUSEMOVE: + { + POINT pt; + GetCursorPos(&pt); + if (pt.x == pt_orig.x && pt.y == pt_orig.y) + break; + } + + case WM_LBUTTONDOWN: + case WM_RBUTTONDOWN: + case WM_MBUTTONDOWN: + case WM_KEYDOWN: + case WM_SYSKEYDOWN: + /* try to terminate screen saver */ + if (!checking_pwd) + PostMessage(hWnd, WM_CLOSE, 0, 0); + break; + } + return DefWindowProc(hWnd, msg, wParam, lParam); - - switch (msg) - { - case WM_CLOSE: - TerminateScreenSaver(hWnd); - /* do NOT pass this to DefWindowProc; it will terminate even if - an invalid password was given. - */ - return 0; - case SCRM_VERIFYPW: - /* verify password or return TRUE if password checking is turned off */ - if (VerifyScreenSavePwd) - return VerifyScreenSavePwd(hWnd); - else - return TRUE; - case WM_SETCURSOR: - if (checking_pwd) - break; - SetCursor(NULL); - return TRUE; - case WM_NCACTIVATE: - case WM_ACTIVATE: - case WM_ACTIVATEAPP: - if (wParam != FALSE) - break; - case WM_MOUSEMOVE: - { - POINT pt; - GetCursorPos(&pt); - if (pt.x == pt_orig.x && pt.y == pt_orig.y) - break; - } - case WM_LBUTTONDOWN: - case WM_RBUTTONDOWN: - case WM_MBUTTONDOWN: - case WM_KEYDOWN: - case WM_SYSKEYDOWN: - /* try to terminate screen saver */ - if (!checking_pwd) - PostMessage(hWnd, WM_CLOSE, 0, 0); - break; - } - return DefWindowProc(hWnd, msg, wParam, lParam); } static void TerminateScreenSaver(HWND hWnd) { - /* don't allow recursion */ - if (checking_pwd || closing) - return; - - /* verify password */ - if (VerifyScreenSavePwd) - { - checking_pwd = TRUE; - closing = SendMessage(hWnd, SCRM_VERIFYPW, 0, 0); - checking_pwd = FALSE; - } - else - closing = TRUE; - - /* are we closing? */ - if (closing) - { - DestroyWindow(hWnd); - } - else - GetCursorPos(&pt_orig); /* if not: get new mouse position */ + /* don't allow recursion */ + if (checking_pwd || closing) + return; + + /* verify password */ + if (VerifyScreenSavePwd) + { + checking_pwd = TRUE; + closing = SendMessage(hWnd, SCRM_VERIFYPW, 0, 0); + checking_pwd = FALSE; + } + else + closing = TRUE; + + /* are we closing? */ + if (closing) + { + DestroyWindow(hWnd); + } + else + GetCursorPos(&pt_orig); /* if not: get new mouse position */ } /* - Register screen saver window class and call user - supplied hook. + Register screen saver window class and call user + supplied hook. */ static BOOL RegisterClasses(void) { - WNDCLASS cls; - ZeroMemory(&cls, sizeof(cls)); - cls.hCursor = NULL; - cls.hIcon = LoadIcon(hMainInstance, MAKEINTATOM(ID_APP)); - cls.lpszMenuName = NULL; - cls.lpszClassName = CLASS_SCRNSAVE; - cls.hbrBackground = NULL; //(HBRUSH)GetStockObject(BLACK_BRUSH); - cls.hInstance = hMainInstance; - cls.style = CS_VREDRAW | CS_HREDRAW | CS_SAVEBITS | CS_PARENTDC; - cls.lpfnWndProc = (WNDPROC) SysScreenSaverProc; - cls.cbWndExtra = 0; - cls.cbClsExtra = 0; - - if (!RegisterClass(&cls)) - return FALSE; - - return RegisterDialogClasses(hMainInstance); + WNDCLASS cls; + ZeroMemory(&cls, sizeof(cls)); + cls.hCursor = NULL; + cls.hIcon = LoadIcon(hMainInstance, MAKEINTATOM(ID_APP)); + cls.lpszMenuName = NULL; + cls.lpszClassName = CLASS_SCRNSAVE; + cls.hbrBackground = NULL; //(HBRUSH)GetStockObject(BLACK_BRUSH); + cls.hInstance = hMainInstance; + cls.style = CS_VREDRAW | CS_HREDRAW | CS_SAVEBITS | CS_PARENTDC; + cls.lpfnWndProc = (WNDPROC) SysScreenSaverProc; + cls.cbWndExtra = 0; + cls.cbClsExtra = 0; + + if (!RegisterClass(&cls)) + return FALSE; + + return RegisterDialogClasses(hMainInstance); } void WINAPI ScreenSaverChangePassword(HWND hParent) { - /* load Master Password Router (MPR) */ - HINSTANCE hMpr = LoadLibrary(TEXT("MPR.DLL")); - - if (hMpr) - { - CHPWDPROC ChangePassword; - ChangePassword = (CHPWDPROC) GetProcAddress(hMpr, szPwdChangePassword); - - /* change password for screen saver provider */ - if (ChangePassword) - ChangePassword(TEXT("SCRSAVE"), hParent, 0, NULL); - - FreeLibrary(hMpr); - } -} - + /* load Master Password Router (MPR) */ + HINSTANCE hMpr = LoadLibrary(TEXT("MPR.DLL")); + + if (hMpr) + { + CHPWDPROC ChangePassword; + ChangePassword = (CHPWDPROC) GetProcAddress(hMpr, szPwdChangePassword); + + /* change password for screen saver provider */ + if (ChangePassword) + ChangePassword(TEXT("SCRSAVE"), hParent, 0, NULL); + + FreeLibrary(hMpr); + } +} Modified: trunk/reactos/lib/sdk/scrnsave/scrnsave.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/scrnsave/scrnsave.… ============================================================================== --- trunk/reactos/lib/sdk/scrnsave/scrnsave.rbuild (original) +++ trunk/reactos/lib/sdk/scrnsave/scrnsave.rbuild Sun Feb 17 02:07:40 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="scrnsave" type="staticlibrary" allowwarnings="true"> +<module name="scrnsave" type="staticlibrary"> <file>scrnsave.c</file> </module> </group>

1 0

[cfinck] 32397: Fix 64-bit build (again.. :-/)
by cfinck＠svn.reactos.org 16 Feb '08

16 Feb '08

Author: cfinck Date: Sun Feb 17 01:49:52 2008 New Revision: 32397 URL: http://svn.reactos.org/svn/reactos?rev=32397&view=rev Log: Fix 64-bit build (again.. :-/) Modified: trunk/reactos/tools/cabman/cabinet.cxx Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?r… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.cxx (original) +++ trunk/reactos/tools/cabman/cabinet.cxx Sun Feb 17 01:49:52 2008 @@ -1210,8 +1210,8 @@ BytesToRead = CFData.CompSize; - DPRINT(MAX_TRACE, ("Read: (0x%X,0x%X).\n", - (UINT)CurrentBuffer, (UINT)Buffer)); + DPRINT(MAX_TRACE, ("Read: (0x%lX,0x%lX).\n", + (unsigned long)CurrentBuffer, (unsigned long)Buffer)); if (((Status = ReadBlock(CurrentBuffer, BytesToRead, &BytesRead)) != CAB_STATUS_SUCCESS) || (BytesToRead != BytesRead))

1 0

[cfinck] 32395: /Wp64 and __w64 are deprecated beginning with Visual C++ 2008. Remove the /Wp64 switch from the cabman project file (no idea why it was enabled anyway ; -) and the _W64 macros from the code.
by cfinck＠svn.reactos.org 16 Feb '08

16 Feb '08

Author: cfinck Date: Sun Feb 17 01:21:59 2008 New Revision: 32395 URL: http://svn.reactos.org/svn/reactos?rev=32395&view=rev Log: /Wp64 and __w64 are deprecated beginning with Visual C++ 2008. Remove the /Wp64 switch from the cabman project file (no idea why it was enabled anyway ;-) and the _W64 macros from the code. Modified: trunk/reactos/tools/cabman/cabinet.cxx trunk/reactos/tools/cabman/cabinet.h trunk/reactos/tools/cabman/cabman.vcproj trunk/reactos/tools/cabman/mszip.cxx Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?r… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.cxx (original) +++ trunk/reactos/tools/cabman/cabinet.cxx Sun Feb 17 01:21:59 2008 @@ -1210,8 +1210,8 @@ BytesToRead = CFData.CompSize; - DPRINT(MAX_TRACE, ("Read: (0x%lX,0x%lX).\n", - (_W64 unsigned long)CurrentBuffer, (_W64 unsigned long)Buffer)); + DPRINT(MAX_TRACE, ("Read: (0x%X,0x%X).\n", + (UINT)CurrentBuffer, (UINT)Buffer)); if (((Status = ReadBlock(CurrentBuffer, BytesToRead, &BytesRead)) != CAB_STATUS_SUCCESS) || (BytesToRead != BytesRead)) Modified: trunk/reactos/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.h (original) +++ trunk/reactos/tools/cabman/cabinet.h Sun Feb 17 01:21:59 2008 @@ -19,10 +19,6 @@ #ifndef MAX_PATH #define MAX_PATH 260 #endif -#endif - -#ifndef _W64 -#define _W64 #endif #include <stdlib.h> Modified: trunk/reactos/tools/cabman/cabman.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabman.vcproj… ============================================================================== --- trunk/reactos/tools/cabman/cabman.vcproj (original) +++ trunk/reactos/tools/cabman/cabman.vcproj Sun Feb 17 01:21:59 2008 @@ -48,7 +48,7 @@ RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="true" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool Modified: trunk/reactos/tools/cabman/mszip.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/mszip.cxx?rev… ============================================================================== --- trunk/reactos/tools/cabman/mszip.cxx (original) +++ trunk/reactos/tools/cabman/mszip.cxx Sun Feb 17 01:21:59 2008 @@ -74,7 +74,7 @@ ZStream.next_in = (unsigned char*)InputBuffer; ZStream.avail_in = InputLength; - ZStream.next_out = (unsigned char*)((_W64 unsigned long)OutputBuffer + 2); + ZStream.next_out = (unsigned char*)((unsigned long)OutputBuffer + 2); ZStream.avail_out = CAB_BLOCKSIZE + 12; /* WindowBits is passed < 0 to tell that there is no zlib header */ @@ -137,7 +137,7 @@ return CS_BADSTREAM; } - ZStream.next_in = (unsigned char*)((_W64 unsigned long)InputBuffer + 2); + ZStream.next_in = (unsigned char*)((unsigned long)InputBuffer + 2); ZStream.avail_in = InputLength - 2; ZStream.next_out = (unsigned char*)OutputBuffer; ZStream.avail_out = CAB_BLOCKSIZE + 12;

1 0

[cfinck] 32394: - Autogenerate the "architecture.h" header file, so we don't need to keep the same information up to date in two places. - Rename GetArchCdPath to GetArchCdRoot to be consistent with the name of the define in "architecture.h". - Add ARM to the rbuild architecture list (needed when the branch will be merged back to trunk).
by cfinck＠svn.reactos.org 16 Feb '08

16 Feb '08

Author: cfinck Date: Sun Feb 17 00:08:03 2008 New Revision: 32394 URL: http://svn.reactos.org/svn/reactos?rev=32394&view=rev Log: - Autogenerate the "architecture.h" header file, so we don't need to keep the same information up to date in two places. - Rename GetArchCdPath to GetArchCdRoot to be consistent with the name of the define in "architecture.h". - Add ARM to the rbuild architecture list (needed when the branch will be merged back to trunk). Added: branches/rbuild/reactos/tools/rbuild/architectureheadergenerator.cpp (with props) Removed: branches/rbuild/reactos/include/reactos/architecture.h Modified: branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.cpp branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.h branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.cpp branches/rbuild/reactos/tools/rbuild/project.cpp branches/rbuild/reactos/tools/rbuild/rbuild.h branches/rbuild/reactos/tools/rbuild/rbuild.mak branches/rbuild/reactos/tools/rbuild/rbuild.vcproj Removed: branches/rbuild/reactos/include/reactos/architecture.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/include/reactos/… ============================================================================== --- branches/rbuild/reactos/include/reactos/architecture.h (original) +++ branches/rbuild/reactos/include/reactos/architecture.h (removed) @@ -1,14 +1,0 @@ -// Simple header for defining architecture-dependent settings - -#ifndef _REACTOS_ARCHITECTURE_H -#define _REACTOS_ARCHITECTURE_H - -#if defined(_M_IX86) -# define ARCH_CD_ROOT "I386" -#elif defined(_M_PPC) -# define ARCH_CD_ROOT "PPC" -#else -# error Unsupported architecture -#endif - -#endif Added: branches/rbuild/reactos/tools/rbuild/architectureheadergenerator.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/arc… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/architectureheadergenerator.cpp (added) +++ branches/rbuild/reactos/tools/rbuild/architectureheadergenerator.cpp Sun Feb 17 00:08:03 2008 @@ -1,0 +1,54 @@ +/* + * Copyright (C) 2008 Colin Finck + * + * 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. + * + * This 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. + * + * You 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. + */ +#include "rbuild.h" + +ArchitectureHeaderGenerator::ArchitectureHeaderGenerator ( const Project& project ) + : project ( project ) +{ +} + +ArchitectureHeaderGenerator::~ArchitectureHeaderGenerator () +{ +} + +void +ArchitectureHeaderGenerator::Generate () +{ + char* buf; + char* s; + + buf = (char*)malloc ( 32*1024 ); + if(!buf) + throw OutOfMemoryException (); + + s = buf; + s = s + sprintf ( s, "/* Auto generated by rbuild */\n"); + s = s + sprintf ( s, "\n" ); + s = s + sprintf ( s, "#ifndef _REACTOS_ARCHITECTURE_H\n" ); + s = s + sprintf ( s, "#define _REACTOS_ARCHITECTURE_H\n" ); + s = s + sprintf ( s, "\n" ); + + s = s + sprintf ( s, "#define ARCH_CD_ROOT \"%s\"", Environment::GetArchCdRoot(project).c_str() ); + + s = s + sprintf ( s, "\n\n" ); + s = s + sprintf ( s, "#endif\n" ); + + FileSupportCode::WriteIfChanged ( buf, NormalizeFilename ( Environment::GetIntermediatePath () + sSep + "include" + sSep + "reactos" + sSep + "architecture.h" ) ); + + free ( s ); +} Propchange: branches/rbuild/reactos/tools/rbuild/architectureheadergenerator.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/bac… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.cpp Sun Feb 17 00:08:03 2008 @@ -349,6 +349,7 @@ GenerateModulesManifests(); GenerateProxyMakefiles (); GenerateCreditsFile(); + GenerateArchitectureHeader(); CheckAutomaticDependencies (); CloseMakefile (); } @@ -783,6 +784,15 @@ printf ( "done\n" ); } +void +MingwBackend::GenerateArchitectureHeader () +{ + printf ( "Generating architecture header file..." ); + ArchitectureHeaderGenerator archHeaderGenerator ( ProjectNode ); + archHeaderGenerator.Generate (); + printf ( "done\n" ); +} + string MingwBackend::GetProxyMakefileTree () const { Modified: branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/bac… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.h (original) +++ branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.h Sun Feb 17 00:08:03 2008 @@ -88,6 +88,7 @@ void GenerateModulesResources(); void GenerateModulesManifests(); void GenerateCreditsFile (); + void GenerateArchitectureHeader (); std::string GetProxyMakefileTree () const; void GenerateProxyMakefiles (); void CheckAutomaticDependencies (); Modified: branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/bac… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Sun Feb 17 00:08:03 2008 @@ -3698,7 +3698,7 @@ MingwLiveIsoModuleHandler::GenerateLiveIsoModuleTarget () { string livecdRootDirectory = module.name; - string livecdArchDirectory = module.name + sSep + Environment::GetArchCdPath( module.project ); + string livecdArchDirectory = module.name + sSep + Environment::GetArchCdRoot( module.project ); FileLocation livecd ( OutputDirectory, livecdRootDirectory, "" ); string bootloader; Modified: branches/rbuild/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/pro… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/project.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/project.cpp Sun Feb 17 00:08:03 2008 @@ -78,10 +78,11 @@ } string -Environment::GetArchCdPath ( const Project& project ) +Environment::GetArchCdRoot ( const Project& project ) { switch( project.architectureType ) { + case ARM: return "ARM"; case I386: return "I386"; case PowerPC: return "PPC"; } @@ -149,7 +150,7 @@ Environment::GetBootstrapCdOutputPath ( const Project& project ) { return GetEnvironmentVariablePathOrDefault ( "ROS_CDBOOTSTRAPOUTPUT", - GetArchCdPath(project) ); + GetArchCdRoot(project) ); } /* static */ string Modified: branches/rbuild/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbu… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/rbuild.h (original) +++ branches/rbuild/reactos/tools/rbuild/rbuild.h Sun Feb 17 00:08:03 2008 @@ -211,7 +211,7 @@ public: static std::string GetVariable ( const std::string& name ); static std::string GetArchName (); - static std::string GetArchCdPath ( const Project& project ); + static std::string GetArchCdRoot ( const Project& project ); static std::string GetIntermediatePath (); static std::string GetOutputPath (); static std::string GetCdOutputPath (); @@ -266,6 +266,7 @@ enum ArchitectureType { + ARM, I386, PowerPC }; @@ -1258,6 +1259,16 @@ private: }; +class ArchitectureHeaderGenerator +{ +public: + const Project& project; + ArchitectureHeaderGenerator ( const Project& project ); + ~ArchitectureHeaderGenerator (); + void Generate(); +private: +}; + extern void InitializeEnvironment (); Modified: branches/rbuild/reactos/tools/rbuild/rbuild.mak URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbu… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/rbuild.mak (original) +++ branches/rbuild/reactos/tools/rbuild/rbuild.mak Sun Feb 17 00:08:03 2008 @@ -267,6 +267,7 @@ modulesmanifestgenerator.cpp \ modulesresourcegenerator.cpp \ creditsgenerator.cpp \ + architectureheadergenerator.cpp \ wineresource.cpp \ xmlnode.cpp \ ) @@ -463,6 +464,10 @@ $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ +$(RBUILD_INT_)architectureheadergenerator.o: $(RBUILD_BASE_)architectureheadergenerator.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + $(RBUILD_INT_)modulesmanifestgenerator.o: $(RBUILD_BASE_)modulesmanifestgenerator.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ Modified: branches/rbuild/reactos/tools/rbuild/rbuild.vcproj URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbu… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/rbuild.vcproj (original) +++ branches/rbuild/reactos/tools/rbuild/rbuild.vcproj Sun Feb 17 00:08:03 2008 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="8.00" + Version="8,00" Name="rbuild" ProjectGUID="{D9305AFB-499E-49F1-A865-99DD7E19E762}" RootNamespace="rbuild" @@ -512,6 +512,10 @@ Name="rbuild_sources" > <File + RelativePath=".\architectureheadergenerator.cpp" + > + </File> + <File RelativePath="automaticdependency.cpp" > <FileConfiguration

1 0

[cfinck] 32393: Fix a CSS typo
by cfinck＠svn.reactos.org 16 Feb '08

16 Feb '08

Author: cfinck Date: Sat Feb 16 22:09:10 2008 New Revision: 32393 URL: http://svn.reactos.org/svn/reactos?rev=32393&view=rev Log: Fix a CSS typo Modified: trunk/web/reactos.org/htdocs/paste/inc/paste.php Modified: trunk/web/reactos.org/htdocs/paste/inc/paste.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/paste/inc/p… ============================================================================== --- trunk/web/reactos.org/htdocs/paste/inc/paste.php (original) +++ trunk/web/reactos.org/htdocs/paste/inc/paste.php Sat Feb 16 22:09:10 2008 @@ -343,7 +343,7 @@ <td bgcolor="#E2E2E2"><input type="text" size="50" maxlength="50" name="desc" id="desc"/></td> </tr> <tr> - <td valign="top" bgcolor="#EEEEEE" style="paddiong-left: 0px; padding-right: 5px;">Convert tabs:</td> + <td valign="top" bgcolor="#EEEEEE" style="padding-left: 0px; padding-right: 5px;">Convert tabs:</td> <td bgcolor="#EEEEEE"> <select name="cvt_tabs" id="cvt_tabs"> <option value="0" selected="selected">No</option> @@ -358,7 +358,7 @@ </td> </tr> <tr> - <td valign="top" bgcolor="#E2E2E2" style="paddiong-left: 0px; padding-right: 5px;">Expire after: </td> + <td valign="top" bgcolor="#E2E2E2" style="padding-left: 0px; padding-right: 5px;">Expire after: </td> <td bgcolor="#E2E2E2"> <input name="optday" type="radio" value="1" checked="checked" /> 7 days

1 0

[dreimer] 32392: Once more... make it possible to translate usetup COMPLETELY. (I hope this time I am right....)
by dreimer＠svn.reactos.org 16 Feb '08

16 Feb '08

Author: dreimer Date: Sat Feb 16 21:58:05 2008 New Revision: 32392 URL: http://svn.reactos.org/svn/reactos?rev=32392&view=rev Log: Once more... make it possible to translate usetup COMPLETELY. (I hope this time I am right....) Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/mui.h trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Sat Feb 16 21:58:05 2008 @@ -1628,7 +1628,7 @@ if (DiskEntry->DriverName.Length > 0) { CONSOLE_PrintTextXY(6, 10, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ.", + MUIGetString(STRING_HDDINFO1), DiskSize, Unit, DiskEntry->DiskNumber, @@ -1640,7 +1640,7 @@ else { CONSOLE_PrintTextXY(6, 10, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu).", + MUIGetString(STRING_HDDINFO2), DiskSize, Unit, DiskEntry->DiskNumber, @@ -1798,7 +1798,7 @@ if (PartType == NULL) { CONSOLE_PrintTextXY(6, 10, - " %c%c Type %lu %I64u %s", + MUIGetString(STRING_HDDINFO3), (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', PartEntry->PartInfo[0].PartitionType, @@ -1836,7 +1836,7 @@ if (DiskEntry->DriverName.Length > 0) { CONSOLE_PrintTextXY(6, 12, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ.", + MUIGetString(STRING_HDDINFO4), DiskSize, Unit, DiskEntry->DiskNumber, @@ -1848,7 +1848,7 @@ else { CONSOLE_PrintTextXY(6, 12, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu).", + MUIGetString(STRING_HDDINFO5), DiskSize, Unit, DiskEntry->DiskNumber, @@ -1965,7 +1965,7 @@ if (PartEntry->AutoCreate == TRUE) { - CONSOLE_SetTextXY(6, 8, "Setup created a new partition on"); + CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NEWPARTITION)); #if 0 CONSOLE_PrintTextXY(8, 10, "Partition %lu (%I64u %s) %s of", @@ -1975,7 +1975,7 @@ PartType); #endif - CONSOLE_PrintTextXY(8, 10, "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ).", + CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDDINFO6), DiskEntry->DiskNumber, DiskSize, DiskUnit, @@ -2001,7 +2001,7 @@ if (PartType == NULL) { CONSOLE_PrintTextXY(8, 10, - "%c%c Type %lu %I64u %s", + MUIGetString(STRING_HDDINFO7), (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', PartEntry->PartInfo[0].PartitionType, @@ -2019,7 +2019,7 @@ PartUnit); } - CONSOLE_PrintTextXY(6, 12, "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ).", + CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDDINFO8), DiskEntry->DiskNumber, DiskSize, DiskUnit, Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h Sat Feb 16 21:58:05 2008 @@ -1646,6 +1646,32 @@ " Formatiere Partition als %S Dateisystem "}, {STRING_KEEPFORMAT, " Dateisystem beibehalten (Keine Vernderungen) "}, + {STRING_HDDINFO1, + "%I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) auf %wZ."}, + {STRING_HDDINFO2, + "%I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO3, + " %c%c Typ %lu %I64u %s"}, + {STRING_HDDINFO4, + "auf %I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) auf %wZ."}, + {STRING_HDDINFO5, + "auf %I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO6, + "Festplatte %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO7, + "%c%c Typ %lu %I64u %s"}, + {STRING_HDDINFO8, + "auf Festplatte %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO9, + "%c%c Typ %-3u %6lu %s"}, + {STRING_HDDINFO10, + "%6lu %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) auf %S"}, + {STRING_HDDINFO11, + "%6lu %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Setup erstellte eine neue Partition auf"}, + {STRING_UNPSPACE, + " Unpartitionierter Speicher %6lu %s"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h Sat Feb 16 21:58:05 2008 @@ -1640,6 +1640,32 @@ " Format partition as %S file system "}, {STRING_KEEPFORMAT, " Keep current file system (no changes) "}, + {STRING_HDDINFO1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFO2, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO3, + " %c%c Type %lu %I64u %s"}, + {STRING_HDDINFO4, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFO5, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO6, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO7, + "%c%c Type %lu %I64u %s"}, + {STRING_HDDINFO8, + "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO9, + "%c%c Type %-3u %6lu %s"}, + {STRING_HDDINFO10, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + {STRING_HDDINFO11, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Setup created a new partition on"}, + {STRING_UNPSPACE, + " Unpartitioned space %6lu %s"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h Sat Feb 16 21:58:05 2008 @@ -1568,8 +1568,3 @@ }; #endif - - - - - Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Sat Feb 16 21:58:05 2008 @@ -1652,6 +1652,32 @@ " Format partition as %S file system "}, {STRING_KEEPFORMAT, " Keep current file system (no changes) "}, + {STRING_HDDINFO1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFO2, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO3, + " %c%c Type %lu %I64u %s"}, + {STRING_HDDINFO4, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFO5, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO6, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO7, + "%c%c Type %lu %I64u %s"}, + {STRING_HDDINFO8, + "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO9, + "%c%c Type %-3u %6lu %s"}, + {STRING_HDDINFO10, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + {STRING_HDDINFO11, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Setup created a new partition on"}, + {STRING_UNPSPACE, + " Unpartitioned space %6lu %s"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h Sat Feb 16 21:58:05 2008 @@ -1574,9 +1574,3 @@ }; #endif - - - - - - Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h Sat Feb 16 21:58:05 2008 @@ -1648,6 +1648,32 @@ " Sformatuj partycj© z systemem plik¢w %S "}, {STRING_KEEPFORMAT, " Zachowaj obecny system plik¢w (bez zmian) "}, + {STRING_HDDINFO1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFO2, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO3, + " %c%c Type %lu %I64u %s"}, + {STRING_HDDINFO4, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFO5, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO6, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO7, + "%c%c Type %lu %I64u %s"}, + {STRING_HDDINFO8, + "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO9, + "%c%c Type %-3u %6lu %s"}, + {STRING_HDDINFO10, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + {STRING_HDDINFO11, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Setup created a new partition on"}, + {STRING_UNPSPACE, + " Unpartitioned space %6lu %s"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h Sat Feb 16 21:58:05 2008 @@ -1640,6 +1640,32 @@ " ®à¬ â¨à®¢ ¨¥ à §¤¥« ¢ ä ©«®¢®© á¨áâ¥¬¥ %S "}, {STRING_KEEPFORMAT, " áâ ¢¨âì áãé¥áâ¢ãîéãî ä ©«®¢ãî á¨áâ¥¬ã (¡¥§ ¨§¬¥¥¨©) "}, + {STRING_HDDINFO1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFO2, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO3, + " %c%c Type %lu %I64u %s"}, + {STRING_HDDINFO4, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFO5, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO6, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO7, + "%c%c Type %lu %I64u %s"}, + {STRING_HDDINFO8, + "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO9, + "%c%c Type %-3u %6lu %s"}, + {STRING_HDDINFO10, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + {STRING_HDDINFO11, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Setup created a new partition on"}, + {STRING_UNPSPACE, + " Unpartitioned space %6lu %s"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h Sat Feb 16 21:58:05 2008 @@ -1645,6 +1645,32 @@ " Naform tova oblas ako systm s£borov %S "}, {STRING_KEEPFORMAT, " Ponecha s£asnì systm s£borov (bez zmeny) "}, + {STRING_HDDINFO1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFO2, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO3, + " %c%c Type %lu %I64u %s"}, + {STRING_HDDINFO4, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFO5, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO6, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO7, + "%c%c Type %lu %I64u %s"}, + {STRING_HDDINFO8, + "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO9, + "%c%c Type %-3u %6lu %s"}, + {STRING_HDDINFO10, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + {STRING_HDDINFO11, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Setup created a new partition on"}, + {STRING_UNPSPACE, + " Unpartitioned space %6lu %s"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h (original) +++ trunk/reactos/base/setup/usetup/mui.h Sat Feb 16 21:58:05 2008 @@ -104,5 +104,17 @@ #define STRING_FORMATDISK1 33 #define STRING_FORMATDISK2 34 #define STRING_KEEPFORMAT 35 - +#define STRING_HDDINFO1 36 +#define STRING_HDDINFO2 37 +#define STRING_HDDINFO3 38 +#define STRING_HDDINFO4 39 +#define STRING_HDDINFO5 40 +#define STRING_HDDINFO6 41 +#define STRING_HDDINFO7 42 +#define STRING_HDDINFO8 43 +#define STRING_HDDINFO9 44 +#define STRING_HDDINFO10 45 +#define STRING_HDDINFO11 46 +#define STRING_NEWPARTITION 47 +#define STRING_UNPSPACE 48 #endif Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c (original) +++ trunk/reactos/base/setup/usetup/partlist.c Sat Feb 16 21:58:05 2008 @@ -1136,7 +1136,7 @@ } sprintf (LineBuffer, - " Unpartitioned space %6lu %s", + MUIGetString(STRING_UNPSPACE), PartSize.u.LowPart, Unit); } @@ -1194,7 +1194,7 @@ if (PartType == NULL) { sprintf (LineBuffer, - "%c%c Type %-3u %6lu %s", + MUIGetString(STRING_HDDINFO9), (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', PartEntry->PartInfo[0].PartitionType, @@ -1288,7 +1288,7 @@ if (DiskEntry->DriverName.Length > 0) { sprintf (LineBuffer, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S", + MUIGetString(STRING_HDDINFO10), DiskSize.u.LowPart, Unit, DiskEntry->DiskNumber, @@ -1300,7 +1300,7 @@ else { sprintf (LineBuffer, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)", + MUIGetString(STRING_HDDINFO11), DiskSize.u.LowPart, Unit, DiskEntry->DiskNumber,

1 0

[jimtabor] 32391: - Patch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): Removed NtGdiStretchDIBits and NtGdiAddFontResource. Replaced with correct API.
by jimtabor＠svn.reactos.org 16 Feb '08

16 Feb '08

Author: jimtabor Date: Sat Feb 16 21:14:36 2008 New Revision: 32391 URL: http://svn.reactos.org/svn/reactos?rev=32391&view=rev Log: - Patch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): Removed NtGdiStretchDIBits and NtGdiAddFontResource. Replaced with correct API. Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/misc/stubsw.c trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/objects/text.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sat Feb 16 21:14:36 2008 @@ -42,8 +42,8 @@ { /* FIXME share memory */ - return NtGdiStretchDIBits(hdc, XDest, YDest, nDestWidth, nDestHeight, XSrc, YSrc, - nSrcWidth, nSrcHeight, lpBits, lpBitsInfo, iUsage, dwRop); + return NtGdiStretchDIBitsInternal(hdc, XDest, YDest, nDestWidth, nDestHeight, XSrc, YSrc, + nSrcWidth, nSrcHeight, (LPBYTE)lpBits, (LPBITMAPINFO)lpBitsInfo, (DWORD)iUsage, dwRop, 0, 0, NULL); } /* Modified: trunk/reactos/dll/win32/gdi32/misc/stubsw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubsw.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubsw.c Sat Feb 16 21:14:36 2008 @@ -215,18 +215,13 @@ */ int STDCALL -GdiAddFontResourceW(LPCWSTR lpszFilename,FLONG fl,DESIGNVECTOR *pdv) -{ - UNICODE_STRING Filename; - //UNIMPLEMENTED; - //SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - //return 0; - - /* FIXME handle fl parameter */ - RtlInitUnicodeString(&Filename, lpszFilename); - return NtGdiAddFontResource ( &Filename, fl ); -} - +GdiAddFontResourceW( + LPCWSTR lpszFilename, + FLONG fl, + DESIGNVECTOR *pdv) +{ + return NtGdiAddFontResourceW((PWSTR)lpszFilename, 0, 0, fl, 0, pdv); +} /* * @implemented Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Sat Feb 16 21:14:36 2008 @@ -58,14 +58,6 @@ PFONTFAMILYINFO Info, DWORD Size ); - - -/* Use NtGdiAddFontResourceW */ -int -STDCALL -NtGdiAddFontResource(PUNICODE_STRING Filename, - DWORD fl); - /* Use NtGdiCreateDIBitmapInternal */ HBITMAP @@ -170,25 +162,6 @@ LPPOINT Point ); -/* Use NtGdiStretchDIBitsInternal. */ -INT -STDCALL -NtGdiStretchDIBits ( - HDC hDC, - INT XDest, - INT YDest, - INT DestWidth, - INT DestHeight, - INT XSrc, - INT YSrc, - INT SrcWidth, - INT SrcHeight, - CONST VOID * Bits, - CONST BITMAPINFO * BitsInfo, - UINT Usage, - DWORD ROP - ); - #endif /* WIN32K_NTGDI_BAD_INCLUDED */ Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Sat Feb 16 21:14:36 2008 @@ -722,19 +722,25 @@ return Result; } -INT STDCALL NtGdiStretchDIBits(HDC hDC, - INT XDest, - INT YDest, - INT DestWidth, - INT DestHeight, - INT XSrc, - INT YSrc, - INT SrcWidth, - INT SrcHeight, - CONST VOID *Bits, - CONST BITMAPINFO *BitsInfo, - UINT Usage, - DWORD ROP) +INT +APIENTRY +NtGdiStretchDIBitsInternal( + HDC hDC, + INT XDest, + INT YDest, + INT DestWidth, + INT DestHeight, + INT XSrc, + INT YSrc, + INT SrcWidth, + INT SrcHeight, + LPBYTE Bits, + LPBITMAPINFO BitsInfo, + DWORD Usage, + DWORD ROP, + UINT cjMaxInfo, + UINT cjMaxBits, + HANDLE hcmXform) { HBITMAP hBitmap, hOldBitmap; HDC hdcMem; @@ -771,7 +777,7 @@ } NtGdiSetDIBits(hdcMem, hBitmap, 0, BitsInfo->bmiHeader.biHeight, Bits, - BitsInfo, Usage); + BitsInfo, (UINT)Usage); /* Origin for DIBitmap may be bottom left (positive biHeight) or top left (negative biHeight) */ Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Sat Feb 16 21:14:36 2008 @@ -436,22 +436,23 @@ return FT_RENDER_MODE_NORMAL; } -int -STDCALL -NtGdiAddFontResource(PUNICODE_STRING Filename, DWORD fl) +INT +APIENTRY +NtGdiAddFontResourceW( + IN WCHAR *pwszFiles, + IN ULONG cwc, + IN ULONG cFiles, + IN FLONG fl, + IN DWORD dwPidTid, + IN OPTIONAL DESIGNVECTOR *pdv) { UNICODE_STRING SafeFileName; PWSTR src; NTSTATUS Status; int Ret; - /* Copy the UNICODE_STRING structure */ - Status = MmCopyFromCaller(&SafeFileName, Filename, sizeof(UNICODE_STRING)); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return 0; - } + /* FIXME - Protect with SEH? */ + RtlInitUnicodeString(&SafeFileName, pwszFiles); /* Reserve for prepending '\??\' */ SafeFileName.Length += 4 * sizeof(WCHAR); @@ -476,7 +477,7 @@ return 0; } - Ret = IntGdiAddFontResource(&SafeFileName, fl); + Ret = IntGdiAddFontResource(&SafeFileName, (DWORD)fl); ExFreePool(SafeFileName.Buffer); return Ret; Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Sat Feb 16 21:14:36 2008 @@ -1558,26 +1558,6 @@ return 0; } - - -/* - * @unimplemented - */ -INT -APIENTRY -NtGdiAddFontResourceW( - IN WCHAR *pwszFiles, - IN ULONG cwc, - IN ULONG cFiles, - IN FLONG f, - IN DWORD dwPidTid, - IN OPTIONAL DESIGNVECTOR *pdv) -{ - UNIMPLEMENTED; - return 0; -} - - /* * @unimplemented */ @@ -2984,33 +2964,6 @@ /* * @unimplemented */ -INT -APIENTRY -NtGdiStretchDIBitsInternal( - IN HDC hdc, - IN INT xDst, - IN INT yDst, - IN INT cxDst, - IN INT cyDst, - IN INT xSrc, - IN INT ySrc, - IN INT cxSrc, - IN INT cySrc, - IN OPTIONAL LPBYTE pjInit, - IN LPBITMAPINFO pbmi, - IN DWORD dwUsage, - IN DWORD dwRop4, - IN UINT cjMaxInfo, - IN UINT cjMaxBits, - IN HANDLE hcmXform) -{ - UNIMPLEMENTED; - return 0; -} - - /* - * @unimplemented - */ BOOL APIENTRY NtGdiUnloadPrinterDriver( Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Sat Feb 16 21:14:36 2008 @@ -679,7 +679,6 @@ NtGdiSetViewportOrgEx 4 NtGdiSetWindowExtEx 4 NtGdiSetWindowOrgEx 4 -NtGdiStretchDIBits 13 NtUserAcquireOrReleaseInputOwnership 1 NtUserBuildMenuItemList 4 NtUserCreateCursorIconHandle 2 @@ -719,7 +718,6 @@ NtUserSendMessageTimeout 8 NtUserSendNotifyMessage 4 NtUserSetScrollBarInfo 3 -NtGdiAddFontResource 2 NtGdiCreateDIBitmap 6 NtGdiGetAspectRatioFilterEx 2 NtGdiGetFontFamilyInfo 4

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs