HGE

1>pack dll with UPX
1>                     Ultimate Packer for eXecutables
1>         Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
1>UPX 1.24w        Markus F.X.J. Oberhumer & Laszlo Molnar         Nov 7th 2002
1>        File size         Ratio      Format      Name
1>   --------------------   ------   -----------   -----------
1>upx: ..\..\hge.dll: CantPackException: unexpected value in PE header (try --force)
1>Packed 1 file: 0 ok, 1 error.
1>Project : error PRJ0019: A tool returned an error code from "pack dll with UPX"

daishiva@localhost ~/dev/hge181
$ patch -p0 -i hge_dx9.patch
 
patching file src/core/graphics.cpp
patching file src/core/system.cpp
patching file src/core/hge.vcproj
patching file src/core/hge_impl.h

Index: src/core/graphics.cpp
===================================================================
--- src/core/graphics.cpp	(revision 22)
+++ src/core/graphics.cpp	(revision 23)
@@ -8,8 +8,8 @@
 
 
 #include "hge_impl.h"
-#include <d3d8.h>
-#include <d3dx8.h>
+#include <d3d9.h>
+#include <d3dx9.h>
 
 
 void CALL HGE_Impl::Gfx_Clear(DWORD color)
@@ -32,7 +32,7 @@
 
 void CALL HGE_Impl::Gfx_SetClipping(int x, int y, int w, int h)
 {
-	D3DVIEWPORT8 vp;
+	D3DVIEWPORT9 vp;
 	int scr_width, scr_height;
 
 	if(!pCurTarget) {
@@ -101,7 +101,7 @@
 
 bool CALL HGE_Impl::Gfx_BeginScene(HTARGET targ)
 {
-	LPDIRECT3DSURFACE8 pSurf=0, pDepth=0;
+	LPDIRECT3DSURFACE9 pSurf=0, pDepth=0;
 	D3DDISPLAYMODE Mode;
 	CRenderTargetList *target=(CRenderTargetList *)targ;
 
@@ -143,7 +143,7 @@
 			pSurf=pScreenSurf;
 			pDepth=pScreenDepth;
 		}
-		if(FAILED(pD3DDevice->SetRenderTarget(pSurf, pDepth)))
+		if(FAILED(pD3DDevice->SetRenderTarget(0, pSurf)))
 		{
 			if(target) pSurf->Release();
 			_PostError("Gfx_BeginScene: Can't set render target");
@@ -171,7 +171,7 @@
 	}
 
 	pD3DDevice->BeginScene();
-	pVB->Lock( 0, 0, (BYTE**)&VertArray, 0 );
+	pVB->Lock( 0, 0, (VOID**)&VertArray, 0 );
 
 	return true;
 }
@@ -219,7 +219,7 @@
 			CurPrimType=HGEPRIM_TRIPLES;
 			if(CurBlendMode != triple->blend) _SetBlendMode(triple->blend);
 			if(triple->tex != CurTexture) {
-				pD3DDevice->SetTexture( 0, (LPDIRECT3DTEXTURE8)triple->tex );
+				pD3DDevice->SetTexture( 0, (LPDIRECT3DTEXTURE9)triple->tex );
 				CurTexture = triple->tex;
 			}
 		}
@@ -241,7 +241,7 @@
 			if(CurBlendMode != quad->blend) _SetBlendMode(quad->blend);
 			if(quad->tex != CurTexture)
 			{
-				pD3DDevice->SetTexture( 0, (LPDIRECT3DTEXTURE8)quad->tex );
+				pD3DDevice->SetTexture( 0, (LPDIRECT3DTEXTURE9)quad->tex );
 				CurTexture = quad->tex;
 			}
 		}
@@ -261,7 +261,7 @@
 		if(CurBlendMode != blend) _SetBlendMode(blend);
 		if(tex != CurTexture)
 		{
-			pD3DDevice->SetTexture( 0, (LPDIRECT3DTEXTURE8)tex );
+			pD3DDevice->SetTexture( 0, (LPDIRECT3DTEXTURE9)tex );
 			CurTexture = tex;
 		}
 
