Emulation/Dxbx
1
0
Fork 0
mirror of https://github.com/PatrickvL/Dxbx.git synced 2024-05-16 03:40:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to get XbeExplorer and Dxbx to actually start

Browse source 
There's no more SVN version anymore, so shortcut that for now.
This commit is contained in:
PatrickvL 2016-12-30 11:57:01 +01:00
parent 3bc16443b7
commit bec521d0d5
9 changed files with 173 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -7,4 +7,6 @@
*.map
*.dcu
*.drc
*.dll
*.dll
Source/Delphi/Bin/Dxbx.Ini
Source/Delphi/Bin/Tools/translationchecker.Ini

141
Libraries/Pascal/Jcl/include/jcld20win64.inc Normal file
View file

@ -0,0 +1,141 @@
{**************************************************************************************************}
{ }
{ Project JEDI Code Library (JCL) }
{ }
{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); }
{ you may not use this file except in compliance with the License. You may obtain a copy of the }
{ License at http://www.mozilla.org/MPL/ }
{ }
{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF }
{ ANY KIND, either express or implied. See the License for the specific language governing rights }
{ and limitations under the License. }
{ }
{ The Original Code is jcl.inc }
{ }
{ The Initial Developer of the Original Code is Marcel van Brakel. }
{ Portions created by Marcel van Brakel are Copyright (C) Marcel van Brakel. }
{ }
{ Contributors: }
{ Marcel van Brakel }
{ Matthias Thoma (mthoma) }
{ Petr Vones }
{ Robert Marquardt (marquardt) }
{ Robert Rossmair (rrossmair) }
{ Florent Ouchet (outchy) }
{ }
{**************************************************************************************************}
{ }
{ This include file defines various JCL specific defines. }
{ The more generic JCL defines are defined in jcl.inc and the generic defines in the jedi.inc file }
{ which is shared with the JEDI VCL. }
{ }
{**************************************************************************************************}
{ }
{ This file is filled by the JCL installer, all the changes made in its content will be lost the }
{ next time the JCL is installed. }
{ }
{**************************************************************************************************}
// $Id$
// Math precision selection, mutually exclusive
// FPC does not support EXTENDED when targetting x86_64, MATH_DOUBLE_PRECISION is the default in this situation
{.$DEFINE MATH_EXTENDED_PRECISION} // default
{.$DEFINE MATH_DOUBLE_PRECISION}
{.$DEFINE MATH_SINGLE_PRECISION}
// Math functions takes care of infinites and NaN
{.$DEFINE MATH_EXT_EXTREMEVALUES}
// JclHookExcept support for hooking exceptions from DLLs
{.$DEFINE HOOK_DLL_EXCEPTIONS}
//Threadsafe directive
{.$DEFINE THREADSAFE}
// To exclude obsolete code from compilation, remove the point from the line below
{.$DEFINE DROP_OBSOLETE_CODE}
//Support for JclUnitVersioning.pas, not supported by Delphi 2005 (automatically disabled afterward)
{.$DEFINE UNITVERSIONING}
// debug sources
// defining these symbols will the debug source to be automatically registered
{.$DEFINE DEBUG_NO_BINARY}
{.$DEFINE DEBUG_NO_TD32} // automatically defined for FPC
{.$DEFINE DEBUG_NO_MAP}
{.$DEFINE DEBUG_NO_EXPORTS}
{.$DEFINE DEBUG_NO_SYMBOLS}
// PCRE options, mutually exclusive
// IMPORTANT: The static link works only for Delphi 2005 and newer
// (an internal error is raised on other compilers)
// Only one of the following defines can be defined at a time
// static link: PCRE_STATICLINK
// static dll import: PCRE_LINKDLL
// dynamic dll import: PCRE_LINKONREQUEST
// RTL's RegularExpressionsAPI: PCRE_RTL
{.$DEFINE PCRE_STATICLINK}
{.$DEFINE PCRE_LINKDLL}
{.$DEFINE PCRE_LINKONREQUEST} // default
{.$DEFINE PCRE_RTL} // DXE and newer
// ANSI/UTF8 PCRE
{.$DEFINE PCRE_8}
// UCS2/UTF16 enabled PCRE
{.$DEFINE PCRE_16} // only valid when PCRE_STATICLINK is enabled, the RTL does not support it and the DLL found over the internet are completly outdated.
// use PCRE16 when available rather than good old PCRE8
{.$DEFINE PCRE_PREFER_16}
// BZIP2 options, mutually exclusive
{.$DEFINE BZIP2_STATICLINK} // default
{.$DEFINE BZIP2_LINKDLL}
{.$DEFINE BZIP2_LINKONREQUEST}
// ZLIB options, mutually exclusive
{.$DEFINE ZLIB_STATICLINK} // default
{.$DEFINE ZLIB_LINKDLL}
{.$DEFINE ZLIB_LINKONREQUEST}
{.$DEFINE ZLIB_RTL} // DXE2 and newer only
// Unicode options
// use RTL Character Database rather than JCL one, less accurate but reduce executable size
{.$DEFINE UNICODE_RTL_DATABASE}
// insert a replacement character if sequence is corrupted rather than raising an exception
{.$DEFINE UNICODE_SILENT_FAILURE}
// defines resource compression (uncompressed, compressed with ZLib, compressed with BZip2), mutually exclusive
{.$DEFINE UNICODE_RAW_DATA} // default
{.$DEFINE UNICODE_ZLIB_DATA}
{.$DEFINE UNICODE_BZIP2_DATA}
// container options
// define mapping of TJclStr* containers to TJclAnsiStr* or TJclWideStr* (mutually exclusive)
{.$DEFINE CONTAINER_ANSISTR} // default for D2007 and older
{.$DEFINE CONTAINER_WIDESTR}
{.$DEFINE CONTAINER_UNICODESTR} // default for D2009 and newer, not supported for Delphi 2007 and older
{.$DEFINE CONTAINER_NOSTR}
// 7Zip options, mutually exclusive
// IMPORTANT: The static link is not supported yet
{.$DEFINE 7ZIP_STATICLINK} // not supported yet
{.$DEFINE 7ZIP_LINKDLL}
{.$DEFINE 7ZIP_LINKONREQUEST} // default

3
Projects/Delphi/D20/Dxbx.dpr
View file

@ -124,6 +124,7 @@ var
OnlineVersionString: string;
Url: string;
begin
{ TODO : Get this working under XE6 again :
// Check for internet connection by getting ip from dns
If IAddrToHostName('www.google.com') <> '' then
begin
@ -146,7 +147,7 @@ begin
end;
end;
end;
}
XBEFilePath := ParamStr(2);
if (ParamStr(2) = '/SymbolScanOnly') and (ParamStr(3) <> '') then

17
Projects/Delphi/D20/DxbxKrnl.dproj
View file

@ -31,6 +31,12 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
<Cfg_2_Win32>true</Cfg_2_Win32>
<CfgParent>Cfg_2</CfgParent>
<Cfg_2>true</Cfg_2>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''">
<SanitizedProjectName>DxbxKrnl</SanitizedProjectName>
<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Winapi;Vcl;$(DCC_Namespace)</DCC_Namespace>
@ -73,6 +79,12 @@
<DCC_ObjOutput>..\..\dcu\d11\</DCC_ObjOutput>
<DCC_HppOutput>..\..\dcu\d11\</DCC_HppOutput>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<Debugger_HostApplication>D:\WorkSpaces\Git\Dxbx\Source\Delphi\Bin\Dxbx.exe</Debugger_HostApplication>
<VerInfo_Locale>1033</VerInfo_Locale>
<Manifest_File>None</Manifest_File>
</PropertyGroup>
<ProjectExtensions>
<Borland.Personality>Delphi.Personality.12</Borland.Personality>
<Borland.ProjectType>VCLApplication</Borland.ProjectType>
@ -115,8 +127,9 @@
<Source Name="MainSource">DxbxKrnl.dpr</Source>
</Source>
<Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k100.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\DataExplorerDBXPlugin200.bpl">DBExpress Data Explorer Integration</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k200.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dclofficexp200.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
</Excluded_Packages>
</Delphi.Personality>
<ModelSupport>False</ModelSupport>

3
Projects/Delphi/D20/XBEExplorer.dpr
View file

@ -76,6 +76,7 @@ var
Url: string;
begin
{ TODO : Get this working under XE6 again :
// Check for internet connection by getting ip from dns
If IAddrToHostName('www.google.com') <> '' then
begin
@ -95,7 +96,7 @@ begin
end;
end;
end;
}
Application.Initialize;
Application.MainFormOnTaskbar := True;
Application.CreateForm(TFormXBEExplorer, FormXBEExplorer);

3
Source/Delphi/src/DxbxKrnl/EmuD3D8/uState.pas
View file

@ -463,10 +463,11 @@ begin
else
{$ENDIF}
{$IFDEF DXBX_USE_D3D}
begin
g_pD3DDevice.SetRenderState(PCRenderState, {PCValue=}Result);
{$ENDIF}
{$IFDEF DXBX_USE_D3D9}
end;
{$ENDIF}
end; // Dxbx_SetRenderState
var

2
Source/Delphi/src/uDxbxUtils.pas
View file

@ -315,6 +315,7 @@ begin
if Result > 0 then
Exit;
{$IFDEF USE_SVN}
ResourceStream := TResourceStream.Create(LibModuleList.ResInstance, 'SvnRevision', RT_RCDATA);
try
VerPtr := PAnsiChar(ResourceStream.Memory);
@ -340,6 +341,7 @@ begin
FreeAndNil(ResourceStream);
Result := _SvnRevision;
end;
{$ENDIF}
end;
{$STACKFRAMES OFF}

4
Source/Delphi/src/uLog.pas
View file

@ -656,7 +656,9 @@ begin
SetLogMode(aDebugMode);
WriteLog('Started logging at ' + DateTimeToStr(Now));
WriteLog('Dxbx version ' + _DXBX_VERSION + ' (svn revision ' + IntToStr(SvnRevision) + ')');
WriteLog('Dxbx version ' + _DXBX_VERSION
{$IFDEF USE_SVN} + ' (svn revision ' + IntToStr(SvnRevision) + ')' {$ENDIF}
);
end; // CreateLogs
procedure CloseLogs;

4
Source/Delphi/src/ufrm_About.pas
View file

@ -89,7 +89,9 @@ procedure Tfrm_About.FormCreate(Sender: TObject);
var
JPEGImage: TJPEGImage;
begin
Caption := 'Dxbx version ' + _DXBX_VERSION + ' (svn revision ' + IntToStr(SvnRevision) + ')';
Caption := 'Dxbx version ' + _DXBX_VERSION
{$IFDEF USE_SVN} + ' (svn revision ' + IntToStr(SvnRevision) + ')' {$ENDIF}
;
JPEGImage := GetJPEGResource('About');
Self.Width := JPEGImage.Width;