ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

D3D render window now uses Cxbx icon

This commit is contained in:
Aaron Robinson 2003-03-04 07:05:25 +00:00
parent 2358492724
commit 241c11fb24
12 changed files with 124 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cxbx.dsp
View File

@ -43,7 +43,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MT /W3 /GX /O2 /I "Include" /I "Include/Win32/" /I "Include/Win32/Cxbxkrnl" /I "Include/Win32/Cxbx" /I "Resource" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MT /W3 /GX /O2 /I "Include" /I "Include/Win32/" /I "Include/Win32/Cxbxkrnl" /I "Include/Win32/Cxbx" /I "Resource" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FR /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@ -145,6 +145,10 @@ SOURCE=.\Include\Cxbx.h
# End Source File
# Begin Source File
SOURCE=.\Resource\CxbxRes.h
# End Source File
# Begin Source File
SOURCE=.\Include\Win32\Cxbx\EmuExe.h
# End Source File
# Begin Source File
@ -161,7 +165,7 @@ SOURCE=.\Include\Win32\Cxbx\Prolog.h
# End Source File
# Begin Source File
SOURCE=.\Resource\resource.h
SOURCE=.\Resource\ResCxbx.h
# End Source File
# Begin Source File

2
Cxbx.vcproj
View File

@ -196,7 +196,7 @@ upxCxbx.bat
RelativePath=".\Include\Core\Xbe.h">
</File>
<File
RelativePath=".\Resource\resource.h">
RelativePath=".\Resource\CxbxRes.h">
</File>
</Filter>
<Filter

16
CxbxKrnl.dsp
View File

@ -43,7 +43,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CXBXKRNL_EXPORTS" /YX /FD /c
# ADD CPP /nologo /MT /W3 /GX /O2 /I "Include" /I "Include/Win32/" /I "Include/Win32/Cxbxkrnl" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CXBXKRNL_EXPORTS" /YX /FD /c
# ADD CPP /nologo /MT /W3 /GX /O2 /I "Include" /I "Include/Win32/" /I "Include/Win32/Cxbxkrnl" /I "Resource" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CXBXKRNL_EXPORTS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@ -69,7 +69,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CXBXKRNL_EXPORTS" /YX /FD /GZ /c
# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "Include" /I "Include/Win32/" /I "Include/Win32/Cxbx" /I "Include/Win32/Cxbxkrnl" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CXBXKRNL_EXPORTS" /FR /YX /FD /GZ /c
# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "Include" /I "Include/Win32/" /I "Include/Win32/Cxbx" /I "Include/Win32/Cxbxkrnl" /I "Resource" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CXBXKRNL_EXPORTS" /FR /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@ -168,6 +168,10 @@ SOURCE=.\Include\Win32\CxbxKrnl\OOVPA.h
# End Source File
# Begin Source File
SOURCE=.\Resource\ResCxbxKrnl.h
# End Source File
# Begin Source File
SOURCE=.\Include\Win32\CxbxKrnl\Xapi.1.0.4361.h
# End Source File
# Begin Source File
@ -182,6 +186,10 @@ SOURCE=.\Include\Win32\CxbxKrnl\xntdll.h
# Begin Group "Resource"
# PROP Default_Filter ""
# Begin Source File
SOURCE=.\Resource\CxbxDll.rc
# End Source File
# End Group
# Begin Group "Source"
@ -235,5 +243,9 @@ SOURCE=.\Source\Win32\CxbxKrnl\Xapi.1.0.4361.inl
SOURCE=.\Source\Win32\CxbxKrnl\Xapi.1.0.4627.inl
# End Source File
# End Group
# Begin Source File
SOURCE=.\Resource\Cxbx.ico
# End Source File
# End Target
# End Project

BIN
Resource/Cxbx.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

4
Resource/Cxbx.rc
View File

@ -1,6 +1,6 @@
//Microsoft Developer Studio generated resource script.
//
#include "resource.h"
#include "ResCxbx.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@ -38,7 +38,7 @@ IDI_CXBX ICON DISCARDABLE "Cxbx.ico"
1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
"CxbxRes.h\0"
END
2 TEXTINCLUDE DISCARDABLE

