diff --git a/Include/dxwnd.h b/Include/dxwnd.h index 3750970..89a7e81 100644 --- a/Include/dxwnd.h +++ b/Include/dxwnd.h @@ -150,6 +150,11 @@ #define DIABLOTWEAK 0x00000001 // ... ??? ... #define CLEARTARGET 0x00000002 // forces a D3D clean on target surface upon each BeginScene invocation #define NOWINPOSCHANGES 0x00000004 // suppress WM_WINDOWPOSCHANGING/CHANGED messages (RollerCoaster Tycoon...) +#define SYSTEMMEMORY 0x00000008 // forces usage of DDSCAPS_SYSTEMMEMORY capability on front & backbuffer surfaces +#define NOBLT 0x00000010 // suppress blit to primary surface +#define DOSTRETCHBLT 0x00000020 // use StretchBlt to primary surface +#define DOFASTBLT 0x00000040 // use FastBlt to primary surface +#define AEROBOOST 0x00000080 // Optimize for AERO environment: set DOSTRETCHBLT + SYSTEMMEMORY // logging Tflags DWORD: #define OUTTRACE 0x00000001 // enables tracing to dxwnd.log in general diff --git a/build/Resources_CN.dll b/build/Resources_CN.dll index 66e1a84..2a0a9b0 100644 --- a/build/Resources_CN.dll +++ b/build/Resources_CN.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f36243fc0a79cc06da0eabc3ad0dbbba323cab01cc95b70fa540816916dea6b1 +oid sha256:5d35410b205f27b7d0447ec515ce1e5206dd29e67c080744e352b15bfc3bd2bb size 132096 diff --git a/build/Resources_EN.dll b/build/Resources_EN.dll index 916db98..2662524 100644 --- a/build/Resources_EN.dll +++ b/build/Resources_EN.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f047139ee7bc1d209f9b2599241fe377c89f9989073e992d65e02f4bb9d5494 -size 137216 +oid sha256:5a0dc4ed7afe922e53af8aa3eb554e1dc91848b05b0d42ded1aff037f4ff38ad +size 137728 diff --git a/build/Resources_IT.dll b/build/Resources_IT.dll index 56e6b37..a0df481 100644 --- a/build/Resources_IT.dll +++ b/build/Resources_IT.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1baec6b508045a54e6151d95ca9ff4ffdeaecb2ea1343cf9991fbbeb29ab32a8 -size 138240 +oid sha256:775ca5f29d0af8b8b9fbf8592148248a64d371fd211475d6205b84801451b029 +size 138752 diff --git a/build/dxwnd.dll b/build/dxwnd.dll index 4cbdc5d..2b107c0 100644 --- a/build/dxwnd.dll +++ b/build/dxwnd.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e1df66d52d976424de5364bad0b810090c3affd24cc462adbbeef4040b248dd -size 505344 +oid sha256:5c88b48ffa3289a31b2b1297c3d42d787145913b6224797d744ae7558a346ab6 +size 506368 diff --git a/build/dxwnd.exe b/build/dxwnd.exe index aae76ff..c0a3a1e 100644 --- a/build/dxwnd.exe +++ b/build/dxwnd.exe @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11ae95eda684d03d69c0855221d6b75795eae8bbc8e2384b0519880904198162 -size 557568 +oid sha256:3422d3b5f715371e64e4d5fa4db1455eb6418fbdf6ac97e717e6f68f4b26d6d2 +size 558080 diff --git a/build/dxwnd.ini b/build/dxwnd.ini index d259038..6d3eed6 100644 --- a/build/dxwnd.ini +++ b/build/dxwnd.ini @@ -1,6 +1,6 @@ [window] -posx=50 -posy=50 +posx=1236 +posy=678 sizx=320 sizy=200 lang=automatic diff --git a/build/exports/Bard's Tale, the.dxw b/build/exports/Bard's Tale, the.dxw new file mode 100644 index 0000000..d125848 --- /dev/null +++ b/build/exports/Bard's Tale, the.dxw @@ -0,0 +1,27 @@ +[target] +title0=Bard's Tale, the +path0=D:\Games\The Bard's Tale\The Bard's Tale.exe +launchpath0= +module0= +opengllib0= +ver0=9 +coord0=0 +flag0=134218272 +flagg0=1207959552 +flagh0=16 +flagi0=138412036 +tflag0=0 +initx0=0 +inity0=0 +minx0=0 +miny0=0 +maxx0=0 +maxy0=0 +posx0=50 +posy0=50 +sizx0=800 +sizy0=600 +maxfps0=0 +initts0=0 +winver0=0 +maxres0=-1 diff --git a/build/exports/Bunnies must die.dxw b/build/exports/Bunnies must die.dxw new file mode 100644 index 0000000..03f2589 --- /dev/null +++ b/build/exports/Bunnies must die.dxw @@ -0,0 +1,27 @@ +[target] +title0=Bunnies must die +path0=D:\Games\Bunnies must die\bmd.exe +launchpath0= +module0= +opengllib0= +ver0=1 +coord0=0 +flag0=150994976 +flagg0=134217728 +flagh0=20 +flagi0=205520900 +tflag0=0 +initx0=0 +inity0=0 +minx0=0 +miny0=0 +maxx0=0 +maxy0=0 +posx0=50 +posy0=50 +sizx0=800 +sizy0=600 +maxfps0=0 +initts0=0 +winver0=0 +maxres0=-1 diff --git a/build/exports/Call Of Cthulhu DCotE.dxw b/build/exports/Call Of Cthulhu DCotE.dxw new file mode 100644 index 0000000..bae262e --- /dev/null +++ b/build/exports/Call Of Cthulhu DCotE.dxw @@ -0,0 +1,27 @@ +[target] +title0=Call Of Cthulhu DCotE +path0=D:\Games\Call Of Cthulhu\Engine\CoCMainWin32.exe +launchpath0= +module0= +opengllib0= +ver0=0 +coord0=0 +flag0=134218272 +flagg0=134217728 +flagh0=20 +flagi0=4194304 +tflag0=6402 +initx0=0 +inity0=0 +minx0=0 +miny0=0 +maxx0=0 +maxy0=0 +posx0=50 +posy0=50 +sizx0=800 +sizy0=600 +maxfps0=0 +initts0=-5 +winver0=0 +maxres0=-1 diff --git a/build/exports/Colin McRae Rally 2.0.dxw b/build/exports/Colin McRae Rally 2.0.dxw new file mode 100644 index 0000000..377decb --- /dev/null +++ b/build/exports/Colin McRae Rally 2.0.dxw @@ -0,0 +1,27 @@ +[target] +title0=Colin McRae Rally 2.0 +path0=D:\Games\MVM 2004 - Colin McRae Rally 2.0\CMR2.exe +launchpath0= +module0= +opengllib0= +ver0=0 +coord0=0 +flag0=134217760 +flagg0=1207959552 +flagh0=20 +flagi0=138412036 +tflag0=0 +initx0=0 +inity0=0 +minx0=0 +miny0=0 +maxx0=0 +maxy0=0 +posx0=50 +posy0=50 +sizx0=800 +sizy0=600 +maxfps0=0 +initts0=0 +winver0=0 +maxres0=-1 diff --git a/build/exports/Croc - Legend of the Gobbos.dxw b/build/exports/Croc - Legend of the Gobbos.dxw new file mode 100644 index 0000000..752e1bd --- /dev/null +++ b/build/exports/Croc - Legend of the Gobbos.dxw @@ -0,0 +1,27 @@ +[target] +title0=Croc - Legend of the Gobbos +path0=D:\Games\Croc\croc.exe +launchpath0= +module0= +opengllib0= +ver0=0 +coord0=0 +flag0=134218272 +flagg0=1207959552 +flagh0=20 +flagi0=138412036 +tflag0=0 +initx0=0 +inity0=0 +minx0=0 +miny0=0 +maxx0=0 +maxy0=0 +posx0=50 +posy0=50 +sizx0=800 +sizy0=600 +maxfps0=0 +initts0=0 +winver0=0 +maxres0=-1 diff --git a/build/exports/Croc 2.dxw b/build/exports/Croc 2.dxw new file mode 100644 index 0000000..b23006d --- /dev/null +++ b/build/exports/Croc 2.dxw @@ -0,0 +1,27 @@ +[target] +title0=Croc 2 +path0=D:\Games\Croc 2\Croc2.exe +launchpath0= +module0= +opengllib0= +ver0=0 +coord0=0 +flag0=134218272 +flagg0=1207959552 +flagh0=20 +flagi0=134217732 +tflag0=0 +initx0=0 +inity0=0 +minx0=0 +miny0=0 +maxx0=0 +maxy0=0 +posx0=50 +posy0=50 +sizx0=800 +sizy0=600 +maxfps0=0 +initts0=0 +winver0=0 +maxres0=-1 diff --git a/build/exports/LEGO Star Wars - The Complete Saga.dxw b/build/exports/LEGO Star Wars - The Complete Saga.dxw new file mode 100644 index 0000000..968a7f4 --- /dev/null +++ b/build/exports/LEGO Star Wars - The Complete Saga.dxw @@ -0,0 +1,27 @@ +[target] +title0=LEGO Star Wars - The Complete Saga +path0=D:\Games\LEGO Star Wars - The Complete Saga\LEGOStarWarsSaga.exe +launchpath0= +module0= +opengllib0= +ver0=0 +coord0=0 +flag0=134218272 +flagg0=1207959552 +flagh0=20 +flagi0=138412036 +tflag0=6402 +initx0=0 +inity0=0 +minx0=0 +miny0=0 +maxx0=0 +maxy0=0 +posx0=50 +posy0=50 +sizx0=800 +sizy0=600 +maxfps0=0 +initts0=0 +winver0=0 +maxres0=-1 diff --git a/build/exports/Legacy of Kain Soul Reaver 2.dxw b/build/exports/Legacy of Kain Soul Reaver 2.dxw new file mode 100644 index 0000000..6580948 --- /dev/null +++ b/build/exports/Legacy of Kain Soul Reaver 2.dxw @@ -0,0 +1,27 @@ +[target] +title0=Legacy of Kain Soul Reaver 2 +path0=D:\Games\Legacy of Kain Soul Reaver 2\sr2.exe +launchpath0= +module0= +opengllib0= +ver0=8 +coord0=0 +flag0=134218288 +flagg0=1207959552 +flagh0=20 +flagi0=138412036 +tflag0=0 +initx0=0 +inity0=0 +minx0=0 +miny0=0 +maxx0=0 +maxy0=0 +posx0=50 +posy0=50 +sizx0=800 +sizy0=600 +maxfps0=0 +initts0=0 +winver0=0 +maxres0=-1 diff --git a/build/exports/Madden NFL 08.dxw b/build/exports/Madden NFL 08.dxw new file mode 100644 index 0000000..f9a07f9 --- /dev/null +++ b/build/exports/Madden NFL 08.dxw @@ -0,0 +1,28 @@ +[target] +title0=Madden NFL 08 +path0=D:\Games\Madden NFL 08\mainapp.exe +launchpath0= +module0= +opengllib0= +ver0=9 +coord0=0 +flag0=134218272 +flagg0=1207959808 +flagh0=20 +flagi0=205520900 +flagj0=0 +tflag0=0 +initx0=0 +inity0=0 +minx0=0 +miny0=0 +maxx0=0 +maxy0=0 +posx0=50 +posy0=50 +sizx0=800 +sizy0=600 +maxfps0=0 +initts0=0 +winver0=0 +maxres0=-1 diff --git a/build/exports/NHL 99.dxw b/build/exports/NHL 99.dxw new file mode 100644 index 0000000..738b8c3 --- /dev/null +++ b/build/exports/NHL 99.dxw @@ -0,0 +1,28 @@ +[target] +title0=NHL 99 +path0=D:\Games\NHL99_RIP\nhl99.exe +launchpath0= +module0= +opengllib0= +ver0=1 +coord0=0 +flag0=134234656 +flagg0=1207959808 +flagh0=20 +flagi0=138412036 +flagj0=1 +tflag0=0 +initx0=0 +inity0=0 +minx0=0 +miny0=0 +maxx0=0 +maxy0=0 +posx0=50 +posy0=50 +sizx0=800 +sizy0=600 +maxfps0=0 +initts0=0 +winver0=0 +maxres0=-1 diff --git a/build/exports/Nocturne.dxw b/build/exports/Nocturne.dxw new file mode 100644 index 0000000..c39b35b --- /dev/null +++ b/build/exports/Nocturne.dxw @@ -0,0 +1,27 @@ +[target] +title0=Nocturne +path0=D:\Games\nocturne\nocturne.exe +launchpath0= +module0= +opengllib0= +ver0=0 +coord0=0 +flag0=134218272 +flagg0=1476395008 +flagh0=20 +flagi0=138412036 +tflag0=0 +initx0=0 +inity0=0 +minx0=0 +miny0=0 +maxx0=0 +maxy0=0 +posx0=50 +posy0=50 +sizx0=800 +sizy0=600 +maxfps0=0 +initts0=0 +winver0=0 +maxres0=-1 diff --git a/build/exports/Quake (OpenGL 3DFX).dxw b/build/exports/Quake (OpenGL 3DFX).dxw new file mode 100644 index 0000000..5433bed --- /dev/null +++ b/build/exports/Quake (OpenGL 3DFX).dxw @@ -0,0 +1,28 @@ +[target] +title0=Quake (OpenGL 3DFX) +path0=D:\Games\Quake\GLQUAKE.EXE +launchpath0= +module0= +opengllib0= +ver0=9 +coord0=0 +flag0=134234656 +flagg0=1208090624 +flagh0=20 +flagi0=138412036 +flagj0=1 +tflag0=0 +initx0=0 +inity0=0 +minx0=0 +miny0=0 +maxx0=0 +maxy0=0 +posx0=50 +posy0=50 +sizx0=800 +sizy0=600 +maxfps0=0 +initts0=0 +winver0=0 +maxres0=-1 diff --git a/build/exports/Quake (win).dxw b/build/exports/Quake (win).dxw new file mode 100644 index 0000000..63d391e --- /dev/null +++ b/build/exports/Quake (win).dxw @@ -0,0 +1,28 @@ +[target] +title0=Quake (win) +path0=D:\Games\Quake\WINQUAKE.EXE +launchpath0= +module0= +opengllib0= +ver0=0 +coord0=0 +flag0=134234656 +flagg0=1207959552 +flagh0=20 +flagi0=138412036 +flagj0=1 +tflag0=0 +initx0=0 +inity0=0 +minx0=0 +miny0=0 +maxx0=0 +maxy0=0 +posx0=50 +posy0=50 +sizx0=800 +sizy0=600 +maxfps0=0 +initts0=0 +winver0=0 +maxres0=-1 diff --git a/build/exports/Queen of Heart 98.dxw b/build/exports/Queen of Heart 98.dxw new file mode 100644 index 0000000..6288126 --- /dev/null +++ b/build/exports/Queen of Heart 98.dxw @@ -0,0 +1,28 @@ +[target] +title0=Queen of Heart 98 +path0=D:\Games\qoh98\Qoh98.exe +launchpath0= +module0= +opengllib0= +ver0=0 +coord0=0 +flag0=134218272 +flagg0=1207959552 +flagh0=20 +flagi0=138412036 +flagj0=1 +tflag0=0 +initx0=0 +inity0=0 +minx0=0 +miny0=0 +maxx0=0 +maxy0=0 +posx0=50 +posy0=50 +sizx0=800 +sizy0=600 +maxfps0=0 +initts0=0 +winver0=0 +maxres0=-1 diff --git a/build/exports/Tomb Raider Underworld.dxw b/build/exports/Tomb Raider Underworld.dxw new file mode 100644 index 0000000..3f9067d --- /dev/null +++ b/build/exports/Tomb Raider Underworld.dxw @@ -0,0 +1,27 @@ +[target] +title0=Tomb Raider - Underworld +path0=D:\Games\Tomb Raider - Underworld\tru.exe +launchpath0= +module0= +opengllib0= +ver0=0 +coord0=1 +flag0=142606848 +flagg0=1207959808 +flagh0=20 +flagi0=138412036 +tflag0=0 +initx0=0 +inity0=0 +minx0=0 +miny0=0 +maxx0=800 +maxy0=600 +posx0=50 +posy0=50 +sizx0=800 +sizy0=600 +maxfps0=0 +initts0=0 +winver0=0 +maxres0=-1 diff --git a/build/exports/readme-relnotes.txt b/build/exports/readme-relnotes.txt deleted file mode 100644 index 39ba174..0000000 --- a/build/exports/readme-relnotes.txt +++ /dev/null @@ -1,595 +0,0 @@ -v2.2.00/01 -major code rewriting - introduced dxwCore class -preliminary FPS handling: Limit, Skip & Count with configurable delay -Hide Multi Monitor configuration flag - used for "Dream Acquarium" on multimonitor PC. - -v2.2.02 -preliminary time stretching: so far applies to GetTickCount() only, and is controlled by Alt-F5 / F6 keys. -Fixed bug in GDI BitBlt call: stretching must be made on screen DC only, or it's made twice. - -v2.02.03/04: -code cleanup - see syslib calls hooking -new configuration flags: Hook GDI and Hook OpenGL -OpenGL custom library field -API hooking fix with module specification -Time stretching by keyboard control (Alt F5/F6) and/or Time Slider dialog - -v2.02.05: -hooked winmm timeGetTime() API: makes time stretching work for Age of Empires series -changed time stretching grain: now it's not the coarse grained 2x, 4x,... series in 9 possible values but the fine grained series 1.5x, 2x, 3x,.... in 17 possible values -added status and time stretching view panels to tray icon menu - -v2.02.06: -preliminary FPS counter overlapped on game screen, Alt-F7 to toggle display on/off. -fixed buf on time stretch logging (and possible game crash). -revised GetDC handling with 8BPP paletized surfaces: avoided need to emulate reverse-blitting and got an impressive speed improvement for games such as Age of Empires I & II and Hyperblade. - -v2.02.07: -many fixes on the FPS and time control features. - -v2.02.08: -fixed some errors in the main directdraw palette descriptor. That gives better compatibility and less complicated source code. -added Fake Version feature: now Dungeon Keeper II (original version, not GOG hack) can detect a fake Win2000 / WinXP environment on Win7 and newer. Tested and working on Win7. Many thanks to Maxim for pushing me hard to win my lazyness and implement this new feature. - -v2.02.09: -Fixed some x,y window coordinates bugs -Fixed some proxy log messages (missing \n line terminator) -Fixed Trace "DirectX" flag. -improved GetDC handling in 8BPP palette mode: AddPalette called on demand, and on any surface (including backbuffers): makes Emergency work with no "Handle DC" flag set. Beware: this may affect the "Map GDI HDC on Primary DC" flag causing surface locks. -Fixed limit FPS timing issues: now the max possible FPS is 1000/delay. -Fixed EndPaint bug causing HDC lock in "Map GDI HDC to Primary DC" mode. - -v2.02.10: -Added "Full RECT Blit" mode: may be useful to handle problematic situations (e.g. "Urban Assault" intro movies) -Fixed ClientToScreen and ScreenToClient hookers to properly handle scaled windows. This makes "Postal" working. -Fixed global palette reference count (??) in DirectDraw::Release hook -Fixed Window messages handling for SWP_NOMOVE, SWP_NOSIZE modes. - -v2.02.11: -Added debug messages for GetSystemMetrics() modes, MapWindowPoints() points, DirectDrawEnumerate/Ex() devices. -ompiled with #define _WIN32_WINNT 0x0600 -> handles Vista modes -Added NOPALETTEUPDATE ("Palette update don't Blit" flag) to eliminate flickering when ddraw and GDI methods conflict -Hooked all LoadLibraryA/W and LoadLibraryExA/W calls -Hooked -extDirectDrawEnumerate/Ex ddraw calls to handle Hide multi-monitor option. -Detected directshow activation through CoCreateInstance and hooked quartz.dll segment: now Urban Assault movies don't require "Full RECT Blit" option to be set. -Updated DDSurface::Release hook - -v2.02.12 -GUI: Tabbed setup panel. More space for more future options. -DLL: (optional) splash screen -probably, some regression bugs.... - -v2.02.13 -Added decoding of WINDOWPOS.flags field in trace log -revised whole hooking procedures to use HMODULE handle instead of module name -Added WM_GETMINMAXINFO and WM_NCCALCSIZE handling in WinProcess hook -Attempt to handle double buffering through surface attach to backbuffer (???) -Fixed CHILD window positioning for BIG windows in CreateWindowExA hook -Added GlobalMemoryStatus hook to fix huge values when value exceeds DWORD range. Fixes Nocturne intro warning message. - -V2.02.14 -Started dll injection to handle startup code -Fixed directx CreateSurface hook to fix "Wargames" error in emulated mode -Fixed directx SetClipper hook to properly handle backbuffer clipping and fix "Wargames" clipping problems - -v2.02.15 -Fixed clipping handling of primary/backbuffer surfaces -Added option to set AERO compatibility for Vista/Win7/Win8 platforms. Need to call a undocumented ddraw API. Thanks to Vovchik that discovered it. Use at your own risk! - -v2.02.16 -DLL injection finally working! Quake 2 is supported. -Added Wireframe option for OpenGL games -Improved fix for clipper handling of primary/backbuffer surfaces - -v2.02.18 -Improved LoadLibrary family hook and other improvements to let DxWnd better retrieve OpenGL libs: now Homeworld 2 is working -Fixed a bug in backbuffer ZBUFFER attach emulation. Now Dungeon Keeper 2 crashes no more. -Moved "Remap client rect" option from directx tab to main program tab -Added the "Force Hook" in the OpenGL tab. Useless for now. -Preliminary work for d3d10/d3d11 wrapping. Unfinished and not working so far. -Added LoadLibraryEx flags explaination in log -Added support for mouse X,Y coordinates display in status window -OpenGL hooking: fixed bug to prevent hooking same call twice -OpenGL hooking: added hook for wglMakeCurrent call to keep track of rendered window -OpenGL hooking: fixed glViewport and extglScissor hook coordinates handling -D3D hooking: Added Wireframe option for D3D games -Added hooking of CLSID_DxDiagProvider through CoCreateInstance -Fixed (further simplified) clipping handling of primary/backbuffer surfaces -ChangeDisplaySettings hook: fixed x,y coordinate inversion in log message - -v2.02.19 -Saves GUI coordinates -Fixed "Remap client rect" option for Diablo's windows and Premier Manager 98 mouse movements -Added "Highlight blit to primary" option to draw a yellow bounding box around blits to primary surface -Fixed some exception conditions when closing the programs -Fixed CreateSurface handling to allow Premier Manager 98 start in emulated mode -Fixed ONEPIXELFIX handling -Fixed BIG WIN handling for Diablo's windows -Fixed FillRect hook to prevent filling outside virtual desktop -Disabled hooking of system libraries -Fixed a nasty bug that caused your desktop to freeze until shutdown !!! -Fixed GetWindowRect handling for windows not created by the task: Diablo queries the explorer window size! Now the retrieved RECT can't be larger than the virtual desktop - -v2.02.20 -Fixed an error in D3D10/11 preliminary code: AoE III working again -Added "Hook all DLLs" option to simplify congiguration: see new Diablo setup -Added screen coordinates to log -Some code rearrangement - -v2.02.21 -it's a w.i.p. release, wait 'till finished.... - -v2.02.22 -Major code rearrangement in API hooking. Expect some troubles... -Added desktop workarea and centered coordinate settings -Fixed imelib hooking -Added HOOKENABLED flag -Fixed ChangeDisplaySettings -GUI: added ListView icons -GUI: added pause command -GUI: updated commands layout - -v2.02.23/24 -Fixed "disable setting gamma ramp" flag to intercept both GDI and D3D calls -Fixed client workarea setting to occupy the whole client area even when preserving aspect ratio (it draws black rectangles to the left/right or top/bottom side) -Added DisableThreadLibraryCalls optimization -Added B&W screen simulation (for primary emulation only) -Improved the primary emulation capacity to handle 3D games -Added the "preserve surface capabilities" flag -Fixed an hooking bug for user32.dll - -v2.02.25 -CORE: -Added 'Single CPU Process Affinity' flag to let old games run on a single CPU core. -Fixed bug causing possible crash using 'preserve surface caps' flag -Switched lpDDSBack reference when backbuffer is upgraded through QueryInterface -Eliminated lpDDSBack clearing when refcount is zero - why is this working better? Needs further investigation -Added DDSCAPS_3DDEVICE capability when in EMULATED mode -GUI: -Added Kill process by name functionality (right click menu on program's list) -Fixed GUI initial position: now checks for desktop size to fit GUI within visible borders -Added single cpu process affinity checkbox in compatibility tab - -v2.02.26 -CORE: -Fixed Black&White mode for 16BPP color depth -Revised hooking code, now more compact and clear.... -Fixed DxWnd splash screen, for those who love it -Increased child win table - now 688 hunter killer works perfectly -GUI: -Added /debug flag to enable debugging options -Revised hooking code, now more compact and clear.... -Restored Hook child win option - -v2.02.27 -CORE: -fixed GetDC/ReleaseDC ddraw implementation to refresh GDI operation on primary surface. Warlords 3 text is now visible. -preliminary implementation of MapWindowPoints - to be tested -GUI: -Fixed log flags wrong initialization - -v2.02.28 -CORE: -eliminated experimental ICSendMessage and ICOpen hooks, preventing some games (Alien Nations) to work -added mciSendCommand hook to fix video playback -fixed MoveWindow bug - still, it's unknown the reason why some programs (Emergency) tries to MoveWindow upon the hWnd=0 desktop! -fixed MapWindowPoints hook (Alien Nations) -fixed desktop detections in some places, now correctly using dxw.IsDesktop() method -Now "Alien Nations" and "Emergency" working (almost) perfectly. -fixed d3d8/9 hook to Get/SetGammaRamp. This should make a great number of recent games playable again. - -v2.02.29 -CORE: -hooked DirectDrawSurface::Lock method to center primary surface memory updates centered into the window (in no emulated mode) - -v2.02.30 -CORE: -Some ddraw::GetDC log message fixes -added preliminary registry emulation - tested ok with "duckman" -added separate flag for preliminary registry operation trace -added CDROM drive type emulation - tested ok with "Fighting Forces" RIP -fixed FixCursorPos routine: cursor x,y compensation must always use pseudo-fullscreen window parameters - fixes Imperialism II mouse problems -fixed Desktop Workarea position mode for ddraw games -added CoCreateInstanceEx hook - "Final Fighter" seems to be using it, but who knows why...? -added "Don't move D3D Rendering Window" window option to make "Fable Lost Chapters" working -GUI: -updated default values on new entry creation to map most-likely-to-work parameters - -v2.02.31 -CORE: -disabled annoying compilation security warnings -improved advapi32.dll hooking and logging -handling of complex primary surfaces with backbuffer surface inherited from one directdraw session to the following and with different interfaces -fixed SetCooperativeLevel handling in case of WINDOWED mode against desktop hwnd==NULL -fixed GetGDISurface in EMULATED mode -hooked gdi32 API set for Imperialism I & II and 688 Hunter Killer:GetClipBox, Polyline, PolyBezierTo, PolylineTo, PolyDraw, MoveToEx, ArcTo, LineTo, StretchDIBits, SetDIBitsToDevice, SetPixel, Ellipse, Polygon, Arc, CreateEllipticRgn, CreateEllipticRgnIndirect, CreateRectRgn, CreateRectRgnIndirect, CreatePolygonRgn, DrawTextA, DrawTextExA. -fixed gdi32.dll hooking for TextOutA, TabbedTextOutA, Rectangle, BitBlt, PatBlt, StretchBlt, CreateFont, CreateFontIndirect -improved ddraw proxy logging -added / fixed user32.dll API FrameRect, TabbedTextOutA, CloseWindow, DestroyWindow, SendMessageW -opengl: fixed glCreateContext, wglMakeCurrent to make Descent III playable in opengl video mode. -fixed DeferWindowPos hook to make Imperialism II working -fixed SM_CXVIRTUALSCREEN, SM_CYVIRTUALSCREEN properties -fixed window class logging causing program crash -GUI: -added "GDI/Scale font parameters" & "DirectX/Disable HAL support" options - -v2.02.32 -CORE: -added new GDI handling mode, "Emulated devce context". Currently tested successfully on "G-Nome" only. -fixed "Prevent maximize" windows handling avoiding to disable topmost style for child windows -fixed handling of DDSCAPS_3DDEVICE surfaces in emulated mode: "Nightmare Ned" is working ok, "The Sims" works better (still crashing..) -fixed banner handling in case of device context remmapped coordinates -fixed memory leakage in SetDIBitsToDevice hooker -GUI -added radiobutton group to set the preferred GDI emulation mode - -v2.02.33 -CORE: -experimental attempt to emulate the ZBUFFER attach to the BACKBUFFER surface -improved log to detail all ddraw object properties -experimental emulation of RGB to YUV conversion to investigate "duckman" problems on Win7 -improved grayscale algorythm -fixed missing DDPF_ALPHAPIXELS property causing several blit incompabilities -fixed surface handling for "Submarine Titans" -fixed mousewheel handling -fixed hooking bug causing several problems (i.e. Age of Empires III) -Added FULLSCREENONLY option: fixes "Submarine Titans" intro movies -Added "Bypass font unsupported api" compatibility flag: makes "Stratego" working -fixed several d3d8/9 hooking problems -GUI -added controls for new core features -defaulted ddraw emulation mode to surface emulation - -v2.02.34 -CORE: -Much better surface description in log -Completely revised CreateSurface hook: emulated and direct code are merged as much as possible, and reference counter are kept accurate. Now most games can work both in emulated and direct mode. -Fixed surface capabilities for "Vangers", "The Sims" (now working in emulated mode again) -Updated "Fixed aspect ratio" option: now uses the x,y size declared in the configuration instead of the fixed 800 x 600 standard one. -Added virtual fullscreen "Desktop" mode. -Completely revised the Peek/GetMessage handling: now it uses the standard SetWindowHook API instead of the address redirection, making the handling more reliable and accurate: now "Age of Empires III" works at last! -GUI: -Added virtual fullscreen "Desktop" mode. -Added "Fix buffered IO after Win98" flag: this is meant to fix an incompatibility in the ReadFile kernel32 API that must read from block boundaries, where a block was smaller up to Win98 and bigger after it. -As a result, games like "Dylan Dog Horror Luna Park" show IO errors while reading data from the CD. Unfortunately, this is not the only problem of this game, so Dylan Dog fans will have to wait further. -Maybe some other programs suffer of this problem, and I will strongly appreciate if anyone finds some. - -v2.02.35 -fixed BACKBUFFER surface attributes in direct (not emulated) mode: Rayman 2 playable again -added FILTERMESSAGES flag ("filter offending messages") to eliminate some problems to games not developed to work windowized (Rayman 2, Mirror's Edge ...) -fixed bug crashing the program when "keep aspect ratio" is selected with window size set to 0 - -v2.02.36 -hooked GetAttachedSurface to non-PRIMARY surface to track ZBUFFER attach to BACKBUFFER. Useless, so far... -revised capability handling in CreateSurface -hook trace is now activated from a separate log flag to reduce debug log size -added "Peek all messages in queue" to avoid queue saturation and automatic task kill in Win7 (thank to P K help) -fixed message handling in the case messages are passed to a routine handle - -v2.02.37 -code reorganization -GUI: -removed useless flags and moved debug options in a hidden tab - -v2.02.38-40 -Fixed coordinate calculation for blit operations when keeping aspect ratio. -Fixed window coordinate placement in desktop / client area mode for programs with a visible menu bar. -Changed "Lock win coordinates" flag: now it allows window movement / resizing when driven by mouse input. -Fixed a bug in GDI "Map DC to primary surface"mode. -Added palette display window to GUI - -v2.02.41 -Added "suppress child process creation"flag. This flag is introduced to manage games such as "Heart of Iron 2" that start intro movie by means of a separate process. HoI2 is starting the binkplay.exe program in the game's avi subfolder. This way you don't get a windowed movie, but completely suppress it. - -v2.02.42 -added hook to kernel32.dll QueryPerformanceCounter API to enable time stretching to Rayman 2 -handled GetAttachedSurface emulation for FLIP capability on primary surface - that makes the intro movies of Empire Earth visible. -Some code cleaning -Cleared invisible debug flags ... - -v2.02.43 -Several changes for Empire Earth: -fix: restore 16BPP color mode after directdraw session termination -fix: recovered window destruction -fix: proper handling of MIPMAP and LOCALVIDMEM surfaces -fix: color depth handling - now when the program terminates the desktop is brought to the original color depth - -v2.02.44 -Improved debug logging for all palette operations -fixed a bugged log causing the crash of Empire Earth in debug mode -added show time stretching flag - preliminary version. Some code cleaning as well. -change in automatic screen refresh - should make the "palette update don't blit" flag obsolete..... -added a static definition for the default system palette -added interception for CoCreateInstance following cases: - case 0xe436ebb3: Module="quartz"; Class="CLSID_FilterGraph"; - case 0x4fd2a832: Module="ddrawex"; Class="CLSID_DirectDrawEx"; - case 0x49c47ce5: Module="amstream"; Class="CLSID_AMMultiMediaStream"; -preliminary (proxed) interception for "GetActiveWindow" and "GetForegroundWindow" - -v2.02.45 -A small fix for ddraw 7 games that makes Praetorians playable, though with some problems! - -v2.02.46 -Fixed handling of user32 CreateDialogIndirectParam call to avoid processing in non fullscreen mode - fix necessary to start "Crimson Skies". - -v2.02.47 -GUI: -Configuration tabs reorganization: now some tabs have merged making it easier to reach all options -core: -improved d3d wrapping and sdded ZBUFFER cleanup flags to fix some d3d games. In particular: -Clean ZBUFFER @1.0 fix: to fix "Star Wars Episode I Racer" -Clean ZBUFFER @0.0 fix: to fix "Crimson Skies" black blocks bug on ATI cards - -v2.02.48 -New options: "Disable fogging", "Textures not power of 2 fix" -A few fix to prevent game crashes - -v2.02.49 -Separated ddraw, d3d and dxwnd log messages -Hooked GetAvailableVidMem method to limit memory values -Hooked ChangeDisplaySettings call in both versions ANSI and WIDECHAR, to prevent messing up with the screen -Added HookWindowProc() subroutine, called at dxhook.c@1534 -Added "Add proxy libs" flag - so far to copy a d3d9.dll proxy lib to fix d3d9 games -Hooked d3d8/9 SetCursorPosition method -Hooked d3d8/9 AddRef / release methods (for logging) -Fixed D3DDevice8/9 hooking -Hooked QueryPerformanceFrequency -Fixed a bug in d3d7 hooking -GUI: added desktop color setting - -v2.02.50 -Added "Intercept RDTSC" option: so far, tested on Unreal Tournament only. -To implement RDTSC detection, I owe a big thank you to Olly who shared the disasm lib used to browse the assembly code. - -v2.02.51/52 -Hooked window timers: now "Ed Hunter" can be time stretched -added NOFILLRECT debug option -fixed WM_DISPLAYCHANGE handling (x,y swapped coordinates?) -fixed int64 arithmetic for performance counters -Added (untested !!!) handling for RDTSCP opcode with "Intercept RDTSC" option -Added "Limit screen resolution" option: seems necessary for "Sid Meyer's Civilization III" to work -Improved initial window coordinate & style handling -fixed virtual screen size showing into status panel -hooked SetPixelFormat, GetPixelFormat, ChoosePixelFormat and DescribePixelFormat to redirect desktop hwnd and make wglCreateContext work (needed for Civ III) -fixed log message for TextOut parameters -hooked DisableD3DSpy (invoked by The Bard's Tale) -fixed extglViewport coordinate remapping when invoked with CW_USEDEFAULT values (Civ III) -fixed bug in DirectDarawCreate/Ex hooking with wrong module handle - -v2.02.53 -Handling of ddraw screen color depth 15BPP - in "Hesperian Wars" -fixed IAT scanning: now function addresses for remapping are searched in possibly multiple instances of dll text segment - in "Aaron Hall's Dungeon Odissey" -hooked SystemParametersInfo call -fixed window size logic to check for window menu bar, considering also the WS_CHILD case. -fixed window move/resize when message processing is enabled: coordinates outside the child area or within ENTER/EXITSIZEMOVE must NOT be altered. -expanded timer processing to include user32 Set/KillTimer - in "Aaron Hall's Dungeon Odissey" -fixed possible recursion while hooking child window procedure identical to parent's one -fixed gdi emulation on top of ddraw surface, enough to play "Sid Meyer's Civilization III". - -v2.02.54 -fixed a bug in d3d GetAvailableVidMem that was causing too many troubles... -fixed a bug in Suppress IME option -fixed a bug in handled library list, possibly affecting d3d/d3d7 games -avoid fixing window style for non-desktop windows (fixed a Port Royale 2 bug) -eliminated "Disable HAL support", no longer necessary -some incomplete work on gdi game handling -added preliminary, incomplete (not working) glide handling - -v2.02.55 -added "Hide desktop background" video option - -v2.02.56 -hooked RegisterClassA API (useless so far...) -fixed bug in SendMessageW hooking: caused truncated text in window titles and form captions -fixed several d3d1-7 hooks: prevented some d3d games to properly work, i.e. "Thief the Dark Project" -fixed d3d GetDisplayMode to return virtual desktop size - fixed "Affari Tuoi", an italian game. -fixed some log messages - -v2.02.57 -fixed WS_NCCALCSIZE & WM_NCPAINT messages to ensure a proper window's border and size - fixed Black Thorn window problems -fixed "Hide desktop background" flag - -v2.02.58 -Added Automatic DirectX mode: not workink always, but should make it much easier to guess a proper surface setting. -Automatic mode allows dynamic mode change depending on the situation: it is necessary for Populous 3 D3D version. -fixed BltFast operation with SRC color key (often used to draw cursor from texures) directly to primary surface: this makes the cursor visible in Populous 3. -minor fixes on logging - -v2.02.59 -fixed IDIrectDraw reference counter for ddraw release 1 session: fixes "Warhammer 40K Rites Of War" first screen -fixed QueryPerformanceCounter handling: fixes "New York Racer" time stretching problems - -v2.02.60 -fixed time stretching to handle Total Soccer 2000 -fixed ZBUFFER surface creation to handle GOG Incoming troubles on some cards -fixed handling of special effects (wireframe, no fogging, zbuffer always) to be valid on all d3d versions - -v2.02.61 -added directx "Compensate Flip emulation" flag: used primarily to get rid of mouse artifacts due to emulated Flip rpocedure in windowed mode. Fixes Gruntz issues and some other games... - -v2.02.62 -fixed d3d7 CreateDevice hook and d3d7 rendering options (wireframe, disablefogging, zbufferalways) -fixed doublebuffer emulation - avoid returning the backbuffer when zbuffer is requested. Fixes rendering problems of many games! - -v2.02.63 -fixed d3d hooking for Reset and GetDirect3D methods: now Jumpgate works at any available resolution, and the "Add proxy libs" option is no longer necessary -fixed "Compensate Flip emulation" option for non emulated surface mode: fixes mouse artifacts for "Rogue Spear Black Thorn" -added preliminary handling for "Disable Textures" option - -v2.02.64 -GUI: implemented multiple file import -DLL: -fixed a ddraw session reference count error that prevented "Jet Moto" to start -fixed "Compensate Flip emulation" for ddraw7 games: now "Empire Earth" supports this flag. -fixed CloseWindow hook: now games that minimize/restore the main window on task switch can possibly recover (e.g. Hundred Swords) -fixed process hook: now it should be a little more robust and efficient. Hopefully should fix some Macromedia Flash problems. -fixed IDDrawSurface::Lock() prototype. Not gameplay improvements, though... -added DirectX "Return 0 ref counter" option as quick & dirty solution to many reference counter problems! -fixed DirectDrawCreateEx failing to register the main ddraw session handle -fixed palette problem in emulated mode: palette must be applied to backbuffer surface as well. Now "Duckman" and "Total Soccer 2000" show perfect colors. - -v2.02.65 -added "Fine time adjust" flag to finely set timeslider by 10% steps ranging from about :2 to x2 -fixed a bug in DWORD timers introduced in v2.02.60: now "Warcraft 2" timing works again -revised logit to calculate delays to emulate VSync timing - now should be more accurate and depending on actual screen refresh rate - -v2.02.66 -fixed palette bug: "Virtua Fighter PC" now shows correct colors. - -v2.02.67 -fixed log for D3D CreateDevice method, missing in some D3D interface versions -added wildcarded program path: now you needn't set the full pathname, but it is sufficient to specify the rightmost part, e.g. the executable filename. -added emulated mode color conversion from 32BPP to 16BPP. Despite the fact that the best way to run a 32BPP game is against a 32BPP desktop, now it is possible to downgrade 32BPP colors to 16BPP. This fixed the fact that 32BPP games run on a 16BPP desktop showed simply black screens (e.g. Baldur's Gate II) -fixed logic for EnumDisplayModes implementation: now screen resolutions and, for emulated mode only, also color depth, are generated by DxWnd and not derived directly from the real ones. This make it possible to fake support for very low screen resolutions (e.g. 320x200) on modern screens that support them no longer. This make "Genocide" running on both supported resolutions 320x200 and 320x240. - -v2.02.68 -added screen resolution choice: either a set of SVGA resolutions (mostly for 3:4 monitors), HDTV resolutions (mostly for 16:9 monitors) or the native set of resolutions offered by your monitor / video card. - -v2.02.69 -improved exception catching to intercept memory violation exceptions and to neutralize offending code. Thank again to olly didasm lib, now the assembly instruction length is automatically determined so that the opcode can be replaced by the correct number of NOP instructions. If this doesn't mean much for you, just consider that this makes playable the Win95 (patched) release of "Star Wars Tie Fighter". -fixed FillRect user32 call - brings some improvements to Imperialism (still far from being acceptable). - -v2.02.70 -GUI: -fixed saving wrong coordinates when dxwnd is terminated while minimized -added check for adminstrative capabilities on startup -DLL: -fix: moved DrawText/Ex api hooks into right library -fix: corrected child window procedure handling - fixes "Imperialism" child window closing -fixed FillRect coordinate handling - fixes "Imperialism" menus -fixed SetWindowPlacement handling - -v2.02.71 -fix: Set/GetWindowLongA/W are always hooked. -fix: added user32 GetDCEx hook for GDI Emulation & Directraw mode -fix: hooked "FrameRect", "TabbedTextOutA", "DrawTextA", "DrawTextExA", "FillRect" in scaled mode only -fix: FIXNCHITTEST mode -fix: when main win is closed, blit area is made null to avoid messing with a wrong screen area -added "Release mouse outside window" option. This option causes the get cursor position to detect a centered mouse position when the cursor is moved outside the window, allowing interaction with other windows without scrolling ot the windowed program. Mainly, this option is meant to help people with a physical disability to use other programs (e. g. the virtual keyboard) to play games. -added "Launch" field (optional) to start the program with arguments or a separate task - -v2.02.72 -fix: fixed Launch field used with "Use DLL injection" flag -fix: somehow improved "Use DLL injection" to avoid blocked tasks and allow exception handling - -v2.02.73 -Add: preliminary support for (unchecked) "Run in window" flag. Now if the flag is unchecked, DxWnd does NOT force the program to run in a window. Still, some rendering modes are not working perfectly. -add: support for Unicode DefWindowProcW API call -fixed some differences in D3D CreateDevice vs. CreateDeviceEx handling -added "Window frame compensation" input flag to set the cursor position properly in "Sub Commando" -fix: properly handled the case of NULL WindowProc routine in CreateDialog/Indirect API calls. Makes "LEGO Stunt Rally" working. -added support for Unicode SystemParametersInfoW API call - -v2.02.74 -Add: API hot patching, thank to aqrit precious support. Now Doom 3 is played in window. -hooked GetCursorInfo call -fix: recalculate vsync timers in case of time stretching -fix: log failure for CreateWindowExW wchar api -Add: configurable keyboard commands -Add: timestretch toggle command -Add: "Enable hotkeys" flag to enable/disable hotkeys -fix: eliminated dialogs with timer warning messages (to be investigated...) -fix: moved "no banner" flag to main tab again -fix: potential string violation, possible cause for flash crash? - -v2.02.75 -Hooked D3DDevice::ShowCursor method to apply force show/hide cursor (preliminary...) -fix: dynamic allocation for WndProc stack to eliminate predefined limit of 256 entries. Star Wars Rebellion uses more than 256. -added: "Suppress D3D8/9 Reset" flag -fix: improved show FPS and Time Stretch overlay so that the two overlays won't overlap each other -fix: bug in ddraw "Locked surface" mode preventing output on screen -fix: fixed bug in critical common portion of the code that was crashing even unhooked programs (namely, Flash Player, ...) - -v2.02.76 -fixed and enhanced several features about registry emulation: added flags "Emulate registry" (to add missing entries) and "Override registry" (to fake existing entries with different values). Fixed "Requiem Avenging Angel" DirectX bogus check bug. -fixed bug in emulate surface palette handling affecting "Requiem Avenging Angel" colors - -v2.02.77 -GUI: added program icon display -fix: some log messages -fix: handling of GetProcAddress D3D9 api -fix: handling of EMULATEBUFFER option - fixes "Star Trek Birth of the Federation" -fix: expanded hot patching scope - now can handle QueryPerformanceCounter and fix time stretching on obfuscated version of "Wind Fantasy SP" -added logging in D3DDevice9::GetAdapterIdentifier - -v2.02.78 -fix: hooked D3D8/9Device::BeginStateBlock -ddraw API hot swappable -log: helper for ChangeDisplaySettings() flags -fix: hot patch handling of loaded modules -log: fixed some messages with no line ending for GetObjectType() -d3d begin of code reorganization and cleaning -ole32, user32 API hot patched -handling of DWL_DLGPROC message - -v2.02.79 -fix: recovered capability to "pin" ddraw and d3d calls - -v2.02.80 -Preliminary multilanguage release, english and chinese, many thanks to gsky916 support -fixed Sleep bug for small delays and accelerated timeshift: fixes "Wind Fantasy SP" reported bug -added log for DirectInput::SetCooperativeLevel flags -fixed flip emulation mode when backbuffer is lost: fixes cursor problems in "HellCopter" -fixed Pitch setting in DirectDraw::EnumDisplayModes when in SVGA emulation mode. Let "Outlive" use this setting - -v2.02.81 -fix: hooked GetMonitorInfoA/W that is a possible way to get the screen resolution. The hooker sets the virtual screen size updating both rcWork & rcMonitor rects in the MONITORINFO structure. This fixes the mouse control in "Tomb Raider Underworld" and likely in other games with a similar engine. - -v2.02.82 -fix: completed chinese translation and language selection through dxwnd.ini file. -added very preliminary (and incomplete) italian translation for debugging. - -v2.02.83 -fix: small error in one coordinate scaling procedure -fix: completed translation in italian (just for testing....) -fix: added palette window activation in icon tray menu -fix: supppressed BackBuffer release within D3D7:CreateDevice: this makes "Tetris Worlds" fully playable -add: build-in check for compatibility modes set! - -v2.02.84 -fix: removed extra reference to ddraw session causing window movements on fullscreen game exit: fixes another "Wind Fantasy SP" reported bug - -v2.02.85 -fix: revised handling of d3d D3DFORMAT field: fixes "Call of Cthulhu DCotE" color problems -fix: added recovery for rounded child win coordinates: fixes blitting problems in Diablo when win size is not an exact multiple of native resolution. - -v2.02.86 -fix: thank to aqrit's research, hooked and hanlded user32.dll GetUpdateRgn API. This fixes refresh and crash problems in Diablo & Hellfire. -added bilinear filtering to directdraw palettized 8BPP emulated mode (where it is mostly needed!). A must try is "Genocide" ! - -v2.02.87 -attempt to fix Win8 missing support for earlier ddraw releases (Croc legend of the Gobbos, Project I.G.I., ...) -fix: optimized bilinear filtering with no horizontal / vertical sawtooth artifacts -added support for 16BPP and 32BPP desktop bilinear filtering -suppressed compatibility checking -fix: doubled default window size when bilinear filtering is active -added repositioning of control parent window when main win is moved -added debug messages about hooked window class and name -fix: ignore IME window when hooking main win, destroy it when requested -fix: ignore HWND_MESSAGE type windows -added "Diablo tweak" compatibility flag for Diablo proper screen update handling. It is a temporary tweak waiting to understand better how to properly manage it. - -v2.02.88 -fix: DIABLOTWEAK flag defaulted to FALSE -add: CLEARTARGET flag - forces a Clear CLEAR_TARGET operation on D3D BeginPaint: useful in combination with wireframe mode. -updated "Optimize CPU" behavior: now it emulates a VSync wait also on D3D8/D3D9. Fixes some "swimming" problem in "Soul Reaver 2", and saves CPU time by limiting the FPS to the refresh rate. -fixed positioning of FPS and time stretching indication on screen overlay -cleaned up GUI project: no more japanese and localized resources, no more unreferenced resources. -GUI: added Desktop status window -GUI: added pixel format descriptor to DxWnd status - -v2.02.89 -fix: added SVGA 512x384 video mode. Necessary for "Outcast" loading screen. -fix: using WINNLSEnableIME call to suppress IME window. -fix: improved some logging - -v2.02.90 -added: "Filter winposchange messages" flag - needed for "RollerCoaster Tycoon / Deluxe / II" games -fix: correct handling of texture surfaces for "Zoo Tycoon" in surface emulation mode. -fix: handling of GDI32.dll calls in GetProcAddress -fix: improved logging -fix: GetRgnBox hooking moved to normal window processing, to handle RollerCoaster Tycoon series. -added: GetTempFileName fix to handle Win95 differences. This makes "Powerslide" playable. - - diff --git a/build/readme-relnotes.txt b/build/readme-relnotes.txt index 39ba174..d504b63 100644 --- a/build/readme-relnotes.txt +++ b/build/readme-relnotes.txt @@ -592,4 +592,6 @@ fix: improved logging fix: GetRgnBox hooking moved to normal window processing, to handle RollerCoaster Tycoon series. added: GetTempFileName fix to handle Win95 differences. This makes "Powerslide" playable. - +v2.02.91 +fix: bug in bilinear filtering mode causing possible game crashes when blitting partial rectangles (es. Age of Empires II cursor) +added: AERO friendly mode - brings AERO compatibility and incredible performance boost for ddraw games in surface emulation mode diff --git a/dll/ddraw.cpp b/dll/ddraw.cpp index 9772ae5..2aa35b3 100644 --- a/dll/ddraw.cpp +++ b/dll/ddraw.cpp @@ -2381,7 +2381,7 @@ static void FixSurfaceCaps(LPDDSURFACEDESC2 lpddsd, int dxversion) if((lpddsd->dwFlags & DDSD_CAPS) && (lpddsd->ddsCaps.dwCaps & DDSCAPS_TEXTURE)){ if (dxw.dwFlags3 & FORCESHEL) { lpddsd->ddsCaps.dwCaps &= ~DDSCAPS_VIDEOMEMORY; - lpddsd->ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY; + if(dxw.dwFlags5 & SYSTEMMEMORY) lpddsd->ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY; } // no further changes... return; @@ -2452,7 +2452,8 @@ static HRESULT BuildPrimaryEmu(LPDIRECTDRAW lpdd, CreateSurface_Type pCreateSurf ddsd.dwFlags |= (DDSD_CAPS|DDSD_WIDTH|DDSD_HEIGHT|DDSD_PIXELFORMAT); ddsd.ddsCaps.dwCaps &= ~(DDSCAPS_PRIMARYSURFACE|DDSCAPS_FLIP|DDSCAPS_COMPLEX|DDSCAPS_VIDEOMEMORY|DDSCAPS_LOCALVIDMEM); // DDSCAPS_OFFSCREENPLAIN seems required to support the palette in memory surfaces - ddsd.ddsCaps.dwCaps |= (DDSCAPS_SYSTEMMEMORY|DDSCAPS_OFFSCREENPLAIN); + ddsd.ddsCaps.dwCaps |= DDSCAPS_OFFSCREENPLAIN; + if(dxw.dwFlags5 & SYSTEMMEMORY) ddsd.ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY; ddsd.dwWidth = dxw.GetScreenWidth(); ddsd.dwHeight = dxw.GetScreenHeight(); @@ -2517,7 +2518,8 @@ static HRESULT BuildPrimaryEmu(LPDIRECTDRAW lpdd, CreateSurface_Type pCreateSurf if(lpDDSEmu_Back==NULL){ ClearSurfaceDesc((void *)&ddsd, dxversion); ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; - ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY; + ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + if(dxw.dwFlags5 & SYSTEMMEMORY) ddsd.ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY; ddsd.dwWidth = dxw.GetScreenWidth(); ddsd.dwHeight = dxw.GetScreenHeight(); if(dxw.dwFlags4 & BILINEARFILTER){ @@ -2611,7 +2613,8 @@ static HRESULT BuildBackBufferEmu(LPDIRECTDRAW lpdd, CreateSurface_Type pCreateS ddsd.dwFlags |= (DDSD_CAPS|DDSD_HEIGHT|DDSD_WIDTH|DDSD_PIXELFORMAT); ddsd.ddsCaps.dwCaps &= ~(DDSCAPS_BACKBUFFER|DDSCAPS_PRIMARYSURFACE|DDSCAPS_FLIP|DDSCAPS_COMPLEX|DDSCAPS_VIDEOMEMORY|DDSCAPS_LOCALVIDMEM); // DDSCAPS_OFFSCREENPLAIN seems required to support the palette in memory surfaces - ddsd.ddsCaps.dwCaps |= (DDSCAPS_SYSTEMMEMORY|DDSCAPS_OFFSCREENPLAIN); + ddsd.ddsCaps.dwCaps |= DDSCAPS_OFFSCREENPLAIN; + if(dxw.dwFlags5 & SYSTEMMEMORY) ddsd.ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY; ddsd.dwWidth = dxw.GetScreenWidth(); ddsd.dwHeight = dxw.GetScreenHeight(); GetPixFmt(&ddsd); @@ -2644,7 +2647,7 @@ static HRESULT BuildBackBufferDir(LPDIRECTDRAW lpdd, CreateSurface_Type pCreateS ddsd.dwFlags &= ~(DDSD_WIDTH|DDSD_HEIGHT|DDSD_BACKBUFFERCOUNT|DDSD_REFRESHRATE|DDSD_PIXELFORMAT); ddsd.dwFlags |= (DDSD_CAPS|DDSD_HEIGHT|DDSD_WIDTH); ddsd.ddsCaps.dwCaps &= ~(DDSCAPS_PRIMARYSURFACE|DDSCAPS_FLIP|DDSCAPS_COMPLEX); - //ddsd.ddsCaps.dwCaps|=DDSCAPS_SYSTEMMEMORY; + if(dxw.dwFlags5 & SYSTEMMEMORY) ddsd.ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY; if (dxversion >= 4) ddsd.ddsCaps.dwCaps |= DDSCAPS_OFFSCREENPLAIN; ddsd.dwWidth = dxw.GetScreenWidth(); ddsd.dwHeight = dxw.GetScreenHeight(); @@ -2665,8 +2668,8 @@ static HRESULT BuildBackBufferDir(LPDIRECTDRAW lpdd, CreateSurface_Type pCreateS if(res) { if ((dxw.dwFlags1 & SWITCHVIDEOMEMORY) && (res==DDERR_OUTOFVIDEOMEMORY)){ OutTraceDW("CreateSurface: CreateSurface DDERR_OUTOFVIDEOMEMORY ERROR at %d, retry in SYSTEMMEMORY\n", __LINE__); - ddsd.ddsCaps.dwCaps &= ~DDSCAPS_VIDEOMEMORY; // try ... - ddsd.ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY; // try ... + ddsd.ddsCaps.dwCaps &= ~DDSCAPS_VIDEOMEMORY; + if(dxw.dwFlags5 & SYSTEMMEMORY) ddsd.ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY; res=(*pCreateSurface)(lpdd, &ddsd, lplpdds, 0); } if(res){ @@ -2691,13 +2694,14 @@ static HRESULT BuildGenericEmu(LPDIRECTDRAW lpdd, CreateSurface_Type pCreateSurf memcpy(&ddsd, lpddsd, lpddsd->dwSize); // Copy over .... FixSurfaceCaps(&ddsd, dxversion); + if(!(dxw.dwFlags5 & SYSTEMMEMORY)) ddsd.ddsCaps.dwCaps &= ~DDSCAPS_SYSTEMMEMORY; DumpSurfaceAttributes((LPDDSURFACEDESC)&ddsd, "[Emu Generic]" , __LINE__); res=(*pCreateSurface)(lpdd, &ddsd, lplpdds, pu); if ((dxw.dwFlags1 & SWITCHVIDEOMEMORY) && (res==DDERR_OUTOFVIDEOMEMORY)){ OutTraceDW("CreateSurface ERROR: res=%x(%s) at %d, retry\n", res, ExplainDDError(res), __LINE__); ddsd.ddsCaps.dwCaps &= ~DDSCAPS_VIDEOMEMORY; - ddsd.ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY; + if(dxw.dwFlags5 & SYSTEMMEMORY) ddsd.ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY; res=(*pCreateSurface)(lpdd, &ddsd, lplpdds, pu); } if (res) { @@ -2736,7 +2740,7 @@ static HRESULT BuildGenericDir(LPDIRECTDRAW lpdd, CreateSurface_Type pCreateSurf if ((dxw.dwFlags1 & SWITCHVIDEOMEMORY) && ((res==DDERR_OUTOFVIDEOMEMORY)||(res==DDERR_UNSUPPORTED))){ OutTraceDW("CreateSurface ERROR: res=%x(%s) at %d, retry\n", res, ExplainDDError(res), __LINE__); lpddsd->ddsCaps.dwCaps &= ~DDSCAPS_VIDEOMEMORY; - lpddsd->ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY; + if(dxw.dwFlags5 & SYSTEMMEMORY) lpddsd->ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY; res = (*pCreateSurface)(lpdd, lpddsd, lplpdds, 0); } if(res){ @@ -3070,6 +3074,49 @@ static void BlitTrace(char *label, LPRECT lps, LPRECT lpd, int line) return; } +HRESULT WINAPI PrimaryBlt(LPDIRECTDRAWSURFACE lpdds, LPRECT lpdestrect, LPDIRECTDRAWSURFACE lpddssrc, LPRECT lpsrcrect) +{ + return (*pBlt)(lpdds, lpdestrect, lpddssrc, lpsrcrect, DDBLT_WAIT, 0); +} + +HRESULT WINAPI PrimaryFastBlt(LPDIRECTDRAWSURFACE lpdds, LPRECT lpdestrect, LPDIRECTDRAWSURFACE lpddssrc, LPRECT lpsrcrect) +{ + return (*pBltFast)(lpdds, lpdestrect->left, lpdestrect->top, lpddssrc, lpsrcrect, DDBLTFAST_WAIT); +} + +HRESULT WINAPI PrimaryStretchBlt(LPDIRECTDRAWSURFACE lpdds, LPRECT lpdestrect, LPDIRECTDRAWSURFACE lpddssrc, LPRECT lpsrcrect) +{ + HRESULT res; + DDSURFACEDESC ddsd; + RECT TmpRect; + LPDIRECTDRAWSURFACE lpddsTmp; + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + lpddssrc->GetSurfaceDesc(&ddsd); + TmpRect.left = TmpRect.top = 0; + TmpRect.bottom = ddsd.dwHeight = lpdestrect->bottom - lpdestrect->top; + TmpRect.right = ddsd.dwWidth = lpdestrect->right - lpdestrect->left; + ddsd.dwFlags = (DDSD_HEIGHT | DDSD_WIDTH | DDSD_CAPS); + ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + if(dxw.dwFlags5 & SYSTEMMEMORY) ddsd.ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY; + res=(*pCreateSurface1)(lpPrimaryDD, &ddsd, &lpddsTmp, NULL); + if(res) OutTraceE("CreateSurface: ERROR %x(%s) at %d\n", res, ExplainDDError(res), __LINE__); + // stretch-blit to target size on OFFSCREENPLAIN temp surface + res= (*pBlt)(lpddsTmp, &TmpRect, lpddssrc, lpsrcrect, DDBLT_WAIT, 0); + if(res) OutTraceE("Blt: ERROR %x(%s) at %d\n", res, ExplainDDError(res), __LINE__); + // fast-blit to primary + res= (*pBltFast)(lpdds, lpdestrect->left, lpdestrect->top, lpddsTmp, &TmpRect, DDBLTFAST_WAIT); + if(res) OutTraceE("Blt: ERROR %x(%s) at %d\n", res, ExplainDDError(res), __LINE__); + if (res) BlitError(res, lpsrcrect, lpdestrect, __LINE__); + (*pReleaseS)(lpddsTmp); + return res; +} + +HRESULT WINAPI PrimaryNoBlt(LPDIRECTDRAWSURFACE lpdds, LPRECT lpdestrect, LPDIRECTDRAWSURFACE lpddssrc, LPRECT lpsrcrect) +{ + return DD_OK; +} + HRESULT WINAPI sBlt(char *api, LPDIRECTDRAWSURFACE lpdds, LPRECT lpdestrect, LPDIRECTDRAWSURFACE lpddssrc, LPRECT lpsrcrect, DWORD dwflags, LPDDBLTFX lpddbltfx, BOOL isFlipping) { @@ -3077,6 +3124,7 @@ HRESULT WINAPI sBlt(char *api, LPDIRECTDRAWSURFACE lpdds, LPRECT lpdestrect, POINT p = {0, 0}; HRESULT res; BOOL ToPrim, FromPrim, ToScreen, FromScreen; + extern PrimaryBlt_Type pPrimaryBlt; //CkArg arg; ToPrim=dxw.IsAPrimarySurface(lpdds); @@ -3219,21 +3267,30 @@ HRESULT WINAPI sBlt(char *api, LPDIRECTDRAWSURFACE lpdds, LPRECT lpdestrect, return res; } + // ========================= // Blit to primary surface + // ========================= if(dxw.HandleFPS()) return DD_OK; + if(dxw.dwFlags5 & NOBLT) return DD_OK; destrect=dxw.MapWindowRect(lpdestrect); //OutTraceB("DESTRECT=(%d,%d)-(%d,%d)\n", destrect.left, destrect.top, destrect.right, destrect.bottom); + // ========================= + // Blit to primary direct surface + // ========================= + if(!(dxw.dwFlags1 & (EMULATESURFACE|EMULATEBUFFER))){ - res=0; + res=DD_OK; + // blit only when source and dest surface are different. Should make ScreenRefresh faster. if (lpdds != lpddssrc) { dxw.ShowOverlay(lpddssrc); if (IsDebug) BlitTrace("PRIM-NOEMU", lpsrcrect, &destrect, __LINE__); - res= (*pBlt)(lpdds, &destrect, lpddssrc, lpsrcrect, dwflags, lpddbltfx); + //res= (*pBlt)(lpdds, &destrect, lpddssrc, lpsrcrect, dwflags, lpddbltfx); + res=(*pPrimaryBlt)(lpdds, &destrect, lpddssrc, lpsrcrect); } if(res){ BlitError(res, lpsrcrect, &destrect, __LINE__); @@ -3278,7 +3335,10 @@ HRESULT WINAPI sBlt(char *api, LPDIRECTDRAWSURFACE lpdds, LPRECT lpdestrect, } // ... else blitting on emulated surface + + // ========================= // Blit/Flip to emulated primary surface + // ========================= if(!lpddssrc) { if (isFlipping){ @@ -3332,7 +3392,7 @@ HRESULT WINAPI sBlt(char *api, LPDIRECTDRAWSURFACE lpdds, LPRECT lpdestrect, if (res) BlitError(res, lpsrcrect, &destrect, __LINE__); } - if(dxw.dwFlags1 & SUPPRESSDXERRORS) res=0; + if(dxw.dwFlags1 & SUPPRESSDXERRORS) res=DD_OK; return res; } @@ -3357,10 +3417,10 @@ HRESULT WINAPI sBlt(char *api, LPDIRECTDRAWSURFACE lpdds, LPRECT lpdestrect, dxw.ShowOverlay(lpDDSSource); if (IsDebug) BlitTrace("BACK2PRIM", &emurect, &destrect, __LINE__); - res=(*pBlt)(lpDDSEmu_Prim, &destrect, lpDDSSource, &emurect, DDBLT_WAIT, 0); + res=(*pPrimaryBlt)(lpDDSEmu_Prim, &destrect, lpDDSSource, &emurect); if (res) BlitError(res, &emurect, &destrect, __LINE__); - if(dxw.dwFlags1 & SUPPRESSDXERRORS) res=0; + if(dxw.dwFlags1 & SUPPRESSDXERRORS) res=DD_OK; if (IsDebug) OutTrace("%s: done ret=%x at %d\n", api, res, __LINE__); return res; } diff --git a/dll/dxemublt.cpp b/dll/dxemublt.cpp index f6fc420..91e00e4 100644 --- a/dll/dxemublt.cpp +++ b/dll/dxemublt.cpp @@ -23,9 +23,11 @@ extern int Set_dwSize_From_Surface(LPDIRECTDRAWSURFACE); #define DXWNDDIRECTBLITTING 1 #define MARKBLITCOLOR32 0x00FFFF00 #define MARKBLITCOLOR16 0x0FF0 -extern Blt_Type pBlt; EmuBlt_Type pEmuBlt; RevBlt_Type pRevBlt; +PrimaryBlt_Type pPrimaryBlt; + +extern Blt_Type pBlt; //--------------------------------------------------------------------------------------------// // Emulated blitting procedures: fills a 32BPP surface from the content of 8BPP or 16BPP ones. @@ -256,8 +258,8 @@ static HRESULT WINAPI BilinearBlt_8_to_32(LPDIRECTDRAWSURFACE lpddsdst, LPRECT l dest0 = dest; src8 = (BYTE *)lpsurface; - src8 += lpsrcrect->top*ddsd_src.lPitch; - src8 += lpsrcrect->left; + src8 += (lpsrcrect->top >> 1)*ddsd_src.lPitch; + src8 += (lpsrcrect->left >> 1); srcpitch = ddsd_src.lPitch - w; // OutTraceDW("DEBUG: h=%d w=%d src=%x dst=%x spitch=%d dpitch=%d\n",h,w,src8,dest,srcpitch,destpitch); @@ -432,8 +434,8 @@ static HRESULT WINAPI BilinearBlt_16_to_32(LPDIRECTDRAWSURFACE lpddsdst, LPRECT ddsd_src.lPitch >>= 1; src16 = (WORD *)(lpsurface ? lpsurface:ddsd_src.lpSurface); - src16 += lpsrcrect->top*ddsd_src.lPitch; - src16 += lpsrcrect->left; + src16 += (lpsrcrect->top >> 1)*ddsd_src.lPitch; + src16 += (lpsrcrect->left >> 1); srcpitch = ddsd_src.lPitch - w; if (!Palette16BPP) SetPalette16BPP(); @@ -760,8 +762,8 @@ static HRESULT WINAPI BilinearBlt_8_to_16(LPDIRECTDRAWSURFACE lpddsdst, LPRECT l dest0 = dest; src8 = (BYTE *)lpsurface; - src8 += lpsrcrect->top*ddsd_src.lPitch; - src8 += lpsrcrect->left; + src8 += (lpsrcrect->top >> 1)*ddsd_src.lPitch; + src8 += (lpsrcrect->left >> 1); srcpitch = ddsd_src.lPitch - w; // OutTraceDW("DEBUG: h=%d w=%d src=%x dst=%x spitch=%d dpitch=%d\n",h,w,src8,dest,srcpitch,destpitch); @@ -877,8 +879,8 @@ static HRESULT WINAPI BilinearBlt_16_to_16(LPDIRECTDRAWSURFACE lpddsdst, LPRECT ddsd_src.lPitch >>= 1; src16 = (WORD *)(lpsurface ? lpsurface:ddsd_src.lpSurface); - src16 += lpsrcrect->top*ddsd_src.lPitch; - src16 += lpsrcrect->left; + src16 += (lpsrcrect->top >> 1)*ddsd_src.lPitch; + src16 += (lpsrcrect->left >> 1); srcpitch = ddsd_src.lPitch - w; // OutTraceDW("DEBUG: h=%d w=%d src=%x dst=%x spitch=%d dpitch=%d\n",h,w,src8,dest,srcpitch,destpitch); @@ -1122,8 +1124,8 @@ static HRESULT WINAPI BilinearBlt_32_to_32(LPDIRECTDRAWSURFACE lpddsdst, LPRECT ddsd_src.lPitch >>= 2; src32 = (DWORD *)(lpsurface ? lpsurface:ddsd_src.lpSurface); - src32 += lpsrcrect->top*ddsd_src.lPitch; - src32 += lpsrcrect->left; + src32 += (lpsrcrect->top >> 1)*ddsd_src.lPitch; + src32 += (lpsrcrect->left >> 1); srcpitch = ddsd_src.lPitch - w; // OutTraceDW("DEBUG: h=%d w=%d src=%x dst=%x spitch=%d dpitch=%d\n",h,w,src8,dest,srcpitch,destpitch); @@ -1583,5 +1585,10 @@ void SetBltTransformations() dxw.ActualPixelFormat.dwRGBBitCount); break; } + + pPrimaryBlt = PrimaryBlt; + if(dxw.dwFlags5 & DOFASTBLT) pPrimaryBlt = PrimaryFastBlt; + if(dxw.dwFlags5 & DOSTRETCHBLT) pPrimaryBlt = PrimaryStretchBlt; + if(dxw.dwFlags5 & NOBLT) pPrimaryBlt = PrimaryNoBlt; return; } diff --git a/dll/dxhook.cpp b/dll/dxhook.cpp index 5d34b9c..5eaaa0e 100644 --- a/dll/dxhook.cpp +++ b/dll/dxhook.cpp @@ -93,8 +93,8 @@ static char *Flag4Names[32]={ }; static char *Flag5Names[32]={ - "DIABLOTWEAK", "CLEARTARGET", "NOWINPOSCHANGES", "", - "", "", "", "", + "DIABLOTWEAK", "CLEARTARGET", "NOWINPOSCHANGES", "SYSTEMMEMORY", + "NOBLT", "DOSTRETCHBLT", "DOFASTBLT", "AEROBOOST", "", "", "", "", "", "", "", "", "", "", "", "", diff --git a/dll/dxwcore.cpp b/dll/dxwcore.cpp index f196db6..606db15 100644 --- a/dll/dxwcore.cpp +++ b/dll/dxwcore.cpp @@ -82,6 +82,7 @@ void dxwCore::InitTarget(TARGETMAP *target) dwFlags4 = target->flags4; dwFlags5 = target->flags5; dwTFlags = target->tflags; + if(dwFlags5 & AEROBOOST) dwFlags5 |= (SYSTEMMEMORY|DOSTRETCHBLT); Windowize = (dwFlags2 & WINDOWIZE) ? TRUE : FALSE; if(dwFlags3 & FULLSCREENONLY) FullScreen=TRUE; gsModules = target->module; diff --git a/dll/dxwnd.aps b/dll/dxwnd.aps index 5d9cdb7..0da9e5a 100644 Binary files a/dll/dxwnd.aps and b/dll/dxwnd.aps differ diff --git a/dll/dxwnd.cpp b/dll/dxwnd.cpp index cd5dcd7..2160a09 100644 --- a/dll/dxwnd.cpp +++ b/dll/dxwnd.cpp @@ -24,7 +24,7 @@ along with this program. If not, see . #include "dxwnd.h" #include "dxwcore.hpp" -#define VERSION "2.02.90" +#define VERSION "2.02.91" #define DDTHREADLOCK 1 diff --git a/dll/dxwnd.vs2008.suo b/dll/dxwnd.vs2008.suo index 4d557b2..890f857 100644 Binary files a/dll/dxwnd.vs2008.suo and b/dll/dxwnd.vs2008.suo differ diff --git a/dll/hddraw.h b/dll/hddraw.h index 021a437..f2579da 100644 --- a/dll/hddraw.h +++ b/dll/hddraw.h @@ -10,10 +10,15 @@ typedef int (WINAPI *GDIReleaseDC_Type)(HWND, HDC); typedef HRESULT (WINAPI *EmuBlt_Type)(LPDIRECTDRAWSURFACE, LPRECT, LPDIRECTDRAWSURFACE, LPRECT, DWORD, LPVOID); typedef HRESULT (WINAPI *RevBlt_Type)(LPDIRECTDRAWSURFACE, LPRECT, LPDIRECTDRAWSURFACE, LPRECT); +typedef HRESULT (WINAPI *PrimaryBlt_Type)(LPDIRECTDRAWSURFACE, LPRECT, LPDIRECTDRAWSURFACE, LPRECT); extern EmuBlt_Type pEmuBlt; extern RevBlt_Type pRevBlt; extern void SetBltTransformations(); +extern HRESULT WINAPI PrimaryBlt(LPDIRECTDRAWSURFACE, LPRECT, LPDIRECTDRAWSURFACE, LPRECT); +extern HRESULT WINAPI PrimaryNoBlt(LPDIRECTDRAWSURFACE, LPRECT, LPDIRECTDRAWSURFACE, LPRECT); +extern HRESULT WINAPI PrimaryStretchBlt(LPDIRECTDRAWSURFACE, LPRECT, LPDIRECTDRAWSURFACE, LPRECT); +extern HRESULT WINAPI PrimaryFastBlt(LPDIRECTDRAWSURFACE, LPRECT, LPDIRECTDRAWSURFACE, LPRECT); // COM generic types typedef HRESULT (WINAPI *QueryInterface_Type)(void *, REFIID, LPVOID *); diff --git a/host/Resource.h b/host/Resource.h index 8c63050..ff0c350 100644 Binary files a/host/Resource.h and b/host/Resource.h differ diff --git a/host/TabDebug.cpp b/host/TabDebug.cpp index a78dfa3..ca18b9d 100644 --- a/host/TabDebug.cpp +++ b/host/TabDebug.cpp @@ -32,6 +32,10 @@ void CTabDebug::DoDataExchange(CDataExchange* pDX) DDX_Check(pDX, IDC_DXPROXED, cTarget->m_DXProxed); DDX_Check(pDX, IDC_ASSERT, cTarget->m_AssertDialog); DDX_Check(pDX, IDC_MARKBLIT, cTarget->m_MarkBlit); + DDX_Check(pDX, IDC_SYSTEMMEMORY, cTarget->m_SystemMemory); + DDX_Check(pDX, IDC_NOBLT, cTarget->m_NoBlt); + DDX_Check(pDX, IDC_STRETCHBLT, cTarget->m_StretchBlt); + DDX_Check(pDX, IDC_FASTBLT, cTarget->m_FastBlt); DDX_Check(pDX, IDC_ANALYTICMODE, cTarget->m_AnalyticMode); DDX_Check(pDX, IDC_SURFACEWARN, cTarget->m_SurfaceWarn); DDX_Check(pDX, IDC_CAPMASK, cTarget->m_CapMask); diff --git a/host/TabDirectX.cpp b/host/TabDirectX.cpp index 8ebe06d..3f45d68 100644 --- a/host/TabDirectX.cpp +++ b/host/TabDirectX.cpp @@ -36,10 +36,8 @@ void CTabDirectX::DoDataExchange(CDataExchange* pDX) DDX_Check(pDX, IDC_SUPPRESSDXERRORS, cTarget->m_SuppressDXErrors); DDX_Check(pDX, IDC_BACKBUFATTACH, cTarget->m_BackBufAttach); DDX_Check(pDX, IDC_NOPALETTEUPDATE, cTarget->m_NoPaletteUpdate); - DDX_Check(pDX, IDC_SETCOMPATIBILITY, cTarget->m_SetCompatibility); - DDX_Check(pDX, IDC_DISABLEHAL, cTarget->m_DisableHAL); + //DDX_Check(pDX, IDC_DISABLEHAL, cTarget->m_DisableHAL); DDX_Check(pDX, IDC_FORCESHEL, cTarget->m_ForcesHEL); - DDX_Check(pDX, IDC_COLORFIX, cTarget->m_ColorFix); DDX_Check(pDX, IDC_NOPIXELFORMAT, cTarget->m_NoPixelFormat); DDX_Check(pDX, IDC_NOALPHACHANNEL, cTarget->m_NoAlphaChannel); DDX_Check(pDX, IDC_FIXREFCOUNTER, cTarget->m_FixRefCounter); @@ -47,6 +45,8 @@ void CTabDirectX::DoDataExchange(CDataExchange* pDX) DDX_Check(pDX, IDC_NOD3DRESET, cTarget->m_NoD3DReset); DDX_Check(pDX, IDC_NOFLIPEMULATION, cTarget->m_NoFlipEmulation); DDX_Check(pDX, IDC_FULLRECTBLT, cTarget->m_FullRectBlt); + DDX_Check(pDX, IDC_SETCOMPATIBILITY, cTarget->m_SetCompatibility); + DDX_Check(pDX, IDC_AEROBOOST, cTarget->m_AEROBoost); } BEGIN_MESSAGE_MAP(CTabDirectX, CDialog) diff --git a/host/TabWindow.cpp b/host/TabWindow.cpp index a0aca8d..7307df5 100644 --- a/host/TabWindow.cpp +++ b/host/TabWindow.cpp @@ -54,6 +54,7 @@ void CTabWindow::DoDataExchange(CDataExchange* pDX) DDX_Check(pDX, IDC_BLACKWHITE, cTarget->m_BlackWhite); DDX_Check(pDX, IDC_USERGB565, cTarget->m_UseRGB565); DDX_Check(pDX, IDC_LOCKSYSCOLORS, cTarget->m_LockSysColors); + DDX_Check(pDX, IDC_COLORFIX, cTarget->m_ColorFix); // screen resolution management DDX_Check(pDX, IDC_LIMITSCREENRES, cTarget->m_LimitScreenRes); diff --git a/host/TargetDlg.cpp b/host/TargetDlg.cpp index 3d62e15..f9164f5 100644 --- a/host/TargetDlg.cpp +++ b/host/TargetDlg.cpp @@ -39,14 +39,15 @@ CTargetDlg::CTargetDlg(CWnd* pParent /*=NULL*/) m_HandleExceptions = FALSE; m_SuppressIME = FALSE; m_SuppressD3DExt = FALSE; - m_SetCompatibility = TRUE; + m_SetCompatibility = TRUE; // default true !! + m_AEROBoost = TRUE; // default true !! m_DiabloTweak = FALSE; m_DisableHAL = FALSE; m_ForcesHEL = FALSE; m_ColorFix = FALSE; m_NoPixelFormat = FALSE; m_NoAlphaChannel = FALSE; - m_FixRefCounter = TRUE; + m_FixRefCounter = TRUE; // default true !! m_ReturnNullRef = FALSE; m_NoD3DReset = FALSE; m_SuppressChild = FALSE; @@ -104,6 +105,10 @@ CTargetDlg::CTargetDlg(CWnd* pParent /*=NULL*/) m_UseRGB565 = FALSE; m_SuppressDXErrors = FALSE; m_MarkBlit = FALSE; + m_SystemMemory = FALSE; + m_NoBlt = FALSE; + m_StretchBlt = FALSE; + m_FastBlt = FALSE; m_PreventMaximize = FALSE; m_ClientRemapping = TRUE; // default true !! m_LockWinPos = FALSE; diff --git a/host/TargetDlg.h b/host/TargetDlg.h index c35d80e..f0c36ee 100644 --- a/host/TargetDlg.h +++ b/host/TargetDlg.h @@ -83,6 +83,10 @@ public: BOOL m_UseRGB565; BOOL m_SuppressDXErrors; BOOL m_MarkBlit; + BOOL m_SystemMemory; + BOOL m_NoBlt; + BOOL m_StretchBlt; + BOOL m_FastBlt; BOOL m_PreventMaximize; BOOL m_ClientRemapping; BOOL m_LockWinPos; @@ -144,6 +148,7 @@ public: BOOL m_ClearTarget; BOOL m_SuppressIME; BOOL m_SetCompatibility; + BOOL m_AEROBoost; BOOL m_DiabloTweak; BOOL m_DisableHAL; BOOL m_ForcesHEL; diff --git a/host/dxwndhost.aps b/host/dxwndhost.aps index 6e2031a..b327c05 100644 Binary files a/host/dxwndhost.aps and b/host/dxwndhost.aps differ diff --git a/host/dxwndhost.cpp b/host/dxwndhost.cpp index bd07881..fe7e6ff 100644 --- a/host/dxwndhost.cpp +++ b/host/dxwndhost.cpp @@ -137,6 +137,8 @@ BOOL CDxwndhostApp::InitInstance() //CompatibilityMinLevel = GetPrivateProfileInt("window", "compatminlevel", 0, InitPath); + if(!gbDebug) gbDebug = GetPrivateProfileInt("window", "debug", 0, InitPath); // debug fleg set from config file + if(!LangSelected){ LANGID LangId; char LangString[20+1]; diff --git a/host/dxwndhost.rc b/host/dxwndhost.rc index e956704..cd2bb83 100644 Binary files a/host/dxwndhost.rc and b/host/dxwndhost.rc differ diff --git a/host/dxwndhost.rc.txt b/host/dxwndhost.rc.txt deleted file mode 100644 index 041693a..0000000 Binary files a/host/dxwndhost.rc.txt and /dev/null differ diff --git a/host/dxwndhost.rc2.txt b/host/dxwndhost.rc2.txt deleted file mode 100644 index 0a22beb..0000000 Binary files a/host/dxwndhost.rc2.txt and /dev/null differ diff --git a/host/dxwndhost.vs2008.suo b/host/dxwndhost.vs2008.suo index 74bffbc..0ec01b1 100644 Binary files a/host/dxwndhost.vs2008.suo and b/host/dxwndhost.vs2008.suo differ diff --git a/host/dxwndhostView.cpp b/host/dxwndhostView.cpp index 72a2cf3..646e3a1 100644 --- a/host/dxwndhostView.cpp +++ b/host/dxwndhostView.cpp @@ -184,6 +184,7 @@ static void SetTargetFromDlg(TARGETMAP *t, CTargetDlg *dlg) if(dlg->m_SuppressIME) t->flags2 |= SUPPRESSIME; if(dlg->m_SuppressD3DExt) t->flags3 |= SUPPRESSD3DEXT; if(dlg->m_SetCompatibility) t->flags2 |= SETCOMPATIBILITY; + if(dlg->m_AEROBoost) t->flags5 |= AEROBOOST; if(dlg->m_DiabloTweak) t->flags5 |= DIABLOTWEAK; if(dlg->m_DisableHAL) t->flags3 |= DISABLEHAL; if(dlg->m_ForcesHEL) t->flags3 |= FORCESHEL; @@ -221,6 +222,10 @@ static void SetTargetFromDlg(TARGETMAP *t, CTargetDlg *dlg) if(dlg->m_UseRGB565) t->flags |= USERGB565; if(dlg->m_SuppressDXErrors) t->flags |= SUPPRESSDXERRORS; if(dlg->m_MarkBlit) t->flags3 |= MARKBLIT; + if(dlg->m_SystemMemory) t->flags5 |= SYSTEMMEMORY; + if(dlg->m_NoBlt) t->flags5 |= NOBLT; + if(dlg->m_StretchBlt) t->flags5 |= DOSTRETCHBLT; + if(dlg->m_FastBlt) t->flags5 |= DOFASTBLT; if(dlg->m_PreventMaximize) t->flags |= PREVENTMAXIMIZE; if(dlg->m_ClientRemapping) t->flags |= CLIENTREMAPPING; if(dlg->m_LockWinPos) t->flags |= LOCKWINPOS; @@ -351,6 +356,7 @@ static void SetDlgFromTarget(TARGETMAP *t, CTargetDlg *dlg) dlg->m_SuppressIME = t->flags2 & SUPPRESSIME ? 1 : 0; dlg->m_SuppressD3DExt = t->flags3 & SUPPRESSD3DEXT ? 1 : 0; dlg->m_SetCompatibility = t->flags2 & SETCOMPATIBILITY ? 1 : 0; + dlg->m_AEROBoost = t->flags5 & AEROBOOST ? 1 : 0; dlg->m_DiabloTweak = t->flags5 & DIABLOTWEAK ? 1 : 0; dlg->m_DisableHAL = t->flags3 & DISABLEHAL ? 1 : 0; dlg->m_ForcesHEL = t->flags3 & FORCESHEL ? 1 : 0; @@ -401,6 +407,10 @@ static void SetDlgFromTarget(TARGETMAP *t, CTargetDlg *dlg) dlg->m_UseRGB565 = t->flags & USERGB565 ? 1 : 0; dlg->m_SuppressDXErrors = t->flags & SUPPRESSDXERRORS ? 1 : 0; dlg->m_MarkBlit = t->flags3 & MARKBLIT ? 1 : 0; + dlg->m_SystemMemory = t->flags5 & SYSTEMMEMORY ? 1 : 0; + dlg->m_NoBlt = t->flags5 & NOBLT ? 1 : 0; + dlg->m_StretchBlt = t->flags5 & DOSTRETCHBLT ? 1 : 0; + dlg->m_FastBlt = t->flags5 & DOFASTBLT ? 1 : 0; dlg->m_PreventMaximize = t->flags & PREVENTMAXIMIZE ? 1 : 0; dlg->m_ClientRemapping = t->flags & CLIENTREMAPPING ? 1 : 0; dlg->m_LockWinPos = t->flags & LOCKWINPOS ? 1 : 0; diff --git a/locale/cn/Resources_Cn.ncb b/locale/cn/Resources_Cn.ncb index 009dce8..edea34c 100644 Binary files a/locale/cn/Resources_Cn.ncb and b/locale/cn/Resources_Cn.ncb differ diff --git a/locale/cn/Resources_Cn.rc b/locale/cn/Resources_Cn.rc index e7886e7..30a307f 100644 Binary files a/locale/cn/Resources_Cn.rc and b/locale/cn/Resources_Cn.rc differ diff --git a/locale/cn/Resources_Cn.suo b/locale/cn/Resources_Cn.suo new file mode 100644 index 0000000..10bee84 Binary files /dev/null and b/locale/cn/Resources_Cn.suo differ diff --git a/locale/en/Resources_EN.rc b/locale/en/Resources_EN.rc index e38ae86..cd2bb83 100644 Binary files a/locale/en/Resources_EN.rc and b/locale/en/Resources_EN.rc differ diff --git a/locale/en/Resources_En.ncb b/locale/en/Resources_En.ncb index 7063e66..0e92e8f 100644 Binary files a/locale/en/Resources_En.ncb and b/locale/en/Resources_En.ncb differ diff --git a/locale/en/Resources_En.suo b/locale/en/Resources_En.suo new file mode 100644 index 0000000..d178f86 Binary files /dev/null and b/locale/en/Resources_En.suo differ diff --git a/locale/it/Resources_IT.rc b/locale/it/Resources_IT.rc index d1927ff..8738516 100644 Binary files a/locale/it/Resources_IT.rc and b/locale/it/Resources_IT.rc differ diff --git a/locale/it/Resources_It.ncb b/locale/it/Resources_It.ncb index c22de01..db92499 100644 Binary files a/locale/it/Resources_It.ncb and b/locale/it/Resources_It.ncb differ diff --git a/locale/it/Resources_It.suo b/locale/it/Resources_It.suo new file mode 100644 index 0000000..6631d6f Binary files /dev/null and b/locale/it/Resources_It.suo differ