@@ -299,8 +299,8 @@
 
 	if(zbuffer)
 	{
-		if(FAILED(pD3DDevice->CreateDepthStencilSurface(pTarget->width, pTarget->height,
-						D3DFMT_D16, D3DMULTISAMPLE_NONE, &pTarget->pDepth)))
+		if(FAILED(pD3DDevice->CreateDepthStencilSurface(width, height,
+			D3DFMT_D16, D3DMULTISAMPLE_NONE, 0, false, &pTarget->pDepth, NULL)))
 		{   
 			pTarget->pTex->Release();
 			_PostError("Can't create render target depth buffer");
@@ -349,7 +349,7 @@
 
 HTEXTURE CALL HGE_Impl::Texture_Create(int width, int height)
 {
-	LPDIRECT3DTEXTURE8 pTex;
+	LPDIRECT3DTEXTURE9 pTex;
 
 	if( FAILED( D3DXCreateTexture( pD3DDevice, width, height,
 										1,					// Mip levels
@@ -370,7 +370,7 @@
 	void *data;
 	DWORD _size;
 	D3DFORMAT fmt1, fmt2;
-	LPDIRECT3DTEXTURE8 pTex;
+	LPDIRECT3DTEXTURE9 pTex;
 	D3DXIMAGE_INFO info;
 	CTextureList *texItem;
 
@@ -437,7 +437,7 @@
 
 void CALL HGE_Impl::Texture_Free(HTEXTURE tex)
 {
-	LPDIRECT3DTEXTURE8 pTex=(LPDIRECT3DTEXTURE8)tex;
+	LPDIRECT3DTEXTURE9 pTex=(LPDIRECT3DTEXTURE9)tex;
 	CTextureList *texItem=textures, *texPrev=0;
 
 	while(texItem)
@@ -458,7 +458,7 @@
 int CALL HGE_Impl::Texture_GetWidth(HTEXTURE tex, bool bOriginal)
 {
 	D3DSURFACE_DESC TDesc;
-	LPDIRECT3DTEXTURE8 pTex=(LPDIRECT3DTEXTURE8)tex;
+	LPDIRECT3DTEXTURE9 pTex=(LPDIRECT3DTEXTURE9)tex;
 	CTextureList *texItem=textures;
 
 	if(bOriginal)
@@ -481,7 +481,7 @@
 int CALL HGE_Impl::Texture_GetHeight(HTEXTURE tex, bool bOriginal)
 {
 	D3DSURFACE_DESC TDesc;
-	LPDIRECT3DTEXTURE8 pTex=(LPDIRECT3DTEXTURE8)tex;
+	LPDIRECT3DTEXTURE9 pTex=(LPDIRECT3DTEXTURE9)tex;
 	CTextureList *texItem=textures;
 
 	if(bOriginal)
@@ -503,7 +503,7 @@
 
 DWORD * CALL HGE_Impl::Texture_Lock(HTEXTURE tex, bool bReadOnly, int left, int top, int width, int height)
 {
-	LPDIRECT3DTEXTURE8 pTex=(LPDIRECT3DTEXTURE8)tex;
+	LPDIRECT3DTEXTURE9 pTex=(LPDIRECT3DTEXTURE9)tex;
 	D3DSURFACE_DESC TDesc;
 	D3DLOCKED_RECT TRect;
 	RECT region, *prec;
@@ -537,7 +537,7 @@
 
 void CALL HGE_Impl::Texture_Unlock(HTEXTURE tex)
 {
-	LPDIRECT3DTEXTURE8 pTex=(LPDIRECT3DTEXTURE8)tex;
+	LPDIRECT3DTEXTURE9 pTex=(LPDIRECT3DTEXTURE9)tex;
 	pTex->UnlockRect(0);
 }
 
@@ -554,7 +554,7 @@
 			switch(CurPrimType)
 			{
 				case HGEPRIM_QUADS:
-					pD3DDevice->DrawIndexedPrimitive(D3DPT_TRIANGLELIST, 0, nPrim<<2, 0, nPrim<<1);
+					pD3DDevice->DrawIndexedPrimitive(D3DPT_TRIANGLELIST, 0, 0, nPrim<<2, 0, nPrim<<1);
 					break;
 
 				case HGEPRIM_TRIPLES:
@@ -570,7 +570,7 @@
 		}
 
 		if(bEndScene) VertArray = 0;
-		else pVB->Lock( 0, 0, (BYTE**)&VertArray, 0 );
+		else pVB->Lock( 0, 0, (VOID**)&VertArray, 0 );
 	}
 }
 
@@ -610,14 +610,14 @@
 bool HGE_Impl::_GfxInit()
 {
 	static const char *szFormats[]={"UNKNOWN", "R5G6B5", "X1R5G5B5", "A1R5G5B5", "X8R8G8B8", "A8R8G8B8"};
-	D3DADAPTER_IDENTIFIER8 AdID;
+	D3DADAPTER_IDENTIFIER9 AdID;
 	D3DDISPLAYMODE Mode;
 	D3DFORMAT Format=D3DFMT_UNKNOWN;
 	UINT nModes, i;
 
 // Init D3D
 
-	pD3D=Direct3DCreate8(120); // D3D_SDK_VERSION
+	pD3D=Direct3DCreate9(D3D_SDK_VERSION); // D3D_SDK_VERSION
 	if(pD3D==NULL)
 	{
 		_PostError("Can't create D3D interface");
@@ -626,7 +626,7 @@
 
 // Get adapter info
 
-	pD3D->GetAdapterIdentifier(D3DADAPTER_DEFAULT, D3DENUM_NO_WHQL_LEVEL, &AdID);
+	pD3D->GetAdapterIdentifier(D3DADAPTER_DEFAULT, 0, &AdID);
 	System_Log("D3D Driver: %s",AdID.Driver);
 	System_Log("Description: %s",AdID.Description);
 	System_Log("Version: %d.%d.%d.%d",
@@ -653,7 +653,7 @@
 	d3dppW.hDeviceWindow    = hwnd;
 	d3dppW.Windowed         = TRUE;
 
-	if(nHGEFPS==HGEFPS_VSYNC) d3dppW.SwapEffect = D3DSWAPEFFECT_COPY_VSYNC;
+	if(nHGEFPS==HGEFPS_VSYNC) { d3dppW.SwapEffect = D3DSWAPEFFECT_COPY; d3dppW.PresentationInterval = D3DPRESENT_INTERVAL_DEFAULT; }
 	else					  d3dppW.SwapEffect = D3DSWAPEFFECT_COPY;
 
 	if(bZBuffer)
@@ -664,11 +664,11 @@
 
 // Set up Full Screen presentation parameters
 
-	nModes=pD3D->GetAdapterModeCount(D3DADAPTER_DEFAULT);
+	nModes=pD3D->GetAdapterModeCount(D3DADAPTER_DEFAULT, Mode.Format);
 
 	for(i=0; i<nModes; i++)
 	{
-		pD3D->EnumAdapterModes(D3DADAPTER_DEFAULT, i, &Mode);
+		pD3D->EnumAdapterModes(D3DADAPTER_DEFAULT, Mode.Format, i, &Mode);
 		if(Mode.Width != (UINT)nScreenWidth || Mode.Height != (UINT)nScreenHeight) continue;
 		if(nScreenBPP==16 && (_format_id(Mode.Format) > _format_id(D3DFMT_A1R5G5B5))) continue;
 		if(_format_id(Mode.Format) > _format_id(Format)) Format=Mode.Format;
@@ -693,8 +693,8 @@
 	d3dppFS.SwapEffect       = D3DSWAPEFFECT_FLIP;
 	d3dppFS.FullScreen_RefreshRateInHz = D3DPRESENT_RATE_DEFAULT;
 
-	if(nHGEFPS==HGEFPS_VSYNC) d3dppFS.FullScreen_PresentationInterval = D3DPRESENT_INTERVAL_ONE;
-	else					  d3dppFS.FullScreen_PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE;
+	if(nHGEFPS==HGEFPS_VSYNC) d3dppFS.PresentationInterval = D3DPRESENT_INTERVAL_ONE;
+	else					  d3dppFS.PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE;
 
 	if(bZBuffer)
 	{
@@ -811,14 +811,14 @@
 
 	if(pIB)
 	{
-		pD3DDevice->SetIndices(NULL,0);
+		pD3DDevice->SetIndices(NULL);
 		pIB->Release();
 		pIB=0;
 	}
 	if(pVB)
 	{
 		if(VertArray) {	pVB->Unlock(); VertArray=0;	}
-		pD3DDevice->SetStreamSource( 0, NULL, sizeof(hgeVertex) );
+		pD3DDevice->SetStreamSource( 0, NULL, 0, sizeof(hgeVertex) );
 		pVB->Release();
 		pVB=0;
 	}
@@ -846,12 +846,12 @@
 
 	if(pIB)
 	{
-		pD3DDevice->SetIndices(NULL,0);
+		pD3DDevice->SetIndices(NULL);
 		pIB->Release();
 	}
 	if(pVB)
 	{
-		pD3DDevice->SetStreamSource( 0, NULL, sizeof(hgeVertex) );
+		pD3DDevice->SetStreamSource( 0, NULL,0, sizeof(hgeVertex) );
 		pVB->Release();
 	}
 
@@ -874,7 +874,7 @@
 	pScreenSurf=0;
 	pScreenDepth=0;
 
-	pD3DDevice->GetRenderTarget(&pScreenSurf);
+	pD3DDevice->GetRenderTarget(0, &pScreenSurf);
 	pD3DDevice->GetDepthStencilSurface(&pScreenDepth);
 
 	while(target)
@@ -884,37 +884,42 @@
 							  d3dpp->BackBufferFormat, D3DPOOL_DEFAULT, &target->pTex);
 		if(target->pDepth)
 			pD3DDevice->CreateDepthStencilSurface(target->width, target->height,
-												  D3DFMT_D16, D3DMULTISAMPLE_NONE, &target->pDepth);
+			D3DFMT_D16, D3DMULTISAMPLE_NONE, 0, false, &target->pDepth, NULL);
 		target=target->next;
 	}
 
 // Create Vertex buffer
 
 	if( FAILED (pD3DDevice->CreateVertexBuffer(VERTEX_BUFFER_SIZE*sizeof(hgeVertex),
-                                              D3DUSAGE_WRITEONLY,
-											  D3DFVF_HGEVERTEX,
-                                              D3DPOOL_DEFAULT, &pVB )))
+		D3DUSAGE_WRITEONLY,
+		D3DFVF_HGEVERTEX,
+		D3DPOOL_DEFAULT, 
+		&pVB, 
+		NULL)))
 	{
 		_PostError("Can't create D3D vertex buffer");
 		return false;
 	}
 
-	pD3DDevice->SetVertexShader( D3DFVF_HGEVERTEX );
-	pD3DDevice->SetStreamSource( 0, pVB, sizeof(hgeVertex) );
+	pD3DDevice->SetVertexShader( NULL );
+	pD3DDevice->SetFVF( D3DFVF_HGEVERTEX );
+	pD3DDevice->SetStreamSource( 0, pVB, 0, sizeof(hgeVertex) );
 
 // Create and setup Index buffer
 
 	if( FAILED( pD3DDevice->CreateIndexBuffer(VERTEX_BUFFER_SIZE*6/4*sizeof(WORD),
-                                              D3DUSAGE_WRITEONLY,
-											  D3DFMT_INDEX16,
-                                              D3DPOOL_DEFAULT, &pIB ) ) )
+		D3DUSAGE_WRITEONLY,
+		D3DFMT_INDEX16,
+		D3DPOOL_DEFAULT, 
+		&pIB
+		, NULL) ) )
 	{
 		_PostError("Can't create D3D index buffer");
 		return false;
 	}
 
 	WORD *pIndices, n=0;
-	if( FAILED( pIB->Lock( 0, 0, (BYTE**)&pIndices, 0 ) ) )
+	if( FAILED( pIB->Lock( 0, 0, (void**)&pIndices, 0 ) ) )
 	{
 		_PostError("Can't lock D3D index buffer");
 		return false;
@@ -931,7 +936,7 @@
 	}
 
 	pIB->Unlock();
-	pD3DDevice->SetIndices(pIB,0);
+	pD3DDevice->SetIndices(pIB);
 
 // Set common render states
 
@@ -955,17 +960,17 @@
 	pD3DDevice->SetTextureStageState( 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE );
 	pD3DDevice->SetTextureStageState( 0, D3DTSS_ALPHAARG2, D3DTA_DIFFUSE );
 
-	pD3DDevice->SetTextureStageState(0, D3DTSS_MIPFILTER, D3DTEXF_POINT);
+	pD3DDevice->SetSamplerState(0, D3DSAMP_MIPFILTER, D3DTEXF_POINT);
 
 	if(bTextureFilter)
 	{
-		pD3DDevice->SetTextureStageState(0,D3DTSS_MAGFILTER,D3DTEXF_LINEAR);
-		pD3DDevice->SetTextureStageState(0,D3DTSS_MINFILTER,D3DTEXF_LINEAR);
+		pD3DDevice->SetSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR);
+		pD3DDevice->SetSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR);
 	}
 	else
 	{
-		pD3DDevice->SetTextureStageState(0,D3DTSS_MAGFILTER,D3DTEXF_POINT);
-		pD3DDevice->SetTextureStageState(0,D3DTSS_MINFILTER,D3DTEXF_POINT);
+		pD3DDevice->SetSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_POINT);
+		pD3DDevice->SetSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_POINT);
 	}
 
 	nPrim=0;