72
Resource/CxbxDll.rc Normal file
View File

@ -0,0 +1,72 @@
//Microsoft Developer Studio generated resource script.
//
#include "ResCxbxDll.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE DISCARDABLE
BEGIN
"ResCxbxDll.h\0"
END
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
BEGIN
"\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_CXBX ICON DISCARDABLE "Cxbx.ico"
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

2
Resource/resource.h → Resource/ResCxbx.h
View File

@ -34,7 +34,7 @@
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 110
#define _APS_NEXT_RESOURCE_VALUE 111
#define _APS_NEXT_COMMAND_VALUE 40041
#define _APS_NEXT_CONTROL_VALUE 1000
#define _APS_NEXT_SYMED_VALUE 103

16
Resource/ResCxbxDll.h Normal file
View File

@ -0,0 +1,16 @@
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by CxbxDll.rc
//
#define IDI_CXBX 101
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 102
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1000
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

6
Source/Win32/Cxbx/Wnd.cpp
View File

@ -34,7 +34,7 @@
#include "Cxbx.h"
#include "Wnd.h"
#include "resource.h"
#include "ResCxbx.h"
// ******************************************************************
// * constructor
@ -71,6 +71,8 @@ bool Wnd::ProcessMessages()
// initialize window
if(!m_initialized)
{
HMODULE hCxbxDll = GetModuleHandle("Cxbx.dll");
m_initialized = true;
WNDCLASS wnd_class;
@ -79,7 +81,7 @@ bool Wnd::ProcessMessages()
wnd_class.lpszClassName = m_classname;
wnd_class.lpfnWndProc = WndProcForward;
wnd_class.style = m_clsstyle;
wnd_class.hIcon = LoadIcon(m_hInstance, MAKEINTRESOURCE(IDI_CXBX));
wnd_class.hIcon = LoadIcon(hCxbxDll, MAKEINTRESOURCE(IDI_CXBX));
wnd_class.hCursor = LoadCursor(NULL, IDC_ARROW);
wnd_class.lpszMenuName = NULL;
wnd_class.cbClsExtra = 0;

2
Source/Win32/Cxbx/WndAbout.cpp
View File

@ -34,7 +34,7 @@
#include "Cxbx.h"
#include "WndAbout.h"
#include "resource.h"
#include "ResCxbx.h"
// ******************************************************************
// * constructor

2
Source/Win32/Cxbx/WndMain.cpp
View File

@ -35,7 +35,7 @@
#include "EmuExe.h"
#include "WndMain.h"
#include "WndAbout.h"
#include "resource.h"
#include "ResCxbx.h"
#include <stdio.h>

8
Source/Win32/CxbxKrnl/EmuXD3D.cpp
View File

@ -40,6 +40,8 @@ namespace win32
#include <process.h>
}
#include "ResCxbxDll.h"
using namespace win32;
// ******************************************************************
@ -67,7 +69,7 @@ VOID xboxkrnl::EmuXInitD3D()
_beginthread(EmuXRenderWindow, 0, NULL);
while(g_EmuXWindow == NULL)
Sleep(10);
Sleep(100);
}
// ******************************************************************
@ -88,13 +90,15 @@ void EmuXRenderWindow(PVOID)
// * register window class
// ******************************************************************
{
HMODULE hCxbxDll = GetModuleHandle("Cxbx.dll");
WNDCLASSEX wc =
{
sizeof(WNDCLASSEX),
CS_CLASSDC,
EmuXMsgProc,
0, 0, GetModuleHandle(NULL),
NULL, LoadCursor(NULL, IDC_ARROW), (HBRUSH)(COLOR_APPWORKSPACE + 1), NULL,
LoadIcon(hCxbxDll, MAKEINTRESOURCE(IDI_CXBX)), LoadCursor(NULL, IDC_ARROW), (HBRUSH)(COLOR_APPWORKSPACE + 1), NULL,
"CxbxRender",
NULL
};