| Index: Installer/dxgl.nsi |
| — | — | @@ -42,7 +42,13 @@ |
| 43 | 43 | !else
|
| 44 | 44 | !define SRCDIR "Release VS2019"
|
| 45 | 45 | !endif
|
| | 46 | +!else if ${COMPILER} == "VC2005"
|
| | 47 | +!ifdef _DEBUG
|
| | 48 | +!define SRCDIR "VS8\Debug"
|
| 46 | 49 | !else
|
| | 50 | +!define SRCDIR "VS8\Release"
|
| | 51 | +!endif
|
| | 52 | +!else
|
| 47 | 53 | !ifdef _DEBUG
|
| 48 | 54 | !define SRCDIR "Debug"
|
| 49 | 55 | !else
|
| — | — | @@ -94,9 +100,18 @@ |
| 95 | 101 | !define ROOT_KEY ${HKEY_CURRENT_USER}
|
| 96 | 102 | !define GetVersion "Kernel32::GetVersion() i"
|
| 97 | 103 |
|
| 98 | | -!if ${COMPILER} == "VC2010"
|
| | 104 | +!if ${COMPILER} == "VC2005"
|
| 99 | 105 | !define download_runtime 1
|
| 100 | | -!define runtime_url "http://www.dxgl.org/download/runtimes/vc10/vcredist_x86.exe"
|
| | 106 | +!define runtime_url "http://dxgl.org/download/runtimes/vc8-6195/vcredist_x86.EXE"
|
| | 107 | +!define runtime_name "Visual C++ 2005"
|
| | 108 | +!define runtime_filename "vcredist_x86.EXE"
|
| | 109 | +!define runtime_sha512 "E94B077E054BD8992374D359F3ADC4D1D78D42118D878556715D77182F7D03635850B2B2F06C012CCB7C410E2B3C124CF6508473EFE150D3C51A51857CE1C6B0"
|
| | 110 | +!define runtime_regkey SOFTWARE\Microsoft\DevDiv\VC\Servicing\8.0\RED\1033
|
| | 111 | +!define runtime_regvalue Install
|
| | 112 | +!define PRODUCT_SUFFIX "-msvc8"
|
| | 113 | +!else if ${COMPILER} == "VC2010"
|
| | 114 | +!define download_runtime 1
|
| | 115 | +!define runtime_url "http://dxgl.org/download/runtimes/vc10/vcredist_x86.exe"
|
| 101 | 116 | !define runtime_name "Visual C++ 2010"
|
| 102 | 117 | !define runtime_filename "vcredist_x86.exe"
|
| 103 | 118 | !define runtime_sha512 "D2D99E06D49A5990B449CF31D82A33104A6B45164E76FBEB34C43D10BCD25C3622AF52E59A2D4B7F5F45F83C3BA4D23CF1A5FC0C03B3606F42426988E63A9770"
|
| — | — | @@ -105,7 +120,7 @@ |
| 106 | 121 | !define PRODUCT_SUFFIX "-msvc10"
|
| 107 | 122 | !else if ${COMPILER} == "VC2013"
|
| 108 | 123 | !define download_runtime 1
|
| 109 | | -!define runtime_url "http://www.dxgl.org/download/runtimes/vc12/vcredist_x86.exe"
|
| | 124 | +!define runtime_url "http://dxgl.org/download/runtimes/vc12/vcredist_x86.exe"
|
| 110 | 125 | !define runtime_name "Visual C++ 2013"
|
| 111 | 126 | !define runtime_filename "vcredist_x86.exe"
|
| 112 | 127 | !define runtime_sha512 "729251371ED208898430040FE48CABD286A5671BD7F472A30E9021B68F73B2D49D85A0879920232426B139520F7E21321BA92646985216BF2F733C64E014A71D"
|
| — | — | @@ -114,7 +129,7 @@ |
| 115 | 130 | !define PRODUCT_SUFFIX "-msvc12"
|
| 116 | 131 | !else if ${COMPILER} == "VC2019_2"
|
| 117 | 132 | !define download_runtime 1
|
| 118 | | -!define runtime_url http://www.dxgl.org/download/runtimes/vc14.22/vc_redist.x86.exe
|
| | 133 | +!define runtime_url http://dxgl.org/download/runtimes/vc14.22/vc_redist.x86.exe
|
| 119 | 134 | !define runtime_name "Visual C++ 2019.2"
|
| 120 | 135 | !define runtime_filename "vc_redist.x86.exe"
|
| 121 | 136 | !define runtime_sha512 "9E023DD1258B20D3DD29EB3858282D5E99F86DC980BECB044A867A0AA8C5210EEBB426B3F7D574C3E10B58A72436C7E360C644A64F5653F19AD28B9C96ECD183"
|
| — | — | @@ -195,7 +210,11 @@ |
| 196 | 211 | Delete $TEMP\vcredist_x86.exe
|
| 197 | 212 | ${Else}
|
| 198 | 213 | DetailPrint "Installing ${runtime_name} Runtime"
|
| | 214 | + !if ${COMPILER} == "VC2005"
|
| | 215 | + ExecWait '"$TEMP\${runtime_filename}" /q' $0
|
| | 216 | + !else
|
| 199 | 217 | ExecWait '"$TEMP\${runtime_filename}" /q /norestart' $0
|
| | 218 | + !endif
|
| 200 | 219 | ${If} $0 != "0"
|
| 201 | 220 | ${If} $0 == "3010"
|
| 202 | 221 | SetRebootFlag true
|
| — | — | @@ -284,7 +303,7 @@ |
| 285 | 304 | Please visit https://support.microsoft.com/en-us/kb/976932/ for instructions on upgrading to Service Pack 1."
|
| 286 | 305 | Quit
|
| 287 | 306 | ${endif}
|
| 288 | | - !else
|
| | 307 | + !else if ${COMPILER} == "VC2010"
|
| 289 | 308 | ${IfNot} ${AtleastWinXP}
|
| 290 | 309 | MessageBox MB_OK|MB_ICONSTOP "This version of DXGL requires at least Windows XP Service Pack 3."
|
| 291 | 310 | Quit
|
| — | — | @@ -302,6 +321,10 @@ |
| 303 | 322 | Please visit http://web.archive.org/web/20150501080245/https://support.microsoft.com/en-us/kb/889100/ for instructions on upgrading to Service Pack 2."
|
| 304 | 323 | Quit
|
| 305 | 324 | ${EndIf}
|
| | 325 | + !else
|
| | 326 | + ${IfNot} ${AtleastWin2000}
|
| | 327 | + MessageBox MB_OK|MB_ICONEXCLAMATION "This version of DXGL requires at least Windows 2000. You may attempt to install this build anyway however it is not guaranteed to run."
|
| | 328 | + ${EndIf}
|
| 306 | 329 | !endif
|
| 307 | 330 | !ifdef _DEBUG
|
| 308 | 331 | MessageBox MB_OK|MB_ICONEXCLAMATION "This is a debug build of DXGL. It is not meant for regular \
|
| Index: ReadMe.md |
| — | — | @@ -1,102 +1,102 @@ |
| 2 | | -# DXGL 0.5.17
-https://dxgl.org
-
-## Introduction
-DXGL is a free replacement for the Windows ddraw.dll library, running on OpenGL. It is designed to overcome driver bugs, particularly in Windows Vista and newer operating systems. It also adds various enhancements to the graphics output such as display scaling and filtering options. DXGL supports the DirectX 7.0 graphics APIs, however it is currently under development and many programs are not yet compatible with DXGL.
-
-## Updgrade notes
-If you upgrade from DXGL 0.5.8 or earlier, the configuration format will be changed, and earlier versions of DXGL will no longer recognize the profiles.
-In addition, any profiles generated by older versions of DXGL going forward will not be recognized by DXGL 0.5.9 or later.
-If you wish to migrate any old profiles generated after installing DXGL 0.5.9 or later, you will need to use Regedit to delete the "Configuration Version" registry value from the HKEY_CURRENT_USER\SOFTWARE\DXGL registry key to force the upgrade to be run again.
-
-## GitHub Notice
-If you downloaded the DXGL source code from GitHub, please note that when compiling DXGL, the version number will not indicate the revision number. This issue is also present when compiling from a zipped source code distribution from the dxgl.org, www.dxgl.info, or www.williamfeely.info website.
-
-## System Requirements
-
-* Windows Vista (with SP2), 7 (with SP1), 8, 8.1, or 10 (standard build)
-* Windows XP (with SP3), Vista, 7, 8, 8.1, or 10 (legacy build)
- * Also compatible with most versions of Wine, by setting the ddraw DLL override to "native, builtin" which is done automatically at installation.
- * Not compatible with Windows 10 in S mode.
-* OpenGL 2.0 or higher compatible video card
- * Requires support for Framebuffer objects
- * Requires support for hardware accelerated non-power-of-two textures
- * OpenGL 3.2 or higher recommended.
-* The standard build requires a SSE2-capable processor; older processors require the legacy build.
-* For the standard build, Visual C++ 2019 x86 runtime, available at https://aka.ms/vs/16/release/vc_redist.x86.exe (note this link may track visitors) (will be installed if not present)
-* For the legacy build, Visual C++ 2010 x86 runtime, available at https://www.microsoft.com/en-us/download/details.aspx?id=8328 (will be installed if not present)
-
-## Build Requirements
-* For the legacy build, Visual Studio 2010 or Visual C++ 2010 Express Edition with Service Pack 1.
-* For the standard build, Visual Studio 2019, Community or higher.
-* The following components are optional. The build process will ask for these if they do not exist:
- * TortoiseSVN (to fill in revision on SVN builds)
- * HTML Help Workshop (to build help)
- * NSIS (to build installer, requires TortoiseSVN and HTML Help Workshop to succeed)
-
-## Build Instructions
-These instructions assume that you do not have any of the required software installed. If you already have any or all of this software installed and set up, skip those steps.
-
-* Install Visual Studio 2019 Community at https://visualstudio.microsoft.com/
-* Install TortoiseSVN from https://tortoisesvn.net/
-* Install HTML Help Workshop from https://www.microsoft.com/en-us/download/details.aspx?id=21138
-* Install NSIS from https://nsis.sourceforge.io/Main_Page
-* Open the dxgl.sln file, select your build configuration (Debug or Release) in the toolbar, and press F7 to build.
-
-## Progress
-For detailed progress information, please check https://www.williamfeely.info/wiki/DXGL_Features
-What works:
-
-* DirectDraw object creation and destruction (versions 1 to 7)
-* Display mode enumeration and switching (with emulated mode switching)
-* Fullscreen and windowed modes.
-* Basic Blt() functionality
-* 8-bit color emulated with GLSL shader
-* Packed-pixel YUV surfaces (currently only supported by Blt() to an RGB surface)
-
-What partially works:
-
-* 3D graphics are only partially supported.
-* Overlay support is currently in development and not yet enabled.
-
-What doesn't work:
-
-* Many functions are stubbed out and return an error
-
-## Installation
-
-Run the installer. When the installer completes, open DXGL Config and add your program files to the config program.
-To uninstall, go to the Add/Remove Programs or Programs and Features control panel and uninstall.
-
-## SVN
-
-SVN readonly access is available at:
-https://dxgl.org/svn/dxgl/
-Alternate URL at:
-https://dxgl.org:8443/svn/dxgl/
-
-There is a Mediawiki-based SVN log at:
-https://dxgl.org/wiki/Special:Code/DXGL
-
-## AppDB
-
-An AppDB system (similar to that on winehq.org) is now available at:
-https://dxgl.org/appdb/
-
-This requires a user account separate from the other services.
-
-Please note that the AppDB is now deprecated and will be made read-only once the new DXGL Wiki launches.
-
-## Discussion boards
-
-You may discuss DXGL at:
-https://forum.dxgl.info
-
-You must create a forum account to post content. For bug reports, please refer to the next section.
-
-## Bug reports
-
-Bug reports are managed by a Bugzilla system available at:
-https://www.dxgl.info/bugzilla/
-
-A user account needs to be created at this site to post bug reports.
+# DXGL 0.5.17
|
| | 2 | +https://dxgl.org
|
| | 3 | +
|
| | 4 | +## Introduction
|
| | 5 | +DXGL is a free replacement for the Windows ddraw.dll library, running on OpenGL. It is designed to overcome driver bugs, particularly in Windows Vista and newer operating systems. It also adds various enhancements to the graphics output such as display scaling and filtering options. DXGL supports the DirectX 7.0 graphics APIs, however it is currently under development and many programs are not yet compatible with DXGL.
|
| | 6 | +
|
| | 7 | +## Updgrade notes
|
| | 8 | +If you upgrade from DXGL 0.5.8 or earlier, the configuration format will be changed, and earlier versions of DXGL will no longer recognize the profiles.
|
| | 9 | +In addition, any profiles generated by older versions of DXGL going forward will not be recognized by DXGL 0.5.9 or later.
|
| | 10 | +If you wish to migrate any old profiles generated after installing DXGL 0.5.9 or later, you will need to use Regedit to delete the "Configuration Version" registry value from the HKEY_CURRENT_USER\SOFTWARE\DXGL registry key to force the upgrade to be run again.
|
| | 11 | +
|
| | 12 | +## GitHub Notice
|
| | 13 | +If you downloaded the DXGL source code from GitHub, please note that when compiling DXGL, the version number will not indicate the revision number. This issue is also present when compiling from a zipped source code distribution from the dxgl.org, www.dxgl.info, or www.williamfeely.info website.
|
| | 14 | +
|
| | 15 | +## System Requirements
|
| | 16 | +
|
| | 17 | +* Windows Vista (with SP2), 7 (with SP1), 8, 8.1, or 10 (standard build)
|
| | 18 | +* Windows XP (with SP3), Vista, 7, 8, 8.1, or 10 (legacy build)
|
| | 19 | + * Also compatible with most versions of Wine, by setting the ddraw DLL override to "native, builtin" which is done automatically at installation.
|
| | 20 | + * Not compatible with Windows 10 in S mode.
|
| | 21 | +* OpenGL 2.0 or higher compatible video card
|
| | 22 | + * Requires support for Framebuffer objects
|
| | 23 | + * Requires support for hardware accelerated non-power-of-two textures
|
| | 24 | + * OpenGL 3.2 or higher recommended.
|
| | 25 | +* The standard build requires a SSE2-capable processor; older processors require the legacy build.
|
| | 26 | +* For the standard build, Visual C++ 2019 x86 runtime, available at https://aka.ms/vs/16/release/vc_redist.x86.exe (note this link may track visitors) (will be installed if not present)
|
| | 27 | +* For the legacy build, Visual C++ 2010 x86 runtime, available at https://www.microsoft.com/en-us/download/details.aspx?id=8328 (will be installed if not present)
|
| | 28 | +
|
| | 29 | +## Build Requirements
|
| | 30 | +* For the legacy build, Visual Studio 2010 or Visual C++ 2010 Express Edition with Service Pack 1.
|
| | 31 | +* For the standard build, Visual Studio 2019, Community or higher.
|
| | 32 | +* The following components are optional. The build process will ask for these if they do not exist:
|
| | 33 | + * TortoiseSVN (to fill in revision on SVN builds)
|
| | 34 | + * HTML Help Workshop (to build help)
|
| | 35 | + * NSIS (to build installer, requires TortoiseSVN and HTML Help Workshop to succeed)
|
| | 36 | +
|
| | 37 | +## Build Instructions
|
| | 38 | +These instructions assume that you do not have any of the required software installed. If you already have any or all of this software installed and set up, skip those steps.
|
| | 39 | +
|
| | 40 | +* Install Visual Studio 2019 Community at https://visualstudio.microsoft.com/
|
| | 41 | +* Install TortoiseSVN from https://tortoisesvn.net/
|
| | 42 | +* Install HTML Help Workshop from https://www.microsoft.com/en-us/download/details.aspx?id=21138
|
| | 43 | +* Install NSIS from https://nsis.sourceforge.io/Main_Page
|
| | 44 | +* Open the dxgl.sln file, select your build configuration (Debug or Release) in the toolbar, and press F7 to build.
|
| | 45 | +
|
| | 46 | +## Progress
|
| | 47 | +For detailed progress information, please check https://www.williamfeely.info/wiki/DXGL_Features
|
| | 48 | +What works:
|
| | 49 | +
|
| | 50 | +* DirectDraw object creation and destruction (versions 1 to 7)
|
| | 51 | +* Display mode enumeration and switching (with emulated mode switching)
|
| | 52 | +* Fullscreen and windowed modes.
|
| | 53 | +* Basic Blt() functionality
|
| | 54 | +* 8-bit color emulated with GLSL shader
|
| | 55 | +* Packed-pixel YUV surfaces (currently only supported by Blt() to an RGB surface)
|
| | 56 | +
|
| | 57 | +What partially works:
|
| | 58 | +
|
| | 59 | +* 3D graphics are only partially supported.
|
| | 60 | +* Overlay support is currently in development and not yet enabled.
|
| | 61 | +
|
| | 62 | +What doesn't work:
|
| | 63 | +
|
| | 64 | +* Many functions are stubbed out and return an error
|
| | 65 | +
|
| | 66 | +## Installation
|
| | 67 | +
|
| | 68 | +Run the installer. When the installer completes, open DXGL Config and add your program files to the config program.
|
| | 69 | +To uninstall, go to the Add/Remove Programs or Programs and Features control panel and uninstall.
|
| | 70 | +
|
| | 71 | +## SVN
|
| | 72 | +
|
| | 73 | +SVN readonly access is available at:
|
| | 74 | +https://dxgl.org/svn/dxgl/
|
| | 75 | +Alternate URL at:
|
| | 76 | +https://dxgl.org:8443/svn/dxgl/
|
| | 77 | +
|
| | 78 | +There is a Mediawiki-based SVN log at:
|
| | 79 | +https://dxgl.org/wiki/Special:Code/DXGL
|
| | 80 | +
|
| | 81 | +## AppDB
|
| | 82 | +
|
| | 83 | +An AppDB system (similar to that on winehq.org) is now available at:
|
| | 84 | +https://dxgl.org/appdb/
|
| | 85 | +
|
| | 86 | +This requires a user account separate from the other services.
|
| | 87 | +
|
| | 88 | +Please note that the AppDB is now deprecated and will be made read-only once the new DXGL Wiki launches.
|
| | 89 | +
|
| | 90 | +## Discussion boards
|
| | 91 | +
|
| | 92 | +You may discuss DXGL at:
|
| | 93 | +https://forum.dxgl.info
|
| | 94 | +
|
| | 95 | +You must create a forum account to post content. For bug reports, please refer to the next section.
|
| | 96 | +
|
| | 97 | +## Bug reports
|
| | 98 | +
|
| | 99 | +Bug reports are managed by a Bugzilla system available at:
|
| | 100 | +https://www.dxgl.info/bugzilla/
|
| | 101 | +
|
| | 102 | +A user account needs to be created at this site to post bug reports.
|
| Index: buildtool/buildtool.c |
| — | — | @@ -218,7 +218,9 @@ |
| 219 | 219 | if(findptr)
|
| 220 | 220 | {
|
| 221 | 221 | #ifdef _MSC_VER
|
| 222 | | - #if (_MSC_VER == 1600)
|
| | 222 | + #if (_MSC_VER == 1400)
|
| | 223 | + strncpy(findptr, "\"VC2005\"\n", 13);
|
| | 224 | + #elif (_MSC_VER == 1600)
|
| 223 | 225 | strncpy(findptr, "\"VC2010\"\n", 13);
|
| 224 | 226 | #elif (_MSC_VER == 1800)
|
| 225 | 227 | strncpy(findptr, "\"VC2013\"\n", 13);
|
| Index: dxgl-nsis/LibSha512.c |
| — | — | @@ -4,6 +4,7 @@ |
| 5 | 5 | // Implementation of SHA512 hash function.
|
| 6 | 6 | // Original author: Tom St Denis, tomstdenis@gmail.com, http://libtom.org
|
| 7 | 7 | // Modified by WaterJuice retaining Public Domain license.
|
| | 8 | +// Modified by William Feely for the DXGL installer.
|
| 8 | 9 | //
|
| 9 | 10 | // This is free and unencumbered software released into the public domain - June 2013 waterjuice.org
|
| 10 | 11 | ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
| — | — | @@ -13,8 +14,17 @@ |
| 14 | 15 | ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
| 15 | 16 |
|
| 16 | 17 | #include "LibSha512.h"
|
| 17 | | -#include <memory.h>
|
| | 18 | +//#include <memory.h>
|
| 18 | 19 |
|
| | 20 | +// Quick and dirty memcpy
|
| | 21 | +void *__memcpy(unsigned char *dest, unsigned char *src, size_t size)
|
| | 22 | +{
|
| | 23 | + size_t i;
|
| | 24 | + for (i = 0; i < size; i++)
|
| | 25 | + dest[i] = src[i];
|
| | 26 | + return dest;
|
| | 27 | +}
|
| | 28 | +
|
| 19 | 29 | ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
| 20 | 30 | // MACROS
|
| 21 | 31 | ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
| — | — | @@ -203,7 +213,7 @@ |
| 204 | 214 | else
|
| 205 | 215 | {
|
| 206 | 216 | n = MIN( BufferSize, (BLOCK_SIZE - Context->curlen) );
|
| 207 | | - memcpy( Context->buf + Context->curlen, Buffer, (size_t)n );
|
| | 217 | + __memcpy( Context->buf + Context->curlen, Buffer, (size_t)n );
|
| 208 | 218 | Context->curlen += n;
|
| 209 | 219 | Buffer = (uint8_t*)Buffer + n;
|
| 210 | 220 | BufferSize -= n;
|
| Index: dxgl-nsis/dxgl-nsis.c |
| — | — | @@ -12,16 +12,22 @@ |
| 13 | 13 | #include "LibSha512.h"
|
| 14 | 14 | #include "pluginapi.h"
|
| 15 | 15 | #include <intrin.h>
|
| 16 | | -#ifdef _MSC_VER
|
| 17 | | -#if (_MSC_VER < 1500)
|
| 18 | | -#pragma function (memcpy)
|
| 19 | | -#pragma function (memcmp)
|
| 20 | | -#endif
|
| 21 | | -#endif
|
| 22 | 16 | #ifndef _TCHAR_DEFINED
|
| 23 | 17 | #include <tchar.h>
|
| 24 | 18 | #endif
|
| 25 | 19 |
|
| | 20 | +// Quick and dirty memcmp
|
| | 21 | +int __memcmp(unsigned char *ptr1, unsigned char *ptr2, size_t size)
|
| | 22 | +{
|
| | 23 | + size_t i;
|
| | 24 | + for (i = 0; i < size; i++)
|
| | 25 | + {
|
| | 26 | + if (ptr1[i] < ptr2[i]) return -1;
|
| | 27 | + if (ptr1[i] > ptr2[i]) return 1;
|
| | 28 | + }
|
| | 29 | + return 0;
|
| | 30 | +}
|
| | 31 | +
|
| 26 | 32 | BOOL WINAPI DllMain(HINSTANCE hInst, ULONG ul_reason_for_call, LPVOID lpReserved)
|
| 27 | 33 | {
|
| 28 | 34 | return TRUE;
|
| — | — | @@ -51,7 +57,7 @@ |
| 52 | 58 | popstring(filename);
|
| 53 | 59 | popstring(comp);
|
| 54 | 60 | Sha512Initialise(&context);
|
| 55 | | - file = CreateFile(filename, GENERIC_READ, FILE_SHARE_READ, NULL,
|
| | 61 | + file = CreateFileA(filename, GENERIC_READ, FILE_SHARE_READ, NULL,
|
| 56 | 62 | OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
|
| 57 | 63 | if (!file)
|
| 58 | 64 | {
|
| — | — | @@ -76,7 +82,7 @@ |
| 77 | 83 | buffer[(i * 2) + 1] = hexdigit(sha512.bytes[i] & 0xF);
|
| 78 | 84 | }
|
| 79 | 85 | buffer[512 / 4] = 0;
|
| 80 | | - compout = memcmp(buffer, comp, 128);
|
| | 86 | + compout = __memcmp(buffer, comp, 128);
|
| 81 | 87 | if (compout)
|
| 82 | 88 | {
|
| 83 | 89 | filename[0] = '0';
|
| — | — | @@ -128,28 +134,6 @@ |
| 129 | 135 | pushstring(out);
|
| 130 | 136 | }
|
| 131 | 137 |
|
| 132 | | -// Quick and dirty memcpy
|
| 133 | | -void *memcpy(unsigned char *dest, unsigned char *src, size_t size)
|
| 134 | | -{
|
| 135 | | - size_t i;
|
| 136 | | - for (i = 0; i < size; i++)
|
| 137 | | - dest[i] = src[i];
|
| 138 | | - return dest;
|
| 139 | | -}
|
| 140 | | -
|
| 141 | | -// Quick and dirty memcmp
|
| 142 | | -int memcmp(unsigned char *ptr1, unsigned char *ptr2, size_t size)
|
| 143 | | -{
|
| 144 | | - size_t i;
|
| 145 | | - for (i = 0; i < size; i++)
|
| 146 | | - {
|
| 147 | | - if (ptr1[i] < ptr2[i]) return -1;
|
| 148 | | - if (ptr1[i] > ptr2[i]) return 1;
|
| 149 | | - }
|
| 150 | | - return 0;
|
| 151 | | -}
|
| 152 | | -
|
| 153 | | -
|
| 154 | 138 | // ASM shift instructions to replace MSVC dependency
|
| 155 | 139 | #ifndef _M_X64
|
| 156 | 140 | void __declspec(naked) _aullshr()
|
| Index: vs8/Help/Help.vcproj |
| — | — | @@ -0,0 +1,73 @@ |
| | 2 | +<?xml version="1.0" encoding="Windows-1252"?>
|
| | 3 | +<VisualStudioProject
|
| | 4 | + ProjectType="Visual C++"
|
| | 5 | + Version="8.00"
|
| | 6 | + Name="Help"
|
| | 7 | + ProjectGUID="{553FB154-8522-4407-B5F5-9088D0F9B5FC}"
|
| | 8 | + RootNamespace="Help"
|
| | 9 | + >
|
| | 10 | + <Platforms>
|
| | 11 | + <Platform
|
| | 12 | + Name="Win32"
|
| | 13 | + />
|
| | 14 | + </Platforms>
|
| | 15 | + <ToolFiles>
|
| | 16 | + </ToolFiles>
|
| | 17 | + <Configurations>
|
| | 18 | + <Configuration
|
| | 19 | + Name="Debug|Win32"
|
| | 20 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)"
|
| | 21 | + IntermediateDirectory="$(ConfigurationName)"
|
| | 22 | + ConfigurationType="10"
|
| | 23 | + CharacterSet="2"
|
| | 24 | + >
|
| | 25 | + <Tool
|
| | 26 | + Name="VCPreBuildEventTool"
|
| | 27 | + />
|
| | 28 | + <Tool
|
| | 29 | + Name="VCCustomBuildTool"
|
| | 30 | + />
|
| | 31 | + <Tool
|
| | 32 | + Name="VCMIDLTool"
|
| | 33 | + />
|
| | 34 | + <Tool
|
| | 35 | + Name="VCPostBuildEventTool"
|
| | 36 | + Description="Building help..."
|
| | 37 | + CommandLine=""$(OutDir)\buildtool.exe" makehelp "$(ProjectDir)..\..\Help\dxgl.hhp""
|
| | 38 | + />
|
| | 39 | + </Configuration>
|
| | 40 | + <Configuration
|
| | 41 | + Name="Release|Win32"
|
| | 42 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)"
|
| | 43 | + IntermediateDirectory="$(ConfigurationName)"
|
| | 44 | + ConfigurationType="10"
|
| | 45 | + CharacterSet="2"
|
| | 46 | + WholeProgramOptimization="1"
|
| | 47 | + >
|
| | 48 | + <Tool
|
| | 49 | + Name="VCPreBuildEventTool"
|
| | 50 | + />
|
| | 51 | + <Tool
|
| | 52 | + Name="VCCustomBuildTool"
|
| | 53 | + />
|
| | 54 | + <Tool
|
| | 55 | + Name="VCMIDLTool"
|
| | 56 | + />
|
| | 57 | + <Tool
|
| | 58 | + Name="VCPostBuildEventTool"
|
| | 59 | + Description="Building help..."
|
| | 60 | + CommandLine=""$(OutDir)\buildtool.exe" makehelp $(ProjectDir)..\..\Help\dxgl.hhp"
|
| | 61 | + />
|
| | 62 | + </Configuration>
|
| | 63 | + </Configurations>
|
| | 64 | + <References>
|
| | 65 | + </References>
|
| | 66 | + <Files>
|
| | 67 | + <File
|
| | 68 | + RelativePath="..\..\Help\dxgl.hhp"
|
| | 69 | + >
|
| | 70 | + </File>
|
| | 71 | + </Files>
|
| | 72 | + <Globals>
|
| | 73 | + </Globals>
|
| | 74 | +</VisualStudioProject>
|
| Index: vs8/Help |
| Property changes on: vs8/Help |
| ___________________________________________________________________ |
| Added: svn:ignore |
| ## -0,0 +1,3 ## |
| | 75 | +Debug |
| | 76 | +Release |
| | 77 | +*.user |
| Index: vs8/Installer/Installer.vcproj |
| — | — | @@ -0,0 +1,73 @@ |
| | 2 | +<?xml version="1.0" encoding="Windows-1252"?>
|
| | 3 | +<VisualStudioProject
|
| | 4 | + ProjectType="Visual C++"
|
| | 5 | + Version="8.00"
|
| | 6 | + Name="Installer"
|
| | 7 | + ProjectGUID="{52CF5216-7B55-4D3F-835D-6F598C33F637}"
|
| | 8 | + RootNamespace="Installer"
|
| | 9 | + >
|
| | 10 | + <Platforms>
|
| | 11 | + <Platform
|
| | 12 | + Name="Win32"
|
| | 13 | + />
|
| | 14 | + </Platforms>
|
| | 15 | + <ToolFiles>
|
| | 16 | + </ToolFiles>
|
| | 17 | + <Configurations>
|
| | 18 | + <Configuration
|
| | 19 | + Name="Debug|Win32"
|
| | 20 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)"
|
| | 21 | + IntermediateDirectory="$(ConfigurationName)"
|
| | 22 | + ConfigurationType="10"
|
| | 23 | + CharacterSet="2"
|
| | 24 | + >
|
| | 25 | + <Tool
|
| | 26 | + Name="VCPreBuildEventTool"
|
| | 27 | + />
|
| | 28 | + <Tool
|
| | 29 | + Name="VCCustomBuildTool"
|
| | 30 | + />
|
| | 31 | + <Tool
|
| | 32 | + Name="VCMIDLTool"
|
| | 33 | + />
|
| | 34 | + <Tool
|
| | 35 | + Name="VCPostBuildEventTool"
|
| | 36 | + Description="Building installer..."
|
| | 37 | + CommandLine=""$(OutDir)\buildtool.exe" makeinstaller "$(ProjectDir)..\..\Installer\dxgl.nsi""
|
| | 38 | + />
|
| | 39 | + </Configuration>
|
| | 40 | + <Configuration
|
| | 41 | + Name="Release|Win32"
|
| | 42 | + OutputDirectory="$(SolutionDir)$(ConfigurationName)"
|
| | 43 | + IntermediateDirectory="$(ConfigurationName)"
|
| | 44 | + ConfigurationType="10"
|
| | 45 | + CharacterSet="2"
|
| | 46 | + WholeProgramOptimization="1"
|
| | 47 | + >
|
| | 48 | + <Tool
|
| | 49 | + Name="VCPreBuildEventTool"
|
| | 50 | + />
|
| | 51 | + <Tool
|
| | 52 | + Name="VCCustomBuildTool"
|
| | 53 | + />
|
| | 54 | + <Tool
|
| | 55 | + Name="VCMIDLTool"
|
| | 56 | + />
|
| | 57 | + <Tool
|
| | 58 | + Name="VCPostBuildEventTool"
|
| | 59 | + Description="Building installer..."
|
| | 60 | + CommandLine=""$(OutDir)\buildtool.exe" makeinstaller "$(ProjectDir)..\..\Installer\dxgl.nsi""
|
| | 61 | + />
|
| | 62 | + </Configuration>
|
| | 63 | + </Configurations>
|
| | 64 | + <References>
|
| | 65 | + </References>
|
| | 66 | + <Files>
|
| | 67 | + <File
|
| | 68 | + RelativePath="..\..\Installer\dxgl.nsi"
|
| | 69 | + >
|
| | 70 | + </File>
|
| | 71 | + </Files>
|
| | 72 | + <Globals>
|
| | 73 | + </Globals>
|
| | 74 | +</VisualStudioProject>
|
| Index: vs8/Installer |
| Property changes on: vs8/Installer |
| ___________________________________________________________________ |
| Added: svn:ignore |
| ## -0,0 +1,3 ## |
| | 75 | +*.user |
| | 76 | +Debug |
| | 77 | +Release |
| Index: vs8/buildtool/buildtool.vcproj |
| — | — | @@ -61,7 +61,7 @@ |
| 62 | 62 | />
|
| 63 | 63 | <Tool
|
| 64 | 64 | Name="VCLinkerTool"
|
| 65 | | - LinkIncremental="2"
|
| | 65 | + LinkIncremental="1"
|
| 66 | 66 | GenerateDebugInformation="true"
|
| 67 | 67 | SubSystem="1"
|
| 68 | 68 | TargetMachine="1"
|
| Index: vs8/dxgl-nsis/dxgl-nsis.vcproj |
| — | — | @@ -120,6 +120,8 @@ |
| 121 | 121 | />
|
| 122 | 122 | <Tool
|
| 123 | 123 | Name="VCCLCompilerTool"
|
| | 124 | + Optimization="1"
|
| | 125 | + FavorSizeOrSpeed="2"
|
| 124 | 126 | WholeProgramOptimization="false"
|
| 125 | 127 | PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DXGLNSIS_EXPORTS"
|
| 126 | 128 | RuntimeLibrary="2"
|
| Index: vs8/dxgl-vs8.sln |
| — | — | @@ -27,6 +27,20 @@ |
| 28 | 28 | EndProject
|
| 29 | 29 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dxgl-nsis", "dxgl-nsis\dxgl-nsis.vcproj", "{EBF0828E-7C19-4FEF-BFF8-41035FA17C71}"
|
| 30 | 30 | EndProject
|
| | 31 | +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Help", "Help\Help.vcproj", "{553FB154-8522-4407-B5F5-9088D0F9B5FC}"
|
| | 32 | + ProjectSection(ProjectDependencies) = postProject
|
| | 33 | + {7DC34E0D-7AFF-4282-9F18-81FD29C290D0} = {7DC34E0D-7AFF-4282-9F18-81FD29C290D0}
|
| | 34 | + EndProjectSection
|
| | 35 | +EndProject
|
| | 36 | +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Installer", "Installer\Installer.vcproj", "{52CF5216-7B55-4D3F-835D-6F598C33F637}"
|
| | 37 | + ProjectSection(ProjectDependencies) = postProject
|
| | 38 | + {7DC34E0D-7AFF-4282-9F18-81FD29C290D0} = {7DC34E0D-7AFF-4282-9F18-81FD29C290D0}
|
| | 39 | + {553FB154-8522-4407-B5F5-9088D0F9B5FC} = {553FB154-8522-4407-B5F5-9088D0F9B5FC}
|
| | 40 | + {EBF0828E-7C19-4FEF-BFF8-41035FA17C71} = {EBF0828E-7C19-4FEF-BFF8-41035FA17C71}
|
| | 41 | + {8A6EAE90-2389-4211-B10F-57C7CADC7FA1} = {8A6EAE90-2389-4211-B10F-57C7CADC7FA1}
|
| | 42 | + {3AB68EF6-DA0B-4B6D-A749-08F945F63424} = {3AB68EF6-DA0B-4B6D-A749-08F945F63424}
|
| | 43 | + EndProjectSection
|
| | 44 | +EndProject
|
| 31 | 45 | Global
|
| 32 | 46 | GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
| 33 | 47 | Debug No DXGL|Win32 = Debug No DXGL|Win32
|
| — | — | @@ -76,6 +90,18 @@ |
| 77 | 91 | {EBF0828E-7C19-4FEF-BFF8-41035FA17C71}.Debug|Win32.Build.0 = Debug|Win32
|
| 78 | 92 | {EBF0828E-7C19-4FEF-BFF8-41035FA17C71}.Release|Win32.ActiveCfg = Release|Win32
|
| 79 | 93 | {EBF0828E-7C19-4FEF-BFF8-41035FA17C71}.Release|Win32.Build.0 = Release|Win32
|
| | 94 | + {553FB154-8522-4407-B5F5-9088D0F9B5FC}.Debug No DXGL|Win32.ActiveCfg = Debug|Win32
|
| | 95 | + {553FB154-8522-4407-B5F5-9088D0F9B5FC}.Debug No DXGL|Win32.Build.0 = Debug|Win32
|
| | 96 | + {553FB154-8522-4407-B5F5-9088D0F9B5FC}.Debug|Win32.ActiveCfg = Debug|Win32
|
| | 97 | + {553FB154-8522-4407-B5F5-9088D0F9B5FC}.Debug|Win32.Build.0 = Debug|Win32
|
| | 98 | + {553FB154-8522-4407-B5F5-9088D0F9B5FC}.Release|Win32.ActiveCfg = Release|Win32
|
| | 99 | + {553FB154-8522-4407-B5F5-9088D0F9B5FC}.Release|Win32.Build.0 = Release|Win32
|
| | 100 | + {52CF5216-7B55-4D3F-835D-6F598C33F637}.Debug No DXGL|Win32.ActiveCfg = Debug|Win32
|
| | 101 | + {52CF5216-7B55-4D3F-835D-6F598C33F637}.Debug No DXGL|Win32.Build.0 = Debug|Win32
|
| | 102 | + {52CF5216-7B55-4D3F-835D-6F598C33F637}.Debug|Win32.ActiveCfg = Debug|Win32
|
| | 103 | + {52CF5216-7B55-4D3F-835D-6F598C33F637}.Debug|Win32.Build.0 = Debug|Win32
|
| | 104 | + {52CF5216-7B55-4D3F-835D-6F598C33F637}.Release|Win32.ActiveCfg = Release|Win32
|
| | 105 | + {52CF5216-7B55-4D3F-835D-6F598C33F637}.Release|Win32.Build.0 = Release|Win32
|
| 80 | 106 | EndGlobalSection
|
| 81 | 107 | GlobalSection(SolutionProperties) = preSolution
|
| 82 | 108 | HideSolutionNode = FALSE
|