From 8afe4931806cda7501e517ff569aa0e22a456ce2 Mon Sep 17 00:00:00 2001
From: Aaron Robinson <caustik@caustik.com>
Date: Fri, 21 Feb 2003 20:33:21 +0000
Subject: [PATCH] HLE (D3D)

---
 Doc/Changelog.txt                 | 7 +++++++
 Doc/Todo.txt                      | 3 ---
 Include/Cxbx.h                    | 2 +-
 Source/Win32/Cxbx/WndAbout.cpp    | 2 +-
 Source/Win32/CxbxKrnl/EmuXD3D.cpp | 4 +++-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Doc/Changelog.txt b/Doc/Changelog.txt
index 30dfe68fe..08351ff2d 100644
--- a/Doc/Changelog.txt
+++ b/Doc/Changelog.txt
@@ -1,5 +1,12 @@
 cxbx website: http://www.caustik.com/xbox/
 
+version: 0.6.0-pre12 (02/??/03)
+--------------------------------
+
+- HLE has advanced to intercepting Direct3D and
+  Xapilib calls. A simple Xbox app built with a
+  1.0.4361 XDK has been shown to work.
+
 version: 0.6.0-pre11 (02/09/03)
 --------------------------------
 
diff --git a/Doc/Todo.txt b/Doc/Todo.txt
index 94a7cf9c9..b7b74c844 100644
--- a/Doc/Todo.txt
+++ b/Doc/Todo.txt
@@ -1,8 +1,5 @@
 Cxbx Todo:
 
-  Direct3DCreate returns 1, so Direct3DCreate must be called before
-  an xbe has a chance to attempt to use this IDirect3D8 interface.
-
   Recent files (for .exe and .xbe) in menu. (Use registry)
 
   Attempt to add compatibility with ME by using LLDT assembly. This
diff --git a/Include/Cxbx.h b/Include/Cxbx.h
index f530ebd95..2959b3ebf 100644
--- a/Include/Cxbx.h
+++ b/Include/Cxbx.h
@@ -52,7 +52,7 @@ typedef signed long    sint32;
 // ******************************************************************
 // * Version Information
 // ******************************************************************
-#define CXBX_VERSION "0.6.0-pre11"
+#define CXBX_VERSION "0.6.0-pre12"
 
 // ******************************************************************
 // * Define this to trace intercepted function calls
diff --git a/Source/Win32/Cxbx/WndAbout.cpp b/Source/Win32/Cxbx/WndAbout.cpp
index d1e53af17..13feaf7be 100644
--- a/Source/Win32/Cxbx/WndAbout.cpp
+++ b/Source/Win32/Cxbx/WndAbout.cpp
@@ -42,7 +42,7 @@
 WndAbout::WndAbout(HINSTANCE x_hInstance, HWND x_parent) : Wnd(x_hInstance)
 {
     m_classname = "WndAbout";
-    m_wndname   = "Cxbx - About";
+    m_wndname   = "Cxbx : About";
 
     m_w         = 285;
     m_h         = 180;
diff --git a/Source/Win32/CxbxKrnl/EmuXD3D.cpp b/Source/Win32/CxbxKrnl/EmuXD3D.cpp
index 6f6fc548f..e3c36e6a9 100644
--- a/Source/Win32/CxbxKrnl/EmuXD3D.cpp
+++ b/Source/Win32/CxbxKrnl/EmuXD3D.cpp
@@ -108,7 +108,7 @@ void EmuXRenderWindow(PVOID)
     {
         g_EmuXWindow = CreateWindow
         (
-            "CxbxRender", "Cxbx : Rendering Window",
+            "CxbxRender", "Cxbx : Xbox Emulator",
             WS_OVERLAPPEDWINDOW, 100, 100, 640, 480,
             GetDesktopWindow(), NULL, GetModuleHandle(NULL), NULL
         );
@@ -278,6 +278,8 @@ HRESULT WINAPI xboxkrnl::EmuXIDirect3DDevice8_Clear
     // * make adjustments to parameters to make sense with windows d3d
     // ******************************************************************
     {
+        // TODO: D3DCLEAR_TARGET_A, *R, *G, *B don't exist on windows
+
         // Tricky MS randomizing .h #defines :[
         {
             DWORD newFlags = 0;