Index: src/core/system.cpp
===================================================================
--- src/core/system.cpp	(revision 22)
+++ src/core/system.cpp	(revision 23)
@@ -379,13 +379,13 @@
 									_render_batch();
 									if(bTextureFilter)
 									{
-										pD3DDevice->SetTextureStageState(0,D3DTSS_MAGFILTER,D3DTEXF_LINEAR);
-										pD3DDevice->SetTextureStageState(0,D3DTSS_MINFILTER,D3DTEXF_LINEAR);
+										pD3DDevice->SetSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR);
+										pD3DDevice->SetSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR);
 									}
 									else
 									{
-										pD3DDevice->SetTextureStageState(0,D3DTSS_MAGFILTER,D3DTEXF_POINT);
-										pD3DDevice->SetTextureStageState(0,D3DTSS_MINFILTER,D3DTEXF_POINT);
+										pD3DDevice->SetSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_POINT);
+										pD3DDevice->SetSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_POINT);
 									}
 								}
 								break;
@@ -462,13 +462,14 @@
 									{
 										if(value==HGEFPS_VSYNC)
 										{
-											d3dppW.SwapEffect = D3DSWAPEFFECT_COPY_VSYNC;
-											d3dppFS.FullScreen_PresentationInterval = D3DPRESENT_INTERVAL_ONE;
+											d3dppW.SwapEffect = D3DSWAPEFFECT_COPY;
+											d3dppW.PresentationInterval = D3DPRESENT_INTERVAL_DEFAULT;
+											d3dppFS.PresentationInterval = D3DPRESENT_INTERVAL_ONE;
 										}
 										else
 										{
 											d3dppW.SwapEffect = D3DSWAPEFFECT_COPY;
-											d3dppFS.FullScreen_PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE;
+											d3dppFS.PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE;
 										}
 										//if(procFocusLostFunc) procFocusLostFunc();
 										_GfxRestore();
@@ -616,7 +617,7 @@
 
 void CALL HGE_Impl::System_Snapshot(const char *filename)
 {
-	LPDIRECT3DSURFACE8 pSurf;
+	LPDIRECT3DSURFACE9 pSurf;
 	char *shotname, tempname[_MAX_PATH];
 	int i;
 
@@ -635,7 +636,7 @@
 
 	if(pD3DDevice)
 	{
-		pD3DDevice->GetBackBuffer(0, D3DBACKBUFFER_TYPE_MONO, &pSurf);
+		pD3DDevice->GetBackBuffer(0, 0, D3DBACKBUFFER_TYPE_MONO, &pSurf);
 		D3DXSaveSurfaceToFile(filename, D3DXIFF_BMP, pSurf, NULL, NULL);
 		pSurf->Release();
 	}
Index: src/core/hge.vcproj
===================================================================
--- src/core/hge.vcproj	(revision 22)
+++ src/core/hge.vcproj	(revision 23)
@@ -72,7 +72,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib d3d8.lib d3dx8.lib user32.lib gdi32.lib Advapi32.lib shell32.lib"
+				AdditionalDependencies="winmm.lib d3d9.lib d3dx9.lib user32.lib gdi32.lib Advapi32.lib shell32.lib"
 				OutputFile="..\..\hge.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -169,7 +169,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib d3d8.lib d3dx8.lib user32.lib gdi32.lib Advapi32.lib shell32.lib"
+				AdditionalDependencies="winmm.lib d3d9.lib d3dx9.lib user32.lib gdi32.lib Advapi32.lib shell32.lib"
 				OutputFile="..\..\hge.dll"
 				Version="1.53"
 				LinkIncremental="1"
@@ -301,6 +301,10 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath=".\power.cpp"
+				>
+			</File>
+			<File
 				RelativePath="random.cpp"
 				>
 				<FileConfiguration
Index: src/core/hge_impl.h
===================================================================
--- src/core/hge_impl.h	(revision 22)
+++ src/core/hge_impl.h	(revision 23)
@@ -12,8 +12,8 @@
 
 #include "..\..\include\hge.h"
 #include <stdio.h>
-#include <d3d8.h>
-#include <d3dx8.h>
+#include <d3d9.h>
+#include <d3dx9.h>
 
 #define DEMO
 
@@ -28,8 +28,8 @@
 {
 	int					width;
 	int					height;
-	IDirect3DTexture8*	pTex;
-	IDirect3DSurface8*	pDepth;
+	IDirect3DTexture9*	pTex;
+	IDirect3DSurface9*	pDepth;
 	CRenderTargetList*	next;
 };
 
@@ -259,13 +259,13 @@
 	RECT					rectFS;
 	LONG					styleFS;
 
-	IDirect3D8*				pD3D;
-	IDirect3DDevice8*		pD3DDevice;
-	IDirect3DVertexBuffer8*	pVB;
-	IDirect3DIndexBuffer8*	pIB;
+	IDirect3D9*				pD3D;
+	IDirect3DDevice9*		pD3DDevice;
+	IDirect3DVertexBuffer9*	pVB;
+	IDirect3DIndexBuffer9*	pIB;
 
-	IDirect3DSurface8*	pScreenSurf;
-	IDirect3DSurface8*	pScreenDepth;
+	IDirect3DSurface9*	pScreenSurf;
+	IDirect3DSurface9*	pScreenDepth;
 	CRenderTargetList*	pTargets;
 	CRenderTargetList*	pCurTarget;

	if(nHGEFPS==HGEFPS_VSYNC) { d3dppW.SwapEffect = D3DSWAPEFFECT_COPY; d3dppW.PresentationInterval = D3DPRESENT_INTERVAL_DEFAULT; }
	else					  d3dppW.SwapEffect = D3DSWAPEFFECT_COPY;

	if(nHGEFPS==HGEFPS_VSYNC) { d3dppW.SwapEffect = D3DSWAPEFFECT_COPY; d3dppW.PresentationInterval = D3DPRESENT_INTERVAL_DEFAULT; }
	else					       { d3dppW.SwapEffect = D3DSWAPEFFECT_COPY; d3dppW.PresentationInterval = D3DPRSENT_INTERVAL_IMMEDIATE; }

patch -p0 -i hge_dx9.patch