diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 34c8dce..811df5d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,11 @@ on: push: branches: - 'master' + - 'develop' - 'github-action' + paths: + - '.github/workflows/build.yml' + - 'action.yml' jobs: Build: @@ -41,11 +45,11 @@ jobs: with: release: true - - name: ReleaseXP build - id: build-releasexp + - name: ReleaseWin2000 build + id: build-releasewin2000 uses: ./ with: - releasexp: true + releasewin2000: true - name: Debug build id: build-debug @@ -53,63 +57,40 @@ jobs: with: debug: true - - name: DebugLogXP build - id: build-debuglogxp + - name: DebugLog build + id: build-debuglog uses: ./ with: - debuglogxp: true + debuglog: true - - name: DebugLogMiniXP build - id: build-debuglogminixp + - name: DebugLogMini build + id: build-debuglogmini uses: ./ with: - debuglogminixp: true + debuglogmini: true - name: Prepare artifact run: | : - - mkdir -p cnc-ddraw-experimental - if [[ -f "${{ steps.build-release.outputs.release }}" ]]; then - mkdir -p cnc-ddraw-release - - cp "${{ steps.build-release.outputs.release }}" cnc-ddraw-release - fi + mkdir -p cnc-ddraw-release + mkdir -p cnc-ddraw-releasewin2000 + mkdir -p cnc-ddraw-debug + mkdir -p cnc-ddraw-debuglog + mkdir -p cnc-ddraw-debuglogmini - if [[ -f "${{ steps.build-releasexp.outputs.releasexp }}" ]]; then - mkdir -p cnc-ddraw-releasexp - - cp "${{ steps.build-releasexp.outputs.releasexp }}" cnc-ddraw-releasexp - - rundll32.exe ./cnc-ddraw-releasexp/ddraw.dll, DDIsWindowed - - cp "${{ steps.build-releasexp.outputs.releasexp-pdb }}" cnc-ddraw-experimental - 7z a -tzip -mm=Deflate -mfb=258 -mpass=15 "./cnc-ddraw-experimental/cnc-ddraw-experimental-release.zip" "./cnc-ddraw-releasexp/ddraw.*" - fi + cp "${{ steps.build-release.outputs.release }}" cnc-ddraw-release - if [[ -f "${{ steps.build-debug.outputs.debug }}" ]]; then - mkdir -p cnc-ddraw-debug - - cp "${{ steps.build-debug.outputs.debug }}" cnc-ddraw-debug - cp "${{ steps.build-debug.outputs.debug-pdb }}" cnc-ddraw-debug - fi + cp "${{ steps.build-releasewin2000.outputs.releasewin2000 }}" cnc-ddraw-releasewin2000 - if [[ -f "${{ steps.build-debuglogxp.outputs.debuglogxp }}" ]]; then - mkdir -p cnc-ddraw-debuglogxp + cp "${{ steps.build-debug.outputs.debug }}" cnc-ddraw-debug + cp "${{ steps.build-debug.outputs.debug-pdb }}" cnc-ddraw-debug - cp "${{ steps.build-debuglogxp.outputs.debuglogxp }}" cnc-ddraw-debuglogxp - cp "${{ steps.build-debuglogxp.outputs.debuglogxp-pdb }}" cnc-ddraw-debuglogxp - - 7z a -tzip -mm=Deflate -mfb=258 -mpass=15 "./cnc-ddraw-experimental/cnc-ddraw-experimental-debuglog.zip" "./cnc-ddraw-debuglogxp/*" - fi + cp "${{ steps.build-debuglog.outputs.debuglog }}" cnc-ddraw-debuglog + cp "${{ steps.build-debuglog.outputs.debuglog-pdb }}" cnc-ddraw-debuglog - if [[ -f "${{ steps.build-debuglogminixp.outputs.debuglogminixp }}" ]]; then - mkdir -p cnc-ddraw-debuglogminixp - - cp "${{ steps.build-debuglogminixp.outputs.debuglogminixp }}" cnc-ddraw-debuglogminixp - cp "${{ steps.build-debuglogminixp.outputs.debuglogminixp-pdb }}" cnc-ddraw-debuglogminixp - fi + cp "${{ steps.build-debuglogmini.outputs.debuglogmini }}" cnc-ddraw-debuglogmini + cp "${{ steps.build-debuglogmini.outputs.debuglogmini-pdb }}" cnc-ddraw-debuglogmini shell: bash @@ -118,37 +99,32 @@ jobs: with: name: cnc-ddraw-release path: cnc-ddraw-release + retention-days: 14 - - name: Upload artifacts cnc-ddraw-releasexp + - name: Upload artifacts cnc-ddraw-releasewin2000 uses: actions/upload-artifact@v4 with: - name: cnc-ddraw-releasexp - path: cnc-ddraw-releasexp + name: cnc-ddraw-releasewin2000 + path: cnc-ddraw-releasewin2000 + retention-days: 14 - name: Upload artifacts cnc-ddraw-debug uses: actions/upload-artifact@v4 with: name: cnc-ddraw-debug path: cnc-ddraw-debug + retention-days: 14 - - name: Upload artifacts cnc-ddraw-debuglogxp + - name: Upload artifacts cnc-ddraw-debuglog uses: actions/upload-artifact@v4 with: - name: cnc-ddraw-debuglogxp - path: cnc-ddraw-debuglogxp + name: cnc-ddraw-debuglog + path: cnc-ddraw-debuglog + retention-days: 14 - - name: Upload artifacts cnc-ddraw-debuglogminixp + - name: Upload artifacts cnc-ddraw-debuglogmini uses: actions/upload-artifact@v4 with: - name: cnc-ddraw-debuglogminixp - path: cnc-ddraw-debuglogminixp - - - name: Release experimental - uses: softprops/action-gh-release@v1 - with: - prerelease: true - name: experimental - tag_name: experimental - files: cnc-ddraw-experimental/* - fail_on_unmatched_files: true - draft: true + name: cnc-ddraw-debuglogmini + path: cnc-ddraw-debuglogmini + retention-days: 14 diff --git a/.gitignore b/.gitignore index 46accfc..158b71e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,4 @@ -inc/git.h - # C++ Builder __astcache/ diff --git a/Makefile b/Makefile index c2f547b..36ab707 100644 --- a/Makefile +++ b/Makefile @@ -1,48 +1,49 @@ -include config.mk -TARGET ?= ddraw.dll - -LDFLAGS ?= -Wl,--enable-stdcall-fixup -s -static -shared -CFLAGS ?= -Iinc -O2 -Wall -std=c99 -LIBS = -lgdi32 -lwinmm -lole32 -lmsimg32 -lavifil32 -luuid - -COMMIT := $(shell git describe --match=NeVeRmAtCh --always --dirty || echo UNKNOWN) -BRANCH := $(shell git rev-parse --abbrev-ref HEAD || echo UNKNOWN) - -HASH := \# -ECHOTEST := $(shell echo \"\") -ifeq ($(ECHOTEST),\"\") - # Windows - ECOMMIT := $(shell echo $(HASH)define GIT_COMMIT "$(COMMIT)" > inc/git.h) - EBRANCH := $(shell echo $(HASH)define GIT_BRANCH "$(BRANCH)" >> inc/git.h) -else - # Either *nix or Windows with BusyBox (e.g. w64devkit) - ECOMMIT := $(shell echo "$(HASH)define GIT_COMMIT" \"$(COMMIT)\" > inc/git.h) - EBRANCH := $(shell echo "$(HASH)define GIT_BRANCH" \"$(BRANCH)\" >> inc/git.h) -endif - -ifdef DEBUG - CFLAGS += -D _DEBUG -D _DEBUG_X -endif - -ifdef _WIN32_WINNT - CFLAGS += -march=i486 -D _WIN32_WINNT=$(_WIN32_WINNT) -endif - CC = i686-w64-mingw32-gcc +CXX = i686-w64-mingw32-g++ WINDRES ?= i686-w64-mingw32-windres +LDFLAGS = -Wl,--enable-stdcall-fixup -s -static +CFLAGS = -Iinc -O2 -march=i486 -Wall +LIBS = -lgdi32 -lwinmm -lpsapi -ldbghelp -lole32 -SRCS := $(wildcard src/*.c) $(wildcard src/*/*.c) res.rc -OBJS := $(addsuffix .o, $(basename $(SRCS))) +FILES = src/IDirect3D/IDirect3D.c \ + src/IDirect3D/IDirect3D2.c \ + src/IDirect3D/IDirect3D3.c \ + src/IDirect3D/IDirect3D7.c \ + src/IDirectDraw/IDirectDraw.c \ + src/IDirectDraw/IDirectDrawPalette.c \ + src/IDirectDraw/IDirectDrawClipper.c \ + src/IDirectDraw/IDirectDrawSurface.c \ + src/IDirectDraw/IDirectDrawGammaControl.c \ + src/IAMMediaStream/IAMMediaStream.c \ + src/crc32.c \ + src/ini.c \ + src/blt.c \ + src/dd.c \ + src/ddpalette.c \ + src/ddsurface.c \ + src/ddclipper.c \ + src/render_ogl.c \ + src/render_gdi.c \ + src/render_d3d9.c \ + src/debug.c \ + src/mouse.c \ + src/winapi_hooks.c \ + src/screenshot.c \ + src/config.c \ + src/lodepng.c \ + src/directinput.c \ + src/hook.c \ + src/dllmain.c \ + src/wndproc.c \ + src/utils.c \ + src/fps_limiter.c \ + src/opengl_utils.c -.PHONY: clean all -all: $(TARGET) - -%.o: %.rc - $(WINDRES) -J rc $< $@ || windres -J rc $< $@ - -$(TARGET): $(OBJS) - $(CC) $(LDFLAGS) -o $@ $^ exports.def $(LIBS) +all: + $(WINDRES) -J rc ddraw.rc ddraw.rc.o + $(CC) $(CFLAGS) $(LDFLAGS) -shared -o ddraw.dll $(FILES) ddraw.def ddraw.rc.o $(LIBS) clean: - $(RM) $(TARGET) $(OBJS) || del $(TARGET) $(subst /,\\,$(OBJS)) + $(RM) ddraw.dll ddraw.rc.o diff --git a/README.md b/README.md index 7485601..0faf14f 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # cnc-ddraw -cnc-ddraw can fix compatibility issues in older 2D games, such as black screen, bad performance, crashes or defective Alt+Tab. It does also add new features such as borderless mode, windowed mode and upscaling via shaders. +cnc-ddraw can fix compatibility issues in older games, such as black screen, bad performance, crashes or defective Alt+Tab.   ### Features - - Supports Windows ME, 2000, XP, Vista, 7, 8, 10, 11, Wine (Linux/macOS/Android) and Virtual Machines + - Supports Windows 2000, XP, Vista, 7, 8, 10, 11, Wine (Linux/macOS) and Virtual Machines - GDI / OpenGL / Direct3D 9 renderer (With automatic renderer selection) - Upscaling via glsl shaders - https://imgur.com/a/kxsM1oY | https://imgur.com/a/wjrhpFV - Windowed Mode / Fullscreen Exclusive Mode / Borderless Mode @@ -24,16 +24,27 @@ cnc-ddraw can fix compatibility issues in older 2D games, such as black screen, 1. Download [cnc-ddraw.zip](https://github.com/FunkyFr3sh/cnc-ddraw/releases/latest/download/cnc-ddraw.zip) and extract it into your game folder 2. Start the game -Wine (Linux/macOS/Android) only: override `ddraw` in [winecfg](https://wiki.winehq.org/Winecfg#Libraries) manually or run `cnc-ddraw config.exe` once. +Wine (Linux/macOS) only: override `ddraw` in [winecfg](https://wiki.winehq.org/Winecfg#Libraries) manually or run cnc-ddraw config.exe once.   -**Important** +If you use cnc-ddraw with a game that got its own windowed mode built in then **make sure you disable the games own windowed mode** first. You can enable windowed mode via cnc-ddraw config.exe instead. -- **The game must be set to fullscreen**. To enable windowed mode, use `cnc-ddraw config.exe` instead -- **cnc-ddraw does not support Direct3D games**, the game must have a **DirectDraw (Software)** renderer -- **If the game doesn't start at all or it's crashing**, [then please generate a debug log file and upload it.](https://github.com/FunkyFr3sh/cnc-ddraw/issues/44) -- Some games require additional steps before they can be used with cnc-ddraw, check the [wiki](https://github.com/FunkyFr3sh/cnc-ddraw/wiki) for details +  + +**If the game starts but it doesn't work perfectly** then open the config program and check the **Compatibility settings**. + +  + +**cnc-ddraw does not support Direct3D/Glide**, it will only work with games that use a **DirectDraw (Software)** renderer. Usually you can tell by the look of the game if it's a 3D game or not, but you can also let cnc-ddraw generate a debug log and search for "IDirect3D" - Link: https://github.com/FunkyFr3sh/cnc-ddraw/issues/44 + +  + +Some games may require additional steps before they can be used with cnc-ddraw, please check the [wiki](https://github.com/FunkyFr3sh/cnc-ddraw/wiki) for more details. + +  + +**If the game doesn't start at all or it's crashing**, [then please generate a debug log file and upload it.](https://github.com/FunkyFr3sh/cnc-ddraw/issues/44)   @@ -46,446 +57,37 @@ Wine (Linux/macOS/Android) only: override `ddraw` in [winecfg](https://wiki.wine   ### Supported Games -- 101: The Airborne Invasion of Normandy -- 7th Legion -- Abomination - The Nemesis Project -- Addiction Pinball -- Age of Empires -- Age of Empires II -- Age of Empires II: The Conquerors -- Age of Empires: The Rise of Rome -- Age of Wonders -- Age of Wonders 2 -- Age of Wonders: Shadow Magic -- Agharta the Hollow Earth -- Airline 69: Return to Casablanca -- Airline Tycoon Deluxe -- Alien Nations -- American Conquest (Steam+GOG) -- American Girls Dress Designer -- Amerzone -- Ancient Conquest -- Ancient Evil -- Anno 1602: Creation of a New World -- Another War -- Anstoss 3 -- Arcanum: Of Steamworks and Magick Obscura -- Arcatera the Dark Brotherhood -- Army Men 2 -- Army Men: Air Tactics -- Army Men: Toys in Space -- Army Men: World War / Army Men: Operation Meltdown -- Arthur's Pet Chase -- Arthur's Sand Castle Contest -- Arthur's Wilderness Rescue -- Atlantis 2: Beyond Atlantis -- Atlantis 3: The New World -- Atlantis: The Lost Tales -- Atomic Bomberman -- Atrox -- Baldr Force EXE -- Baldur's Gate -- Baldur's Gate 2 -- Balls of Steel v1.2 -- Barbie(R) Photo Designer -- Barbie(tm) Beach Vacation(tm) -- Batman: Justice Unbalanced -- Batman: Toxic Chill -- Bejeweled 2 Deluxe -- Birthright: The Gorgons Alliance -- Blade & Sword -- Blood II - The Chosen -- Blue's 123 Time Activities -- Blue's Treasure Hunt -- Broken Sword -- Broken Sword 2: The Smoking Mirror -- Caesar III (Sierra - 1998) -- Call To Power 2 -- Callus 95 - CPS-1 (Capcom Play System 1) emulator -- Capitalism II -- Capitalism Lab -- Captain Claw -- Carmageddon -- Carmageddon 2 -- Casino Empire (AKA Hoyle Casino) -- Championship Manager 99-00 -- Chaos Gate -- Clans -- Close Combat 2: A Bridge Too Far -- Close Combat 3: The Russian Front -- Close Combat 4: The Battle of the Bulge -- Close Combat 5: Invasion: Normandy -- ClueFinders 3rd Grade Adventures -- ClueFinders 4th Grade Adventures -- ClueFinders 5th Grade Adventures -- ClueFinders 6th Grade Adventures -- ClueFinders Math Adventures 1.0 -- ClueFinders Math Adventures 2.0 -- ClueFinders Mystery Mansion -- ClueFinders Search and Solve Adventures -- ClueFinders The Incredible Toy Store Adventure -- ClueFinders(R) Reading Adventures Ages 9-12 -- Command & Conquer Gold -- Command & Conquer: Red Alert -- Command & Conquer: Red Alert 2 -- Command & Conquer: Red Alert 2: Yuri's Revenge -- Command & Conquer: Sole Survivor -- Command & Conquer: Tiberian Sun -- Commandos -- Commandos - Beyond The Call Of Duty -- Commandos 2 -- Commando 2004 (only with /ddraw command line parameter) -- Constructor -- Corsairs Gold -- Cossacks (Steam+GOG) -- Cultures - The Discovery of Vinland -- Cultures 2 -- Cyber Gladiators (needs CyberGladiators_Patch_Win_EN_WinXP.zip) -- Cyberchase Carnival Chaos -- Cyberchase Castleblanca Quest -- Cydonia Mars - The First Manned Mission -- Cloud Kingdom 3 (only with /ddraw command line parameter) -- Dark Earth -- Dark Reign: The Future of War -- Dark Secret of Africa -- Day Of The Tentacle -- Daytona -- Daytona USA (Sega - 1996) -- Deadlock 2 -- Deadly Tide -- Delta Force -- Desperados: Wanted Dead or Alive -- Diablo -- Diablo 2 -- Diablo 2: Lord of Destruction -- Diablo: Hellfire -- Die by the Sword -- Disciples -- Disciples 2 - Rise of the Elves -- Discoworld Noir -- Divine Divinity -- Dominion - Storm Over Gift 3 -- Doom 95 -- Dracula -- Dragon Throne: Battle of Red Cliffs -- Dreams to Realty -- DuelSavior -- DuelSavior: Justice -- Dune 2000 -- Dungeon Keeper -- Dungeon Keeper 2 -- Economic War -- Eggsucker -- Emperor: Rise of the Middle Kingdom -- Enemy Infestation -- Escape Velocity Nova -- Excalibur 2555AD -- F-16 Agressor -- F-16 Multirole Fighter -- F-22 Raptor -- Fable -- Fairy Tale About Father Frost, Ivan and Nastya -- Falcon 4.0 (Microprose version) -- Fallout -- Fallout 2 -- Fallout Tactics: Brotherhood of Steel -- Final fantasy VII -- Final fantasy VIII -- Final Liberation: Warhammer Epic 40000 (GOG) -- Freddi Fish -- Freddi Fish 4 -- Freddi Fish's One-Stop Fun Shop -- Freddi Fish: Maze Madness -- Freddi Fish: The Case of the Creature of Coral Cove -- Freddi Fish: The Case of the Haunted Schoolhouse -- Freddi Fish: The Case of the Hogfish Rustlers of Briny Gulch -- Freddi Water Worries -- Full Throttle -- Future Cop L.A.P.D -- G-Police -- Gateway (Remake) -- Geneforge -- Gilbert Goodmate And The Mushroom Of Phungoria -- Gorasul: The Legacy of the Dragon -- Grand Theft Auto -- Grand Theft Auto: London 1961 -- Grand Theft Auto: London 1969 -- Gromada Revenge -- Gruntz -- Hamtaro: Wake Up Snoozer! -- Handkerchief -- Hard Truck: Road to Victory -- Heart of Darkness -- Hearts of Iron 2 -- Heroes Chronicles: Clash of the Dragons -- Heroes Chronicles: Conquest of the Underworld -- Heroes Chronicles: Masters of the Elements -- Heroes Chronicles: Warlords of the Wasteland -- Heroes of Might and Magic -- Heroes of Might and Magic II -- Heroes of Might and Magic III -- Heroes of Might and Magic IV -- Hexen 95 -- Hooligans: Storm over Europe -- Hugo Gold -- Hugo Wild River -- Icewind Dale -- Icewind Dale 2 -- Ignition -- Imperialism 2: The Age of Exploration -- Indiana Jones and the Fate of Atlantis -- Indiana Jones and the Last Crusade -- Infantry Online -- Interstate 76 -- Invictus: In the Shadow of Olympus -- Jagged Alliance 2 -- Jagged Alliance 2: Unfinished Business -- Jagged Alliance 2: Wildfire -- Jazz Jackrabbit 2 -- Jeff Wayne's The War of the Worlds -- Karma Immortal Wrath -- Killing Time -- Kings Quest 8: Mask of Eternity -- KKND Xtreme -- KKND2: Krossfire -- Knights and Merchants: The Peasants Rebellion -- Knights and Merchants: The Shattered Kingdom -- Kohan: Immortal Sovereigns -- Konung -- Konung 2 -- Lands of Lore 2 Guardian of Destiny (Software mode only) -- Lapis (lapis.mgame.com) -- Last Bronx -- Links Extreme -- Lionheart - Legacy of the Crusader -- Little Bear Kindergarten Thinking Adventures -- Little Bear Preschool Thinking Adventures -- Little Bear Rainy Day Activities -- Little Bear Toddler Discovery Adventures -- Locomotion -- Lode Runner 2 -- Lost Vikings 2 -- M.A.X. 2 Mechanized Assault & Exploration -- Madeline 1st Grade Math -- Madeline 2nd Grade Math -- Mageslayer -- Majesty Gold -- Majesty Gold HD -- Mario Sorb 3 -- Meat Puppet -- Mech Warrior 3 -- Megaman X4 -- Metal Gear Solid -- Metal Knight -- Mob Rule (AKA Constructor: Street Wars / Street Wars: Constructor Underworld) -- Moorhuhn -- Moorhuhn 2 -- Moorhuhn Adventure: Fluch des Goldes -- Moorhuhn Adventure: Schatz des Pharao and Fluch des Goldes) -- Moorhuhn Winter Editon -- MiG-29 Fulcrum -- Mission Deliver Kindness -- Moto Racer -- Moto Racer 2 -- Nancy Drew: Danger on Deception Island -- Nancy Drew: Last Train to Blue Moon Canyon -- Nancy Drew: Message in a Haunted Mansion -- Nancy Drew: Secrets Can Kill -- Nancy Drew: Stay Tuned For Danger -- Nancy Drew: The Secret of Shadow Ranch -- Nancy Drew: Treasure in the Royal Tower -- NBA Action '98 -- NBA Full Court Press -- Need For Speed III: Hot Pursuit -- Need For Speed: High Stakes -- Neo Sonic Universe -- New Robinson -- NexusTk -- Nightmare Creatures -- Ninja Jonder Deluxe -- Nox (Westwood - 2000) -- Oddworld: Abe's Exoddus -- Oddworld: Abe's Oddysee -- Original War -- Outlaws -- Outlive -- Outwars (software mode) -- Pacific General -- Pajama Sam -- Pajama Sam 3 -- Pajama Sam 3: You Are What You Eat From Your Head To Your Feet -- Pajama Sam's Games to Play on Any Day -- Pajama Sam's One-Stop Fun Shop -- Pajama Sam(r): Life is Rough When You Lose Your Stuff(tm) -- Pajama Sam: No Need to Hide When It's Dark Outside -- Pandora's Box Puzzle Game -- Panzer Dragoon -- Patrician 3 -- Pax Imperia -- Pharaoh (Sierra - 1999) -- Pizza Syndicate (AKA Fast Food Tycoon) -- Platypus -- Populous: The Beginning -- Poseidon: Master of Atlantis -- Pro Pinball - Big Race USA -- Pro Pinball - Fantastic Journey -- Putt-Putt and Pep's Balloon-o-Rama -- Putt-Putt and Pep's Dog On A Stick -- Putt-Putt Joins the Circus -- Putt-Putt Saves The Zoo -- Putt-Putt's One-Stop Fun Shop -- Putt-Putt: Pep's Birthday Surprise -- Putt-Putt: Travels Through Time -- Quest for Glory 5 -- Rage of Mages -- Rage of Mages 2 -- Railroad Tycoon II -- Reader Rabbit 1st Grade -- Reader Rabbit 2nd Grade -- Reader Rabbit Dreamship Tales -- Reader Rabbit Kindergarten -- Reader Rabbit Learn To Read With Phonics -- Reader Rabbit Learning Creations -- Reader Rabbit Math Ages 4-6 -- Reader Rabbit Preschool 2002 -- Reader Rabbit Reading Ages 4-6 -- Reader Rabbit Reading Ages 6-9 -- Reader Rabbit Thinking Ages 4-6 (US) -- Reader Rabbit Toddler -- Reader Rabbit's(R) Math Ages 6 - 9 (2002) -- Real War -- Red Baron 3D -- Reksio and Captain Nemo (Reksio i Kapitan Nemo) -- Reksio and Kretes in Action (Reksio i Kretes w Akcji!) -- Reksio and the Pirate Treasure (Reksio i Skarb Piratów) -- Reksio and the Time Machine (Reksio i Wehikuł Czasu) -- Reksio and the UFO (Reksio i Ufo) -- Reksio and the Wizards (Reksio i Czarodzieje) -- Rent-A-Hero -- Resurrection - The Return of the Black Dragon (software mode) -- Return to Krondor -- Rising Lands (patched) -- Road Rash -- Robin Hood - The Legend of Sherwood -- Roland Garros 98 (software mode) -- RollerCoaster Tycoon -- Sanitarium -- Scooby-Doo(TM), Case File #2 The Scary Stone Dragon -- Scooby-Doo(TM), Phantom of the Knight(TM) -- Scooby-Doo(TM), Showdown in Ghost Town(TM) -- Sega Rally -- Sega Touring Car -- Septerra Core -- Settlers 3 -- Seven Kingdoms II -- Shadow Flare -- Shadow Watch -- Shogo - Mobile Armor Division -- Silver (needs "SilverUK GeForce2 And Radeon Patch") -- Sim City 3000 -- Sim Copter -- SimTunes -- Sim Theme Park (aka Theme Park World) -- SimCoaster / Theme Park Inc -- Simon the Sorcerer 1/2 (windows 95 version) -- Sonic 3D Blast -- Soldiers At War -- Space Rangers -- Spec Ops - Ranger Assault (software mode) -- SpongeBob SquarePants: Typing -- SPY Fox : Some Assembly Required -- SPY Fox in Dry Cereal -- SPY Fox: Hold the Mustard -- SPY Fox: Operation Ozone -- Squad Leader -- Star Trek Away Team -- Star Trek Generations -- Star Wars Anakin's Speedway -- Star Wars Early Learning Activity Center -- Star Wars Episode I: The Gungan Frontier -- Star Wars Jedi Knight: Dark Forces II -- Star Wars Rebellion -- Star Wars Yoda's Challenge -- Star Wars: Droid Works -- Star Wars: Galactic Battlegrounds -- Star Wars: Galactic Battlegrounds: Clone Campaigns -- Star Wars: Pit Droids -- StarCraft -- StarCraft: Broodwars -- StarFlyers Alien Space Chase -- StarFlyers Royal Jewel Rescue -- Starship Titanic -- Start Trek Armada -- Steel Panthers: World At War -- Strawberry Shortcake: Amazing Cookie Party -- Stronghold Crusader Extreme HD -- Stronghold Crusader HD -- Stronghold HD -- Sudden Strike 2 -- Superbike 2000 -- Swarog -- The Jungle Book Groove Party -- The Curse Of Monkey Island -- The Dig -- The Last Express -- The Missing on Lost Island -- The Neverhood -- The Next Worlds -- The Powerpuff Girls - Princess Snorebucks -- The Powerpuff Girls(TM) Mojo Jojo's Clone Zone -- The Rocky Interactive Horror Show -- The Sex Files -- The X-Files DVD -- Theme Hospital -- Three Kingdoms: Fate of the Dragon -- Throne of Darkness -- Thunder Brigade -- TianLong BaBu -- Tone Rebellion -- Total Annihilation -- Total Annihilation (Unofficial Beta Patch v3.9.02) -- Total Annihilation: Kingdoms -- Toy Story -- Tridonis -- Twisted Metal -- Twisted Metal 2 -- Tzar: The Burden of the Crown -- Unreal -- Uprising 2: Lead and Destroy -- Uprising: Join or Die -- Vermeer -- Virtua Cop -- Virtua Cop 2 -- Virtua Fighter 2 -- Virtua Fighter PC -- Virtual Springfield -- Virtual On: Cyber Troopers -- WarGames -- War Wind -- War Wind II - Human Onslaught -- Warcraft 2 -- WarCraft 2000: Nuclear Epidemic -- Warlords 3: Darklords Rising -- Warlords Battlecry -- Warlords Battlecry 2 -- Warlords Battlecry 3 -- Weird War -- Wheel Of Fortune -- Wing Commander - The Kilrathi Saga -- Wizardry 8 -- Wizards and Warriors -- Worms 2 -- Worms Armageddon -- Z & Z Expansion Kit -- Zeus: Master of Olympus -- Zoombinis Island Odyssey -- Zoombinis Logical Journey -- Zoombinis Mountain Rescue -- Zork Nemesis -- Zuma Deluxe -- ... -There are a lot more games supported but I don't usually update the list, just give it a try and if it doesn't work then check the [wiki](https://github.com/FunkyFr3sh/cnc-ddraw/wiki) and the instructions above. + - Command & Conquer Gold + - Command & Conquer: Red Alert + - Command & Conquer: Tiberian Sun + - Command & Conquer: Red Alert 2 + - Captain Claw + - Carmageddon + - Carmageddon 2 + - Warcraft 2 + - StarCraft + - Diablo + - Diablo 2 + - Age of Empires + - Age of Empires II + - Theme Hospital + - Populous: The Beginning + - Outlaws + - Dungeon Keeper + - Dark Reign: The Future of War + - Star Wars: Galactic Battlegrounds + - Atomic Bomberman + - Dune 2000 + - Oddworld: Abe's Oddysee + - Commandos + - Red Baron 3D + - F-16 Multirole Fighter + - F-22 Raptor + - Nox + - ... + +There are a lot more games supported but I don't usually update the list, just give it a try and if it doesn't work then check the instructions above. [![](https://img.shields.io/github/downloads/FunkyFr3sh/cnc-ddraw/total)](https://github.com/FunkyFr3sh/cnc-ddraw/releases/latest/download/cnc-ddraw.zip) diff --git a/action.yml b/action.yml index f2a0b38..0b1e1cc 100644 --- a/action.yml +++ b/action.yml @@ -11,7 +11,7 @@ # uses: phobos2077/sfall@develop # with: # release-xp: true -# +# # - name: Copy sfall to mod directory # run: copy "${{ steps.sfall.outputs.release-xp }}" "my/mod/directory/ddraw.dll" # @@ -24,20 +24,20 @@ inputs: description: 'Set to true to enable building with Release configuration' required: true - releasexp: - description: 'Set to true to enable building with ReleaseXP configuration' + releasewin2000: + description: 'Set to true to enable building with ReleaseWin2000 configuration' required: true debug: description: 'Set to true to enable building with Debug configuration' required: true - debuglogxp: - description: 'Set to true to enable building with DebugLogXP configuration' + debuglog: + description: 'Set to true to enable building with DebugLog configuration' required: true - debuglogminixp: - description: 'Set to true to enable building with DebugLogMiniXP configuration' + debuglogmini: + description: 'Set to true to enable building with DebugLogMini configuration' required: true # Outputs are always using Windows directory separator (`\`) @@ -46,16 +46,10 @@ outputs: release: description: 'Full path to ddraw.dll built with Release configuration' value: ${{ steps.build-release.outputs.ddraw-dll }} - release-pdb: - description: 'Full path to ddraw.pdb built with Release configuration' - value: ${{ steps.build-release.outputs.ddraw-pdb }} - releasexp: - description: 'Full path to ddraw.dll built with ReleaseXP configuration' - value: ${{ steps.build-releasexp.outputs.ddraw-dll }} - releasexp-pdb: - description: 'Full path to ddraw.pdb built with ReleaseXP configuration' - value: ${{ steps.build-releasexp.outputs.ddraw-pdb }} + releasewin2000: + description: 'Full path to ddraw.dll built with ReleaseWin2000 configuration' + value: ${{ steps.build-releasewin2000.outputs.ddraw-dll }} debug: description: 'Full path to ddraw.dll built with Debug configuration' @@ -64,19 +58,19 @@ outputs: description: 'Full path to ddraw.pdb built with Debug configuration' value: ${{ steps.build-debug.outputs.ddraw-pdb }} - debuglogxp: - description: 'Full path to ddraw.dll built with DebugLogXP configuration' - value: ${{ steps.build-debuglogxp.outputs.ddraw-dll }} - debuglogxp-pdb: - description: 'Full path to ddraw.pdb built with DebugLogXP configuration' - value: ${{ steps.build-debuglogxp.outputs.ddraw-pdb }} + debuglog: + description: 'Full path to ddraw.dll built with DebugLog configuration' + value: ${{ steps.build-debuglog.outputs.ddraw-dll }} + debuglog-pdb: + description: 'Full path to ddraw.pdb built with DebugLog configuration' + value: ${{ steps.build-debuglog.outputs.ddraw-pdb }} - debuglogminixp: - description: 'Full path to ddraw.dll built with DebugLogMiniXP configuration' - value: ${{ steps.build-debuglogminixp.outputs.ddraw-dll }} - debuglogminixp-pdb: - description: 'Full path to ddraw.pdb built with DebugLogMiniXP configuration' - value: ${{ steps.build-debuglogminixp.outputs.ddraw-pdb }} + debuglogmini: + description: 'Full path to ddraw.dll built with DebugLogMini configuration' + value: ${{ steps.build-debuglogmini.outputs.ddraw-dll }} + debuglogmini-pdb: + description: 'Full path to ddraw.pdb built with DebugLogMini configuration' + value: ${{ steps.build-debuglogmini.outputs.ddraw-pdb }} runs: using: 'composite' @@ -88,8 +82,8 @@ runs: if [[ "${{ runner.os }}" != "Windows" ]]; then echo "[ERROR] This action can only be used on Windows" exit 1 - elif [[ "${{ inputs.release }}" != "true" ]] && [[ "${{ inputs.releasexp }}" != "true" ]] && [[ "${{ inputs.debug }}" != "true" ]] && [[ "${{ inputs.debuglogxp }}" != "true" ]] && [[ "${{ inputs.debuglogminixp }}" != "true" ]]; then - echo "[ERROR] At least one of following inputs must be set to 'true' -- 'release', 'releasexp', 'debug', 'debuglogxp', 'debuglogminixp'" + elif [[ "${{ inputs.release }}" != "true" ]] && [[ "${{ inputs.releasewin2000 }}" != "true" ]] && [[ "${{ inputs.debug }}" != "true" ]] && [[ "${{ inputs.debuglog }}" != "true" ]] && [[ "${{ inputs.debuglogmini }}" != "true" ]]; then + echo "[ERROR] At least one of following inputs must be set to 'true' -- 'release', 'releasewin2000', 'debug', 'debuglog', 'debuglogmini'" exit 1 # elif [[ ! -f "$(cygpath --unix "$GITHUB_ACTION_PATH/cnc-ddraw.sln")" ]]; then @@ -116,35 +110,31 @@ runs: - name: Build Release id: build-release run: | - if false; then - #if [[ "${{ inputs.release }}" == "true" ]]; then + if [[ "${{ inputs.release }}" == "true" ]]; then echo ::group::Build Release # # echo "@echo off" > "$GITHUB_ACTION_PATH/sfall/PostBuild.cmd" - "${{ steps.msbuild.outputs.exe }}" "$GITHUB_ACTION_PATH/cnc-ddraw.sln" -p:Configuration=Release -p:Platform=x86 -p:PlatformToolset=v142 + "${{ steps.msbuild.outputs.exe }}" "$GITHUB_ACTION_PATH/cnc-ddraw.sln" -p:Configuration=Release -p:Platform=x86 -p:PlatformToolset=v141_xp # echo "ddraw-dll=$(cygpath --windows "$GITHUB_ACTION_PATH/bin/Release/ddraw.dll")" >> $GITHUB_OUTPUT - echo "ddraw-pdb=$(cygpath --windows "$GITHUB_ACTION_PATH/bin/Release/ddraw.pdb")" >> $GITHUB_OUTPUT echo "::endgroup::" fi shell: bash # Creating empty `PostBuild.cmd` to avoid false-positive build error - - name: Build ReleaseXP - id: build-releasexp + - name: Build ReleaseWin2000 + id: build-releasewin2000 run: | - #if false; then - if [[ "${{ inputs.releasexp }}" == "true" ]]; then - echo ::group::Build ReleaseXP + if [[ "${{ inputs.releasewin2000 }}" == "true" ]]; then + echo ::group::Build ReleaseWin2000 # # echo "@echo off" > "$GITHUB_ACTION_PATH/sfall/PostBuild.cmd" - "${{ steps.msbuild.outputs.exe }}" "$GITHUB_ACTION_PATH/cnc-ddraw.sln" -p:Configuration=ReleaseXP -p:Platform=x86 -p:PlatformToolset=v141_xp + "${{ steps.msbuild.outputs.exe }}" "$GITHUB_ACTION_PATH/cnc-ddraw.sln" -p:Configuration=ReleaseWin2000 -p:Platform=x86 -p:PlatformToolset=v141_xp # - echo "ddraw-dll=$(cygpath --windows "$GITHUB_ACTION_PATH/bin/ReleaseXP/ddraw.dll")" >> $GITHUB_OUTPUT - echo "ddraw-pdb=$(cygpath --windows "$GITHUB_ACTION_PATH/bin/ReleaseXP/ddraw.pdb")" >> $GITHUB_OUTPUT + echo "ddraw-dll=$(cygpath --windows "$GITHUB_ACTION_PATH/bin/ReleaseWin2000/ddraw.dll")" >> $GITHUB_OUTPUT echo "::endgroup::" fi @@ -155,13 +145,12 @@ runs: id: build-debug run: | : - if false; then - #if [[ "${{ inputs.debug }}" == "true" ]]; then + if [[ "${{ inputs.debug }}" == "true" ]]; then echo "::group::Build Debug" # # echo "@echo off" > "$GITHUB_ACTION_PATH/sfall/PostBuild.cmd" - "${{ steps.msbuild.outputs.exe }}" "$GITHUB_ACTION_PATH/cnc-ddraw.sln" -p:Configuration=Debug -p:Platform=x86 -p:PlatformToolset=v142 + "${{ steps.msbuild.outputs.exe }}" "$GITHUB_ACTION_PATH/cnc-ddraw.sln" -p:Configuration=Debug -p:Platform=x86 -p:PlatformToolset=v141_xp # echo "ddraw-dll=$(cygpath --windows "$GITHUB_ACTION_PATH/bin/Debug/ddraw.dll")" >> $GITHUB_OUTPUT echo "ddraw-pdb=$(cygpath --windows "$GITHUB_ACTION_PATH/bin/Debug/ddraw.pdb")" >> $GITHUB_OUTPUT @@ -171,40 +160,38 @@ runs: shell: bash # Creating empty `PostBuild.cmd` to avoid false-positive build error - - name: Build DebugLogXP - id: build-debuglogxp + - name: Build DebugLog + id: build-debuglog run: | : - #if false; then - if [[ "${{ inputs.debuglogxp }}" == "true" ]]; then - echo "::group::Build DebugLogXP" + if [[ "${{ inputs.debuglog }}" == "true" ]]; then + echo "::group::Build DebugLog" # # echo "@echo off" > "$GITHUB_ACTION_PATH/sfall/PostBuild.cmd" - "${{ steps.msbuild.outputs.exe }}" "$GITHUB_ACTION_PATH/cnc-ddraw.sln" -p:Configuration=DebugLogXP -p:Platform=x86 -p:PlatformToolset=v141_xp + "${{ steps.msbuild.outputs.exe }}" "$GITHUB_ACTION_PATH/cnc-ddraw.sln" -p:Configuration=DebugLog -p:Platform=x86 -p:PlatformToolset=v141_xp # - echo "ddraw-dll=$(cygpath --windows "$GITHUB_ACTION_PATH/bin/DebugLogXP/ddraw.dll")" >> $GITHUB_OUTPUT - echo "ddraw-pdb=$(cygpath --windows "$GITHUB_ACTION_PATH/bin/DebugLogXP/ddraw.pdb")" >> $GITHUB_OUTPUT + echo "ddraw-dll=$(cygpath --windows "$GITHUB_ACTION_PATH/bin/DebugLog/ddraw.dll")" >> $GITHUB_OUTPUT + echo "ddraw-pdb=$(cygpath --windows "$GITHUB_ACTION_PATH/bin/DebugLog/ddraw.pdb")" >> $GITHUB_OUTPUT echo "::endgroup::" fi shell: bash # Creating empty `PostBuild.cmd` to avoid false-positive build error - - name: Build DebugLogMiniXP - id: build-debuglogminixp + - name: Build DebugLogMini + id: build-debuglogmini run: | : - if false; then - #if [[ "${{ inputs.debuglogminixp }}" == "true" ]]; then - echo "::group::Build DebugLogMiniXP" + if [[ "${{ inputs.debuglogmini }}" == "true" ]]; then + echo "::group::Build DebugLogMini" # # echo "@echo off" > "$GITHUB_ACTION_PATH/sfall/PostBuild.cmd" - "${{ steps.msbuild.outputs.exe }}" "$GITHUB_ACTION_PATH/cnc-ddraw.sln" -p:Configuration=DebugLogMiniXP -p:Platform=x86 -p:PlatformToolset=v141_xp + "${{ steps.msbuild.outputs.exe }}" "$GITHUB_ACTION_PATH/cnc-ddraw.sln" -p:Configuration=DebugLogMini -p:Platform=x86 -p:PlatformToolset=v141_xp # - echo "ddraw-dll=$(cygpath --windows "$GITHUB_ACTION_PATH/bin/DebugLogMiniXP/ddraw.dll")" >> $GITHUB_OUTPUT - echo "ddraw-pdb=$(cygpath --windows "$GITHUB_ACTION_PATH/bin/DebugLogMiniXP/ddraw.pdb")" >> $GITHUB_OUTPUT + echo "ddraw-dll=$(cygpath --windows "$GITHUB_ACTION_PATH/bin/DebugLogMini/ddraw.dll")" >> $GITHUB_OUTPUT + echo "ddraw-pdb=$(cygpath --windows "$GITHUB_ACTION_PATH/bin/DebugLogMini/ddraw.pdb")" >> $GITHUB_OUTPUT echo "::endgroup::" fi diff --git a/build.bat b/build.bat new file mode 100644 index 0000000..b3508d8 --- /dev/null +++ b/build.bat @@ -0,0 +1,8 @@ +@echo off +REM +REM cnc-patch environment config +REM +set PATH=C:\w64devkit\bin +make clean +make +pause diff --git a/build.cmd b/build.cmd deleted file mode 100644 index 801abe4..0000000 --- a/build.cmd +++ /dev/null @@ -1,15 +0,0 @@ -@echo off - -set GIT1=C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\ -set GIT2=C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\ -set GIT3=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\ -set GIT4=C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\ -set GIT5=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\ -set GIT6=C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\ - -set PATH=C:\w64devkit\bin;%GIT1%;%GIT2%;%GIT3%;%GIT4%;%GIT5%;%GIT6%;%PATH% - -make clean -make _WIN32_WINNT=0x0400 - -pause diff --git a/build_debug.cmd b/build_debug.cmd deleted file mode 100644 index 4e43145..0000000 --- a/build_debug.cmd +++ /dev/null @@ -1,15 +0,0 @@ -@echo off - -set GIT1=C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\ -set GIT2=C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\ -set GIT3=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\ -set GIT4=C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\ -set GIT5=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\ -set GIT6=C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\ - -set PATH=C:\w64devkit\bin;%GIT1%;%GIT2%;%GIT3%;%GIT4%;%GIT5%;%GIT6%;%PATH% - -make clean -make DEBUG=1 _WIN32_WINNT=0x0400 - -pause diff --git a/cnc-ddraw.sln b/cnc-ddraw.sln index eca7295..ab7f479 100644 --- a/cnc-ddraw.sln +++ b/cnc-ddraw.sln @@ -8,22 +8,22 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x86 = Debug|x86 - DebugLogMiniXP|x86 = DebugLogMiniXP|x86 - DebugLogXP|x86 = DebugLogXP|x86 + DebugLog|x86 = DebugLog|x86 + DebugLogMini|x86 = DebugLogMini|x86 Release|x86 = Release|x86 - ReleaseXP|x86 = ReleaseXP|x86 + ReleaseWin2000|x86 = ReleaseWin2000|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {96094551-5D52-4EBD-BE4C-5291A03507FC}.Debug|x86.ActiveCfg = Debug|Win32 {96094551-5D52-4EBD-BE4C-5291A03507FC}.Debug|x86.Build.0 = Debug|Win32 - {96094551-5D52-4EBD-BE4C-5291A03507FC}.DebugLogMiniXP|x86.ActiveCfg = DebugLogMiniXP|Win32 - {96094551-5D52-4EBD-BE4C-5291A03507FC}.DebugLogMiniXP|x86.Build.0 = DebugLogMiniXP|Win32 - {96094551-5D52-4EBD-BE4C-5291A03507FC}.DebugLogXP|x86.ActiveCfg = DebugLogXP|Win32 - {96094551-5D52-4EBD-BE4C-5291A03507FC}.DebugLogXP|x86.Build.0 = DebugLogXP|Win32 + {96094551-5D52-4EBD-BE4C-5291A03507FC}.DebugLog|x86.ActiveCfg = DebugLog|Win32 + {96094551-5D52-4EBD-BE4C-5291A03507FC}.DebugLog|x86.Build.0 = DebugLog|Win32 + {96094551-5D52-4EBD-BE4C-5291A03507FC}.DebugLogMini|x86.ActiveCfg = DebugLogMini|Win32 + {96094551-5D52-4EBD-BE4C-5291A03507FC}.DebugLogMini|x86.Build.0 = DebugLogMini|Win32 {96094551-5D52-4EBD-BE4C-5291A03507FC}.Release|x86.ActiveCfg = Release|Win32 {96094551-5D52-4EBD-BE4C-5291A03507FC}.Release|x86.Build.0 = Release|Win32 - {96094551-5D52-4EBD-BE4C-5291A03507FC}.ReleaseXP|x86.ActiveCfg = ReleaseXP|Win32 - {96094551-5D52-4EBD-BE4C-5291A03507FC}.ReleaseXP|x86.Build.0 = ReleaseXP|Win32 + {96094551-5D52-4EBD-BE4C-5291A03507FC}.ReleaseWin2000|x86.ActiveCfg = ReleaseWin2000|Win32 + {96094551-5D52-4EBD-BE4C-5291A03507FC}.ReleaseWin2000|x86.Build.0 = ReleaseWin2000|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/cnc-ddraw.vcxproj b/cnc-ddraw.vcxproj index 3f5d12d..924f32f 100644 --- a/cnc-ddraw.vcxproj +++ b/cnc-ddraw.vcxproj @@ -1,20 +1,20 @@  - - DebugLogMiniXP + + DebugLogMini Win32 - - DebugLogXP + + DebugLog Win32 Debug Win32 - - ReleaseXP + + ReleaseWin2000 Win32 @@ -27,7 +27,6 @@ - @@ -50,9 +49,7 @@ - - @@ -70,7 +67,6 @@ - @@ -78,10 +74,8 @@ - - @@ -89,10 +83,7 @@ - - - @@ -115,49 +106,50 @@ - - + + + + - cnc_ddraw - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + 7.0 {96094551-5D52-4EBD-BE4C-5291A03507FC} DynamicLibrary true - $(DefaultPlatformToolset) + v141_xp MultiByte DynamicLibrary false - $(DefaultPlatformToolset) + v141_xp true MultiByte - + DynamicLibrary false v141_xp true MultiByte - + DynamicLibrary false v141_xp true MultiByte - + DynamicLibrary false v141_xp @@ -165,7 +157,9 @@ MultiByte - + + + @@ -174,13 +168,13 @@ - + - + - + @@ -196,21 +190,21 @@ false ddraw - - $(SolutionDir)bin\ReleaseXP\ - $(SolutionDir)bin\ReleaseXP\ + + $(SolutionDir)bin\ReleaseWin2000\ + $(SolutionDir)bin\ReleaseWin2000\ false ddraw - - $(SolutionDir)bin\DebugLogXP\ - $(SolutionDir)bin\DebugLogXP\ + + $(SolutionDir)bin\DebugLog\ + $(SolutionDir)bin\DebugLog\ false ddraw - - $(SolutionDir)bin\DebugLogMiniXP\ - $(SolutionDir)bin\DebugLogMiniXP\ + + $(SolutionDir)bin\DebugLogMini\ + $(SolutionDir)bin\DebugLogMini\ false ddraw @@ -220,37 +214,22 @@ Level2 Disabled - _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_DEBUG_X;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) MultiThreadedDebug inc;src\detours Windows - avifil32.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - exports.def + dbghelp.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ddraw.def -if NOT "$(LocalDebuggerWorkingDirectory)" == "$(ProjectDir)" if exist "$(LocalDebuggerCommand)" if exist "$(LocalDebuggerWorkingDirectory)" ( +if exist "$(LocalDebuggerCommand)" if exist "$(LocalDebuggerWorkingDirectory)" ( copy "$(TargetPath)" "$(LocalDebuggerWorkingDirectory)$(TargetFileName)" ) - - -set DST_FILE="inc/git.h" -set GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\git.exe" - -if not exist %GIT_PATH% set GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\git.exe" -if not exist %GIT_PATH% set GIT_PATH=git.exe - -for /f "tokens=*" %%I in ('%GIT_PATH% describe --match=NeVeRmAtCh --always --dirty ^|^| echo UNKNOWN') do set GIT_COMMIT=%%I -for /f "tokens=*" %%I in ('%GIT_PATH% rev-parse --abbrev-ref HEAD ^|^| echo UNKNOWN') do set GIT_BRANCH=%%I - -echo #define GIT_COMMIT "%GIT_COMMIT%" > %DST_FILE% -echo #define GIT_BRANCH "%GIT_BRANCH%" >> %DST_FILE% - - @@ -268,33 +247,18 @@ echo #define GIT_BRANCH "%GIT_BRANCH%" >> %DST_FILE% Windows true true - avifil32.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - exports.def + winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ddraw.def -if NOT "$(LocalDebuggerWorkingDirectory)" == "$(ProjectDir)" if exist "$(LocalDebuggerCommand)" if exist "$(LocalDebuggerWorkingDirectory)" ( +if exist "$(LocalDebuggerCommand)" if exist "$(LocalDebuggerWorkingDirectory)" ( copy "$(TargetPath)" "$(LocalDebuggerWorkingDirectory)$(TargetFileName)" ) - - -set DST_FILE="inc/git.h" -set GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\git.exe" - -if not exist %GIT_PATH% set GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\git.exe" -if not exist %GIT_PATH% set GIT_PATH=git.exe - -for /f "tokens=*" %%I in ('%GIT_PATH% describe --match=NeVeRmAtCh --always --dirty ^|^| echo UNKNOWN') do set GIT_COMMIT=%%I -for /f "tokens=*" %%I in ('%GIT_PATH% rev-parse --abbrev-ref HEAD ^|^| echo UNKNOWN') do set GIT_BRANCH=%%I - -echo #define GIT_COMMIT "%GIT_COMMIT%" > %DST_FILE% -echo #define GIT_BRANCH "%GIT_BRANCH%" >> %DST_FILE% - - - + Level2 @@ -305,38 +269,27 @@ echo #define GIT_BRANCH "%GIT_BRANCH%" >> %DST_FILE% _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) MultiThreaded inc;src\detours + NoExtensions Windows true true - avifil32.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - exports.def + winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ddraw.def -if NOT "$(LocalDebuggerWorkingDirectory)" == "$(ProjectDir)" if exist "$(LocalDebuggerCommand)" if exist "$(LocalDebuggerWorkingDirectory)" ( +if exist "$(LocalDebuggerCommand)" if exist "$(LocalDebuggerWorkingDirectory)" ( copy "$(TargetPath)" "$(LocalDebuggerWorkingDirectory)$(TargetFileName)" ) - - -set DST_FILE="inc/git.h" -set GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\git.exe" - -if not exist %GIT_PATH% set GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\git.exe" -if not exist %GIT_PATH% set GIT_PATH=git.exe - -for /f "tokens=*" %%I in ('%GIT_PATH% describe --match=NeVeRmAtCh --always --dirty ^|^| echo UNKNOWN') do set GIT_COMMIT=%%I -for /f "tokens=*" %%I in ('%GIT_PATH% rev-parse --abbrev-ref HEAD ^|^| echo UNKNOWN') do set GIT_BRANCH=%%I - -echo #define GIT_COMMIT "%GIT_COMMIT%" > %DST_FILE% -echo #define GIT_BRANCH "%GIT_BRANCH%" >> %DST_FILE% - - + + /safeseh %(AdditionalOptions) + - + Level2 @@ -352,8 +305,8 @@ echo #define GIT_BRANCH "%GIT_BRANCH%" >> %DST_FILE% Windows true true - avifil32.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - exports.def + dbghelp.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ddraw.def @@ -362,23 +315,8 @@ if NOT "$(LocalDebuggerWorkingDirectory)" == "$(ProjectDir)" if exist "$(LocalDe ) - - -set DST_FILE="inc/git.h" -set GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\git.exe" - -if not exist %GIT_PATH% set GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\git.exe" -if not exist %GIT_PATH% set GIT_PATH=git.exe - -for /f "tokens=*" %%I in ('%GIT_PATH% describe --match=NeVeRmAtCh --always --dirty ^|^| echo UNKNOWN') do set GIT_COMMIT=%%I -for /f "tokens=*" %%I in ('%GIT_PATH% rev-parse --abbrev-ref HEAD ^|^| echo UNKNOWN') do set GIT_BRANCH=%%I - -echo #define GIT_COMMIT "%GIT_COMMIT%" > %DST_FILE% -echo #define GIT_BRANCH "%GIT_BRANCH%" >> %DST_FILE% - - - + Level2 @@ -394,8 +332,8 @@ echo #define GIT_BRANCH "%GIT_BRANCH%" >> %DST_FILE% Windows true true - avifil32.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - exports.def + dbghelp.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ddraw.def @@ -404,22 +342,9 @@ if NOT "$(LocalDebuggerWorkingDirectory)" == "$(ProjectDir)" if exist "$(LocalDe ) - - -set DST_FILE="inc/git.h" -set GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw64\bin\git.exe" - -if not exist %GIT_PATH% set GIT_PATH="$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin\git.exe" -if not exist %GIT_PATH% set GIT_PATH=git.exe - -for /f "tokens=*" %%I in ('%GIT_PATH% describe --match=NeVeRmAtCh --always --dirty ^|^| echo UNKNOWN') do set GIT_COMMIT=%%I -for /f "tokens=*" %%I in ('%GIT_PATH% rev-parse --abbrev-ref HEAD ^|^| echo UNKNOWN') do set GIT_BRANCH=%%I - -echo #define GIT_COMMIT "%GIT_COMMIT%" > %DST_FILE% -echo #define GIT_BRANCH "%GIT_BRANCH%" >> %DST_FILE% - - - + + + \ No newline at end of file diff --git a/cnc-ddraw.vcxproj.filters b/cnc-ddraw.vcxproj.filters index b15230e..5a253f1 100644 --- a/cnc-ddraw.vcxproj.filters +++ b/cnc-ddraw.vcxproj.filters @@ -159,18 +159,6 @@ Source Files - - Source Files - - - Source Files - - - Source Files - - - Source Files - @@ -287,27 +275,9 @@ Header Files - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - + Resource Files diff --git a/config/ConfigFormUnit.cpp b/config/ConfigFormUnit.cpp index 7d40a88..3954825 100644 --- a/config/ConfigFormUnit.cpp +++ b/config/ConfigFormUnit.cpp @@ -117,9 +117,6 @@ void __fastcall TConfigForm::RestoreDefaultsBtnClick(TObject *Sender) void TConfigForm::ApplyTranslation(TIniFile *ini) { - Application->HintHidePause = 100 * 1000; - Application->HintPause = 0; - auto lang = LowerCase(ini->ReadString("ddraw", "configlang", "auto")); int priID = SysLocale.PriLangID; @@ -131,31 +128,31 @@ void TConfigForm::ApplyTranslation(TIniFile *ini) ConfigForm->Caption = L"cnc-ddraw 配置"; DisplayBtn->Caption = L"显示设置"; AdvancedBtn->Caption = L"高级设置"; - HotkeyBtn->Caption = L"快捷键设置"; + HotkeyBtn->Caption = L"热键设置"; CompatibilityBtn->Caption = L"兼容性设置"; RestoreDefaultsBtn->Caption = L"恢复默认设置"; PresentationLbl->Caption = L"显示方式"; - MaintasLbl->Caption = L"保持宽高比"; - VsyncLbl->Caption = L"启用垂直同步"; + MaintasLbl->Caption = L"保持纵横比"; + VsyncLbl->Caption = L"打开垂直同步"; AdjmouseLbl->Caption = L"调整鼠标灵敏度"; - DevmodeLbl->Caption = L"将光标锁定到窗口/屏幕"; + DevmodeLbl->Caption = L"锁定光标到窗口/屏幕"; RendererLbl->Caption = L"渲染器"; BorderLbl->Caption = L"在窗口模式下显示窗口边框"; SavesettingsLbl->Caption = L"记住窗口位置和大小"; - ShaderLbl->Caption = L"OpenGL 着色器"; - MaxfpsLbl->Caption = L"限制帧速率"; - BoxingLbl->Caption = L"启用整数缩放"; + ShaderLbl->Caption = L"OpenGL着色器"; + MaxfpsLbl->Caption = L"限制帧率"; + BoxingLbl->Caption = L"打开窗盒显示/整数缩放"; ToggleWindowedLbl->Caption = L"切换窗口模式"; MaximizeWindowLbl->Caption = L"最大化窗口"; UnlockCursor1Lbl->Caption = L"解锁光标 1"; UnlockCursor2Lbl->Caption = L"解锁光标 2"; - ScreenshotLbl->Caption = L"截图"; - MaxgameticksLbl->Caption = L"限制游戏速度"; + ScreenshotLbl->Caption = L"截屏"; + MaxgameticksLbl->Caption = L"限制游戏速率"; NoactivateappLbl->Caption = L"修复损坏的Alt+Tab功能"; - ResolutionsLbl->Caption = L"解锁额外的屏幕分辨率"; - MinfpsLbl->Caption = L"强制高 FPS / 修复 Freesync/G-Sync 卡顿"; - SinglecpuLbl->Caption = L"修复低性能和声音问题"; - NonexclusiveLbl->Caption = L"修复不显示的视频/UI 元素"; + ResolutionsLbl->Caption = L"解锁其他屏幕分辨率"; + MinfpsLbl->Caption = L"强制高FPS / 修复使用Freesync/G-Sync的卡顿问题"; + SinglecpuLbl->Caption = L"修复性能不佳和声音问题"; + NonexclusiveLbl->Caption = L"修复不显示的视频/UI元素"; RendererCbx->Items->Clear(); RendererCbx->AddItem(L"自动", NULL); @@ -172,37 +169,15 @@ void TConfigForm::ApplyTranslation(TIniFile *ini) MaxgameticksCbx->Items->Clear(); MaxgameticksCbx->AddItem(L"无限制", NULL); MaxgameticksCbx->AddItem(L"与显示器刷新率同步", NULL); - MaxgameticksCbx->AddItem(L"模拟 60hz 刷新率显示器", NULL); - MaxgameticksCbx->AddItem(L"1000 次每秒", NULL); - MaxgameticksCbx->AddItem(L"500 次每秒", NULL); - MaxgameticksCbx->AddItem(L"250 次每秒", NULL); - MaxgameticksCbx->AddItem(L"125 次每秒", NULL); - MaxgameticksCbx->AddItem(L"60 次每秒", NULL); - MaxgameticksCbx->AddItem(L"30 次每秒", NULL); - MaxgameticksCbx->AddItem(L"25 次每秒", NULL); - MaxgameticksCbx->AddItem(L"15 次每秒", NULL); - - System::UnicodeString shaderHint = - L"一些着色器只有在启用放大时才有效。\n\n"; - - System::UnicodeString upscaleHint = - L"必须启用放大才能使此设置生效。\n\n"; - - System::UnicodeString enableUpscaleHint = - L"要启用放大，请将显示方式设置为“无边框” \n" - "或“拉伸至全屏”。对于“窗口化”， \n" - "你必须调整窗口大小或将窗口开启最大化。"; - - ShaderLbl->Hint = shaderHint + enableUpscaleHint; - ShaderD3DCbx->Hint = shaderHint + enableUpscaleHint; - ShaderCbx->Hint = shaderHint + enableUpscaleHint; - - MaintasLbl->Hint = upscaleHint + enableUpscaleHint; - MaintasChk->Hint = upscaleHint + enableUpscaleHint; - AdjmouseLbl->Hint = upscaleHint + enableUpscaleHint; - AdjmouseChk->Hint = upscaleHint + enableUpscaleHint; - BoxingLbl->Hint = upscaleHint + enableUpscaleHint; - BoxingChk->Hint = upscaleHint + enableUpscaleHint; + MaxgameticksCbx->AddItem(L"模拟60hz刷新率显示器", NULL); + MaxgameticksCbx->AddItem(L"1000tick每秒", NULL); + MaxgameticksCbx->AddItem(L"500tick每秒", NULL); + MaxgameticksCbx->AddItem(L"250tick每秒", NULL); + MaxgameticksCbx->AddItem(L"125tick每秒", NULL); + MaxgameticksCbx->AddItem(L"60tick每秒", NULL); + MaxgameticksCbx->AddItem(L"30tick每秒", NULL); + MaxgameticksCbx->AddItem(L"25tick每秒", NULL); + MaxgameticksCbx->AddItem(L"15tick每秒", NULL); } else if (lang == "spanish" || (lang == "auto" && priID == LANG_SPANISH)) { LanguageImg->Visible = true; @@ -262,28 +237,6 @@ void TConfigForm::ApplyTranslation(TIniFile *ini) MaxgameticksCbx->AddItem(L"30 tics por segundo", NULL); MaxgameticksCbx->AddItem(L"25 tics por segundo", NULL); MaxgameticksCbx->AddItem(L"15 tics por segundo", NULL); - - System::UnicodeString shaderHint = - L"Algunos de los sombreadores solo funcionan cuando la ampliación está habilitada. \n\n"; - - System::UnicodeString upscaleHint = - L"La ampliación debe estar habilitada para que esta configuración funcione. \n\n"; - - System::UnicodeString enableUpscaleHint = - L"Para habilitar la mejora, configure su presentación en 'Sin bordes' \n" - "o 'Pantalla completa ampliada'. Para la presentación 'Ventana', \n" - "debe cambiar el tamaño o maximizar la ventana."; - - ShaderLbl->Hint = shaderHint + enableUpscaleHint; - ShaderD3DCbx->Hint = shaderHint + enableUpscaleHint; - ShaderCbx->Hint = shaderHint + enableUpscaleHint; - - MaintasLbl->Hint = upscaleHint + enableUpscaleHint; - MaintasChk->Hint = upscaleHint + enableUpscaleHint; - AdjmouseLbl->Hint = upscaleHint + enableUpscaleHint; - AdjmouseChk->Hint = upscaleHint + enableUpscaleHint; - BoxingLbl->Hint = upscaleHint + enableUpscaleHint; - BoxingChk->Hint = upscaleHint + enableUpscaleHint; } else if (lang == "german" || (lang == "auto" && priID == LANG_GERMAN)) { LanguageImg->Visible = true; @@ -306,7 +259,7 @@ void TConfigForm::ApplyTranslation(TIniFile *ini) SavesettingsLbl->Caption = L"Fensterposition und Größe merken"; ShaderLbl->Caption = L"OpenGL Shader"; MaxfpsLbl->Caption = L"Limitiere Aktualisierungsrate"; - BoxingLbl->Caption = L"Windowboxing / Integer Skalierung aktivieren"; //Not 100% sure if "windowboxing" can be translated better. + BoxingLbl->Caption = L"Fensterboxing / Integer Skalierung aktivieren"; //Not 100% sure if "windowboxing" can be translated better. ToggleWindowedLbl->Caption = L"Fenstermodus umschalten"; MaximizeWindowLbl->Caption = L"Fenster maximieren"; UnlockCursor1Lbl->Caption = L"Cursor entsperren 1"; @@ -343,29 +296,6 @@ void TConfigForm::ApplyTranslation(TIniFile *ini) MaxgameticksCbx->AddItem(L"30 Ticks pro Sekunde", NULL); MaxgameticksCbx->AddItem(L"25 Ticks pro Sekunde", NULL); MaxgameticksCbx->AddItem(L"15 Ticks pro Sekunde", NULL); - - System::UnicodeString shaderHint = - L"Einige der Shader funktionieren nur, wenn die Hochskalierung aktiviert ist. \n\n"; - - System::UnicodeString upscaleHint = - L"Damit diese Einstellung funktioniert, muss die Hochskalierung aktiviert sein. \n\n"; - - System::UnicodeString enableUpscaleHint = - L"Um die Hochskalierung zu aktivieren, stellen Sie Ihre Darstellung \n" - "entweder auf 'Ränderfreies Fenster' oder 'Hochskaliertes Vollbild' ein. \n" - "Für die 'Fenstermodus'-Darstellung müssen Sie die Größe des Fensters \n" - "ändern oder es maximieren."; - - ShaderLbl->Hint = shaderHint + enableUpscaleHint; - ShaderD3DCbx->Hint = shaderHint + enableUpscaleHint; - ShaderCbx->Hint = shaderHint + enableUpscaleHint; - - MaintasLbl->Hint = upscaleHint + enableUpscaleHint; - MaintasChk->Hint = upscaleHint + enableUpscaleHint; - AdjmouseLbl->Hint = upscaleHint + enableUpscaleHint; - AdjmouseChk->Hint = upscaleHint + enableUpscaleHint; - BoxingLbl->Hint = upscaleHint + enableUpscaleHint; - BoxingChk->Hint = upscaleHint + enableUpscaleHint; } else if (lang == "russian" || (lang == "auto" && priID == LANG_RUSSIAN)) { LanguageImg->Visible = true; @@ -426,28 +356,6 @@ void TConfigForm::ApplyTranslation(TIniFile *ini) MaxgameticksCbx->AddItem(L"30 тиков в секунду", NULL); MaxgameticksCbx->AddItem(L"25 тиков в секунду", NULL); MaxgameticksCbx->AddItem(L"15 тиков в секунду", NULL); - - System::UnicodeString shaderHint = - L"Некоторые шейдеры работают только при включенном масштабировании. \n\n"; - - System::UnicodeString upscaleHint = - L"Чтобы этот параметр работал, необходимо включить масштабирование. \n\n"; - - System::UnicodeString enableUpscaleHint = - L"Чтобы включить масштабирование, установите для презентации режим \n" - "'Без границ' или 'Полноэкранный масштабированный'. Для презентации в \n" - "'Оконный' режиме необходимо изменить размер или развернуть окно."; - - ShaderLbl->Hint = shaderHint + enableUpscaleHint; - ShaderD3DCbx->Hint = shaderHint + enableUpscaleHint; - ShaderCbx->Hint = shaderHint + enableUpscaleHint; - - MaintasLbl->Hint = upscaleHint + enableUpscaleHint; - MaintasChk->Hint = upscaleHint + enableUpscaleHint; - AdjmouseLbl->Hint = upscaleHint + enableUpscaleHint; - AdjmouseChk->Hint = upscaleHint + enableUpscaleHint; - BoxingLbl->Hint = upscaleHint + enableUpscaleHint; - BoxingChk->Hint = upscaleHint + enableUpscaleHint; } else if (lang == "hungarian" || (lang == "auto" && priID == LANG_HUNGARIAN)) { LanguageImg->Visible = true; @@ -507,28 +415,6 @@ void TConfigForm::ApplyTranslation(TIniFile *ini) MaxgameticksCbx->AddItem(L"30 tick másodpercenként", NULL); MaxgameticksCbx->AddItem(L"25 tick másodpercenként", NULL); MaxgameticksCbx->AddItem(L"15 tick másodpercenként", NULL); - - System::UnicodeString shaderHint = - L"Néhány árnyékoló csak akkor működik, ha a felskálázás engedélyezve van. \n\n"; - - System::UnicodeString upscaleHint = - L"A beállítás működéséhez engedélyezni kell a felskálázást. \n\n"; - - System::UnicodeString enableUpscaleHint = - L"A felskálázás engedélyezéséhez állítsa a prezentációt 'Keret nélkül' \n" - "vagy 'Teljes képernyő felskálázva' értékre. Az 'Ablakban' bemutatóhoz \n" - "át kell méretezni vagy maximalizálni kell az ablakot."; - - ShaderLbl->Hint = shaderHint + enableUpscaleHint; - ShaderD3DCbx->Hint = shaderHint + enableUpscaleHint; - ShaderCbx->Hint = shaderHint + enableUpscaleHint; - - MaintasLbl->Hint = upscaleHint + enableUpscaleHint; - MaintasChk->Hint = upscaleHint + enableUpscaleHint; - AdjmouseLbl->Hint = upscaleHint + enableUpscaleHint; - AdjmouseChk->Hint = upscaleHint + enableUpscaleHint; - BoxingLbl->Hint = upscaleHint + enableUpscaleHint; - BoxingChk->Hint = upscaleHint + enableUpscaleHint; } else if (lang == "french" || (lang == "auto" && priID == LANG_FRENCH)) { LanguageImg->Visible = true; @@ -588,28 +474,6 @@ void TConfigForm::ApplyTranslation(TIniFile *ini) MaxgameticksCbx->AddItem(L"30 tics par seconde", NULL); MaxgameticksCbx->AddItem(L"25 tics par seconde", NULL); MaxgameticksCbx->AddItem(L"15 tics par seconde", NULL); - - System::UnicodeString shaderHint = - L"Certains shaders ne fonctionnent que lorsque la mise à l'échelle est activée. \n\n"; - - System::UnicodeString upscaleHint = - L"La mise à l'échelle doit être activée pour que ce paramètre fonctionne. \n\n"; - - System::UnicodeString enableUpscaleHint = - L"Pour activer la mise à l'échelle, définissez votre présentation \n" - "sur 'Sans Bordure' ou 'Plein Écran Mis à l'Échelle'. Pour la \n" - "présentation 'Fenêtré', vous devez redimensionner ou agrandir la fenêtre."; - - ShaderLbl->Hint = shaderHint + enableUpscaleHint; - ShaderD3DCbx->Hint = shaderHint + enableUpscaleHint; - ShaderCbx->Hint = shaderHint + enableUpscaleHint; - - MaintasLbl->Hint = upscaleHint + enableUpscaleHint; - MaintasChk->Hint = upscaleHint + enableUpscaleHint; - AdjmouseLbl->Hint = upscaleHint + enableUpscaleHint; - AdjmouseChk->Hint = upscaleHint + enableUpscaleHint; - BoxingLbl->Hint = upscaleHint + enableUpscaleHint; - BoxingChk->Hint = upscaleHint + enableUpscaleHint; } else if (lang == "italian" || (lang == "auto" && priID == LANG_ITALIAN)) { LanguageImg->Visible = true; @@ -669,190 +533,6 @@ void TConfigForm::ApplyTranslation(TIniFile *ini) MaxgameticksCbx->AddItem(L"30 tick al secondo", NULL); MaxgameticksCbx->AddItem(L"25 tick al secondo", NULL); MaxgameticksCbx->AddItem(L"15 tick al secondo", NULL); - - System::UnicodeString shaderHint = - L"Alcuni shader funzionano solo quando il ridimensionamento dell'immagine è abilitato. \n\n"; - - System::UnicodeString upscaleHint = - L"Affinché questa impostazione funzioni, è necessario abilitare il ridimensionamento dell'immagine. \n\n"; - - System::UnicodeString enableUpscaleHint = - L"Per abilitare il ridimensionamento dell'immagine, imposta la modalità di presentazione \n" - "su 'Senza Bordi o 'Schermo Intero Ridimensionato'. Per la modalità 'In Finestra', \n" - "è necessario ridimensionare o ingrandire la finestra manualmente."; - - ShaderLbl->Hint = shaderHint + enableUpscaleHint; - ShaderD3DCbx->Hint = shaderHint + enableUpscaleHint; - ShaderCbx->Hint = shaderHint + enableUpscaleHint; - - MaintasLbl->Hint = upscaleHint + enableUpscaleHint; - MaintasChk->Hint = upscaleHint + enableUpscaleHint; - AdjmouseLbl->Hint = upscaleHint + enableUpscaleHint; - AdjmouseChk->Hint = upscaleHint + enableUpscaleHint; - BoxingLbl->Hint = upscaleHint + enableUpscaleHint; - BoxingChk->Hint = upscaleHint + enableUpscaleHint; - } - else if (lang == "vietnamese" || (lang == "auto" && priID == LANG_VIETNAMESE)) { - LanguageImg->Visible = true; - - /* -vietnamese - made by TheBuck338 @ github */ - - ConfigForm->Caption = L"Thiết lập cnc-ddraw"; - DisplayBtn->Caption = L"Cài Đặt Hình Ảnh"; - AdvancedBtn->Caption = L"Cài Đặt Nâng Cao"; - HotkeyBtn->Caption = L"Cài Đặt Phím Tắt"; - CompatibilityBtn->Caption = L"Cài Đặt Tương Thích"; - RestoreDefaultsBtn->Caption = L"Khôi phục cài đặt gốc"; - PresentationLbl->Caption = L"Chế Độ Hiển Thị"; - MaintasLbl->Caption = L"Giữ nguyên tỉ lệ khung hình"; - VsyncLbl->Caption = L"Bật VSync"; - AdjmouseLbl->Caption = L"Điều chỉnh độ nhạy của chuột"; - DevmodeLbl->Caption = L"Khóa con trỏ vào cửa sổ / màn hình"; - RendererLbl->Caption = L"Trình kết xuất"; - BorderLbl->Caption = L"Hiển thị thanh tiêu đề trong chế độ cửa sổ"; - SavesettingsLbl->Caption = L"Ghi nhớ vị trí kích thước và cửa sổ"; - ShaderLbl->Caption = L"Shader OpenGL"; - MaxfpsLbl->Caption = L"Giới hạn tốc độ khung hình"; - BoxingLbl->Caption = L"Bật windowboxing / chia tỷ lệ theo số nguyên"; - ToggleWindowedLbl->Caption = L"Bật/tắt chế độ cửa sổ"; - MaximizeWindowLbl->Caption = L"Phóng to cửa sổ"; - UnlockCursor1Lbl->Caption = L"Mở khóa con trỏ 1"; - UnlockCursor2Lbl->Caption = L"Mở khóa con trỏ 2"; - ScreenshotLbl->Caption = L"Chụp màn hình"; - MaxgameticksLbl->Caption = L"Giới hạn tốc độ trò chơi"; - NoactivateappLbl->Caption = L"Sửa lỗi Alt+Tab"; - ResolutionsLbl->Caption = L"Mở khóa thêm độ phân giải màn hình"; - MinfpsLbl->Caption = L"Khắc phục hiện tượng giật hình khi sử dụng Freesync/G-Sync"; - SinglecpuLbl->Caption = L"Khắc phục các vấn đề về hiệu năng và âm thanh kém"; - NonexclusiveLbl->Caption = L"Sửa lỗi các video / phần tử UI không hiển thị"; - - RendererCbx->Items->Clear(); - RendererCbx->AddItem(L"Tự Động", NULL); - RendererCbx->AddItem(L"Direct3D 9", NULL); - RendererCbx->AddItem(L"OpenGL", NULL); - RendererCbx->AddItem(L"GDI", NULL); - - PresentationCbx->Items->Clear(); - PresentationCbx->AddItem(L"Toàn Màn Hình", NULL); - PresentationCbx->AddItem(L"Toàn Màn Hình Nâng Cao Độ Phân Giải", NULL); - PresentationCbx->AddItem(L"Toàn Màn Hình Không Viền", NULL); - PresentationCbx->AddItem(L"Cửa Sổ", NULL); - - MaxgameticksCbx->Items->Clear(); - MaxgameticksCbx->AddItem(L"Không giới hạn", NULL); - MaxgameticksCbx->AddItem(L"Đồng bộ hóa với tần số quét màn hình", NULL); - MaxgameticksCbx->AddItem(L"Mô phỏng màn hình với tần số quét 60Hz", NULL); - MaxgameticksCbx->AddItem(L"1000 ticks mỗi giây", NULL); - MaxgameticksCbx->AddItem(L"500 ticks mỗi giây", NULL); - MaxgameticksCbx->AddItem(L"250 ticks mỗi giây", NULL); - MaxgameticksCbx->AddItem(L"125 ticks mỗi giây", NULL); - MaxgameticksCbx->AddItem(L"60 ticks mỗi giây", NULL); - MaxgameticksCbx->AddItem(L"30 ticks mỗi giây", NULL); - MaxgameticksCbx->AddItem(L"25 ticks mỗi giây", NULL); - MaxgameticksCbx->AddItem(L"15 ticks mỗi giây", NULL); - - System::UnicodeString shaderHint = - L"Một số shader chỉ hoạt động khi bật chế độ nâng cao độ phân giải. \n\n"; - - System::UnicodeString upscaleHint = - L"Phải bật chế độ nâng cao độ phân giải để cài đặt này hoạt động. \n\n"; - - System::UnicodeString enableUpscaleHint = - L"Để bật chế độ nâng cao độ phân giải, hãy đặt chế độ hiển thị của bạn\n" - "thành 'Toàn Màn Hình Không Viền' hoặc 'Toàn Màn Hình Nâng Cao Độ Phân Giải'.\n" - "Đối với chế độ 'Cửa Sổ', bạn phải thay đổi kích thước hoặc phóng to cửa sổ."; - - ShaderLbl->Hint = shaderHint + enableUpscaleHint; - ShaderD3DCbx->Hint = shaderHint + enableUpscaleHint; - ShaderCbx->Hint = shaderHint + enableUpscaleHint; - - MaintasLbl->Hint = upscaleHint + enableUpscaleHint; - MaintasChk->Hint = upscaleHint + enableUpscaleHint; - AdjmouseLbl->Hint = upscaleHint + enableUpscaleHint; - AdjmouseChk->Hint = upscaleHint + enableUpscaleHint; - BoxingLbl->Hint = upscaleHint + enableUpscaleHint; - BoxingChk->Hint = upscaleHint + enableUpscaleHint; - } - else if (lang == "polish" || (lang == "auto" && priID == LANG_POLISH)) { - LanguageImg->Visible = true; - - /* -polish - made by WaRzillA @ github */ - - ConfigForm->Caption = L"Konfiguracja cnc-ddraw"; - DisplayBtn->Caption = L"Ustawienia wyświetlania"; - AdvancedBtn->Caption = L"Ustawienia zaawansowane"; - HotkeyBtn->Caption = L"Skróty klawiaturowe"; - CompatibilityBtn->Caption = L"Ustawienia kompatybilności"; - RestoreDefaultsBtn->Caption = L"Przywróć ustawienia domyślne"; - PresentationLbl->Caption = L"Tryb wyświetlania"; - MaintasLbl->Caption = L"Zachowaj proporcje obrazu"; - VsyncLbl->Caption = L"Włącz VSync"; - AdjmouseLbl->Caption = L"Dostosuj czułość myszy"; - DevmodeLbl->Caption = L"Zablokuj kursor w oknie/na ekranie"; - RendererLbl->Caption = L"Silnik renderowania"; - BorderLbl->Caption = L"Pokaż ramki okna w trybie okienkowym"; - SavesettingsLbl->Caption = L"Zapamiętaj pozycję i rozmiar okna"; - ShaderLbl->Caption = L"Shader OpenGL"; - MaxfpsLbl->Caption = L"Ogranicz liczbę klatek na sekundę"; - BoxingLbl->Caption = L"Włącz windowboxing / integer scaling "; - ToggleWindowedLbl->Caption = L"Przełącz na tryb okienkowy"; - MaximizeWindowLbl->Caption = L"Maksymalizuj okno"; - UnlockCursor1Lbl->Caption = L"Odblokuj kursor 1"; - UnlockCursor2Lbl->Caption = L"Odblokuj kursor 2"; - ScreenshotLbl->Caption = L"Zrzut ekranu"; - MaxgameticksLbl->Caption = L"Ogranicz prędkość gry"; - NoactivateappLbl->Caption = L"Napraw nieprawidłowe działanie Alt+Tab"; - ResolutionsLbl->Caption = L"Odblokuj dodatkowe rozdzielczości ekranu"; - MinfpsLbl->Caption = L"Wymuś wysokie FPS / Napraw zacinanie Freesync/G-Sync"; - SinglecpuLbl->Caption = L"Napraw problemy z wydajnością i dźwiękiem"; - NonexclusiveLbl->Caption = L"Napraw niewidoczne filmy / elementy interfejsu"; - - RendererCbx->Items->Clear(); - RendererCbx->AddItem(L"Automatyczny", NULL); - RendererCbx->AddItem(L"Direct3D 9", NULL); - RendererCbx->AddItem(L"OpenGL", NULL); - RendererCbx->AddItem(L"GDI", NULL); - - PresentationCbx->Items->Clear(); - PresentationCbx->AddItem(L"Pełny ekran", NULL); - PresentationCbx->AddItem(L"Pełny ekran z upscalingiem", NULL); - PresentationCbx->AddItem(L"Tryb bezramkowy", NULL); - PresentationCbx->AddItem(L"Tryb okienkowy", NULL); - - MaxgameticksCbx->Items->Clear(); - MaxgameticksCbx->AddItem(L"Bez limitu", NULL); - MaxgameticksCbx->AddItem(L"Synchronizacja z odświeżaniem monitora", NULL); - MaxgameticksCbx->AddItem(L"Symulacja monitora 60 Hz", NULL); - MaxgameticksCbx->AddItem(L"1000 tików na sekundę", NULL); - MaxgameticksCbx->AddItem(L"500 tików na sekundę", NULL); - MaxgameticksCbx->AddItem(L"250 tików na sekundę", NULL); - MaxgameticksCbx->AddItem(L"125 tików na sekundę", NULL); - MaxgameticksCbx->AddItem(L"60 tików na sekundę", NULL); - MaxgameticksCbx->AddItem(L"30 tików na sekundę", NULL); - MaxgameticksCbx->AddItem(L"25 tików na sekundę", NULL); - MaxgameticksCbx->AddItem(L"15 tików na sekundę", NULL); - - System::UnicodeString shaderHint = - L"Niektóre shadery działają tylko wtedy, gdy włączone jest skalowanie. \n\n"; - - System::UnicodeString upscaleHint = - L"Skalowanie musi być włączone, aby ta opcja działała. \n\n"; - - System::UnicodeString enableUpscaleHint = - L"Aby włączyć skalowanie, ustaw tryb wyświetlania na 'Tryb bezramkowy' \n" - "lub 'Pełny ekran z upscalingiem'. Dla 'Tryb okienkowy' \n" - "musisz zmienić rozmiar lub zmaksymalizować okno."; - - ShaderLbl->Hint = shaderHint + enableUpscaleHint; - ShaderD3DCbx->Hint = shaderHint + enableUpscaleHint; - ShaderCbx->Hint = shaderHint + enableUpscaleHint; - - MaintasLbl->Hint = upscaleHint + enableUpscaleHint; - MaintasChk->Hint = upscaleHint + enableUpscaleHint; - AdjmouseLbl->Hint = upscaleHint + enableUpscaleHint; - AdjmouseChk->Hint = upscaleHint + enableUpscaleHint; - BoxingLbl->Hint = upscaleHint + enableUpscaleHint; - BoxingChk->Hint = upscaleHint + enableUpscaleHint; } else { IsEnglish = true; @@ -900,18 +580,6 @@ void TConfigForm::ApplyTranslation(TIniFile *ini) LanguageImg->Picture->Graphic = png; LanguageImg->Visible = true; } - else if (priID == LANG_VIETNAMESE) { - TPngImage *png = new TPngImage(); - png->LoadFromResourceName((int)HInstance, "PngImage_VN"); - LanguageImg->Picture->Graphic = png; - LanguageImg->Visible = true; - } - else if (priID == LANG_POLISH) { - TPngImage *png = new TPngImage(); - png->LoadFromResourceName((int)HInstance, "PngImage_PL"); - LanguageImg->Picture->Graphic = png; - LanguageImg->Visible = true; - } } catch (...) { } @@ -970,28 +638,6 @@ void TConfigForm::ApplyTranslation(TIniFile *ini) MaxgameticksCbx->AddItem(L"25 ticks per second", NULL); MaxgameticksCbx->AddItem(L"15 ticks per second", NULL); */ - - System::UnicodeString shaderHint = - L"Some of the shaders only work when upscaling is enabled. \n\n"; - - System::UnicodeString upscaleHint = - L"Upscaling must be enabled for this setting to work. \n\n"; - - System::UnicodeString enableUpscaleHint = - L"To enable upscaling, set your presentation to either 'Borderless' \n" - "or 'Fullscreen Upscaled'. For the 'Windowed' presentation, \n" - "you must resize or maximize the window."; - - ShaderLbl->Hint = shaderHint + enableUpscaleHint; - ShaderD3DCbx->Hint = shaderHint + enableUpscaleHint; - ShaderCbx->Hint = shaderHint + enableUpscaleHint; - - MaintasLbl->Hint = upscaleHint + enableUpscaleHint; - MaintasChk->Hint = upscaleHint + enableUpscaleHint; - AdjmouseLbl->Hint = upscaleHint + enableUpscaleHint; - AdjmouseChk->Hint = upscaleHint + enableUpscaleHint; - BoxingLbl->Hint = upscaleHint + enableUpscaleHint; - BoxingChk->Hint = upscaleHint + enableUpscaleHint; } ToggleWindowedKeyLbl->Caption = GetKeyText(VK_MENU) + L" +"; @@ -1144,9 +790,6 @@ void __fastcall TConfigForm::FormCreate(TObject *Sender) RendererCbx->ItemIndex = 0; } - ShaderD3DCbx->Enabled = !ContainsStr(RendererCbx->Text, "GDI"); - ShaderCbx->Enabled = ShaderD3DCbx->Enabled; - try { TStringDynArray list = TDirectory::GetFiles( @@ -1274,7 +917,7 @@ void __fastcall TConfigForm::FormCreate(TObject *Sender) MinfpsChk->State = Minfps != 0 ? tssOn : tssOff; SinglecpuChk->State = GetBool(ini, "singlecpu", true) ? tssOff : tssOn; - NonexclusiveChk->State = GetBool(ini, "nonexclusive", true) ? tssOn : tssOff; + NonexclusiveChk->State = GetBool(ini, "nonexclusive", false) ? tssOn : tssOff; CompatibilityBtn->Visible = !GetBool(ini, "hide_compat_tab", false); @@ -1733,9 +1376,6 @@ void __fastcall TConfigForm::DevmodeChkClick(TObject *Sender) void __fastcall TConfigForm::RendererCbxChange(TObject *Sender) { - ShaderD3DCbx->Enabled = !ContainsStr(RendererCbx->Text, "GDI"); - ShaderCbx->Enabled = ShaderD3DCbx->Enabled; - if (ContainsStr(RendererCbx->Text, "Direct3D")) { ShaderLbl->Caption = diff --git a/config/ConfigFormUnit.dfm b/config/ConfigFormUnit.dfm index 4f108df..a69b94f 100644 --- a/config/ConfigFormUnit.dfm +++ b/config/ConfigFormUnit.dfm @@ -2677,7 +2677,7 @@ object ConfigForm: TConfigForm 61C0650530766087F0B9DE67A1EF3B173173597F3B695CC608E0B202F8FC22D7 BBBF4CD8CBB88CCBB88CCBB88CCBB88CCBB88CCBB88CCBB88CCBB88CCBB88CCB B88CB18EFF1FA2974C1C31AF16A40000000049454E44AE426082} - Position = poScreenCenter + Position = poDesktopCenter OnActivate = FormActivate OnCreate = FormCreate DesignSize = ( @@ -2696,6 +2696,8 @@ object ConfigForm: TConfigForm ShowCaption = False TabOrder = 1 StyleElements = [seFont, seBorder] + ExplicitWidth = 495 + ExplicitHeight = 464 DesignSize = ( 499 465) @@ -2725,8 +2727,6 @@ object ConfigForm: TConfigForm Font.Name = 'Segoe UI' Font.Style = [] ParentFont = False - ParentShowHint = False - ShowHint = True end object VsyncLbl: TLabel Left = 40 @@ -2755,8 +2755,6 @@ object ConfigForm: TConfigForm Font.Name = 'Segoe UI' Font.Style = [] ParentFont = False - ParentShowHint = False - ShowHint = True end object DevmodeLbl: TLabel Left = 40 @@ -2836,8 +2834,6 @@ object ConfigForm: TConfigForm Top = 132 Width = 50 Height = 20 - ParentShowHint = False - ShowHint = True ShowStateCaption = False TabOrder = 0 OnClick = MaintasChkClick @@ -2856,8 +2852,6 @@ object ConfigForm: TConfigForm Top = 268 Width = 50 Height = 20 - ParentShowHint = False - ShowHint = True ShowStateCaption = False TabOrder = 3 OnClick = AdjmouseChkClick @@ -2883,6 +2877,7 @@ object ConfigForm: TConfigForm TabOrder = 5 StyleElements = [seFont, seBorder] OnClick = ThemePnlClick + ExplicitLeft = 471 end end object CompatibilityPnl: TPanel @@ -2898,6 +2893,8 @@ object ConfigForm: TConfigForm TabOrder = 3 Visible = False StyleElements = [seFont, seBorder] + ExplicitWidth = 495 + ExplicitHeight = 464 object MaxgameticksLbl: TLabel Left = 40 Top = 28 @@ -3078,6 +3075,8 @@ object ConfigForm: TConfigForm TabOrder = 2 Visible = False StyleElements = [seFont, seBorder] + ExplicitWidth = 495 + ExplicitHeight = 464 object RendererLbl: TLabel Left = 40 Top = 28 @@ -3118,8 +3117,6 @@ object ConfigForm: TConfigForm Font.Name = 'Segoe UI' Font.Style = [] ParentFont = False - ParentShowHint = False - ShowHint = True end object MaxfpsLbl: TLabel Left = 40 @@ -3162,8 +3159,6 @@ object ConfigForm: TConfigForm Font.Name = 'Segoe UI' Font.Style = [] ParentFont = False - ParentShowHint = False - ShowHint = True end object RendererPbox: TPaintBox Left = 40 @@ -3195,8 +3190,6 @@ object ConfigForm: TConfigForm Font.Name = 'Segoe UI' Font.Style = [] ParentFont = False - ParentShowHint = False - ShowHint = True TabOrder = 6 Visible = False OnChange = ShaderD3DCbxChange @@ -3256,15 +3249,13 @@ object ConfigForm: TConfigForm BevelInner = bvNone BevelOuter = bvSpace Style = csDropDownList - DropDownCount = 13 + DropDownCount = 10 Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText Font.Height = -16 Font.Name = 'Segoe UI' Font.Style = [] ParentFont = False - ParentShowHint = False - ShowHint = True TabOrder = 3 OnChange = ShaderCbxChange end @@ -3282,8 +3273,6 @@ object ConfigForm: TConfigForm Top = 277 Width = 50 Height = 20 - ParentShowHint = False - ShowHint = True ShowStateCaption = False TabOrder = 5 OnClick = BoxingChkClick @@ -3302,6 +3291,8 @@ object ConfigForm: TConfigForm TabOrder = 4 Visible = False StyleElements = [seFont, seBorder] + ExplicitWidth = 495 + ExplicitHeight = 464 object ToggleWindowedLbl: TLabel Left = 40 Top = 27 @@ -3529,6 +3520,7 @@ object ConfigForm: TConfigForm Color = clMenu ParentBackground = False TabOrder = 0 + ExplicitHeight = 467 DesignSize = ( 233 468) diff --git a/config/Resources/VN.png b/config/Resources/VN.png deleted file mode 100644 index ec7cd48..0000000 Binary files a/config/Resources/VN.png and /dev/null differ diff --git a/config/Resources/pl.png b/config/Resources/pl.png deleted file mode 100644 index d413d01..0000000 Binary files a/config/Resources/pl.png and /dev/null differ diff --git a/config/cnc-ddraw config.cbproj b/config/cnc-ddraw config.cbproj index 7792b8b..dbd448c 100644 --- a/config/cnc-ddraw config.cbproj +++ b/config/cnc-ddraw config.cbproj @@ -1,7 +1,7 @@  {E020D5C7-AE07-4DB9-9688-6D289E9FFF1A} - 20.1 + 19.5 VCL Application cnc-ddraw config.cpp @@ -10,7 +10,6 @@ Win32 1 c - cnc-ddraw config true @@ -25,11 +24,6 @@ Base true - - true - Base - true - true Base @@ -47,12 +41,6 @@ true true - - true - Cfg_1 - true - true - true Base @@ -70,12 +58,6 @@ true true - - true - Cfg_2 - true - true - JPHNE true @@ -119,14 +101,6 @@ 1033 $(BDS)\bin\default_app.manifest - - Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) - Debug - true - CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= - 1033 - $(BDS)\bin\default_app.manifest - false true @@ -167,9 +141,6 @@ PerMonitorV2 - - PerMonitorV2 - NDEBUG;$(Defines) None @@ -190,9 +161,6 @@ PerMonitorV2 - - PerMonitorV2 - 0 @@ -227,10 +195,6 @@ RCDATA PngImage_IT - - RCDATA - PngImage_PL - RCDATA PngImage_RU @@ -239,10 +203,6 @@ RCDATA PngImage_US - - RCDATA - PngImage_VN - Base @@ -305,16 +265,6 @@ true - - - true - - - - - true - - true @@ -332,16 +282,6 @@ true - - - true - - - - - true - - @@ -354,92 +294,16 @@ true - - - true - - - - - true - - - - - cnc-ddraw config.exe - true - - - - - .\ - true - - - - - .\ - true - - - - - .\ - true - - - - - .\ - true - - - - - .\ - true - - - - - .\ - true - - - - - .\ - true - - - - - .\ - true - - - - - .\ - true - - - - - .\ - true - - 1 @@ -530,16 +394,6 @@ 1 - - - res\drawable-anydpi-v21 - 1 - - - res\drawable-anydpi-v21 - 1 - - res\values @@ -560,66 +414,6 @@ 1 - - - res\values-v31 - 1 - - - res\values-v31 - 1 - - - - - res\drawable-anydpi-v26 - 1 - - - res\drawable-anydpi-v26 - 1 - - - - - res\drawable - 1 - - - res\drawable - 1 - - - - - res\drawable - 1 - - - res\drawable - 1 - - - - - res\drawable - 1 - - - res\drawable - 1 - - - - - res\drawable-anydpi-v33 - 1 - - - res\drawable-anydpi-v33 - 1 - - res\values @@ -630,16 +424,6 @@ 1 - - - res\values-night-v21 - 1 - - - res\values-night-v21 - 1 - - res\drawable @@ -810,56 +594,6 @@ 1 - - - res\drawable-anydpi-v24 - 1 - - - res\drawable-anydpi-v24 - 1 - - - - - res\drawable - 1 - - - res\drawable - 1 - - - - - res\drawable-night-anydpi-v21 - 1 - - - res\drawable-night-anydpi-v21 - 1 - - - - - res\drawable-anydpi-v31 - 1 - - - res\drawable-anydpi-v31 - 1 - - - - - res\drawable-night-anydpi-v31 - 1 - - - res\drawable-night-anydpi-v31 - 1 - - 1 @@ -1100,9 +834,6 @@ 1 - - 1 - @@ -1173,10 +904,6 @@ Assets 1 - - Assets - 1 - @@ -1187,10 +914,6 @@ Assets 1 - - Assets - 1 - @@ -1404,12 +1127,10 @@ - True False - False 12 diff --git a/config/cnc-ddraw config.cpp b/config/cnc-ddraw config.cpp index cef38b4..4c3dd33 100644 --- a/config/cnc-ddraw config.cpp +++ b/config/cnc-ddraw config.cpp @@ -11,6 +11,7 @@ #include USEFORM("ConfigFormUnit.cpp", ConfigForm); //--------------------------------------------------------------------------- + #define GAME_PATH (TPath::GetDirectoryName(Application->ExeName) + "\\") int WINAPI _tWinMain(HINSTANCE, HINSTANCE, LPTSTR, int) @@ -67,15 +68,4 @@ int WINAPI _tWinMain(HINSTANCE, HINSTANCE, LPTSTR, int) } return 0; } - -// dummy functions to avoid Wtsapi32.dll imports -EXTERN_C BOOL WINAPI WTSRegisterSessionNotification(HWND hWnd, DWORD dwFlags) -{ - return TRUE; -} - -EXTERN_C BOOL WINAPI WTSUnRegisterSessionNotification(HWND hWnd) -{ - return TRUE; -} //--------------------------------------------------------------------------- diff --git a/config/cnc-ddraw config_resources.rc b/config/cnc-ddraw config_resources.rc index b077d3a..a2ed1e5 100644 --- a/config/cnc-ddraw config_resources.rc +++ b/config/cnc-ddraw config_resources.rc @@ -4,7 +4,5 @@ PngImage_ES RCDATA "Resources\\ES.png" PngImage_FR RCDATA "Resources\\fr.png" PngImage_HU RCDATA "Resources\\hu.png" PngImage_IT RCDATA "Resources\\IT.png" -PngImage_PL RCDATA "Resources\\pl.png" PngImage_RU RCDATA "Resources\\RU.png" PngImage_US RCDATA "Resources\\US.png" -PngImage_VN RCDATA "Resources\\VN.png" diff --git a/exports.def b/ddraw.def similarity index 96% rename from exports.def rename to ddraw.def index 1e25f0f..ff672bc 100644 --- a/exports.def +++ b/ddraw.def @@ -21,5 +21,3 @@ EXPORTS GameHandlesClose DATA pvBmpBits = FakePrimarySurface DATA DDIsWindowed - DDGetProcAddress - DDEnableZoom diff --git a/res.rc b/ddraw.rc similarity index 77% rename from res.rc rename to ddraw.rc index 46f3908..69ba76c 100644 --- a/res.rc +++ b/ddraw.rc @@ -1,6 +1,4 @@ #include "inc/version.h" -#include "inc/git.h" - 1 VERSIONINFO FILEVERSION VERSION @@ -12,13 +10,13 @@ PRODUCTVERSION VERSION { VALUE "CompanyName", "github.com/FunkyFr3sh" VALUE "FileDescription", "DirectDraw replacement" - VALUE "FileVersion", VERSION_STRING " (git~" GIT_COMMIT ", " GIT_BRANCH ")" + VALUE "FileVersion", VERSION_STRING VALUE "InternalName", "ddraw" VALUE "LegalCopyright", "Copyright (c) 2010-2024" VALUE "LegalTrademarks", "" VALUE "OriginalFileName", "ddraw.dll" VALUE "ProductName", "cnc-ddraw" - VALUE "ProductVersion", VERSION_STRING " (git~" GIT_COMMIT ", " GIT_BRANCH ")" + VALUE "ProductVersion", VERSION_STRING VALUE "Comments", "https://github.com/FunkyFr3sh/cnc-ddraw" } } diff --git a/inc/IDirect3D.h b/inc/IDirect3D.h index aed4b3d..dd03465 100644 --- a/inc/IDirect3D.h +++ b/inc/IDirect3D.h @@ -3,7 +3,6 @@ #define WIN32_LEAN_AND_MEAN #include -#include "d3dcaps.h" DEFINE_GUID(IID_IDirect3D, 0x3BBA0080, 0x2421, 0x11CF, 0xA3, 0x1A, 0x00, 0xAA, 0x00, 0xB9, 0x33, 0x56); @@ -11,9 +10,6 @@ DEFINE_GUID(IID_IDirect3D2, 0x6aae1ec1, 0x662a, 0x11d0, 0x88, 0x9d, 0x00, 0xaa, DEFINE_GUID(IID_IDirect3D3, 0xbb223240, 0xe72b, 0x11d0, 0xa9, 0xb4, 0x00, 0xaa, 0x00, 0xc0, 0x99, 0x3e); DEFINE_GUID(IID_IDirect3D7, 0xf5049e77, 0x4861, 0x11d2, 0xa4, 0x7, 0x0, 0xa0, 0xc9, 0x6, 0x29, 0xa8); -DEFINE_GUID(IID_IDirect3DNullDevice, 0x8767df22, 0xbacc, 0x11d1, 0x89, 0x69, 0x0, 0xa0, 0xc9, 0x6, 0x29, 0xa8); - - #define DECLARE_D3D_INTERFACE(iface) typedef struct iface { \ struct iface##Vtbl FAR* lpVtbl; \ ULONG ref; \ @@ -21,6 +17,7 @@ DEFINE_GUID(IID_IDirect3DNullDevice, 0x8767df22, 0xbacc, 0x11d1, 0x89, 0x69, 0x0 typedef struct iface##Vtbl iface##Vtbl; \ struct iface##Vtbl + /* IID_IDirect3D */ DECLARE_D3D_INTERFACE(IDirect3DImpl) @@ -30,7 +27,7 @@ DECLARE_D3D_INTERFACE(IDirect3DImpl) ULONG(__stdcall * Release) (IDirect3DImpl*); HRESULT(__stdcall * Initialize)(IDirect3DImpl*, int); - HRESULT(__stdcall * EnumDevices)(IDirect3DImpl*, LPD3DENUMDEVICESCALLBACK, LPVOID); + HRESULT(__stdcall * EnumDevices)(IDirect3DImpl*, int, int); HRESULT(__stdcall * CreateLight)(IDirect3DImpl*, int, int); HRESULT(__stdcall * CreateMaterial)(IDirect3DImpl*, int, int); HRESULT(__stdcall * CreateViewport)(IDirect3DImpl*, int, int); @@ -47,7 +44,7 @@ DECLARE_D3D_INTERFACE(IDirect3D2Impl) ULONG(__stdcall * AddRef) (IDirect3D2Impl*); ULONG(__stdcall * Release) (IDirect3D2Impl*); - HRESULT(__stdcall * EnumDevices)(IDirect3D2Impl*, LPD3DENUMDEVICESCALLBACK, LPVOID); + HRESULT(__stdcall * EnumDevices)(IDirect3D2Impl*, int, int); HRESULT(__stdcall * CreateLight)(IDirect3D2Impl*, int, int); HRESULT(__stdcall * CreateMaterial)(IDirect3D2Impl*, int, int); HRESULT(__stdcall * CreateViewport)(IDirect3D2Impl*, int, int); @@ -65,7 +62,7 @@ DECLARE_D3D_INTERFACE(IDirect3D3Impl) ULONG(__stdcall * AddRef) (IDirect3D3Impl*); ULONG(__stdcall * Release) (IDirect3D3Impl*); - HRESULT(__stdcall * EnumDevices)(IDirect3D3Impl*, LPD3DENUMDEVICESCALLBACK, LPVOID); + HRESULT(__stdcall * EnumDevices)(IDirect3D3Impl*, int, int); HRESULT(__stdcall * CreateLight)(IDirect3D3Impl*, int, int); HRESULT(__stdcall * CreateMaterial)(IDirect3D3Impl*, int, int); HRESULT(__stdcall * CreateViewport)(IDirect3D3Impl*, int, int); @@ -86,7 +83,7 @@ DECLARE_D3D_INTERFACE(IDirect3D7Impl) ULONG(__stdcall * AddRef) (IDirect3D7Impl*); ULONG(__stdcall * Release) (IDirect3D7Impl*); - HRESULT(__stdcall * EnumDevices)(IDirect3D7Impl*, LPD3DENUMDEVICESCALLBACK7, LPVOID); + HRESULT(__stdcall * EnumDevices)(IDirect3D7Impl*, int, int); HRESULT(__stdcall * CreateDevice)(IDirect3D7Impl*, int, int, int); HRESULT(__stdcall * CreateVertexBuffer)(IDirect3D7Impl*, int, int, int); HRESULT(__stdcall * EnumZBufferFormats)(IDirect3D7Impl*, int, int, int); diff --git a/inc/IDirectDrawClipper.h b/inc/IDirectDrawClipper.h index 95510e6..7e5161f 100644 --- a/inc/IDirectDrawClipper.h +++ b/inc/IDirectDrawClipper.h @@ -16,7 +16,6 @@ typedef struct IDirectDrawClipperImpl ULONG ref; HWND hwnd; HRGN region; - CRITICAL_SECTION cs; } IDirectDrawClipperImpl; diff --git a/inc/IDirectDrawSurface.h b/inc/IDirectDrawSurface.h index b96314a..e339450 100644 --- a/inc/IDirectDrawSurface.h +++ b/inc/IDirectDrawSurface.h @@ -9,11 +9,6 @@ #include "IDirectDraw.h" -typedef struct DDBITMAPINFO{ - BITMAPINFOHEADER bmiHeader; - RGBQUAD bmiColors[256]; -} DDBITMAPINFO; - struct IDirectDrawSurfaceImpl; struct IDirectDrawSurfaceImplVtbl; @@ -23,9 +18,9 @@ typedef struct IDirectDrawSurfaceImpl ULONG ref; - DWORD bpp; DWORD width; DWORD height; + DWORD bpp; DWORD size; DWORD flags; DWORD caps; @@ -33,8 +28,6 @@ typedef struct IDirectDrawSurfaceImpl CRITICAL_SECTION cs; IDirectDrawPaletteImpl* palette; - PALETTEENTRY selected_pal[256]; - UINT selected_pal_count; void* surface; HANDLE mapping; @@ -45,7 +38,6 @@ typedef struct IDirectDrawSurfaceImpl PBITMAPINFO bmi; HBITMAP bitmap; HDC hdc; - int dc_state; DDCOLORKEY color_key; DWORD last_flip_tick; DWORD last_blt_tick; diff --git a/inc/config.h b/inc/config.h index e15bece..fe0f885 100644 --- a/inc/config.h +++ b/inc/config.h @@ -18,17 +18,16 @@ typedef struct CNCDDRAWCONFIG char dll_file_name[MAX_PATH]; char process_file_ext[MAX_PATH]; char dll_file_ext[MAX_PATH]; - char game_section[MAX_PATH]; INIFILE ini; + BOOL is_wine; BOOL d3d9on12; BOOL opengl_core; - + /* Optional settings */ BOOL fullscreen; BOOL windowed; BOOL maintas; - char aspect_ratio[16]; BOOL boxing; int maxfps; BOOL vsync; @@ -40,10 +39,6 @@ typedef struct CNCDDRAWCONFIG int save_settings; BOOL resizable; int d3d9_filter; - int anti_aliased_fonts_min_size; - int min_font_size; - int center_window; - char inject_resolution[128]; BOOL vhack; char screenshot_dir[MAX_PATH]; BOOL toggle_borderless; @@ -53,43 +48,41 @@ typedef struct CNCDDRAWCONFIG BOOL noactivateapp; int maxgameticks; - int limiter_type; int minfps; BOOL nonexclusive; BOOL singlecpu; int resolutions; int fixchilds; BOOL hook_peekmessage; + BOOL hook_getmessage; /* Undocumented settings */ - BOOL fix_alt_key_stuck; - BOOL fix_not_responding; - BOOL no_compat_warning; + BOOL releasealt; + BOOL fixnotresponding; + int hook; int guard_lines; int max_resolutions; + BOOL limit_bltfast; BOOL lock_surfaces; + BOOL allow_wmactivate; BOOL flipclear; + BOOL fixmousehook; BOOL rgb555; BOOL no_dinput_hook; - BOOL center_cursor_fix; - char fake_mode[128]; - BOOL lock_mouse_top_left; - char win_version[32]; - int hook; - BOOL limit_gdi_handles; - BOOL remove_menu; int refresh_rate; - int terminate_process; + int anti_aliased_fonts_min_size; + int custom_width; + int custom_height; + int min_font_size; + BOOL direct3d_passthrough; /* Hotkeys */ struct { int toggle_fullscreen; - int toggle_fullscreen2; int toggle_maximize; - int toggle_maximize2; int unlock_cursor1; int unlock_cursor2; int screenshot; @@ -97,16 +90,14 @@ typedef struct CNCDDRAWCONFIG /* Game specific settings */ + BOOL remove_menu; + BOOL armadahack; BOOL tshack; BOOL infantryhack; BOOL stronghold_hack; BOOL mgs_hack; - BOOL tlc_hack; - BOOL carma95_hack; - BOOL sirtech_hack; - BOOL flightsim98_hack; - BOOL darkcolony_hack; + BOOL vermeer_hack; } CNCDDRAWCONFIG; diff --git a/inc/crc32.h b/inc/crc32.h index 9b0728d..d842810 100644 --- a/inc/crc32.h +++ b/inc/crc32.h @@ -6,6 +6,5 @@ unsigned long Crc32_ComputeBuf(unsigned long inCrc32, const void* buf, size_t bufLen); -unsigned long Crc32_FromFile(unsigned long crc32, char* filename); #endif diff --git a/inc/d3dcaps.h b/inc/d3dcaps.h deleted file mode 100644 index 4f86f61..0000000 --- a/inc/d3dcaps.h +++ /dev/null @@ -1,607 +0,0 @@ -/*==========================================================================; - * - * Copyright (C) Microsoft Corporation. All Rights Reserved. - * - * File: d3dcaps.h - * Content: Direct3D capabilities include file - * - ***************************************************************************/ - - - -#ifndef _D3DCAPS_H -#define _D3DCAPS_H - -/* - * Pull in DirectDraw include file automatically: - */ -#include "ddraw.h" - -#ifndef DIRECT3D_VERSION -#define DIRECT3D_VERSION 0x0700 -#endif - -#if defined(_X86_) || defined(_IA64_) -#pragma pack(4) -#endif - -/* Description of capabilities of transform */ - -typedef struct _D3DTRANSFORMCAPS { - DWORD dwSize; - DWORD dwCaps; -} D3DTRANSFORMCAPS, *LPD3DTRANSFORMCAPS; - -#define D3DTRANSFORMCAPS_CLIP 0x00000001L /* Will clip whilst transforming */ - -/* Description of capabilities of lighting */ - -typedef struct _D3DLIGHTINGCAPS { - DWORD dwSize; - DWORD dwCaps; /* Lighting caps */ - DWORD dwLightingModel; /* Lighting model - RGB or mono */ - DWORD dwNumLights; /* Number of lights that can be handled */ -} D3DLIGHTINGCAPS, *LPD3DLIGHTINGCAPS; - -#define D3DLIGHTINGMODEL_RGB 0x00000001L -#define D3DLIGHTINGMODEL_MONO 0x00000002L - -#define D3DLIGHTCAPS_POINT 0x00000001L /* Point lights supported */ -#define D3DLIGHTCAPS_SPOT 0x00000002L /* Spot lights supported */ -#define D3DLIGHTCAPS_DIRECTIONAL 0x00000004L /* Directional lights supported */ -#if(DIRECT3D_VERSION < 0x700) -#define D3DLIGHTCAPS_PARALLELPOINT 0x00000008L /* Parallel point lights supported */ -#endif -#if(DIRECT3D_VERSION < 0x500) -#define D3DLIGHTCAPS_GLSPOT 0x00000010L /* GL syle spot lights supported */ -#endif - -/* Description of capabilities for each primitive type */ - -typedef struct _D3DPrimCaps { - DWORD dwSize; - DWORD dwMiscCaps; /* Capability flags */ - DWORD dwRasterCaps; - DWORD dwZCmpCaps; - DWORD dwSrcBlendCaps; - DWORD dwDestBlendCaps; - DWORD dwAlphaCmpCaps; - DWORD dwShadeCaps; - DWORD dwTextureCaps; - DWORD dwTextureFilterCaps; - DWORD dwTextureBlendCaps; - DWORD dwTextureAddressCaps; - DWORD dwStippleWidth; /* maximum width and height of */ - DWORD dwStippleHeight; /* of supported stipple (up to 32x32) */ -} D3DPRIMCAPS, *LPD3DPRIMCAPS; - -/* D3DPRIMCAPS dwMiscCaps */ - -#define D3DPMISCCAPS_MASKPLANES 0x00000001L -#define D3DPMISCCAPS_MASKZ 0x00000002L -#define D3DPMISCCAPS_LINEPATTERNREP 0x00000004L -#define D3DPMISCCAPS_CONFORMANT 0x00000008L -#define D3DPMISCCAPS_CULLNONE 0x00000010L -#define D3DPMISCCAPS_CULLCW 0x00000020L -#define D3DPMISCCAPS_CULLCCW 0x00000040L - -/* D3DPRIMCAPS dwRasterCaps */ - -#define D3DPRASTERCAPS_DITHER 0x00000001L -#define D3DPRASTERCAPS_ROP2 0x00000002L -#define D3DPRASTERCAPS_XOR 0x00000004L -#define D3DPRASTERCAPS_PAT 0x00000008L -#define D3DPRASTERCAPS_ZTEST 0x00000010L -#define D3DPRASTERCAPS_SUBPIXEL 0x00000020L -#define D3DPRASTERCAPS_SUBPIXELX 0x00000040L -#define D3DPRASTERCAPS_FOGVERTEX 0x00000080L -#define D3DPRASTERCAPS_FOGTABLE 0x00000100L -#define D3DPRASTERCAPS_STIPPLE 0x00000200L -#if(DIRECT3D_VERSION >= 0x0500) -#define D3DPRASTERCAPS_ANTIALIASSORTDEPENDENT 0x00000400L -#define D3DPRASTERCAPS_ANTIALIASSORTINDEPENDENT 0x00000800L -#define D3DPRASTERCAPS_ANTIALIASEDGES 0x00001000L -#define D3DPRASTERCAPS_MIPMAPLODBIAS 0x00002000L -#define D3DPRASTERCAPS_ZBIAS 0x00004000L -#define D3DPRASTERCAPS_ZBUFFERLESSHSR 0x00008000L -#define D3DPRASTERCAPS_FOGRANGE 0x00010000L -#define D3DPRASTERCAPS_ANISOTROPY 0x00020000L -#endif /* DIRECT3D_VERSION >= 0x0500 */ -#if(DIRECT3D_VERSION >= 0x0600) -#define D3DPRASTERCAPS_WBUFFER 0x00040000L -#define D3DPRASTERCAPS_TRANSLUCENTSORTINDEPENDENT 0x00080000L -#define D3DPRASTERCAPS_WFOG 0x00100000L -#define D3DPRASTERCAPS_ZFOG 0x00200000L -#endif /* DIRECT3D_VERSION >= 0x0600 */ - -/* D3DPRIMCAPS dwZCmpCaps, dwAlphaCmpCaps */ - -#define D3DPCMPCAPS_NEVER 0x00000001L -#define D3DPCMPCAPS_LESS 0x00000002L -#define D3DPCMPCAPS_EQUAL 0x00000004L -#define D3DPCMPCAPS_LESSEQUAL 0x00000008L -#define D3DPCMPCAPS_GREATER 0x00000010L -#define D3DPCMPCAPS_NOTEQUAL 0x00000020L -#define D3DPCMPCAPS_GREATEREQUAL 0x00000040L -#define D3DPCMPCAPS_ALWAYS 0x00000080L - -/* D3DPRIMCAPS dwSourceBlendCaps, dwDestBlendCaps */ - -#define D3DPBLENDCAPS_ZERO 0x00000001L -#define D3DPBLENDCAPS_ONE 0x00000002L -#define D3DPBLENDCAPS_SRCCOLOR 0x00000004L -#define D3DPBLENDCAPS_INVSRCCOLOR 0x00000008L -#define D3DPBLENDCAPS_SRCALPHA 0x00000010L -#define D3DPBLENDCAPS_INVSRCALPHA 0x00000020L -#define D3DPBLENDCAPS_DESTALPHA 0x00000040L -#define D3DPBLENDCAPS_INVDESTALPHA 0x00000080L -#define D3DPBLENDCAPS_DESTCOLOR 0x00000100L -#define D3DPBLENDCAPS_INVDESTCOLOR 0x00000200L -#define D3DPBLENDCAPS_SRCALPHASAT 0x00000400L -#define D3DPBLENDCAPS_BOTHSRCALPHA 0x00000800L -#define D3DPBLENDCAPS_BOTHINVSRCALPHA 0x00001000L - -/* D3DPRIMCAPS dwShadeCaps */ - -#define D3DPSHADECAPS_COLORFLATMONO 0x00000001L -#define D3DPSHADECAPS_COLORFLATRGB 0x00000002L -#define D3DPSHADECAPS_COLORGOURAUDMONO 0x00000004L -#define D3DPSHADECAPS_COLORGOURAUDRGB 0x00000008L -#define D3DPSHADECAPS_COLORPHONGMONO 0x00000010L -#define D3DPSHADECAPS_COLORPHONGRGB 0x00000020L - -#define D3DPSHADECAPS_SPECULARFLATMONO 0x00000040L -#define D3DPSHADECAPS_SPECULARFLATRGB 0x00000080L -#define D3DPSHADECAPS_SPECULARGOURAUDMONO 0x00000100L -#define D3DPSHADECAPS_SPECULARGOURAUDRGB 0x00000200L -#define D3DPSHADECAPS_SPECULARPHONGMONO 0x00000400L -#define D3DPSHADECAPS_SPECULARPHONGRGB 0x00000800L - -#define D3DPSHADECAPS_ALPHAFLATBLEND 0x00001000L -#define D3DPSHADECAPS_ALPHAFLATSTIPPLED 0x00002000L -#define D3DPSHADECAPS_ALPHAGOURAUDBLEND 0x00004000L -#define D3DPSHADECAPS_ALPHAGOURAUDSTIPPLED 0x00008000L -#define D3DPSHADECAPS_ALPHAPHONGBLEND 0x00010000L -#define D3DPSHADECAPS_ALPHAPHONGSTIPPLED 0x00020000L - -#define D3DPSHADECAPS_FOGFLAT 0x00040000L -#define D3DPSHADECAPS_FOGGOURAUD 0x00080000L -#define D3DPSHADECAPS_FOGPHONG 0x00100000L - -/* D3DPRIMCAPS dwTextureCaps */ - -/* - * Perspective-correct texturing is supported - */ -#define D3DPTEXTURECAPS_PERSPECTIVE 0x00000001L - -/* - * Power-of-2 texture dimensions are required - */ -#define D3DPTEXTURECAPS_POW2 0x00000002L - -/* - * Alpha in texture pixels is supported - */ -#define D3DPTEXTURECAPS_ALPHA 0x00000004L - -/* - * Color-keyed textures are supported - */ -#define D3DPTEXTURECAPS_TRANSPARENCY 0x00000008L - -/* - * obsolete, see D3DPTADDRESSCAPS_BORDER - */ -#define D3DPTEXTURECAPS_BORDER 0x00000010L - -/* - * Only square textures are supported - */ -#define D3DPTEXTURECAPS_SQUAREONLY 0x00000020L - -#if(DIRECT3D_VERSION >= 0x0600) -/* - * Texture indices are not scaled by the texture size prior - * to interpolation. - */ -#define D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE 0x00000040L - -/* - * Device can draw alpha from texture palettes - */ -#define D3DPTEXTURECAPS_ALPHAPALETTE 0x00000080L - -/* - * Device can use non-POW2 textures if: - * 1) D3DTEXTURE_ADDRESS is set to CLAMP for this texture's stage - * 2) D3DRS_WRAP(N) is zero for this texture's coordinates - * 3) mip mapping is not enabled (use magnification filter only) - */ -#define D3DPTEXTURECAPS_NONPOW2CONDITIONAL 0x00000100L - -#endif /* DIRECT3D_VERSION >= 0x0600 */ -#if(DIRECT3D_VERSION >= 0x0700) - -// 0x00000200L unused - -/* - * Device can divide transformed texture coordinates by the - * COUNTth texture coordinate (can do D3DTTFF_PROJECTED) - */ -#define D3DPTEXTURECAPS_PROJECTED 0x00000400L - -/* - * Device can do cubemap textures - */ -#define D3DPTEXTURECAPS_CUBEMAP 0x00000800L - -#define D3DPTEXTURECAPS_COLORKEYBLEND 0x00001000L -#endif /* DIRECT3D_VERSION >= 0x0700 */ - -/* D3DPRIMCAPS dwTextureFilterCaps */ - -#define D3DPTFILTERCAPS_NEAREST 0x00000001L -#define D3DPTFILTERCAPS_LINEAR 0x00000002L -#define D3DPTFILTERCAPS_MIPNEAREST 0x00000004L -#define D3DPTFILTERCAPS_MIPLINEAR 0x00000008L -#define D3DPTFILTERCAPS_LINEARMIPNEAREST 0x00000010L -#define D3DPTFILTERCAPS_LINEARMIPLINEAR 0x00000020L - -#if(DIRECT3D_VERSION >= 0x0600) -/* Device3 Min Filter */ -#define D3DPTFILTERCAPS_MINFPOINT 0x00000100L -#define D3DPTFILTERCAPS_MINFLINEAR 0x00000200L -#define D3DPTFILTERCAPS_MINFANISOTROPIC 0x00000400L - -/* Device3 Mip Filter */ -#define D3DPTFILTERCAPS_MIPFPOINT 0x00010000L -#define D3DPTFILTERCAPS_MIPFLINEAR 0x00020000L - -/* Device3 Mag Filter */ -#define D3DPTFILTERCAPS_MAGFPOINT 0x01000000L -#define D3DPTFILTERCAPS_MAGFLINEAR 0x02000000L -#define D3DPTFILTERCAPS_MAGFANISOTROPIC 0x04000000L -#define D3DPTFILTERCAPS_MAGFAFLATCUBIC 0x08000000L -#define D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC 0x10000000L -#endif /* DIRECT3D_VERSION >= 0x0600 */ - -/* D3DPRIMCAPS dwTextureBlendCaps */ - -#define D3DPTBLENDCAPS_DECAL 0x00000001L -#define D3DPTBLENDCAPS_MODULATE 0x00000002L -#define D3DPTBLENDCAPS_DECALALPHA 0x00000004L -#define D3DPTBLENDCAPS_MODULATEALPHA 0x00000008L -#define D3DPTBLENDCAPS_DECALMASK 0x00000010L -#define D3DPTBLENDCAPS_MODULATEMASK 0x00000020L -#define D3DPTBLENDCAPS_COPY 0x00000040L -#if(DIRECT3D_VERSION >= 0x0500) -#define D3DPTBLENDCAPS_ADD 0x00000080L -#endif /* DIRECT3D_VERSION >= 0x0500 */ - -/* D3DPRIMCAPS dwTextureAddressCaps */ -#define D3DPTADDRESSCAPS_WRAP 0x00000001L -#define D3DPTADDRESSCAPS_MIRROR 0x00000002L -#define D3DPTADDRESSCAPS_CLAMP 0x00000004L -#if(DIRECT3D_VERSION >= 0x0500) -#define D3DPTADDRESSCAPS_BORDER 0x00000008L -#define D3DPTADDRESSCAPS_INDEPENDENTUV 0x00000010L -#endif /* DIRECT3D_VERSION >= 0x0500 */ - -#if(DIRECT3D_VERSION >= 0x0600) - -/* D3DDEVICEDESC dwStencilCaps */ - -#define D3DSTENCILCAPS_KEEP 0x00000001L -#define D3DSTENCILCAPS_ZERO 0x00000002L -#define D3DSTENCILCAPS_REPLACE 0x00000004L -#define D3DSTENCILCAPS_INCRSAT 0x00000008L -#define D3DSTENCILCAPS_DECRSAT 0x00000010L -#define D3DSTENCILCAPS_INVERT 0x00000020L -#define D3DSTENCILCAPS_INCR 0x00000040L -#define D3DSTENCILCAPS_DECR 0x00000080L - -/* D3DDEVICEDESC dwTextureOpCaps */ - -#define D3DTEXOPCAPS_DISABLE 0x00000001L -#define D3DTEXOPCAPS_SELECTARG1 0x00000002L -#define D3DTEXOPCAPS_SELECTARG2 0x00000004L -#define D3DTEXOPCAPS_MODULATE 0x00000008L -#define D3DTEXOPCAPS_MODULATE2X 0x00000010L -#define D3DTEXOPCAPS_MODULATE4X 0x00000020L -#define D3DTEXOPCAPS_ADD 0x00000040L -#define D3DTEXOPCAPS_ADDSIGNED 0x00000080L -#define D3DTEXOPCAPS_ADDSIGNED2X 0x00000100L -#define D3DTEXOPCAPS_SUBTRACT 0x00000200L -#define D3DTEXOPCAPS_ADDSMOOTH 0x00000400L -#define D3DTEXOPCAPS_BLENDDIFFUSEALPHA 0x00000800L -#define D3DTEXOPCAPS_BLENDTEXTUREALPHA 0x00001000L -#define D3DTEXOPCAPS_BLENDFACTORALPHA 0x00002000L -#define D3DTEXOPCAPS_BLENDTEXTUREALPHAPM 0x00004000L -#define D3DTEXOPCAPS_BLENDCURRENTALPHA 0x00008000L -#define D3DTEXOPCAPS_PREMODULATE 0x00010000L -#define D3DTEXOPCAPS_MODULATEALPHA_ADDCOLOR 0x00020000L -#define D3DTEXOPCAPS_MODULATECOLOR_ADDALPHA 0x00040000L -#define D3DTEXOPCAPS_MODULATEINVALPHA_ADDCOLOR 0x00080000L -#define D3DTEXOPCAPS_MODULATEINVCOLOR_ADDALPHA 0x00100000L -#define D3DTEXOPCAPS_BUMPENVMAP 0x00200000L -#define D3DTEXOPCAPS_BUMPENVMAPLUMINANCE 0x00400000L -#define D3DTEXOPCAPS_DOTPRODUCT3 0x00800000L - -/* D3DDEVICEDESC dwFVFCaps flags */ - -#define D3DFVFCAPS_TEXCOORDCOUNTMASK 0x0000ffffL /* mask for texture coordinate count field */ -#define D3DFVFCAPS_DONOTSTRIPELEMENTS 0x00080000L /* Device prefers that vertex elements not be stripped */ - -#endif /* DIRECT3D_VERSION >= 0x0600 */ - -typedef float D3DVALUE, *LPD3DVALUE; -typedef DWORD D3DCOLORMODEL; - -/* - * Description for a device. - * This is used to describe a device that is to be created or to query - * the current device. - */ -typedef struct _D3DDeviceDesc { - DWORD dwSize; /* Size of D3DDEVICEDESC structure */ - DWORD dwFlags; /* Indicates which fields have valid data */ - D3DCOLORMODEL dcmColorModel; /* Color model of device */ - DWORD dwDevCaps; /* Capabilities of device */ - D3DTRANSFORMCAPS dtcTransformCaps; /* Capabilities of transform */ - BOOL bClipping; /* Device can do 3D clipping */ - D3DLIGHTINGCAPS dlcLightingCaps; /* Capabilities of lighting */ - D3DPRIMCAPS dpcLineCaps; - D3DPRIMCAPS dpcTriCaps; - DWORD dwDeviceRenderBitDepth; /* One of DDBB_8, 16, etc.. */ - DWORD dwDeviceZBufferBitDepth;/* One of DDBD_16, 32, etc.. */ - DWORD dwMaxBufferSize; /* Maximum execute buffer size */ - DWORD dwMaxVertexCount; /* Maximum vertex count */ -//#if(DIRECT3D_VERSION >= 0x0500) - // *** New fields for DX5 *** // - - // Width and height caps are 0 for legacy HALs. - DWORD dwMinTextureWidth, dwMinTextureHeight; - DWORD dwMaxTextureWidth, dwMaxTextureHeight; - DWORD dwMinStippleWidth, dwMaxStippleWidth; - DWORD dwMinStippleHeight, dwMaxStippleHeight; -//#endif /* DIRECT3D_VERSION >= 0x0500 */ - -//#if(DIRECT3D_VERSION >= 0x0600) - // New fields for DX6 - DWORD dwMaxTextureRepeat; - DWORD dwMaxTextureAspectRatio; - DWORD dwMaxAnisotropy; - - // Guard band that the rasterizer can accommodate - // Screen-space vertices inside this space but outside the viewport - // will get clipped properly. - D3DVALUE dvGuardBandLeft; - D3DVALUE dvGuardBandTop; - D3DVALUE dvGuardBandRight; - D3DVALUE dvGuardBandBottom; - - D3DVALUE dvExtentsAdjust; - DWORD dwStencilCaps; - - DWORD dwFVFCaps; - DWORD dwTextureOpCaps; - WORD wMaxTextureBlendStages; - WORD wMaxSimultaneousTextures; -//#endif /* DIRECT3D_VERSION >= 0x0600 */ -} D3DDEVICEDESC, *LPD3DDEVICEDESC; - -#if(DIRECT3D_VERSION >= 0x0700) -typedef struct _D3DDeviceDesc7 { - DWORD dwDevCaps; /* Capabilities of device */ - D3DPRIMCAPS dpcLineCaps; - D3DPRIMCAPS dpcTriCaps; - DWORD dwDeviceRenderBitDepth; /* One of DDBB_8, 16, etc.. */ - DWORD dwDeviceZBufferBitDepth;/* One of DDBD_16, 32, etc.. */ - - DWORD dwMinTextureWidth, dwMinTextureHeight; - DWORD dwMaxTextureWidth, dwMaxTextureHeight; - - DWORD dwMaxTextureRepeat; - DWORD dwMaxTextureAspectRatio; - DWORD dwMaxAnisotropy; - - D3DVALUE dvGuardBandLeft; - D3DVALUE dvGuardBandTop; - D3DVALUE dvGuardBandRight; - D3DVALUE dvGuardBandBottom; - - D3DVALUE dvExtentsAdjust; - DWORD dwStencilCaps; - - DWORD dwFVFCaps; - DWORD dwTextureOpCaps; - WORD wMaxTextureBlendStages; - WORD wMaxSimultaneousTextures; - - DWORD dwMaxActiveLights; - D3DVALUE dvMaxVertexW; - GUID deviceGUID; - - WORD wMaxUserClipPlanes; - WORD wMaxVertexBlendMatrices; - - DWORD dwVertexProcessingCaps; - - DWORD dwReserved1; - DWORD dwReserved2; - DWORD dwReserved3; - DWORD dwReserved4; -} D3DDEVICEDESC7, *LPD3DDEVICEDESC7; -#endif /* DIRECT3D_VERSION >= 0x0700 */ - -#define D3DDEVICEDESCSIZE (sizeof(D3DDEVICEDESC)) -#define D3DDEVICEDESC7SIZE (sizeof(D3DDEVICEDESC7)) - -typedef HRESULT (CALLBACK * LPD3DENUMDEVICESCALLBACK)(GUID FAR *lpGuid, LPSTR lpDeviceDescription, LPSTR lpDeviceName, LPD3DDEVICEDESC, LPD3DDEVICEDESC, LPVOID); - -//#if(DIRECT3D_VERSION >= 0x0700) -typedef HRESULT (CALLBACK * LPD3DENUMDEVICESCALLBACK7)(LPSTR lpDeviceDescription, LPSTR lpDeviceName, LPD3DDEVICEDESC7, LPVOID); -//#endif /* DIRECT3D_VERSION >= 0x0700 */ - -/* D3DDEVICEDESC dwFlags indicating valid fields */ - -#define D3DDD_COLORMODEL 0x00000001L /* dcmColorModel is valid */ -#define D3DDD_DEVCAPS 0x00000002L /* dwDevCaps is valid */ -#define D3DDD_TRANSFORMCAPS 0x00000004L /* dtcTransformCaps is valid */ -#define D3DDD_LIGHTINGCAPS 0x00000008L /* dlcLightingCaps is valid */ -#define D3DDD_BCLIPPING 0x00000010L /* bClipping is valid */ -#define D3DDD_LINECAPS 0x00000020L /* dpcLineCaps is valid */ -#define D3DDD_TRICAPS 0x00000040L /* dpcTriCaps is valid */ -#define D3DDD_DEVICERENDERBITDEPTH 0x00000080L /* dwDeviceRenderBitDepth is valid */ -#define D3DDD_DEVICEZBUFFERBITDEPTH 0x00000100L /* dwDeviceZBufferBitDepth is valid */ -#define D3DDD_MAXBUFFERSIZE 0x00000200L /* dwMaxBufferSize is valid */ -#define D3DDD_MAXVERTEXCOUNT 0x00000400L /* dwMaxVertexCount is valid */ - -/* D3DDEVICEDESC dwDevCaps flags */ - -#define D3DDEVCAPS_FLOATTLVERTEX 0x00000001L /* Device accepts floating point */ - /* for post-transform vertex data */ -#define D3DDEVCAPS_SORTINCREASINGZ 0x00000002L /* Device needs data sorted for increasing Z */ -#define D3DDEVCAPS_SORTDECREASINGZ 0X00000004L /* Device needs data sorted for decreasing Z */ -#define D3DDEVCAPS_SORTEXACT 0x00000008L /* Device needs data sorted exactly */ - -#define D3DDEVCAPS_EXECUTESYSTEMMEMORY 0x00000010L /* Device can use execute buffers from system memory */ -#define D3DDEVCAPS_EXECUTEVIDEOMEMORY 0x00000020L /* Device can use execute buffers from video memory */ -#define D3DDEVCAPS_TLVERTEXSYSTEMMEMORY 0x00000040L /* Device can use TL buffers from system memory */ -#define D3DDEVCAPS_TLVERTEXVIDEOMEMORY 0x00000080L /* Device can use TL buffers from video memory */ -#define D3DDEVCAPS_TEXTURESYSTEMMEMORY 0x00000100L /* Device can texture from system memory */ -#define D3DDEVCAPS_TEXTUREVIDEOMEMORY 0x00000200L /* Device can texture from device memory */ -#if(DIRECT3D_VERSION >= 0x0500) -#define D3DDEVCAPS_DRAWPRIMTLVERTEX 0x00000400L /* Device can draw TLVERTEX primitives */ -#define D3DDEVCAPS_CANRENDERAFTERFLIP 0x00000800L /* Device can render without waiting for flip to complete */ -#define D3DDEVCAPS_TEXTURENONLOCALVIDMEM 0x00001000L /* Device can texture from nonlocal video memory */ -#endif /* DIRECT3D_VERSION >= 0x0500 */ -#if(DIRECT3D_VERSION >= 0x0600) -#define D3DDEVCAPS_DRAWPRIMITIVES2 0x00002000L /* Device can support DrawPrimitives2 */ -#define D3DDEVCAPS_SEPARATETEXTUREMEMORIES 0x00004000L /* Device is texturing from separate memory pools */ -#define D3DDEVCAPS_DRAWPRIMITIVES2EX 0x00008000L /* Device can support Extended DrawPrimitives2 i.e. DX7 compliant driver*/ -#endif /* DIRECT3D_VERSION >= 0x0600 */ -#if(DIRECT3D_VERSION >= 0x0700) -#define D3DDEVCAPS_HWTRANSFORMANDLIGHT 0x00010000L /* Device can support transformation and lighting in hardware and DRAWPRIMITIVES2EX must be also */ -#define D3DDEVCAPS_CANBLTSYSTONONLOCAL 0x00020000L /* Device supports a Tex Blt from system memory to non-local vidmem */ -#define D3DDEVCAPS_HWRASTERIZATION 0x00080000L /* Device has HW acceleration for rasterization */ - -/* - * These are the flags in the D3DDEVICEDESC7.dwVertexProcessingCaps field - */ - -/* device can do texgen */ -#define D3DVTXPCAPS_TEXGEN 0x00000001L -/* device can do IDirect3DDevice7 colormaterialsource ops */ -#define D3DVTXPCAPS_MATERIALSOURCE7 0x00000002L -/* device can do vertex fog */ -#define D3DVTXPCAPS_VERTEXFOG 0x00000004L -/* device can do directional lights */ -#define D3DVTXPCAPS_DIRECTIONALLIGHTS 0x00000008L -/* device can do positional lights (includes point and spot) */ -#define D3DVTXPCAPS_POSITIONALLIGHTS 0x00000010L -/* device can do local viewer */ -#define D3DVTXPCAPS_LOCALVIEWER 0x00000020L - -#endif /* DIRECT3D_VERSION >= 0x0700 */ - -#define D3DFDS_COLORMODEL 0x00000001L /* Match color model */ -#define D3DFDS_GUID 0x00000002L /* Match guid */ -#define D3DFDS_HARDWARE 0x00000004L /* Match hardware/software */ -#define D3DFDS_TRIANGLES 0x00000008L /* Match in triCaps */ -#define D3DFDS_LINES 0x00000010L /* Match in lineCaps */ -#define D3DFDS_MISCCAPS 0x00000020L /* Match primCaps.dwMiscCaps */ -#define D3DFDS_RASTERCAPS 0x00000040L /* Match primCaps.dwRasterCaps */ -#define D3DFDS_ZCMPCAPS 0x00000080L /* Match primCaps.dwZCmpCaps */ -#define D3DFDS_ALPHACMPCAPS 0x00000100L /* Match primCaps.dwAlphaCmpCaps */ -#define D3DFDS_SRCBLENDCAPS 0x00000200L /* Match primCaps.dwSourceBlendCaps */ -#define D3DFDS_DSTBLENDCAPS 0x00000400L /* Match primCaps.dwDestBlendCaps */ -#define D3DFDS_SHADECAPS 0x00000800L /* Match primCaps.dwShadeCaps */ -#define D3DFDS_TEXTURECAPS 0x00001000L /* Match primCaps.dwTextureCaps */ -#define D3DFDS_TEXTUREFILTERCAPS 0x00002000L /* Match primCaps.dwTextureFilterCaps */ -#define D3DFDS_TEXTUREBLENDCAPS 0x00004000L /* Match primCaps.dwTextureBlendCaps */ -#define D3DFDS_TEXTUREADDRESSCAPS 0x00008000L /* Match primCaps.dwTextureBlendCaps */ - -/* - * FindDevice arguments - */ -typedef struct _D3DFINDDEVICESEARCH { - DWORD dwSize; - DWORD dwFlags; - BOOL bHardware; - D3DCOLORMODEL dcmColorModel; - GUID guid; - DWORD dwCaps; - D3DPRIMCAPS dpcPrimCaps; -} D3DFINDDEVICESEARCH, *LPD3DFINDDEVICESEARCH; - -typedef struct _D3DFINDDEVICERESULT { - DWORD dwSize; - GUID guid; /* guid which matched */ - D3DDEVICEDESC ddHwDesc; /* hardware D3DDEVICEDESC */ - D3DDEVICEDESC ddSwDesc; /* software D3DDEVICEDESC */ -} D3DFINDDEVICERESULT, *LPD3DFINDDEVICERESULT; - -/* - * Description of execute buffer. - */ -typedef struct _D3DExecuteBufferDesc { - DWORD dwSize; /* size of this structure */ - DWORD dwFlags; /* flags indicating which fields are valid */ - DWORD dwCaps; /* capabilities of execute buffer */ - DWORD dwBufferSize; /* size of execute buffer data */ - LPVOID lpData; /* pointer to actual data */ -} D3DEXECUTEBUFFERDESC, *LPD3DEXECUTEBUFFERDESC; - -/* D3DEXECUTEBUFFER dwFlags indicating valid fields */ - -#define D3DDEB_BUFSIZE 0x00000001l /* buffer size valid */ -#define D3DDEB_CAPS 0x00000002l /* caps valid */ -#define D3DDEB_LPDATA 0x00000004l /* lpData valid */ - -/* D3DEXECUTEBUFFER dwCaps */ - -#define D3DDEBCAPS_SYSTEMMEMORY 0x00000001l /* buffer in system memory */ -#define D3DDEBCAPS_VIDEOMEMORY 0x00000002l /* buffer in device memory */ -#define D3DDEBCAPS_MEM (D3DDEBCAPS_SYSTEMMEMORY|D3DDEBCAPS_VIDEOMEMORY) - -#if(DIRECT3D_VERSION < 0x0800) - -#if(DIRECT3D_VERSION >= 0x0700) -typedef struct _D3DDEVINFO_TEXTUREMANAGER { - BOOL bThrashing; /* indicates if thrashing */ - DWORD dwApproxBytesDownloaded; /* Approximate number of bytes downloaded by texture manager */ - DWORD dwNumEvicts; /* number of textures evicted */ - DWORD dwNumVidCreates; /* number of textures created in video memory */ - DWORD dwNumTexturesUsed; /* number of textures used */ - DWORD dwNumUsedTexInVid; /* number of used textures present in video memory */ - DWORD dwWorkingSet; /* number of textures in video memory */ - DWORD dwWorkingSetBytes; /* number of bytes in video memory */ - DWORD dwTotalManaged; /* total number of managed textures */ - DWORD dwTotalBytes; /* total number of bytes of managed textures */ - DWORD dwLastPri; /* priority of last texture evicted */ -} D3DDEVINFO_TEXTUREMANAGER, *LPD3DDEVINFO_TEXTUREMANAGER; - -typedef struct _D3DDEVINFO_TEXTURING { - DWORD dwNumLoads; /* counts Load() API calls */ - DWORD dwApproxBytesLoaded; /* Approximate number bytes loaded via Load() */ - DWORD dwNumPreLoads; /* counts PreLoad() API calls */ - DWORD dwNumSet; /* counts SetTexture() API calls */ - DWORD dwNumCreates; /* counts texture creates */ - DWORD dwNumDestroys; /* counts texture destroys */ - DWORD dwNumSetPriorities; /* counts SetPriority() API calls */ - DWORD dwNumSetLODs; /* counts SetLOD() API calls */ - DWORD dwNumLocks; /* counts number of texture locks */ - DWORD dwNumGetDCs; /* counts number of GetDCs to textures */ -} D3DDEVINFO_TEXTURING, *LPD3DDEVINFO_TEXTURING; -#endif /* DIRECT3D_VERSION >= 0x0700 */ - -#endif //(DIRECT3D_VERSION < 0x0800) - -#pragma pack() - - -#endif /* _D3DCAPS_H_ */ - - diff --git a/inc/dd.h b/inc/dd.h index fe175f7..afd00d9 100644 --- a/inc/dd.h +++ b/inc/dd.h @@ -15,16 +15,15 @@ typedef HRESULT(WINAPI* DIRECTDRAWCREATEPROC)(GUID FAR*, LPDIRECTDRAW FAR*, IUnk ULONG dd_AddRef(); ULONG dd_Release(); HRESULT dd_EnumDisplayModes(DWORD dwFlags, LPDDSURFACEDESC lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK lpEnumModesCallback); +HRESULT dd_WaitForVerticalBlank(DWORD dwFlags, HANDLE hEvent); +HRESULT dd_SetDisplayMode(DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwFlags); +HRESULT dd_SetCooperativeLevel(HWND hwnd, DWORD dwFlags); +HRESULT dd_RestoreDisplayMode(); HRESULT dd_GetCaps(LPDDCAPS_DX1 lpDDDriverCaps, LPDDCAPS_DX1 lpDDEmulCaps); HRESULT dd_GetDisplayMode(LPDDSURFACEDESC lpDDSurfaceDesc); HRESULT dd_GetMonitorFrequency(LPDWORD lpdwFreq); -HRESULT dd_GetVerticalBlankStatus(LPBOOL lpbIsInVB); -HRESULT dd_RestoreDisplayMode(); -HRESULT dd_SetCooperativeLevel(HWND hwnd, DWORD dwFlags); -HRESULT dd_SetDisplayMode(DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwFlags); -HRESULT dd_WaitForVerticalBlank(DWORD dwFlags, HANDLE hEvent); HRESULT dd_GetAvailableVidMem(LPDDSCAPS lpDDCaps, LPDWORD lpdwTotal, LPDWORD lpdwFree); -HRESULT dd_TestCooperativeLevel(); +HRESULT dd_GetVerticalBlankStatus(LPBOOL lpbIsInVB); HRESULT dd_GetDeviceIdentifier(LPDDDEVICEIDENTIFIER pDDDI, DWORD dwFlags, REFIID riid); HRESULT dd_CreateEx(GUID* lpGuid, LPVOID* lplpDD, REFIID iid, IUnknown* pUnkOuter); @@ -32,7 +31,6 @@ HRESULT dd_CreateEx(GUID* lpGuid, LPVOID* lplpDD, REFIID iid, IUnknown* pUnkOute #define FIX_CHILDS_DETECT 1 #define FIX_CHILDS_DETECT_PAINT 2 #define FIX_CHILDS_DETECT_HIDE 3 -#define FIX_CHILDS_DETECT_HIDE_NOSCALE 4 #define RESLIST_NORMAL 0 #define RESLIST_MINI 1 @@ -47,52 +45,22 @@ HRESULT dd_CreateEx(GUID* lpGuid, LPVOID* lplpDD, REFIID iid, IUnknown* pUnkOute #define SDM_LEAVE_WINDOWED 0x00000002l #define SDM_LEAVE_FULLSCREEN 0x00000004l -#define LIMIT_AUTO 0 -#define LIMIT_TESTCOOP 1 -#define LIMIT_BLTFAST 2 -#define LIMIT_UNLOCK 3 -#define LIMIT_PEEKMESSAGE 4 - -#define CENTER_WINDOW_NEVER 0 -#define CENTER_WINDOW_AUTO 1 -#define CENTER_WINDOW_ALWAYS 2 - -#ifndef CREATE_WAITABLE_TIMER_HIGH_RESOLUTION -#define CREATE_WAITABLE_TIMER_HIGH_RESOLUTION 0x00000002 -#endif - -#ifndef CREATE_WAITABLE_TIMER_MANUAL_RESET -#define CREATE_WAITABLE_TIMER_MANUAL_RESET 0x00000001 -#endif - -#ifndef GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT -#define GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT 0x00000002 -#endif - -#ifndef GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS -#define GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS 0x00000004 -#endif - -#if (_WIN32_WINNT < _WIN32_WINNT_WIN2K) -#define GdiTransparentBlt TransparentBlt -#endif - typedef struct SPEEDLIMITER { DWORD tick_length; LONGLONG tick_length_ns; HANDLE htimer; LARGE_INTEGER due_time; - BOOL dds_unlock_limiter_disabled; + BOOL use_blt_or_flip; } SPEEDLIMITER; struct IDirectDrawSurfaceImpl; -extern struct CNCDDRAW g_ddraw; +extern struct CNCDDRAW* g_ddraw; typedef struct CNCDDRAW { - LONG ref; + ULONG ref; DWORD width; DWORD height; @@ -127,7 +95,6 @@ typedef struct CNCDDRAW LONG palette_updated; LONG surface_updated; LONG clear_screen; - LONG screen_updated; float scale_w; float scale_h; @@ -156,7 +123,6 @@ typedef struct CNCDDRAW BOOL isredalert; BOOL iscnc1; BOOL iskkndx; - BOOL isworms2; LONG upscale_hack_active; HCURSOR old_cursor; int show_cursor_count; @@ -169,27 +135,15 @@ typedef struct CNCDDRAW void* last_freed_palette; /* Dungeon Keeper hack */ void* last_freed_surface; /* Nox hack */ BOOL child_window_exists; + HWND video_window_hwnd; BOOL got_child_windows; DWORD last_set_window_pos_tick; /* WINE hack */ - DWORD last_msg_pull_tick; SPEEDLIMITER ticks_limiter; SPEEDLIMITER flip_limiter; DWORD minfps_tick_len; DWORD gui_thread_id; BOOL show_driver_warning; - BOOL windowed_hack; - struct - { - HWND hwnd; - int x; - int y; - } textbox; /* Age Of Empires 2 textbox align */ - - struct - { - BOOL enabled; - } zoom; } CNCDDRAW; #endif diff --git a/inc/ddclipper.h b/inc/ddclipper.h index 3f23c93..f9c02c4 100644 --- a/inc/ddclipper.h +++ b/inc/ddclipper.h @@ -12,7 +12,6 @@ HRESULT ddc_GetHWnd(IDirectDrawClipperImpl* This, HWND FAR* lphWnd); HRESULT ddc_IsClipListChanged(IDirectDrawClipperImpl* This, BOOL FAR* lpbChanged); HRESULT ddc_SetClipList(IDirectDrawClipperImpl* This, LPRGNDATA lpClipList, DWORD dwFlags); HRESULT ddc_SetHWnd(IDirectDrawClipperImpl* This, DWORD dwFlags, HWND hWnd); -HRESULT ddc_SetClipRect(IDirectDrawClipperImpl* This, LPRECT lpRect); HRESULT dd_CreateClipper(DWORD dwFlags, IDirectDrawClipperImpl** lplpDDClipper, IUnknown FAR* pUnkOuter); #endif diff --git a/inc/ddpalette.h b/inc/ddpalette.h index cfd46ff..7d264db 100644 --- a/inc/ddpalette.h +++ b/inc/ddpalette.h @@ -7,8 +7,6 @@ #include "IDirectDrawPalette.h" #include "dd.h" -#define DDPCAPS_REFRESH_CHANGED_ONLY (1 << 31) - HRESULT ddp_GetEntries(IDirectDrawPaletteImpl* This, DWORD dwFlags, DWORD dwBase, DWORD dwNumEntries, LPPALETTEENTRY lpEntries); HRESULT ddp_SetEntries(IDirectDrawPaletteImpl* This, DWORD dwFlags, DWORD dwStartingEntry, DWORD dwCount, LPPALETTEENTRY lpEntries); HRESULT dd_CreatePalette(DWORD dwFlags, LPPALETTEENTRY lpDDColorArray, IDirectDrawPaletteImpl** lpDDPalette, IUnknown FAR* unkOuter); diff --git a/inc/debug.h b/inc/debug.h index fa70c85..f7c81d1 100644 --- a/inc/debug.h +++ b/inc/debug.h @@ -3,10 +3,8 @@ #define WIN32_LEAN_AND_MEAN #include -#include LONG WINAPI dbg_exception_handler(EXCEPTION_POINTERS* exception); -LONG WINAPI dbg_vectored_exception_handler(EXCEPTION_POINTERS* exception); void dbg_counter_start(); double dbg_counter_stop(); void dbg_debug_string(const char* format, ...); @@ -15,7 +13,6 @@ void dbg_draw_frame_info_start(); void dbg_draw_frame_info_end(); void dbg_printf(const char* fmt, ...); void dbg_init(); -void dbg_dump_wnd_styles(DWORD style, DWORD exstyle); void dbg_dump_swp_flags(DWORD flags); void dbg_dump_ddp_flags(DWORD flags); void dbg_dump_scl_flags(DWORD flags); @@ -27,25 +24,11 @@ void dbg_dump_dds_caps(DWORD caps); void dbg_dump_dds_flags(DWORD flags); void dbg_dump_dds_blt_fast_flags(DWORD flags); void dbg_dump_dds_lock_flags(DWORD flags); -void dbg_dump_di_scm_flags(DWORD flags); -void dbg_dump_hook_type(int idHook); -char* dbg_d3d9_hr_to_str(HRESULT hr); char* dbg_mes_to_str(int id); -void __cdecl dbg_invoke_watson(wchar_t const*, wchar_t const*, wchar_t const*, unsigned int, uintptr_t); extern double g_dbg_frame_time; extern DWORD g_dbg_frame_count; extern LPTOP_LEVEL_EXCEPTION_FILTER g_dbg_exception_filter; -extern PVOID g_dbg_exception_handle; - -#if defined(__GNUC__) /* wrap msvc intrinsics onto gcc builtins */ -#undef _ReturnAddress -#undef _AddressOfReturnAddress -#define _ReturnAddress() __builtin_return_address(0) -#define _AddressOfReturnAddress() __builtin_frame_address (0) -#else -#pragma intrinsic(_ReturnAddress) -#endif /* __GNUC__ */ //#define _DEBUG 1 diff --git a/inc/delay_imports.h b/inc/delay_imports.h deleted file mode 100644 index ba654ed..0000000 --- a/inc/delay_imports.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef DELAY_IMPORTS_H -#define DELAY_IMPORTS_H - -#define STATUS_SUCCESS ((NTSTATUS)0x00000000L) -#define ThreadQuerySetWin32StartAddress 9 - -typedef NTSTATUS(WINAPI* RTLVERIFYVERSIONINFOPROC)(PRTL_OSVERSIONINFOEXW, ULONG, ULONGLONG); -typedef const char* (CDECL* WINE_GET_VERSIONPROC)(); -typedef void (CDECL* WINE_GET_HOST_VERSIONPROC)(const char** sysname, const char** release); -typedef NTSTATUS(WINAPI* NTQUERYINFORMATIONTHREADPROC)(HANDLE, LONG, PVOID, ULONG, PULONG); - -typedef ULONGLONG(WINAPI* VERSETCONDITIONMASKPROC)(ULONGLONG, DWORD, BYTE); -typedef BOOL(WINAPI* GETMODULEHANDLEEXAPROC)(DWORD, LPCSTR, HMODULE*); - -extern NTQUERYINFORMATIONTHREADPROC delay_NtQueryInformationThread; -extern RTLVERIFYVERSIONINFOPROC delay_RtlVerifyVersionInfo; -extern WINE_GET_VERSIONPROC delay_wine_get_version; -extern WINE_GET_HOST_VERSIONPROC delay_wine_get_host_version; - -extern VERSETCONDITIONMASKPROC delay_VerSetConditionMask; -extern GETMODULEHANDLEEXAPROC delay_GetModuleHandleExA; - -void delay_imports_init(); - -#endif diff --git a/inc/dllmain.h b/inc/dllmain.h index f7e028b..176d72a 100644 --- a/inc/dllmain.h +++ b/inc/dllmain.h @@ -29,8 +29,4 @@ typedef HRESULT(__stdcall* SETPROCESSDPIAWERENESSPROC)(PROCESS_DPI_AWARENESS); typedef BOOL(__stdcall* SETPROCESSDPIAWAREPROC)(); typedef BOOL(__stdcall* SETPROCESSDPIAWARENESSCONTEXTPROC)(DPI_AWARENESS_CONTEXT); -#if (_WIN32_WINNT < _WIN32_WINNT_WINXP) -#define SetThreadExecutionState(a) -#endif - #endif diff --git a/inc/hook.h b/inc/hook.h index 23de636..6ebb33b 100644 --- a/inc/hook.h +++ b/inc/hook.h @@ -1,13 +1,12 @@ #ifndef HOOK_H #define HOOK_H +#define WIN32_LEAN_AND_MEAN #include -#include #define HOOK_SKIP_2 0x00000001l #define HOOK_LOCAL_ONLY 0x00000002l -#define HOOK_SYSTEM_ONLY 0x00000004l typedef struct HOOKLISTDATA { char function_name[32]; @@ -18,7 +17,7 @@ typedef struct HOOKLISTDATA { HMODULE mod; } HOOKLISTDATA; -typedef struct HOOKLIST { char module_name[32]; HOOKLISTDATA data[39]; } HOOKLIST; +typedef struct HOOKLIST { char module_name[32]; HOOKLISTDATA data[30]; } HOOKLIST; typedef BOOL(WINAPI* GETCURSORPOSPROC)(LPPOINT); typedef BOOL(WINAPI* CLIPCURSORPROC)(const RECT*); @@ -37,7 +36,6 @@ typedef BOOL(WINAPI* SETWINDOWPOSPROC)(HWND, HWND, int, int, int, int, UINT); typedef BOOL(WINAPI* MOVEWINDOWPROC)(HWND, int, int, int, int, BOOL); typedef LRESULT(WINAPI* SENDMESSAGEAPROC)(HWND, UINT, WPARAM, LPARAM); typedef LONG(WINAPI* SETWINDOWLONGAPROC)(HWND, int, LONG); -typedef LONG(WINAPI* SETWINDOWLONGWPROC)(HWND, int, LONG); typedef LONG(WINAPI* GETWINDOWLONGAPROC)(HWND, int); typedef BOOL(WINAPI* ENABLEWINDOWPROC)(HWND, BOOL); typedef HWND(WINAPI* CREATEWINDOWEXAPROC)(DWORD, LPCSTR, LPCSTR, DWORD, int, int, int, int, HWND, HMENU, HINSTANCE, LPVOID); @@ -47,7 +45,6 @@ typedef BOOL (WINAPI* SHOWWINDOWPROC)(HWND, int); typedef HWND(WINAPI* GETTOPWINDOWPROC)(HWND); typedef HWND(WINAPI* GETFOREGROUNDWINDOWPROC)(); typedef BOOL(WINAPI* STRETCHBLTPROC)(HDC, int, int, int, int, HDC, int, int, int, int, DWORD); -typedef BOOL(WINAPI* BITBLTPROC)(HDC, int, int, int, int, HDC, int, int, DWORD); typedef int (WINAPI* SETDIBITSTODEVICEPROC)( HDC, int, int, DWORD, DWORD, int, int, UINT, UINT, const VOID*, const BITMAPINFO*, UINT); @@ -55,40 +52,23 @@ typedef int (WINAPI* SETDIBITSTODEVICEPROC)( typedef int (WINAPI* STRETCHDIBITSPROC)( HDC, int, int, int, int, int, int, int, int, const VOID*, const BITMAPINFO*, UINT, DWORD); -typedef BOOL (WINAPI* SETFOREGROUNDWINDOWPROC)(HWND); +typedef BOOL (WINAPI* SETFOREGROUNDWINDOWPROC)(HWND hWnd); typedef HHOOK(WINAPI* SETWINDOWSHOOKEXAPROC)(int, HOOKPROC, HINSTANCE, DWORD); typedef BOOL(WINAPI* PEEKMESSAGEAPROC)(LPMSG, HWND, UINT, UINT, UINT); typedef BOOL(WINAPI* GETMESSAGEAPROC)(LPMSG, HWND, UINT, UINT); -typedef BOOL(WINAPI* GETWINDOWPLACEMENTPROC)(HWND, WINDOWPLACEMENT*); -typedef BOOL(WINAPI* SETWINDOWPLACEMENTPROC)(HWND, const WINDOWPLACEMENT*); -typedef BOOL(WINAPI* ENUMDISPLAYSETTINGSAPROC)(LPCSTR, DWORD, DEVMODEA*); -typedef LRESULT(WINAPI* DEFWINDOWPROCAPROC)(HWND, UINT, WPARAM, LPARAM); -typedef HWND(WINAPI* SETPARENTPROC)(HWND, HWND); -typedef HDC (WINAPI* BEGINPAINTPROC)(HWND, LPPAINTSTRUCT); -typedef SHORT(WINAPI* GETKEYSTATEPROC)(int); -typedef SHORT(WINAPI* GETASYNCKEYSTATEPROC)(int); typedef int (WINAPI* GETDEVICECAPSPROC)(HDC, int); typedef HFONT(WINAPI* CREATEFONTINDIRECTAPROC)(CONST LOGFONT*); typedef HFONT(WINAPI* CREATEFONTAPROC)(int, int, int, int, int, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, LPCTSTR); -typedef UINT(WINAPI* GETSYSTEMPALETTEENTRIESPROC)(HDC, UINT, UINT, LPPALETTEENTRY); -typedef HPALETTE(WINAPI* SELECTPALETTEPROC)(HDC, HPALETTE, BOOL); -typedef UINT (WINAPI* REALIZEPALETTEPROC)(HDC); - typedef HMODULE(WINAPI* LOADLIBRARYAPROC)(LPCSTR); typedef HMODULE(WINAPI* LOADLIBRARYWPROC)(LPCWSTR); typedef HMODULE(WINAPI* LOADLIBRARYEXAPROC)(LPCSTR, HANDLE, DWORD); typedef HMODULE(WINAPI* LOADLIBRARYEXWPROC)(LPCWSTR, HANDLE, DWORD); typedef FARPROC(WINAPI* GETPROCADDRESSPROC)(HMODULE, LPCSTR); typedef BOOL(WINAPI* GETDISKFREESPACEAPROC)(LPCSTR, LPDWORD, LPDWORD, LPDWORD, LPDWORD); -typedef DWORD(WINAPI* GETVERSIONPROC)(void); -typedef BOOL(WINAPI* GETVERSIONEXAPROC)(LPOSVERSIONINFOA); typedef HRESULT(WINAPI* COCREATEINSTANCEPROC)(REFCLSID, LPUNKNOWN, DWORD, REFIID, LPVOID*); -typedef MCIERROR(WINAPI* MCISENDCOMMANDAPROC)(MCIDEVICEID, UINT, DWORD_PTR, DWORD_PTR); typedef LPTOP_LEVEL_EXCEPTION_FILTER(WINAPI* SETUNHANDLEDEXCEPTIONFILTERPROC)(LPTOP_LEVEL_EXCEPTION_FILTER); -typedef PGETFRAME (WINAPI* AVISTREAMGETFRAMEOPENPROC)(PAVISTREAM, LPBITMAPINFOHEADER); - extern GETCURSORPOSPROC real_GetCursorPos; extern CLIPCURSORPROC real_ClipCursor; extern SHOWCURSORPROC real_ShowCursor; @@ -106,7 +86,6 @@ extern SETWINDOWPOSPROC real_SetWindowPos; extern MOVEWINDOWPROC real_MoveWindow; extern SENDMESSAGEAPROC real_SendMessageA; extern SETWINDOWLONGAPROC real_SetWindowLongA; -extern SETWINDOWLONGWPROC real_SetWindowLongW; extern GETWINDOWLONGAPROC real_GetWindowLongA; extern ENABLEWINDOWPROC real_EnableWindow; extern CREATEWINDOWEXAPROC real_CreateWindowExA; @@ -116,44 +95,28 @@ extern SHOWWINDOWPROC real_ShowWindow; extern GETTOPWINDOWPROC real_GetTopWindow; extern GETFOREGROUNDWINDOWPROC real_GetForegroundWindow; extern STRETCHBLTPROC real_StretchBlt; -extern BITBLTPROC real_BitBlt; extern SETDIBITSTODEVICEPROC real_SetDIBitsToDevice; extern STRETCHDIBITSPROC real_StretchDIBits; extern SETFOREGROUNDWINDOWPROC real_SetForegroundWindow; extern SETWINDOWSHOOKEXAPROC real_SetWindowsHookExA; extern PEEKMESSAGEAPROC real_PeekMessageA; extern GETMESSAGEAPROC real_GetMessageA; -extern GETWINDOWPLACEMENTPROC real_GetWindowPlacement; -extern SETWINDOWPLACEMENTPROC real_SetWindowPlacement; -extern ENUMDISPLAYSETTINGSAPROC real_EnumDisplaySettingsA; -extern DEFWINDOWPROCAPROC real_DefWindowProcA; -extern SETPARENTPROC real_SetParent; -extern BEGINPAINTPROC real_BeginPaint; -extern GETKEYSTATEPROC real_GetKeyState; -extern GETASYNCKEYSTATEPROC real_GetAsyncKeyState; extern GETDEVICECAPSPROC real_GetDeviceCaps; extern CREATEFONTINDIRECTAPROC real_CreateFontIndirectA; extern CREATEFONTAPROC real_CreateFontA; -extern GETSYSTEMPALETTEENTRIESPROC real_GetSystemPaletteEntries; -extern SELECTPALETTEPROC real_SelectPalette; -extern REALIZEPALETTEPROC real_RealizePalette; extern LOADLIBRARYAPROC real_LoadLibraryA; extern LOADLIBRARYWPROC real_LoadLibraryW; extern LOADLIBRARYEXAPROC real_LoadLibraryExA; extern LOADLIBRARYEXWPROC real_LoadLibraryExW; extern GETPROCADDRESSPROC real_GetProcAddress; extern GETDISKFREESPACEAPROC real_GetDiskFreeSpaceA; -extern GETVERSIONPROC real_GetVersion; -extern GETVERSIONEXAPROC real_GetVersionExA; extern COCREATEINSTANCEPROC real_CoCreateInstance; -extern MCISENDCOMMANDAPROC real_mciSendCommandA; extern SETUNHANDLEDEXCEPTIONFILTERPROC real_SetUnhandledExceptionFilter; -extern AVISTREAMGETFRAMEOPENPROC real_AVIStreamGetFrameOpen; extern BOOL g_hook_active; extern HOOKLIST g_hook_hooklist[]; -void hook_init(); +void hook_init(BOOL initial_hook); void hook_exit(); void hook_patch_iat(HMODULE hmod, BOOL unhook, char* module_name, char* function_name, PROC new_function); void hook_patch_iat_list(HMODULE hmod, BOOL unhook, HOOKLIST* hooks, BOOL is_local); diff --git a/inc/indeo.h b/inc/indeo.h deleted file mode 100644 index a83e007..0000000 --- a/inc/indeo.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef INDEO_H -#define INDEO_H - -void indeo_enable(); -void indeo_disable(); - -#endif diff --git a/inc/keyboard.h b/inc/keyboard.h deleted file mode 100644 index 8962198..0000000 --- a/inc/keyboard.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef KEYBOARD_H -#define KEYBOARD_H - - -void keyboard_hook_init(); -void keyboard_hook_exit(); -LRESULT CALLBACK keyboard_hook_proc(int Code, WPARAM wParam, LPARAM lParam); - -extern HHOOK g_keyboard_hook; - -#endif diff --git a/inc/opengl_utils.h b/inc/opengl_utils.h index d84dd20..63d2a73 100644 --- a/inc/opengl_utils.h +++ b/inc/opengl_utils.h @@ -108,13 +108,10 @@ extern PFNGLDRAWBUFFERSPROC glDrawBuffers; extern PFNGLCHECKFRAMEBUFFERSTATUSPROC glCheckFramebufferStatus; extern PFNGLDELETEFRAMEBUFFERSPROC glDeleteFramebuffers; extern PFNGLTEXBUFFERPROC glTexBuffer; -extern PFNGLGETINTEGERVPROC glGetIntegerv; -extern PFNGLGETSTRINGIPROC glGetStringi; extern HMODULE g_oglu_hmodule; extern BOOL g_oglu_got_version2; extern BOOL g_oglu_got_version3; extern char g_oglu_version[]; -extern char g_oglu_version_long[]; #endif diff --git a/inc/palette.h b/inc/palette.h deleted file mode 100644 index 8e38ec4..0000000 --- a/inc/palette.h +++ /dev/null @@ -1,265 +0,0 @@ -#ifndef PALETTE_H -#define PALETTE_H - -// Original palette copied from Windows ME -static PALETTEENTRY g_ddp_default_palette[] = -{ - { 0, 0, 0, 0 }, - { 128, 0, 0, 0 }, - { 0, 128, 0, 0 }, - { 128, 128, 0, 0 }, - { 0, 0, 128, 0 }, - { 128, 0, 128, 0 }, - { 0, 128, 128, 0 }, - { 192, 192, 192, 0 }, - { 192, 220, 192, 0 }, - { 166, 202, 240, 0 }, - { 95, 63, 63, 0 }, - { 127, 63, 63, 0 }, - { 159, 63, 63, 0 }, - { 191, 63, 63, 0 }, - { 223, 63, 63, 0 }, - { 255, 63, 63, 0 }, - { 63, 95, 63, 0 }, - { 95, 95, 63, 0 }, - { 127, 95, 63, 0 }, - { 159, 95, 63, 0 }, - { 191, 95, 63, 0 }, - { 223, 95, 63, 0 }, - { 255, 95, 63, 0 }, - { 63, 127, 63, 0 }, - { 95, 127, 63, 0 }, - { 127, 127, 63, 0 }, - { 159, 127, 63, 0 }, - { 191, 127, 63, 0 }, - { 223, 127, 63, 0 }, - { 255, 127, 63, 0 }, - { 63, 159, 63, 0 }, - { 95, 159, 63, 0 }, - { 127, 159, 63, 0 }, - { 159, 159, 63, 0 }, - { 191, 159, 63, 0 }, - { 223, 159, 63, 0 }, - { 255, 159, 63, 0 }, - { 63, 191, 63, 0 }, - { 95, 191, 63, 0 }, - { 127, 191, 63, 0 }, - { 159, 191, 63, 0 }, - { 191, 191, 63, 0 }, - { 223, 191, 63, 0 }, - { 255, 191, 63, 0 }, - { 63, 223, 63, 0 }, - { 95, 223, 63, 0 }, - { 127, 223, 63, 0 }, - { 159, 223, 63, 0 }, - { 191, 223, 63, 0 }, - { 223, 223, 63, 0 }, - { 255, 223, 63, 0 }, - { 63, 255, 63, 0 }, - { 95, 255, 63, 0 }, - { 127, 255, 63, 0 }, - { 159, 255, 63, 0 }, - { 191, 255, 63, 0 }, - { 223, 255, 63, 0 }, - { 255, 255, 63, 0 }, - { 63, 63, 95, 0 }, - { 95, 63, 95, 0 }, - { 127, 63, 95, 0 }, - { 159, 63, 95, 0 }, - { 191, 63, 95, 0 }, - { 223, 63, 95, 0 }, - { 255, 63, 95, 0 }, - { 63, 95, 95, 0 }, - { 95, 95, 95, 0 }, - { 127, 95, 95, 0 }, - { 159, 95, 95, 0 }, - { 191, 95, 95, 0 }, - { 223, 95, 95, 0 }, - { 255, 95, 95, 0 }, - { 63, 127, 95, 0 }, - { 95, 127, 95, 0 }, - { 127, 127, 95, 0 }, - { 159, 127, 95, 0 }, - { 191, 127, 95, 0 }, - { 223, 127, 95, 0 }, - { 255, 127, 95, 0 }, - { 63, 159, 95, 0 }, - { 95, 159, 95, 0 }, - { 127, 159, 95, 0 }, - { 159, 159, 95, 0 }, - { 191, 159, 95, 0 }, - { 223, 159, 95, 0 }, - { 255, 159, 95, 0 }, - { 63, 191, 95, 0 }, - { 95, 191, 95, 0 }, - { 127, 191, 95, 0 }, - { 159, 191, 95, 0 }, - { 191, 191, 95, 0 }, - { 223, 191, 95, 0 }, - { 255, 191, 95, 0 }, - { 63, 223, 95, 0 }, - { 95, 223, 95, 0 }, - { 127, 223, 95, 0 }, - { 159, 223, 95, 0 }, - { 191, 223, 95, 0 }, - { 223, 223, 95, 0 }, - { 255, 223, 95, 0 }, - { 63, 255, 95, 0 }, - { 95, 255, 95, 0 }, - { 127, 255, 95, 0 }, - { 159, 255, 95, 0 }, - { 191, 255, 95, 0 }, - { 223, 255, 95, 0 }, - { 255, 255, 95, 0 }, - { 63, 63, 127, 0 }, - { 95, 63, 127, 0 }, - { 127, 63, 127, 0 }, - { 159, 63, 127, 0 }, - { 191, 63, 127, 0 }, - { 223, 63, 127, 0 }, - { 255, 63, 127, 0 }, - { 63, 95, 127, 0 }, - { 95, 95, 127, 0 }, - { 127, 95, 127, 0 }, - { 159, 95, 127, 0 }, - { 191, 95, 127, 0 }, - { 223, 95, 127, 0 }, - { 255, 95, 127, 0 }, - { 63, 127, 127, 0 }, - { 95, 127, 127, 0 }, - { 127, 127, 127, 0 }, - { 159, 127, 127, 0 }, - { 191, 127, 127, 0 }, - { 223, 127, 127, 0 }, - { 255, 127, 127, 0 }, - { 63, 159, 127, 0 }, - { 95, 159, 127, 0 }, - { 127, 159, 127, 0 }, - { 159, 159, 127, 0 }, - { 191, 159, 127, 0 }, - { 223, 159, 127, 0 }, - { 255, 159, 127, 0 }, - { 63, 191, 127, 0 }, - { 95, 191, 127, 0 }, - { 127, 191, 127, 0 }, - { 159, 191, 127, 0 }, - { 191, 191, 127, 0 }, - { 223, 191, 127, 0 }, - { 255, 191, 127, 0 }, - { 63, 223, 127, 0 }, - { 95, 223, 127, 0 }, - { 127, 223, 127, 0 }, - { 159, 223, 127, 0 }, - { 191, 223, 127, 0 }, - { 223, 223, 127, 0 }, - { 255, 223, 127, 0 }, - { 63, 255, 127, 0 }, - { 95, 255, 127, 0 }, - { 127, 255, 127, 0 }, - { 159, 255, 127, 0 }, - { 191, 255, 127, 0 }, - { 223, 255, 127, 0 }, - { 255, 255, 127, 0 }, - { 63, 63, 159, 0 }, - { 95, 63, 159, 0 }, - { 127, 63, 159, 0 }, - { 159, 63, 159, 0 }, - { 191, 63, 159, 0 }, - { 223, 63, 159, 0 }, - { 255, 63, 159, 0 }, - { 63, 95, 159, 0 }, - { 95, 95, 159, 0 }, - { 127, 95, 159, 0 }, - { 159, 95, 159, 0 }, - { 191, 95, 159, 0 }, - { 223, 95, 159, 0 }, - { 255, 95, 159, 0 }, - { 63, 127, 159, 0 }, - { 95, 127, 159, 0 }, - { 127, 127, 159, 0 }, - { 159, 127, 159, 0 }, - { 191, 127, 159, 0 }, - { 223, 127, 159, 0 }, - { 255, 127, 159, 0 }, - { 63, 159, 159, 0 }, - { 95, 159, 159, 0 }, - { 127, 159, 159, 0 }, - { 159, 159, 159, 0 }, - { 191, 159, 159, 0 }, - { 223, 159, 159, 0 }, - { 255, 159, 159, 0 }, - { 63, 191, 159, 0 }, - { 95, 191, 159, 0 }, - { 127, 191, 159, 0 }, - { 159, 191, 159, 0 }, - { 191, 191, 159, 0 }, - { 223, 191, 159, 0 }, - { 255, 191, 159, 0 }, - { 63, 223, 159, 0 }, - { 95, 223, 159, 0 }, - { 127, 223, 159, 0 }, - { 159, 223, 159, 0 }, - { 191, 223, 159, 0 }, - { 223, 223, 159, 0 }, - { 255, 223, 159, 0 }, - { 63, 255, 159, 0 }, - { 95, 255, 159, 0 }, - { 127, 255, 159, 0 }, - { 159, 255, 159, 0 }, - { 191, 255, 159, 0 }, - { 223, 255, 159, 0 }, - { 255, 255, 159, 0 }, - { 63, 63, 191, 0 }, - { 95, 63, 191, 0 }, - { 127, 63, 191, 0 }, - { 159, 63, 191, 0 }, - { 191, 63, 191, 0 }, - { 223, 63, 191, 0 }, - { 255, 63, 191, 0 }, - { 63, 95, 191, 0 }, - { 95, 95, 191, 0 }, - { 127, 95, 191, 0 }, - { 159, 95, 191, 0 }, - { 191, 95, 191, 0 }, - { 223, 95, 191, 0 }, - { 255, 95, 191, 0 }, - { 63, 127, 191, 0 }, - { 95, 127, 191, 0 }, - { 127, 127, 191, 0 }, - { 159, 127, 191, 0 }, - { 191, 127, 191, 0 }, - { 223, 127, 191, 0 }, - { 255, 127, 191, 0 }, - { 63, 159, 191, 0 }, - { 95, 159, 191, 0 }, - { 127, 159, 191, 0 }, - { 159, 159, 191, 0 }, - { 191, 159, 191, 0 }, - { 223, 159, 191, 0 }, - { 255, 159, 191, 0 }, - { 63, 191, 191, 0 }, - { 95, 191, 191, 0 }, - { 127, 191, 191, 0 }, - { 159, 191, 191, 0 }, - { 191, 191, 191, 0 }, - { 223, 191, 191, 0 }, - { 255, 191, 191, 0 }, - { 63, 223, 191, 0 }, - { 95, 223, 191, 0 }, - { 127, 223, 191, 0 }, - { 159, 223, 191, 0 }, - { 191, 223, 191, 0 }, - { 223, 223, 191, 0 }, - { 255, 251, 240, 0 }, - { 58, 109, 165, 0 }, - { 128, 128, 128, 0 }, - { 255, 0, 0, 0 }, - { 0, 255, 0, 0 }, - { 255, 255, 0, 0 }, - { 0, 0, 255, 0 }, - { 255, 0, 255, 0 }, - { 0, 255, 255, 0 }, - { 255, 255, 255, 0 } -}; - -#endif diff --git a/inc/render_ogl.h b/inc/render_ogl.h index bc4d39f..4de364f 100644 --- a/inc/render_ogl.h +++ b/inc/render_ogl.h @@ -5,28 +5,16 @@ #include "opengl_utils.h" #define TEXTURE_COUNT 4 -#define FBO_COUNT 2 - -#ifdef _DEBUG -#define GL_CHECK(stmt) do { \ - stmt; \ - ogl_check_error(#stmt); \ - } while (0) -#else -#define GL_CHECK(stmt) stmt -#endif typedef struct OGLRENDERER { - HWND hwnd; - HDC hdc; HGLRC context; GLuint main_program; - GLuint shader1_program; - GLuint shader2_program; + GLuint scale_program; BOOL got_error; int surface_tex_width; int surface_tex_height; + int* surface_tex; GLenum surface_format; GLenum surface_type; GLuint surface_tex_ids[TEXTURE_COUNT]; @@ -37,23 +25,16 @@ typedef struct OGLRENDERER GLint main_vertex_coord_attr_loc; GLuint main_vbos[3]; GLuint main_vao; - GLint shader1_frame_count_uni_loc; - GLint shader2_frame_count_uni_loc; - GLuint frame_buffer_id[FBO_COUNT]; - GLuint frame_buffer_tex_id[FBO_COUNT]; - GLint shader1_tex_coord_attr_loc; - GLint shader2_tex_coord_attr_loc; - GLuint shader1_vbos[3]; - GLuint shader2_vbos[3]; - GLuint shader1_vao; - GLuint shader2_vao; + GLint frame_count_uni_loc; + GLuint frame_buffer_id; + GLuint frame_buffer_tex_id; + GLint scale_tex_coord_attr_loc; + GLuint scale_vbos[3]; + GLuint scale_vao; BOOL use_opengl; BOOL filter_bilinear; - BOOL shader2_upscale; } OGLRENDERER; DWORD WINAPI ogl_render_main(void); -BOOL ogl_create(); -BOOL ogl_release(); #endif diff --git a/inc/utils.h b/inc/utils.h index 3833ede..2e2e779 100644 --- a/inc/utils.h +++ b/inc/utils.h @@ -6,15 +6,8 @@ HMODULE WINAPI util_enumerate_modules(_In_opt_ HMODULE hModuleLast); -void util_set_process_affinity(); -void util_set_thread_affinity(DWORD tid); -void util_pull_messages(); -DWORD util_get_timestamp(HMODULE mod); -FARPROC util_get_iat_proc(HMODULE mod, char* module_name, char* function_name); -BOOL util_caller_is_ddraw_wrapper(void* return_address); BOOL util_is_bad_read_ptr(void* p); BOOL util_is_minimized(HWND hwnd); -BOOL util_in_foreground(); BOOL util_is_avx_supported(); void util_limit_game_ticks(); void util_update_bnet_pos(int newX, int newY); @@ -23,7 +16,6 @@ void util_toggle_maximize(); void util_toggle_fullscreen(); BOOL util_unadjust_window_rect(LPRECT prc, DWORD dwStyle, BOOL fMenu, DWORD dwExStyle); void util_set_window_rect(int x, int y, int width, int height, UINT flags); -BOOL CALLBACK util_enum_thread_wnd_proc(HWND hwnd, LPARAM lParam); BOOL CALLBACK util_enum_child_proc(HWND hwnd, LPARAM lParam); BOOL util_detect_low_res_screen(); diff --git a/inc/version.h b/inc/version.h index 29e19fa..a75a5b5 100644 --- a/inc/version.h +++ b/inc/version.h @@ -4,10 +4,10 @@ #define str(s) #s #define ver_str(a,b,c,d) str(a) "." str(b) "." str(c) "." str(d) -#define VERSION_MAJOR 7 -#define VERSION_MINOR 1 +#define VERSION_MAJOR 6 +#define VERSION_MINOR 3 #define VERSION_BUILD 0 -#define VERSION_REVISION 1 +#define VERSION_REVISION 0 #define VERSION VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD, VERSION_REVISION #define VERSION_STRING ver_str(VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD, VERSION_REVISION) diff --git a/inc/versionhelpers.h b/inc/versionhelpers.h deleted file mode 100644 index 36f2dd6..0000000 --- a/inc/versionhelpers.h +++ /dev/null @@ -1,266 +0,0 @@ -/** - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. - */ - -#ifndef _INC_VERSIONHELPERS -#define _INC_VERSIONHELPERS - -#ifdef __cplusplus -#define VERSIONHELPERAPI inline bool -#else -#define VERSIONHELPERAPI FORCEINLINE BOOL -#endif - -#ifndef _WIN32_WINNT_WIN8 -#define _WIN32_WINNT_WIN8 0x0602 -#endif -#ifndef _WIN32_WINNT_WINBLUE -#define _WIN32_WINNT_WINBLUE 0x0603 -#endif -#ifndef _WIN32_WINNT_WINTHRESHOLD -#define _WIN32_WINNT_WINTHRESHOLD 0x0A00 /* ABRACADABRA_THRESHOLD*/ -#endif -#ifndef _WIN32_WINNT_WIN10 -#define _WIN32_WINNT_WIN10 0x0A00 /* ABRACADABRA_THRESHOLD*/ -#endif -#ifndef _WIN32_WINNT_WIN11 -#define _WIN32_WINNT_WIN11 0x0A00 -#endif - -#if (_WIN32_WINNT < _WIN32_WINNT_WIN2K) -#define VerifyVersionInfoW(a,b,c) 0 -#define VerSetConditionMask verhelp_set_mask -#endif - -BOOL verhelp_verify_version(PRTL_OSVERSIONINFOEXW versionInfo, ULONG typeMask, ULONGLONG conditionMask); -ULONGLONG verhelp_set_mask(ULONGLONG ConditionMask, DWORD TypeMask, BYTE Condition); -const char* verhelp_wine_get_version(); -void verhelp_wine_get_host_version(const char** sysname, const char** release); - -VERSIONHELPERAPI IsWindowsVersionOrGreater(DWORD major, DWORD minor, DWORD build, WORD servpack) -{ - RTL_OSVERSIONINFOEXW vi = { sizeof(vi),major,minor,build,0,{0},servpack }; - return verhelp_verify_version(&vi, VER_MAJORVERSION | VER_MINORVERSION | VER_BUILDNUMBER | VER_SERVICEPACKMAJOR, - VerSetConditionMask(VerSetConditionMask(VerSetConditionMask(VerSetConditionMask(0, - VER_MAJORVERSION, VER_GREATER_EQUAL), - VER_MINORVERSION, VER_GREATER_EQUAL), - VER_BUILDNUMBER, VER_GREATER_EQUAL), - VER_SERVICEPACKMAJOR, VER_GREATER_EQUAL)); -} - -VERSIONHELPERAPI IsWindowsVersion(DWORD major, DWORD minor, DWORD build, WORD servpack) -{ - RTL_OSVERSIONINFOEXW vi = { sizeof(vi),major,minor,build,0,{0},servpack }; - return verhelp_verify_version(&vi, VER_MAJORVERSION | VER_MINORVERSION | VER_BUILDNUMBER | VER_SERVICEPACKMAJOR, - VerSetConditionMask(VerSetConditionMask(VerSetConditionMask(VerSetConditionMask(0, - VER_MAJORVERSION, VER_EQUAL), - VER_MINORVERSION, VER_EQUAL), - VER_BUILDNUMBER, VER_GREATER_EQUAL), - VER_SERVICEPACKMAJOR, VER_EQUAL)); -} - -VERSIONHELPERAPI IsWindowsVersionExcactBuild(DWORD major, DWORD minor, DWORD build, WORD servpack) -{ - RTL_OSVERSIONINFOEXW vi = { sizeof(vi),major,minor,build,0,{0},servpack }; - return verhelp_verify_version(&vi, VER_MAJORVERSION | VER_MINORVERSION | VER_BUILDNUMBER | VER_SERVICEPACKMAJOR, - VerSetConditionMask(VerSetConditionMask(VerSetConditionMask(VerSetConditionMask(0, - VER_MAJORVERSION, VER_EQUAL), - VER_MINORVERSION, VER_EQUAL), - VER_BUILDNUMBER, VER_EQUAL), - VER_SERVICEPACKMAJOR, VER_EQUAL)); -} - -VERSIONHELPERAPI IsWindowsVersionAnySP(DWORD major, DWORD minor, DWORD build) -{ - RTL_OSVERSIONINFOEXW vi = { sizeof(vi),major,minor,build,0,{0},0 }; - return verhelp_verify_version(&vi, VER_MAJORVERSION | VER_MINORVERSION | VER_BUILDNUMBER | VER_SERVICEPACKMAJOR, - VerSetConditionMask(VerSetConditionMask(VerSetConditionMask(VerSetConditionMask(0, - VER_MAJORVERSION, VER_EQUAL), - VER_MINORVERSION, VER_EQUAL), - VER_BUILDNUMBER, VER_GREATER_EQUAL), - VER_SERVICEPACKMAJOR, VER_GREATER_EQUAL)); -} - -VERSIONHELPERAPI IsWindows2000OrGreater(void) { - return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WIN2K), LOBYTE(_WIN32_WINNT_WIN2K), 0, 0); -} - -VERSIONHELPERAPI IsWindowsXPOrGreater(void) { - return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WINXP), LOBYTE(_WIN32_WINNT_WINXP), 0, 0); -} - -VERSIONHELPERAPI IsWindowsXPSP1OrGreater(void) { - return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WINXP), LOBYTE(_WIN32_WINNT_WINXP), 0, 1); -} - -VERSIONHELPERAPI IsWindowsXPSP2OrGreater(void) { - return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WINXP), LOBYTE(_WIN32_WINNT_WINXP), 0, 2); -} - -VERSIONHELPERAPI IsWindowsXPSP3OrGreater(void) { - return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WINXP), LOBYTE(_WIN32_WINNT_WINXP), 0, 3); -} - -VERSIONHELPERAPI IsWindowsVistaOrGreater(void) { - return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_VISTA), LOBYTE(_WIN32_WINNT_VISTA), 0, 0); -} - -VERSIONHELPERAPI IsWindowsVistaSP1OrGreater(void) { - return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_VISTA), LOBYTE(_WIN32_WINNT_VISTA), 0, 1); -} - -VERSIONHELPERAPI IsWindowsVistaSP2OrGreater(void) { - return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_VISTA), LOBYTE(_WIN32_WINNT_VISTA), 0, 2); -} - -VERSIONHELPERAPI IsWindows7OrGreater(void) { - return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WIN7), LOBYTE(_WIN32_WINNT_WIN7), 0, 0); -} - -VERSIONHELPERAPI IsWindows7SP1OrGreater(void) { - return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WIN7), LOBYTE(_WIN32_WINNT_WIN7), 0, 1); -} - -VERSIONHELPERAPI IsWindows8OrGreater(void) { - return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WIN8), LOBYTE(_WIN32_WINNT_WIN8), 0, 0); -} - -VERSIONHELPERAPI IsWindows8Point1OrGreater(void) { - return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WINBLUE), LOBYTE(_WIN32_WINNT_WINBLUE), 0, 0); -} - -VERSIONHELPERAPI IsWindowsThresholdOrGreater(void) { - return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WINTHRESHOLD), LOBYTE(_WIN32_WINNT_WINTHRESHOLD), 0, 0); -} - -VERSIONHELPERAPI IsWindows10OrGreater(void) { - return IsWindowsThresholdOrGreater(); -} - -VERSIONHELPERAPI IsWindows10Version1803OrGreater(void) { - return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WIN10), LOBYTE(_WIN32_WINNT_WIN10), 17134, 0); -} - -VERSIONHELPERAPI IsWindows11OrGreater(void) { - return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WIN11), LOBYTE(_WIN32_WINNT_WIN11), 22000, 0); -} - -VERSIONHELPERAPI IsWindows11Version24H2OrGreater(void) { - return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WIN11), LOBYTE(_WIN32_WINNT_WIN11), 26100, 0); -} - -VERSIONHELPERAPI IsWindowsServer(void) { - OSVERSIONINFOEXW vi = {sizeof(vi),0,0,0,0,{0},0,0,0,VER_NT_WORKSTATION}; - return !verhelp_verify_version(&vi, VER_PRODUCT_TYPE, VerSetConditionMask(0, VER_PRODUCT_TYPE, VER_EQUAL)); -} - -VERSIONHELPERAPI IsWindows2000(void) { - return IsWindowsVersionAnySP(HIBYTE(_WIN32_WINNT_WIN2K), LOBYTE(_WIN32_WINNT_WIN2K), 0); -} - -VERSIONHELPERAPI IsWindowsXP(void) { - return IsWindowsVersionAnySP(HIBYTE(_WIN32_WINNT_WINXP), LOBYTE(_WIN32_WINNT_WINXP), 0); -} - -VERSIONHELPERAPI IsWindowsXPRTM(void) { - return IsWindowsVersion(HIBYTE(_WIN32_WINNT_WINXP), LOBYTE(_WIN32_WINNT_WINXP), 0, 0); -} - -VERSIONHELPERAPI IsWindowsXPSP1(void) { - return IsWindowsVersion(HIBYTE(_WIN32_WINNT_WINXP), LOBYTE(_WIN32_WINNT_WINXP), 0, 1); -} - -VERSIONHELPERAPI IsWindowsXPSP2(void) { - return IsWindowsVersion(HIBYTE(_WIN32_WINNT_WINXP), LOBYTE(_WIN32_WINNT_WINXP), 0, 2); -} - -VERSIONHELPERAPI IsWindowsXPSP3(void) { - return IsWindowsVersion(HIBYTE(_WIN32_WINNT_WINXP), LOBYTE(_WIN32_WINNT_WINXP), 0, 3); -} - -VERSIONHELPERAPI IsWindowsVista(void) { - return IsWindowsVersionAnySP(HIBYTE(_WIN32_WINNT_VISTA), LOBYTE(_WIN32_WINNT_VISTA), 0); -} - -VERSIONHELPERAPI IsWindowsVistaRTM(void) { - return IsWindowsVersion(HIBYTE(_WIN32_WINNT_VISTA), LOBYTE(_WIN32_WINNT_VISTA), 0, 0); -} - -VERSIONHELPERAPI IsWindowsVistaSP1(void) { - return IsWindowsVersion(HIBYTE(_WIN32_WINNT_VISTA), LOBYTE(_WIN32_WINNT_VISTA), 0, 1); -} - -VERSIONHELPERAPI IsWindowsVistaSP2(void) { - return IsWindowsVersion(HIBYTE(_WIN32_WINNT_VISTA), LOBYTE(_WIN32_WINNT_VISTA), 0, 2); -} - -VERSIONHELPERAPI IsWindows7(void) { - return IsWindowsVersionAnySP(HIBYTE(_WIN32_WINNT_WIN7), LOBYTE(_WIN32_WINNT_WIN7), 0); -} - -VERSIONHELPERAPI IsWindows7RTM(void) { - return IsWindowsVersion(HIBYTE(_WIN32_WINNT_WIN7), LOBYTE(_WIN32_WINNT_WIN7), 0, 0); -} - -VERSIONHELPERAPI IsWindows7SP1(void) { - return IsWindowsVersion(HIBYTE(_WIN32_WINNT_WIN7), LOBYTE(_WIN32_WINNT_WIN7), 0, 1); -} - -VERSIONHELPERAPI IsWindows8(void) { - return IsWindowsVersion(HIBYTE(_WIN32_WINNT_WIN8), LOBYTE(_WIN32_WINNT_WIN8), 0, 0); -} - -VERSIONHELPERAPI IsWindows8Point1(void) { - return IsWindowsVersion(HIBYTE(_WIN32_WINNT_WINBLUE), LOBYTE(_WIN32_WINNT_WINBLUE), 0, 0); -} - -VERSIONHELPERAPI IsWindowsThreshold(void) { - return IsWindows10OrGreater() && !IsWindows11OrGreater(); -} - -VERSIONHELPERAPI IsWindows10(void) { - return IsWindowsThreshold(); -} - -VERSIONHELPERAPI IsWindows11(void) { - return IsWindowsVersion(HIBYTE(_WIN32_WINNT_WIN11), LOBYTE(_WIN32_WINNT_WIN11), 22000, 0); -} - -VERSIONHELPERAPI IsWindows11Version24H2(void) { - return IsWindowsVersionExcactBuild(HIBYTE(_WIN32_WINNT_WIN11), LOBYTE(_WIN32_WINNT_WIN11), 26100, 0); -} - -VERSIONHELPERAPI IsWine(void) { - return verhelp_wine_get_version() != NULL; -} - -VERSIONHELPERAPI IsMacOS(void) { - const char* sysname = NULL; - const char* release = NULL; - verhelp_wine_get_host_version(&sysname, &release); - - return sysname && _strcmpi(sysname, "Darwin") == 0; -} - -VERSIONHELPERAPI IsLinux(void) { - const char* sysname = NULL; - const char* release = NULL; - verhelp_wine_get_host_version(&sysname, &release); - - return sysname && _strcmpi(sysname, "Linux") == 0; -} - -VERSIONHELPERAPI IsAndroid(void) { - const char* sysname = NULL; - const char* release = NULL; - verhelp_wine_get_host_version(&sysname, &release); - - return release && strstr(release, "android") != NULL; -} - -VERSIONHELPERAPI IsSteamDeck(void) { - return IsWine() && GetEnvironmentVariable("STEAMDECK", NULL, 0); -} - -#endif diff --git a/inc/winapi_hooks.h b/inc/winapi_hooks.h index ad44c7e..a66f475 100644 --- a/inc/winapi_hooks.h +++ b/inc/winapi_hooks.h @@ -1,8 +1,8 @@ #ifndef WINAPI_HOOKS_H #define WINAPI_HOOKS_H +#define WIN32_LEAN_AND_MEAN #include -#include BOOL WINAPI fake_GetCursorPos(LPPOINT lpPoint); @@ -22,7 +22,6 @@ BOOL WINAPI fake_SetWindowPos(HWND hWnd, HWND hWndInsertAfter, int X, int Y, int BOOL WINAPI fake_MoveWindow(HWND hWnd, int X, int Y, int nWidth, int nHeight, BOOL bRepaint); LRESULT WINAPI fake_SendMessageA(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); LONG WINAPI fake_SetWindowLongA(HWND hWnd, int nIndex, LONG dwNewLong); -LONG WINAPI fake_SetWindowLongW(HWND hWnd, int nIndex, LONG dwNewLong); LONG WINAPI fake_GetWindowLongA(HWND hWnd, int nIndex); BOOL WINAPI fake_EnableWindow(HWND hWnd, BOOL bEnable); BOOL WINAPI fake_DestroyWindow(HWND hWnd); @@ -34,29 +33,11 @@ BOOL WINAPI fake_SetForegroundWindow(HWND hWnd); HHOOK WINAPI fake_SetWindowsHookExA(int idHook, HOOKPROC lpfn, HINSTANCE hmod, DWORD dwThreadId); BOOL WINAPI fake_PeekMessageA(LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax, UINT wRemoveMsg); BOOL WINAPI fake_GetMessageA(LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax); -BOOL WINAPI fake_GetWindowPlacement(HWND hWnd, WINDOWPLACEMENT* lpwndpl); -BOOL WINAPI fake_SetWindowPlacement(HWND hWnd, const WINDOWPLACEMENT* lpwndpl); -BOOL WINAPI fake_EnumDisplaySettingsA(LPCSTR lpszDeviceName, DWORD iModeNum, DEVMODEA* lpDevMode); -LRESULT WINAPI fake_DefWindowProcA(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); -HWND WINAPI fake_SetParent(HWND hWndChild, HWND hWndNewParent); -HDC WINAPI fake_BeginPaint(HWND hWnd, LPPAINTSTRUCT lpPaint); -SHORT WINAPI fake_GetKeyState(int nVirtKey); -SHORT WINAPI fake_GetAsyncKeyState(int vKey); int WINAPI fake_GetDeviceCaps(HDC hdc, int index); -int WINAPI fake_GetDeviceCaps_system(HDC hdc, int index); BOOL WINAPI fake_StretchBlt( HDC hdcDest, int xDest, int yDest, int wDest, int hDest, HDC hdcSrc, int xSrc, int ySrc, int wSrc, int hSrc, DWORD rop); -BOOL WINAPI fake_WinGStretchBlt( - HDC hdcDest, int xDest, int yDest, int wDest, int hDest, HDC hdcSrc, int xSrc, int ySrc, int wSrc, int hSrc); - -BOOL WINAPI fake_WinGBitBlt( - HDC hdc, int x, int y, int cx, int cy, HDC hdcSrc, int x1, int y1); - -BOOL WINAPI fake_BitBlt( - HDC hdc, int x, int y, int cx, int cy, HDC hdcSrc, int x1, int y1, DWORD rop); - int WINAPI fake_SetDIBitsToDevice( HDC, int, int, DWORD, DWORD, int, int, UINT, UINT, const VOID*, const BITMAPINFO*, UINT); @@ -65,9 +46,6 @@ int WINAPI fake_StretchDIBits( HFONT WINAPI fake_CreateFontIndirectA(CONST LOGFONTA*); HFONT WINAPI fake_CreateFontA(int, int, int, int, int, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, LPCTSTR); -UINT WINAPI fake_GetSystemPaletteEntries(HDC, UINT, UINT, LPPALETTEENTRY); -HPALETTE WINAPI fake_SelectPalette(HDC, HPALETTE, BOOL); -UINT WINAPI fake_RealizePalette(HDC); HMODULE WINAPI fake_LoadLibraryA(LPCSTR lpLibFileName); HMODULE WINAPI fake_LoadLibraryW(LPCWSTR lpLibFileName); @@ -82,9 +60,6 @@ BOOL WINAPI fake_GetDiskFreeSpaceA( LPDWORD lpNumberOfFreeClusters, LPDWORD lpTotalNumberOfClusters); -DWORD WINAPI fake_GetVersion(void); -BOOL WINAPI fake_GetVersionExA(LPOSVERSIONINFOA lpVersionInformation); - HWND WINAPI fake_CreateWindowExA( DWORD dwExStyle, LPCSTR lpClassName, LPCSTR lpWindowName, DWORD dwStyle, int X, int Y, int nWidth, int nHeight, HWND hWndParent, HMENU hMenu, HINSTANCE hInstance, LPVOID lpParam); @@ -92,11 +67,7 @@ HWND WINAPI fake_CreateWindowExA( HRESULT WINAPI fake_CoCreateInstance( REFCLSID rclsid, LPUNKNOWN pUnkOuter, DWORD dwClsContext, REFIID riid, LPVOID* ppv); -MCIERROR WINAPI fake_mciSendCommandA(MCIDEVICEID IDDevice, UINT uMsg, DWORD_PTR fdwCommand, DWORD_PTR dwParam); - LPTOP_LEVEL_EXCEPTION_FILTER WINAPI fake_SetUnhandledExceptionFilter( LPTOP_LEVEL_EXCEPTION_FILTER lpTopLevelExceptionFilter); -PGETFRAME WINAPI fake_AVIStreamGetFrameOpen(PAVISTREAM pavi, LPBITMAPINFOHEADER lpbiWanted); - #endif diff --git a/inc/wndproc.h b/inc/wndproc.h index 4af4f7e..3cb6a97 100644 --- a/inc/wndproc.h +++ b/inc/wndproc.h @@ -9,18 +9,12 @@ #define WM_DISPLAYCHANGE_DDRAW WM_APP+116 #define WM_TOGGLE_FULLSCREEN WM_APP+117 #define WM_TOGGLE_MAXIMIZE WM_APP+118 -#define WM_RESTORE_STYLE WM_APP+119 #define IDT_TIMER_LEAVE_BNET 541287654 -#define IDT_TIMER_LINUX_FIX_WINDOW_SIZE 345267753 #define CNC_DDRAW_SET_FULLSCREEN 1 #define CNC_DDRAW_SET_WINDOWED 2 -#ifndef WM_UNICHAR -#define WM_UNICHAR 0x0109 -#endif - LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); #endif diff --git a/src/IDirect3D/IDirect3D.c b/src/IDirect3D/IDirect3D.c index e4b0ee5..352430f 100644 --- a/src/IDirect3D/IDirect3D.c +++ b/src/IDirect3D/IDirect3D.c @@ -4,28 +4,15 @@ HRESULT __stdcall IDirect3D__QueryInterface(IDirect3DImpl* This, REFIID riid, void** obj) { - TRACE( - "NOT_IMPLEMENTED -> %s(This=%p, riid=%08X, obj=%p) [%p]\n", - __FUNCTION__, - This, - (unsigned int)riid, - obj, - _ReturnAddress()); - + TRACE("NOT_IMPLEMENTED -> %s(This=%p, riid=%08X, obj=%p)\n", __FUNCTION__, This, (unsigned int)riid, obj); HRESULT ret = E_FAIL; - - if (riid) - { - TRACE("NOT_IMPLEMENTED GUID = %08X\n", ((GUID*)riid)->Data1); - } - TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; } ULONG __stdcall IDirect3D__AddRef(IDirect3DImpl* This) { - TRACE("-> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("-> %s(This=%p)\n", __FUNCTION__, This); ULONG ret = ++This->ref; TRACE("<- %s(This ref=%u)\n", __FUNCTION__, ret); return ret; @@ -33,7 +20,7 @@ ULONG __stdcall IDirect3D__AddRef(IDirect3DImpl* This) ULONG __stdcall IDirect3D__Release(IDirect3DImpl* This) { - TRACE("-> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("-> %s(This=%p)\n", __FUNCTION__, This); ULONG ret = --This->ref; @@ -50,33 +37,23 @@ ULONG __stdcall IDirect3D__Release(IDirect3DImpl* This) HRESULT __stdcall IDirect3D__Initialize(IDirect3DImpl* This, int a) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = E_FAIL; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; } -HRESULT __stdcall IDirect3D__EnumDevices( - IDirect3DImpl* This, - LPD3DENUMDEVICESCALLBACK lpEnumDevicesCallback, - LPVOID lpUserArg) +HRESULT __stdcall IDirect3D__EnumDevices(IDirect3DImpl* This, int a, int b) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); - HRESULT ret = S_OK; - - if (lpEnumDevicesCallback) - { - D3DDEVICEDESC desc = { 0 }; - lpEnumDevicesCallback((GUID FAR*)&GUID_NULL, "NULL", "NULL", &desc, &desc, lpUserArg); - } - + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); + HRESULT ret = E_FAIL; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; } HRESULT __stdcall IDirect3D__CreateLight(IDirect3DImpl* This, int a, int b) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = E_FAIL; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -84,7 +61,7 @@ HRESULT __stdcall IDirect3D__CreateLight(IDirect3DImpl* This, int a, int b) HRESULT __stdcall IDirect3D__CreateMaterial(IDirect3DImpl* This, int a, int b) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = E_FAIL; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -92,7 +69,7 @@ HRESULT __stdcall IDirect3D__CreateMaterial(IDirect3DImpl* This, int a, int b) HRESULT __stdcall IDirect3D__CreateViewport(IDirect3DImpl* This, int a, int b) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = E_FAIL; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -100,7 +77,7 @@ HRESULT __stdcall IDirect3D__CreateViewport(IDirect3DImpl* This, int a, int b) HRESULT __stdcall IDirect3D__FindDevice(IDirect3DImpl* This, int a, int b) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = E_FAIL; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; diff --git a/src/IDirect3D/IDirect3D2.c b/src/IDirect3D/IDirect3D2.c index c4f93ab..d84598f 100644 --- a/src/IDirect3D/IDirect3D2.c +++ b/src/IDirect3D/IDirect3D2.c @@ -4,28 +4,15 @@ HRESULT __stdcall IDirect3D2__QueryInterface(IDirect3D2Impl* This, REFIID riid, void** obj) { - TRACE( - "NOT_IMPLEMENTED -> %s(This=%p, riid=%08X, obj=%p) [%p]\n", - __FUNCTION__, - This, - (unsigned int)riid, - obj, - _ReturnAddress()); - + TRACE("NOT_IMPLEMENTED -> %s(This=%p, riid=%08X, obj=%p)\n", __FUNCTION__, This, (unsigned int)riid, obj); HRESULT ret = E_FAIL; - - if (riid) - { - TRACE("NOT_IMPLEMENTED GUID = %08X\n", ((GUID*)riid)->Data1); - } - TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; } ULONG __stdcall IDirect3D2__AddRef(IDirect3D2Impl* This) { - TRACE("-> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("-> %s(This=%p)\n", __FUNCTION__, This); ULONG ret = ++This->ref; TRACE("<- %s(This ref=%u)\n", __FUNCTION__, ret); return ret; @@ -33,7 +20,7 @@ ULONG __stdcall IDirect3D2__AddRef(IDirect3D2Impl* This) ULONG __stdcall IDirect3D2__Release(IDirect3D2Impl* This) { - TRACE("-> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("-> %s(This=%p)\n", __FUNCTION__, This); ULONG ret = --This->ref; @@ -48,27 +35,17 @@ ULONG __stdcall IDirect3D2__Release(IDirect3D2Impl* This) return ret; } -HRESULT __stdcall IDirect3D2__EnumDevices( - IDirect3D2Impl* This, - LPD3DENUMDEVICESCALLBACK lpEnumDevicesCallback, - LPVOID lpUserArg) +HRESULT __stdcall IDirect3D2__EnumDevices(IDirect3D2Impl* This, int a, int b) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); - HRESULT ret = S_OK; - - if (lpEnumDevicesCallback) - { - //D3DDEVICEDESC desc = { 0 }; - //lpEnumDevicesCallback((GUID FAR*)&GUID_NULL, "NULL", "NULL", &desc, &desc, lpUserArg); - } - + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); + HRESULT ret = E_FAIL; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; } HRESULT __stdcall IDirect3D2__CreateLight(IDirect3D2Impl* This, int a, int b) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = E_FAIL; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -76,7 +53,7 @@ HRESULT __stdcall IDirect3D2__CreateLight(IDirect3D2Impl* This, int a, int b) HRESULT __stdcall IDirect3D2__CreateMaterial(IDirect3D2Impl* This, int a, int b) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = E_FAIL; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -84,7 +61,7 @@ HRESULT __stdcall IDirect3D2__CreateMaterial(IDirect3D2Impl* This, int a, int b) HRESULT __stdcall IDirect3D2__CreateViewport(IDirect3D2Impl* This, int a, int b) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = E_FAIL; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -92,7 +69,7 @@ HRESULT __stdcall IDirect3D2__CreateViewport(IDirect3D2Impl* This, int a, int b) HRESULT __stdcall IDirect3D2__FindDevice(IDirect3D2Impl* This, int a, int b) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = E_FAIL; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -100,7 +77,7 @@ HRESULT __stdcall IDirect3D2__FindDevice(IDirect3D2Impl* This, int a, int b) HRESULT __stdcall IDirect3D2__CreateDevice(IDirect3D2Impl* This, int a, int b, int c) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = E_FAIL; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; diff --git a/src/IDirect3D/IDirect3D3.c b/src/IDirect3D/IDirect3D3.c index 8b6ff43..0978d4a 100644 --- a/src/IDirect3D/IDirect3D3.c +++ b/src/IDirect3D/IDirect3D3.c @@ -4,28 +4,15 @@ HRESULT __stdcall IDirect3D3__QueryInterface(IDirect3D3Impl* This, REFIID riid, void** obj) { - TRACE( - "NOT_IMPLEMENTED -> %s(This=%p, riid=%08X, obj=%p) [%p]\n", - __FUNCTION__, - This, - (unsigned int)riid, - obj, - _ReturnAddress()); - + TRACE("NOT_IMPLEMENTED -> %s(This=%p, riid=%08X, obj=%p)\n", __FUNCTION__, This, (unsigned int)riid, obj); HRESULT ret = E_FAIL; - - if (riid) - { - TRACE("NOT_IMPLEMENTED GUID = %08X\n", ((GUID*)riid)->Data1); - } - TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; } ULONG __stdcall IDirect3D3__AddRef(IDirect3D3Impl* This) { - TRACE("-> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("-> %s(This=%p)\n", __FUNCTION__, This); ULONG ret = ++This->ref; TRACE("<- %s(This ref=%u)\n", __FUNCTION__, ret); return ret; @@ -33,7 +20,7 @@ ULONG __stdcall IDirect3D3__AddRef(IDirect3D3Impl* This) ULONG __stdcall IDirect3D3__Release(IDirect3D3Impl* This) { - TRACE("-> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("-> %s(This=%p)\n", __FUNCTION__, This); ULONG ret = --This->ref; @@ -48,27 +35,17 @@ ULONG __stdcall IDirect3D3__Release(IDirect3D3Impl* This) return ret; } -HRESULT __stdcall IDirect3D3__EnumDevices( - IDirect3D3Impl* This, - LPD3DENUMDEVICESCALLBACK lpEnumDevicesCallback, - LPVOID lpUserArg) +HRESULT __stdcall IDirect3D3__EnumDevices(IDirect3D3Impl* This, int a, int b) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); - HRESULT ret = S_OK; - - if (lpEnumDevicesCallback) - { - //D3DDEVICEDESC desc = { 0 }; - //lpEnumDevicesCallback((GUID FAR*)&GUID_NULL, "NULL", "NULL", &desc, &desc, lpUserArg); - } - + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); + HRESULT ret = E_FAIL; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; } HRESULT __stdcall IDirect3D3__CreateLight(IDirect3D3Impl* This, int a, int b) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = E_FAIL; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -76,7 +53,7 @@ HRESULT __stdcall IDirect3D3__CreateLight(IDirect3D3Impl* This, int a, int b) HRESULT __stdcall IDirect3D3__CreateMaterial(IDirect3D3Impl* This, int a, int b) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = E_FAIL; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -84,7 +61,7 @@ HRESULT __stdcall IDirect3D3__CreateMaterial(IDirect3D3Impl* This, int a, int b) HRESULT __stdcall IDirect3D3__CreateViewport(IDirect3D3Impl* This, int a, int b) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = E_FAIL; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -92,7 +69,7 @@ HRESULT __stdcall IDirect3D3__CreateViewport(IDirect3D3Impl* This, int a, int b) HRESULT __stdcall IDirect3D3__FindDevice(IDirect3D3Impl* This, int a, int b) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = E_FAIL; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -100,7 +77,7 @@ HRESULT __stdcall IDirect3D3__FindDevice(IDirect3D3Impl* This, int a, int b) HRESULT __stdcall IDirect3D3__CreateDevice(IDirect3D3Impl* This, int a, int b, int c, int d) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = E_FAIL; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -108,7 +85,7 @@ HRESULT __stdcall IDirect3D3__CreateDevice(IDirect3D3Impl* This, int a, int b, i HRESULT __stdcall IDirect3D3__CreateVertexBuffer(IDirect3D3Impl* This, int a, int b, int c, int d) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = E_FAIL; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -116,7 +93,7 @@ HRESULT __stdcall IDirect3D3__CreateVertexBuffer(IDirect3D3Impl* This, int a, in HRESULT __stdcall IDirect3D3__EnumZBufferFormats(IDirect3D3Impl* This, int a, int b, int c) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = E_FAIL; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -124,7 +101,7 @@ HRESULT __stdcall IDirect3D3__EnumZBufferFormats(IDirect3D3Impl* This, int a, in HRESULT __stdcall IDirect3D3__EvictManagedTextures(IDirect3D3Impl* This) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = E_FAIL; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; diff --git a/src/IDirect3D/IDirect3D7.c b/src/IDirect3D/IDirect3D7.c index 0102923..99c36bb 100644 --- a/src/IDirect3D/IDirect3D7.c +++ b/src/IDirect3D/IDirect3D7.c @@ -4,28 +4,15 @@ HRESULT __stdcall IDirect3D7__QueryInterface(IDirect3D7Impl* This, REFIID riid, void** obj) { - TRACE( - "NOT_IMPLEMENTED -> %s(This=%p, riid=%08X, obj=%p) [%p]\n", - __FUNCTION__, - This, - (unsigned int)riid, - obj, - _ReturnAddress()); - + TRACE("NOT_IMPLEMENTED -> %s(This=%p, riid=%08X, obj=%p)\n", __FUNCTION__, This, (unsigned int)riid, obj); HRESULT ret = E_FAIL; - - if (riid) - { - TRACE("NOT_IMPLEMENTED GUID = %08X\n", ((GUID*)riid)->Data1); - } - TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; } ULONG __stdcall IDirect3D7__AddRef(IDirect3D7Impl* This) { - TRACE("-> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("-> %s(This=%p)\n", __FUNCTION__, This); ULONG ret = ++This->ref; TRACE("<- %s(This ref=%u)\n", __FUNCTION__, ret); return ret; @@ -33,7 +20,7 @@ ULONG __stdcall IDirect3D7__AddRef(IDirect3D7Impl* This) ULONG __stdcall IDirect3D7__Release(IDirect3D7Impl* This) { - TRACE("-> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("-> %s(This=%p)\n", __FUNCTION__, This); ULONG ret = --This->ref; @@ -48,27 +35,17 @@ ULONG __stdcall IDirect3D7__Release(IDirect3D7Impl* This) return ret; } -HRESULT __stdcall IDirect3D7__EnumDevices( - IDirect3D7Impl* This, - LPD3DENUMDEVICESCALLBACK7 lpEnumDevicesCallback, - LPVOID lpUserArg) +HRESULT __stdcall IDirect3D7__EnumDevices(IDirect3D7Impl* This, int a, int b) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); - HRESULT ret = S_OK; - - if (lpEnumDevicesCallback) - { - //D3DDEVICEDESC7 desc = { 0 }; - //lpEnumDevicesCallback("NULL", "NULL", &desc, lpUserArg); - } - + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); + HRESULT ret = E_FAIL; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; } HRESULT __stdcall IDirect3D7__CreateDevice(IDirect3D7Impl* This, int a, int b, int c) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = E_FAIL; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -76,7 +53,7 @@ HRESULT __stdcall IDirect3D7__CreateDevice(IDirect3D7Impl* This, int a, int b, i HRESULT __stdcall IDirect3D7__CreateVertexBuffer(IDirect3D7Impl* This, int a, int b, int c) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = E_FAIL; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -84,7 +61,7 @@ HRESULT __stdcall IDirect3D7__CreateVertexBuffer(IDirect3D7Impl* This, int a, in HRESULT __stdcall IDirect3D7__EnumZBufferFormats(IDirect3D7Impl* This, int a, int b, int c) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = E_FAIL; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -92,7 +69,7 @@ HRESULT __stdcall IDirect3D7__EnumZBufferFormats(IDirect3D7Impl* This, int a, in HRESULT __stdcall IDirect3D7__EvictManagedTextures(IDirect3D7Impl* This) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = E_FAIL; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; diff --git a/src/IDirectDraw/IDirectDraw.c b/src/IDirectDraw/IDirectDraw.c index 9384714..9a96270 100644 --- a/src/IDirectDraw/IDirectDraw.c +++ b/src/IDirectDraw/IDirectDraw.c @@ -1,4 +1,3 @@ -#include #include #include "IDirectDraw.h" #include "IDirect3D.h" @@ -14,15 +13,11 @@ HRESULT __stdcall IDirectDraw__QueryInterface(IDirectDrawImpl* This, REFIID riid, LPVOID FAR* ppvObj) { - TRACE("-> %s(This=%p, riid=%08X, ppvObj=%p) [%p]\n", __FUNCTION__, This, (unsigned int)riid, ppvObj, _ReturnAddress()); + TRACE("-> %s(This=%p, riid=%08X, ppvObj=%p)\n", __FUNCTION__, This, (unsigned int)riid, ppvObj); HRESULT ret = E_NOINTERFACE; - if (!ppvObj) - { - ret = E_INVALIDARG; - } - else if (riid) + if (riid) { if (IsEqualGUID(&IID_IDirectDraw2, riid) || IsEqualGUID(&IID_IDirectDraw4, riid) || @@ -56,7 +51,7 @@ HRESULT __stdcall IDirectDraw__QueryInterface(IDirectDrawImpl* This, REFIID riid ret = S_OK; } - else if (IsEqualGUID(&IID_IDirect3D, riid)) + else if (IsEqualGUID(&IID_IDirect3D, riid) && !g_config.direct3d_passthrough) { IDirect3DImpl* d3d = (IDirect3DImpl*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DImpl)); @@ -70,7 +65,7 @@ HRESULT __stdcall IDirectDraw__QueryInterface(IDirectDrawImpl* This, REFIID riid ret = S_OK; } - else if (IsEqualGUID(&IID_IDirect3D2, riid)) + else if (IsEqualGUID(&IID_IDirect3D2, riid) && !g_config.direct3d_passthrough) { IDirect3D2Impl* d3d = (IDirect3D2Impl*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3D2Impl)); @@ -84,7 +79,7 @@ HRESULT __stdcall IDirectDraw__QueryInterface(IDirectDrawImpl* This, REFIID riid ret = S_OK; } - else if (IsEqualGUID(&IID_IDirect3D3, riid)) + else if (IsEqualGUID(&IID_IDirect3D3, riid) && !g_config.direct3d_passthrough) { IDirect3D3Impl* d3d = (IDirect3D3Impl*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3D3Impl)); @@ -98,7 +93,7 @@ HRESULT __stdcall IDirectDraw__QueryInterface(IDirectDrawImpl* This, REFIID riid ret = S_OK; } - else if (IsEqualGUID(&IID_IDirect3D7, riid)) + else if (IsEqualGUID(&IID_IDirect3D7, riid) && !g_config.direct3d_passthrough) { IDirect3D7Impl* d3d = (IDirect3D7Impl*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3D7Impl)); @@ -132,30 +127,24 @@ HRESULT __stdcall IDirectDraw__QueryInterface(IDirectDrawImpl* This, REFIID riid ret = S_OK; */ } - else if (((GUID*)riid)->Data1 == 0 && ((GUID*)riid)->Data2 == 0 && ((GUID*)riid)->Data3 == 0) - { - TRACE("NOT_IMPLEMENTED GUID = 0 0 0\n"); - - ret = E_NOINTERFACE; - } else { TRACE("NOT_IMPLEMENTED GUID = %08X\n", ((GUID*)riid)->Data1); - if (!g_ddraw.real_dll) - g_ddraw.real_dll = real_LoadLibraryA("system32\\ddraw.dll"); + if (!g_ddraw->real_dll) + g_ddraw->real_dll = real_LoadLibraryA("system32\\ddraw.dll"); - if (g_ddraw.real_dll && !g_ddraw.DirectDrawCreate) - g_ddraw.DirectDrawCreate = (void*)real_GetProcAddress(g_ddraw.real_dll, "DirectDrawCreate"); + if (g_ddraw->real_dll && !g_ddraw->DirectDrawCreate) + g_ddraw->DirectDrawCreate = (void*)real_GetProcAddress(g_ddraw->real_dll, "DirectDrawCreate"); - if (g_ddraw.DirectDrawCreate == DirectDrawCreate) - g_ddraw.DirectDrawCreate = NULL; + if (g_ddraw->DirectDrawCreate == DirectDrawCreate) + g_ddraw->DirectDrawCreate = NULL; - if (!g_ddraw.real_dd && g_ddraw.DirectDrawCreate) - g_ddraw.DirectDrawCreate(NULL, &g_ddraw.real_dd, NULL); + if (!g_ddraw->real_dd && g_ddraw->DirectDrawCreate) + g_ddraw->DirectDrawCreate(NULL, &g_ddraw->real_dd, NULL); - if (g_ddraw.real_dd) - ret = IDirectDraw_QueryInterface(g_ddraw.real_dd, riid, ppvObj); + if (g_ddraw->real_dd) + ret = IDirectDraw_QueryInterface(g_ddraw->real_dd, riid, ppvObj); else ret = E_NOINTERFACE; } @@ -168,7 +157,7 @@ HRESULT __stdcall IDirectDraw__QueryInterface(IDirectDrawImpl* This, REFIID riid ULONG __stdcall IDirectDraw__AddRef(IDirectDrawImpl* This) { - TRACE("-> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("-> %s(This=%p)\n", __FUNCTION__, This); ULONG ret = ++This->ref; #ifdef _DEBUG @@ -183,7 +172,7 @@ ULONG __stdcall IDirectDraw__AddRef(IDirectDrawImpl* This) ULONG __stdcall IDirectDraw__Release(IDirectDrawImpl* This) { - TRACE("-> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("-> %s(This=%p)\n", __FUNCTION__, This); ULONG ret = --This->ref; @@ -206,7 +195,7 @@ ULONG __stdcall IDirectDraw__Release(IDirectDrawImpl* This) HRESULT __stdcall IDirectDraw__Compact(IDirectDrawImpl* This) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DD_OK; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -219,13 +208,12 @@ HRESULT __stdcall IDirectDraw__CreateClipper( IUnknown FAR* pUnkOuter) { TRACE( - "-> %s(This=%p, dwFlags=%08X, lplpDDClipper=%p, unkOuter=%p) [%p]\n", + "-> %s(This=%p, dwFlags=%08X, lplpDDClipper=%p, unkOuter=%p)\n", __FUNCTION__, This, dwFlags, lplpDDClipper, - pUnkOuter, - _ReturnAddress()); + pUnkOuter); HRESULT ret = dd_CreateClipper(dwFlags, (IDirectDrawClipperImpl**)lplpDDClipper, pUnkOuter); @@ -241,14 +229,13 @@ HRESULT __stdcall IDirectDraw__CreatePalette( IUnknown FAR* unkOuter) { TRACE( - "-> %s(This=%p, dwFlags=%08X, lpDDColorArray=%p, lpDDPalette=%p, unkOuter=%p) [%p]\n", + "-> %s(This=%p, dwFlags=%08X, lpDDColorArray=%p, lpDDPalette=%p, unkOuter=%p)\n", __FUNCTION__, This, dwFlags, lpDDColorArray, lpDDPalette, - unkOuter, - _ReturnAddress()); + unkOuter); HRESULT ret = dd_CreatePalette(dwFlags, lpDDColorArray, (IDirectDrawPaletteImpl**)lpDDPalette, unkOuter); @@ -263,13 +250,12 @@ HRESULT __stdcall IDirectDraw__CreateSurface( IUnknown FAR* unkOuter) { TRACE( - "-> %s(This=%p, lpDDSurfaceDesc=%p, lpDDSurface=%p, unkOuter=%p) [%p]\n", + "-> %s(This=%p, lpDDSurfaceDesc=%p, lpDDSurface=%p, unkOuter=%p)\n", __FUNCTION__, This, lpDDSurfaceDesc, lpDDSurface, - unkOuter, - _ReturnAddress()); + unkOuter); HRESULT ret = dd_CreateSurface( @@ -287,7 +273,7 @@ HRESULT __stdcall IDirectDraw__DuplicateSurface( LPDIRECTDRAWSURFACE7 lpDDSrcSurface, LPDIRECTDRAWSURFACE7* lpDDDestSurface) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DDERR_CANTDUPLICATE; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -301,14 +287,13 @@ HRESULT __stdcall IDirectDraw__EnumDisplayModes( LPDDENUMMODESCALLBACK2 lpEnumModesCallback) { TRACE( - "-> %s(This=%p, dwFlags=%08X, lpDDSurfaceDesc=%p, lpContext=%p, lpEnumModesCallback=%p) [%p]\n", + "-> %s(This=%p, dwFlags=%08X, lpDDSurfaceDesc=%p, lpContext=%p, lpEnumModesCallback=%p)\n", __FUNCTION__, This, dwFlags, lpDDSurfaceDesc, lpContext, - lpEnumModesCallback, - _ReturnAddress()); + lpEnumModesCallback); HRESULT ret = dd_EnumDisplayModes( @@ -328,25 +313,15 @@ HRESULT __stdcall IDirectDraw__EnumSurfaces( LPVOID lpContext, LPDDENUMSURFACESCALLBACK7 lpEnumSurfacesCallback) { - TRACE( - "NOT_IMPLEMENTED -> %s(This=%p, dwFlags=%08X, lpDDSurfaceDesc=%p, lpContext=%p, lpEnumSurfacesCallback=%p) [%p]\n", - __FUNCTION__, - This, - dwFlags, - lpDDSurfaceDesc, - lpContext, - lpEnumSurfacesCallback, - _ReturnAddress()); - + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DD_OK; - TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; } HRESULT __stdcall IDirectDraw__FlipToGDISurface(IDirectDrawImpl* This) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DD_OK; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -354,14 +329,7 @@ HRESULT __stdcall IDirectDraw__FlipToGDISurface(IDirectDrawImpl* This) HRESULT __stdcall IDirectDraw__GetCaps(IDirectDrawImpl* This, LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDEmulCaps) { - TRACE( - "-> %s(This=%p, lpDDDriverCaps=%p, lpDDEmulCaps=%p) [%p]\n", - __FUNCTION__, - This, - lpDDDriverCaps, - lpDDEmulCaps, - _ReturnAddress()); - + TRACE("-> %s(This=%p, lpDDDriverCaps=%p, lpDDEmulCaps=%p)\n", __FUNCTION__, This, lpDDDriverCaps, lpDDEmulCaps); HRESULT ret = dd_GetCaps((LPDDCAPS_DX1)lpDDDriverCaps, (LPDDCAPS_DX1)lpDDEmulCaps); TRACE("<- %s\n", __FUNCTION__); return ret; @@ -369,7 +337,7 @@ HRESULT __stdcall IDirectDraw__GetCaps(IDirectDrawImpl* This, LPDDCAPS lpDDDrive HRESULT __stdcall IDirectDraw__GetDisplayMode(IDirectDrawImpl* This, LPDDSURFACEDESC2 lpDDSurfaceDesc) { - TRACE("-> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("-> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = dd_GetDisplayMode((LPDDSURFACEDESC)lpDDSurfaceDesc); TRACE("<- %s\n", __FUNCTION__); return ret; @@ -377,7 +345,7 @@ HRESULT __stdcall IDirectDraw__GetDisplayMode(IDirectDrawImpl* This, LPDDSURFACE HRESULT __stdcall IDirectDraw__GetFourCCCodes(IDirectDrawImpl* This, LPDWORD lpNumCodes, LPDWORD lpCodes) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DDERR_INVALIDOBJECT; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -385,16 +353,16 @@ HRESULT __stdcall IDirectDraw__GetFourCCCodes(IDirectDrawImpl* This, LPDWORD lpN HRESULT __stdcall IDirectDraw__GetGDISurface(IDirectDrawImpl* This, LPDIRECTDRAWSURFACE7* lplpGDIDDSurface) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DD_OK; - *lplpGDIDDSurface = (LPDIRECTDRAWSURFACE7)g_ddraw.primary; + *lplpGDIDDSurface = (LPDIRECTDRAWSURFACE7)g_ddraw->primary; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; } HRESULT __stdcall IDirectDraw__GetMonitorFrequency(IDirectDrawImpl* This, LPDWORD lpdwFreq) { - TRACE("-> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("-> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = dd_GetMonitorFrequency(lpdwFreq); TRACE("<- %s\n", __FUNCTION__); return ret; @@ -402,7 +370,7 @@ HRESULT __stdcall IDirectDraw__GetMonitorFrequency(IDirectDrawImpl* This, LPDWOR HRESULT __stdcall IDirectDraw__GetScanLine(IDirectDrawImpl* This, LPDWORD lpdwScanLine) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DDERR_UNSUPPORTED; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -410,7 +378,7 @@ HRESULT __stdcall IDirectDraw__GetScanLine(IDirectDrawImpl* This, LPDWORD lpdwSc HRESULT __stdcall IDirectDraw__GetVerticalBlankStatus(IDirectDrawImpl* This, LPBOOL lpbIsInVB) { - TRACE("-> %s(This=%p, lpbIsInVB=%p) [%p]\n", __FUNCTION__, This, lpbIsInVB, _ReturnAddress()); + TRACE("-> %s(This=%p, lpbIsInVB=%p)\n", __FUNCTION__, This, lpbIsInVB); HRESULT ret = dd_GetVerticalBlankStatus(lpbIsInVB); TRACE("<- %s\n", __FUNCTION__); return ret; @@ -418,7 +386,7 @@ HRESULT __stdcall IDirectDraw__GetVerticalBlankStatus(IDirectDrawImpl* This, LPB HRESULT __stdcall IDirectDraw__Initialize(IDirectDrawImpl* This, GUID* lpGUID) { - TRACE("-> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("-> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DD_OK; TRACE("<- %s\n", __FUNCTION__); return ret; @@ -426,7 +394,7 @@ HRESULT __stdcall IDirectDraw__Initialize(IDirectDrawImpl* This, GUID* lpGUID) HRESULT __stdcall IDirectDraw__RestoreDisplayMode(IDirectDrawImpl* This) { - TRACE("-> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("-> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = dd_RestoreDisplayMode(); TRACE("<- %s\n", __FUNCTION__); return ret; @@ -434,7 +402,7 @@ HRESULT __stdcall IDirectDraw__RestoreDisplayMode(IDirectDrawImpl* This) HRESULT __stdcall IDirectDraw__SetCooperativeLevel(IDirectDrawImpl* This, HWND hwnd, DWORD dwFlags) { - TRACE("-> %s(This=%p, hwnd=%p, dwFlags=0x%08X) [%p]\n", __FUNCTION__, This, hwnd, dwFlags, _ReturnAddress()); + TRACE("-> %s(This=%p, hwnd=%p, dwFlags=0x%08X)\n", __FUNCTION__, This, hwnd, dwFlags); HRESULT ret = dd_SetCooperativeLevel(hwnd, dwFlags); TRACE("<- %s\n", __FUNCTION__); return ret; @@ -442,15 +410,7 @@ HRESULT __stdcall IDirectDraw__SetCooperativeLevel(IDirectDrawImpl* This, HWND h HRESULT __stdcall IDirectDraw__SetDisplayMode(IDirectDrawImpl* This, DWORD dwWidth, DWORD dwHeight, DWORD dwBPP) { - TRACE( - "-> %s(This=%p, dwWidth=%d, dwHeight=%d, dwBPP=%d) [%p]\n", - __FUNCTION__, - This, - dwWidth, - dwHeight, - dwBPP, - _ReturnAddress()); - + TRACE("-> %s(This=%p, dwWidth=%d, dwHeight=%d, dwBPP=%d)\n", __FUNCTION__, This, dwWidth, dwHeight, dwBPP); HRESULT ret = dd_SetDisplayMode(dwWidth, dwHeight, dwBPP, SDM_MODE_SET_BY_GAME); TRACE("<- %s\n", __FUNCTION__); return ret; @@ -465,15 +425,14 @@ HRESULT __stdcall IDirectDraw__SetDisplayModeX( DWORD dwFlags) { TRACE( - "-> %s(This=%p, dwWidth=%d, dwHeight=%d, dwBPP=%d, refreshRate=%d, dwFlags=%d) [%p]\n", + "-> %s(This=%p, dwWidth=%d, dwHeight=%d, dwBPP=%d, refreshRate=%d, dwFlags=%d)\n", __FUNCTION__, This, dwWidth, dwHeight, dwBPP, dwRefreshRate, - dwFlags, - _ReturnAddress()); + dwFlags); HRESULT ret = dd_SetDisplayMode(dwWidth, dwHeight, dwBPP, SDM_MODE_SET_BY_GAME); @@ -483,7 +442,7 @@ HRESULT __stdcall IDirectDraw__SetDisplayModeX( HRESULT __stdcall IDirectDraw__WaitForVerticalBlank(IDirectDrawImpl* This, DWORD dwFlags, HANDLE hEvent) { - TRACE_EXT("-> %s(This=%p, dwFlags=%08X, hEvent=%p) [%p]\n", __FUNCTION__, This, dwFlags, hEvent, _ReturnAddress()); + TRACE_EXT("-> %s(This=%p, dwFlags=%08X, hEvent=%p)\n", __FUNCTION__, This, dwFlags, hEvent); HRESULT ret = dd_WaitForVerticalBlank(dwFlags, hEvent); TRACE_EXT("<- %s\n", __FUNCTION__); return ret; @@ -496,13 +455,12 @@ HRESULT __stdcall IDirectDraw__GetAvailableVidMem( LPDWORD lpdwFree) { TRACE( - "-> %s(This=%p, lpDDCaps=%p, lpdwTotal=%p, lpdwFree=%p) [%p]\n", + "-> %s(This=%p, lpDDCaps=%p, lpdwTotal=%p, lpdwFree=%p)\n", __FUNCTION__, This, lpDDCaps, lpdwTotal, - lpdwFree, - _ReturnAddress()); + lpdwFree); HRESULT ret = dd_GetAvailableVidMem((LPDDSCAPS)lpDDCaps, lpdwTotal, lpdwFree); @@ -512,7 +470,7 @@ HRESULT __stdcall IDirectDraw__GetAvailableVidMem( HRESULT __stdcall IDirectDraw__GetSurfaceFromDC(IDirectDrawImpl* This, HDC hdc, LPDIRECTDRAWSURFACE7* lplpDDSurface) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DDERR_NOTFOUND; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -520,7 +478,7 @@ HRESULT __stdcall IDirectDraw__GetSurfaceFromDC(IDirectDrawImpl* This, HDC hdc, HRESULT __stdcall IDirectDraw__RestoreAllSurfaces(IDirectDrawImpl* This) { - TRACE("-> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("-> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DD_OK; TRACE("<- %s\n", __FUNCTION__); return ret; @@ -528,15 +486,15 @@ HRESULT __stdcall IDirectDraw__RestoreAllSurfaces(IDirectDrawImpl* This) HRESULT __stdcall IDirectDraw__TestCooperativeLevel(IDirectDrawImpl* This) { - TRACE_EXT("-> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); - HRESULT ret = dd_TestCooperativeLevel(); + TRACE_EXT("-> %s(This=%p)\n", __FUNCTION__, This); + HRESULT ret = DD_OK; TRACE_EXT("<- %s\n", __FUNCTION__); return ret; } HRESULT __stdcall IDirectDraw__GetDeviceIdentifier(IDirectDrawImpl* This, LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags) { - TRACE("-> %s(This=%p, pDDDI=%p, dwFlags=%08X) [%p]\n", __FUNCTION__, This, pDDDI, dwFlags, _ReturnAddress()); + TRACE("-> %s(This=%p, pDDDI=%p, dwFlags=%08X)\n", __FUNCTION__, This, pDDDI, dwFlags); HRESULT ret = dd_GetDeviceIdentifier((LPDDDEVICEIDENTIFIER)pDDDI, dwFlags, &This->guid); TRACE("<- %s\n", __FUNCTION__); return ret; @@ -544,7 +502,7 @@ HRESULT __stdcall IDirectDraw__GetDeviceIdentifier(IDirectDrawImpl* This, LPDDDE HRESULT __stdcall IDirectDraw__StartModeTest(IDirectDrawImpl* This, LPSIZE pModes, DWORD dwNumModes, DWORD dwFlags) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DDERR_CURRENTLYNOTAVAIL; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -552,7 +510,7 @@ HRESULT __stdcall IDirectDraw__StartModeTest(IDirectDrawImpl* This, LPSIZE pMode HRESULT __stdcall IDirectDraw__EvaluateMode(IDirectDrawImpl* This, DWORD dwFlags, DWORD* pTimeout) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DDERR_INVALIDOBJECT; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; diff --git a/src/IDirectDraw/IDirectDrawClipper.c b/src/IDirectDraw/IDirectDrawClipper.c index 6270c09..86aaaa6 100644 --- a/src/IDirectDraw/IDirectDrawClipper.c +++ b/src/IDirectDraw/IDirectDrawClipper.c @@ -2,31 +2,17 @@ #include "ddclipper.h" #include "debug.h" - HRESULT __stdcall IDirectDrawClipper__QueryInterface(IDirectDrawClipperImpl* This, REFIID riid, LPVOID FAR* ppvObj) { - TRACE( - "NOT_IMPLEMENTED -> %s(This=%p, riid=%08X, ppvObj=%p) [%p]\n", - __FUNCTION__, - This, - (unsigned int)riid, - ppvObj, - _ReturnAddress()); - + TRACE("NOT_IMPLEMENTED -> %s(This=%p, riid=%08X, ppvObj=%p)\n", __FUNCTION__, This, (unsigned int)riid, ppvObj); HRESULT ret = E_NOINTERFACE; - - if (!ppvObj) - { - ret = E_INVALIDARG; - } - TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; } ULONG __stdcall IDirectDrawClipper__AddRef(IDirectDrawClipperImpl* This) { - TRACE("-> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("-> %s(This=%p)\n", __FUNCTION__, This); ULONG ret = ++This->ref; TRACE("<- %s(This ref=%u)\n", __FUNCTION__, ret); return ret; @@ -34,7 +20,7 @@ ULONG __stdcall IDirectDrawClipper__AddRef(IDirectDrawClipperImpl* This) ULONG __stdcall IDirectDrawClipper__Release(IDirectDrawClipperImpl* This) { - TRACE("-> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("-> %s(This=%p)\n", __FUNCTION__, This); ULONG ret = --This->ref; @@ -45,8 +31,6 @@ ULONG __stdcall IDirectDrawClipper__Release(IDirectDrawClipperImpl* This) if (This->region) DeleteObject(This->region); - DeleteCriticalSection(&This->cs); - HeapFree(GetProcessHeap(), 0, This); } @@ -61,23 +45,22 @@ HRESULT __stdcall IDirectDrawClipper__GetClipList( LPDWORD lpdwSiz) { TRACE( - "-> %s(This=%p, lpRect=%p, lpClipList=%p, lpdwSiz=%p) [%p]\n", + "NOT_IMPLEMENTED -> %s(This=%p, lpRect=%p, lpClipList=%p, lpdwSiz=%p)\n", __FUNCTION__, This, lpRect, lpClipList, - lpdwSiz, - _ReturnAddress()); + lpdwSiz); HRESULT ret = ddc_GetClipList(This, lpRect, lpClipList, lpdwSiz); - TRACE("<- %s\n", __FUNCTION__); + TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; } HRESULT __stdcall IDirectDrawClipper__GetHWnd(IDirectDrawClipperImpl* This, HWND FAR* lphWnd) { - TRACE("-> %s(This=%p, lphWnd=%p) [%p]\n", __FUNCTION__, This, lphWnd, _ReturnAddress()); + TRACE("-> %s(This=%p, lphWnd=%p)\n", __FUNCTION__, This, lphWnd); HRESULT ret = ddc_GetHWnd(This, lphWnd); TRACE("<- %s\n", __FUNCTION__); return ret; @@ -85,7 +68,7 @@ HRESULT __stdcall IDirectDrawClipper__GetHWnd(IDirectDrawClipperImpl* This, HWND HRESULT __stdcall IDirectDrawClipper__Initialize(IDirectDrawClipperImpl* This, LPDIRECTDRAW lpDD, DWORD dwFlags) { - TRACE("-> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("-> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DD_OK; TRACE("<- %s\n", __FUNCTION__); return ret; @@ -93,7 +76,7 @@ HRESULT __stdcall IDirectDrawClipper__Initialize(IDirectDrawClipperImpl* This, L HRESULT __stdcall IDirectDrawClipper__IsClipListChanged(IDirectDrawClipperImpl* This, BOOL FAR* lpbChanged) { - TRACE("-> %s(This=%p, lpbChanged=%p) [%p]\n", __FUNCTION__, This, lpbChanged, _ReturnAddress()); + TRACE("-> %s(This=%p, lpbChanged=%p)\n", __FUNCTION__, This, lpbChanged); HRESULT ret = ddc_IsClipListChanged(This, lpbChanged); TRACE("<- %s\n", __FUNCTION__); return ret; @@ -101,15 +84,15 @@ HRESULT __stdcall IDirectDrawClipper__IsClipListChanged(IDirectDrawClipperImpl* HRESULT __stdcall IDirectDrawClipper__SetClipList(IDirectDrawClipperImpl* This, LPRGNDATA lpClipList, DWORD dwFlags) { - TRACE("-> %s(This=%p, lpClipList=%p, dwFlags=%08X) [%p]\n", __FUNCTION__, This, lpClipList, dwFlags, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p, lpClipList=%p, dwFlags=%08X)\n", __FUNCTION__, This, lpClipList, dwFlags); HRESULT ret = ddc_SetClipList(This, lpClipList, dwFlags); - TRACE("<- %s\n", __FUNCTION__); + TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; } HRESULT __stdcall IDirectDrawClipper__SetHWnd(IDirectDrawClipperImpl* This, DWORD dwFlags, HWND hWnd) { - TRACE("-> %s(This=%p, dwFlags=%08X, hWnd=%p) [%p]\n", __FUNCTION__, This, dwFlags, hWnd, _ReturnAddress()); + TRACE("-> %s(This=%p, dwFlags=%08X, hWnd=%p)\n", __FUNCTION__, This, dwFlags, hWnd); HRESULT ret = ddc_SetHWnd(This, dwFlags, hWnd); TRACE("<- %s\n", __FUNCTION__); return ret; diff --git a/src/IDirectDraw/IDirectDrawGammaControl.c b/src/IDirectDraw/IDirectDrawGammaControl.c index d0bd36a..7676bc2 100644 --- a/src/IDirectDraw/IDirectDrawGammaControl.c +++ b/src/IDirectDraw/IDirectDrawGammaControl.c @@ -1,31 +1,17 @@ #include "IDirectDrawGammaControl.h" #include "debug.h" - HRESULT __stdcall IDirectDrawGammaControl__QueryInterface(IDirectDrawGammaControlImpl* This, REFIID riid, LPVOID FAR* ppvObj) { - TRACE( - "NOT_IMPLEMENTED -> %s(This=%p, riid=%08X, ppvObj=%p) [%p]\n", - __FUNCTION__, - This, - (unsigned int)riid, - ppvObj, - _ReturnAddress()); - + TRACE("NOT_IMPLEMENTED -> %s(This=%p, riid=%08X, ppvObj=%p)\n", __FUNCTION__, This, (unsigned int)riid, ppvObj); HRESULT ret = E_NOINTERFACE; - - if (!ppvObj) - { - ret = E_INVALIDARG; - } - TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; } ULONG __stdcall IDirectDrawGammaControl__AddRef(IDirectDrawGammaControlImpl* This) { - TRACE("-> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("-> %s(This=%p)\n", __FUNCTION__, This); ULONG ret = ++This->ref; TRACE("<- %s(This ref=%u)\n", __FUNCTION__, ret); return ret; @@ -33,7 +19,7 @@ ULONG __stdcall IDirectDrawGammaControl__AddRef(IDirectDrawGammaControlImpl* Thi ULONG __stdcall IDirectDrawGammaControl__Release(IDirectDrawGammaControlImpl* This) { - TRACE("-> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("-> %s(This=%p)\n", __FUNCTION__, This); ULONG ret = --This->ref; @@ -50,7 +36,7 @@ ULONG __stdcall IDirectDrawGammaControl__Release(IDirectDrawGammaControlImpl* Th HRESULT __stdcall IDirectDrawGammaControl__GetGammaRamp(IDirectDrawGammaControlImpl* This, DWORD dwFlags, LPDDGAMMARAMP lpRampData) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DDERR_EXCEPTION; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -58,7 +44,7 @@ HRESULT __stdcall IDirectDrawGammaControl__GetGammaRamp(IDirectDrawGammaControlI HRESULT __stdcall IDirectDrawGammaControl__SetGammaRamp(IDirectDrawGammaControlImpl* This, DWORD dwFlags, LPDDGAMMARAMP lpRampData) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DDERR_EXCEPTION; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; diff --git a/src/IDirectDraw/IDirectDrawPalette.c b/src/IDirectDraw/IDirectDrawPalette.c index 0a6334a..2eb313b 100644 --- a/src/IDirectDraw/IDirectDrawPalette.c +++ b/src/IDirectDraw/IDirectDrawPalette.c @@ -6,28 +6,15 @@ HRESULT __stdcall IDirectDrawPalette__QueryInterface(IDirectDrawPaletteImpl* This, REFIID riid, LPVOID FAR* ppvObj) { - TRACE( - "NOT_IMPLEMENTED -> %s(This=%p, riid=%08X, ppvObj=%p) [%p]\n", - __FUNCTION__, - This, - (unsigned int)riid, - ppvObj, - _ReturnAddress()); - + TRACE("NOT_IMPLEMENTED -> %s(This=%p, riid=%08X, ppvObj=%p)\n", __FUNCTION__, This, (unsigned int)riid, ppvObj); HRESULT ret = E_NOINTERFACE; - - if (!ppvObj) - { - ret = E_INVALIDARG; - } - TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; } ULONG __stdcall IDirectDrawPalette__AddRef(IDirectDrawPaletteImpl* This) { - TRACE("-> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("-> %s(This=%p)\n", __FUNCTION__, This); ULONG ret = ++This->ref; TRACE("<- %s(This ref=%u)\n", __FUNCTION__, ret); return ret; @@ -35,7 +22,7 @@ ULONG __stdcall IDirectDrawPalette__AddRef(IDirectDrawPaletteImpl* This) ULONG __stdcall IDirectDrawPalette__Release(IDirectDrawPaletteImpl* This) { - TRACE("-> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("-> %s(This=%p)\n", __FUNCTION__, This); ULONG ret = --This->ref; @@ -43,8 +30,8 @@ ULONG __stdcall IDirectDrawPalette__Release(IDirectDrawPaletteImpl* This) { TRACE(" Released (%p)\n", This); - if (g_ddraw.ref) - g_ddraw.last_freed_palette = This; + if (g_ddraw) + g_ddraw->last_freed_palette = This; HeapFree(GetProcessHeap(), 0, This); } @@ -55,7 +42,7 @@ ULONG __stdcall IDirectDrawPalette__Release(IDirectDrawPaletteImpl* This) HRESULT __stdcall IDirectDrawPalette__GetCaps(IDirectDrawPaletteImpl* This, LPDWORD lpdwCaps) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p, lpdwCaps=%p) [%p]\n", __FUNCTION__, This, lpdwCaps, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p, lpdwCaps=%p)\n", __FUNCTION__, This, lpdwCaps); HRESULT ret = DDERR_INVALIDOBJECT; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -69,14 +56,13 @@ HRESULT __stdcall IDirectDrawPalette__GetEntries( LPPALETTEENTRY lpEntries) { TRACE( - "-> %s(This=%p, dwFlags=%08X, dwBase=%u, dwNumEntries=%u, lpEntries=%p) [%p]\n", + "-> %s(This=%p, dwFlags=%08X, dwBase=%u, dwNumEntries=%u, lpEntries=%p)\n", __FUNCTION__, This, dwFlags, dwBase, dwNumEntries, - lpEntries, - _ReturnAddress()); + lpEntries); HRESULT ret = ddp_GetEntries(This, dwFlags, dwBase, dwNumEntries, lpEntries); @@ -90,7 +76,7 @@ HRESULT __stdcall IDirectDrawPalette__Initialize( DWORD dwFlags, LPPALETTEENTRY lpDDColorTable) { - TRACE("-> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("-> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DD_OK; TRACE("<- %s\n", __FUNCTION__); return ret; @@ -104,14 +90,13 @@ HRESULT __stdcall IDirectDrawPalette__SetEntries( LPPALETTEENTRY lpEntries) { TRACE_EXT( - "-> %s(This=%p, dwFlags=%08X, dwStartingEntry=%u, dwCount=%u, lpEntries=%p) [%p]\n", + "-> %s(This=%p, dwFlags=%08X, dwStartingEntry=%u, dwCount=%u, lpEntries=%p)\n", __FUNCTION__, This, dwFlags, dwStartingEntry, dwCount, - lpEntries, - _ReturnAddress()); + lpEntries); HRESULT ret = ddp_SetEntries(This, dwFlags, dwStartingEntry, dwCount, lpEntries); diff --git a/src/IDirectDraw/IDirectDrawSurface.c b/src/IDirectDraw/IDirectDrawSurface.c index 7916405..c7775af 100644 --- a/src/IDirectDraw/IDirectDrawSurface.c +++ b/src/IDirectDraw/IDirectDrawSurface.c @@ -8,14 +8,10 @@ HRESULT __stdcall IDirectDrawSurface__QueryInterface(IDirectDrawSurfaceImpl* This, REFIID riid, LPVOID FAR* ppvObj) { - TRACE("-> %s(This=%p, riid=%08X, ppvObj=%p) [%p]\n", __FUNCTION__, This, (unsigned int)riid, ppvObj, _ReturnAddress()); + TRACE("-> %s(This=%p, riid=%08X, ppvObj=%p)\n", __FUNCTION__, This, (unsigned int)riid, ppvObj); HRESULT ret = S_OK; - if (!ppvObj) - { - ret = E_INVALIDARG; - } - else if (riid) + if (riid) { if (IsEqualGUID(&IID_IDirectDrawSurface, riid) || IsEqualGUID(&IID_IDirectDrawSurface2, riid) || @@ -64,7 +60,7 @@ HRESULT __stdcall IDirectDrawSurface__QueryInterface(IDirectDrawSurfaceImpl* Thi ULONG __stdcall IDirectDrawSurface__AddRef(IDirectDrawSurfaceImpl* This) { - TRACE("-> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("-> %s(This=%p)\n", __FUNCTION__, This); ULONG ret = ++This->ref; TRACE("<- %s(This ref=%u)\n", __FUNCTION__, ret); return ret; @@ -72,7 +68,7 @@ ULONG __stdcall IDirectDrawSurface__AddRef(IDirectDrawSurfaceImpl* This) ULONG __stdcall IDirectDrawSurface__Release(IDirectDrawSurfaceImpl* This) { - TRACE("-> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("-> %s(This=%p)\n", __FUNCTION__, This); ULONG ret = --This->ref; @@ -86,11 +82,11 @@ ULONG __stdcall IDirectDrawSurface__Release(IDirectDrawSurfaceImpl* This) { TRACE(" Released (%p)\n", This); - if (g_ddraw.ref && (This->caps & DDSCAPS_PRIMARYSURFACE)) + if (g_ddraw && (This->caps & DDSCAPS_PRIMARYSURFACE)) { - EnterCriticalSection(&g_ddraw.cs); - g_ddraw.primary = NULL; - LeaveCriticalSection(&g_ddraw.cs); + EnterCriticalSection(&g_ddraw->cs); + g_ddraw->primary = NULL; + LeaveCriticalSection(&g_ddraw->cs); } if (This->bitmap) @@ -115,7 +111,7 @@ ULONG __stdcall IDirectDrawSurface__Release(IDirectDrawSurfaceImpl* This) if (This->mapping) CloseHandle(This->mapping); - if (This->backbuffer && (!g_ddraw.ref || (void*)This->backbuffer != g_ddraw.last_freed_surface)) + if (This->backbuffer && (!g_ddraw || (void*)This->backbuffer != g_ddraw->last_freed_surface)) { IDirectDrawSurface_Release(This->backbuffer); } @@ -123,15 +119,15 @@ ULONG __stdcall IDirectDrawSurface__Release(IDirectDrawSurfaceImpl* This) if (This->clipper) IDirectDrawClipper_Release(This->clipper); - if (This->palette && (!g_ddraw.ref || (void*)This->palette != g_ddraw.last_freed_palette)) + if (This->palette && (!g_ddraw || (void*)This->palette != g_ddraw->last_freed_palette)) { IDirectDrawPalette_Release(This->palette); } DeleteCriticalSection(&This->cs); - if (g_ddraw.ref) - g_ddraw.last_freed_surface = This; + if (g_ddraw) + g_ddraw->last_freed_surface = This; HeapFree(GetProcessHeap(), 0, This); } @@ -142,7 +138,7 @@ ULONG __stdcall IDirectDrawSurface__Release(IDirectDrawSurfaceImpl* This) HRESULT __stdcall IDirectDrawSurface__AddAttachedSurface(IDirectDrawSurfaceImpl* This, LPDIRECTDRAWSURFACE7 lpDDSurface) { - TRACE("-> %s(This=%p, lpDDSurface=%p) [%p]\n", __FUNCTION__, This, lpDDSurface, _ReturnAddress()); + TRACE("-> %s(This=%p, lpDDSurface=%p)\n", __FUNCTION__, This, lpDDSurface); HRESULT ret = dds_AddAttachedSurface(This, (IDirectDrawSurfaceImpl*)lpDDSurface); TRACE("<- %s\n", __FUNCTION__); return ret; @@ -150,7 +146,7 @@ HRESULT __stdcall IDirectDrawSurface__AddAttachedSurface(IDirectDrawSurfaceImpl* HRESULT __stdcall IDirectDrawSurface__AddOverlayDirtyRect(IDirectDrawSurfaceImpl* This, LPRECT lpRect) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DD_OK; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -165,15 +161,14 @@ HRESULT __stdcall IDirectDrawSurface__Blt( LPDDBLTFX lpDDBltFx) { TRACE_EXT( - "-> %s(This=%p, lpDestRect=%p, lpDDSrcSurface=%p, lpSrcRect=%p, dwFlags=%08X, lpDDBltFx=%p) [%p]\n", + "-> %s(This=%p, lpDestRect=%p, lpDDSrcSurface=%p, lpSrcRect=%p, dwFlags=%08X, lpDDBltFx=%p)\n", __FUNCTION__, This, lpDestRect, lpDDSrcSurface, lpSrcRect, dwFlags, - lpDDBltFx, - _ReturnAddress()); + lpDDBltFx); HRESULT ret = dds_Blt(This, lpDestRect, (IDirectDrawSurfaceImpl*)lpDDSrcSurface, lpSrcRect, dwFlags, lpDDBltFx); @@ -187,7 +182,7 @@ HRESULT __stdcall IDirectDrawSurface__BltBatch( DWORD dwCount, DWORD dwFlags) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DD_OK; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -202,15 +197,14 @@ HRESULT __stdcall IDirectDrawSurface__BltFast( DWORD dwFlags) { TRACE_EXT( - "-> %s(This=%p, dwX=%d, dwY=%d, lpDDSrcSurface=%p, lpSrcRect=%p, dwFlags=%08X) [%p]\n", + "-> %s(This=%p, dwX=%d, dwY=%d, lpDDSrcSurface=%p, lpSrcRect=%p, dwFlags=%08X)\n", __FUNCTION__, This, dwX, dwY, lpDDSrcSurface, lpSrcRect, - dwFlags, - _ReturnAddress()); + dwFlags); HRESULT ret = dds_BltFast(This, dwX, dwY, (IDirectDrawSurfaceImpl*)lpDDSrcSurface, lpSrcRect, dwFlags); @@ -223,7 +217,7 @@ HRESULT __stdcall IDirectDrawSurface__DeleteAttachedSurface( DWORD dwFlags, LPDIRECTDRAWSURFACE7 lpDDSurface) { - TRACE("-> %s(This=%p, dwFlags=%08X, lpDDSurface=%p) [%p]\n", __FUNCTION__, This, dwFlags, lpDDSurface, _ReturnAddress()); + TRACE("-> %s(This=%p, dwFlags=%08X, lpDDSurface=%p)\n", __FUNCTION__, This, dwFlags, lpDDSurface); HRESULT ret = dds_DeleteAttachedSurface(This, dwFlags, (IDirectDrawSurfaceImpl*)lpDDSurface); TRACE("<- %s\n", __FUNCTION__); return ret; @@ -235,12 +229,11 @@ HRESULT __stdcall IDirectDrawSurface__EnumAttachedSurfaces( LPDDENUMSURFACESCALLBACK7 lpEnumSurfacesCallback) { TRACE( - "-> %s(This=%p, lpContext=%p, lpEnumSurfacesCallback=%p) [%p]\n", + "-> %s(This=%p, lpContext=%p, lpEnumSurfacesCallback=%p)\n", __FUNCTION__, This, lpContext, - lpEnumSurfacesCallback, - _ReturnAddress()); + lpEnumSurfacesCallback); HRESULT ret = dds_EnumAttachedSurfaces(This, lpContext, (LPDDENUMSURFACESCALLBACK)lpEnumSurfacesCallback); @@ -254,7 +247,7 @@ HRESULT __stdcall IDirectDrawSurface__EnumOverlayZOrders( LPVOID lpContext, LPDDENUMSURFACESCALLBACK7 lpfnCallback) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DD_OK; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -266,12 +259,11 @@ HRESULT __stdcall IDirectDrawSurface__Flip( DWORD dwFlags) { TRACE_EXT( - "-> %s(This=%p, lpDDSurfaceTargetOverride=%p, dwFlags=%08X) [%p]\n", + "-> %s(This=%p, lpDDSurfaceTargetOverride=%p, dwFlags=%08X)\n", __FUNCTION__, This, lpDDSurfaceTargetOverride, - dwFlags, - _ReturnAddress()); + dwFlags); HRESULT ret = dds_Flip(This, (IDirectDrawSurfaceImpl*)lpDDSurfaceTargetOverride, dwFlags); @@ -284,23 +276,15 @@ HRESULT __stdcall IDirectDrawSurface__GetAttachedSurface( LPDDSCAPS2 lpDdsCaps, LPDIRECTDRAWSURFACE7 FAR* lpDDsurface) { - TRACE( - "-> %s(This=%p, dwCaps=%08X, lpDDsurface=%p) [%p]\n", - __FUNCTION__, - This, - lpDdsCaps->dwCaps, - lpDDsurface, - _ReturnAddress()); - + TRACE("-> %s(This=%p, dwCaps=%08X, lpDDsurface=%p)\n", __FUNCTION__, This, lpDdsCaps->dwCaps, lpDDsurface); HRESULT ret = dds_GetAttachedSurface(This, (LPDDSCAPS)lpDdsCaps, (IDirectDrawSurfaceImpl**)lpDDsurface); - TRACE("<- %s\n", __FUNCTION__); return ret; } HRESULT __stdcall IDirectDrawSurface__GetBltStatus(IDirectDrawSurfaceImpl* This, DWORD dwFlags) { - //TRACE_EXT("-> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + //TRACE_EXT("-> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DD_OK; //TRACE_EXT("<- %s\n", __FUNCTION__); return ret; @@ -308,7 +292,7 @@ HRESULT __stdcall IDirectDrawSurface__GetBltStatus(IDirectDrawSurfaceImpl* This, HRESULT __stdcall IDirectDrawSurface__GetCaps(IDirectDrawSurfaceImpl* This, LPDDSCAPS2 lpDDSCaps) { - TRACE("-> %s(This=%p, lpDDSCaps=%p) [%p]\n", __FUNCTION__, This, lpDDSCaps, _ReturnAddress()); + TRACE("-> %s(This=%p, lpDDSCaps=%p)\n", __FUNCTION__, This, lpDDSCaps); HRESULT ret = dds_GetCaps(This, (LPDDSCAPS)lpDDSCaps); TRACE("<- %s\n", __FUNCTION__); return ret; @@ -316,7 +300,7 @@ HRESULT __stdcall IDirectDrawSurface__GetCaps(IDirectDrawSurfaceImpl* This, LPDD HRESULT __stdcall IDirectDrawSurface__GetClipper(IDirectDrawSurfaceImpl* This, LPDIRECTDRAWCLIPPER FAR* lpClipper) { - TRACE_EXT("-> %s(This=%p, lpClipper=%p) [%p]\n", __FUNCTION__, This, lpClipper, _ReturnAddress()); + TRACE_EXT("-> %s(This=%p, lpClipper=%p)\n", __FUNCTION__, This, lpClipper); HRESULT ret = dds_GetClipper(This, (IDirectDrawClipperImpl**)lpClipper); TRACE_EXT("<- %s\n", __FUNCTION__); return ret; @@ -324,7 +308,7 @@ HRESULT __stdcall IDirectDrawSurface__GetClipper(IDirectDrawSurfaceImpl* This, L HRESULT __stdcall IDirectDrawSurface__GetColorKey(IDirectDrawSurfaceImpl* This, DWORD dwFlags, LPDDCOLORKEY lpColorKey) { - TRACE_EXT("-> %s(This=%p, dwFlags=0x%08X, lpColorKey=%p) [%p]\n", __FUNCTION__, This, dwFlags, lpColorKey, _ReturnAddress()); + TRACE_EXT("-> %s(This=%p, dwFlags=0x%08X, lpColorKey=%p)\n", __FUNCTION__, This, dwFlags, lpColorKey); HRESULT ret = dds_GetColorKey(This, dwFlags, lpColorKey); TRACE_EXT("<- %s\n", __FUNCTION__); return ret; @@ -332,7 +316,7 @@ HRESULT __stdcall IDirectDrawSurface__GetColorKey(IDirectDrawSurfaceImpl* This, HRESULT __stdcall IDirectDrawSurface__GetDC(IDirectDrawSurfaceImpl* This, HDC FAR* lpHDC) { - TRACE_EXT("-> %s(This=%p, lpHDC=%p) [%p]\n", __FUNCTION__, This, lpHDC, _ReturnAddress()); + TRACE_EXT("-> %s(This=%p, lpHDC=%p)\n", __FUNCTION__, This, lpHDC); HRESULT ret = dds_GetDC(This, lpHDC); TRACE_EXT("<- %s\n", __FUNCTION__); return ret; @@ -340,7 +324,7 @@ HRESULT __stdcall IDirectDrawSurface__GetDC(IDirectDrawSurfaceImpl* This, HDC FA HRESULT __stdcall IDirectDrawSurface__GetFlipStatus(IDirectDrawSurfaceImpl* This, DWORD dwFlags) { - TRACE_EXT("-> %s(This=%p, dwFlags=%08X) [%p]\n", __FUNCTION__, This, dwFlags, _ReturnAddress()); + TRACE_EXT("-> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DD_OK; TRACE_EXT("<- %s\n", __FUNCTION__); return ret; @@ -348,7 +332,7 @@ HRESULT __stdcall IDirectDrawSurface__GetFlipStatus(IDirectDrawSurfaceImpl* This HRESULT __stdcall IDirectDrawSurface__GetOverlayPosition(IDirectDrawSurfaceImpl* This, LPLONG lplX, LPLONG lplY) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DDERR_NOTAOVERLAYSURFACE; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -356,7 +340,7 @@ HRESULT __stdcall IDirectDrawSurface__GetOverlayPosition(IDirectDrawSurfaceImpl* HRESULT __stdcall IDirectDrawSurface__GetPalette(IDirectDrawSurfaceImpl* This, LPDIRECTDRAWPALETTE FAR* lplpDDPalette) { - TRACE("-> %s(This=%p, lplpDDPalette=%p) [%p]\n", __FUNCTION__, This, lplpDDPalette, _ReturnAddress()); + TRACE("-> %s(This=%p, lplpDDPalette=%p)\n", __FUNCTION__, This, lplpDDPalette); HRESULT ret = dds_GetPalette(This, (IDirectDrawPaletteImpl**)lplpDDPalette); TRACE("<- %s\n", __FUNCTION__); return ret; @@ -364,7 +348,7 @@ HRESULT __stdcall IDirectDrawSurface__GetPalette(IDirectDrawSurfaceImpl* This, L HRESULT __stdcall IDirectDrawSurface__GetPixelFormat(IDirectDrawSurfaceImpl* This, LPDDPIXELFORMAT ddpfPixelFormat) { - TRACE_EXT("-> %s(This=%p, ...) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE_EXT("-> %s(This=%p, ...)\n", __FUNCTION__, This); HRESULT ret = dds_GetPixelFormat(This, ddpfPixelFormat); TRACE_EXT("<- %s\n", __FUNCTION__); return ret; @@ -372,7 +356,7 @@ HRESULT __stdcall IDirectDrawSurface__GetPixelFormat(IDirectDrawSurfaceImpl* Thi HRESULT __stdcall IDirectDrawSurface__GetSurfaceDesc(IDirectDrawSurfaceImpl* This, LPDDSURFACEDESC2 lpDDSurfaceDesc) { - TRACE_EXT("-> %s(This=%p, lpDDSurfaceDesc=%p) [%p]\n", __FUNCTION__, This, lpDDSurfaceDesc, _ReturnAddress()); + TRACE_EXT("-> %s(This=%p, lpDDSurfaceDesc=%p)\n", __FUNCTION__, This, lpDDSurfaceDesc); HRESULT ret = dds_GetSurfaceDesc(This, (LPDDSURFACEDESC)lpDDSurfaceDesc); TRACE_EXT("<- %s\n", __FUNCTION__); return ret; @@ -383,7 +367,7 @@ HRESULT __stdcall IDirectDrawSurface__Initialize( LPDIRECTDRAW lpDD, LPDDSURFACEDESC2 lpDDSurfaceDesc) { - TRACE("-> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("-> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DD_OK; TRACE("<- %s\n", __FUNCTION__); return ret; @@ -391,7 +375,7 @@ HRESULT __stdcall IDirectDrawSurface__Initialize( HRESULT __stdcall IDirectDrawSurface__IsLost(IDirectDrawSurfaceImpl* This) { - //TRACE_EXT("-> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + //TRACE_EXT("-> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DD_OK; //TRACE_EXT("<- %s\n", __FUNCTION__); return ret; @@ -405,14 +389,13 @@ HRESULT __stdcall IDirectDrawSurface__Lock( HANDLE hEvent) { TRACE_EXT( - "-> %s(This=%p, lpDestRect=%p, lpDDSurfaceDesc=%p, dwFlags=%08X, hEvent=%p) [%p]\n", + "-> %s(This=%p, lpDestRect=%p, lpDDSurfaceDesc=%p, dwFlags=%08X, hEvent=%p)\n", __FUNCTION__, This, lpDestRect, lpDDSurfaceDesc, dwFlags, - hEvent, - _ReturnAddress()); + hEvent); HRESULT ret = dds_Lock(This, lpDestRect, (LPDDSURFACEDESC)lpDDSurfaceDesc, dwFlags, hEvent); @@ -422,7 +405,7 @@ HRESULT __stdcall IDirectDrawSurface__Lock( HRESULT __stdcall IDirectDrawSurface__ReleaseDC(IDirectDrawSurfaceImpl* This, HDC hDC) { - TRACE_EXT("-> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE_EXT("-> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = dds_ReleaseDC(This, hDC); TRACE_EXT("<- %s\n", __FUNCTION__); return ret; @@ -430,7 +413,7 @@ HRESULT __stdcall IDirectDrawSurface__ReleaseDC(IDirectDrawSurfaceImpl* This, HD HRESULT __stdcall IDirectDrawSurface__Restore(IDirectDrawSurfaceImpl* This) { - TRACE_EXT("-> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE_EXT("-> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DD_OK; TRACE_EXT("<- %s\n", __FUNCTION__); return ret; @@ -438,7 +421,7 @@ HRESULT __stdcall IDirectDrawSurface__Restore(IDirectDrawSurfaceImpl* This) HRESULT __stdcall IDirectDrawSurface__SetClipper(IDirectDrawSurfaceImpl* This, LPDIRECTDRAWCLIPPER lpClipper) { - TRACE("-> %s(This=%p, lpClipper=%p) [%p]\n", __FUNCTION__, This, lpClipper, _ReturnAddress()); + TRACE("-> %s(This=%p, lpClipper=%p)\n", __FUNCTION__, This, lpClipper); HRESULT ret = dds_SetClipper(This, (IDirectDrawClipperImpl*)lpClipper); TRACE("<- %s\n", __FUNCTION__); return ret; @@ -446,7 +429,7 @@ HRESULT __stdcall IDirectDrawSurface__SetClipper(IDirectDrawSurfaceImpl* This, L HRESULT __stdcall IDirectDrawSurface__SetColorKey(IDirectDrawSurfaceImpl* This, DWORD dwFlags, LPDDCOLORKEY lpColorKey) { - TRACE_EXT("-> %s(This=%p, dwFlags=0x%08X, lpColorKey=%p) [%p]\n", __FUNCTION__, This, dwFlags, lpColorKey, _ReturnAddress()); + TRACE_EXT("-> %s(This=%p, dwFlags=0x%08X, lpColorKey=%p)\n", __FUNCTION__, This, dwFlags, lpColorKey); HRESULT ret = dds_SetColorKey(This, dwFlags, lpColorKey); TRACE_EXT("<- %s\n", __FUNCTION__); return ret; @@ -454,7 +437,7 @@ HRESULT __stdcall IDirectDrawSurface__SetColorKey(IDirectDrawSurfaceImpl* This, HRESULT __stdcall IDirectDrawSurface__SetOverlayPosition(IDirectDrawSurfaceImpl* This, LONG lX, LONG lY) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DD_OK; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -462,7 +445,7 @@ HRESULT __stdcall IDirectDrawSurface__SetOverlayPosition(IDirectDrawSurfaceImpl* HRESULT __stdcall IDirectDrawSurface__SetPalette(IDirectDrawSurfaceImpl* This, LPDIRECTDRAWPALETTE lpDDPalette) { - TRACE("-> %s(This=%p, lpDDPalette=%p) [%p]\n", __FUNCTION__, This, lpDDPalette, _ReturnAddress()); + TRACE("-> %s(This=%p, lpDDPalette=%p)\n", __FUNCTION__, This, lpDDPalette); HRESULT ret = dds_SetPalette(This, (IDirectDrawPaletteImpl*)lpDDPalette); TRACE("<- %s\n", __FUNCTION__); return ret; @@ -470,7 +453,7 @@ HRESULT __stdcall IDirectDrawSurface__SetPalette(IDirectDrawSurfaceImpl* This, L HRESULT __stdcall IDirectDrawSurface__Unlock(IDirectDrawSurfaceImpl* This, LPRECT lpRect) { - TRACE_EXT("-> %s(This=%p, lpRect=%p) [%p]\n", __FUNCTION__, This, lpRect, _ReturnAddress()); + TRACE_EXT("-> %s(This=%p, lpRect=%p)\n", __FUNCTION__, This, lpRect); HRESULT ret = dds_Unlock(This, lpRect); TRACE_EXT("<- %s\n", __FUNCTION__); return ret; @@ -484,7 +467,7 @@ HRESULT __stdcall IDirectDrawSurface__UpdateOverlay( DWORD dwFlags, LPDDOVERLAYFX lpDDOverlayFx) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DD_OK; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -492,7 +475,7 @@ HRESULT __stdcall IDirectDrawSurface__UpdateOverlay( HRESULT __stdcall IDirectDrawSurface__UpdateOverlayDisplay(IDirectDrawSurfaceImpl* This, DWORD dwFlags) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DD_OK; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -503,7 +486,7 @@ HRESULT __stdcall IDirectDrawSurface__UpdateOverlayZOrder( DWORD dwFlags, LPDIRECTDRAWSURFACE7 lpDDSReference) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DD_OK; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -511,7 +494,7 @@ HRESULT __stdcall IDirectDrawSurface__UpdateOverlayZOrder( HRESULT __stdcall IDirectDrawSurface__GetDDInterface(IDirectDrawSurfaceImpl* This, LPVOID* lplpDD) { - TRACE("-> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("-> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = dds_GetDDInterface(This, lplpDD); TRACE("<- %s\n", __FUNCTION__); return ret; @@ -519,7 +502,7 @@ HRESULT __stdcall IDirectDrawSurface__GetDDInterface(IDirectDrawSurfaceImpl* Thi HRESULT __stdcall IDirectDrawSurface__PageLock(IDirectDrawSurfaceImpl* This, DWORD dwFlags) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DD_OK; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -527,7 +510,7 @@ HRESULT __stdcall IDirectDrawSurface__PageLock(IDirectDrawSurfaceImpl* This, DWO HRESULT __stdcall IDirectDrawSurface__PageUnlock(IDirectDrawSurfaceImpl* This, DWORD dwFlags) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DD_OK; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -535,7 +518,7 @@ HRESULT __stdcall IDirectDrawSurface__PageUnlock(IDirectDrawSurfaceImpl* This, D HRESULT __stdcall IDirectDrawSurface__SetSurfaceDesc(IDirectDrawSurfaceImpl* This, LPDDSURFACEDESC2 lpDDSD, DWORD dwFlags) { - TRACE("-> %s(This=%p, lpDDSD=%p, dwFlags=%08X) [%p]\n", __FUNCTION__, This, lpDDSD, dwFlags, _ReturnAddress()); + TRACE("-> %s(This=%p, lpDDSD=%p, dwFlags=%08X)\n", __FUNCTION__, This, lpDDSD, dwFlags); HRESULT ret = dds_SetSurfaceDesc(This, lpDDSD, dwFlags); TRACE("<- %s\n", __FUNCTION__); return ret; @@ -548,7 +531,7 @@ HRESULT __stdcall IDirectDrawSurface__SetPrivateData( DWORD dwSize, DWORD dwFlags) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DDERR_OUTOFMEMORY; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -560,7 +543,7 @@ HRESULT __stdcall IDirectDrawSurface__GetPrivateData( LPVOID lpBuffer, LPDWORD lpdwBufferSize) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DDERR_NOTFOUND; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -568,7 +551,7 @@ HRESULT __stdcall IDirectDrawSurface__GetPrivateData( HRESULT __stdcall IDirectDrawSurface__FreePrivateData(IDirectDrawSurfaceImpl* This, REFGUID rtag) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DD_OK; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -576,7 +559,7 @@ HRESULT __stdcall IDirectDrawSurface__FreePrivateData(IDirectDrawSurfaceImpl* Th HRESULT __stdcall IDirectDrawSurface__GetUniquenessValue(IDirectDrawSurfaceImpl* This, LPDWORD lpdwValue) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DDERR_INVALIDOBJECT; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -584,7 +567,7 @@ HRESULT __stdcall IDirectDrawSurface__GetUniquenessValue(IDirectDrawSurfaceImpl* HRESULT __stdcall IDirectDrawSurface__ChangeUniquenessValue(IDirectDrawSurfaceImpl* This) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DDERR_INVALIDOBJECT; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -592,7 +575,7 @@ HRESULT __stdcall IDirectDrawSurface__ChangeUniquenessValue(IDirectDrawSurfaceIm HRESULT __stdcall IDirectDrawSurface__SetPriority(IDirectDrawSurfaceImpl* This, DWORD dwPrio) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DDERR_INVALIDOBJECT; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -600,7 +583,7 @@ HRESULT __stdcall IDirectDrawSurface__SetPriority(IDirectDrawSurfaceImpl* This, HRESULT __stdcall IDirectDrawSurface__GetPriority(IDirectDrawSurfaceImpl* This, LPDWORD lpdwPrio) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DDERR_INVALIDOBJECT; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -608,7 +591,7 @@ HRESULT __stdcall IDirectDrawSurface__GetPriority(IDirectDrawSurfaceImpl* This, HRESULT __stdcall IDirectDrawSurface__SetLOD(IDirectDrawSurfaceImpl* This, DWORD dwLod) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DDERR_INVALIDOBJECT; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -616,7 +599,7 @@ HRESULT __stdcall IDirectDrawSurface__SetLOD(IDirectDrawSurfaceImpl* This, DWORD HRESULT __stdcall IDirectDrawSurface__GetLOD(IDirectDrawSurfaceImpl* This, LPDWORD lpdwLod) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p) [%p]\n", __FUNCTION__, This, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); HRESULT ret = DDERR_INVALIDOBJECT; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; diff --git a/src/blt.c b/src/blt.c index 166e3dd..0c212aa 100644 --- a/src/blt.c +++ b/src/blt.c @@ -518,7 +518,7 @@ void blt_colorfill( if (bpp == 8 || (bpp == 16 && (color & 0xFF) == ((color >> 8) & 0xFF)) || - ((bpp == 32 || bpp == 24) && + (bpp == 32 && (color & 0xFF) == ((color >> 8) & 0xFF) && (color & 0xFF) == ((color >> 16) & 0xFF) && (color & 0xFF) == ((color >> 24) & 0xFF))) diff --git a/src/config.c b/src/config.c index 36b756a..d405775 100644 --- a/src/config.c +++ b/src/config.c @@ -11,14 +11,12 @@ #include "debug.h" #include "dllmain.h" #include "ini.h" -#include "versionhelpers.h" static void cfg_init(); static void cfg_create_ini(); static BOOL cfg_get_bool(LPCSTR key, BOOL default_value); static int cfg_get_int(LPCSTR key, int default_value); static DWORD cfg_get_string(LPCSTR key, LPCSTR default_value, LPSTR out_string, DWORD out_size); -static DWORD cfg_get_game_section(LPSTR buf, DWORD size); #define GET_INT(a,b,c) a = cfg_get_int(b, c); TRACE("%s=%d\n", b, a) #define GET_BOOL(a,b,c) a = cfg_get_bool(b, c); TRACE("%s=%s\n", b, a ? "true" : "false") @@ -38,7 +36,6 @@ void cfg_load() GET_BOOL(g_config.fullscreen, "fullscreen", FALSE); GET_BOOL(g_config.windowed, "windowed", FALSE); GET_BOOL(g_config.maintas, "maintas", FALSE); - GET_STRING("aspect_ratio", "", g_config.aspect_ratio, sizeof(g_config.aspect_ratio)); GET_BOOL(g_config.boxing, "boxing", FALSE); GET_INT(g_config.maxfps, "maxfps", -1); GET_BOOL(g_config.vsync, "vsync", FALSE); @@ -52,10 +49,6 @@ void cfg_load() GET_INT(g_config.save_settings, "savesettings", 1); GET_BOOL(g_config.resizable, "resizable", TRUE); GET_INT(g_config.d3d9_filter, "d3d9_filter", FILTER_CUBIC); - GET_INT(g_config.anti_aliased_fonts_min_size, "anti_aliased_fonts_min_size", 13); - GET_INT(g_config.min_font_size, "min_font_size", 0); - GET_INT(g_config.center_window, "center_window", CENTER_WINDOW_AUTO); - GET_STRING("inject_resolution", "", g_config.inject_resolution, sizeof(g_config.inject_resolution)); GET_BOOL(g_config.vhack, "vhack", FALSE); GET_STRING("screenshotdir", ".\\Screenshots\\", g_config.screenshot_dir, sizeof(g_config.screenshot_dir)); GET_BOOL(g_config.toggle_borderless, "toggle_borderless", FALSE); @@ -65,67 +58,57 @@ void cfg_load() GET_BOOL(g_config.noactivateapp, "noactivateapp", FALSE); GET_INT(g_config.maxgameticks, "maxgameticks", 0); - GET_INT(g_config.limiter_type, "limiter_type", LIMIT_AUTO); GET_INT(g_config.minfps, "minfps", 0); - GET_BOOL(g_config.nonexclusive, "nonexclusive", TRUE); + GET_BOOL(g_config.nonexclusive, "nonexclusive", FALSE); GET_BOOL(g_config.singlecpu, "singlecpu", TRUE); GET_INT(g_config.resolutions, "resolutions", RESLIST_NORMAL); GET_INT(g_config.fixchilds, "fixchilds", FIX_CHILDS_DETECT_PAINT); GET_BOOL(g_config.hook_peekmessage, "hook_peekmessage", FALSE); + GET_BOOL(g_config.hook_getmessage, "hook_getmessage", FALSE); /* Undocumented settings */ - GET_BOOL(g_config.fix_alt_key_stuck, "fix_alt_key_stuck", FALSE); + GET_BOOL(g_config.releasealt, "releasealt", FALSE); GET_BOOL(GameHandlesClose, "game_handles_close", FALSE); - GET_BOOL(g_config.fix_not_responding, "fix_not_responding", FALSE); - GET_BOOL(g_config.no_compat_warning, "no_compat_warning", FALSE); + GET_BOOL(g_config.fixnotresponding, "fixnotresponding", FALSE); + GET_INT(g_config.hook, "hook", 4); GET_INT(g_config.guard_lines, "guard_lines", 200); GET_INT(g_config.max_resolutions, "max_resolutions", 0); + GET_BOOL(g_config.limit_bltfast, "limit_bltfast", FALSE); GET_BOOL(g_config.lock_surfaces, "lock_surfaces", FALSE); + GET_BOOL(g_config.allow_wmactivate, "allow_wmactivate", FALSE); GET_BOOL(g_config.flipclear, "flipclear", FALSE); + GET_BOOL(g_config.fixmousehook, "fixmousehook", FALSE); GET_BOOL(g_config.rgb555, "rgb555", FALSE); GET_BOOL(g_config.no_dinput_hook, "no_dinput_hook", FALSE); - GET_BOOL(g_config.center_cursor_fix, "center_cursor_fix", FALSE); - GET_STRING("fake_mode", "", g_config.fake_mode, sizeof(g_config.fake_mode)); - GET_BOOL(g_config.lock_mouse_top_left, "lock_mouse_top_left", FALSE); - GET_STRING("win_version", "", g_config.win_version, sizeof(g_config.win_version)); - GET_INT(g_config.hook, "hook", 4); - GET_BOOL(g_config.limit_gdi_handles, "limit_gdi_handles", FALSE); - GET_BOOL(g_config.remove_menu, "remove_menu", FALSE); GET_INT(g_config.refresh_rate, "refresh_rate", 0); - GET_BOOL(g_config.terminate_process, "terminate_process", FALSE); + GET_INT(g_config.anti_aliased_fonts_min_size, "anti_aliased_fonts_min_size", 13); + GET_INT(g_config.custom_width, "custom_width", 0); + GET_INT(g_config.custom_height, "custom_height", 0); + GET_INT(g_config.min_font_size, "min_font_size", 0); + GET_BOOL(g_config.direct3d_passthrough, "direct3d_passthrough", FALSE); /* Hotkeys */ GET_INT(g_config.hotkeys.toggle_fullscreen, "keytogglefullscreen", VK_RETURN); - GET_INT(g_config.hotkeys.toggle_fullscreen2, "keytogglefullscreen2", 0); GET_INT(g_config.hotkeys.toggle_maximize, "keytogglemaximize", VK_NEXT); - GET_INT(g_config.hotkeys.toggle_maximize2, "keytogglemaximize2", 0); GET_INT(g_config.hotkeys.unlock_cursor1, "keyunlockcursor1", VK_TAB); GET_INT(g_config.hotkeys.unlock_cursor2, "keyunlockcursor2", VK_RCONTROL); GET_INT(g_config.hotkeys.screenshot, "keyscreenshot", VK_SNAPSHOT); /* Game specific settings */ + + GET_BOOL(g_config.remove_menu, "remove_menu", FALSE); /* Added for HoMM4 */ GET_BOOL(g_config.armadahack, "armadahack", FALSE); GET_BOOL(g_config.tshack, "tshack", FALSE); GET_BOOL(g_config.infantryhack, "infantryhack", FALSE); GET_BOOL(g_config.stronghold_hack, "stronghold_hack", FALSE); GET_BOOL(g_config.mgs_hack, "mgs_hack", FALSE); - GET_BOOL(g_config.tlc_hack, "tlc_hack", FALSE); - GET_BOOL(g_config.carma95_hack, "carma95_hack", FALSE); - GET_BOOL(g_config.sirtech_hack, "sirtech_hack", FALSE); - GET_BOOL(g_config.flightsim98_hack, "flightsim98_hack", FALSE); - GET_BOOL(g_config.darkcolony_hack, "darkcolony_hack", FALSE); - + GET_BOOL(g_config.vermeer_hack, "vermeer_hack", FALSE); + GameHandlesClose = GameHandlesClose || g_config.infantryhack; - if (g_config.lock_mouse_top_left) - g_config.adjmouse = FALSE; - - if (g_config.aspect_ratio[0]) - g_config.maintas = TRUE; - ini_free(&g_config.ini); } @@ -134,10 +117,6 @@ void cfg_save() if (!g_config.save_settings) return; - /* Do not save settings while macOS maximize is active */ - if (IsMacOS() && !g_config.window_rect.left && !g_config.window_rect.top) - return; - char buf[16]; char* section = g_config.save_settings == 1 ? "ddraw" : g_config.process_file_name; @@ -203,9 +182,6 @@ static void cfg_create_ini() "; Maintain aspect ratio\n" "maintas=false\n" "\n" - "; Use custom aspect ratio - Example values: 4:3, 16:10, 16:9, 21:9\n" - "aspect_ratio=\n" - "\n" "; Windowboxing / Integer Scaling\n" "boxing=false\n" "\n" @@ -251,21 +227,7 @@ static void cfg_create_ini() "; Possible values: 0 = nearest-neighbor, 1 = bilinear, 2 = bicubic, 3 = lanczos (bicubic/lanczos only support 16/32bit color depth games)\n" "d3d9_filter=2\n" "\n" - "; Disable font smoothing for fonts that are smaller than size X\n" - "anti_aliased_fonts_min_size=13\n" - "\n" - "; Raise the size of small fonts to X\n" - "min_font_size=0\n" - "\n" - "; Center window to screen when game changes the display resolution\n" - "; Possible values: 0 = never center, 1 = automatic, 2 = always center\n" - "center_window=1\n" - "\n" - "; Inject a custom display resolution into the in-game resolution list - Example values: 960x540, 3840x2160\n" - "; Note: This setting can used for downscaling as well, you can insert resolutions higher than your monitor supports\n" - "inject_resolution=\n" - "\n" - "; Enable upscale hack for high resolution patches (Supports C&C1, Red Alert 1, Worms 2 and KKND Xtreme)\n" + "; Enable upscale hack for high resolution patches (Supports C&C1, Red Alert 1 and KKND Xtreme)\n" "vhack=false\n" "\n" "; Where should screenshots be saved\n" @@ -291,54 +253,52 @@ static void cfg_create_ini() "; Note: Usually one of the following values will work: 60 / 30 / 25 / 20 / 15 (lower value = slower game speed)\n" "maxgameticks=0\n" "\n" - "; Method that should be used to limit game ticks (maxgameticks=): 0 = Automatic, 1 = TestCooperativeLevel, 2 = BltFast, 3 = Unlock, 4 = PeekMessage\n" - "limiter_type=0\n" - "\n" "; Force minimum FPS, possible values: 0 = disabled, -1 = use 'maxfps=' value, -2 = same as -1 but force full redraw, 1-1000 = custom FPS\n" "; Note: Set this to a low value such as 5 or 10 if some parts of the game are not being displayed (e.g. menus or loading screens)\n" "minfps=0\n" "\n" "; Disable fullscreen-exclusive mode for the direct3d9*/opengl* renderers\n" "; Note: Can be used in case some GUI elements like buttons/textboxes/videos/etc.. are invisible\n" - "nonexclusive=true\n" + "nonexclusive=false\n" "\n" "; Force CPU0 affinity, avoids crashes/freezing, *might* have a performance impact\n" "; Note: Disable this if the game is not running smooth or there are sound issues\n" "singlecpu=true\n" "\n" - "; Available display resolutions, possible values: 0 = Small list, 1 = Very small list, 2 = Full list\n" + "; Available resolutions, possible values: 0 = Small list, 1 = Very small list, 2 = Full list\n" "; Note: Set this to 2 if your chosen resolution is not working or does not show up in the list\n" "; Note: Set this to 1 if the game is crashing on startup\n" "resolutions=0\n" "\n" - "; Child window handling, possible values: 0 = Disabled, 1 = Display top left, 2 = Display top left + repaint, 3 = Hide, 4 = Display top left + hide\n" + "; Child window handling, possible values: 0 = Disabled, 1 = Display top left, 2 = Display top left + repaint, 3 = Hide\n" "; Note: Disables upscaling if a child window was detected (to ensure the game is fully playable, may look weird though)\n" "fixchilds=2\n" "\n" - "; Enable the following setting if your cursor doesn't lock to the window or it doesn't work properly when upscaling is enabled\n" + "; Enable one of the following settings if your cursor doesn't work properly when upscaling is enabled\n" "hook_peekmessage=false\n" + "hook_getmessage=false\n" "\n" "\n" - "; Undocumented compatibility settings - These will probably not solve your problem, you should rather focus on the settings above\n" - "fix_alt_key_stuck=false\n" + "; Undocumented settings - You may or may not change these (You should rather focus on the settings above)\n" + "releasealt=false\n" "game_handles_close=false\n" - "fix_not_responding=false\n" - "no_compat_warning=false\n" + "fixnotresponding=false\n" + "hook=4\n" "guard_lines=200\n" "max_resolutions=0\n" + "limit_bltfast=false\n" "lock_surfaces=false\n" + "allow_wmactivate=false\n" "flipclear=false\n" + "fixmousehook=false\n" "rgb555=false\n" "no_dinput_hook=false\n" - "center_cursor_fix=false\n" - ";fake_mode=640x480x32\n" - "lock_mouse_top_left=false\n" - ";win_version=95\n" - "hook=4\n" - "limit_gdi_handles=false\n" - "remove_menu=false\n" "refresh_rate=0\n" - "terminate_process=false\n" + "anti_aliased_fonts_min_size=13\n" + "custom_width=0\n" + "custom_height=0\n" + "min_font_size=0\n" + "direct3d_passthrough=false\n" "\n" "\n" "\n" @@ -350,15 +310,9 @@ static void cfg_create_ini() "; Switch between windowed and fullscreen mode = [Alt] + ???\n" "keytogglefullscreen=0x0D\n" "\n" - "; Switch between windowed and fullscreen mode (single key) = ???\n" - "keytogglefullscreen2=0x00\n" - "\n" "; Maximize window = [Alt] + ???\n" "keytogglemaximize=0x22\n" "\n" - "; Maximize window (single key) = ???\n" - "keytogglemaximize2=0x00\n" - "\n" "; Unlock cursor 1 = [Ctrl] + ???\n" "keyunlockcursor1=0x09\n" "\n" @@ -374,7 +328,7 @@ static void cfg_create_ini() "; The following settings are for cnc-ddraw config.exe\n" "\n" "\n" - "; cnc-ddraw config program language, possible values: auto, english, chinese, german, spanish, russian, hungarian, french, italian, vietnamese, polish\n" + "; cnc-ddraw config program language, possible values: auto, english, chinese, german, spanish, russian, hungarian, french, italian\n" "configlang=auto\n" "\n" "; cnc-ddraw config program theme, possible values: Windows10, Cobalt XEMedia\n" @@ -392,23 +346,10 @@ static void cfg_create_ini() "; The following settings override all settings shown above, section name = executable name\n" "\n" "\n" - "; 101: The Airborne Invasion of Normandy\n" - "[101]\n" - "terminate_process=true\n" - "\n" - "; 7th Legion\n" - "[legion]\n" - "maxgameticks=25\n" - "\n" "; Atrox\n" "[Atrox]\n" - "nonexclusive=true\n" - "\n" - "; Arcatera the Dark Brotherhood\n" - "[darksun]\n" - "maxgameticks=60\n" - "maxfps=60\n" - "minfps=-1\n" + "fixchilds=0\n" + "allow_wmactivate=true\n" "\n" "; Atomic Bomberman\n" "[BM]\n" @@ -426,12 +367,6 @@ static void cfg_create_ini() "adjmouse=true\n" "resolutions=2\n" "\n" - "; Age of Empires: The Rise of Rome (RockNRor patch)\n" - "[EmpiresX_RockNRor]\n" - "nonexclusive=true\n" - "adjmouse=true\n" - "resolutions=2\n" - "\n" "; Age of Empires II\n" "[EMPIRES2]\n" "nonexclusive=true\n" @@ -448,37 +383,16 @@ static void cfg_create_ini() "guard_lines=300\n" "minfps=-2\n" "\n" - "; American Girls Dress Designer\n" - "[Dress Designer]\n" - "fake_mode=640x480x32\n" - "nonexclusive=true\n" - "\n" - "; Age of Wonders\n" - "[AoW]\n" - "resolutions=2\n" - "nonexclusive=false\n" - "singlecpu=false\n" - "\n" - "; Age of Wonders\n" - "[AoWCompat]\n" - "resolutions=2\n" - "nonexclusive=false\n" - "singlecpu=false\n" - "\n" - "; Age of Wonders Config Tool\n" - "[AoWSetup]\n" - "resolutions=2\n" - "\n" "; Age of Wonders 2\n" "[AoW2]\n" "resolutions=2\n" - "nonexclusive=false\n" + "renderer=opengl\n" "singlecpu=false\n" "\n" "; Age of Wonders 2\n" "[AoW2Compat]\n" "resolutions=2\n" - "nonexclusive=false\n" + "renderer=opengl\n" "singlecpu=false\n" "\n" "; Age of Wonders 2 Config Tool\n" @@ -488,13 +402,13 @@ static void cfg_create_ini() "; Age of Wonders: Shadow Magic\n" "[AoWSM]\n" "resolutions=2\n" - "nonexclusive=false\n" + "renderer=opengl\n" "singlecpu=false\n" "\n" "; Age of Wonders: Shadow Magic\n" "[AoWSMCompat]\n" "resolutions=2\n" - "nonexclusive=false\n" + "renderer=opengl\n" "singlecpu=false\n" "\n" "; Age of Wonders: Shadow Magic Config Tool\n" @@ -510,30 +424,6 @@ static void cfg_create_ini() "[1602]\n" "adjmouse=true\n" "\n" - "; Army Men: World War / Army Men: Operation Meltdown\n" - "[amww]\n" - "maxfps=60\n" - "maxgameticks=120\n" - "minfps=-1\n" - "\n" - "; Army Men: Air Tactics\n" - "[Amat]\n" - "maxfps=60\n" - "maxgameticks=120\n" - "minfps=-1\n" - "\n" - "; Army Men: Toys in Space\n" - "[ARMYMENTIS]\n" - "maxfps=60\n" - "maxgameticks=120\n" - "minfps=-1\n" - "\n" - "; Army Men 2\n" - "[ArmyMen2]\n" - "maxfps=60\n" - "maxgameticks=120\n" - "minfps=-1\n" - "\n" "; Alien Nations\n" "[AN]\n" "adjmouse=true\n" @@ -541,46 +431,17 @@ static void cfg_create_ini() "; Atlantis\n" "[ATLANTIS]\n" "renderer=opengl\n" - "maxgameticks=30\n" - "center_cursor_fix=true\n" + "maxgameticks=60\n" "\n" "; Airline Tycoon Deluxe\n" "[AT]\n" - "lock_mouse_top_left=true\n" - "fixchilds=3\n" - "\n" - "; Arthur's Wilderness Rescue\n" - "[Arthur]\n" - "renderer=gdi\n" - "\n" - "; Axis & Allies\n" - "[AxisAllies]\n" - "hook_peekmessage=true\n" - "maxgameticks=60\n" - "\n" - "; A Bug's Life Action Game\n" - "[bugs]\n" - "fix_not_responding=true\n" - "\n" - "; Barney - Secret of the Rainbow\n" - "[Barney]\n" - "adjmouse=false\n" - "width=0\n" - "height=0\n" - "resizable=false\n" - "maintas=false\n" - "boxing=false\n" + "fixchilds=0\n" "\n" "; Baldur's Gate II\n" "; Note: 'Use 3D Acceleration' must be disabled and 'Full Screen' must be enabled in BGConfig.exe\n" "[BGMain]\n" "resolutions=2\n" "\n" - "; Balls of Steel v1.2\n" - "[bos]\n" - "checkfile=.\\barbarin.ddp\n" - "win_version=95\n" - "\n" "; BALDR FORCE EXE\n" "[BaldrForce]\n" "noactivateapp=true\n" @@ -595,60 +456,19 @@ static void cfg_create_ini() "checkfile=.\\SOUND.REZ\n" "noactivateapp=true\n" "\n" - "; Blue's 123 Time Activities\n" - "[Blues123Time]\n" - "renderer=gdi\n" - "hook=3\n" - "\n" - "; Blue's Treasure Hunt\n" - "[Blue'sTreasureHunt-Disc1]\n" - "renderer=gdi\n" - "\n" - "; Blue's Treasure Hunt\n" - "[Blue'sTreasureHunt-Disc2]\n" - "renderer=gdi\n" - "\n" - "; Blue's Reading Time Activities\n" - "[Blue's Reading Time]\n" - "renderer=gdi\n" - "\n" - "; Blue's ArtTime Activities\n" - "[ArtTime]\n" - "renderer=gdi\n" - "\n" - "; Callus 95 - CPS-1 (Capcom Play System 1) emulator\n" - "[CALLUS95]\n" - "game_handles_close=true\n" - "windowed=true\n" - "toggle_borderless=true\n" - "devmode=true\n" - "\n" - "; Callus 95 - CPS-1 (Capcom Play System 1) emulator\n" - "[CALLUS95p]\n" - "game_handles_close=true\n" - "windowed=true\n" - "toggle_borderless=true\n" - "devmode=true\n" - "\n" "; Carmageddon\n" "[CARMA95]\n" + "noactivateapp=true\n" "flipclear=true\n" - "carma95_hack=true\n" "\n" "; Carmageddon\n" "[CARM95]\n" + "noactivateapp=true\n" "flipclear=true\n" - "carma95_hack=true\n" "\n" - "; Carmen Sandiego's Great Chase - NOT WORKING YET\n" - "[TIME32]\n" - "renderer=gdi\n" - "adjmouse=false\n" - "width=0\n" - "height=0\n" - "resizable=false\n" - "maintas=false\n" - "boxing=false\n" + "; Carmageddon 2\n" + "[Carma2_SW]\n" + "noactivateapp=true\n" "\n" "; Captain Claw\n" "[claw]\n" @@ -695,7 +515,6 @@ static void cfg_create_ini() "\n" "; Command & Conquer: Tiberian Sun / Command & Conquer: Red Alert 2\n" "[game]\n" - "nonexclusive=false\n" "checkfile=.\\blowfish.dll\n" "tshack=true\n" "noactivateapp=true\n" @@ -707,7 +526,6 @@ static void cfg_create_ini() "\n" "; Command & Conquer: Tiberian Sun Demo\n" "[SUN]\n" - "nonexclusive=false\n" "noactivateapp=true\n" "tshack=true\n" "adjmouse=true\n" @@ -718,7 +536,6 @@ static void cfg_create_ini() "\n" "; Command & Conquer: Tiberian Sun - CnCNet\n" "[ts-spawn]\n" - "nonexclusive=false\n" "noactivateapp=true\n" "tshack=true\n" "adjmouse=true\n" @@ -729,7 +546,6 @@ static void cfg_create_ini() "\n" "; Command & Conquer: Red Alert 2 - XWIS\n" "[ra2]\n" - "nonexclusive=false\n" "noactivateapp=true\n" "tshack=true\n" "maxfps=60\n" @@ -739,7 +555,6 @@ static void cfg_create_ini() "\n" "; Command & Conquer: Red Alert 2 - XWIS\n" "[Red Alert 2]\n" - "nonexclusive=false\n" "noactivateapp=true\n" "tshack=true\n" "maxfps=60\n" @@ -749,7 +564,6 @@ static void cfg_create_ini() "\n" "; Command & Conquer: Red Alert 2: Yuri's Revenge\n" "[gamemd]\n" - "nonexclusive=false\n" "noactivateapp=true\n" "tshack=true\n" "maxfps=60\n" @@ -759,7 +573,6 @@ static void cfg_create_ini() "\n" "; Command & Conquer: Red Alert 2: Yuri's Revenge - ?ModExe?\n" "[ra2md]\n" - "nonexclusive=false\n" "noactivateapp=true\n" "tshack=true\n" "maxfps=60\n" @@ -769,7 +582,6 @@ static void cfg_create_ini() "\n" "; Command & Conquer: Red Alert 2: Yuri's Revenge - CnCNet\n" "[gamemd-spawn]\n" - "nonexclusive=false\n" "noactivateapp=true\n" "tshack=true\n" "maxfps=60\n" @@ -779,7 +591,6 @@ static void cfg_create_ini() "\n" "; Command & Conquer: Red Alert 2: Yuri's Revenge - XWIS\n" "[Yuri's Revenge]\n" - "nonexclusive=false\n" "noactivateapp=true\n" "tshack=true\n" "maxfps=60\n" @@ -795,26 +606,13 @@ static void cfg_create_ini() "[comandos_w10]\n" "maxgameticks=-1\n" "\n" - "; Constructor\n" - "[Game_W95]\n" - "noactivateapp=true\n" - "\n" "; Caesar III\n" "[c3]\n" "nonexclusive=true\n" "adjmouse=true\n" "\n" - "; Cloud Kingdom 3 (only with /ddraw command line parameter)\n" - "[Clouds Kingdom 3]\n" - "fake_mode=320x240x32\n" - "\n" - "; Commando 2004 (only with /ddraw command line parameter)\n" - "[commando]\n" - "fake_mode=320x240x32\n" - "\n" "; Chris Sawyer's Locomotion\n" - "[LOCO/2]\n" - "checkfile=.\\LOCO.EXE\n" + "[LOCO]\n" "adjmouse=true\n" "\n" "; Cultures 2\n" @@ -827,51 +625,24 @@ static void cfg_create_ini() "\n" "; Close Combat 2: A Bridge Too Far\n" "[cc2]\n" - "maxgameticks=20\n" - "limiter_type=4\n" - "minfps=15\n" "adjmouse=true\n" "nonexclusive=true\n" "\n" "; Close Combat 3: The Russian Front\n" "[cc3]\n" - "maxgameticks=30\n" - "limiter_type=2\n" "adjmouse=true\n" "nonexclusive=true\n" "\n" "; Close Combat 4: The Battle of the Bulge\n" "[cc4]\n" - "maxgameticks=30\n" - "limiter_type=2\n" "adjmouse=true\n" "nonexclusive=true\n" "\n" "; Close Combat 5: Invasion: Normandy\n" "[cc5]\n" - "maxgameticks=30\n" - "limiter_type=2\n" "adjmouse=true\n" "nonexclusive=true\n" "\n" - "; ClueFinders Math Adventures 1.0\n" - "[TCFM32]\n" - "adjmouse=false\n" - "width=0\n" - "height=0\n" - "resizable=false\n" - "maintas=false\n" - "boxing=false\n" - "\n" - "; ClueFinders Math Adventures 1.0\n" - "[cfmath32]\n" - "adjmouse=false\n" - "width=0\n" - "height=0\n" - "resizable=false\n" - "maintas=false\n" - "boxing=false\n" - "\n" "; Call To Power 2\n" "[ctp2]\n" "maintas=false\n" @@ -881,32 +652,16 @@ static void cfg_create_ini() "[corsairs]\n" "adjmouse=true\n" "\n" - "; Dark Colony\n" - "[dc16]\n" - "maxgameticks=30\n" - "darkcolony_hack=true\n" - "hook_peekmessage=true\n" - "\n" "; Divine Divinity\n" "[div]\n" "resolutions=2\n" "singlecpu=false\n" "\n" - "; Die by the Sword\n" - "[windie]\n" - "maxgameticks=30\n" - "\n" "; Dragon Throne: Battle of Red Cliffs\n" "[AdSanguo]\n" "maxgameticks=60\n" "noactivateapp=true\n" - "limiter_type=2\n" - "\n" - "; Dark Secret of Africa\n" - "[Game/5]\n" - "checkfile=.\\CONFIG.CFG\n" - "maxfps=60\n" - "minfps=-1\n" + "limit_bltfast=true\n" "\n" "; Dark Reign: The Future of War\n" "[DKReign]\n" @@ -917,10 +672,6 @@ static void cfg_create_ini() "maxgameticks=60\n" "noactivateapp=true\n" "\n" - "; Dreams to Realty\n" - "[windream]\n" - "maxgameticks=60\n" - "\n" "; Deadlock 2\n" "[DEADLOCK]\n" "fixchilds=0\n" @@ -936,20 +687,6 @@ static void cfg_create_ini() "[hellfire]\n" "devmode=true\n" "\n" - "; Disney Trivia Challenge\n" - "[DisneyTr]\n" - "fixchilds=3\n" - "lock_mouse_top_left=true\n" - "renderer=gdi\n" - "\n" - "; Discoworld Noir\n" - "[dn]\n" - "fake_mode=640x480x16\n" - "\n" - "; Dominion - Storm Over Gift 3\n" - "[dominion]\n" - "flipclear=true\n" - "\n" "; Escape Velocity Nova\n" "[EV Nova]\n" "nonexclusive=true\n" @@ -961,102 +698,21 @@ static void cfg_create_ini() "; Economic War\n" "[EcoW]\n" "maxgameticks=60\n" - "fix_not_responding=true\n" - "\n" - "; Emperor: Rise of the Middle Kingdom\n" - "[Emperor]\n" - "nonexclusive=true\n" - "adjmouse=true\n" + "fixnotresponding=true\n" "\n" "; Enemy Infestation\n" "[EI]\n" - "hook_peekmessage=true\n" + "hook_getmessage=true\n" "\n" - "; F-16 Agressor\n" - "[f-16]\n" - "resolutions=1\n" - "\n" - "; Fallout Tactics: Brotherhood of Steel\n" - "[BOS/2]\n" - "checkfile=.\\binkw32.dll\n" - "hook_peekmessage=true\n" - "\n" - "; Fallout Tactics: Brotherhood of Steel\n" - "[BOS_HR]\n" - "hook_peekmessage=true\n" - "\n" - "; Fallout Tactics: Brotherhood of Steel\n" - "[FT Tools]\n" - "hook_peekmessage=true\n" - "\n" - "; Flight Simulator 98\n" - "[FLTSIM95]\n" - "flightsim98_hack=true\n" - "\n" - "; Flight Simulator 98\n" - "[FLTSIM98]\n" - "flightsim98_hack=true\n" - "\n" "; Fairy Tale About Father Frost, Ivan and Nastya\n" "[mrazik]\n" "guard_lines=0\n" "\n" - "; Fable\n" - "[Fable]\n" - "maxgameticks=59\n" - "limiter_type=4\n" - "\n" - "; Final Liberation: Warhammer Epic 40000\n" - "[Epic40k]\n" - "hook_peekmessage=true\n" - "maxgameticks=125\n" - "\n" "; Future Cop - L.A.P.D.\n" "[FCopLAPD]\n" "nonexclusive=true\n" "adjmouse=true\n" "\n" - "; Freddi 1\n" - "[Freddi1]\n" - "renderer=gdi\n" - "\n" - "; Freddi Fish : The Case of the Hogfish Rustlers of Briny Gulch\n" - "[Freddihrbg]\n" - "renderer=gdi\n" - "\n" - "; Freddi Water Worries\n" - "[Water]\n" - "renderer=gdi\n" - "\n" - "; Freddi Fish\n" - "[FreddiSCS]\n" - "renderer=gdi\n" - "\n" - "; Freddi Fish\n" - "[FREDDI4]\n" - "renderer=gdi\n" - "hook=3\n" - "\n" - "; Freddi Fish's One-Stop Fun Shop\n" - "[FreddisFunShop]\n" - "renderer=gdi\n" - "\n" - "; Freddi Fish: The Case of the Creature of Coral Cove\n" - "[freddicove]\n" - "renderer=gdi\n" - "\n" - "; Freddi Fish: The Case of the Haunted Schoolhouse\n" - "[FreddiCHSH]\n" - "renderer=gdi\n" - "\n" - "; Freddi Fish: Maze Madness\n" - "[Maze]\n" - "renderer=gdi\n" - "\n" - "; Glover\n" - "[glover]\n" - "fix_not_responding=true\n" - "\n" "; G-Police\n" "[GPOLICE]\n" "maxgameticks=60\n" @@ -1065,8 +721,6 @@ static void cfg_create_ini() "[gangsters]\n" "adjmouse=true\n" "nonexclusive=true\n" - "fixchilds=0\n" - "fake_mode=640x480x8\n" "\n" "; Grand Theft Auto\n" "[Grand Theft Auto]\n" @@ -1086,55 +740,17 @@ static void cfg_create_ini() "noactivateapp=true\n" "nonexclusive=true\n" "\n" - "; Girl Talk\n" - "[GirlTalk]\n" - "resolutions=2\n" - "game_handles_close=true\n" - "\n" - "; Jazz Jackrabbit 2 plus\n" - "[Jazz2]\n" - "inject_resolution=800x450\n" - "\n" - "; Jazz Jackrabbit 2\n" - "[Jazz2_NonPlus]\n" - "inject_resolution=800x450\n" - "\n" - "; Jungle Storm\n" - "[Jstorm]\n" - "no_compat_warning=true\n" - "win_version=98\n" - "\n" - "; Hades Challenge\n" - "[HADESCH]\n" - "no_compat_warning=true\n" - "\n" "; Heroes of Might and Magic II: The Succession Wars\n" "[HEROES2W]\n" "adjmouse=true\n" - "game_handles_close=true\n" - "keytogglefullscreen2=0x73\n" "\n" "; Heroes of Might and Magic III\n" "[Heroes3]\n" - "renderer=opengl\n" "game_handles_close=true\n" - "keytogglefullscreen2=0x73\n" "\n" "; Heroes of Might and Magic III HD Mod\n" "[Heroes3 HD]\n" - "renderer=opengl\n" "game_handles_close=true\n" - "keytogglefullscreen2=0x73\n" - "\n" - "; Heroes of Might and Magic III - Master of Puppets mod\n" - "[MoP]\n" - "game_handles_close=true\n" - "keytogglefullscreen2=0x73\n" - "\n" - "; Heroes of Might and Magic IV\n" - "[heroes4]\n" - "remove_menu=true\n" - "keytogglefullscreen2=0x73\n" "\n" "; Hard Truck: Road to Victory\n" "[htruck]\n" @@ -1142,25 +758,13 @@ static void cfg_create_ini() "renderer=opengl\n" "noactivateapp=true\n" "\n" - "; Hooligans: Storm over Europe\n" - "[hooligans]\n" - "limit_gdi_handles=true\n" - "\n" - "; Imperialism 2: The Age of Exploration\n" - "[Imperialism II]\n" - "adjmouse=false\n" - "width=0\n" - "height=0\n" - "resizable=false\n" - "maintas=false\n" - "boxing=false\n" - "\n" "; Icewind Dale 2\n" "; Note: 'Full Screen' must be enabled in Config.exe\n" "; Note: 1070x602 is the lowest possible 16:9 resolution for the Widescreen patch (600/601 height will crash)\n" "[iwd2]\n" "resolutions=2\n" - "inject_resolution=1070x602\n" + "custom_width=1070\n" + "custom_height=602\n" "\n" "; Invictus\n" "[Invictus]\n" @@ -1171,14 +775,9 @@ static void cfg_create_ini() "[i76]\n" "adjmouse=true\n" "\n" - "; Infantry\n" + "; Infantry Online\n" "[infantry]\n" - "resolutions=2\n" - "infantryhack=true\n" - "max_resolutions=90\n" - "\n" - "; Infantry Steam\n" - "[FreeInfantry]\n" + "devmode=true\n" "resolutions=2\n" "infantryhack=true\n" "max_resolutions=90\n" @@ -1186,48 +785,45 @@ static void cfg_create_ini() "; Jagged Alliance 2\n" "[ja2]\n" "singlecpu=false\n" - "sirtech_hack=true\n" - "fix_alt_key_stuck=true\n" + "fixmousehook=true\n" + "noactivateapp=true\n" + "releasealt=true\n" "\n" "; Jagged Alliance 2: Unfinished Business\n" "[JA2UB]\n" "singlecpu=false\n" - "sirtech_hack=true\n" - "fix_alt_key_stuck=true\n" + "fixmousehook=true\n" + "noactivateapp=true\n" + "releasealt=true\n" "\n" "; Jagged Alliance 2: Wildfire\n" "[WF6]\n" "singlecpu=false\n" - "sirtech_hack=true\n" - "fix_alt_key_stuck=true\n" + "fixmousehook=true\n" + "noactivateapp=true\n" + "releasealt=true\n" "\n" "; Jagged Alliance 2 - UC mod\n" "[JA2_UC]\n" "singlecpu=false\n" - "sirtech_hack=true\n" - "fix_alt_key_stuck=true\n" + "fixmousehook=true\n" + "noactivateapp=true\n" + "releasealt=true\n" "\n" "; Jagged Alliance 2 - Vengeance Reloaded mod\n" "[JA2_Vengeance]\n" "singlecpu=false\n" - "sirtech_hack=true\n" - "fix_alt_key_stuck=true\n" + "fixmousehook=true\n" + "noactivateapp=true\n" + "releasealt=true\n" "\n" - "; Jagged Alliance 2 - Vengeance Reloaded mod German exe\n" - "[JA2_Vengeance_DE]\n" - "singlecpu=false\n" - "sirtech_hack=true\n" - "fix_alt_key_stuck=true\n" + "; Jedi Knight Dark Forces 2\n" + "[JK]\n" + "direct3d_passthrough=true\n" "\n" - "; Jeopardy! - NOT WORKING YET\n" - "[jeoppc]\n" - "singlecpu=false\n" - "\n" - "; Karma Immortal Wrath\n" - "[karma]\n" - "fix_not_responding=true\n" - "maxgameticks=60\n" - "limiter_type=4\n" + "; Kings Quest 8\n" + "[Mask]\n" + "renderer=opengl\n" "\n" "; Konung\n" "[konung]\n" @@ -1245,124 +841,10 @@ static void cfg_create_ini() "[KKND2]\n" "noactivateapp=true\n" "\n" - "; Knights and Merchants The Shattered Kingdom\n" - "[KaM_800]\n" - "limiter_type=2\n" - "maxgameticks=60\n" - "\n" - "; Knights and Merchants The Shattered Kingdom\n" - "[KaM_1024]\n" - "limiter_type=2\n" - "maxgameticks=60\n" - "\n" - "; Lode Runner 2\n" - "[LR2]\n" - "no_dinput_hook=true\n" - "fake_mode=640x480x16\n" - "\n" - "; Last Bronx\n" - "[LB]\n" - "maxgameticks=30\n" - "\n" - "; Lapis (lapis.mgame.com)\n" - "[Lapis]\n" - "fixchilds=3\n" - "lock_mouse_top_left=true\n" - "\n" - "; LEGO LOCO - NOT WORKING YET\n" - "[LOCO]\n" - "checkfile=.\\LEGO.INI\n" - "fake_mode=1024x768x16\n" - "posX=0\n" - "posY=0\n" - "border=false\n" - "fullscreen=false\n" - "\n" - "; Little Bear Kindergarten/Preschool Thinking Adventures: Parent's Progress Report\n" - "[LBPR]\n" - "adjmouse=false\n" - "width=0\n" - "height=0\n" - "resizable=false\n" - "maintas=false\n" - "boxing=false\n" - "\n" - "; Little Bear Kindergarten/Preschool Thinking Adventures\n" - "[LBSTART]\n" - "adjmouse=false\n" - "width=0\n" - "height=0\n" - "resizable=false\n" - "maintas=false\n" - "boxing=false\n" - "\n" - "; Little Bear Toddler Discovery Adventures\n" - "[LBT]\n" - "adjmouse=false\n" - "width=0\n" - "height=0\n" - "resizable=false\n" - "maintas=false\n" - "boxing=false\n" - "\n" "; Lionheart\n" "[Lionheart]\n" "hook_peekmessage=true\n" "\n" - "; Lost Vikings 2\n" - "[LOSTV95]\n" - "fake_mode=320x240x16\n" - "\n" - "; Nightmare Creatures\n" - "[NC]\n" - "maxgameticks=30\n" - "\n" - "; Moto Racer (software mode)\n" - "[moto]\n" - "maxgameticks=59\n" - "\n" - "; Madeline 1st Grade Math\n" - "[madmath1]\n" - "nonexclusive=true\n" - "no_compat_warning=true\n" - "adjmouse=false\n" - "width=0\n" - "height=0\n" - "resizable=false\n" - "maintas=false\n" - "boxing=false\n" - "renderer=gdi\n" - "hook=2\n" - "win_version=nt4\n" - "\n" - "; Madeline 1st Grade Math: Progress Report\n" - "[madpr]\n" - "nonexclusive=true\n" - "no_compat_warning=true\n" - "adjmouse=false\n" - "width=0\n" - "height=0\n" - "resizable=false\n" - "maintas=false\n" - "boxing=false\n" - "renderer=gdi\n" - "hook=2\n" - "win_version=nt4\n" - "\n" - "; Madeline 2nd Grade Math\n" - "[madmath2]\n" - "nonexclusive=true\n" - "no_compat_warning=true\n" - "adjmouse=false\n" - "width=0\n" - "height=0\n" - "resizable=false\n" - "maintas=false\n" - "boxing=false\n" - "renderer=gdi\n" - "hook=2\n" - "win_version=nt4\n" - "\n" "; Majesty Gold\n" "[Majesty]\n" "minfps=-2\n" @@ -1375,50 +857,19 @@ static void cfg_create_ini() "[MajestyHD - Old]\n" "adjmouse=true\n" "\n" - "; Meat Puppet\n" - "[meat]\n" - "hook_peekmessage=true\n" - "\n" "; Mech Warrior 3\n" "[Mech3]\n" "nonexclusive=true\n" "\n" - "; Men In Black - NOT WORKING YET\n" - "[MIB]\n" - "hook=2\n" - "\n" "; Moorhuhn 2\n" "[Moorhuhn2]\n" - "fix_alt_key_stuck=true\n" - "\n" - "; Metal Knight\n" - "[mk]\n" - "maxgameticks=60\n" - "limiter_type=4\n" + "releasealt=true\n" "\n" "; New Robinson\n" "[ROBY]\n" "adjmouse=true\n" "hook_peekmessage=true\n" "\n" - "; Neo Sonic Universe\n" - "[nsu]\n" - "fake_mode=320x240x32\n" - "\n" - "; Neo Sonic Universe - battle mode\n" - "[nsu_battle]\n" - "fake_mode=320x240x32\n" - "\n" - "; Nancy Drew (All games)\n" - "[Game/3]\n" - "checkfile=.\\Nancy.cid\n" - "limiter_type=1\n" - "maxgameticks=120\n" - "\n" - "; NBA Full Court Press\n" - "[NBA_FCP]\n" - "fake_mode=640x480x8\n" - "\n" "; Nox\n" "[NOX]\n" "checkfile=.\\NOX.ICD\n" @@ -1443,203 +894,22 @@ static void cfg_create_ini() "adjmouse=true\n" "renderer=gdi\n" "\n" - "; Pandora's Box Puzzle Game\n" - "[Pandora]\n" - "fixchilds=0\n" - "\n" - "; Paddle Bash Hotshot\n" - "[SPAGHSPaddle]\n" - "no_compat_warning=true\n" - "\n" - "; Pajama Sam's Games to Play on Any Day\n" - "[PJGAMES]\n" - "renderer=gdi\n" - "\n" - "; Pajama Sam\n" - "[PajamaTAL]\n" - "renderer=gdi\n" - "\n" - "; Pajama Sam: No Need to Hide When It's Dark Outside\n" - "[PajamaNHD]\n" - "renderer=gdi\n" - "\n" - "; Pajama Sam 3\n" - "[Pajama3]\n" - "renderer=gdi\n" - "\n" - "; Pajama Sam's One-Stop Fun Shop\n" - "[SamsFunShop]\n" - "renderer=gdi\n" - "\n" - "; Pajama Sam DON'T FEAR THE DARK\n" - "[pjSam]\n" - "renderer=gdi\n" - "\n" - "; Pajama Sam 3: You Are What You Eat From Your Head To Your Feet\n" - "[UKpajamaEAT]\n" - "renderer=gdi\n" - "\n" "; Pharaoh\n" "[Pharaoh]\n" "adjmouse=true\n" "\n" - "; Putt-Putt Saves The Zoo\n" - "[PUTTZOO]\n" - "renderer=gdi\n" - "hook=3\n" - "\n" - "; Putt-Putt's One-Stop Fun Shop\n" - "[PuttsFunShop]\n" - "renderer=gdi\n" - "\n" - "; Putt-Putt and Pep's Dog On A Stick\n" - "[DOG]\n" - "renderer=gdi\n" - "\n" - "; Putt-Putt Joins the Circus\n" - "[puttcircus]\n" - "renderer=gdi\n" - "\n" - "; Putt-Putt Enters The Race\n" - "[UKPuttRace]\n" - "renderer=gdi\n" - "\n" - "; Putt-Putt: Travels Through Time\n" - "[PuttTTT]\n" - "renderer=gdi\n" - "\n" - "; Putt-Putt and Pep's Balloon-o-Rama\n" - "[Balloon]\n" - "renderer=gdi\n" - "\n" - "; Putt-Putt Travels Through Time\n" - "[PUTTPUTTTTT]\n" - "renderer=gdi\n" - "\n" - "; Putt-Putt Joins the Circus\n" - "[puttputtjtc]\n" - "renderer=gdi\n" - "\n" - "; Pizza Syndicate\n" - "[Pizza2]\n" - "renderer=opengl\n" - "\n" - "; Pizza Syndicate - Mehr Biss (Mission CD)\n" - "[Pizza_Mission]\n" - "renderer=opengl\n" - "\n" "; Pax Imperia\n" "[Pax Imperia]\n" "nonexclusive=true\n" "\n" - "; Play with the Teletubbies\n" - "[PlayWTT]\n" - "hook=3\n" - "\n" - "; Populous - The Beginning\n" - "[popTB]\n" - "singlecpu=false\n" - "\n" - "; Rage of Mages\n" - "[rom]\n" - "maxgameticks=60\n" - "limiter_type=4\n" - "singlecpu=true\n" - "\n" "; Railroad Tycoon II\n" "[RT2]\n" - "maxgameticks=60" "adjmouse=true\n" "\n" - "; Reader Rabbit Thinking Ages 4-6 (US)\n" - "[rrta32]\n" - "adjmouse=false\n" - "width=0\n" - "height=0\n" - "resizable=false\n" - "maintas=false\n" - "boxing=false\n" - "\n" - "; Reader Rabbit Reading Ages 4-6\n" - "[rrirjw32]\n" - "renderer=gdi\n" - "adjmouse=false\n" - "width=0\n" - "height=0\n" - "resizable=false\n" - "maintas=false\n" - "boxing=false\n" - "\n" - "; Reader Rabbit Reading Ages 6-9\n" - "[irj2w32]\n" - "renderer=gdi\n" - "adjmouse=false\n" - "width=0\n" - "height=0\n" - "resizable=false\n" - "maintas=false\n" - "boxing=false\n" - "\n" - "; Real War\n" - "[RealWar]\n" - "maxgameticks=60\n" - "limiter_type=3\n" - "\n" - "; Return to Krondor\n" - "[RtK]\n" - "fixchilds=3\n" - "lock_mouse_top_left=true\n" - "limiter_type=2\n" - "game_handles_close=true\n" - "maxgameticks=59\n" - "anti_aliased_fonts_min_size=99\n" - "\n" "; ROAD RASH\n" "[RoadRash]\n" "adjmouse=true\n" - "nonexclusive=true\n" - "\n" - "; Robin Hood - The Legend of Sherwood (GOG)\n" - "[Game/4]\n" - "checkfile=.\\Robin Hood.exe\n" - "singlecpu=false\n" - "fix_not_responding=true\n" - "\n" - "; Robin Hood - The Legend of Sherwood (Steam)\n" - "[_rh]\n" - "singlecpu=false\n" - "fix_not_responding=true\n" - "\n" - "; Robin Hood - The Legend of Sherwood\n" - "[Robin Hood]\n" - "singlecpu=false\n" - "fix_not_responding=true\n" - "\n" - "; Rising Lands\n" - "[Rising]\n" - "maxgameticks=30\n" - "limiter_type=4\n" - "\n" - "; Scooby-Doo(TM), Case File #1 The Glowing Bug Man - NOT WORKING YET\n" - "[Case File #1]\n" - "windowed=true\n" - "nonexclusive=true\n" - "fake_mode=640x480x32\n" - "\n" - "; Seven Kingdoms II\n" - "[7k2]\n" - "fake_mode=352x240x32\n" - "fix_not_responding=true\n" - "\n" - "; Seven Games of the Soul\n" - "[faust]\n" - "maxgameticks=25\n" - "\n" - "; Swarog\n" - "[Swarog]\n" - "maxfps=60\n" - "maxgameticks=60\n" - "minfps=-1\n" + "fixchilds=1\n" "\n" "; Sim Copter\n" "[SimCopter]\n" @@ -1657,15 +927,6 @@ static void cfg_create_ini() "maintas=false\n" "boxing=false\n" "\n" - "; Star Wars Rebellion\n" - "[REBEXE]\n" - "adjmouse=false\n" - "width=0\n" - "height=0\n" - "resizable=false\n" - "maintas=false\n" - "boxing=false\n" - "\n" "; Star Wars: Galactic Battlegrounds\n" "[battlegrounds]\n" "nonexclusive=true\n" @@ -1684,34 +945,6 @@ static void cfg_create_ini() "[Rangers]\n" "hook_peekmessage=true\n" "\n" - "; SPYFox: Hold the Mustard\n" - "[mustard]\n" - "renderer=gdi\n" - "\n" - "; SPY Fox: Some Assembly Required\n" - "[Spyfox2]\n" - "renderer=gdi\n" - "\n" - "; SPY Fox in Dry Cereal (2008)\n" - "[SpyFox]\n" - "renderer=gdi\n" - "\n" - "; SPY Fox in Dry Cereal (2001)\n" - "[SPYFOXDC]\n" - "renderer=gdi\n" - "\n" - "; SPY Fox : Some Assembly Required\n" - "[SPYFOXSR]\n" - "renderer=gdi\n" - "\n" - "; SPY Fox: Operation Ozone\n" - "[spyozon]\n" - "renderer=gdi\n" - "\n" - "; SPY Fox: Operation Ozone\n" - "[spyfoxozu]\n" - "renderer=gdi\n" - "\n" "; Stronghold Crusader HD\n" "[Stronghold Crusader]\n" "resolutions=2\n" @@ -1733,44 +966,17 @@ static void cfg_create_ini() "; Sim City 3000\n" "[SC3]\n" "minfps=-2\n" - "maxgameticks=60\n" - "\n" - "; SimTunes\n" - "[SIMTUNES]\n" - "terminate_process=true\n" - "hook=3\n" - "\n" - "; Street Wars: Constructor Underworld\n" - "[Sw]\n" - "checkfile=.\\smackw32.dll\n" - "maxgameticks=30\n" - "limiter_type=4\n" "\n" "; Shadow Watch\n" - "[sw/2]\n" - "checkfile=.\\Dx.dll\n" + "[sw]\n" "adjmouse=true\n" - "maxgameticks=30\n" - "hook_peekmessage=true\n" "\n" "; Shadow Flare\n" "[ShadowFlare]\n" "nonexclusive=true\n" "adjmouse=true\n" - "\n" - "; Squad Leader\n" - "[SquadLeader]\n" - "maxgameticks=30\n" - "limiter_type=4\n" - "\n" - "; Soldiers At War\n" - "[SAW_Game]\n" - "maxgameticks=30\n" - "limiter_type=4\n" - "\n" - "; The Tone Rebellion\n" - "[Float]\n" - "hook_peekmessage=true\n" + "maintas=false\n" + "boxing=false\n" "\n" "; Total Annihilation (Unofficial Beta Patch v3.9.02)\n" "[TotalA]\n" @@ -1784,50 +990,16 @@ static void cfg_create_ini() "lock_surfaces=true\n" "singlecpu=false\n" "\n" - "; Virtual Springfield\n" - "[VIRTUAL]\n" - "game_handles_close=true\n" - "\n" "; Total Annihilation: Kingdoms\n" "[Kingdoms]\n" "game_handles_close=true\n" "max_resolutions=32\n" "\n" - "; The Missing on Lost Island\n" - "[Island]\n" - "lock_mouse_top_left=true\n" - "fixchilds=3\n" - "\n" - "; The X-Files DVD\n" - "[XFiles]\n" - "windowed=true\n" - "fullscreen=true\n" - "toggle_borderless=true\n" - "\n" - "; The Learning Company Launcher\n" - "[TLCLauncher]\n" - "tlc_hack=true\n" - "adjmouse=false\n" - "width=0\n" - "height=0\n" - "resizable=false\n" - "maintas=false\n" - "boxing=false\n" - "\n" - "; The Jungle Book Groove Party\n" - "[Jungle_vr]\n" - "fix_not_responding=true\n" - "\n" "; Three Kingdoms: Fate of the Dragon\n" "[sanguo]\n" "maxgameticks=60\n" "noactivateapp=true\n" - "limiter_type=2\n" - "\n" - "; Thomas & Friends - The Great Festival Adventure\n" - "[Thomas]\n" - "no_compat_warning=true\n" - "noactivateapp=true\n" + "limit_bltfast=true\n" "\n" "; RollerCoaster Tycoon\n" "[rct]\n" @@ -1856,13 +1028,6 @@ static void cfg_create_ini() "[Tzar]\n" "adjmouse=true\n" "\n" - "; Unreal\n" - "[Unreal]\n" - "adjmouse=false\n" - "lock_mouse_top_left=true\n" - "center_cursor_fix=true\n" - "noactivateapp=true\n" - "\n" "; Uprising\n" "[uprising]\n" "adjmouse=true\n" @@ -1875,72 +1040,33 @@ static void cfg_create_ini() "; Vermeer\n" "[vermeer]\n" "adjmouse=true\n" - "fake_mode=640x480x32\n" - "\n" - "; Virtua Fighter 2\n" - "[VF2]\n" - "fake_mode=640x480x8\n" - "\n" - "; Virtual On: Cyber Troopers\n" - "[V_ON]\n" - "devmode=true\n" - "windowed=true\n" - "fullscreen=true\n" - "toggle_borderless=true\n" - "\n" - "; Wall Street Trader 2000 - NOT WORKING YET\n" - "[WSTrader]\n" - "nonexclusive=false\n" - "windowed=false\n" - "\n" - "; WarCraft 2000: Nuclear Epidemic\n" - "[war2000]\n" - "resolutions=2\n" - "guard_lines=600\n" - "minfps=-2\n" - "\n" - "; Warhammer 40000: Chaos Gate\n" - "[WH40K]\n" - "maxgameticks=250\n" + "vermeer_hack=true\n" "\n" "; Wizardry 8\n" "[Wiz8]\n" - "sirtech_hack=true\n" - "fix_alt_key_stuck=true\n" + "fixmousehook=true\n" + "noactivateapp=true\n" + "releasealt=true\n" "\n" "; Worms 2\n" "[worms2]\n" - "vhack=true\n" - "flipclear=true\n" "game_handles_close=true\n" - "center_cursor_fix=true\n" "\n" "; Worms Armageddon\n" "[WA]\n" - "lock_mouse_top_left=true\n" - "\n" - "; Wheel Of Fortune\n" - "[WHEEL]\n" - "singlecpu=false\n" + "adjmouse=true\n" + "width=0\n" + "height=0\n" + "resizable=false\n" "\n" "; War Wind\n" "[WW]\n" "minfps=-1\n" "\n" - "; Jeff Wayne's 'The War Of The Worlds'\n" - "[WoW]\n" - "minfps=-1\n" - "\n" "; Zeus and Poseidon\n" "[Zeus]\n" "adjmouse=true\n" "\n" - "; Zork Nemesis\n" - "[znemesis]\n" - "fix_not_responding=true\n" - "maxgameticks=60\n" - "limiter_type=4\n" - "\n" , fh); fclose(fh); @@ -1949,6 +1075,8 @@ static void cfg_create_ini() static void cfg_init() { + g_config.is_wine = real_GetProcAddress(GetModuleHandleA("ntdll.dll"), "wine_get_version") != 0; + /* get process filename and directory */ if (GetModuleFileNameA(NULL, g_config.game_path, sizeof(g_config.game_path) - 1) > 0) { @@ -2017,49 +1145,39 @@ static void cfg_init() } ini_create(&g_config.ini, g_config.ini_path); - cfg_get_game_section(g_config.game_section, sizeof(g_config.game_section)); - - TRACE("filename = %s\n", g_config.process_file_name); - TRACE("section = %s\n", g_config.game_section[0] ? g_config.game_section : "ddraw"); } -static DWORD cfg_get_game_section(LPSTR buf, DWORD size) +static DWORD cfg_get_string(LPCSTR key, LPCSTR default_value, LPSTR out_string, DWORD out_size) { - if (!buf || size == 0) - return 0; + char buf[MAX_PATH] = { 0 }; - char tmp[MAX_PATH] = { 0 }; - - if (IsWine()) + if (g_config.is_wine) { char section[MAX_PATH] = { 0 }; _snprintf(section, sizeof(section) - 1, "%s/wine", g_config.process_file_name); if (ini_section_exists(&g_config.ini, section)) { - strncpy(buf, section, size); - buf[size - 1] = 0; - return strlen(buf); + DWORD x = ini_get_string(&g_config.ini, section, key, "", out_string, out_size); + + if (x > 0) + return x; + + return ini_get_string(&g_config.ini, "ddraw", key, default_value, out_string, out_size); } } - if (ini_section_exists(&g_config.ini, g_config.process_file_name)) + DWORD s = ini_get_string(&g_config.ini, g_config.process_file_name, key, "", out_string, out_size); + + if (s > 0) { - if (ini_get_string(&g_config.ini, g_config.process_file_name, "checkfile", "", tmp, sizeof(tmp)) > 0) + if (ini_get_string(&g_config.ini, g_config.process_file_name, "checkfile", "", buf, sizeof(buf)) > 0) { - if (FILE_EXISTS(tmp)) - { - strncpy(buf, g_config.process_file_name, size); - buf[size - 1] = 0; - return strlen(buf); - } + if (FILE_EXISTS(buf)) + return s; } else - { - strncpy(buf, g_config.process_file_name, size); - buf[size - 1] = 0; - return strlen(buf); - } + return s; } for (int i = 2; i < 10; i++) @@ -2067,36 +1185,19 @@ static DWORD cfg_get_game_section(LPSTR buf, DWORD size) char section[MAX_PATH] = { 0 }; _snprintf(section, sizeof(section) - 1, "%s/%d", g_config.process_file_name, i); - if (ini_section_exists(&g_config.ini, section)) + DWORD s = ini_get_string(&g_config.ini, section, key, "", out_string, out_size); + + if (s > 0) { - if (ini_get_string(&g_config.ini, section, "checkfile", "", tmp, sizeof(tmp)) > 0) + if (ini_get_string(&g_config.ini, section, "checkfile", "", buf, sizeof(buf)) > 0) { - if (FILE_EXISTS(tmp)) - { - strncpy(buf, section, size); - buf[size - 1] = 0; - return strlen(buf); - } + if (FILE_EXISTS(buf)) + return s; } } } - buf[0] = 0; - - return 0; -} - -static DWORD cfg_get_string(LPCSTR key, LPCSTR default_value, LPSTR buf, DWORD size) -{ - if (g_config.game_section[0]) - { - DWORD s = ini_get_string(&g_config.ini, g_config.game_section, key, "", buf, size); - - if (s > 0) - return s; - } - - return ini_get_string(&g_config.ini, "ddraw", key, default_value, buf, size); + return ini_get_string(&g_config.ini, "ddraw", key, default_value, out_string, out_size); } static BOOL cfg_get_bool(LPCSTR key, BOOL default_value) diff --git a/src/crc32.c b/src/crc32.c index e7ff75d..826842f 100644 --- a/src/crc32.c +++ b/src/crc32.c @@ -77,29 +77,6 @@ unsigned long Crc32_ComputeBuf( unsigned long inCrc32, const void *buf, return( crc32 ^ 0xFFFFFFFF ); } -unsigned long Crc32_FromFile(unsigned long crc32, char* filename) -{ - if (!filename) - return 0; - - FILE* fp = fopen(filename, "rb"); - if (!fp) - return 0; - - char buf[1024]; - for (size_t s = 0; (s = fread(buf, 1, sizeof(buf), fp)) && !ferror(fp);) - { - crc32 = Crc32_ComputeBuf(crc32, buf, s); - } - - if (ferror(fp)) - crc32 = 0; - - fclose(fp); - - return crc32; -} - /*----------------------------------------------------------------------------*\ * END OF MODULE: crc32.c \*----------------------------------------------------------------------------*/ diff --git a/src/dd.c b/src/dd.c index b9e5b12..2f1af1d 100644 --- a/src/dd.c +++ b/src/dd.c @@ -6,7 +6,6 @@ #include "hook.h" #include "config.h" #include "mouse.h" -#include "keyboard.h" #include "wndproc.h" #include "render_d3d9.h" #include "render_gdi.h" @@ -15,10 +14,10 @@ #include "debug.h" #include "utils.h" #include "blt.h" -#include "versionhelpers.h" +#include "dllmain.h" -CNCDDRAW g_ddraw; +CNCDDRAW* g_ddraw = NULL; HRESULT dd_EnumDisplayModes( DWORD dwFlags, @@ -28,7 +27,6 @@ HRESULT dd_EnumDisplayModes( { dbg_dump_edm_flags(dwFlags); - DDSURFACEDESC2 s = { 0 }; DWORD bpp_filter = 0; if (lpDDSurfaceDesc) @@ -48,48 +46,12 @@ HRESULT dd_EnumDisplayModes( bpp_filter = lpDDSurfaceDesc->ddpfPixelFormat.dwRGBBitCount; break; } - - if ((lpDDSurfaceDesc->dwFlags & DDSD_WIDTH) && (lpDDSurfaceDesc->dwFlags & DDSD_HEIGHT)) - { - TRACE(" dwWidth=%u, dwHeight=%u\n", lpDDSurfaceDesc->dwWidth, lpDDSurfaceDesc->dwHeight); - - s.dwSize = sizeof(DDSURFACEDESC); - s.dwFlags = DDSD_HEIGHT | DDSD_REFRESHRATE | DDSD_WIDTH | DDSD_PITCH | DDSD_PIXELFORMAT; - s.dwRefreshRate = 60; - s.dwHeight = lpDDSurfaceDesc->dwHeight; - s.dwWidth = lpDDSurfaceDesc->dwWidth; - - s.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); - s.ddpfPixelFormat.dwFlags = DDPF_PALETTEINDEXED8 | DDPF_RGB; - s.ddpfPixelFormat.dwRGBBitCount = 8; - - if (lpDDSurfaceDesc->ddpfPixelFormat.dwRGBBitCount == 16) - { - s.ddpfPixelFormat.dwFlags = DDPF_RGB; - s.ddpfPixelFormat.dwRGBBitCount = 16; - s.ddpfPixelFormat.dwRBitMask = 0xF800; - s.ddpfPixelFormat.dwGBitMask = 0x07E0; - s.ddpfPixelFormat.dwBBitMask = 0x001F; - } - else if (lpDDSurfaceDesc->ddpfPixelFormat.dwRGBBitCount == 32) - { - s.ddpfPixelFormat.dwFlags = DDPF_RGB; - s.ddpfPixelFormat.dwRGBBitCount = 32; - s.ddpfPixelFormat.dwRBitMask = 0xFF0000; - s.ddpfPixelFormat.dwGBitMask = 0x00FF00; - s.ddpfPixelFormat.dwBBitMask = 0x0000FF; - } - - s.lPitch = ((s.dwWidth * s.ddpfPixelFormat.dwRGBBitCount + 63) & ~63) >> 3; - - lpEnumModesCallback((LPDDSURFACEDESC)&s, lpContext); - return DD_OK; - } } } DWORD i = 0; DWORD res_count = 0; + DDSURFACEDESC2 s; /* Some games crash when you feed them with too many resolutions so we have to keep the list short */ @@ -100,12 +62,10 @@ HRESULT dd_EnumDisplayModes( memset(®_m, 0, sizeof(DEVMODE)); reg_m.dmSize = sizeof(DEVMODE); - if (real_EnumDisplaySettingsA(NULL, ENUM_REGISTRY_SETTINGS, ®_m)) + if (EnumDisplaySettings(NULL, ENUM_REGISTRY_SETTINGS, ®_m)) { max_w = reg_m.dmPelsWidth; max_h = reg_m.dmPelsHeight; - - TRACE(" max_w=%u, max_h=%u\n", reg_m.dmPelsWidth, reg_m.dmPelsHeight); } if (g_config.stronghold_hack && max_w && (max_w % 8)) @@ -113,11 +73,6 @@ HRESULT dd_EnumDisplayModes( while (--max_w % 8); } - char* ires = &g_config.inject_resolution[0]; - - unsigned long custom_width = strtoul(ires, &ires, 0); - unsigned long custom_height = strtoul(ires + 1, &ires, 0); - BOOL rlf = g_config.resolutions == RESLIST_FULL; BOOL rlm = g_config.resolutions == RESLIST_MINI; @@ -154,7 +109,7 @@ HRESULT dd_EnumDisplayModes( { rlf ? 1720 : 0, rlf ? 720 : 0 }, { rlf ? 2560 : 0, rlf ? 1080 : 0 }, /* Inject custom resolution */ - { custom_width, custom_height }, + { g_config.custom_width, g_config.custom_height }, { max_w, max_h }, }; @@ -167,10 +122,9 @@ HRESULT dd_EnumDisplayModes( } } - if (((g_ddraw.bpp && !g_ddraw.windowed_hack) && g_config.resolutions == RESLIST_NORMAL) || - g_config.resolutions == RESLIST_FULL) + if ((g_ddraw->bpp && g_config.resolutions == RESLIST_NORMAL) || g_config.resolutions == RESLIST_FULL) { - TRACE(" g_ddraw.bpp=%u\n", g_ddraw.bpp); + TRACE(" g_ddraw->bpp=%u\n", g_ddraw->bpp); /* set up some filters to keep the list short */ DWORD refresh_rate = 0; @@ -182,7 +136,7 @@ HRESULT dd_EnumDisplayModes( memset(&m, 0, sizeof(DEVMODE)); m.dmSize = sizeof(DEVMODE); - while (real_EnumDisplaySettingsA(NULL, i, &m)) + while (EnumDisplaySettings(NULL, i, &m)) { TRACE_EXT( " %u: %ux%u@%u %u bpp | flags=0x%08X, FO=%u\n", @@ -221,7 +175,7 @@ HRESULT dd_EnumDisplayModes( BOOL custom_res_injected = FALSE; - while (real_EnumDisplaySettingsA(NULL, i, &m)) + while (EnumDisplaySettings(NULL, i, &m)) { if (refresh_rate == m.dmDisplayFrequency && bpp == m.dmBitsPerPel && @@ -233,10 +187,10 @@ HRESULT dd_EnumDisplayModes( while (--m.dmPelsWidth % 8); } - if (!custom_res_injected && custom_width && custom_height) + if (!custom_res_injected && g_config.custom_width && g_config.custom_height) { - m.dmPelsWidth = custom_width; - m.dmPelsHeight = custom_height; + m.dmPelsWidth = g_config.custom_width; + m.dmPelsHeight = g_config.custom_height; custom_res_injected = TRUE; } @@ -263,7 +217,7 @@ HRESULT dd_EnumDisplayModes( if (s.ddpfPixelFormat.dwRGBBitCount == bpp_filter || !bpp_filter) { - if (g_ddraw.bpp == 8 || g_config.resolutions == RESLIST_FULL) + if (g_ddraw->bpp == 8 || g_config.resolutions == RESLIST_FULL) { if (g_config.max_resolutions && res_count++ >= g_config.max_resolutions) { @@ -288,7 +242,7 @@ HRESULT dd_EnumDisplayModes( if (s.ddpfPixelFormat.dwRGBBitCount == bpp_filter || !bpp_filter) { - if (g_ddraw.bpp == 16 || g_config.resolutions == RESLIST_FULL) + if (g_ddraw->bpp == 16 || g_config.resolutions == RESLIST_FULL) { if (g_config.max_resolutions && res_count++ >= g_config.max_resolutions) { @@ -313,7 +267,7 @@ HRESULT dd_EnumDisplayModes( if (s.ddpfPixelFormat.dwRGBBitCount == bpp_filter || !bpp_filter) { - if (g_ddraw.bpp == 32 || g_config.resolutions == RESLIST_FULL) + if (g_ddraw->bpp == 32 || g_config.resolutions == RESLIST_FULL) { if (g_config.max_resolutions && res_count++ >= g_config.max_resolutions) { @@ -345,14 +299,14 @@ HRESULT dd_EnumDisplayModes( } } - if (!g_ddraw.bpp || g_config.resolutions != RESLIST_NORMAL || g_ddraw.windowed_hack) + if (!g_ddraw->bpp || g_config.resolutions != RESLIST_NORMAL) { for (i = 0; i < sizeof(resolutions) / sizeof(resolutions[0]); i++) { if (!resolutions[i].cx || !resolutions[i].cy) continue; - if (!(resolutions[i].cx == custom_width && resolutions[i].cy == custom_height) && + if (!(resolutions[i].cx == g_config.custom_width && resolutions[i].cy == g_config.custom_height) && ((max_w && resolutions[i].cx > max_w) || (max_h && resolutions[i].cy > max_h))) { DEVMODE m; @@ -364,10 +318,7 @@ HRESULT dd_EnumDisplayModes( m.dmPelsHeight = resolutions[i].cy; if (ChangeDisplaySettings(&m, CDS_TEST) != DISP_CHANGE_SUCCESSFUL) - { - TRACE(" SKIPPED: %ux%u\n", m.dmPelsWidth, m.dmPelsHeight); continue; - } } memset(&s, 0, sizeof(s)); @@ -492,18 +443,7 @@ HRESULT dd_GetCaps(LPDDCAPS_DX1 lpDDDriverCaps, LPDDCAPS_DX1 lpDDEmulCaps) lpDDDriverCaps->dwVidMemTotal = 16777216; lpDDDriverCaps->dwVidMemFree = 16777216; - - lpDDDriverCaps->ddsCaps.dwCaps = - DDSCAPS_BACKBUFFER | - DDSCAPS_COMPLEX | - DDSCAPS_FLIP | - DDSCAPS_FRONTBUFFER | - DDSCAPS_OFFSCREENPLAIN | - DDSCAPS_PRIMARYSURFACE | - DDSCAPS_VIDEOMEMORY | - DDSCAPS_OWNDC | - DDSCAPS_LOCALVIDMEM | - DDSCAPS_NONLOCALVIDMEM; + lpDDDriverCaps->ddsCaps.dwCaps = DDSCAPS_FLIP; } if (lpDDEmulCaps) @@ -518,7 +458,6 @@ HRESULT dd_GetCaps(LPDDCAPS_DX1 lpDDDriverCaps, LPDDCAPS_DX1 lpDDEmulCaps) memset(lpDDEmulCaps, 0, size); lpDDEmulCaps->dwSize = size; - lpDDEmulCaps->dwCaps = DDCAPS_BLTSTRETCH; } return DD_OK; @@ -532,56 +471,41 @@ HRESULT dd_GetDisplayMode(LPDDSURFACEDESC lpDDSurfaceDesc) memset(lpDDSurfaceDesc, 0, size); - unsigned long width = 1024; - unsigned long height = 768; - unsigned long bpp = 16; - - if (g_ddraw.width) - { - width = g_ddraw.width; - height = g_ddraw.height; - bpp = g_ddraw.bpp; - } - else if (g_config.fake_mode[0]) - { - char* e = &g_config.fake_mode[0]; - - width = strtoul(e, &e, 0); - height = strtoul(e + 1, &e, 0); - bpp = strtoul(e + 1, &e, 0); - } - lpDDSurfaceDesc->ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); - lpDDSurfaceDesc->ddpfPixelFormat.dwRGBBitCount = bpp; + lpDDSurfaceDesc->ddpfPixelFormat.dwFlags = DDPF_PALETTEINDEXED8 | DDPF_RGB; + lpDDSurfaceDesc->ddpfPixelFormat.dwRGBBitCount = 8; lpDDSurfaceDesc->dwSize = size; lpDDSurfaceDesc->dwFlags = DDSD_HEIGHT | DDSD_REFRESHRATE | DDSD_WIDTH | DDSD_PITCH | DDSD_PIXELFORMAT; lpDDSurfaceDesc->dwRefreshRate = 60; - lpDDSurfaceDesc->dwWidth = width; - lpDDSurfaceDesc->dwHeight = height; + lpDDSurfaceDesc->dwHeight = g_ddraw->height ? g_ddraw->height : 768; + lpDDSurfaceDesc->dwWidth = g_ddraw->width ? g_ddraw->width : 1024; - if (bpp == 32 || bpp == 24) + lpDDSurfaceDesc->lPitch = + ((lpDDSurfaceDesc->dwWidth * lpDDSurfaceDesc->ddpfPixelFormat.dwRGBBitCount + 63) & ~63) >> 3; + + if (g_ddraw->bpp == 32 || g_config.vermeer_hack) { lpDDSurfaceDesc->ddpfPixelFormat.dwFlags = DDPF_RGB; + lpDDSurfaceDesc->ddpfPixelFormat.dwRGBBitCount = 32; lpDDSurfaceDesc->ddpfPixelFormat.dwRBitMask = 0xFF0000; lpDDSurfaceDesc->ddpfPixelFormat.dwGBitMask = 0x00FF00; lpDDSurfaceDesc->ddpfPixelFormat.dwBBitMask = 0x0000FF; + + lpDDSurfaceDesc->lPitch = + ((lpDDSurfaceDesc->dwWidth * lpDDSurfaceDesc->ddpfPixelFormat.dwRGBBitCount + 63) & ~63) >> 3; } - else if (bpp == 8) - { - lpDDSurfaceDesc->ddpfPixelFormat.dwFlags = DDPF_PALETTEINDEXED8 | DDPF_RGB; - } - else + else if (g_ddraw->bpp != 8) { lpDDSurfaceDesc->ddpfPixelFormat.dwFlags = DDPF_RGB; lpDDSurfaceDesc->ddpfPixelFormat.dwRGBBitCount = 16; lpDDSurfaceDesc->ddpfPixelFormat.dwRBitMask = 0xF800; lpDDSurfaceDesc->ddpfPixelFormat.dwGBitMask = 0x07E0; lpDDSurfaceDesc->ddpfPixelFormat.dwBBitMask = 0x001F; - } - lpDDSurfaceDesc->lPitch = - ((lpDDSurfaceDesc->dwWidth * lpDDSurfaceDesc->ddpfPixelFormat.dwRGBBitCount + 63) & ~63) >> 3; + lpDDSurfaceDesc->lPitch = + ((lpDDSurfaceDesc->dwWidth * lpDDSurfaceDesc->ddpfPixelFormat.dwRGBBitCount + 63) & ~63) >> 3; + } } return DD_OK; @@ -595,50 +519,30 @@ HRESULT dd_GetMonitorFrequency(LPDWORD lpdwFreq) return DD_OK; } -HRESULT dd_GetVerticalBlankStatus(LPBOOL lpbIsInVB) -{ - if (!lpbIsInVB) - return DDERR_INVALIDPARAMS; - - static DWORD last_vb; - DWORD tick = GetTickCount(); - - if (last_vb + 16 > tick) - { - *lpbIsInVB = FALSE; - } - else - { - last_vb = tick; - *lpbIsInVB = TRUE; - } - - TRACE(" lpbIsInVB = %s\n", *lpbIsInVB ? "TRUE" : "FALSE"); - - return DD_OK; -} - HRESULT dd_RestoreDisplayMode() { - if (!g_ddraw.render.run) + if (!g_ddraw->render.run) { return DD_OK; } - EnterCriticalSection(&g_ddraw.cs); - g_ddraw.render.run = FALSE; - ReleaseSemaphore(g_ddraw.render.sem, 1, NULL); - LeaveCriticalSection(&g_ddraw.cs); - - if (g_ddraw.render.thread) + if (g_ddraw->renderer != gdi_render_main) { - WaitForSingleObject(g_ddraw.render.thread, INFINITE); - g_ddraw.render.thread = NULL; + EnterCriticalSection(&g_ddraw->cs); + g_ddraw->render.run = FALSE; + ReleaseSemaphore(g_ddraw->render.sem, 1, NULL); + LeaveCriticalSection(&g_ddraw->cs); + + if (g_ddraw->render.thread) + { + WaitForSingleObject(g_ddraw->render.thread, INFINITE); + g_ddraw->render.thread = NULL; + } } if (!g_config.windowed) { - if (g_ddraw.renderer == d3d9_render_main && !g_config.nonexclusive) + if (g_ddraw->renderer == d3d9_render_main && !g_config.nonexclusive) { if (!d3d9_reset(TRUE)) d3d9_release(); @@ -649,252 +553,207 @@ HRESULT dd_RestoreDisplayMode() } } - //real_ShowWindow(g_ddraw.hwnd, SW_MINIMIZE); - return DD_OK; } HRESULT dd_SetDisplayMode(DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwFlags) { - if (!dwWidth) - dwWidth = g_ddraw.width ? g_ddraw.width : 800; - - if (!dwHeight) - dwHeight = g_ddraw.height ? g_ddraw.height : 600; - - if (!dwBPP) - dwBPP = g_ddraw.bpp ? g_ddraw.bpp : 16; - if (dwBPP != 8 && dwBPP != 16 && dwBPP != 32) return DDERR_INVALIDMODE; if (g_config.mgs_hack && dwHeight == 480) dwHeight -= 32; /* Remove black bar in Metal Gear Solid */ - if (g_ddraw.render.thread) + if (g_ddraw->render.thread) { - EnterCriticalSection(&g_ddraw.cs); - g_ddraw.render.run = FALSE; - ReleaseSemaphore(g_ddraw.render.sem, 1, NULL); - LeaveCriticalSection(&g_ddraw.cs); + EnterCriticalSection(&g_ddraw->cs); + g_ddraw->render.run = FALSE; + ReleaseSemaphore(g_ddraw->render.sem, 1, NULL); + LeaveCriticalSection(&g_ddraw->cs); - WaitForSingleObject(g_ddraw.render.thread, INFINITE); - g_ddraw.render.thread = NULL; + WaitForSingleObject(g_ddraw->render.thread, INFINITE); + g_ddraw->render.thread = NULL; } - if (!g_ddraw.mode.dmPelsWidth) + if (!g_ddraw->mode.dmPelsWidth) { ChangeDisplaySettings(NULL, 0); - g_ddraw.mode.dmSize = sizeof(DEVMODE); - g_ddraw.mode.dmDriverExtra = 0; + g_ddraw->mode.dmSize = sizeof(DEVMODE); + g_ddraw->mode.dmDriverExtra = 0; - if (real_EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &g_ddraw.mode) == FALSE) + if (EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &g_ddraw->mode) == FALSE) { - g_ddraw.mode.dmSize = sizeof(DEVMODE); - g_ddraw.mode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFREQUENCY; - g_ddraw.mode.dmPelsWidth = real_GetSystemMetrics(SM_CXSCREEN); - g_ddraw.mode.dmPelsHeight = real_GetSystemMetrics(SM_CYSCREEN); - g_ddraw.mode.dmDisplayFrequency = 60; - g_ddraw.mode.dmBitsPerPel = 32; + g_ddraw->mode.dmSize = sizeof(DEVMODE); + g_ddraw->mode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFREQUENCY; + g_ddraw->mode.dmPelsWidth = real_GetSystemMetrics(SM_CXSCREEN); + g_ddraw->mode.dmPelsHeight = real_GetSystemMetrics(SM_CYSCREEN); + g_ddraw->mode.dmDisplayFrequency = 60; + g_ddraw->mode.dmBitsPerPel = 32; - if (!g_ddraw.mode.dmPelsWidth || !g_ddraw.mode.dmPelsHeight) + if (!g_ddraw->mode.dmPelsWidth || !g_ddraw->mode.dmPelsHeight) { g_config.fullscreen = FALSE; } } } - BOOL zooming = g_ddraw.zoom.enabled; - g_ddraw.zoom.enabled = FALSE; - - g_ddraw.render.width = g_config.window_rect.right; - g_ddraw.render.height = g_config.window_rect.bottom; + g_ddraw->render.width = g_config.window_rect.right; + g_ddraw->render.height = g_config.window_rect.bottom; /* temporary fix: center window for games that keep changing their resolution */ - if (g_config.center_window && - (g_ddraw.width || g_config.infantryhack || g_config.center_window == CENTER_WINDOW_ALWAYS) && - (g_ddraw.width != dwWidth || g_ddraw.height != dwHeight) && - ( - dwWidth > g_config.window_rect.right || - dwHeight > g_config.window_rect.bottom || - g_config.center_window == CENTER_WINDOW_ALWAYS) - ) + if ((g_ddraw->width || g_config.infantryhack) && + (g_ddraw->width != dwWidth || g_ddraw->height != dwHeight) && + (dwWidth > g_config.window_rect.right || dwHeight > g_config.window_rect.bottom)) { g_config.window_rect.left = -32000; g_config.window_rect.top = -32000; } - g_ddraw.width = dwWidth; - g_ddraw.height = dwHeight; - g_ddraw.bpp = dwBPP; + g_ddraw->width = dwWidth; + g_ddraw->height = dwHeight; + g_ddraw->bpp = dwBPP; - InterlockedExchange((LONG*)&g_ddraw.cursor.x, dwWidth / 2); - InterlockedExchange((LONG*)&g_ddraw.cursor.y, dwHeight / 2); + InterlockedExchange((LONG*)&g_ddraw->cursor.x, dwWidth / 2); + InterlockedExchange((LONG*)&g_ddraw->cursor.y, dwHeight / 2); BOOL border = g_config.border; BOOL nonexclusive = FALSE; if (g_config.fullscreen) { - g_ddraw.render.width = g_ddraw.mode.dmPelsWidth; - g_ddraw.render.height = g_ddraw.mode.dmPelsHeight; + g_ddraw->render.width = g_ddraw->mode.dmPelsWidth; + g_ddraw->render.height = g_ddraw->mode.dmPelsHeight; if (g_config.windowed) /* windowed-fullscreen aka borderless */ { border = FALSE; - if (!g_config.remove_menu && GetMenu(g_ddraw.hwnd)) - { - g_ddraw.render.height -= real_GetSystemMetrics(SM_CYMENU); - } - /* prevent OpenGL from going automatically into fullscreen exclusive mode */ - if (g_ddraw.renderer == ogl_render_main) + if (g_ddraw->renderer == ogl_render_main) nonexclusive = TRUE; } } - else if (zooming) + + if (g_ddraw->render.width < g_ddraw->width) { - if (g_ddraw.width > g_ddraw.mode.dmPelsWidth || - g_ddraw.height > g_ddraw.mode.dmPelsHeight) - { - /* Downscaling requires adjmouse to be enabled */ - g_config.adjmouse = TRUE; - } - - /* Do not change display resolution when zooming */ - g_ddraw.render.width = g_ddraw.render.mode.dmPelsWidth; - g_ddraw.render.height = g_ddraw.render.mode.dmPelsHeight; - - /* Resize and alt+enter are not supported yet with zooming */ - g_config.resizable = FALSE; - g_config.hotkeys.toggle_fullscreen = 0; + g_ddraw->render.width = g_ddraw->width; } - if (!zooming || g_config.fullscreen) + if (g_ddraw->render.height < g_ddraw->height) { - if (g_ddraw.render.width < g_ddraw.width) - { - g_ddraw.render.width = g_ddraw.width; - } - - if (g_ddraw.render.height < g_ddraw.height) - { - g_ddraw.render.height = g_ddraw.height; - } + g_ddraw->render.height = g_ddraw->height; } - g_ddraw.render.run = TRUE; + g_ddraw->render.run = TRUE; BOOL lock_mouse = g_mouse_locked; mouse_unlock(); - memset(&g_ddraw.render.mode, 0, sizeof(DEVMODE)); - g_ddraw.render.mode.dmSize = sizeof(DEVMODE); + memset(&g_ddraw->render.mode, 0, sizeof(DEVMODE)); + g_ddraw->render.mode.dmSize = sizeof(DEVMODE); - g_ddraw.render.mode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; - g_ddraw.render.mode.dmPelsWidth = g_ddraw.render.width; - g_ddraw.render.mode.dmPelsHeight = g_ddraw.render.height; + g_ddraw->render.mode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; + g_ddraw->render.mode.dmPelsWidth = g_ddraw->render.width; + g_ddraw->render.mode.dmPelsHeight = g_ddraw->render.height; if (g_config.refresh_rate) { - g_ddraw.render.mode.dmFields |= DM_DISPLAYFREQUENCY; - g_ddraw.render.mode.dmDisplayFrequency = g_config.refresh_rate; + g_ddraw->render.mode.dmFields |= DM_DISPLAYFREQUENCY; + g_ddraw->render.mode.dmDisplayFrequency = g_config.refresh_rate; - if (ChangeDisplaySettings(&g_ddraw.render.mode, CDS_TEST) != DISP_CHANGE_SUCCESSFUL) + if (ChangeDisplaySettings(&g_ddraw->render.mode, CDS_TEST) != DISP_CHANGE_SUCCESSFUL) { g_config.refresh_rate = 0; - g_ddraw.render.mode.dmFields &= ~DM_DISPLAYFREQUENCY; - g_ddraw.render.mode.dmDisplayFrequency = 0; + g_ddraw->render.mode.dmFields &= ~DM_DISPLAYFREQUENCY; + g_ddraw->render.mode.dmDisplayFrequency = 0; } } if (!g_config.windowed) { /* Making sure the chosen resolution is valid */ - if (ChangeDisplaySettings(&g_ddraw.render.mode, CDS_TEST) != DISP_CHANGE_SUCCESSFUL) + if (ChangeDisplaySettings(&g_ddraw->render.mode, CDS_TEST) != DISP_CHANGE_SUCCESSFUL) { /* Try without upscaling */ - g_ddraw.render.width = g_ddraw.width; - g_ddraw.render.height = g_ddraw.height; + g_ddraw->render.width = g_ddraw->width; + g_ddraw->render.height = g_ddraw->height; - g_ddraw.render.mode.dmPelsWidth = g_ddraw.render.width; - g_ddraw.render.mode.dmPelsHeight = g_ddraw.render.height; + g_ddraw->render.mode.dmPelsWidth = g_ddraw->render.width; + g_ddraw->render.mode.dmPelsHeight = g_ddraw->render.height; - if (ChangeDisplaySettings(&g_ddraw.render.mode, CDS_TEST) != DISP_CHANGE_SUCCESSFUL) + if (ChangeDisplaySettings(&g_ddraw->render.mode, CDS_TEST) != DISP_CHANGE_SUCCESSFUL) { /* Try 2x scaling */ - g_ddraw.render.width *= 2; - g_ddraw.render.height *= 2; + g_ddraw->render.width *= 2; + g_ddraw->render.height *= 2; - g_ddraw.render.mode.dmPelsWidth = g_ddraw.render.width; - g_ddraw.render.mode.dmPelsHeight = g_ddraw.render.height; + g_ddraw->render.mode.dmPelsWidth = g_ddraw->render.width; + g_ddraw->render.mode.dmPelsHeight = g_ddraw->render.height; - if ((g_ddraw.render.width > g_ddraw.mode.dmPelsWidth || - g_ddraw.render.height > g_ddraw.mode.dmPelsHeight) || - ChangeDisplaySettings(&g_ddraw.render.mode, CDS_TEST) != DISP_CHANGE_SUCCESSFUL) + if ((g_ddraw->render.width > g_ddraw->mode.dmPelsWidth || + g_ddraw->render.height > g_ddraw->mode.dmPelsHeight) || + ChangeDisplaySettings(&g_ddraw->render.mode, CDS_TEST) != DISP_CHANGE_SUCCESSFUL) { SIZE res = { 0 }; /* try to get a resolution with the same aspect ratio as the requested resolution */ BOOL found_res = util_get_lowest_resolution( - (float)g_ddraw.width / g_ddraw.height, + (float)g_ddraw->width / g_ddraw->height, &res, - g_ddraw.width + 1, /* don't return the original resolution since we tested that one already */ - g_ddraw.height, - g_ddraw.mode.dmPelsWidth, - g_ddraw.mode.dmPelsHeight); + g_ddraw->width + 1, /* don't return the original resolution since we tested that one already */ + g_ddraw->height, + g_ddraw->mode.dmPelsWidth, + g_ddraw->mode.dmPelsHeight); if (!found_res) { /* try to get a resolution with the same aspect ratio as the current display mode */ found_res = util_get_lowest_resolution( - (float)g_ddraw.mode.dmPelsWidth / g_ddraw.mode.dmPelsHeight, + (float)g_ddraw->mode.dmPelsWidth / g_ddraw->mode.dmPelsHeight, &res, - g_ddraw.width, - g_ddraw.height, - g_ddraw.mode.dmPelsWidth, - g_ddraw.mode.dmPelsHeight); + g_ddraw->width, + g_ddraw->height, + g_ddraw->mode.dmPelsWidth, + g_ddraw->mode.dmPelsHeight); } - g_ddraw.render.width = res.cx; - g_ddraw.render.height = res.cy; + g_ddraw->render.width = res.cx; + g_ddraw->render.height = res.cy; - g_ddraw.render.mode.dmPelsWidth = g_ddraw.render.width; - g_ddraw.render.mode.dmPelsHeight = g_ddraw.render.height; + g_ddraw->render.mode.dmPelsWidth = g_ddraw->render.width; + g_ddraw->render.mode.dmPelsHeight = g_ddraw->render.height; if (!found_res || - ChangeDisplaySettings(&g_ddraw.render.mode, CDS_TEST) != DISP_CHANGE_SUCCESSFUL) + ChangeDisplaySettings(&g_ddraw->render.mode, CDS_TEST) != DISP_CHANGE_SUCCESSFUL) { - if (g_ddraw.width > g_ddraw.mode.dmPelsWidth || - g_ddraw.height > g_ddraw.mode.dmPelsHeight) + if (g_ddraw->width > g_ddraw->mode.dmPelsWidth || + g_ddraw->height > g_ddraw->mode.dmPelsHeight) { /* Downscaling requires adjmouse to be enabled */ g_config.adjmouse = TRUE; } /* try current display settings */ - g_ddraw.render.width = g_ddraw.mode.dmPelsWidth; - g_ddraw.render.height = g_ddraw.mode.dmPelsHeight; + g_ddraw->render.width = g_ddraw->mode.dmPelsWidth; + g_ddraw->render.height = g_ddraw->mode.dmPelsHeight; - g_ddraw.render.mode.dmPelsWidth = g_ddraw.render.width; - g_ddraw.render.mode.dmPelsHeight = g_ddraw.render.height; + g_ddraw->render.mode.dmPelsWidth = g_ddraw->render.width; + g_ddraw->render.mode.dmPelsHeight = g_ddraw->render.height; - if (ChangeDisplaySettings(&g_ddraw.render.mode, CDS_TEST) != DISP_CHANGE_SUCCESSFUL) + if (ChangeDisplaySettings(&g_ddraw->render.mode, CDS_TEST) != DISP_CHANGE_SUCCESSFUL) { /* everything failed, use borderless mode instead */ ChangeDisplaySettings(NULL, 0); g_config.windowed = TRUE; g_config.fullscreen = TRUE; - g_config.toggle_borderless = TRUE; border = FALSE; /* prevent OpenGL from going automatically into fullscreen exclusive mode */ - if (g_ddraw.renderer == ogl_render_main) + if (g_ddraw->renderer == ogl_render_main) nonexclusive = TRUE; } @@ -907,207 +766,155 @@ HRESULT dd_SetDisplayMode(DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwFl /* Support downscaling in borderless mode */ if (g_config.windowed && g_config.fullscreen) { - if (g_ddraw.width > g_ddraw.mode.dmPelsWidth || - g_ddraw.height > g_ddraw.mode.dmPelsHeight) + if (g_ddraw->width > g_ddraw->mode.dmPelsWidth || + g_ddraw->height > g_ddraw->mode.dmPelsHeight) { /* Downscaling requires adjmouse to be enabled */ g_config.adjmouse = TRUE; - g_ddraw.render.width = g_ddraw.mode.dmPelsWidth; - g_ddraw.render.height = g_ddraw.mode.dmPelsHeight; + g_ddraw->render.width = g_ddraw->mode.dmPelsWidth; + g_ddraw->render.height = g_ddraw->mode.dmPelsHeight; - g_ddraw.render.mode.dmPelsWidth = g_ddraw.render.width; - g_ddraw.render.mode.dmPelsHeight = g_ddraw.render.height; + g_ddraw->render.mode.dmPelsWidth = g_ddraw->render.width; + g_ddraw->render.mode.dmPelsHeight = g_ddraw->render.height; } } - g_ddraw.render.viewport.width = g_ddraw.render.width; - g_ddraw.render.viewport.height = g_ddraw.render.height; - g_ddraw.render.viewport.x = 0; - g_ddraw.render.viewport.y = 0; + g_ddraw->render.viewport.width = g_ddraw->render.width; + g_ddraw->render.viewport.height = g_ddraw->render.height; + g_ddraw->render.viewport.x = 0; + g_ddraw->render.viewport.y = 0; if (g_config.boxing) { + g_ddraw->render.viewport.width = g_ddraw->width; + g_ddraw->render.viewport.height = g_ddraw->height; + for (int i = 20; i-- > 1;) { - if (g_ddraw.width * i <= g_ddraw.render.width && g_ddraw.height * i <= g_ddraw.render.height) + if (g_ddraw->width * i <= g_ddraw->render.width && g_ddraw->height * i <= g_ddraw->render.height) { - g_ddraw.render.viewport.width = i * g_ddraw.width; - g_ddraw.render.viewport.height = i * g_ddraw.height; + g_ddraw->render.viewport.width *= i; + g_ddraw->render.viewport.height *= i; break; } } - g_ddraw.render.viewport.y = g_ddraw.render.height / 2 - g_ddraw.render.viewport.height / 2; - g_ddraw.render.viewport.x = g_ddraw.render.width / 2 - g_ddraw.render.viewport.width / 2; + g_ddraw->render.viewport.y = g_ddraw->render.height / 2 - g_ddraw->render.viewport.height / 2; + g_ddraw->render.viewport.x = g_ddraw->render.width / 2 - g_ddraw->render.viewport.width / 2; } else if (g_config.maintas) { - double dst_ar; - double src_ar = (double)g_ddraw.render.height / g_ddraw.render.width;; + double dst_ar = (double)g_ddraw->height / g_ddraw->width; + double src_ar = (double)g_ddraw->render.height / g_ddraw->render.width; - if (g_config.aspect_ratio[0]) - { - char* e = &g_config.aspect_ratio[0]; - - DWORD cx = strtoul(e, &e, 0); - DWORD cy = strtoul(e + 1, &e, 0); - - dst_ar = (double)cy / cx; - } - else - { - dst_ar = (double)g_ddraw.height / g_ddraw.width; - } - - g_ddraw.render.viewport.width = g_ddraw.render.width; - g_ddraw.render.viewport.height = (int)round(dst_ar * g_ddraw.render.viewport.width); + g_ddraw->render.viewport.width = g_ddraw->render.width; + g_ddraw->render.viewport.height = (int)round(dst_ar * g_ddraw->render.viewport.width); if (src_ar < dst_ar) { - g_ddraw.render.viewport.width = - (int)round(((double)g_ddraw.render.viewport.width / g_ddraw.render.viewport.height) * g_ddraw.render.height); + g_ddraw->render.viewport.width = + (int)round(((double)g_ddraw->render.viewport.width / g_ddraw->render.viewport.height) * g_ddraw->render.height); - g_ddraw.render.viewport.height = g_ddraw.render.height; + g_ddraw->render.viewport.height = g_ddraw->render.height; } - g_ddraw.render.viewport.width = min(g_ddraw.render.viewport.width, g_ddraw.render.width); - g_ddraw.render.viewport.height = min(g_ddraw.render.viewport.height, g_ddraw.render.height); + g_ddraw->render.viewport.width = min(g_ddraw->render.viewport.width, g_ddraw->render.width); + g_ddraw->render.viewport.height = min(g_ddraw->render.viewport.height, g_ddraw->render.height); - g_ddraw.render.viewport.y = g_ddraw.render.height / 2 - g_ddraw.render.viewport.height / 2; - g_ddraw.render.viewport.x = g_ddraw.render.width / 2 - g_ddraw.render.viewport.width / 2; + g_ddraw->render.viewport.y = g_ddraw->render.height / 2 - g_ddraw->render.viewport.height / 2; + g_ddraw->render.viewport.x = g_ddraw->render.width / 2 - g_ddraw->render.viewport.width / 2; } - g_ddraw.render.scale_w = ((float)g_ddraw.render.viewport.width / g_ddraw.width); - g_ddraw.render.scale_h = ((float)g_ddraw.render.viewport.height / g_ddraw.height); - g_ddraw.render.unscale_w = ((float)g_ddraw.width / g_ddraw.render.viewport.width); - g_ddraw.render.unscale_h = ((float)g_ddraw.height / g_ddraw.render.viewport.height); + g_ddraw->render.scale_w = ((float)g_ddraw->render.viewport.width / g_ddraw->width); + g_ddraw->render.scale_h = ((float)g_ddraw->render.viewport.height / g_ddraw->height); + g_ddraw->render.unscale_w = ((float)g_ddraw->width / g_ddraw->render.viewport.width); + g_ddraw->render.unscale_h = ((float)g_ddraw->height / g_ddraw->render.viewport.height); - /* Hack for games that require the cursor to be in the exact center of the screen (Worms 2 / Atlantis) */ - if (g_config.center_cursor_fix) - { - g_ddraw.mouse.scale_x = ((float)(g_ddraw.render.viewport.width) / (g_ddraw.width)); - g_ddraw.mouse.scale_y = ((float)(g_ddraw.render.viewport.height) / (g_ddraw.height)); - g_ddraw.mouse.unscale_x = ((float)(g_ddraw.width) / (g_ddraw.render.viewport.width)); - g_ddraw.mouse.unscale_y = ((float)(g_ddraw.height) / (g_ddraw.render.viewport.height)); - } - else - { - g_ddraw.mouse.scale_x = ((float)(g_ddraw.render.viewport.width - 1) / (g_ddraw.width - 1)); - g_ddraw.mouse.scale_y = ((float)(g_ddraw.render.viewport.height - 1) / (g_ddraw.height - 1)); - g_ddraw.mouse.unscale_x = ((float)(g_ddraw.width - 1) / (g_ddraw.render.viewport.width - 1)); - g_ddraw.mouse.unscale_y = ((float)(g_ddraw.height - 1) / (g_ddraw.render.viewport.height - 1)); - } + g_ddraw->mouse.scale_x = ((float)(g_ddraw->render.viewport.width - 1) / (g_ddraw->width - 1)); + g_ddraw->mouse.scale_y = ((float)(g_ddraw->render.viewport.height - 1) / (g_ddraw->height - 1)); + g_ddraw->mouse.unscale_x = ((float)(g_ddraw->width - 1) / (g_ddraw->render.viewport.width - 1)); + g_ddraw->mouse.unscale_y = ((float)(g_ddraw->height - 1) / (g_ddraw->render.viewport.height - 1)); - g_ddraw.mouse.x_adjust = g_ddraw.render.viewport.x; - g_ddraw.mouse.y_adjust = g_ddraw.render.viewport.y; + g_ddraw->mouse.x_adjust = g_ddraw->render.viewport.x; + g_ddraw->mouse.y_adjust = g_ddraw->render.viewport.y; - if (g_config.lock_mouse_top_left) - { - g_ddraw.mouse.x_adjust = 0; - g_ddraw.mouse.y_adjust = 0; - } - - g_ddraw.mouse.rc.left = g_ddraw.mouse.x_adjust; - g_ddraw.mouse.rc.top = g_ddraw.mouse.y_adjust; - g_ddraw.mouse.rc.right = g_ddraw.width + g_ddraw.mouse.x_adjust; - g_ddraw.mouse.rc.bottom = g_ddraw.height + g_ddraw.mouse.y_adjust; + g_ddraw->mouse.rc.left = g_ddraw->mouse.x_adjust; + g_ddraw->mouse.rc.top = g_ddraw->mouse.y_adjust; + g_ddraw->mouse.rc.right = g_ddraw->width + g_ddraw->mouse.x_adjust; + g_ddraw->mouse.rc.bottom = g_ddraw->height + g_ddraw->mouse.y_adjust; if (g_config.adjmouse) { - g_ddraw.mouse.rc.right = g_ddraw.render.viewport.width + g_ddraw.mouse.x_adjust; - g_ddraw.mouse.rc.bottom = g_ddraw.render.viewport.height + g_ddraw.mouse.y_adjust; + g_ddraw->mouse.rc.right = g_ddraw->render.viewport.width + g_ddraw->mouse.x_adjust; + g_ddraw->mouse.rc.bottom = g_ddraw->render.viewport.height + g_ddraw->mouse.y_adjust; } - if (nonexclusive || (g_config.nonexclusive && !g_config.windowed && g_ddraw.renderer == ogl_render_main)) + if (nonexclusive || (g_config.nonexclusive && !g_config.windowed && g_ddraw->renderer == ogl_render_main)) { - g_ddraw.render.height++; - g_ddraw.render.opengl_y_align = 1; + g_ddraw->render.height++; + g_ddraw->render.opengl_y_align = 1; } else { - g_ddraw.render.opengl_y_align = 0; + g_ddraw->render.opengl_y_align = 0; } - //dbg_dump_wnd_styles(real_GetWindowLongA(g_ddraw.hwnd, GWL_STYLE), real_GetWindowLongA(g_ddraw.hwnd, GWL_EXSTYLE)); if (g_config.windowed) { - if (g_config.remove_menu && GetMenu(g_ddraw.hwnd)) - SetMenu(g_ddraw.hwnd, NULL); + if (g_config.remove_menu && GetMenu(g_ddraw->hwnd)) + SetMenu(g_ddraw->hwnd, NULL); - if (!g_config.fix_not_responding && - g_ddraw.last_msg_pull_tick && - g_ddraw.last_msg_pull_tick + 1000 < timeGetTime() && - GetCurrentThreadId() == g_ddraw.gui_thread_id && - !IsWine()) + if (!g_config.is_wine) { - /* workaround for "Not Responding" window problem in cnc games */ - g_ddraw.last_msg_pull_tick = timeGetTime(); - MSG msg; - real_PeekMessageA(&msg, g_ddraw.hwnd, 0, 0, PM_NOREMOVE | PM_QS_INPUT); + MSG msg; /* workaround for "Not Responding" window problem in cnc games */ + real_PeekMessageA(&msg, g_ddraw->hwnd, 0, 0, PM_NOREMOVE | PM_QS_INPUT); } if (!border) { real_SetWindowLongA( - g_ddraw.hwnd, + g_ddraw->hwnd, GWL_STYLE, real_GetWindowLongA( - g_ddraw.hwnd, - GWL_STYLE) & ~(WS_CAPTION | WS_THICKFRAME | WS_MINIMIZE | WS_MAXIMIZE | WS_SYSMENU)); + g_ddraw->hwnd, + GWL_STYLE) & ~(WS_CAPTION | WS_THICKFRAME | WS_MINIMIZE | WS_MAXIMIZE | WS_SYSMENU)); + + if (GetMenu(g_ddraw->hwnd)) + SetMenu(g_ddraw->hwnd, NULL); } else { real_SetWindowLongA( - g_ddraw.hwnd, + g_ddraw->hwnd, GWL_STYLE, - (real_GetWindowLongA(g_ddraw.hwnd, GWL_STYLE) | WS_OVERLAPPEDWINDOW) & ~(WS_MAXIMIZE)); - - DWORD class_sytle = GetClassLongA(g_ddraw.hwnd, GCL_STYLE); - if (class_sytle & CS_NOCLOSE) - { - SetClassLongA(g_ddraw.hwnd, GCL_STYLE, class_sytle & ~CS_NOCLOSE); - } + (real_GetWindowLongA(g_ddraw->hwnd, GWL_STYLE) | WS_OVERLAPPEDWINDOW) & ~WS_MAXIMIZE); } - LONG exstyle = real_GetWindowLongA(g_ddraw.hwnd, GWL_EXSTYLE); + LONG exstyle = real_GetWindowLongA(g_ddraw->hwnd, GWL_EXSTYLE); if ((exstyle & WS_EX_TOOLWINDOW)) { - real_SetWindowLongA(g_ddraw.hwnd, GWL_EXSTYLE, exstyle & ~(WS_EX_TOOLWINDOW)); + real_SetWindowLongA(g_ddraw->hwnd, GWL_EXSTYLE, exstyle & ~(WS_EX_TOOLWINDOW)); } - exstyle = real_GetWindowLongA(g_ddraw.hwnd, GWL_EXSTYLE); - - if ((exstyle & WS_EX_CLIENTEDGE)) + if (g_config.is_wine) { - real_SetWindowLongA(g_ddraw.hwnd, GWL_EXSTYLE, exstyle & ~(WS_EX_CLIENTEDGE)); - } - - if (IsWine()) - { - LONG remove_flags = !g_config.resizable ? (WS_MAXIMIZEBOX | WS_THICKFRAME) : 0; - real_SetWindowLongA( - g_ddraw.hwnd, + g_ddraw->hwnd, GWL_STYLE, - (real_GetWindowLongA(g_ddraw.hwnd, GWL_STYLE) | WS_MINIMIZEBOX) & ~(remove_flags)); + (real_GetWindowLongA(g_ddraw->hwnd, GWL_STYLE) | WS_MINIMIZEBOX) & ~(WS_MAXIMIZEBOX | WS_THICKFRAME)); } /* center the window with correct dimensions */ - int cy = g_ddraw.mode.dmPelsWidth ? g_ddraw.mode.dmPelsWidth : g_ddraw.render.width; - int cx = g_ddraw.mode.dmPelsHeight ? g_ddraw.mode.dmPelsHeight : g_ddraw.render.height; - int x = (g_config.window_rect.left != -32000) ? g_config.window_rect.left : (cy / 2) - (g_ddraw.render.width / 2); - int y = (g_config.window_rect.top != -32000) ? g_config.window_rect.top : (cx / 2) - (g_ddraw.render.height / 2); + int cy = g_ddraw->mode.dmPelsWidth ? g_ddraw->mode.dmPelsWidth : g_ddraw->render.width; + int cx = g_ddraw->mode.dmPelsHeight ? g_ddraw->mode.dmPelsHeight : g_ddraw->render.height; + int x = (g_config.window_rect.left != -32000) ? g_config.window_rect.left : (cy / 2) - (g_ddraw->render.width / 2); + int y = (g_config.window_rect.top != -32000) ? g_config.window_rect.top : (cx / 2) - (g_ddraw->render.height / 2); if (g_config.fullscreen) { x = y = 0; - - if (GetMenu(g_ddraw.hwnd)) - { - y = real_GetSystemMetrics(SM_CYMENU); - } } else if (border && g_config.window_rect.top == -32000 && y < 0) { @@ -1115,69 +922,51 @@ HRESULT dd_SetDisplayMode(DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwFl y = real_GetSystemMetrics(SM_CYCAPTION) + real_GetSystemMetrics(SM_CYSIZEFRAME); } - if (util_is_minimized(g_ddraw.hwnd)) - real_ShowWindow(g_ddraw.hwnd, SW_RESTORE); + if (util_is_minimized(g_ddraw->hwnd)) + real_ShowWindow(g_ddraw->hwnd, SW_RESTORE); - RECT dst = { x, y, g_ddraw.render.width + x, g_ddraw.render.height + y }; + RECT dst = { x, y, g_ddraw->render.width + x, g_ddraw->render.height + y }; - LONG style = real_GetWindowLongA(g_ddraw.hwnd, GWL_STYLE); - exstyle = real_GetWindowLongA(g_ddraw.hwnd, GWL_EXSTYLE); + LONG style = real_GetWindowLongA(g_ddraw->hwnd, GWL_STYLE); + exstyle = real_GetWindowLongA(g_ddraw->hwnd, GWL_EXSTYLE); - AdjustWindowRectEx(&dst, style, GetMenu(g_ddraw.hwnd) != NULL, exstyle); - - real_SetWindowPos( - g_ddraw.hwnd, - HWND_NOTOPMOST, - dst.left, - dst.top, - (dst.right - dst.left), - (dst.bottom - dst.top), - SWP_SHOWWINDOW | SWP_FRAMECHANGED); + AdjustWindowRectEx(&dst, style, GetMenu(g_ddraw->hwnd) != NULL, exstyle); + if (!(dwFlags & 8)) + { + real_SetWindowPos( + g_ddraw->hwnd, + HWND_NOTOPMOST, + dst.left, + dst.top, + (dst.right - dst.left), + (dst.bottom - dst.top), + SWP_SHOWWINDOW | SWP_FRAMECHANGED); + } BOOL d3d9_active = FALSE; - if (g_ddraw.renderer == d3d9_render_main) + if (g_ddraw->renderer == d3d9_render_main) { d3d9_active = d3d9_create(); if (!d3d9_active) { d3d9_release(); - g_ddraw.show_driver_warning = TRUE; - g_ddraw.renderer = gdi_render_main; - } - } - else if (g_ddraw.renderer == ogl_render_main) - { - if (!ogl_create()) - { - ogl_release(); - g_ddraw.show_driver_warning = TRUE; - g_ddraw.renderer = gdi_render_main; + g_ddraw->show_driver_warning = TRUE; + g_ddraw->renderer = gdi_render_main; } } - if (lock_mouse || (g_config.fullscreen && real_GetForegroundWindow() == g_ddraw.hwnd)) + if (lock_mouse || (g_config.fullscreen && real_GetForegroundWindow() == g_ddraw->hwnd)) mouse_lock(); } else { - int menu_height = 0; + if (GetMenu(g_ddraw->hwnd)) + SetMenu(g_ddraw->hwnd, NULL); - if (GetMenu(g_ddraw.hwnd)) - { - if (1) // g_config.remove_menu || !g_config.nonexclusive) - { - SetMenu(g_ddraw.hwnd, NULL); - } - else - { - menu_height = real_GetSystemMetrics(SM_CYMENU); - } - } - - LONG style = real_GetWindowLongA(g_ddraw.hwnd, GWL_STYLE); + LONG style = real_GetWindowLongA(g_ddraw->hwnd, GWL_STYLE); DWORD swp_flags = SWP_SHOWWINDOW; @@ -1186,43 +975,34 @@ HRESULT dd_SetDisplayMode(DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwFl swp_flags |= SWP_FRAMECHANGED; real_SetWindowLongA( - g_ddraw.hwnd, + g_ddraw->hwnd, GWL_STYLE, style & ~(WS_CAPTION | WS_THICKFRAME | WS_MINIMIZE | WS_MAXIMIZE | WS_SYSMENU)); } - LONG exstyle = real_GetWindowLongA(g_ddraw.hwnd, GWL_EXSTYLE); + LONG exstyle = real_GetWindowLongA(g_ddraw->hwnd, GWL_EXSTYLE); if ((exstyle & WS_EX_TOOLWINDOW)) { - real_SetWindowLongA(g_ddraw.hwnd, GWL_EXSTYLE, exstyle & ~(WS_EX_TOOLWINDOW)); - } - - exstyle = real_GetWindowLongA(g_ddraw.hwnd, GWL_EXSTYLE); - - if ((exstyle & WS_EX_CLIENTEDGE)) - { - swp_flags |= SWP_FRAMECHANGED; - - real_SetWindowLongA(g_ddraw.hwnd, GWL_EXSTYLE, exstyle & ~(WS_EX_CLIENTEDGE)); + real_SetWindowLongA(g_ddraw->hwnd, GWL_EXSTYLE, exstyle & ~(WS_EX_TOOLWINDOW)); } BOOL d3d9_active = FALSE; - if (g_ddraw.renderer == d3d9_render_main) + if (g_ddraw->renderer == d3d9_render_main) { if (g_config.nonexclusive) { - if (util_is_minimized(g_ddraw.hwnd)) - real_ShowWindow(g_ddraw.hwnd, SW_RESTORE); + if (util_is_minimized(g_ddraw->hwnd)) + real_ShowWindow(g_ddraw->hwnd, SW_RESTORE); real_SetWindowPos( - g_ddraw.hwnd, + g_ddraw->hwnd, HWND_TOPMOST, 0, 0, - g_ddraw.render.width, - g_ddraw.render.height + menu_height, + g_ddraw->render.width, + g_ddraw->render.height, swp_flags); swp_flags = SWP_SHOWWINDOW; @@ -1233,28 +1013,18 @@ HRESULT dd_SetDisplayMode(DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwFl if (!d3d9_active) { d3d9_release(); - g_ddraw.show_driver_warning = TRUE; - g_ddraw.renderer = gdi_render_main; - } - } - else if (g_ddraw.renderer == ogl_render_main) - { - if (!ogl_create()) - { - ogl_release(); - g_ddraw.show_driver_warning = TRUE; - g_ddraw.renderer = gdi_render_main; + g_ddraw->show_driver_warning = TRUE; + g_ddraw->renderer = gdi_render_main; } } if (!d3d9_active || g_config.nonexclusive) { - if (!zooming && ChangeDisplaySettings(&g_ddraw.render.mode, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL) + if (ChangeDisplaySettings(&g_ddraw->render.mode, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL) { - g_ddraw.render.run = FALSE; + g_ddraw->render.run = FALSE; g_config.windowed = TRUE; g_config.fullscreen = TRUE; - g_config.toggle_borderless = TRUE; return dd_SetDisplayMode(dwWidth, dwHeight, dwBPP, dwFlags); } @@ -1262,111 +1032,71 @@ HRESULT dd_SetDisplayMode(DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwFl Fix wayland bug: ChangeDisplaySettings fails silently - enable borderless mode in case display resolution was not changed */ - if (IsWine() && !IsSteamDeck() && - (g_ddraw.render.mode.dmPelsWidth != real_GetSystemMetrics(SM_CXSCREEN) || - g_ddraw.render.mode.dmPelsHeight != real_GetSystemMetrics(SM_CYSCREEN))) + if (g_config.is_wine && + (g_ddraw->render.mode.dmPelsWidth != real_GetSystemMetrics(SM_CXSCREEN) || + g_ddraw->render.mode.dmPelsHeight != real_GetSystemMetrics(SM_CYSCREEN))) { ChangeDisplaySettings(NULL, 0); - g_ddraw.render.run = FALSE; + g_ddraw->render.run = FALSE; g_config.windowed = TRUE; g_config.fullscreen = TRUE; - g_config.toggle_borderless = TRUE; return dd_SetDisplayMode(dwWidth, dwHeight, dwBPP, dwFlags); } } - if (IsWine()) + if (g_config.is_wine) { real_SetWindowLongA( - g_ddraw.hwnd, + g_ddraw->hwnd, GWL_STYLE, - real_GetWindowLongA(g_ddraw.hwnd, GWL_STYLE) | WS_MINIMIZEBOX); + real_GetWindowLongA(g_ddraw->hwnd, GWL_STYLE) | WS_MINIMIZEBOX); } - if (util_is_minimized(g_ddraw.hwnd)) - real_ShowWindow(g_ddraw.hwnd, SW_RESTORE); + if (util_is_minimized(g_ddraw->hwnd)) + real_ShowWindow(g_ddraw->hwnd, SW_RESTORE); real_SetWindowPos( - g_ddraw.hwnd, + g_ddraw->hwnd, HWND_TOPMOST, 0, 0, - g_ddraw.render.width, - g_ddraw.render.height + menu_height, + g_ddraw->render.width, + g_ddraw->render.height, swp_flags); if (d3d9_active && g_config.nonexclusive) d3d9_reset(TRUE); - g_ddraw.last_set_window_pos_tick = timeGetTime(); + g_ddraw->last_set_window_pos_tick = timeGetTime(); mouse_lock(); } - /* Age Of Empires 2 textbox align */ - if (g_ddraw.textbox.hwnd && - g_ddraw.textbox.x && - g_ddraw.textbox.y && - IsWindow(g_ddraw.textbox.hwnd) && - GetParent(g_ddraw.textbox.hwnd) == g_ddraw.hwnd) - { - char class_name[MAX_PATH] = { 0 }; - GetClassNameA(g_ddraw.textbox.hwnd, class_name, sizeof(class_name) - 1); + RedrawWindow(g_ddraw->hwnd, NULL, NULL, RDW_ERASE | RDW_INVALIDATE); - if (_strcmpi(class_name, "Edit") == 0) - { - real_SetWindowPos( - g_ddraw.textbox.hwnd, - 0, - (int)(g_ddraw.render.viewport.x + (g_ddraw.textbox.x * g_ddraw.render.scale_w)), - (int)(g_ddraw.render.viewport.y + (g_ddraw.textbox.y * g_ddraw.render.scale_h)), - 0, - 0, - SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER - ); - } + if (g_ddraw->render.viewport.x != 0 || g_ddraw->render.viewport.y != 0) + { + InterlockedExchange(&g_ddraw->render.clear_screen, TRUE); } - RedrawWindow(g_ddraw.hwnd, NULL, NULL, RDW_ERASE | RDW_INVALIDATE); - - if (g_ddraw.render.viewport.x != 0 || g_ddraw.render.viewport.y != 0) + if (g_ddraw->render.thread == NULL) { - InterlockedExchange(&g_ddraw.render.clear_screen, TRUE); - } + InterlockedExchange(&g_ddraw->render.palette_updated, TRUE); + InterlockedExchange(&g_ddraw->render.surface_updated, TRUE); + ReleaseSemaphore(g_ddraw->render.sem, 1, NULL); - if (g_ddraw.render.thread == NULL) - { - InterlockedExchange(&g_ddraw.render.palette_updated, TRUE); - InterlockedExchange(&g_ddraw.render.surface_updated, TRUE); - ReleaseSemaphore(g_ddraw.render.sem, 1, NULL); - - DWORD tid; - g_ddraw.render.thread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)g_ddraw.renderer, NULL, 0, &tid); - SetThreadPriority(g_ddraw.render.thread, THREAD_PRIORITY_ABOVE_NORMAL); + g_ddraw->render.thread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)g_ddraw->renderer, NULL, 0, NULL); + SetThreadPriority(g_ddraw->render.thread, THREAD_PRIORITY_ABOVE_NORMAL); } if ((dwFlags & SDM_MODE_SET_BY_GAME) && !g_config.infantryhack) { - real_SendMessageA(g_ddraw.hwnd, WM_SIZE_DDRAW, 0, MAKELPARAM(g_ddraw.width, g_ddraw.height)); - real_SendMessageA(g_ddraw.hwnd, WM_DISPLAYCHANGE_DDRAW, g_ddraw.bpp, MAKELPARAM(g_ddraw.width, g_ddraw.height)); + real_SendMessageA(g_ddraw->hwnd, WM_SIZE_DDRAW, 0, MAKELPARAM(g_ddraw->width, g_ddraw->height)); + real_SendMessageA(g_ddraw->hwnd, WM_MOVE_DDRAW, 0, MAKELPARAM(0, 0)); + real_SendMessageA(g_ddraw->hwnd, WM_DISPLAYCHANGE_DDRAW, g_ddraw->bpp, MAKELPARAM(g_ddraw->width, g_ddraw->height)); } - TRACE( - " render res=%ux%u (viewport res=%ux%u, x=%d, y=%d)\n", - g_ddraw.render.width, - g_ddraw.render.height, - g_ddraw.render.viewport.width, - g_ddraw.render.viewport.height, - g_ddraw.render.viewport.x, - g_ddraw.render.viewport.y); - - TRACE( - " windowed=%s, fullscreen=%s, adjmouse=%s\n", - g_config.windowed ? "true" : "false", - g_config.fullscreen ? "true" : "false", - g_config.adjmouse ? "true" : "false"); - return DD_OK; } @@ -1374,63 +1104,57 @@ HRESULT dd_SetCooperativeLevel(HWND hwnd, DWORD dwFlags) { dbg_dump_scl_flags(dwFlags); - if (!hwnd) + if (hwnd == NULL) { - if (!g_ddraw.hwnd && g_config.fake_mode[0]) + if (dwFlags & DDSCL_NORMAL) { - EnumThreadWindows(GetCurrentThreadId(), (WNDENUMPROC)util_enum_thread_wnd_proc, 0); - hwnd = g_ddraw.hwnd; - - if (!hwnd) - return DD_OK; + hwnd = *(HWND*)0x46B4D8; } else - { return DD_OK; - } } - if (!g_ddraw.hwnd) + if (g_ddraw->hwnd == NULL) { - g_ddraw.hwnd = hwnd; + g_ddraw->hwnd = hwnd; } - if (!g_ddraw.wndproc) + if (!g_ddraw->wndproc) { - hook_init(); + hook_init(FALSE); - g_ddraw.wndproc = (WNDPROC)real_SetWindowLongA(g_ddraw.hwnd, GWL_WNDPROC, (LONG)fake_WndProc); - g_ddraw.gui_thread_id = GetWindowThreadProcessId(g_ddraw.hwnd, NULL); + g_ddraw->wndproc = (WNDPROC)real_SetWindowLongA(g_ddraw->hwnd, GWL_WNDPROC, (LONG)fake_WndProc); + g_ddraw->gui_thread_id = GetWindowThreadProcessId(g_ddraw->hwnd, NULL); - keyboard_hook_init(); - - if (!g_ddraw.render.hdc) + if (!g_ddraw->render.hdc) { - g_ddraw.render.hdc = GetDC(g_ddraw.hwnd); + g_ddraw->render.hdc = GetDC(g_ddraw->hwnd); - if (g_ddraw.renderer == ogl_render_main) - { - PIXELFORMATDESCRIPTOR pfd; - memset(&pfd, 0, sizeof(PIXELFORMATDESCRIPTOR)); - pfd.nSize = sizeof(PIXELFORMATDESCRIPTOR); + PIXELFORMATDESCRIPTOR pfd; + memset(&pfd, 0, sizeof(PIXELFORMATDESCRIPTOR)); + pfd.nSize = sizeof(PIXELFORMATDESCRIPTOR); - pfd.nVersion = 1; - pfd.dwFlags = PFD_DRAW_TO_WINDOW | PFD_DOUBLEBUFFER | PFD_SUPPORT_OPENGL; - pfd.iPixelType = PFD_TYPE_RGBA; - pfd.cColorBits = g_ddraw.mode.dmBitsPerPel; - pfd.iLayerType = PFD_MAIN_PLANE; + pfd.nVersion = 1; + pfd.dwFlags = + PFD_DRAW_TO_WINDOW | PFD_DOUBLEBUFFER | (g_ddraw->renderer == ogl_render_main ? PFD_SUPPORT_OPENGL : 0); - SetPixelFormat(g_ddraw.render.hdc, ChoosePixelFormat(g_ddraw.render.hdc, &pfd), &pfd); - } + pfd.iPixelType = PFD_TYPE_RGBA; + pfd.cColorBits = g_ddraw->mode.dmBitsPerPel; + pfd.iLayerType = PFD_MAIN_PLANE; + + SetPixelFormat(g_ddraw->render.hdc, ChoosePixelFormat(g_ddraw->render.hdc, &pfd), &pfd); } if (!g_config.devmode) { - InterlockedExchange((LONG*)&g_ddraw.old_cursor, (LONG)real_SetCursor(LoadCursor(NULL, IDC_ARROW))); + HCURSOR cursor = real_SetCursor(LoadCursor(NULL, IDC_ARROW)); + + if (cursor != LoadCursor(NULL, IDC_WAIT)) + InterlockedExchange((LONG*)&g_ddraw->old_cursor, (LONG)cursor); } int cursor_count = real_ShowCursor(TRUE) - 1; - InterlockedExchange((LONG*)&g_ddraw.show_cursor_count, cursor_count); + InterlockedExchange((LONG*)&g_ddraw->show_cursor_count, cursor_count); real_ShowCursor(FALSE); /* Make sure the cursor is visible in windowed mode initially */ @@ -1445,37 +1169,24 @@ HRESULT dd_SetCooperativeLevel(HWND hwnd, DWORD dwFlags) real_ClipCursor(NULL); } - GetWindowText(g_ddraw.hwnd, (LPTSTR)&g_ddraw.title, sizeof(g_ddraw.title)); + GetWindowText(g_ddraw->hwnd, (LPTSTR)&g_ddraw->title, sizeof(g_ddraw->title)); - g_ddraw.isredalert = strcmp(g_ddraw.title, "Red Alert") == 0; - g_ddraw.iscnc1 = strcmp(g_ddraw.title, "Command & Conquer") == 0; - g_ddraw.iskkndx = strcmp(g_ddraw.title, "KKND Xtreme") == 0; - g_ddraw.isworms2 = strcmp(g_ddraw.title, "worms2") == 0; + g_ddraw->isredalert = strcmp(g_ddraw->title, "Red Alert") == 0; + g_ddraw->iscnc1 = strcmp(g_ddraw->title, "Command & Conquer") == 0; + g_ddraw->iskkndx = strcmp(g_ddraw->title, "KKND Xtreme") == 0; - if (g_ddraw.iskkndx) + if (g_ddraw->iskkndx) { - g_ddraw.upscale_hack_width = 640; - g_ddraw.upscale_hack_height = 480; + g_ddraw->upscale_hack_width = 640; + g_ddraw->upscale_hack_height = 480; } - else if (g_ddraw.isredalert || g_ddraw.iscnc1) + else if (g_ddraw->isredalert || g_ddraw->iscnc1) { - g_ddraw.upscale_hack_width = 640; - g_ddraw.upscale_hack_height = 400; - } - else if (g_ddraw.isworms2) - { - if (memcmp((char*)GetModuleHandleA(NULL) + 0x00010000, "\x17\x81\xC2\x00\x80\x00\x00\x89", 8) != 0) - { - g_ddraw.isworms2 = FALSE; - } - else - { - g_ddraw.upscale_hack_width = 80; - g_ddraw.upscale_hack_height = 60; - } + g_ddraw->upscale_hack_width = 640; + g_ddraw->upscale_hack_height = 400; } - if (g_config.vhack && !g_ddraw.isredalert && !g_ddraw.iscnc1 && !g_ddraw.iskkndx && !g_ddraw.isworms2) + if (g_config.vhack && !g_ddraw->isredalert && !g_ddraw->iscnc1 && !g_ddraw->iskkndx) { g_config.vhack = 0; } @@ -1484,84 +1195,43 @@ HRESULT dd_SetCooperativeLevel(HWND hwnd, DWORD dwFlags) /* Infantry Online Zone List Window */ if (g_config.infantryhack) { - static BOOL windowed, fullscreen, devmode; + static BOOL windowed, fullscreen; if (dwFlags & DDSCL_FULLSCREEN) { g_config.windowed = windowed; g_config.fullscreen = fullscreen; - g_config.devmode = devmode; } else if (dwFlags & DDSCL_NOWINDOWCHANGES) { windowed = g_config.windowed; fullscreen = g_config.fullscreen; - devmode = g_config.devmode; - if (GetMenu(g_ddraw.hwnd) != NULL) + if (GetMenu(g_ddraw->hwnd) != NULL) { g_config.windowed = TRUE; g_config.fullscreen = FALSE; - g_config.devmode = TRUE; - - /* - if (!g_config.window_rect.right && g_config.window_rect.left == -32000) - { - if (real_GetSystemMetrics(SM_CYSCREEN) >= 2160) - { - g_config.window_rect.right = 640 * 3; - g_config.window_rect.bottom = 480 * 3; - } - else if (real_GetSystemMetrics(SM_CYSCREEN) >= 1440) - { - g_config.window_rect.right = 640 * 2; - g_config.window_rect.bottom = 480 * 2; - } - else if (real_GetSystemMetrics(SM_CYSCREEN) >= 1080) - { - g_config.window_rect.right = (LONG)(640 * 1.5f); - g_config.window_rect.bottom = (LONG)(480 * 1.5f); - } - } - */ } dd_SetDisplayMode(640, 480, 16, SDM_MODE_SET_BY_GAME); } } - if ((dwFlags & DDSCL_NORMAL) && !(dwFlags & DDSCL_FULLSCREEN)) + if (dwFlags & DDSCL_NORMAL) { - if (g_config.fake_mode[0]) + if (g_config.vermeer_hack) { - char* e = &g_config.fake_mode[0]; - - unsigned long width = strtoul(e, &e, 0); - unsigned long height = strtoul(e + 1, &e, 0); - unsigned long bpp = strtoul(e + 1, &e, 0); - - dd_SetDisplayMode(width, height, bpp, 0); + dd_SetDisplayMode(640, 480, 16, 0); } - else if (!g_ddraw.width) + else { - RECT rc = { 0 }; - real_GetClientRect(hwnd, &rc); - - BOOL popup = real_GetWindowLongA(hwnd, GWL_STYLE) & WS_POPUP; - - if ((rc.right < real_GetSystemMetrics(SM_CXSCREEN) && rc.bottom < real_GetSystemMetrics(SM_CYSCREEN)) || !popup) - { - TRACE(" client rect=%dx%d\n", rc.right, rc.bottom); - - g_ddraw.windowed_hack = TRUE; - dd_SetDisplayMode(rc.right, rc.bottom, 16, 0); - } + GameHandlesClose = TRUE; + g_config.devmode = TRUE; + g_config.fullscreen = FALSE; + g_config.windowed = TRUE; + dd_SetDisplayMode(515, 325, 32, 8); } } - else - { - g_ddraw.windowed_hack = FALSE; - } return DD_OK; } @@ -1570,29 +1240,29 @@ HRESULT dd_WaitForVerticalBlank(DWORD dwFlags, HANDLE hEvent) { if (g_config.maxgameticks == -2) { - if (fpsl_wait_for_vblank()) + if (fpsl_dwm_flush() || fpsl_wait_for_vblank()) return DD_OK; } - if (!g_ddraw.flip_limiter.tick_length) + if (!g_ddraw->flip_limiter.tick_length) return DD_OK; - if (g_ddraw.flip_limiter.htimer) + if (g_ddraw->flip_limiter.htimer) { FILETIME ft = { 0 }; GetSystemTimeAsFileTime(&ft); - if (CompareFileTime((FILETIME*)&g_ddraw.flip_limiter.due_time, &ft) == -1) + if (CompareFileTime((FILETIME*)&g_ddraw->flip_limiter.due_time, &ft) == -1) { - memcpy(&g_ddraw.flip_limiter.due_time, &ft, sizeof(LARGE_INTEGER)); + memcpy(&g_ddraw->flip_limiter.due_time, &ft, sizeof(LARGE_INTEGER)); } else { - WaitForSingleObject(g_ddraw.flip_limiter.htimer, g_ddraw.flip_limiter.tick_length * 2); + WaitForSingleObject(g_ddraw->flip_limiter.htimer, g_ddraw->flip_limiter.tick_length * 2); } - g_ddraw.flip_limiter.due_time.QuadPart += g_ddraw.flip_limiter.tick_length_ns; - SetWaitableTimer(g_ddraw.flip_limiter.htimer, &g_ddraw.flip_limiter.due_time, 0, NULL, NULL, FALSE); + g_ddraw->flip_limiter.due_time.QuadPart += g_ddraw->flip_limiter.tick_length_ns; + SetWaitableTimer(g_ddraw->flip_limiter.htimer, &g_ddraw->flip_limiter.due_time, 0, NULL, NULL, FALSE); } else { @@ -1604,12 +1274,12 @@ HRESULT dd_WaitForVerticalBlank(DWORD dwFlags, HANDLE hEvent) return DD_OK; } - next_game_tick += g_ddraw.flip_limiter.tick_length; + next_game_tick += g_ddraw->flip_limiter.tick_length; DWORD tick_count = timeGetTime(); int sleep_time = next_game_tick - tick_count; - if (sleep_time <= 0 || sleep_time > g_ddraw.flip_limiter.tick_length) + if (sleep_time <= 0 || sleep_time > g_ddraw->flip_limiter.tick_length) { next_game_tick = tick_count; } @@ -1624,37 +1294,37 @@ HRESULT dd_WaitForVerticalBlank(DWORD dwFlags, HANDLE hEvent) ULONG dd_AddRef() { - return InterlockedIncrement(&g_ddraw.ref); + return ++g_ddraw->ref; } ULONG dd_Release() { - LONG ref = InterlockedDecrement(&g_ddraw.ref); + g_ddraw->ref--; - if (ref == 0) + if (g_ddraw->ref == 0) { - if (g_ddraw.bpp) + if (g_ddraw->bpp) { cfg_save(); } - if (g_ddraw.render.run) + if (g_ddraw->render.run) { - EnterCriticalSection(&g_ddraw.cs); - g_ddraw.render.run = FALSE; - ReleaseSemaphore(g_ddraw.render.sem, 1, NULL); - LeaveCriticalSection(&g_ddraw.cs); + EnterCriticalSection(&g_ddraw->cs); + g_ddraw->render.run = FALSE; + ReleaseSemaphore(g_ddraw->render.sem, 1, NULL); + LeaveCriticalSection(&g_ddraw->cs); - if (g_ddraw.render.thread) + if (g_ddraw->render.thread) { - WaitForSingleObject(g_ddraw.render.thread, INFINITE); - g_ddraw.render.thread = NULL; + WaitForSingleObject(g_ddraw->render.thread, INFINITE); + g_ddraw->render.thread = NULL; } } if (!g_config.windowed) { - if (g_ddraw.renderer == d3d9_render_main && !g_config.nonexclusive) + if (g_ddraw->renderer == d3d9_render_main && !g_config.nonexclusive) { if (!d3d9_reset(TRUE)) d3d9_release(); @@ -1665,29 +1335,24 @@ ULONG dd_Release() } } - if (g_ddraw.renderer == ogl_render_main) + if (g_ddraw->render.hdc) { - ogl_release(); + ReleaseDC(g_ddraw->hwnd, g_ddraw->render.hdc); + g_ddraw->render.hdc = NULL; } - if (g_ddraw.render.hdc) + if (g_ddraw->ticks_limiter.htimer) { - ReleaseDC(g_ddraw.hwnd, g_ddraw.render.hdc); - g_ddraw.render.hdc = NULL; + CancelWaitableTimer(g_ddraw->ticks_limiter.htimer); + CloseHandle(g_ddraw->ticks_limiter.htimer); + g_ddraw->ticks_limiter.htimer = NULL; } - if (g_ddraw.ticks_limiter.htimer) + if (g_ddraw->flip_limiter.htimer) { - CancelWaitableTimer(g_ddraw.ticks_limiter.htimer); - CloseHandle(g_ddraw.ticks_limiter.htimer); - g_ddraw.ticks_limiter.htimer = NULL; - } - - if (g_ddraw.flip_limiter.htimer) - { - CancelWaitableTimer(g_ddraw.flip_limiter.htimer); - CloseHandle(g_ddraw.flip_limiter.htimer); - g_ddraw.flip_limiter.htimer = NULL; + CancelWaitableTimer(g_ddraw->flip_limiter.htimer); + CloseHandle(g_ddraw->flip_limiter.htimer); + g_ddraw->flip_limiter.htimer = NULL; } if (g_fpsl.htimer) @@ -1697,31 +1362,26 @@ ULONG dd_Release() g_fpsl.htimer = NULL; } - if (g_ddraw.real_dd) + if (g_ddraw->real_dd) { - g_ddraw.real_dd->lpVtbl->Release(g_ddraw.real_dd); + g_ddraw->real_dd->lpVtbl->Release(g_ddraw->real_dd); } - DeleteCriticalSection(&g_ddraw.cs); + DeleteCriticalSection(&g_ddraw->cs); - if (g_ddraw.hwnd && IsWindow(g_ddraw.hwnd)) + /* restore old wndproc, subsequent ddraw creation will otherwise fail */ + if (g_ddraw->hwnd) { - /* restore old wndproc, subsequent ddraw creation will otherwise fail */ - real_SetWindowLongA(g_ddraw.hwnd, GWL_WNDPROC, (LONG)g_ddraw.wndproc); + real_SetWindowLongA(g_ddraw->hwnd, GWL_WNDPROC, (LONG)g_ddraw->wndproc); } - - memset(&g_ddraw, 0, sizeof(g_ddraw)); - + + HeapFree(GetProcessHeap(), 0, g_ddraw); + g_ddraw = NULL; + return 0; } - if (ref < 0) - { - InterlockedExchange(&g_ddraw.ref, 0); - return 0; - } - - return (ULONG)ref; + return g_ddraw->ref; } HRESULT dd_GetAvailableVidMem(LPDDSCAPS lpDDCaps, LPDWORD lpdwTotal, LPDWORD lpdwFree) @@ -1735,15 +1395,12 @@ HRESULT dd_GetAvailableVidMem(LPDDSCAPS lpDDCaps, LPDWORD lpdwTotal, LPDWORD lpd return DD_OK; } -HRESULT dd_TestCooperativeLevel() +HRESULT dd_GetVerticalBlankStatus(LPBOOL lpbIsInVB) { - if (g_config.limiter_type == LIMIT_TESTCOOP && g_ddraw.ticks_limiter.tick_length > 0) - { - g_ddraw.ticks_limiter.dds_unlock_limiter_disabled = TRUE; - util_limit_game_ticks(); - } + if (lpbIsInVB) + *lpbIsInVB = TRUE; - return g_config.tlc_hack ? DDERR_NOEXCLUSIVEMODE : DD_OK; + return DD_OK; } HRESULT dd_GetDeviceIdentifier(LPDDDEVICEIDENTIFIER pDDDI, DWORD dwFlags, REFIID riid) @@ -1765,60 +1422,42 @@ HRESULT dd_GetDeviceIdentifier(LPDDDEVICEIDENTIFIER pDDDI, DWORD dwFlags, REFIID HRESULT dd_CreateEx(GUID* lpGuid, LPVOID* lplpDD, REFIID iid, IUnknown* pUnkOuter) { - if (InterlockedExchangeAdd((LONG*)&g_ddraw.ref, 0) == 0) + if (!g_ddraw) { - InterlockedIncrement(&g_ddraw.ref); + g_ddraw = (CNCDDRAW*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CNCDDRAW)); + g_ddraw->ref++; - InitializeCriticalSection(&g_ddraw.cs); + InitializeCriticalSection(&g_ddraw->cs); - g_ddraw.render.sem = CreateSemaphore(NULL, 0, 1, NULL); + g_ddraw->render.sem = CreateSemaphore(NULL, 0, 1, NULL); g_blt_use_avx = util_is_avx_supported(); if (g_config.minfps > 1000) g_config.minfps = 1000; if (g_config.minfps > 0) - g_ddraw.minfps_tick_len = (DWORD)(1000.0f / g_config.minfps); + g_ddraw->minfps_tick_len = (DWORD)(1000.0f / g_config.minfps); - - HANDLE (WINAPI *createTimerExW)(LPSECURITY_ATTRIBUTES, LPCWSTR, DWORD, DWORD) = NULL; - - if (!IsWine() && IsWindows10Version1803OrGreater()) - { - createTimerExW = (void*)real_GetProcAddress(real_LoadLibraryA("Kernel32.dll"), "CreateWaitableTimerExW"); - } - - DWORD timer_flags = CREATE_WAITABLE_TIMER_MANUAL_RESET | CREATE_WAITABLE_TIMER_HIGH_RESOLUTION; - - /* can't fully set it up here due to missing g_ddraw.mode.dmDisplayFrequency */ - g_fpsl.htimer = createTimerExW ? createTimerExW(NULL, NULL, timer_flags, TIMER_ALL_ACCESS) : NULL; - - if (!g_fpsl.htimer) - g_fpsl.htimer = CreateWaitableTimer(NULL, TRUE, NULL); + /* can't fully set it up here due to missing g_ddraw->mode.dmDisplayFrequency */ + g_fpsl.htimer = CreateWaitableTimer(NULL, TRUE, NULL); if (g_config.maxgameticks > 0 && g_config.maxgameticks <= 1000) { - g_ddraw.ticks_limiter.htimer = createTimerExW ? createTimerExW(NULL, NULL, timer_flags, TIMER_ALL_ACCESS) : NULL; - - if (!g_ddraw.ticks_limiter.htimer) - g_ddraw.ticks_limiter.htimer = CreateWaitableTimer(NULL, TRUE, NULL); + g_ddraw->ticks_limiter.htimer = CreateWaitableTimer(NULL, TRUE, NULL); float len = 1000.0f / g_config.maxgameticks; - g_ddraw.ticks_limiter.tick_length_ns = (LONGLONG)(len * 10000); - g_ddraw.ticks_limiter.tick_length = (DWORD)(len + 0.5f); + g_ddraw->ticks_limiter.tick_length_ns = (LONGLONG)(len * 10000); + g_ddraw->ticks_limiter.tick_length = (DWORD)(len + 0.5f); } if (g_config.maxgameticks >= 0 || g_config.maxgameticks == -2) { /* always using 60 fps for flip... */ - g_ddraw.flip_limiter.htimer = createTimerExW ? createTimerExW(NULL, NULL, timer_flags, TIMER_ALL_ACCESS) : NULL; - - if (!g_ddraw.flip_limiter.htimer) - g_ddraw.flip_limiter.htimer = CreateWaitableTimer(NULL, TRUE, NULL); + g_ddraw->flip_limiter.htimer = CreateWaitableTimer(NULL, TRUE, NULL); float flip_len = 1000.0f / 60; - g_ddraw.flip_limiter.tick_length_ns = (LONGLONG)(flip_len * 10000); - g_ddraw.flip_limiter.tick_length = (DWORD)(flip_len + 0.5f); + g_ddraw->flip_limiter.tick_length_ns = (LONGLONG)(flip_len * 10000); + g_ddraw->flip_limiter.tick_length = (DWORD)(flip_len + 0.5f); } @@ -1828,17 +1467,7 @@ HRESULT dd_CreateEx(GUID* lpGuid, LPVOID* lplpDD, REFIID iid, IUnknown* pUnkOute if (g_config.singlecpu) { - if (!IsWine() && IsWindows11Version24H2OrGreater()) - { - if (GetProcessAffinityMask(proc, &proc_affinity, &system_affinity)) - SetProcessAffinityMask(proc, system_affinity); - - util_set_process_affinity(); - } - else - { - SetProcessAffinityMask(proc, 1); - } + SetProcessAffinityMask(proc, 1); } else if (GetProcessAffinityMask(proc, &proc_affinity, &system_affinity)) { @@ -1862,45 +1491,42 @@ HRESULT dd_CreateEx(GUID* lpGuid, LPVOID* lplpDD, REFIID iid, IUnknown* pUnkOute if (tolower(g_config.renderer[0]) == 'd') /* direct3d9 or direct3d9on12*/ { - g_ddraw.renderer = d3d9_render_main; + g_ddraw->renderer = d3d9_render_main; } else if (tolower(g_config.renderer[0]) == 's' || tolower(g_config.renderer[0]) == 'g') /* gdi */ { - g_ddraw.renderer = gdi_render_main; + g_ddraw->renderer = gdi_render_main; } else if (tolower(g_config.renderer[0]) == 'o') /* opengl or openglcore */ { if (oglu_load_dll()) { - g_ddraw.renderer = ogl_render_main; + g_ddraw->renderer = ogl_render_main; } else { - g_ddraw.show_driver_warning = TRUE; - g_ddraw.renderer = gdi_render_main; + g_ddraw->show_driver_warning = TRUE; + g_ddraw->renderer = gdi_render_main; } } else /* auto */ { - if (!IsWine() && d3d9_is_available()) + if (!g_config.is_wine && d3d9_is_available()) { - g_ddraw.renderer = d3d9_render_main; + g_ddraw->renderer = d3d9_render_main; } else if (oglu_load_dll()) { - g_ddraw.renderer = ogl_render_main; + g_ddraw->renderer = ogl_render_main; } else { - g_ddraw.show_driver_warning = TRUE; - g_ddraw.renderer = gdi_render_main; + g_ddraw->show_driver_warning = TRUE; + g_ddraw->renderer = gdi_render_main; } } - LONG ref = InterlockedDecrement(&g_ddraw.ref); - - if (ref < 0) - InterlockedExchange(&g_ddraw.ref, 0); + g_ddraw->ref--; } IDirectDrawImpl* dd = (IDirectDrawImpl*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectDrawImpl)); diff --git a/src/ddclipper.c b/src/ddclipper.c index d1d6ceb..28fc283 100644 --- a/src/ddclipper.c +++ b/src/ddclipper.c @@ -3,24 +3,15 @@ #include "IDirectDrawClipper.h" #include "ddclipper.h" #include "debug.h" -#include "dd.h" HRESULT ddc_GetClipList(IDirectDrawClipperImpl* This, LPRECT lpRect, LPRGNDATA lpClipList, LPDWORD lpdwSiz) { - EnterCriticalSection(&This->cs); - if (!This->region) - { - LeaveCriticalSection(&This->cs); return DDERR_NOCLIPLIST; - } if (!lpdwSiz) - { - LeaveCriticalSection(&This->cs); return DDERR_INVALIDPARAMS; - } HRGN region = NULL; @@ -29,16 +20,11 @@ HRESULT ddc_GetClipList(IDirectDrawClipperImpl* This, LPRECT lpRect, LPRGNDATA l region = CreateRectRgnIndirect(lpRect); if (!region) - { - LeaveCriticalSection(&This->cs); return DDERR_INVALIDPARAMS; - } if (CombineRgn(region, This->region, region, RGN_AND) == ERROR) { DeleteObject(region); - - LeaveCriticalSection(&This->cs); return DDERR_GENERIC; } } @@ -53,142 +39,63 @@ HRESULT ddc_GetClipList(IDirectDrawClipperImpl* This, LPRECT lpRect, LPRGNDATA l DeleteObject(region); if (*lpdwSiz == 0) - { - LeaveCriticalSection(&This->cs); return DDERR_REGIONTOOSMALL; - } - LeaveCriticalSection(&This->cs); return DD_OK; } HRESULT ddc_GetHWnd(IDirectDrawClipperImpl* This, HWND FAR* lphWnd) { - EnterCriticalSection(&This->cs); - if (!lphWnd) - { - LeaveCriticalSection(&This->cs); return DDERR_INVALIDPARAMS; - } *lphWnd = This->hwnd; - LeaveCriticalSection(&This->cs); return DD_OK; } HRESULT ddc_IsClipListChanged(IDirectDrawClipperImpl* This, BOOL FAR* lpbChanged) { - EnterCriticalSection(&This->cs); - if (!lpbChanged) - { - LeaveCriticalSection(&This->cs); return DDERR_INVALIDPARAMS; - } *lpbChanged = FALSE; /* Always return FALSE - See ddc_SetHWnd for remarks */ - LeaveCriticalSection(&This->cs); return DD_OK; } HRESULT ddc_SetClipList(IDirectDrawClipperImpl* This, LPRGNDATA lpClipList, DWORD dwFlags) { - EnterCriticalSection(&This->cs); - + /* Keep this commented out until we found a game that actually needs it if (This->hwnd) - { - LeaveCriticalSection(&This->cs); return DDERR_CLIPPERISUSINGHWND; - } + + if (This->region) + DeleteObject(This->region); if (lpClipList) { - if (!lpClipList->rdh.nCount) - { - LeaveCriticalSection(&This->cs); - return DDERR_INVALIDCLIPLIST; - } - - if (This->region) - DeleteObject(This->region); - - RECT* rc = (RECT*)lpClipList->Buffer; - - This->region = CreateRectRgnIndirect(&rc[0]); + This->region = ExtCreateRegion(NULL, 0, lpClipList); if (!This->region) - { - LeaveCriticalSection(&This->cs); return DDERR_INVALIDCLIPLIST; - } - - for (int i = 1; i < lpClipList->rdh.nCount; ++i) - { - HRGN region = CreateRectRgnIndirect(&rc[i]); - - if (!region) - { - LeaveCriticalSection(&This->cs); - return DDERR_INVALIDCLIPLIST; - } - - if (CombineRgn(This->region, region, This->region, RGN_OR) == ERROR) - { - DeleteObject(region); - DeleteObject(This->region); - This->region = NULL; - - LeaveCriticalSection(&This->cs); - return DDERR_INVALIDCLIPLIST; - } - - DeleteObject(region); - } } else { - if (This->region) - DeleteObject(This->region); - This->region = NULL; } - - LeaveCriticalSection(&This->cs); + */ return DD_OK; } HRESULT ddc_SetHWnd(IDirectDrawClipperImpl* This, DWORD dwFlags, HWND hWnd) { - EnterCriticalSection(&This->cs); /* We don't use the regions from the hwnd here since everything is emulated and we need the entire emulated surface to be redrawn all the time */ This->hwnd = hWnd; - if (hWnd && !This->region && g_ddraw.width) - { - RECT rc = { 0, 0, g_ddraw.width, g_ddraw.height }; - ddc_SetClipRect(This, &rc); - } - - LeaveCriticalSection(&This->cs); - return DD_OK; -} - -HRESULT ddc_SetClipRect(IDirectDrawClipperImpl* This, LPRECT lpRect) -{ - EnterCriticalSection(&This->cs); - - if (This->region) - DeleteObject(This->region); - - This->region = CreateRectRgnIndirect(lpRect); - - LeaveCriticalSection(&This->cs); return DD_OK; } @@ -204,7 +111,6 @@ HRESULT dd_CreateClipper(DWORD dwFlags, IDirectDrawClipperImpl** lplpDDClipper, c->lpVtbl = &g_ddc_vtbl; IDirectDrawClipper_AddRef(c); - InitializeCriticalSection(&c->cs); *lplpDDClipper = c; diff --git a/src/ddpalette.c b/src/ddpalette.c index e51df8e..3a7b52c 100644 --- a/src/ddpalette.c +++ b/src/ddpalette.c @@ -14,15 +14,11 @@ HRESULT ddp_GetEntries( DWORD dwNumEntries, LPPALETTEENTRY lpEntries) { - if (!lpEntries) - return DDERR_INVALIDPARAMS; - - for (int i = dwBase, x = 0; i < dwBase + dwNumEntries && i < 256; i++, x++) + for (int i = dwBase, x = 0; i < dwBase + dwNumEntries; i++, x++) { lpEntries[x].peRed = This->data_rgb[i].rgbRed; lpEntries[x].peGreen = This->data_rgb[i].rgbGreen; lpEntries[x].peBlue = This->data_rgb[i].rgbBlue; - lpEntries[x].peFlags = 0; } return DD_OK; @@ -35,17 +31,7 @@ HRESULT ddp_SetEntries( DWORD dwCount, LPPALETTEENTRY lpEntries) { - if (!lpEntries) - return DDERR_INVALIDPARAMS; - - RGBQUAD data_rgb[256]; - - if ((dwFlags & DDPCAPS_REFRESH_CHANGED_ONLY)) - { - memcpy(data_rgb, This->data_rgb, sizeof(This->data_rgb)); - } - - for (int i = dwStartingEntry, x = 0; i < dwStartingEntry + dwCount && i < 256; i++, x++) + for (int i = dwStartingEntry, x = 0; i < dwStartingEntry + dwCount; i++, x++) { This->data_bgr[i] = (lpEntries[x].peBlue << 16) | (lpEntries[x].peGreen << 8) | lpEntries[x].peRed; @@ -71,21 +57,10 @@ HRESULT ddp_SetEntries( This->data_rgb[255].rgbReserved = 0; } - if ((dwFlags & DDPCAPS_REFRESH_CHANGED_ONLY)) + if (g_ddraw && g_ddraw->primary && g_ddraw->primary->palette == This && g_ddraw->render.run) { - if (memcmp(data_rgb, This->data_rgb, sizeof(This->data_rgb)) == 0) - { - // do not set palette_updated BOOL if nothing changed - return DD_OK; - } - - TRACE_EXT(" Palette changed\n"); - } - - if (g_ddraw.ref && g_ddraw.primary && g_ddraw.primary->palette == This && g_ddraw.render.run) - { - InterlockedExchange(&g_ddraw.render.palette_updated, TRUE); - ReleaseSemaphore(g_ddraw.render.sem, 1, NULL); + InterlockedExchange(&g_ddraw->render.palette_updated, TRUE); + ReleaseSemaphore(g_ddraw->render.sem, 1, NULL); } return DD_OK; diff --git a/src/ddsurface.c b/src/ddsurface.c index 96d69de..b45cc75 100644 --- a/src/ddsurface.c +++ b/src/ddsurface.c @@ -11,11 +11,6 @@ #include "utils.h" #include "blt.h" #include "config.h" -#include "ddclipper.h" -#include "utils.h" -#include "versionhelpers.h" -#include "ddpalette.h" -#include "palette.h" LONG g_dds_gdi_handles; @@ -50,22 +45,11 @@ HRESULT dds_Blt( DWORD dwFlags, LPDDBLTFX lpDDBltFx) { - if (lpDDSrcSurface && - lpDDSrcSurface->bpp != 8 && - lpDDSrcSurface->bpp != 16 && - lpDDSrcSurface->bpp != 24 && - lpDDSrcSurface->bpp != 32) - { - return DDERR_INVALIDPARAMS; - } - dbg_dump_dds_blt_flags(dwFlags); dbg_dump_dds_blt_fx_flags((dwFlags & DDBLT_DDFX) && lpDDBltFx ? lpDDBltFx->dwDDFX : 0); - util_pull_messages(); - - if (g_ddraw.ref && - g_ddraw.iskkndx && + if (g_ddraw && + g_ddraw->iskkndx && (dwFlags & DDBLT_COLORFILL) && lpDestRect && lpDestRect->right == 640 && @@ -85,16 +69,10 @@ HRESULT dds_Blt( RECT dst_rect = { 0, 0, This->width, This->height }; if (lpSrcRect && src_surface) - { - //dbg_print_rect("lpSrcRect", lpSrcRect); - src_rect = *lpSrcRect; - } + memcpy(&src_rect, lpSrcRect, sizeof(src_rect)); if (lpDestRect) - { - //dbg_print_rect("lpDestRect", lpDestRect); - dst_rect = *lpDestRect; - } + memcpy(&dst_rect, lpDestRect, sizeof(dst_rect)); int src_w = src_rect.right - src_rect.left; int src_h = src_rect.bottom - src_rect.top; @@ -107,19 +85,18 @@ HRESULT dds_Blt( BOOL is_stretch_blt = src_w != dst_w || src_h != dst_h; - if (This->clipper && !This->clipper->hwnd && !(dwFlags & DDBLT_NO_CLIP) && dst_w > 0 && dst_h > 0) + /* Disable this for now (needs more testing) + if (This->clipper && !(dwFlags & DDBLT_NO_CLIP) && dst_w > 0 && dst_h > 0) { DWORD size = 0; - HRESULT result = ddc_GetClipList(This->clipper, &dst_rect, NULL, &size); - - if (SUCCEEDED(result)) + if (SUCCEEDED(IDirectDrawClipper_GetClipList(This->clipper, &dst_rect, NULL, &size))) { RGNDATA* list = (RGNDATA*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); if (list) { - if (SUCCEEDED(ddc_GetClipList(This->clipper, &dst_rect, list, &size))) + if (SUCCEEDED(IDirectDrawClipper_GetClipList(This->clipper, &dst_rect, list, &size))) { RECT* dst_c_rect = (RECT*)list->Buffer; @@ -144,17 +121,8 @@ HRESULT dds_Blt( return DD_OK; } } - else if (result == DDERR_NOCLIPLIST) - { - TRACE(" DDERR_NOCLIPLIST\n"); - //return DDERR_NOCLIPLIST; - } - else - { - TRACE(" DDERR_INVALIDCLIPLIST\n"); - //return DDERR_INVALIDCLIPLIST; - } } + */ if (dst_rect.right < 0) dst_rect.right = 0; @@ -236,11 +204,6 @@ HRESULT dds_Blt( if (dst_buf && (dwFlags & DDBLT_COLORFILL) && lpDDBltFx && dst_w > 0 && dst_h > 0) { - if (This->bpp == 24) - { - TRACE_EXT(" NOT_IMPLEMENTED This->bpp=%u, dwFillColor=%08X\n", This->bpp, lpDDBltFx->dwFillColor); - } - blt_colorfill( dst_buf, dst_x, @@ -264,10 +227,7 @@ HRESULT dds_Blt( BOOL mirror_left_right = got_fx && (lpDDBltFx->dwDDFX & DDBLTFX_MIRRORLEFTRIGHT); BOOL mirror_up_down = got_fx && (lpDDBltFx->dwDDFX & DDBLTFX_MIRRORUPDOWN); - if (This->bpp != src_surface->bpp || - This->bpp == 24 || - src_surface->bpp == 24 || - (is_stretch_blt && This == src_surface)) + if (This->bpp != src_surface->bpp) { TRACE_EXT(" NOT_IMPLEMENTED This->bpp=%u, src_surface->bpp=%u\n", This->bpp, src_surface->bpp); @@ -277,13 +237,13 @@ HRESULT dds_Blt( HDC src_dc; dds_GetDC(src_surface, &src_dc); - if (((dwFlags & DDBLT_KEYSRC) && (src_surface->flags & DDSD_CKSRCBLT)) || (dwFlags & DDBLT_KEYSRCOVERRIDE)) + if ((dwFlags & DDBLT_KEYSRC) || (dwFlags & DDBLT_KEYSRCOVERRIDE)) { UINT color = (dwFlags & DDBLT_KEYSRCOVERRIDE) ? lpDDBltFx->ddckSrcColorkey.dwColorSpaceLowValue : src_surface->color_key.dwColorSpaceLowValue; - if (src_surface->bpp == 32 || src_surface->bpp == 24) + if (src_surface->bpp == 32) { color = color & 0xFFFFFF; } @@ -301,7 +261,7 @@ HRESULT dds_Blt( { RGBQUAD* quad = src_surface->palette ? src_surface->palette->data_rgb : - g_ddraw.ref && g_ddraw.primary && g_ddraw.primary->palette ? g_ddraw.primary->palette->data_rgb : + g_ddraw && g_ddraw->primary && g_ddraw->primary->palette ? g_ddraw->primary->palette->data_rgb : NULL; if (quad) @@ -335,7 +295,7 @@ HRESULT dds_Blt( */ } else if ( - ((dwFlags & DDBLT_KEYSRC) && (src_surface->flags & DDSD_CKSRCBLT)) || + (dwFlags & DDBLT_KEYSRC) || (dwFlags & DDBLT_KEYSRCOVERRIDE) || mirror_left_right || mirror_up_down) @@ -444,21 +404,20 @@ HRESULT dds_Blt( } } - if ((This->caps & DDSCAPS_PRIMARYSURFACE) && g_ddraw.ref && g_ddraw.render.run) + if ((This->caps & DDSCAPS_PRIMARYSURFACE) && g_ddraw && g_ddraw->render.run) { - InterlockedExchange(&g_ddraw.render.surface_updated, TRUE); - InterlockedExchange(&g_ddraw.render.screen_updated, TRUE); + InterlockedExchange(&g_ddraw->render.surface_updated, TRUE); if (!(This->flags & DDSD_BACKBUFFERCOUNT) || This->last_flip_tick + FLIP_REDRAW_TIMEOUT < timeGetTime()) { This->last_blt_tick = timeGetTime(); - ReleaseSemaphore(g_ddraw.render.sem, 1, NULL); + ReleaseSemaphore(g_ddraw->render.sem, 1, NULL); SwitchToThread(); - if (g_ddraw.ticks_limiter.tick_length > 0 && g_config.limiter_type != LIMIT_PEEKMESSAGE) + if (g_ddraw->ticks_limiter.tick_length > 0) { - g_ddraw.ticks_limiter.dds_unlock_limiter_disabled = TRUE; + g_ddraw->ticks_limiter.use_blt_or_flip = TRUE; util_limit_game_ticks(); } } @@ -482,10 +441,7 @@ HRESULT dds_BltFast( RECT src_rect = { 0, 0, src_surface ? src_surface->width : 0, src_surface ? src_surface->height : 0 }; if (lpSrcRect && src_surface) - { - //dbg_print_rect("lpSrcRect", lpSrcRect); - src_rect = *lpSrcRect; - } + memcpy(&src_rect, lpSrcRect, sizeof(src_rect)); int dst_x = dwX; int dst_y = dwY; @@ -569,9 +525,7 @@ HRESULT dds_BltFast( if (src_surface && dst_w > 0 && dst_h > 0) { - if (This->bpp != src_surface->bpp || - This->bpp == 24 || - src_surface->bpp == 24) + if (This->bpp != src_surface->bpp) { TRACE_EXT(" NOT_IMPLEMENTED This->bpp=%u, src_surface->bpp=%u\n", This->bpp, src_surface->bpp); @@ -581,11 +535,11 @@ HRESULT dds_BltFast( HDC src_dc; dds_GetDC(src_surface, &src_dc); - if ((dwFlags & DDBLTFAST_SRCCOLORKEY) && (src_surface->flags & DDSD_CKSRCBLT)) + if (dwFlags & DDBLTFAST_SRCCOLORKEY) { UINT color = src_surface->color_key.dwColorSpaceLowValue; - if (src_surface->bpp == 32 || src_surface->bpp == 24) + if (src_surface->bpp == 32) { color = color & 0xFFFFFF; } @@ -603,7 +557,7 @@ HRESULT dds_BltFast( { RGBQUAD* quad = src_surface->palette ? src_surface->palette->data_rgb : - g_ddraw.ref && g_ddraw.primary && g_ddraw.primary->palette ? g_ddraw.primary->palette->data_rgb : + g_ddraw && g_ddraw->primary && g_ddraw->primary->palette ? g_ddraw->primary->palette->data_rgb : NULL; if (quad) @@ -618,11 +572,11 @@ HRESULT dds_BltFast( } else { - real_BitBlt(dst_dc, dst_x, dst_y, dst_w, dst_h, src_dc, src_x, src_y, SRCCOPY); + BitBlt(dst_dc, dst_x, dst_y, dst_w, dst_h, src_dc, src_x, src_y, SRCCOPY); } /* - real_BitBlt( + BitBlt( dst_dc, dwX, dwY, @@ -634,7 +588,7 @@ HRESULT dds_BltFast( SRCCOPY); */ } - else if ((dwFlags & DDBLTFAST_SRCCOLORKEY) && (src_surface->flags & DDSD_CKSRCBLT)) + else if (dwFlags & DDBLTFAST_SRCCOLORKEY) { blt_colorkey( dst_buf, @@ -683,21 +637,20 @@ HRESULT dds_BltFast( } } - if ((This->caps & DDSCAPS_PRIMARYSURFACE) && g_ddraw.ref && g_ddraw.render.run) + if ((This->caps & DDSCAPS_PRIMARYSURFACE) && g_ddraw && g_ddraw->render.run) { - InterlockedExchange(&g_ddraw.render.surface_updated, TRUE); - InterlockedExchange(&g_ddraw.render.screen_updated, TRUE); + InterlockedExchange(&g_ddraw->render.surface_updated, TRUE); DWORD time = timeGetTime(); if (!(This->flags & DDSD_BACKBUFFERCOUNT) || (This->last_flip_tick + FLIP_REDRAW_TIMEOUT < time && This->last_blt_tick + FLIP_REDRAW_TIMEOUT < time)) { - ReleaseSemaphore(g_ddraw.render.sem, 1, NULL); + ReleaseSemaphore(g_ddraw->render.sem, 1, NULL); - if (g_config.limiter_type == LIMIT_BLTFAST && g_ddraw.ticks_limiter.tick_length > 0) + if (g_config.limit_bltfast && g_ddraw->ticks_limiter.tick_length > 0) { - g_ddraw.ticks_limiter.dds_unlock_limiter_disabled = TRUE; + g_ddraw->ticks_limiter.use_blt_or_flip = TRUE; util_limit_game_ticks(); } } @@ -733,7 +686,8 @@ HRESULT dds_GetSurfaceDesc(IDirectDrawSurfaceImpl* This, LPDDSURFACEDESC lpDDSur DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH | - DDSD_PIXELFORMAT; + DDSD_PIXELFORMAT | + DDSD_LPSURFACE; lpDDSurfaceDesc->dwWidth = This->width; lpDDSurfaceDesc->dwHeight = This->height; @@ -750,13 +704,6 @@ HRESULT dds_GetSurfaceDesc(IDirectDrawSurfaceImpl* This, LPDDSURFACEDESC lpDDSur lpDDSurfaceDesc->dwBackBufferCount = This->backbuffer_count; } - if (This->flags & DDSD_CKSRCBLT) - { - lpDDSurfaceDesc->dwFlags |= DDSD_CKSRCBLT; - lpDDSurfaceDesc->ddckCKSrcBlt.dwColorSpaceHighValue = This->color_key.dwColorSpaceHighValue; - lpDDSurfaceDesc->ddckCKSrcBlt.dwColorSpaceLowValue = This->color_key.dwColorSpaceLowValue; - } - if (This->bpp == 8) { lpDDSurfaceDesc->ddpfPixelFormat.dwFlags |= DDPF_PALETTEINDEXED8; @@ -767,7 +714,7 @@ HRESULT dds_GetSurfaceDesc(IDirectDrawSurfaceImpl* This, LPDDSURFACEDESC lpDDSur lpDDSurfaceDesc->ddpfPixelFormat.dwGBitMask = 0x07E0; lpDDSurfaceDesc->ddpfPixelFormat.dwBBitMask = 0x001F; } - else if (This->bpp == 32 || This->bpp == 24) + else if (This->bpp == 32) { lpDDSurfaceDesc->ddpfPixelFormat.dwRBitMask = 0xFF0000; lpDDSurfaceDesc->ddpfPixelFormat.dwGBitMask = 0x00FF00; @@ -789,17 +736,8 @@ HRESULT dds_EnumAttachedSurfaces( if (This->backbuffer) { - /* Hack for carmageddon 1 lowres mode */ - if (g_config.carma95_hack && g_ddraw.height == 200) - { - dds_GetSurfaceDesc(This, (LPDDSURFACEDESC)&desc); - lpEnumSurfacesCallback((LPDIRECTDRAWSURFACE)This, (LPDDSURFACEDESC)&desc, lpContext); - } - else - { - dds_GetSurfaceDesc(This->backbuffer, (LPDDSURFACEDESC)&desc); - lpEnumSurfacesCallback((LPDIRECTDRAWSURFACE)This->backbuffer, (LPDDSURFACEDESC)&desc, lpContext); - } + dds_GetSurfaceDesc(This->backbuffer, (LPDDSURFACEDESC)&desc); + lpEnumSurfacesCallback((LPDIRECTDRAWSURFACE)This->backbuffer, (LPDDSURFACEDESC)&desc, lpContext); } return DD_OK; @@ -809,9 +747,9 @@ HRESULT dds_Flip(IDirectDrawSurfaceImpl* This, IDirectDrawSurfaceImpl* lpDDSurfa { dbg_dump_dds_flip_flags(dwFlags); - if (This->backbuffer && !This->skip_flip && !(g_config.carma95_hack && g_ddraw.height == 200)) + if (This->backbuffer && !This->skip_flip) { - EnterCriticalSection(&g_ddraw.cs); + EnterCriticalSection(&g_ddraw->cs); IDirectDrawSurfaceImpl* backbuffer = lpDDSurfaceTargetOverride ? lpDDSurfaceTargetOverride : This->backbuffer; void* buf = InterlockedExchangePointer(&This->surface, backbuffer->surface); @@ -824,12 +762,12 @@ HRESULT dds_Flip(IDirectDrawSurfaceImpl* This, IDirectDrawSurfaceImpl* lpDDSurfa InterlockedExchangePointer((void*)&backbuffer->hdc, dc); InterlockedExchangePointer(&backbuffer->mapping, map); - if (g_config.flipclear && (This->caps & DDSCAPS_PRIMARYSURFACE)) + if (g_config.flipclear) { blt_clear(buf, 0, backbuffer->size); } - LeaveCriticalSection(&g_ddraw.cs); + LeaveCriticalSection(&g_ddraw->cs); if (!lpDDSurfaceTargetOverride && This->backbuffer->backbuffer) { @@ -839,13 +777,12 @@ HRESULT dds_Flip(IDirectDrawSurfaceImpl* This, IDirectDrawSurfaceImpl* lpDDSurfa This->skip_flip = FALSE; - if ((This->caps & DDSCAPS_PRIMARYSURFACE) && g_ddraw.ref && g_ddraw.render.run) + if ((This->caps & DDSCAPS_PRIMARYSURFACE) && g_ddraw && g_ddraw->render.run) { This->last_flip_tick = timeGetTime(); - InterlockedExchange(&g_ddraw.render.surface_updated, TRUE); - InterlockedExchange(&g_ddraw.render.screen_updated, TRUE); - ReleaseSemaphore(g_ddraw.render.sem, 1, NULL); + InterlockedExchange(&g_ddraw->render.surface_updated, TRUE); + ReleaseSemaphore(g_ddraw->render.sem, 1, NULL); SwitchToThread(); if ((g_config.maxgameticks == 0 && (dwFlags & DDFLIP_WAIT)) || g_config.maxgameticks == -2) @@ -853,9 +790,9 @@ HRESULT dds_Flip(IDirectDrawSurfaceImpl* This, IDirectDrawSurfaceImpl* lpDDSurfa dd_WaitForVerticalBlank(DDWAITVB_BLOCKEND, NULL); } - if (g_ddraw.ticks_limiter.tick_length > 0 && g_config.limiter_type != LIMIT_PEEKMESSAGE) + if (g_ddraw->ticks_limiter.tick_length > 0) { - g_ddraw.ticks_limiter.dds_unlock_limiter_disabled = TRUE; + g_ddraw->ticks_limiter.use_blt_or_flip = TRUE; util_limit_game_ticks(); } } @@ -865,13 +802,18 @@ HRESULT dds_Flip(IDirectDrawSurfaceImpl* This, IDirectDrawSurfaceImpl* lpDDSurfa HRESULT dds_GetAttachedSurface(IDirectDrawSurfaceImpl* This, LPDDSCAPS lpDdsCaps, IDirectDrawSurfaceImpl** lpDDsurface) { - if (!lpDdsCaps || !lpDDsurface) - return DDERR_INVALIDPARAMS; - - if (This->backbuffer && (This->backbuffer->caps & lpDdsCaps->dwCaps) == lpDdsCaps->dwCaps) + if (lpDdsCaps->dwCaps & DDSCAPS_BACKBUFFER) { - IDirectDrawSurface_AddRef(This->backbuffer); - *lpDDsurface = This->backbuffer; + if (This->backbuffer) + { + IDirectDrawSurface_AddRef(This->backbuffer); + *lpDDsurface = This->backbuffer; + } + else + { + IDirectDrawSurface_AddRef(This); + *lpDDsurface = This; + } return DD_OK; } @@ -909,11 +851,6 @@ HRESULT dds_GetClipper(IDirectDrawSurfaceImpl* This, IDirectDrawClipperImpl** lp HRESULT dds_GetColorKey(IDirectDrawSurfaceImpl* This, DWORD dwFlags, LPDDCOLORKEY lpColorKey) { - if (!(This->flags & DDSD_CKSRCBLT)) - { - return DDERR_NOCOLORKEY; - } - if (dwFlags != DDCKEY_SRCBLT || !lpColorKey) { TRACE(" NOT_IMPLEMENTED dwFlags=%08X, lpColorKey=%p\n", dwFlags, lpColorKey); @@ -940,7 +877,7 @@ HRESULT dds_GetDC(IDirectDrawSurfaceImpl* This, HDC FAR* lpHDC) RGBQUAD* data = This->palette ? This->palette->data_rgb : - g_ddraw.ref && g_ddraw.primary && g_ddraw.primary->palette ? g_ddraw.primary->palette->data_rgb : + g_ddraw && g_ddraw->primary && g_ddraw->primary->palette ? g_ddraw->primary->palette->data_rgb : NULL; HDC dc = This->hdc; @@ -954,9 +891,6 @@ HRESULT dds_GetDC(IDirectDrawSurfaceImpl* This, HDC FAR* lpHDC) if (lpHDC) *lpHDC = dc; - if (!(This->caps & DDSCAPS_OWNDC)) - InterlockedExchange((LONG*)&This->dc_state, SaveDC(dc)); - return DD_OK; } @@ -998,7 +932,7 @@ HRESULT dds_GetPixelFormat(IDirectDrawSurfaceImpl* This, LPDDPIXELFORMAT ddpfPix ddpfPixelFormat->dwGBitMask = 0x07E0; ddpfPixelFormat->dwBBitMask = 0x001F; } - else if (This->bpp == 32 || This->bpp == 24) + else if (This->bpp == 32) { ddpfPixelFormat->dwRBitMask = 0xFF0000; ddpfPixelFormat->dwGBitMask = 0x00FF00; @@ -1023,7 +957,11 @@ HRESULT dds_Lock( dbg_dump_dds_lock_flags(dwFlags); - util_pull_messages(); + if (g_ddraw && g_config.fixnotresponding && !g_config.is_wine) + { + MSG msg; /* workaround for "Not Responding" window problem */ + real_PeekMessageA(&msg, g_ddraw->hwnd, 0, 0, PM_NOREMOVE); + } HRESULT ret = dds_GetSurfaceDesc(This, lpDDSurfaceDesc); @@ -1050,23 +988,19 @@ HRESULT dds_Lock( HRESULT dds_ReleaseDC(IDirectDrawSurfaceImpl* This, HDC hDC) { - if ((This->caps & DDSCAPS_PRIMARYSURFACE) && g_ddraw.ref && g_ddraw.render.run) + if ((This->caps & DDSCAPS_PRIMARYSURFACE) && g_ddraw && g_ddraw->render.run) { - InterlockedExchange(&g_ddraw.render.surface_updated, TRUE); - InterlockedExchange(&g_ddraw.render.screen_updated, TRUE); + InterlockedExchange(&g_ddraw->render.surface_updated, TRUE); DWORD time = timeGetTime(); if (!(This->flags & DDSD_BACKBUFFERCOUNT) || (This->last_flip_tick + FLIP_REDRAW_TIMEOUT < time && This->last_blt_tick + FLIP_REDRAW_TIMEOUT < time)) { - ReleaseSemaphore(g_ddraw.render.sem, 1, NULL); + ReleaseSemaphore(g_ddraw->render.sem, 1, NULL); } } - if (!(This->caps & DDSCAPS_OWNDC)) - RestoreDC(hDC, InterlockedExchangeAdd((LONG*)&This->dc_state, 0)); - return DD_OK; } @@ -1078,8 +1012,12 @@ HRESULT dds_SetClipper(IDirectDrawSurfaceImpl* This, IDirectDrawClipperImpl* lpC if ((This->caps & DDSCAPS_PRIMARYSURFACE) && lpClipper->hwnd) { + if (lpClipper->region) + DeleteObject(lpClipper->region); + RECT rc = { 0, 0, This->width, This->height }; - ddc_SetClipRect(lpClipper, &rc); + + lpClipper->region = CreateRectRgnIndirect(&rc); } } @@ -1100,8 +1038,6 @@ HRESULT dds_SetColorKey(IDirectDrawSurfaceImpl* This, DWORD dwFlags, LPDDCOLORKE if (lpColorKey) { - This->flags |= DDSD_CKSRCBLT; - This->color_key.dwColorSpaceLowValue = lpColorKey->dwColorSpaceLowValue; if (dwFlags & DDCKEY_COLORSPACE) @@ -1119,24 +1055,22 @@ HRESULT dds_SetColorKey(IDirectDrawSurfaceImpl* This, DWORD dwFlags, LPDDCOLORKE HRESULT dds_SetPalette(IDirectDrawSurfaceImpl* This, IDirectDrawPaletteImpl* lpDDPalette) { - if (This->bpp != 8) - return DDERR_INVALIDPIXELFORMAT; - if (lpDDPalette) IDirectDrawPalette_AddRef(lpDDPalette); - IDirectDrawPaletteImpl* old_palette = This->palette; + if (This->palette) + IDirectDrawPalette_Release(This->palette); - if ((This->caps & DDSCAPS_PRIMARYSURFACE) && g_ddraw.ref) + if ((This->caps & DDSCAPS_PRIMARYSURFACE) && g_ddraw) { - EnterCriticalSection(&g_ddraw.cs); + EnterCriticalSection(&g_ddraw->cs); This->palette = lpDDPalette; - LeaveCriticalSection(&g_ddraw.cs); + LeaveCriticalSection(&g_ddraw->cs); - if (g_ddraw.render.run) + if (g_ddraw->render.run) { - InterlockedExchange(&g_ddraw.render.palette_updated, TRUE); - ReleaseSemaphore(g_ddraw.render.sem, 1, NULL); + InterlockedExchange(&g_ddraw->render.palette_updated, TRUE); + ReleaseSemaphore(g_ddraw->render.sem, 1, NULL); } } else @@ -1144,16 +1078,13 @@ HRESULT dds_SetPalette(IDirectDrawSurfaceImpl* This, IDirectDrawPaletteImpl* lpD This->palette = lpDDPalette; } - if (old_palette) - IDirectDrawPalette_Release(old_palette); - return DD_OK; } HRESULT dds_Unlock(IDirectDrawSurfaceImpl* This, LPRECT lpRect) { /* Hack for Warcraft II BNE and Diablo */ - HWND hwnd = g_ddraw.ref && g_ddraw.bnet_active ? FindWindowEx(HWND_DESKTOP, NULL, "SDlgDialog", NULL) : NULL; + HWND hwnd = g_ddraw && g_ddraw->bnet_active ? FindWindowEx(HWND_DESKTOP, NULL, "SDlgDialog", NULL) : NULL; if (hwnd && (This->caps & DDSCAPS_PRIMARYSURFACE)) { @@ -1198,12 +1129,17 @@ HRESULT dds_Unlock(IDirectDrawSurfaceImpl* This, LPRECT lpRect) if (erase) { - blt_clear(This->surface, 0xFE, This->size); + BOOL x = g_ddraw->ticks_limiter.use_blt_or_flip; + + DDBLTFX fx = { .dwFillColor = 0xFE }; + IDirectDrawSurface_Blt(This, NULL, NULL, NULL, DDBLT_COLORFILL, &fx); + + g_ddraw->ticks_limiter.use_blt_or_flip = x; } } /* Hack for Star Trek Armada */ - hwnd = g_ddraw.ref && g_config.armadahack ? FindWindowEx(HWND_DESKTOP, NULL, "#32770", NULL) : NULL; + hwnd = g_ddraw && g_config.armadahack ? FindWindowEx(HWND_DESKTOP, NULL, "#32770", NULL) : NULL; if (hwnd && (This->caps & DDSCAPS_PRIMARYSURFACE)) { @@ -1232,28 +1168,28 @@ HRESULT dds_Unlock(IDirectDrawSurfaceImpl* This, LPRECT lpRect) ReleaseDC(hwnd, hdc); } - blt_clear(This->surface, 0x00, This->size); + BOOL x = g_ddraw->ticks_limiter.use_blt_or_flip; + + DDBLTFX fx = { .dwFillColor = 0 }; + IDirectDrawSurface_Blt(This, NULL, NULL, NULL, DDBLT_COLORFILL, &fx); + + g_ddraw->ticks_limiter.use_blt_or_flip = x; } - if ((This->caps & DDSCAPS_PRIMARYSURFACE) && g_ddraw.ref && g_ddraw.render.run) + if ((This->caps & DDSCAPS_PRIMARYSURFACE) && g_ddraw && g_ddraw->render.run) { - InterlockedExchange(&g_ddraw.render.surface_updated, TRUE); - InterlockedExchange(&g_ddraw.render.screen_updated, TRUE); + InterlockedExchange(&g_ddraw->render.surface_updated, TRUE); DWORD time = timeGetTime(); if (!(This->flags & DDSD_BACKBUFFERCOUNT) || (This->last_flip_tick + FLIP_REDRAW_TIMEOUT < time && This->last_blt_tick + FLIP_REDRAW_TIMEOUT < time)) { - ReleaseSemaphore(g_ddraw.render.sem, 1, NULL); + ReleaseSemaphore(g_ddraw->render.sem, 1, NULL); - if (g_ddraw.ticks_limiter.tick_length > 0 && - g_config.limiter_type != LIMIT_PEEKMESSAGE && - (!g_ddraw.ticks_limiter.dds_unlock_limiter_disabled || g_config.limiter_type == LIMIT_UNLOCK)) - { + if (g_ddraw->ticks_limiter.tick_length > 0 && !g_ddraw->ticks_limiter.use_blt_or_flip) util_limit_game_ticks(); - } } } @@ -1279,7 +1215,9 @@ HRESULT dds_SetSurfaceDesc(IDirectDrawSurfaceImpl* This, LPDDSURFACEDESC2 lpDDSD dbg_dump_dds_flags(lpDDSD->dwFlags); dbg_dump_dds_caps(lpDDSD->ddsCaps.dwCaps); - if ((lpDDSD->dwFlags & DDSD_LPSURFACE) == 0) + DWORD req_flags = DDSD_LPSURFACE | DDSD_PITCH | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT; + + if ((lpDDSD->dwFlags & req_flags) != req_flags) return DDERR_UNSUPPORTED; @@ -1314,52 +1252,32 @@ HRESULT dds_SetSurfaceDesc(IDirectDrawSurfaceImpl* This, LPDDSURFACEDESC2 lpDDSD This->mapping = NULL; } - if (lpDDSD->dwFlags & DDSD_PIXELFORMAT) + + switch (lpDDSD->ddpfPixelFormat.dwRGBBitCount) { - switch (lpDDSD->ddpfPixelFormat.dwRGBBitCount) - { - case 0: - break; - case 8: - This->bpp = 8; - break; - case 15: - TRACE(" NOT_IMPLEMENTED bpp=%u\n", lpDDSD->ddpfPixelFormat.dwRGBBitCount); - case 16: - This->bpp = 16; - break; - case 24: - This->bpp = 24; - break; - case 32: - This->bpp = 32; - break; - default: - TRACE(" NOT_IMPLEMENTED bpp=%u\n", lpDDSD->ddpfPixelFormat.dwRGBBitCount); - break; - } - } - - if (lpDDSD->dwFlags & DDSD_WIDTH) - { - This->width = lpDDSD->dwWidth; - } - - if (lpDDSD->dwFlags & DDSD_HEIGHT) - { - This->height = lpDDSD->dwHeight; - } - - if (lpDDSD->dwFlags & DDSD_PITCH) - { - This->pitch = lpDDSD->lPitch; - } - - if (lpDDSD->dwFlags & DDSD_LPSURFACE) - { - This->surface = lpDDSD->lpSurface; + case 8: + This->bpp = 8; + break; + case 15: + TRACE(" NOT_IMPLEMENTED bpp=%u\n", lpDDSD->ddpfPixelFormat.dwRGBBitCount); + case 16: + This->bpp = 16; + break; + case 24: + TRACE(" NOT_IMPLEMENTED bpp=%u\n", lpDDSD->ddpfPixelFormat.dwRGBBitCount); + case 32: + This->bpp = 32; + break; + default: + This->bpp = 8; + TRACE(" NOT_IMPLEMENTED bpp=%u\n", lpDDSD->ddpfPixelFormat.dwRGBBitCount); + break; } + This->width = lpDDSD->dwWidth; + This->height = lpDDSD->dwHeight; + This->surface = lpDDSD->lpSurface; + This->pitch = lpDDSD->lPitch; This->bytes_pp = This->bpp / 8; This->size = This->pitch * This->height; This->custom_buf = TRUE; @@ -1397,15 +1315,15 @@ HRESULT dd_CreateSurface( } if ((lpDDSurfaceDesc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) && - g_ddraw.primary && - g_ddraw.primary->width == g_ddraw.width && - g_ddraw.primary->height == g_ddraw.height && - g_ddraw.primary->bpp == g_ddraw.bpp) + g_ddraw->primary && + g_ddraw->primary->width == g_ddraw->width && + g_ddraw->primary->height == g_ddraw->height && + g_ddraw->primary->bpp == g_ddraw->bpp) { - g_ddraw.primary->skip_flip = TRUE; + g_ddraw->primary->skip_flip = TRUE; - *lpDDSurface = g_ddraw.primary; - IDirectDrawSurface_AddRef(g_ddraw.primary); + *lpDDSurface = g_ddraw->primary; + IDirectDrawSurface_AddRef(g_ddraw->primary); return DD_OK; } @@ -1419,7 +1337,7 @@ HRESULT dd_CreateSurface( InitializeCriticalSection(&dst_surface->cs); - dst_surface->bpp = g_ddraw.bpp == 0 ? 16 : g_ddraw.bpp; + dst_surface->bpp = g_ddraw->bpp == 0 ? 16 : g_ddraw->bpp; dst_surface->flags = lpDDSurfaceDesc->dwFlags; dst_surface->caps = lpDDSurfaceDesc->ddsCaps.dwCaps; dst_surface->ddraw = This; @@ -1443,8 +1361,7 @@ HRESULT dd_CreateSurface( dst_surface->bpp = 16; break; case 24: - dst_surface->bpp = 24; - break; + TRACE(" NOT_IMPLEMENTED bpp=%u\n", lpDDSurfaceDesc->ddpfPixelFormat.dwRGBBitCount); case 32: dst_surface->bpp = 32; break; @@ -1461,15 +1378,10 @@ HRESULT dd_CreateSurface( dst_surface->caps |= DDSCAPS_FRONTBUFFER; } - if (!(dst_surface->caps & DDSCAPS_SYSTEMMEMORY)) - { - dst_surface->caps |= DDSCAPS_VIDEOMEMORY; - } + dst_surface->width = g_ddraw->width; + dst_surface->height = g_ddraw->height; - dst_surface->caps |= DDSCAPS_VISIBLE; - - dst_surface->width = g_ddraw.width == 0 ? 1024 : g_ddraw.width; - dst_surface->height = g_ddraw.height == 0 ? 768 : g_ddraw.height; + dst_surface->caps |= DDSCAPS_VIDEOMEMORY; } else { @@ -1498,24 +1410,23 @@ HRESULT dd_CreateSurface( DWORD aligned_width = dst_surface->pitch / dst_surface->bytes_pp; + DWORD bmi_size = sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD) * 256; DWORD bmp_size = dst_surface->pitch * (dst_surface->height + g_config.guard_lines); - dst_surface->bmi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DDBITMAPINFO)); + dst_surface->bmi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bmi_size); dst_surface->bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); dst_surface->bmi->bmiHeader.biWidth = aligned_width; dst_surface->bmi->bmiHeader.biHeight = -((int)dst_surface->height + g_config.guard_lines); dst_surface->bmi->bmiHeader.biPlanes = 1; dst_surface->bmi->bmiHeader.biBitCount = dst_surface->bpp; - dst_surface->bmi->bmiHeader.biCompression = dst_surface->bpp == 16 ? BI_BITFIELDS : BI_RGB; + dst_surface->bmi->bmiHeader.biCompression = dst_surface->bpp == 8 ? BI_RGB : BI_BITFIELDS; WORD clr_bits = (WORD)(dst_surface->bmi->bmiHeader.biPlanes * dst_surface->bmi->bmiHeader.biBitCount); - dst_surface->bmi->bmiHeader.biClrUsed = - dst_surface->bpp == 8 ? 256 : - dst_surface->bpp == 16 ? 3 : - dst_surface->bpp == 24 ? 0 : - dst_surface->bpp == 32 ? 0 : - 0; + if (clr_bits < 24) + { + dst_surface->bmi->bmiHeader.biClrUsed = (1 << clr_bits); + } dst_surface->bmi->bmiHeader.biSizeImage = ((aligned_width * clr_bits + 63) & ~63) / 8 * dst_surface->height; @@ -1542,29 +1453,34 @@ HRESULT dd_CreateSurface( ((DWORD*)dst_surface->bmi->bmiColors)[1] = 0x07E0; ((DWORD*)dst_surface->bmi->bmiColors)[2] = 0x001F; } + else if (dst_surface->bpp == 32) + { + ((DWORD*)dst_surface->bmi->bmiColors)[0] = 0xFF0000; + ((DWORD*)dst_surface->bmi->bmiColors)[1] = 0x00FF00; + ((DWORD*)dst_surface->bmi->bmiColors)[2] = 0x0000FF; + } /* Claw hack: 128x128 surfaces need a DC for custom levels to work properly */ - if ((!g_config.limit_gdi_handles && InterlockedExchangeAdd(&g_dds_gdi_handles, 0) < 9000) || - (dst_surface->width == g_ddraw.width && dst_surface->height == g_ddraw.height) || + if (InterlockedExchangeAdd(&g_dds_gdi_handles, 0) < 4000 || + (dst_surface->width == g_ddraw->width && dst_surface->height == g_ddraw->height) || (dst_surface->width == 128 && dst_surface->height == 128)) { - dst_surface->hdc = CreateCompatibleDC(g_ddraw.render.hdc); + dst_surface->hdc = CreateCompatibleDC(g_ddraw->render.hdc); if (dst_surface->hdc) InterlockedIncrement(&g_dds_gdi_handles); - // CreateDIBSection cannot handle values higher than a WORD - 0xFF00 (guard lines); - DWORD map_offset = min(65280, dst_surface->pitch * g_config.guard_lines); - dst_surface->mapping = CreateFileMappingA( INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE | SEC_COMMIT, 0, - bmp_size + 256 + map_offset, + bmp_size + 256, NULL); + DWORD map_offset = 0; + if (dst_surface->mapping) { LPVOID data = MapViewOfFile(dst_surface->mapping, FILE_MAP_ALL_ACCESS, 0, 0, 0); @@ -1608,18 +1524,8 @@ HRESULT dd_CreateSurface( if (dst_surface->caps & DDSCAPS_PRIMARYSURFACE) { - g_ddraw.primary = dst_surface; + g_ddraw->primary = dst_surface; FakePrimarySurface = dst_surface->surface; - - if (dst_surface->bpp == 8) - { - IDirectDrawPaletteImpl* lpDDPalette; - dd_CreatePalette(DDPCAPS_ALLOW256, g_ddp_default_palette, &lpDDPalette, NULL); - dds_SetPalette(dst_surface, lpDDPalette); - - // Make sure temp palette will be released once replaced - IDirectDrawPalette_Release(lpDDPalette); - } } } @@ -1650,21 +1556,11 @@ HRESULT dd_CreateSurface( desc.ddsCaps.dwCaps |= DDSCAPS_FLIP; } - if (dst_surface->caps & DDSCAPS_COMPLEX) - { - desc.ddsCaps.dwCaps |= DDSCAPS_COMPLEX; - } - if (dst_surface->caps & DDSCAPS_VIDEOMEMORY) { desc.ddsCaps.dwCaps |= DDSCAPS_VIDEOMEMORY; } - if (dst_surface->caps & DDSCAPS_SYSTEMMEMORY) - { - desc.ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY; - } - desc.dwWidth = dst_surface->width; desc.dwHeight = dst_surface->height; diff --git a/src/debug.c b/src/debug.c index b030114..b63c88e 100644 --- a/src/debug.c +++ b/src/debug.c @@ -1,9 +1,6 @@ #include #include #include -#include -#include -#include "directinput.h" #include "ddraw.h" #include "dd.h" #include "ddsurface.h" @@ -11,28 +8,15 @@ #include "debug.h" #include "hook.h" #include "version.h" -#include "git.h" -#include "versionhelpers.h" -#include "utils.h" -#include "crc32.h" -#include "dllmain.h" -#include "config.h" -#include "delay_imports.h" double g_dbg_frame_time = 0; DWORD g_dbg_frame_count = 0; LPTOP_LEVEL_EXCEPTION_FILTER g_dbg_exception_filter; -PVOID g_dbg_exception_handle; static LONGLONG g_dbg_counter_start_time = 0; static double g_dbg_counter_freq = 0.0; static FILE* g_dbg_log_file; -static char g_dbg_log_path1[MAX_PATH] = "cnc-ddraw-1.log"; -static char g_dbg_log_path2[MAX_PATH] = "cnc-ddraw-2.log"; -static char g_dbg_log_path3[MAX_PATH] = "cnc-ddraw-3.log"; -static char g_dbg_dmp_path1[MAX_PATH] = "cnc-ddraw-1.dmp"; -static char g_dbg_dmp_path2[MAX_PATH] = "cnc-ddraw-2.dmp"; static BOOL g_dbg_log_rotate; #ifdef _DEBUG @@ -42,47 +26,36 @@ LONG WINAPI dbg_exception_handler(EXCEPTION_POINTERS* exception) { g_dbg_crash_count++; - BOOL(WINAPI * MiniDumpWriteDumpProc)( - HANDLE, - DWORD, - HANDLE, - MINIDUMP_TYPE, - PMINIDUMP_EXCEPTION_INFORMATION, - PMINIDUMP_USER_STREAM_INFORMATION, - PMINIDUMP_CALLBACK_INFORMATION - ); + char filename[MAX_PATH] = { 0 }; + _snprintf(filename, sizeof(filename) - 1, "cnc-ddraw-%d.dmp", g_dbg_crash_count == 1 ? 1 : 2); - MiniDumpWriteDumpProc = (void*)real_GetProcAddress(real_LoadLibraryA("Dbghelp.dll"), "MiniDumpWriteDump"); - if (MiniDumpWriteDumpProc) + HANDLE dmp = + CreateFile( + filename, + GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_WRITE | FILE_SHARE_READ, + 0, + CREATE_ALWAYS, + 0, + 0); + + if (dmp != INVALID_HANDLE_VALUE) { - HANDLE dmp = - CreateFile( - g_dbg_crash_count == 1 ? g_dbg_dmp_path1 : g_dbg_dmp_path2, - GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_WRITE | FILE_SHARE_READ, - 0, - CREATE_ALWAYS, - 0, - 0); + MINIDUMP_EXCEPTION_INFORMATION info; + info.ThreadId = GetCurrentThreadId(); + info.ExceptionPointers = exception; + info.ClientPointers = TRUE; - if (dmp != INVALID_HANDLE_VALUE) - { - MINIDUMP_EXCEPTION_INFORMATION info; - info.ThreadId = GetCurrentThreadId(); - info.ExceptionPointers = exception; - info.ClientPointers = TRUE; + MiniDumpWriteDump( + GetCurrentProcess(), + GetCurrentProcessId(), + dmp, + 0, + &info, + NULL, + NULL); - MiniDumpWriteDumpProc( - GetCurrentProcess(), - GetCurrentProcessId(), - dmp, - 0, - &info, - NULL, - NULL); - - CloseHandle(dmp); - } + CloseHandle(dmp); } if (exception && exception->ExceptionRecord) @@ -90,7 +63,7 @@ LONG WINAPI dbg_exception_handler(EXCEPTION_POINTERS* exception) HMODULE mod = NULL; char filename[MAX_PATH] = { 0 }; - if (delay_GetModuleHandleExA && delay_GetModuleHandleExA( + if (GetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, exception->ExceptionRecord->ExceptionAddress, &mod)) @@ -112,66 +85,8 @@ LONG WINAPI dbg_exception_handler(EXCEPTION_POINTERS* exception) return EXCEPTION_EXECUTE_HANDLER; } - -void __cdecl dbg_invoke_watson( - wchar_t const* const expression, - wchar_t const* const function_name, - wchar_t const* const file_name, - unsigned int const line_number, - uintptr_t const reserved -) -{ - TRACE("%s [%p]\n", __FUNCTION__, _ReturnAddress()); - - /* Force access violation to produce a dmp file for debugging */ - *(int*)0 = 0; - - TerminateProcess(GetCurrentProcess(), STATUS_INVALID_CRUNTIME_PARAMETER); -} #endif -LONG WINAPI dbg_vectored_exception_handler(EXCEPTION_POINTERS* exception) -{ - if (exception && - exception->ContextRecord && - exception->ExceptionRecord && - exception->ExceptionRecord->ExceptionAddress && - exception->ExceptionRecord->ExceptionCode == STATUS_PRIVILEGED_INSTRUCTION) - { - size_t size = 0; - BYTE* addr = exception->ExceptionRecord->ExceptionAddress; - switch (*addr) - { - case 0xE4: // IN ib - case 0xE5: // IN id - case 0xE6: // OUT ib - case 0xE7: // OUT ib - size = 2; - break; - case 0xF8: // CLC - case 0xF9: // STC - case 0xFA: // CLI - case 0xFB: // STI - case 0xFC: // CLD - case 0xFD: // STD - case 0xEC: // IN ib - case 0xED: // IN id - case 0xEE: // OUT - case 0xEF: // OUT - size = 1; - break; - } - - if (size) - { - exception->ContextRecord->Eip += size; - return EXCEPTION_CONTINUE_EXECUTION; - } - } - - return EXCEPTION_CONTINUE_SEARCH; -} - void dbg_init() { static BOOL once = 0; @@ -180,107 +95,61 @@ void dbg_init() { once = TRUE; - char exe_path[MAX_PATH] = { 0 }; - if (GetModuleFileNameA(NULL, exe_path, sizeof(exe_path) - 1) > 0) - { - char filename[MAX_PATH] = { 0 }; - char drive[MAX_PATH] = { 0 }; - char dir[MAX_PATH] = { 0 }; - _splitpath(exe_path, drive, dir, filename, NULL); + remove("cnc-ddraw-1.dmp"); + remove("cnc-ddraw-2.dmp"); - char game_path[MAX_PATH] = { 0 }; - _makepath(game_path, drive, dir, NULL, NULL); + remove("cnc-ddraw-1.log"); + remove("cnc-ddraw-2.log"); + remove("cnc-ddraw-3.log"); - _snprintf(g_dbg_dmp_path1, sizeof(g_dbg_dmp_path1) - 1, "%scnc-ddraw-%s-1.dmp", game_path, filename); - _snprintf(g_dbg_dmp_path2, sizeof(g_dbg_dmp_path2) - 1, "%scnc-ddraw-%s-2.dmp", game_path, filename); + g_dbg_log_file = fopen("cnc-ddraw-1.log", "w"); + setvbuf(g_dbg_log_file, NULL, _IOLBF, 1024); - _snprintf(g_dbg_log_path1, sizeof(g_dbg_log_path1) - 1, "%scnc-ddraw-%s-1.log", game_path, filename); - _snprintf(g_dbg_log_path2, sizeof(g_dbg_log_path2) - 1, "%scnc-ddraw-%s-2.log", game_path, filename); - _snprintf(g_dbg_log_path3, sizeof(g_dbg_log_path3) - 1, "%scnc-ddraw-%s-3.log", game_path, filename); - } + TRACE("cnc-ddraw version = %d.%d.%d.%d\n", VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD, VERSION_REVISION); - remove(g_dbg_dmp_path1); - remove(g_dbg_dmp_path2); - - remove(g_dbg_log_path1); - remove(g_dbg_log_path2); - remove(g_dbg_log_path3); - - g_dbg_log_file = fopen(g_dbg_log_path1, "w"); - if (g_dbg_log_file) - { - setvbuf(g_dbg_log_file, NULL, _IOLBF, 1024); - } - - TRACE( - "cnc-ddraw version = %d.%d.%d.%d (git~%s, %s)\n", - VERSION_MAJOR, - VERSION_MINOR, - VERSION_BUILD, - VERSION_REVISION, - GIT_COMMIT, - GIT_BRANCH); - - TRACE("cnc-ddraw = %p\n", g_ddraw_module); - - HKEY hkey = NULL; + HKEY hkey; LONG status = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", 0L, KEY_READ, &hkey); - HKEY hkey9x = NULL; - LONG status9x = - RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion", 0L, KEY_READ, &hkey9x); - - char name[256] = { 0 }; - DWORD name_size = sizeof(name); - if (status || RegQueryValueExA(hkey, "ProductName", NULL, NULL, (PVOID)&name, &name_size) != ERROR_SUCCESS) - { - if (status9x == ERROR_SUCCESS) - RegQueryValueExA(hkey9x, "ProductName", NULL, NULL, (PVOID)&name, &name_size); - } - - char vers[256] = { 0 }; - DWORD vers_size = sizeof(vers); - if (status || RegQueryValueExA(hkey, "DisplayVersion", NULL, NULL, (PVOID)&vers, &vers_size) != ERROR_SUCCESS) - { - if (status9x == ERROR_SUCCESS) - RegQueryValueExA(hkey9x, "VersionNumber", NULL, NULL, (PVOID)&vers, &vers_size); - } - - char build[256] = { 0 }; - DWORD build_size = sizeof(build); - if (status || RegQueryValueExA(hkey, "BuildLabEx", NULL, NULL, (PVOID)&build, &build_size) != ERROR_SUCCESS) - { - if (status == ERROR_SUCCESS) - RegQueryValueExA(hkey, "BuildLab", NULL, NULL, (PVOID)&build, &build_size); - } - - TRACE("%s %s (%s)\n", name, vers, build); - if (status == ERROR_SUCCESS) - RegCloseKey(hkey); - - if (status9x == ERROR_SUCCESS) - RegCloseKey(hkey9x); - - if (IsWine()) { - TRACE("Wine version = %s\n", verhelp_wine_get_version()); + char name[256] = { 0 }; + DWORD name_size = sizeof(name); + RegQueryValueExA(hkey, "ProductName", NULL, NULL, (PVOID)&name, &name_size); + char dversion[256] = { 0 }; + DWORD dversion_size = sizeof(dversion); + RegQueryValueExA(hkey, "DisplayVersion", NULL, NULL, (PVOID)&dversion, &dversion_size); + + char build[256] = { 0 }; + DWORD build_size = sizeof(build); + RegQueryValueExA(hkey, "BuildLab", NULL, NULL, (PVOID)&build, &build_size); + + TRACE("%s %s (%s)\n", name, dversion, build); + + RegCloseKey(hkey); + } + + const char* (CDECL * wine_get_version)() = + (void*)real_GetProcAddress(GetModuleHandleA("ntdll.dll"), "wine_get_version"); + + if (wine_get_version) + { + TRACE("Wine version = %s\n", wine_get_version()); + } + + void (CDECL* wine_get_host_version)(const char** sysname, const char** release) = + (void*)real_GetProcAddress(GetModuleHandleA("ntdll.dll"), "wine_get_host_version"); + + if (wine_get_host_version) + { const char* sysname = NULL; const char* release = NULL; - verhelp_wine_get_host_version(&sysname, &release); + + wine_get_host_version(&sysname, &release); TRACE("Wine sysname = %s, release = %s\n", sysname, release); } - - TRACE("crc32 = %08X\n", Crc32_FromFile(0, exe_path)); - - DWORD timestamp = util_get_timestamp(GetModuleHandleA(NULL)); - if (timestamp) - { - TRACE("timestamp = %s", asctime(_gmtime32((const long*)×tamp))); - } } } @@ -324,15 +193,12 @@ void dbg_printf(const char* fmt, ...) if (g_dbg_log_file && ftell(g_dbg_log_file) >= 1024 * 1024 * 100) /* rotate every 100MB */ { - g_dbg_log_file = - freopen( - g_dbg_log_rotate ? g_dbg_log_path3 : g_dbg_log_path2, - "w", - g_dbg_log_file); + char filename[MAX_PATH] = { 0 }; + _snprintf(filename, sizeof(filename) - 1, "cnc-ddraw-%d.log", g_dbg_log_rotate ? 3 : 2); g_dbg_log_rotate = !g_dbg_log_rotate; - if (g_dbg_log_file) + if ((g_dbg_log_file = freopen(filename, "w", g_dbg_log_file))) { setvbuf(g_dbg_log_file, NULL, _IOLBF, 1024); } @@ -386,12 +252,12 @@ void dbg_draw_frame_info_start() static DWORD tick_fps = 0; static char debug_text[512] = { 0 }; - RECT debugrc = { 0, 0, g_ddraw.width, g_ddraw.height }; + RECT debugrc = { 0, 0, g_ddraw->width, g_ddraw->height }; - if (g_ddraw.primary) + if (g_ddraw->primary) { HDC primary_dc; - dds_GetDC(g_ddraw.primary, &primary_dc); + dds_GetDC(g_ddraw->primary, &primary_dc); DrawText(primary_dc, debug_text, -1, &debugrc, DT_NOCLIP); } @@ -421,145 +287,6 @@ void dbg_draw_frame_info_end() g_dbg_frame_time = dbg_counter_stop(); } -void dbg_dump_wnd_styles(DWORD style, DWORD exstyle) -{ -#ifdef _DEBUG - if (style & WS_BORDER) { - TRACE(" WS_BORDER\n"); - } - if (style & WS_CAPTION) { - TRACE(" WS_CAPTION\n"); - } - if (style & WS_CHILD) { - TRACE(" WS_CHILD\n"); - } - if (style & WS_CHILDWINDOW) { - TRACE(" WS_CHILDWINDOW\n"); - } - if (style & WS_CLIPCHILDREN) { - TRACE(" WS_CLIPCHILDREN\n"); - } - if (style & WS_CLIPSIBLINGS) { - TRACE(" WS_CLIPSIBLINGS\n"); - } - if (style & WS_DISABLED) { - TRACE(" WS_DISABLED\n"); - } - if (style & WS_DLGFRAME) { - TRACE(" WS_DLGFRAME\n"); - } - if (style & WS_GROUP) { - TRACE(" WS_GROUP\n"); - } - if (style & WS_HSCROLL) { - TRACE(" WS_HSCROLL\n"); - } - if (style & WS_ICONIC) { - TRACE(" WS_ICONIC\n"); - } - if (style & WS_MAXIMIZE) { - TRACE(" WS_MAXIMIZE\n"); - } - if (style & WS_MAXIMIZEBOX) { - TRACE(" WS_MAXIMIZEBOX\n"); - } - if (style & WS_MINIMIZE) { - TRACE(" WS_MINIMIZE\n"); - } - if (style & WS_MINIMIZEBOX) { - TRACE(" WS_MINIMIZEBOX\n"); - } - if (style & WS_POPUP) { - TRACE(" WS_POPUP\n"); - } - if (style & WS_SIZEBOX) { - TRACE(" WS_SIZEBOX\n"); - } - if (style & WS_SYSMENU) { - TRACE(" WS_SYSMENU\n"); - } - if (style & WS_TABSTOP) { - TRACE(" WS_TABSTOP\n"); - } - if (style & WS_THICKFRAME) { - TRACE(" WS_THICKFRAME\n"); - } - if (style & WS_VISIBLE) { - TRACE(" WS_VISIBLE\n"); - } - if (style & WS_VSCROLL) { - TRACE(" WS_VSCROLL\n"); - } - - if (exstyle & WS_EX_ACCEPTFILES) { - TRACE(" WS_EX_ACCEPTFILES\n"); - } - if (exstyle & WS_EX_APPWINDOW) { - TRACE(" WS_EX_APPWINDOW\n"); - } - if (exstyle & WS_EX_CLIENTEDGE) { - TRACE(" WS_EX_CLIENTEDGE\n"); - } - if (exstyle & WS_EX_COMPOSITED) { - TRACE(" WS_EX_COMPOSITED\n"); - } - if (exstyle & WS_EX_CONTEXTHELP) { - TRACE(" WS_EX_CONTEXTHELP\n"); - } - if (exstyle & WS_EX_CONTROLPARENT) { - TRACE(" WS_EX_CONTROLPARENT\n"); - } - if (exstyle & WS_EX_DLGMODALFRAME) { - TRACE(" WS_EX_DLGMODALFRAME\n"); - } - if (exstyle & WS_EX_LAYERED) { - TRACE(" WS_EX_LAYERED\n"); - } - if (exstyle & WS_EX_LAYOUTRTL) { - TRACE(" WS_EX_LAYOUTRTL\n"); - } - if (exstyle & WS_EX_LEFTSCROLLBAR) { - TRACE(" WS_EX_LEFTSCROLLBAR\n"); - } - if (exstyle & WS_EX_MDICHILD) { - TRACE(" WS_EX_MDICHILD\n"); - } - if (exstyle & WS_EX_NOACTIVATE) { - TRACE(" WS_EX_NOACTIVATE\n"); - } - if (exstyle & WS_EX_NOINHERITLAYOUT) { - TRACE(" WS_EX_NOINHERITLAYOUT\n"); - } - if (exstyle & WS_EX_NOPARENTNOTIFY) { - TRACE(" WS_EX_NOPARENTNOTIFY\n"); - } - //if (exstyle & WS_EX_NOREDIRECTIONBITMAP) { - // TRACE(" WS_EX_NOREDIRECTIONBITMAP\n"); - //} - if (exstyle & WS_EX_RIGHT) { - TRACE(" WS_EX_RIGHT\n"); - } - if (exstyle & WS_EX_RTLREADING) { - TRACE(" WS_EX_RTLREADING\n"); - } - if (exstyle & WS_EX_STATICEDGE) { - TRACE(" WS_EX_STATICEDGE\n"); - } - if (exstyle & WS_EX_TOOLWINDOW) { - TRACE(" WS_EX_TOOLWINDOW\n"); - } - if (exstyle & WS_EX_TOPMOST) { - TRACE(" WS_EX_TOPMOST\n"); - } - if (exstyle & WS_EX_TRANSPARENT) { - TRACE(" WS_EX_TRANSPARENT\n"); - } - if (exstyle & WS_EX_WINDOWEDGE) { - TRACE(" WS_EX_WINDOWEDGE\n"); - } -#endif -} - void dbg_dump_swp_flags(DWORD flags) { #ifdef _DEBUG @@ -1091,111 +818,6 @@ void dbg_dump_dds_lock_flags(DWORD flags) #endif } -void dbg_dump_di_scm_flags(DWORD flags) -{ -#ifdef _DEBUG - if (flags & DISCL_EXCLUSIVE) { - TRACE(" DISCL_EXCLUSIVE\n"); - } - if (flags & DISCL_NONEXCLUSIVE) { - TRACE(" DISCL_NONEXCLUSIVE\n"); - } - if (flags & DISCL_FOREGROUND) { - TRACE(" DISCL_FOREGROUND\n"); - } - if (flags & DISCL_BACKGROUND) { - TRACE(" DISCL_BACKGROUND\n"); - } - if (flags & DISCL_NOWINKEY) { - TRACE(" DISCL_NOWINKEY\n"); - } -#endif -} - -void dbg_dump_hook_type(int idHook) -{ -#ifdef _DEBUG - if (idHook == 0) { - TRACE(" WH_JOURNALRECORD\n"); - } - if (idHook == 1) { - TRACE(" WH_JOURNALPLAYBACK\n"); - } - if (idHook == 2) { - TRACE(" WH_KEYBOARD\n"); - } - if (idHook == 3) { - TRACE(" WH_GETMESSAGE\n"); - } - if (idHook == 4) { - TRACE(" WH_CALLWNDPROC\n"); - } - if (idHook == 5) { - TRACE(" WH_CBT\n"); - } - if (idHook == 6) { - TRACE(" WH_SYSMSGFILTER\n"); - } - if (idHook == 7) { - TRACE(" WH_MOUSE\n"); - } - if (idHook == 9) { - TRACE(" WH_DEBUG\n"); - } - if (idHook == 10) { - TRACE(" WH_SHELL\n"); - } - if (idHook == 11) { - TRACE(" WH_FOREGROUNDIDLE\n"); - } - if (idHook == 12) { - TRACE(" WH_CALLWNDPROCRET\n"); - } - if (idHook == 13) { - TRACE(" WH_KEYBOARD_LL\n"); - } - if (idHook == 14) { - TRACE(" WH_MOUSE_LL\n"); - } - if (idHook == -1) { - TRACE(" WH_MSGFILTER\n"); - } -#endif -} - -char* dbg_d3d9_hr_to_str(HRESULT hr) -{ -#define HR_TO_STR(x) if (x == hr) return #x - - HR_TO_STR(D3D_OK); - - HR_TO_STR(D3DERR_WRONGTEXTUREFORMAT); - HR_TO_STR(D3DERR_UNSUPPORTEDCOLOROPERATION); - HR_TO_STR(D3DERR_UNSUPPORTEDCOLORARG); - HR_TO_STR(D3DERR_UNSUPPORTEDALPHAOPERATION); - HR_TO_STR(D3DERR_UNSUPPORTEDALPHAARG); - HR_TO_STR(D3DERR_TOOMANYOPERATIONS); - HR_TO_STR(D3DERR_CONFLICTINGTEXTUREFILTER); - HR_TO_STR(D3DERR_UNSUPPORTEDFACTORVALUE); - HR_TO_STR(D3DERR_CONFLICTINGRENDERSTATE); - HR_TO_STR(D3DERR_UNSUPPORTEDTEXTUREFILTER); - HR_TO_STR(D3DERR_CONFLICTINGTEXTUREPALETTE); - HR_TO_STR(D3DERR_DRIVERINTERNALERROR); - - HR_TO_STR(D3DERR_NOTFOUND); - HR_TO_STR(D3DERR_MOREDATA); - HR_TO_STR(D3DERR_DEVICELOST); - HR_TO_STR(D3DERR_DEVICENOTRESET); - HR_TO_STR(D3DERR_NOTAVAILABLE); - HR_TO_STR(D3DERR_OUTOFVIDEOMEMORY); - HR_TO_STR(D3DERR_INVALIDDEVICE); - HR_TO_STR(D3DERR_INVALIDCALL); - HR_TO_STR(D3DERR_DRIVERINVALIDCALL); - HR_TO_STR(D3DERR_WASSTILLDRAWING); - - return "UNKNOWN"; -} - char* dbg_mes_to_str(int id) { switch (id) diff --git a/src/delay_imports.c b/src/delay_imports.c deleted file mode 100644 index 2b23dda..0000000 --- a/src/delay_imports.c +++ /dev/null @@ -1,30 +0,0 @@ -#include -#include "versionhelpers.h" -#include "delay_imports.h" - -NTQUERYINFORMATIONTHREADPROC delay_NtQueryInformationThread; -RTLVERIFYVERSIONINFOPROC delay_RtlVerifyVersionInfo; -WINE_GET_VERSIONPROC delay_wine_get_version; -WINE_GET_HOST_VERSIONPROC delay_wine_get_host_version; - -VERSETCONDITIONMASKPROC delay_VerSetConditionMask; -GETMODULEHANDLEEXAPROC delay_GetModuleHandleExA; - -void delay_imports_init() -{ - HMODULE mod = GetModuleHandleA("ntdll.dll"); - if (mod) - { - delay_NtQueryInformationThread = (NTQUERYINFORMATIONTHREADPROC)GetProcAddress(mod, "NtQueryInformationThread"); - delay_RtlVerifyVersionInfo = (RTLVERIFYVERSIONINFOPROC)GetProcAddress(mod, "RtlVerifyVersionInfo"); - delay_wine_get_version = (WINE_GET_VERSIONPROC)GetProcAddress(mod, "wine_get_version"); - delay_wine_get_host_version = (WINE_GET_HOST_VERSIONPROC)GetProcAddress(mod, "wine_get_host_version"); - } - - mod = GetModuleHandleA("Kernel32.dll"); - if (mod) - { - delay_VerSetConditionMask = (VERSETCONDITIONMASKPROC)GetProcAddress(mod, "VerSetConditionMask"); - delay_GetModuleHandleExA = (GETMODULEHANDLEEXAPROC)GetProcAddress(mod, "GetModuleHandleExA"); - } -} diff --git a/src/directinput.c b/src/directinput.c index a0d077d..b21578c 100644 --- a/src/directinput.c +++ b/src/directinput.c @@ -6,7 +6,6 @@ #include "dd.h" #include "mouse.h" #include "config.h" -#include "utils.h" #ifdef _MSC_VER #include "detours.h" @@ -24,20 +23,10 @@ static DICREATEDEVICEEXPROC real_di_CreateDeviceEx; static DIDSETCOOPERATIVELEVELPROC real_did_SetCooperativeLevel; static DIDGETDEVICEDATAPROC real_did_GetDeviceData; static DIDGETDEVICESTATEPROC real_did_GetDeviceState; - -static PROC* g_di_CreateDevice_vtbl_addr; -static PROC* g_di_CreateDeviceEx_vtbl_addr; -static PROC* g_did_SetCooperativeLevel_vtbl_addr; -static PROC* g_did_GetDeviceData_vtbl_addr; -static PROC* g_did_GetDeviceState_vtbl_addr; - static LPDIRECTINPUTDEVICEA g_mouse_device; static PROC hook_func(PROC* org_func, PROC new_func) { - if (!org_func || !new_func) - return 0; - PROC org = *org_func; DWORD old_protect; @@ -54,18 +43,16 @@ static PROC hook_func(PROC* org_func, PROC new_func) static HRESULT WINAPI fake_did_SetCooperativeLevel(IDirectInputDeviceA* This, HWND hwnd, DWORD dwFlags) { - TRACE("DirectInput SetCooperativeLevel(This=%p, hwnd=%p, dwFlags=0x%08X) [%p]\n", This, hwnd, dwFlags, _ReturnAddress()); - TRACE(" mouse_device = %s\n", This == g_mouse_device ? "TRUE" : "FALSE"); - dbg_dump_di_scm_flags(dwFlags); + TRACE("DirectInput SetCooperativeLevel(This=%p, hwnd=%p, dwFlags=0x%08X)\n", This, hwnd, dwFlags); - if (This == g_mouse_device && (dwFlags & DISCL_EXCLUSIVE)) + if (This == g_mouse_device && g_ddraw && (dwFlags & DISCL_EXCLUSIVE)) { - if (g_mouse_locked || g_config.devmode || !g_ddraw.ref) + if (g_mouse_locked || g_config.devmode) { while (real_ShowCursor(FALSE) >= 0); } - InterlockedExchange((LONG*)&g_ddraw.show_cursor_count, -1); + InterlockedExchange((LONG*)&g_ddraw->show_cursor_count, -1); } return real_did_SetCooperativeLevel(This, hwnd, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE); @@ -78,25 +65,13 @@ static HRESULT WINAPI fake_did_GetDeviceData( LPDWORD pdwInOut, DWORD dwFlags) { - /* - TRACE( - "DirectInput GetDeviceData(This=%p, cbObjectData=%lu, rgdod=%p, pdwInOut=%p, dwFlags=%lu) [%p]\n", - This, - cbObjectData, - rgdod, - pdwInOut, - dwFlags, - _ReturnAddress()); - */ - - BOOL block_mouse = This == g_mouse_device && !g_mouse_locked && !g_config.devmode; - BOOL in_background = FALSE;//g_ddraw.ref && g_ddraw.hwnd && !util_in_foreground(g_ddraw.hwnd); + //TRACE("DirectInput GetDeviceData\n"); HRESULT result = real_did_GetDeviceData(This, cbObjectData, rgdod, pdwInOut, dwFlags); - if (SUCCEEDED(result)) + if (SUCCEEDED(result) && g_ddraw && !g_mouse_locked && !g_config.devmode) { - if ((block_mouse || in_background) && pdwInOut) + if (pdwInOut) { if (rgdod && *pdwInOut > 0 && cbObjectData > 0) { @@ -112,16 +87,13 @@ static HRESULT WINAPI fake_did_GetDeviceData( static HRESULT WINAPI fake_did_GetDeviceState(IDirectInputDeviceA* This, DWORD cbData, LPVOID lpvData) { - //TRACE("DirectInput GetDeviceState(This=%p, cbData=%lu, lpvData=%p) [%p]\n", This, cbData, lpvData, _ReturnAddress()); - - BOOL block_mouse = This == g_mouse_device && !g_mouse_locked && !g_config.devmode; - BOOL in_background = g_ddraw.ref && g_ddraw.hwnd && !util_in_foreground(g_ddraw.hwnd); + //TRACE("DirectInput GetDeviceState\n"); HRESULT result = real_did_GetDeviceState(This, cbData, lpvData); - if (SUCCEEDED(result)) + if (SUCCEEDED(result) && g_ddraw && !g_mouse_locked && !g_config.devmode) { - if ((block_mouse || in_background) && cbData > 0 && lpvData) + if (cbData > 0 && lpvData) { memset(lpvData, 0, cbData); } @@ -136,38 +108,30 @@ static HRESULT WINAPI fake_di_CreateDevice( LPDIRECTINPUTDEVICEA* lplpDIDevice, LPUNKNOWN pUnkOuter) { - TRACE("DirectInput CreateDevice [%p]\n", _ReturnAddress()); + TRACE("DirectInput CreateDevice\n"); HRESULT result = real_di_CreateDevice(This, rguid, lplpDIDevice, pUnkOuter); if (SUCCEEDED(result)) { - if (rguid) + if (rguid && IsEqualGUID(&GUID_SysMouse, rguid)) { - TRACE(" GUID = %08X\n", ((GUID*)rguid)->Data1); - - if (IsEqualGUID(&GUID_SysMouse, rguid)) - { - g_mouse_device = *lplpDIDevice; - } + g_mouse_device = *lplpDIDevice; } if (!real_did_SetCooperativeLevel) { - g_did_SetCooperativeLevel_vtbl_addr = (PROC*)&(*lplpDIDevice)->lpVtbl->SetCooperativeLevel; - real_did_SetCooperativeLevel = - (DIDSETCOOPERATIVELEVELPROC)hook_func(g_did_SetCooperativeLevel_vtbl_addr, (PROC)fake_did_SetCooperativeLevel); - - g_did_GetDeviceData_vtbl_addr = (PROC*)&(*lplpDIDevice)->lpVtbl->GetDeviceData; + (DIDSETCOOPERATIVELEVELPROC)hook_func( + (PROC*)&(*lplpDIDevice)->lpVtbl->SetCooperativeLevel, (PROC)fake_did_SetCooperativeLevel); real_did_GetDeviceData = - (DIDGETDEVICEDATAPROC)hook_func(g_did_GetDeviceData_vtbl_addr, (PROC)fake_did_GetDeviceData); - - g_did_GetDeviceState_vtbl_addr = (PROC*)&(*lplpDIDevice)->lpVtbl->GetDeviceState; + (DIDGETDEVICEDATAPROC)hook_func( + (PROC*)&(*lplpDIDevice)->lpVtbl->GetDeviceData, (PROC)fake_did_GetDeviceData); real_did_GetDeviceState = - (DIDGETDEVICESTATEPROC)hook_func(g_did_GetDeviceState_vtbl_addr, (PROC)fake_did_GetDeviceState); + (DIDGETDEVICESTATEPROC)hook_func( + (PROC*)&(*lplpDIDevice)->lpVtbl->GetDeviceState, (PROC)fake_did_GetDeviceState); } } @@ -181,38 +145,30 @@ static HRESULT WINAPI fake_di_CreateDeviceEx( LPDIRECTINPUTDEVICEA* lplpDIDevice, LPUNKNOWN pUnkOuter) { - TRACE("DirectInput CreateDeviceEx [%p]\n", _ReturnAddress()); + TRACE("DirectInput CreateDeviceEx\n"); HRESULT result = real_di_CreateDeviceEx(This, rguid, riid, lplpDIDevice, pUnkOuter); if (SUCCEEDED(result)) { - if (rguid) + if (rguid && IsEqualGUID(&GUID_SysMouse, rguid)) { - TRACE(" GUID = %08X\n", ((GUID*)rguid)->Data1); - - if (IsEqualGUID(&GUID_SysMouse, rguid)) - { - g_mouse_device = *lplpDIDevice; - } + g_mouse_device = *lplpDIDevice; } if (!real_did_SetCooperativeLevel) { - g_did_SetCooperativeLevel_vtbl_addr = (PROC*)&(*lplpDIDevice)->lpVtbl->SetCooperativeLevel; - real_did_SetCooperativeLevel = - (DIDSETCOOPERATIVELEVELPROC)hook_func(g_did_SetCooperativeLevel_vtbl_addr, (PROC)fake_did_SetCooperativeLevel); - - g_did_GetDeviceData_vtbl_addr = (PROC*)&(*lplpDIDevice)->lpVtbl->GetDeviceData; + (DIDSETCOOPERATIVELEVELPROC)hook_func( + (PROC*)&(*lplpDIDevice)->lpVtbl->SetCooperativeLevel, (PROC)fake_did_SetCooperativeLevel); real_did_GetDeviceData = - (DIDGETDEVICEDATAPROC)hook_func(g_did_GetDeviceData_vtbl_addr, (PROC)fake_did_GetDeviceData); - - g_did_GetDeviceState_vtbl_addr = (PROC*)&(*lplpDIDevice)->lpVtbl->GetDeviceState; + (DIDGETDEVICEDATAPROC)hook_func( + (PROC*)&(*lplpDIDevice)->lpVtbl->GetDeviceData, (PROC)fake_did_GetDeviceData); real_did_GetDeviceState = - (DIDGETDEVICESTATEPROC)hook_func(g_did_GetDeviceState_vtbl_addr, (PROC)fake_did_GetDeviceState); + (DIDGETDEVICESTATEPROC)hook_func( + (PROC*)&(*lplpDIDevice)->lpVtbl->GetDeviceState, (PROC)fake_did_GetDeviceState); } } @@ -225,12 +181,12 @@ HRESULT WINAPI fake_DirectInputCreateA( LPDIRECTINPUTA* lplpDirectInput, LPUNKNOWN punkOuter) { - TRACE("DirectInputCreateA [%p]\n", _ReturnAddress()); + TRACE("DirectInputCreateA\n"); if (!real_DirectInputCreateA) { real_DirectInputCreateA = - (DIRECTINPUTCREATEAPROC)real_GetProcAddress(real_LoadLibraryA("dinput.dll"), "DirectInputCreateA"); + (DIRECTINPUTCREATEAPROC)real_GetProcAddress(GetModuleHandle("dinput.dll"), "DirectInputCreateA"); if (real_DirectInputCreateA == fake_DirectInputCreateA) { @@ -248,10 +204,8 @@ HRESULT WINAPI fake_DirectInputCreateA( if (SUCCEEDED(result) && !real_di_CreateDevice && !g_config.no_dinput_hook) { - g_di_CreateDevice_vtbl_addr = (PROC*)&(*lplpDirectInput)->lpVtbl->CreateDevice; - real_di_CreateDevice = - (DICREATEDEVICEPROC)hook_func(g_di_CreateDevice_vtbl_addr, (PROC)fake_di_CreateDevice); + (DICREATEDEVICEPROC)hook_func((PROC*)&(*lplpDirectInput)->lpVtbl->CreateDevice, (PROC)fake_di_CreateDevice); } return result; @@ -263,12 +217,12 @@ HRESULT WINAPI fake_DirectInputCreateW( LPDIRECTINPUTW* lplpDirectInput, LPUNKNOWN punkOuter) { - TRACE("DirectInputCreateW [%p]\n", _ReturnAddress()); + TRACE("DirectInputCreateW\n"); if (!real_DirectInputCreateW) { real_DirectInputCreateW = - (DIRECTINPUTCREATEWPROC)real_GetProcAddress(real_LoadLibraryA("dinput.dll"), "DirectInputCreateW"); + (DIRECTINPUTCREATEWPROC)real_GetProcAddress(GetModuleHandle("dinput.dll"), "DirectInputCreateW"); if (real_DirectInputCreateW == fake_DirectInputCreateW) { @@ -286,10 +240,8 @@ HRESULT WINAPI fake_DirectInputCreateW( if (SUCCEEDED(result) && !real_di_CreateDevice && !g_config.no_dinput_hook) { - g_di_CreateDevice_vtbl_addr = (PROC*)&(*lplpDirectInput)->lpVtbl->CreateDevice; - real_di_CreateDevice = - (DICREATEDEVICEPROC)hook_func(g_di_CreateDevice_vtbl_addr, (PROC)fake_di_CreateDevice); + (DICREATEDEVICEPROC)hook_func((PROC*)&(*lplpDirectInput)->lpVtbl->CreateDevice, (PROC)fake_di_CreateDevice); } return result; @@ -302,12 +254,12 @@ HRESULT WINAPI fake_DirectInputCreateEx( LPDIRECTINPUT7A* ppvOut, LPUNKNOWN punkOuter) { - TRACE("DirectInputCreateEx [%p]\n", _ReturnAddress()); + TRACE("DirectInputCreateEx\n"); if (!real_DirectInputCreateEx) { real_DirectInputCreateEx = - (DIRECTINPUTCREATEEXPROC)real_GetProcAddress(real_LoadLibraryA("dinput.dll"), "DirectInputCreateEx"); + (DIRECTINPUTCREATEEXPROC)real_GetProcAddress(GetModuleHandle("dinput.dll"), "DirectInputCreateEx"); if (real_DirectInputCreateEx == fake_DirectInputCreateEx) { @@ -325,10 +277,8 @@ HRESULT WINAPI fake_DirectInputCreateEx( if (SUCCEEDED(result) && !real_di_CreateDevice && !g_config.no_dinput_hook) { - g_di_CreateDevice_vtbl_addr = (PROC*)&(*ppvOut)->lpVtbl->CreateDevice; - real_di_CreateDevice = - (DICREATEDEVICEPROC)hook_func(g_di_CreateDevice_vtbl_addr, (PROC)fake_di_CreateDevice); + (DICREATEDEVICEPROC)hook_func((PROC*)&(*ppvOut)->lpVtbl->CreateDevice, (PROC)fake_di_CreateDevice); } if (SUCCEEDED(result) && @@ -337,10 +287,8 @@ HRESULT WINAPI fake_DirectInputCreateEx( (IsEqualGUID(&IID_IDirectInput7A, riidltf) || IsEqualGUID(&IID_IDirectInput7W, riidltf)) && !g_config.no_dinput_hook) { - g_di_CreateDeviceEx_vtbl_addr = (PROC*)&(*ppvOut)->lpVtbl->CreateDeviceEx; - real_di_CreateDeviceEx = - (DICREATEDEVICEEXPROC)hook_func(g_di_CreateDeviceEx_vtbl_addr, (PROC)fake_di_CreateDeviceEx); + (DICREATEDEVICEEXPROC)hook_func((PROC*)&(*ppvOut)->lpVtbl->CreateDeviceEx, (PROC)fake_di_CreateDeviceEx); } return result; @@ -353,12 +301,12 @@ HRESULT WINAPI fake_DirectInput8Create( LPDIRECTINPUT8* ppvOut, LPUNKNOWN punkOuter) { - TRACE("DirectInput8Create [%p]\n", _ReturnAddress()); + TRACE("DirectInput8Create\n"); if (!real_DirectInput8Create) { real_DirectInput8Create = - (DIRECTINPUT8CREATEPROC)real_GetProcAddress(real_LoadLibraryA("dinput8.dll"), "DirectInput8Create"); + (DIRECTINPUT8CREATEPROC)real_GetProcAddress(GetModuleHandle("dinput8.dll"), "DirectInput8Create"); if (real_DirectInput8Create == fake_DirectInput8Create) { @@ -376,10 +324,8 @@ HRESULT WINAPI fake_DirectInput8Create( if (SUCCEEDED(result) && !real_di_CreateDevice && !g_config.no_dinput_hook) { - g_di_CreateDevice_vtbl_addr = (PROC*)&(*ppvOut)->lpVtbl->CreateDevice; - real_di_CreateDevice = - (DICREATEDEVICEPROC)hook_func(g_di_CreateDevice_vtbl_addr, (PROC)fake_di_CreateDevice); + (DICREATEDEVICEPROC)hook_func((PROC*)&(*ppvOut)->lpVtbl->CreateDevice, (PROC)fake_di_CreateDevice); } return result; @@ -437,12 +383,6 @@ void dinput_hook_init() void dinput_hook_exit() { - hook_func(g_di_CreateDevice_vtbl_addr, (PROC)real_di_CreateDevice); - hook_func(g_di_CreateDeviceEx_vtbl_addr, (PROC)real_di_CreateDeviceEx); - hook_func(g_did_SetCooperativeLevel_vtbl_addr, (PROC)real_did_SetCooperativeLevel); - hook_func(g_did_GetDeviceData_vtbl_addr, (PROC)real_did_GetDeviceData); - hook_func(g_did_GetDeviceState_vtbl_addr, (PROC)real_did_GetDeviceState); - #ifdef _MSC_VER if (g_dinput_hook_active) { diff --git a/src/dllmain.c b/src/dllmain.c index 8832177..ee3c2cc 100644 --- a/src/dllmain.c +++ b/src/dllmain.c @@ -9,11 +9,6 @@ #include "debug.h" #include "config.h" #include "hook.h" -#include "indeo.h" -#include "utils.h" -#include "versionhelpers.h" -#include "delay_imports.h" -#include "keyboard.h" /* export for cncnet cnc games */ @@ -24,7 +19,6 @@ PVOID FakePrimarySurface; HMODULE g_ddraw_module; -static BOOL g_screensaver_disabled; BOOL WINAPI DllMain(HANDLE hDll, DWORD dwReason, LPVOID lpReserved) { @@ -34,9 +28,7 @@ BOOL WINAPI DllMain(HANDLE hDll, DWORD dwReason, LPVOID lpReserved) { g_ddraw_module = hDll; - delay_imports_init(); - - if (GetEnvironmentVariable("cnc_ddraw_config_init", NULL, 0)) + if (GetEnvironmentVariableW(L"cnc_ddraw_config_init", NULL, 0)) { cfg_load(); return TRUE; @@ -44,19 +36,12 @@ BOOL WINAPI DllMain(HANDLE hDll, DWORD dwReason, LPVOID lpReserved) #ifdef _DEBUG dbg_init(); + TRACE("cnc-ddraw = %p\n", hDll); g_dbg_exception_filter = real_SetUnhandledExceptionFilter((LPTOP_LEVEL_EXCEPTION_FILTER)dbg_exception_handler); #endif cfg_load(); - PVOID(WINAPI * add_handler)(ULONG, PVECTORED_EXCEPTION_HANDLER) = - (void*)real_GetProcAddress(GetModuleHandleA("Kernel32.dll"), "AddVectoredExceptionHandler"); - - if (add_handler) - { - g_dbg_exception_handle = add_handler(1, (PVECTORED_EXCEPTION_HANDLER)dbg_vectored_exception_handler); - } - char buf[1024]; if (GetEnvironmentVariable("__COMPAT_LAYER", buf, sizeof(buf))) @@ -75,18 +60,16 @@ BOOL WINAPI DllMain(HANDLE hDll, DWORD dwReason, LPVOID lpReserved) if (_strcmpi(s, "WIN95") == 0 || _strcmpi(s, "WIN98") == 0 || _strcmpi(s, "NT4SP5") == 0) { - char mes[280] = { 0 }; + char mes[128] = { 0 }; _snprintf( mes, sizeof(mes) - 1, - "Warning: Compatibility modes detected. \n\nIf there are issues with the game then try to " - "disable the '%s' compatibility mode for all game executables.\n\n" - "Note: You can disable this warning via ddraw.ini -> 'no_compat_warning=true'", + "Please disable the '%s' compatibility mode for all game executables and " + "then try to start the game again.", s); - if (!g_config.no_compat_warning) - MessageBoxA(NULL, mes, "Compatibility modes detected - cnc-ddraw", MB_OK); + MessageBoxA(NULL, mes, "Compatibility modes detected - cnc-ddraw", MB_OK); break; } @@ -133,160 +116,61 @@ BOOL WINAPI DllMain(HANDLE hDll, DWORD dwReason, LPVOID lpReserved) set_aware(); } - /* Make sure screensaver will stay off and monitors will stay on */ - SetThreadExecutionState(ES_CONTINUOUS | ES_DISPLAY_REQUIRED); - - /* WINE does not support SetThreadExecutionState so we'll have to use SPI_SETSCREENSAVEACTIVE instead */ - BOOL screensaver_enabled = FALSE; - SystemParametersInfoA(SPI_GETSCREENSAVEACTIVE, 0, &screensaver_enabled, 0); - - if (screensaver_enabled) - { - SystemParametersInfoA(SPI_SETSCREENSAVEACTIVE, FALSE, NULL, 0); - g_screensaver_disabled = TRUE; - } - - indeo_enable(); timeBeginPeriod(1); - hook_init(); + hook_init(TRUE); break; } case DLL_PROCESS_DETACH: { - if (GetEnvironmentVariable("cnc_ddraw_config_init", NULL, 0)) + if (GetEnvironmentVariableW(L"cnc_ddraw_config_init", NULL, 0)) return TRUE; TRACE("cnc-ddraw DLL_PROCESS_DETACH\n"); cfg_save(); - indeo_disable(); timeEndPeriod(1); - keyboard_hook_exit(); dinput_hook_exit(); hook_exit(); - - SetThreadExecutionState(ES_CONTINUOUS); - - if (g_screensaver_disabled) - { - SystemParametersInfoA(SPI_SETSCREENSAVEACTIVE, TRUE, NULL, 0); - } - - ULONG(WINAPI* remove_handler)(PVOID) = - (void*)real_GetProcAddress(GetModuleHandleA("Kernel32.dll"), "RemoveVectoredExceptionHandler"); - - if (g_dbg_exception_handle && remove_handler) - remove_handler(g_dbg_exception_handle); - - if (g_config.terminate_process == 2) - TerminateProcess(GetCurrentProcess(), 0); - break; } - case DLL_THREAD_ATTACH: - { - if (g_config.singlecpu && !IsWine() && IsWindows11Version24H2OrGreater()) - { - util_set_thread_affinity(GetCurrentThreadId()); - } - } } return TRUE; } -void DDEnableZoom() -{ - TRACE("%s [%p]\n", __FUNCTION__, _ReturnAddress()); - - g_ddraw.zoom.enabled = TRUE; -} - BOOL DDIsWindowed() { - TRACE("%s [%p]\n", __FUNCTION__, _ReturnAddress()); - return g_config.windowed && !g_config.fullscreen; } -FARPROC WINAPI DDGetProcAddress(HMODULE hModule, LPCSTR lpProcName) -{ - TRACE("%s [%p]\n", __FUNCTION__, _ReturnAddress()); - - return real_GetProcAddress(hModule, lpProcName); -} - HRESULT WINAPI DirectDrawCreate(GUID FAR* lpGUID, LPDIRECTDRAW FAR* lplpDD, IUnknown FAR* pUnkOuter) { - TRACE("-> %s(lpGUID=%p, lplpDD=%p, pUnkOuter=%p) [%p]\n", __FUNCTION__, lpGUID, lplpDD, pUnkOuter, _ReturnAddress()); - - HRESULT ret; - - if (util_caller_is_ddraw_wrapper(_ReturnAddress()) || g_config.flightsim98_hack) - { - if (lplpDD) - *lplpDD = NULL; - - ret = DDERR_GENERIC; - } - else - { - ret = dd_CreateEx(lpGUID, (LPVOID*)lplpDD, &IID_IDirectDraw, pUnkOuter); - } - + TRACE("-> %s(lpGUID=%p, lplpDD=%p, pUnkOuter=%p)\n", __FUNCTION__, lpGUID, lplpDD, pUnkOuter); + HRESULT ret = dd_CreateEx(lpGUID, (LPVOID*)lplpDD, &IID_IDirectDraw, pUnkOuter); TRACE("<- %s\n", __FUNCTION__); return ret; } HRESULT WINAPI DirectDrawCreateClipper(DWORD dwFlags, LPDIRECTDRAWCLIPPER FAR* lplpDDClipper, IUnknown FAR* pUnkOuter) { - TRACE( - "-> %s(dwFlags=%08X, DDClipper=%p, unkOuter=%p) [%p]\n", - __FUNCTION__, - (int)dwFlags, - lplpDDClipper, - pUnkOuter, - _ReturnAddress()); - + TRACE("-> %s(dwFlags=%08X, DDClipper=%p, unkOuter=%p)\n", __FUNCTION__, (int)dwFlags, lplpDDClipper, pUnkOuter); HRESULT ret = dd_CreateClipper(dwFlags, (IDirectDrawClipperImpl**)lplpDDClipper, pUnkOuter); - TRACE("<- %s\n", __FUNCTION__); return ret; } HRESULT WINAPI DirectDrawCreateEx(GUID* lpGuid, LPVOID* lplpDD, REFIID iid, IUnknown* pUnkOuter) { - TRACE( - "-> %s(lpGUID=%p, lplpDD=%p, riid=%08X, pUnkOuter=%p) [%p]\n", - __FUNCTION__, - lpGuid, - lplpDD, - iid, - pUnkOuter, - _ReturnAddress()); - - HRESULT ret; - - if (util_caller_is_ddraw_wrapper(_ReturnAddress()) || g_config.flightsim98_hack) - { - if (lplpDD) - *lplpDD = NULL; - - ret = DDERR_GENERIC; - } - else - { - ret = dd_CreateEx(lpGuid, lplpDD, &IID_IDirectDraw7, pUnkOuter); - } - + TRACE("-> %s(lpGUID=%p, lplpDD=%p, riid=%08X, pUnkOuter=%p)\n", __FUNCTION__, lpGuid, lplpDD, iid, pUnkOuter); + HRESULT ret = dd_CreateEx(lpGuid, lplpDD, &IID_IDirectDraw7, pUnkOuter); TRACE("<- %s\n", __FUNCTION__); return ret; } HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACK lpCallback, LPVOID lpContext) { - TRACE("-> %s(lpCallback=%p, lpContext=%p) [%p]\n", __FUNCTION__, lpCallback, lpContext, _ReturnAddress()); + TRACE("-> %s(lpCallback=%p, lpContext=%p)\n", __FUNCTION__, lpCallback, lpContext); if (lpCallback) lpCallback(NULL, "Primary Display Driver", "display", lpContext); @@ -297,13 +181,7 @@ HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACK lpCallback, LPVOID lpContex HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA lpCallback, LPVOID lpContext, DWORD dwFlags) { - TRACE( - "-> %s(lpCallback=%p, lpContext=%p, dwFlags=%d) [%p]\n", - __FUNCTION__, - lpCallback, - lpContext, - dwFlags, - _ReturnAddress()); + TRACE("-> %s(lpCallback=%p, lpContext=%p, dwFlags=%d)\n", __FUNCTION__, lpCallback, lpContext, dwFlags); if (lpCallback) lpCallback(NULL, "Primary Display Driver", "display", lpContext, NULL); @@ -314,12 +192,7 @@ HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA lpCallback, LPVOID lpC HRESULT WINAPI DirectDrawEnumerateExW(LPDDENUMCALLBACKEXW lpCallback, LPVOID lpContext, DWORD dwFlags) { - TRACE( - "-> %s(lpCallback=%p, lpContext=%p, dwFlags=%d) [%p]\n", __FUNCTION__, - lpCallback, - lpContext, - dwFlags, - _ReturnAddress()); + TRACE("-> %s(lpCallback=%p, lpContext=%p, dwFlags=%d)\n", __FUNCTION__, lpCallback, lpContext, dwFlags); if (lpCallback) lpCallback(NULL, L"Primary Display Driver", L"display", lpContext, NULL); @@ -330,7 +203,7 @@ HRESULT WINAPI DirectDrawEnumerateExW(LPDDENUMCALLBACKEXW lpCallback, LPVOID lpC HRESULT WINAPI DirectDrawEnumerateW(LPDDENUMCALLBACKW lpCallback, LPVOID lpContext) { - TRACE("-> %s(lpCallback=%p, lpContext=%p) [%p]\n", __FUNCTION__, lpCallback, lpContext, _ReturnAddress()); + TRACE("-> %s(lpCallback=%p, lpContext=%p)\n", __FUNCTION__, lpCallback, lpContext); if (lpCallback) lpCallback(NULL, L"Primary Display Driver", L"display", lpContext); @@ -341,7 +214,7 @@ HRESULT WINAPI DirectDrawEnumerateW(LPDDENUMCALLBACKW lpCallback, LPVOID lpConte DWORD WINAPI CompleteCreateSysmemSurface(DWORD a) { - TRACE("NOT_IMPLEMENTED -> %s() [%p]\n", __FUNCTION__, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s()\n", __FUNCTION__); DWORD ret = 0; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -349,7 +222,7 @@ DWORD WINAPI CompleteCreateSysmemSurface(DWORD a) HRESULT WINAPI D3DParseUnknownCommand(LPVOID lpCmd, LPVOID* lpRetCmd) { - TRACE("NOT_IMPLEMENTED -> %s(lpCmd=%p, lpRetCmd=%p) [%p]\n", __FUNCTION__, lpCmd, lpRetCmd, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s(lpCmd=%p, lpRetCmd=%p)\n", __FUNCTION__, lpCmd, lpRetCmd); HRESULT ret = E_FAIL; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -357,7 +230,7 @@ HRESULT WINAPI D3DParseUnknownCommand(LPVOID lpCmd, LPVOID* lpRetCmd) DWORD WINAPI AcquireDDThreadLock() { - TRACE("NOT_IMPLEMENTED -> %s() [%p]\n", __FUNCTION__, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s()\n", __FUNCTION__); DWORD ret = 0; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -365,7 +238,7 @@ DWORD WINAPI AcquireDDThreadLock() DWORD WINAPI ReleaseDDThreadLock() { - TRACE("NOT_IMPLEMENTED -> %s() [%p]\n", __FUNCTION__, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s()\n", __FUNCTION__); DWORD ret = 0; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -373,7 +246,7 @@ DWORD WINAPI ReleaseDDThreadLock() DWORD WINAPI DDInternalLock(DWORD a, DWORD b) { - TRACE("NOT_IMPLEMENTED -> %s() [%p]\n", __FUNCTION__, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s()\n", __FUNCTION__); DWORD ret = 0; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -381,7 +254,7 @@ DWORD WINAPI DDInternalLock(DWORD a, DWORD b) DWORD WINAPI DDInternalUnlock(DWORD a) { - TRACE("NOT_IMPLEMENTED -> %s() [%p]\n", __FUNCTION__, _ReturnAddress()); + TRACE("NOT_IMPLEMENTED -> %s()\n", __FUNCTION__); DWORD ret = 0; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; diff --git a/src/fps_limiter.c b/src/fps_limiter.c index 0996784..90c8076 100644 --- a/src/fps_limiter.c +++ b/src/fps_limiter.c @@ -4,9 +4,6 @@ #include "debug.h" #include "hook.h" #include "config.h" -#include "render_ogl.h" -#include "versionhelpers.h" - FPSLIMITER g_fpsl; @@ -17,8 +14,8 @@ void fpsl_init() g_fpsl.tick_length_ns = 0; g_fpsl.tick_length = 0; - if (max_fps < 0 || (g_config.vsync && (!g_config.maxfps || g_config.maxfps >= g_ddraw.mode.dmDisplayFrequency))) - max_fps = g_ddraw.mode.dmDisplayFrequency; + if (max_fps < 0 || (g_config.vsync && (!g_config.maxfps || g_config.maxfps >= g_ddraw->mode.dmDisplayFrequency))) + max_fps = g_ddraw->mode.dmDisplayFrequency; if (max_fps > 1000) max_fps = 0; @@ -91,13 +88,13 @@ BOOL fpsl_wait_for_vblank() { if (g_fpsl.initialized) { - if (!g_fpsl.got_adapter && g_fpsl.D3DKMTOpenAdapterFromHdc && g_ddraw.render.hdc) + if (!g_fpsl.got_adapter && g_fpsl.D3DKMTOpenAdapterFromHdc && g_ddraw->render.hdc) { EnterCriticalSection(&g_fpsl.cs); if (!g_fpsl.got_adapter) { - g_fpsl.adapter.hDc = g_ddraw.render.hdc; + g_fpsl.adapter.hDc = g_ddraw->render.hdc; if (g_fpsl.D3DKMTOpenAdapterFromHdc(&g_fpsl.adapter) == 0) { @@ -120,9 +117,16 @@ BOOL fpsl_wait_for_vblank() BOOL fpsl_dwm_flush() { - if (g_fpsl.initialized && fpsl_dwm_is_enabled() && g_fpsl.DwmFlush && !IsWine()) + if (g_fpsl.initialized && fpsl_dwm_is_enabled() && g_fpsl.DwmFlush) { - return SUCCEEDED(g_fpsl.DwmFlush()); + HRESULT x = g_fpsl.DwmFlush(); + + if (!SUCCEEDED(x)) + { + //TRACE(" ERROR %s(result=%08X)\n", __FUNCTION__, x); + } + + return SUCCEEDED(x); } return FALSE; @@ -147,26 +151,17 @@ void fpsl_frame_start() void fpsl_frame_end() { if (g_config.maxfps < 0 || - (g_config.vsync && (!g_config.maxfps || g_config.maxfps >= g_ddraw.mode.dmDisplayFrequency))) + (g_config.vsync && (!g_config.maxfps || g_config.maxfps >= g_ddraw->mode.dmDisplayFrequency))) { - /* Workaround for DwmFlush() freeze (e.g. slow alt+tab) issue on windows 7 SP1 */ - if (g_ddraw.renderer == ogl_render_main && !IsWine() && !IsWindows8OrGreater()) - { - if (fpsl_wait_for_vblank()) - return; - } - else - { - if (fpsl_dwm_flush() || fpsl_wait_for_vblank()) - return; - } + if (fpsl_dwm_flush() || fpsl_wait_for_vblank()) + return; } if (g_fpsl.tick_length > 0) { if (g_fpsl.htimer) { - if (g_config.vsync && (!g_config.maxfps || g_config.maxfps >= g_ddraw.mode.dmDisplayFrequency)) + if (g_config.vsync && (!g_config.maxfps || g_config.maxfps >= g_ddraw->mode.dmDisplayFrequency)) { WaitForSingleObject(g_fpsl.htimer, g_fpsl.tick_length * 2); LARGE_INTEGER due_time = { .QuadPart = -g_fpsl.tick_length_ns }; diff --git a/src/hook.c b/src/hook.c index 29846c7..5646765 100644 --- a/src/hook.c +++ b/src/hook.c @@ -1,5 +1,7 @@ +#define WIN32_LEAN_AND_MEAN #include #include +#include #include "directinput.h" #include "dd.h" #include "winapi_hooks.h" @@ -8,8 +10,6 @@ #include "dllmain.h" #include "config.h" #include "utils.h" -#include "patch.h" -#include "versionhelpers.h" #ifdef _MSC_VER #include "detours.h" @@ -43,45 +43,23 @@ SHOWWINDOWPROC real_ShowWindow = ShowWindow; GETTOPWINDOWPROC real_GetTopWindow = GetTopWindow; GETFOREGROUNDWINDOWPROC real_GetForegroundWindow = GetForegroundWindow; STRETCHBLTPROC real_StretchBlt = StretchBlt; -BITBLTPROC real_BitBlt = BitBlt; SETDIBITSTODEVICEPROC real_SetDIBitsToDevice = SetDIBitsToDevice; STRETCHDIBITSPROC real_StretchDIBits = StretchDIBits; SETFOREGROUNDWINDOWPROC real_SetForegroundWindow = SetForegroundWindow; SETWINDOWSHOOKEXAPROC real_SetWindowsHookExA = SetWindowsHookExA; PEEKMESSAGEAPROC real_PeekMessageA = PeekMessageA; GETMESSAGEAPROC real_GetMessageA = GetMessageA; -GETWINDOWPLACEMENTPROC real_GetWindowPlacement = GetWindowPlacement; -SETWINDOWPLACEMENTPROC real_SetWindowPlacement = SetWindowPlacement; -ENUMDISPLAYSETTINGSAPROC real_EnumDisplaySettingsA = EnumDisplaySettingsA; -DEFWINDOWPROCAPROC real_DefWindowProcA = DefWindowProcA; -SETPARENTPROC real_SetParent = SetParent; -BEGINPAINTPROC real_BeginPaint = BeginPaint; -GETKEYSTATEPROC real_GetKeyState = GetKeyState; -GETASYNCKEYSTATEPROC real_GetAsyncKeyState = GetAsyncKeyState; GETDEVICECAPSPROC real_GetDeviceCaps = GetDeviceCaps; CREATEFONTINDIRECTAPROC real_CreateFontIndirectA = CreateFontIndirectA; CREATEFONTAPROC real_CreateFontA = CreateFontA; -GETSYSTEMPALETTEENTRIESPROC real_GetSystemPaletteEntries = GetSystemPaletteEntries; -SELECTPALETTEPROC real_SelectPalette = SelectPalette; -REALIZEPALETTEPROC real_RealizePalette = RealizePalette; LOADLIBRARYAPROC real_LoadLibraryA = LoadLibraryA; LOADLIBRARYWPROC real_LoadLibraryW = LoadLibraryW; LOADLIBRARYEXAPROC real_LoadLibraryExA = LoadLibraryExA; LOADLIBRARYEXWPROC real_LoadLibraryExW = LoadLibraryExW; GETPROCADDRESSPROC real_GetProcAddress = GetProcAddress; GETDISKFREESPACEAPROC real_GetDiskFreeSpaceA = GetDiskFreeSpaceA; -GETVERSIONPROC real_GetVersion = GetVersion; -GETVERSIONEXAPROC real_GetVersionExA = GetVersionExA; COCREATEINSTANCEPROC real_CoCreateInstance = CoCreateInstance; -MCISENDCOMMANDAPROC real_mciSendCommandA = mciSendCommandA; SETUNHANDLEDEXCEPTIONFILTERPROC real_SetUnhandledExceptionFilter = SetUnhandledExceptionFilter; -AVISTREAMGETFRAMEOPENPROC real_AVIStreamGetFrameOpen = AVIStreamGetFrameOpen; - -#if (_WIN32_WINNT >= _WIN32_WINNT_WIN2K) -SETWINDOWLONGWPROC real_SetWindowLongW = SetWindowLongW; -#else -SETWINDOWLONGWPROC real_SetWindowLongW; -#endif HOOKLIST g_hook_hooklist[] = { @@ -115,21 +93,8 @@ HOOKLIST g_hook_hooklist[] = { "GetForegroundWindow", (PROC)fake_GetForegroundWindow, (PROC*)&real_GetForegroundWindow, 0 }, { "PeekMessageA", (PROC)fake_PeekMessageA, (PROC*)&real_PeekMessageA, 0 }, { "GetMessageA", (PROC)fake_GetMessageA, (PROC*)&real_GetMessageA, 0 }, - { "GetWindowPlacement", (PROC)fake_GetWindowPlacement, (PROC*)&real_GetWindowPlacement, 0 }, - { "SetWindowPlacement", (PROC)fake_SetWindowPlacement, (PROC*)&real_SetWindowPlacement, 0 }, - { "EnumDisplaySettingsA", (PROC)fake_EnumDisplaySettingsA, (PROC*)&real_EnumDisplaySettingsA, 0 }, - { "DefWindowProcA", (PROC)fake_DefWindowProcA, (PROC*)&real_DefWindowProcA, 0 }, - { "SetParent", (PROC)fake_SetParent, (PROC*)&real_SetParent, 0 }, - { "BeginPaint", (PROC)fake_BeginPaint, (PROC*)&real_BeginPaint, 0 }, - { "GetKeyState", (PROC)fake_GetKeyState, (PROC*)&real_GetKeyState, 0 }, - { "GetAsyncKeyState", (PROC)fake_GetAsyncKeyState, (PROC*)&real_GetAsyncKeyState, 0 }, { "SetForegroundWindow", (PROC)fake_SetForegroundWindow, (PROC*)&real_SetForegroundWindow, 0 }, { "SetWindowsHookExA", (PROC)fake_SetWindowsHookExA, (PROC*)&real_SetWindowsHookExA, 0 }, - -#if (_WIN32_WINNT >= _WIN32_WINNT_WIN2K) - { "SetWindowLongW", (PROC)fake_SetWindowLongW, (PROC*)&real_SetWindowLongW, 0 }, -#endif - { "", NULL, NULL, 0 } } }, @@ -140,20 +105,6 @@ HOOKLIST g_hook_hooklist[] = { "", NULL, NULL, 0 } } }, - { - "winmm.dll", - { - { "mciSendCommandA", (PROC)fake_mciSendCommandA, (PROC*)&real_mciSendCommandA, HOOK_SKIP_2 }, - { "", NULL, NULL, 0 } - } - }, - { - "Avifil32.dll", - { - { "AVIStreamGetFrameOpen", (PROC)fake_AVIStreamGetFrameOpen, (PROC*)&real_AVIStreamGetFrameOpen, 0 }, - { "", NULL, NULL, 0 } - } - }, { "dinput.dll", { @@ -173,28 +124,15 @@ HOOKLIST g_hook_hooklist[] = { "gdi32.dll", { - { "BitBlt", (PROC)fake_BitBlt, (PROC*)&real_BitBlt, HOOK_SKIP_2 }, { "StretchBlt", (PROC)fake_StretchBlt, (PROC*)&real_StretchBlt, HOOK_SKIP_2 }, { "SetDIBitsToDevice", (PROC)fake_SetDIBitsToDevice, (PROC*)&real_SetDIBitsToDevice, HOOK_SKIP_2 }, { "StretchDIBits", (PROC)fake_StretchDIBits, (PROC*)&real_StretchDIBits, HOOK_SKIP_2 }, { "GetDeviceCaps", (PROC)fake_GetDeviceCaps, (PROC*)&real_GetDeviceCaps, HOOK_LOCAL_ONLY }, - { "GetDeviceCaps", (PROC)fake_GetDeviceCaps_system, NULL, HOOK_SYSTEM_ONLY }, { "CreateFontA", (PROC)fake_CreateFontA, (PROC*)&real_CreateFontA, 0 }, - { "GetSystemPaletteEntries", (PROC)fake_GetSystemPaletteEntries, (PROC*)&real_GetSystemPaletteEntries, 0 }, - { "SelectPalette", (PROC)fake_SelectPalette, (PROC*)&real_SelectPalette, 0 }, - { "RealizePalette", (PROC)fake_RealizePalette, (PROC*)&real_RealizePalette, 0 }, { "CreateFontIndirectA", (PROC)fake_CreateFontIndirectA, (PROC*)&real_CreateFontIndirectA, 0 }, { "", NULL, NULL, 0 } } }, - { - "WING32.DLL", - { - { "WinGBitBlt", (PROC)fake_WinGBitBlt, NULL, 0 }, - { "WinGStretchBlt", (PROC)fake_WinGStretchBlt, NULL, 0 }, - { "", NULL, NULL, 0 } - } - }, { "kernel32.dll", { @@ -203,12 +141,7 @@ HOOKLIST g_hook_hooklist[] = { "LoadLibraryExA", (PROC)fake_LoadLibraryExA, (PROC*)&real_LoadLibraryExA, HOOK_SKIP_2 }, { "LoadLibraryExW", (PROC)fake_LoadLibraryExW, (PROC*)&real_LoadLibraryExW, HOOK_SKIP_2 }, { "GetProcAddress", (PROC)fake_GetProcAddress, (PROC*)&real_GetProcAddress, HOOK_SKIP_2 }, - { "GetDiskFreeSpaceA", (PROC)fake_GetDiskFreeSpaceA, (PROC*)&real_GetDiskFreeSpaceA, 0 }, - { "GetVersion", (PROC)fake_GetVersion, (PROC*)&real_GetVersion, 0 }, - { "GetVersionExA", (PROC)fake_GetVersionExA, (PROC*)&real_GetVersionExA, 0 }, -#if defined(_DEBUG) && defined(__GNUC__) - { "SetUnhandledExceptionFilter", (PROC)fake_SetUnhandledExceptionFilter, (PROC*)&real_SetUnhandledExceptionFilter, 0 }, -#endif + { "GetDiskFreeSpaceA", (PROC)fake_GetDiskFreeSpaceA, (PROC*)&real_GetDiskFreeSpaceA, HOOK_SKIP_2 }, { "", NULL, NULL, 0 } } }, @@ -244,15 +177,17 @@ void hook_patch_obfuscated_iat_list(HMODULE hmod, BOOL unhook, HOOKLIST* hooks, if (dos_header->e_magic != IMAGE_DOS_SIGNATURE) return; - PIMAGE_NT_HEADERS nt_headers = (PIMAGE_NT_HEADERS)((DWORD)hmod + (DWORD)dos_header->e_lfanew); + PIMAGE_NT_HEADERS nt_headers = (PIMAGE_NT_HEADERS)((DWORD)dos_header + (DWORD)dos_header->e_lfanew); if (nt_headers->Signature != IMAGE_NT_SIGNATURE) return; DWORD import_desc_rva = nt_headers->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress; - if (!import_desc_rva) + DWORD import_desc_size = nt_headers->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].Size; + + if (import_desc_rva == 0 || import_desc_size == 0) return; - PIMAGE_IMPORT_DESCRIPTOR import_desc = (PIMAGE_IMPORT_DESCRIPTOR)((DWORD)hmod + import_desc_rva); + PIMAGE_IMPORT_DESCRIPTOR import_desc = (PIMAGE_IMPORT_DESCRIPTOR)((DWORD)dos_header + import_desc_rva); while (import_desc->FirstThunk) { @@ -264,13 +199,13 @@ void hook_patch_obfuscated_iat_list(HMODULE hmod, BOOL unhook, HOOKLIST* hooks, for (int i = 0; hooks[i].module_name[0]; i++) { - char* imp_module_name = (char*)((DWORD)hmod + import_desc->Name); + char* imp_module_name = (char*)((DWORD)dos_header + import_desc->Name); if (_stricmp(imp_module_name, hooks[i].module_name) == 0) { HMODULE cur_mod = GetModuleHandleA(hooks[i].module_name); - PIMAGE_THUNK_DATA first_thunk = (void*)((DWORD)hmod + import_desc->FirstThunk); + PIMAGE_THUNK_DATA first_thunk = (void*)((DWORD)dos_header + import_desc->FirstThunk); while (first_thunk->u1.Function) { @@ -294,9 +229,6 @@ void hook_patch_obfuscated_iat_list(HMODULE hmod, BOOL unhook, HOOKLIST* hooks, if (!is_local && (hooks[i].data[x].flags & HOOK_LOCAL_ONLY)) continue; - if (is_local && (hooks[i].data[x].flags & HOOK_SYSTEM_ONLY)) - continue; - if (unhook) { if (first_thunk->u1.Function == (DWORD)hooks[i].data[x].new_function) @@ -367,15 +299,17 @@ void hook_patch_iat_list(HMODULE hmod, BOOL unhook, HOOKLIST* hooks, BOOL is_loc if (dos_header->e_magic != IMAGE_DOS_SIGNATURE) return; - PIMAGE_NT_HEADERS nt_headers = (PIMAGE_NT_HEADERS)((DWORD)hmod + (DWORD)dos_header->e_lfanew); + PIMAGE_NT_HEADERS nt_headers = (PIMAGE_NT_HEADERS)((DWORD)dos_header + (DWORD)dos_header->e_lfanew); if (nt_headers->Signature != IMAGE_NT_SIGNATURE) return; DWORD import_desc_rva = nt_headers->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress; - if (!import_desc_rva) + DWORD import_desc_size = nt_headers->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].Size; + + if (import_desc_rva == 0 || import_desc_size == 0) return; - PIMAGE_IMPORT_DESCRIPTOR import_desc = (PIMAGE_IMPORT_DESCRIPTOR)((DWORD)hmod + import_desc_rva); + PIMAGE_IMPORT_DESCRIPTOR import_desc = (PIMAGE_IMPORT_DESCRIPTOR)((DWORD)dos_header + import_desc_rva); while (import_desc->FirstThunk) { @@ -387,12 +321,12 @@ void hook_patch_iat_list(HMODULE hmod, BOOL unhook, HOOKLIST* hooks, BOOL is_loc for (int i = 0; hooks[i].module_name[0]; i++) { - char* imp_module_name = (char*)((DWORD)hmod + import_desc->Name); + char* imp_module_name = (char*)((DWORD)dos_header + import_desc->Name); if (_stricmp(imp_module_name, hooks[i].module_name) == 0) { - PIMAGE_THUNK_DATA first_thunk = (void*)((DWORD)hmod + import_desc->FirstThunk); - PIMAGE_THUNK_DATA o_first_thunk = (void*)((DWORD)hmod + import_desc->OriginalFirstThunk); + PIMAGE_THUNK_DATA first_thunk = (void*)((DWORD)dos_header + import_desc->FirstThunk); + PIMAGE_THUNK_DATA o_first_thunk = (void*)((DWORD)dos_header + import_desc->OriginalFirstThunk); while (first_thunk->u1.Function) { @@ -415,9 +349,6 @@ void hook_patch_iat_list(HMODULE hmod, BOOL unhook, HOOKLIST* hooks, BOOL is_loc if (!is_local && (hooks[i].data[x].flags & HOOK_LOCAL_ONLY)) continue; - if (is_local && (hooks[i].data[x].flags & HOOK_SYSTEM_ONLY)) - continue; - #if defined(__GNUC__) if (util_is_bad_read_ptr((void*)import->Name)) continue; @@ -486,25 +417,27 @@ BOOL hook_got_ddraw_import(HMODULE mod, BOOL check_imported_dlls) if (dos_header->e_magic != IMAGE_DOS_SIGNATURE) return FALSE; - PIMAGE_NT_HEADERS nt_headers = (PIMAGE_NT_HEADERS)((DWORD)mod + (DWORD)dos_header->e_lfanew); + PIMAGE_NT_HEADERS nt_headers = (PIMAGE_NT_HEADERS)((DWORD)dos_header + (DWORD)dos_header->e_lfanew); if (nt_headers->Signature != IMAGE_NT_SIGNATURE) return FALSE; DWORD import_desc_rva = nt_headers->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress; - if (!import_desc_rva) + DWORD import_desc_size = nt_headers->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].Size; + + if (import_desc_rva == 0 || import_desc_size == 0) return FALSE; - PIMAGE_IMPORT_DESCRIPTOR import_desc = (PIMAGE_IMPORT_DESCRIPTOR)((DWORD)mod + import_desc_rva); + PIMAGE_IMPORT_DESCRIPTOR import_desc = (PIMAGE_IMPORT_DESCRIPTOR)((DWORD)dos_header + import_desc_rva); while (import_desc->FirstThunk) { if (import_desc->Name) { - char* imp_module_name = (char*)((DWORD)mod + import_desc->Name); + char* imp_module_name = (char*)((DWORD)dos_header + import_desc->Name); if (_stricmp(imp_module_name, "ddraw.dll") == 0) { - PIMAGE_THUNK_DATA first_thunk = (void*)((DWORD)mod + import_desc->FirstThunk); + PIMAGE_THUNK_DATA first_thunk = (void*)((DWORD)dos_header + import_desc->FirstThunk); if (first_thunk->u1.Function) return TRUE; @@ -577,20 +510,14 @@ void hook_create(HOOKLIST* hooks, BOOL initial_hook) /* Don't hook reshade/swiftshader/mesa3d */ if (_strcmpi(mod_filename, "opengl32") == 0 || - _strcmpi(mod_filename, "libgallium_wgl") == 0 || - _strcmpi(mod_filename, "libglapi") == 0 || _strcmpi(mod_filename, "d3d9") == 0 || - _strcmpi(mod_filename, "mdraw") == 0 || - _strcmpi(mod_filename, "SH33W32") == 0 || _strcmpi(mod_filename, "Shw32") == 0) continue; BOOL is_local = _strnicmp(game_dir, mod_dir, strlen(game_dir)) == 0; - BOOL wine_hook = IsWine() && _strcmpi(mod_filename, "mciavi32") == 0; if (is_local || - wine_hook || - _strcmpi(mod_filename, "QuickTime") == 0 || + _strcmpi(mod_filename, "mciavi32") == 0 || _strcmpi(mod_filename, "MSVFW32") == 0 || _strcmpi(mod_filename, "quartz") == 0 || _strcmpi(mod_filename, "winmm") == 0) @@ -653,11 +580,9 @@ void hook_revert(HOOKLIST* hooks) _splitpath(mod_path, NULL, mod_dir, mod_filename, NULL); BOOL is_local = _strnicmp(game_dir, mod_dir, strlen(game_dir)) == 0; - BOOL wine_hook = IsWine() && _strcmpi(mod_filename, "mciavi32") == 0; if (is_local || - wine_hook || - _strcmpi(mod_filename, "QuickTime") == 0 || + _strcmpi(mod_filename, "mciavi32") == 0 || _strcmpi(mod_filename, "MSVFW32") == 0 || _strcmpi(mod_filename, "quartz") == 0 || _strcmpi(mod_filename, "winmm") == 0) @@ -675,42 +600,35 @@ void hook_revert(HOOKLIST* hooks) } } -void hook_init() +void hook_init(BOOL initial_hook) { - if (!g_hook_active) + if (initial_hook) { if (g_config.hook == 4 && hook_got_ddraw_import(GetModuleHandleA(NULL), TRUE)) { /* Switch to 3 if we can be sure that ddraw.dll will not be unloaded from the process */ g_config.hook = 3; - - TRACE("Switched to hook 3\n"); } } if (!g_hook_active || g_config.hook == 3 || g_config.hook == 4) { #if defined(_DEBUG) && defined(_MSC_VER) - if (!g_hook_active) + if (initial_hook) { DetourTransactionBegin(); DetourUpdateThread(GetCurrentThread()); DetourAttach((PVOID*)&real_SetUnhandledExceptionFilter, (PVOID)fake_SetUnhandledExceptionFilter); DetourTransactionCommit(); - - if (!IsDebuggerPresent()) - { - patch_ljmp((void*)_invoke_watson, (void*)dbg_invoke_watson); - } } #endif - if (!g_hook_active) + if (initial_hook) { hook_patch_iat(GetModuleHandle("AcGenral"), FALSE, "user32.dll", "SetWindowsHookExA", (PROC)fake_SetWindowsHookExA); } - hook_create((HOOKLIST*)&g_hook_hooklist, !g_hook_active); + hook_create((HOOKLIST*)&g_hook_hooklist, initial_hook); g_hook_active = TRUE; } @@ -724,13 +642,12 @@ void hook_exit() hook_revert((HOOKLIST*)&g_hook_hooklist); -#if defined(_DEBUG) -#if defined(_MSC_VER) +#if defined(_DEBUG) && defined(_MSC_VER) DetourTransactionBegin(); DetourUpdateThread(GetCurrentThread()); DetourDetach((PVOID*)&real_SetUnhandledExceptionFilter, (PVOID)fake_SetUnhandledExceptionFilter); DetourTransactionCommit(); -#endif + real_SetUnhandledExceptionFilter(g_dbg_exception_filter); #endif diff --git a/src/indeo.c b/src/indeo.c deleted file mode 100644 index 65fa2ab..0000000 --- a/src/indeo.c +++ /dev/null @@ -1,61 +0,0 @@ -#include - - -void indeo_enable() -{ - HKEY hkey; - LONG status = - RegCreateKeyExA( - HKEY_CURRENT_USER, - "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Drivers32", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_WRITE | KEY_QUERY_VALUE, - NULL, - &hkey, - NULL); - - if (status == ERROR_SUCCESS) - { - LPCTSTR iv31 = "ir32_32.dll"; - RegSetValueExA(hkey, "vidc.iv31", 0, REG_SZ, (const BYTE*)iv31, strlen(iv31) + 1); - - LPCTSTR iv32 = "ir32_32.dll"; - RegSetValueExA(hkey, "vidc.iv32", 0, REG_SZ, (const BYTE*)iv32, strlen(iv32) + 1); - - LPCTSTR iv41 = "ir41_32.ax"; - RegSetValueExA(hkey, "vidc.iv41", 0, REG_SZ, (const BYTE*)iv41, strlen(iv41) + 1); - - LPCTSTR iv50 = "ir50_32.dll"; - RegSetValueExA(hkey, "vidc.iv50", 0, REG_SZ, (const BYTE*)iv50, strlen(iv50) + 1); - - RegCloseKey(hkey); - } -} - -void indeo_disable() -{ - HKEY hkey; - LONG status = - RegCreateKeyExA( - HKEY_CURRENT_USER, - "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Drivers32", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_WRITE | KEY_QUERY_VALUE, - NULL, - &hkey, - NULL); - - if (status == ERROR_SUCCESS) - { - RegDeleteValueA(hkey, "vidc.iv31"); - RegDeleteValueA(hkey, "vidc.iv32"); - RegDeleteValueA(hkey, "vidc.iv41"); - RegDeleteValueA(hkey, "vidc.iv50"); - - RegCloseKey(hkey); - } -} diff --git a/src/keyboard.c b/src/keyboard.c deleted file mode 100644 index f54ba63..0000000 --- a/src/keyboard.c +++ /dev/null @@ -1,132 +0,0 @@ -#include -#include "debug.h" -#include "hook.h" -#include "dd.h" -#include "utils.h" -#include "config.h" -#include "keyboard.h" -#include "mouse.h" -#include "screenshot.h" - - -HHOOK g_keyboard_hook; - -void keyboard_hook_init() -{ - if (g_keyboard_hook && UnhookWindowsHookEx(g_keyboard_hook)) - { - g_keyboard_hook = NULL; - } - - if (!g_ddraw.gui_thread_id) - return; - - g_keyboard_hook = - real_SetWindowsHookExA( - WH_KEYBOARD, - keyboard_hook_proc, - NULL, - g_ddraw.gui_thread_id); -} - -void keyboard_hook_exit() -{ - if (g_keyboard_hook) - { - UnhookWindowsHookEx(g_keyboard_hook); - } -} - -LRESULT CALLBACK keyboard_hook_proc(int code, WPARAM wParam, LPARAM lParam) -{ - if (code < 0 || !wParam) - return CallNextHookEx(g_keyboard_hook, code, wParam, lParam); - - BOOL alt_down = !!(lParam & (1 << 29)); - BOOL key_down = !(lParam & (1 << 31)); - BOOL key_released = !!(lParam & (1 << 31)); - BOOL key_triggered = !(lParam & (1 << 30)); - - //TRACE("kbhook code=%u, wParam=%u, triggered=%u, released=%u, alt_down=%u\n", code, wParam, key_triggered, key_released, alt_down); - - if (wParam == VK_MENU && (key_released || key_triggered)) /* Fix for alt key being stuck on alt+tab in some games */ - { - g_ddraw.alt_key_down = alt_down; - } - - if (wParam == g_config.hotkeys.toggle_fullscreen && alt_down && key_down) - { - if (key_triggered) - util_toggle_fullscreen(); - - return 1; - } - - if (wParam == g_config.hotkeys.toggle_fullscreen2) - { - if (key_triggered) - util_toggle_fullscreen(); - - return 1; - } - - if (wParam == g_config.hotkeys.toggle_maximize && alt_down && key_down) - { - if (key_triggered) - util_toggle_maximize(); - - return 1; - } - - if (wParam == g_config.hotkeys.toggle_maximize2) - { - if (key_triggered) - util_toggle_maximize(); - - return 1; - } - - if (wParam == g_config.hotkeys.screenshot) - { - // VK_SNAPSHOT does not have a KEYDOWN event... - if (g_config.hotkeys.screenshot == VK_SNAPSHOT) - { - if (key_released) - { - ss_take_screenshot(g_ddraw.primary); - return 1; - } - } - else if (key_triggered) - { - ss_take_screenshot(g_ddraw.primary); - return 1; - } - } - - if (wParam == g_config.hotkeys.unlock_cursor1 || wParam == VK_CONTROL) - { - if ((real_GetAsyncKeyState(VK_CONTROL) & 0x8000) && - (real_GetAsyncKeyState(g_config.hotkeys.unlock_cursor1) & 0x8000)) - { - mouse_unlock(); - - if (key_down) - return 1; - } - } - - if (wParam == g_config.hotkeys.unlock_cursor2 || wParam == VK_MENU || wParam == VK_CONTROL) - { - if ((real_GetAsyncKeyState(VK_RMENU) & 0x8000) && - (real_GetAsyncKeyState(g_config.hotkeys.unlock_cursor2) & 0x8000)) - { - mouse_unlock(); - - if (key_down) - return 1; - } - } - - return CallNextHookEx(g_keyboard_hook, code, wParam, lParam); -} diff --git a/src/mouse.c b/src/mouse.c index 46aca13..504ee92 100644 --- a/src/mouse.c +++ b/src/mouse.c @@ -13,12 +13,12 @@ HOOKPROC g_mouse_proc; void mouse_lock() { - if (g_config.devmode || g_ddraw.bnet_active || !g_ddraw.hwnd) + if (g_config.devmode || g_ddraw->bnet_active || !g_ddraw->hwnd) return; - if (g_hook_active && !g_mouse_locked && !util_is_minimized(g_ddraw.hwnd)) + if (g_hook_active && !g_mouse_locked && !util_is_minimized(g_ddraw->hwnd)) { - int game_count = InterlockedExchangeAdd((LONG*)&g_ddraw.show_cursor_count, 0); + int game_count = InterlockedExchangeAdd((LONG*)&g_ddraw->show_cursor_count, 0); int cur_count = real_ShowCursor(TRUE) - 1; real_ShowCursor(FALSE); @@ -31,22 +31,22 @@ void mouse_lock() while (real_ShowCursor(TRUE) < game_count); } - real_SetCursor((HCURSOR)InterlockedExchangeAdd((LONG*)&g_ddraw.old_cursor, 0)); + real_SetCursor((HCURSOR)InterlockedExchangeAdd((LONG*)&g_ddraw->old_cursor, 0)); RECT rc = { 0 }; - real_GetClientRect(g_ddraw.hwnd, &rc); - real_MapWindowPoints(g_ddraw.hwnd, HWND_DESKTOP, (LPPOINT)&rc, 2); - OffsetRect(&rc, g_ddraw.render.viewport.x, g_ddraw.render.viewport.y); + real_GetClientRect(g_ddraw->hwnd, &rc); + real_MapWindowPoints(g_ddraw->hwnd, HWND_DESKTOP, (LPPOINT)&rc, 2); + OffsetRect(&rc, g_ddraw->render.viewport.x, g_ddraw->render.viewport.y); - int cur_x = InterlockedExchangeAdd((LONG*)&g_ddraw.cursor.x, 0); - int cur_y = InterlockedExchangeAdd((LONG*)&g_ddraw.cursor.y, 0); + int cur_x = InterlockedExchangeAdd((LONG*)&g_ddraw->cursor.x, 0); + int cur_y = InterlockedExchangeAdd((LONG*)&g_ddraw->cursor.y, 0); real_SetCursorPos( - g_config.adjmouse ? (int)(rc.left + (cur_x * g_ddraw.mouse.scale_x)) : rc.left + cur_x, - g_config.adjmouse ? (int)(rc.top + (cur_y * g_ddraw.mouse.scale_y)) : rc.top + cur_y); + g_config.adjmouse ? (int)(rc.left + (cur_x * g_ddraw->mouse.scale_x)) : rc.left + cur_x, + g_config.adjmouse ? (int)(rc.top + (cur_y * g_ddraw->mouse.scale_y)) : rc.top + cur_y); - CopyRect(&rc, &g_ddraw.mouse.rc); - real_MapWindowPoints(g_ddraw.hwnd, HWND_DESKTOP, (LPPOINT)&rc, 2); + CopyRect(&rc, &g_ddraw->mouse.rc); + real_MapWindowPoints(g_ddraw->hwnd, HWND_DESKTOP, (LPPOINT)&rc, 2); real_ClipCursor(&rc); g_mouse_locked = TRUE; @@ -55,7 +55,7 @@ void mouse_lock() void mouse_unlock() { - if (g_config.devmode || !g_hook_active || !g_ddraw.hwnd) + if (g_config.devmode || !g_hook_active || !g_ddraw->hwnd) return; if (g_mouse_locked) @@ -63,19 +63,19 @@ void mouse_unlock() g_mouse_locked = FALSE; real_ClipCursor(NULL); - ReleaseCapture(); + //ReleaseCapture(); RECT rc = { 0 }; - real_GetClientRect(g_ddraw.hwnd, &rc); - real_MapWindowPoints(g_ddraw.hwnd, HWND_DESKTOP, (LPPOINT)&rc, 2); - OffsetRect(&rc, g_ddraw.render.viewport.x, g_ddraw.render.viewport.y); + real_GetClientRect(g_ddraw->hwnd, &rc); + real_MapWindowPoints(g_ddraw->hwnd, HWND_DESKTOP, (LPPOINT)&rc, 2); + OffsetRect(&rc, g_ddraw->render.viewport.x, g_ddraw->render.viewport.y); - int cur_x = InterlockedExchangeAdd((LONG*)&g_ddraw.cursor.x, 0); - int cur_y = InterlockedExchangeAdd((LONG*)&g_ddraw.cursor.y, 0); + int cur_x = InterlockedExchangeAdd((LONG*)&g_ddraw->cursor.x, 0); + int cur_y = InterlockedExchangeAdd((LONG*)&g_ddraw->cursor.y, 0); real_SetCursorPos( - (int)(rc.left + (cur_x * g_ddraw.mouse.scale_x)), - (int)(rc.top + (cur_y * g_ddraw.mouse.scale_y))); + (int)(rc.left + (cur_x * g_ddraw->mouse.scale_x)), + (int)(rc.top + (cur_y * g_ddraw->mouse.scale_y))); real_SetCursor(LoadCursor(NULL, IDC_ARROW)); @@ -85,7 +85,7 @@ void mouse_unlock() LRESULT CALLBACK mouse_hook_proc(int Code, WPARAM wParam, LPARAM lParam) { - if (!g_ddraw.ref) + if (!g_ddraw) return g_mouse_proc(Code, wParam, lParam); if (Code < 0 || (!g_config.devmode && !g_mouse_locked)) diff --git a/src/opengl_utils.c b/src/opengl_utils.c index e315b15..2f14a5e 100644 --- a/src/opengl_utils.c +++ b/src/opengl_utils.c @@ -5,7 +5,6 @@ #include "debug.h" #include "hook.h" #include "config.h" -#include "versionhelpers.h" PFNWGLCREATECONTEXTPROC xwglCreateContext; PFNWGLDELETECONTEXTPROC xwglDeleteContext; @@ -88,14 +87,11 @@ PFNWGLSWAPINTERVALEXTPROC wglSwapIntervalEXT; PFNWGLGETEXTENSIONSSTRINGARBPROC wglGetExtensionsStringARB; PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribsARB; PFNGLTEXBUFFERPROC glTexBuffer; -PFNGLGETINTEGERVPROC glGetIntegerv; -PFNGLGETSTRINGIPROC glGetStringi; HMODULE g_oglu_hmodule; BOOL g_oglu_got_version2; BOOL g_oglu_got_version3; char g_oglu_version[128]; -char g_oglu_version_long[128]; BOOL oglu_load_dll() { @@ -195,16 +191,13 @@ void oglu_init() wglGetExtensionsStringARB = (PFNWGLGETEXTENSIONSSTRINGARBPROC)xwglGetProcAddress("wglGetExtensionsStringARB"); glTexBuffer = (PFNGLTEXBUFFERPROC)xwglGetProcAddress("glTexBuffer"); - glGetIntegerv = (PFNGLGETINTEGERVPROC)xwglGetProcAddress("glGetIntegerv"); - glGetStringi = (PFNGLGETSTRINGIPROC)xwglGetProcAddress("glGetStringi"); char* glversion = (char*)glGetString(GL_VERSION); if (glversion) { strncpy(g_oglu_version, glversion, sizeof(g_oglu_version) - 1); - strncpy(g_oglu_version_long, glversion, sizeof(g_oglu_version_long) - 1); - g_oglu_version[sizeof(g_oglu_version) - 1] = '\0'; /* strncpy fix */ - strtok(g_oglu_version, " "); + const char deli[2] = " "; + strtok(g_oglu_version, deli); } else { @@ -219,7 +212,7 @@ void oglu_init() glEnableVertexAttribArray && glUniform2fv && glUniformMatrix4fv && glGenVertexArrays && glBindVertexArray && glGetUniformLocation; - if (IsWine() && glversion && glversion[0] == '2') // macOS + if (g_config.is_wine && glversion && glversion[0] == '2') // macOS { g_oglu_got_version3 = FALSE; wglCreateContextAttribsARB = (PFNWGLCREATECONTEXTATTRIBSARBPROC)xwglGetProcAddress("wglCreateContextAttribsARB"); @@ -233,32 +226,11 @@ void oglu_init() BOOL oglu_ext_exists(char* ext, HDC hdc) { - BOOL got_num_extensions = FALSE; + char* glext = (char*)glGetString(GL_EXTENSIONS); - if (glGetIntegerv && glGetStringi) + if (glext) { - GLint n = 0; - glGetIntegerv(GL_NUM_EXTENSIONS, &n); - - if (glGetError() == GL_NO_ERROR) - { - got_num_extensions = TRUE; - - for (GLint i = 0; i < n; i++) - { - char* glext = (char*)glGetStringi(GL_EXTENSIONS, i); - - if (glext && strcmp(glext, ext) == 0) - return TRUE; - } - } - } - - if (!got_num_extensions) - { - char* glext = (char*)glGetString(GL_EXTENSIONS); - - if (glext && strstr(glext, ext)) + if (strstr(glext, ext)) return TRUE; } diff --git a/src/render_d3d9.c b/src/render_d3d9.c index dde4b2c..faed00a 100644 --- a/src/render_d3d9.c +++ b/src/render_d3d9.c @@ -10,21 +10,11 @@ #include "wndproc.h" #include "blt.h" #include "debug.h" -#include "d3d9types.h" +#include "D3d9types.h" #include "hook.h" #include "config.h" -#ifdef _DEBUG -#define FAILEDX(stmt) d3d9_check_failed(stmt, #stmt) -#define SUCCEEDEDX(stmt) d3d9_check_succeeded(stmt, #stmt) -static BOOL d3d9_check_failed(HRESULT hr, const char* stmt); -static BOOL d3d9_check_succeeded(HRESULT hr, const char* stmt); -#else -#define FAILEDX(stmt) FAILED(stmt) -#define SUCCEEDEDX(stmt) SUCCEEDED(stmt) -#endif - static BOOL d3d9_create_resources(); static BOOL d3d9_set_states(); static BOOL d3d9_update_vertices(BOOL upscale_hack, BOOL stretch); @@ -65,7 +55,7 @@ BOOL d3d9_is_available() BOOL d3d9_create() { - if (g_d3d9.hwnd == g_ddraw.hwnd && d3d9_create_resources() && d3d9_reset(g_config.windowed)) + if (g_d3d9.hwnd == g_ddraw->hwnd && d3d9_create_resources() && d3d9_reset(g_config.windowed)) { return TRUE; } @@ -96,10 +86,10 @@ BOOL d3d9_create() #if _DEBUG D3DADAPTER_IDENTIFIER9 ai = {0}; D3DCAPS9 caps = { 0 }; - HRESULT adapter_hr = IDirect3D9_GetAdapterIdentifier(g_d3d9.instance, D3DADAPTER_DEFAULT, 0, &ai); - HRESULT devcaps_hr = IDirect3D9_GetDeviceCaps(g_d3d9.instance, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, &caps); + HRESULT hr = IDirect3D9_GetAdapterIdentifier(g_d3d9.instance, D3DADAPTER_DEFAULT, 0, &ai); + HRESULT hr2 = IDirect3D9_GetDeviceCaps(g_d3d9.instance, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, &caps); - if (SUCCEEDEDX(adapter_hr)) + if (SUCCEEDED(hr)) { TRACE("+--Direct3D9-------------------------------------\n"); TRACE("| D3D9On12: %s (%p)\n", d3d9on12 != NULL ? "True" : "False", GetModuleHandleA("d3d9on12.dll")); @@ -116,7 +106,7 @@ BOOL d3d9_create() TRACE("| Driver: %s\n", ai.Driver); TRACE("| Description: %s\n", ai.Description); - if (SUCCEEDEDX(devcaps_hr)) + if (SUCCEEDED(hr2)) { TRACE("| MaxTextureWidth: %d\n", caps.MaxTextureWidth); TRACE("| MaxTextureHeight: %d\n", caps.MaxTextureHeight); @@ -132,18 +122,18 @@ BOOL d3d9_create() TRACE("+------------------------------------------------\n"); } #endif - g_d3d9.hwnd = g_ddraw.hwnd; + g_d3d9.hwnd = g_ddraw->hwnd; memset(&g_d3d9.params, 0, sizeof(g_d3d9.params)); g_d3d9.params.Windowed = g_config.windowed || g_config.nonexclusive; g_d3d9.params.SwapEffect = D3DSWAPEFFECT_DISCARD; - g_d3d9.params.hDeviceWindow = g_ddraw.hwnd; + g_d3d9.params.hDeviceWindow = g_ddraw->hwnd; g_d3d9.params.PresentationInterval = g_config.vsync ? D3DPRESENT_INTERVAL_ONE : D3DPRESENT_INTERVAL_IMMEDIATE; - g_d3d9.params.BackBufferWidth = g_d3d9.params.Windowed ? 0 : g_ddraw.render.width; - g_d3d9.params.BackBufferHeight = g_d3d9.params.Windowed ? 0 : g_ddraw.render.height; + g_d3d9.params.BackBufferWidth = g_d3d9.params.Windowed ? 0 : g_ddraw->render.width; + g_d3d9.params.BackBufferHeight = g_d3d9.params.Windowed ? 0 : g_ddraw->render.height; g_d3d9.params.FullScreen_RefreshRateInHz = g_d3d9.params.Windowed ? 0 : g_config.refresh_rate; - g_d3d9.params.BackBufferFormat = g_ddraw.mode.dmBitsPerPel == 16 ? D3DFMT_R5G6B5 : D3DFMT_X8R8G8B8; + g_d3d9.params.BackBufferFormat = g_ddraw->mode.dmBitsPerPel == 16 ? D3DFMT_R5G6B5 : D3DFMT_X8R8G8B8; g_d3d9.params.BackBufferCount = 1; DWORD behavior_flags[] = { @@ -156,12 +146,12 @@ BOOL d3d9_create() for (int i = 0; i < sizeof(behavior_flags) / sizeof(behavior_flags[0]); i++) { - if (SUCCEEDEDX( + if (SUCCEEDED( IDirect3D9_CreateDevice( g_d3d9.instance, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - g_ddraw.hwnd, + g_ddraw->hwnd, behavior_flags[i], &g_d3d9.params, &g_d3d9.device))) @@ -173,31 +163,6 @@ BOOL d3d9_create() return FALSE; } -#ifdef _DEBUG -static BOOL d3d9_check_failed(HRESULT hr, const char* stmt) -{ - if (FAILED(hr)) - { - TRACE("Direct3D9 error %s [%08x] (%s)\n", dbg_d3d9_hr_to_str(hr), hr, stmt); - return TRUE; - } - - return FALSE; -} - -static BOOL d3d9_check_succeeded(HRESULT hr, const char* stmt) -{ - if (!SUCCEEDED(hr)) - { - TRACE("Direct3D9 error %s [%08x] (%s)\n", dbg_d3d9_hr_to_str(hr), hr, stmt); - - return FALSE; - } - - return TRUE; -} -#endif - BOOL d3d9_on_device_lost() { if (g_d3d9.device && IDirect3DDevice9_TestCooperativeLevel(g_d3d9.device) == D3DERR_DEVICENOTRESET) @@ -211,20 +176,20 @@ BOOL d3d9_on_device_lost() BOOL d3d9_reset(BOOL windowed) { g_d3d9.params.Windowed = windowed || g_config.nonexclusive; - g_d3d9.params.BackBufferWidth = g_d3d9.params.Windowed ? 0 : g_ddraw.render.width; - g_d3d9.params.BackBufferHeight = g_d3d9.params.Windowed ? 0 : g_ddraw.render.height; + g_d3d9.params.BackBufferWidth = g_d3d9.params.Windowed ? 0 : g_ddraw->render.width; + g_d3d9.params.BackBufferHeight = g_d3d9.params.Windowed ? 0 : g_ddraw->render.height; g_d3d9.params.FullScreen_RefreshRateInHz = g_d3d9.params.Windowed ? 0 : g_config.refresh_rate; - g_d3d9.params.BackBufferFormat = g_ddraw.mode.dmBitsPerPel == 16 ? D3DFMT_R5G6B5 : D3DFMT_X8R8G8B8; + g_d3d9.params.BackBufferFormat = g_ddraw->mode.dmBitsPerPel == 16 ? D3DFMT_R5G6B5 : D3DFMT_X8R8G8B8; - if (g_d3d9.device && SUCCEEDEDX(IDirect3DDevice9_Reset(g_d3d9.device, &g_d3d9.params))) + if (g_d3d9.device && SUCCEEDED(IDirect3DDevice9_Reset(g_d3d9.device, &g_d3d9.params))) { BOOL result = d3d9_set_states(); if (result) { - InterlockedExchange(&g_ddraw.render.palette_updated, TRUE); - InterlockedExchange(&g_ddraw.render.surface_updated, TRUE); - ReleaseSemaphore(g_ddraw.render.sem, 1, NULL); + InterlockedExchange(&g_ddraw->render.palette_updated, TRUE); + InterlockedExchange(&g_ddraw->render.surface_updated, TRUE); + ReleaseSemaphore(g_ddraw->render.sem, 1, NULL); } return result; @@ -299,8 +264,8 @@ static BOOL d3d9_create_resources() BOOL err = FALSE; - int width = g_ddraw.width; - int height = g_ddraw.height; + int width = g_ddraw->width; + int height = g_ddraw->height; g_d3d9.tex_width = width <= 1024 ? 1024 : width <= 2048 ? 2048 : width <= 4096 ? 4096 : width; @@ -313,7 +278,7 @@ static BOOL d3d9_create_resources() g_d3d9.scale_w = (float)width / g_d3d9.tex_width;; g_d3d9.scale_h = (float)height / g_d3d9.tex_height; - err = err || FAILEDX( + err = err || FAILED( IDirect3DDevice9_CreateVertexBuffer( g_d3d9.device, sizeof(CUSTOMVERTEX) * 4, 0, @@ -322,13 +287,13 @@ static BOOL d3d9_create_resources() &g_d3d9.vertex_buf, NULL)); - err = err || !d3d9_update_vertices(InterlockedExchangeAdd(&g_ddraw.upscale_hack_active, 0), TRUE); + err = err || !d3d9_update_vertices(InterlockedExchangeAdd(&g_ddraw->upscale_hack_active, 0), TRUE); for (int i = 0; i < D3D9_TEXTURE_COUNT; i++) { - if (g_ddraw.bpp == 16 && g_config.rgb555) + if (g_ddraw->bpp == 16 && g_config.rgb555) { - BOOL error = FAILEDX( + BOOL error = FAILED( IDirect3DDevice9_CreateTexture( g_d3d9.device, g_d3d9.tex_width, @@ -342,7 +307,7 @@ static BOOL d3d9_create_resources() if (error) { - err = err || FAILEDX( + err = err || FAILED( IDirect3DDevice9_CreateTexture( g_d3d9.device, g_d3d9.tex_width, @@ -355,9 +320,9 @@ static BOOL d3d9_create_resources() 0)); } } - else if (g_ddraw.bpp == 32) + else if (g_ddraw->bpp == 32) { - BOOL error = FAILEDX( + BOOL error = FAILED( IDirect3DDevice9_CreateTexture( g_d3d9.device, g_d3d9.tex_width, @@ -371,7 +336,7 @@ static BOOL d3d9_create_resources() if (error) { - err = err || FAILEDX( + err = err || FAILED( IDirect3DDevice9_CreateTexture( g_d3d9.device, g_d3d9.tex_width, @@ -386,14 +351,14 @@ static BOOL d3d9_create_resources() } else { - err = err || FAILEDX( + err = err || FAILED( IDirect3DDevice9_CreateTexture( g_d3d9.device, g_d3d9.tex_width, g_d3d9.tex_height, 1, 0, - g_ddraw.bpp == 16 ? D3DFMT_R5G6B5 : D3DFMT_L8, + g_ddraw->bpp == 16 ? D3DFMT_R5G6B5 : D3DFMT_L8, D3DPOOL_MANAGED, &g_d3d9.surface_tex[i], 0)); @@ -401,9 +366,9 @@ static BOOL d3d9_create_resources() err = err || !g_d3d9.surface_tex[i]; - if (g_ddraw.bpp == 8) + if (g_ddraw->bpp == 8) { - BOOL error = FAILEDX( + BOOL error = FAILED( IDirect3DDevice9_CreateTexture( g_d3d9.device, 256, @@ -417,7 +382,7 @@ static BOOL d3d9_create_resources() if (error) { - err = err || FAILEDX( + err = err || FAILED( IDirect3DDevice9_CreateTexture( g_d3d9.device, 256, @@ -434,9 +399,9 @@ static BOOL d3d9_create_resources() } } - if (g_ddraw.bpp == 8) + if (g_ddraw->bpp == 8) { - err = err || FAILEDX( + err = err || FAILED( IDirect3DDevice9_CreatePixelShader(g_d3d9.device, (DWORD*)D3D9_PALETTE_SHADER, &g_d3d9.pixel_shader)); IDirect3DDevice9_CreatePixelShader( @@ -448,7 +413,7 @@ static BOOL d3d9_create_resources() { if (g_config.d3d9_filter == FILTER_LANCZOS) { - BOOL error = FAILEDX( + BOOL error = FAILED( IDirect3DDevice9_CreatePixelShader( g_d3d9.device, (DWORD*)D3D9_LANCZOS2_SHADER, @@ -469,27 +434,27 @@ static BOOL d3d9_create_resources() } } - return g_d3d9.vertex_buf && (g_d3d9.pixel_shader || g_ddraw.bpp == 16 || g_ddraw.bpp == 32) && !err; + return g_d3d9.vertex_buf && (g_d3d9.pixel_shader || g_ddraw->bpp == 16 || g_ddraw->bpp == 32) && !err; } static BOOL d3d9_set_states() { BOOL err = FALSE; - err = err || FAILEDX(IDirect3DDevice9_SetFVF(g_d3d9.device, D3DFVF_XYZRHW | D3DFVF_TEX1)); - err = err || FAILEDX(IDirect3DDevice9_SetStreamSource(g_d3d9.device, 0, g_d3d9.vertex_buf, 0, sizeof(CUSTOMVERTEX))); - err = err || FAILEDX(IDirect3DDevice9_SetTexture(g_d3d9.device, 0, (IDirect3DBaseTexture9*)g_d3d9.surface_tex[0])); + err = err || FAILED(IDirect3DDevice9_SetFVF(g_d3d9.device, D3DFVF_XYZRHW | D3DFVF_TEX1)); + err = err || FAILED(IDirect3DDevice9_SetStreamSource(g_d3d9.device, 0, g_d3d9.vertex_buf, 0, sizeof(CUSTOMVERTEX))); + err = err || FAILED(IDirect3DDevice9_SetTexture(g_d3d9.device, 0, (IDirect3DBaseTexture9*)g_d3d9.surface_tex[0])); - if (g_ddraw.bpp == 8) + if (g_ddraw->bpp == 8) { - err = err || FAILEDX(IDirect3DDevice9_SetTexture(g_d3d9.device, 1, (IDirect3DBaseTexture9*)g_d3d9.palette_tex[0])); + err = err || FAILED(IDirect3DDevice9_SetTexture(g_d3d9.device, 1, (IDirect3DBaseTexture9*)g_d3d9.palette_tex[0])); BOOL bilinear = g_config.d3d9_filter && g_d3d9.pixel_shader_upscale && - (g_ddraw.render.viewport.width != g_ddraw.width || g_ddraw.render.viewport.height != g_ddraw.height || g_config.vhack); + (g_ddraw->render.viewport.width != g_ddraw->width || g_ddraw->render.viewport.height != g_ddraw->height); - err = err || FAILEDX( + err = err || FAILED( IDirect3DDevice9_SetPixelShader( g_d3d9.device, bilinear ? g_d3d9.pixel_shader_upscale : g_d3d9.pixel_shader)); @@ -497,7 +462,7 @@ static BOOL d3d9_set_states() if (bilinear) { float texture_size[4] = { (float)g_d3d9.tex_width, (float)g_d3d9.tex_height, 0, 0 }; - err = err || FAILEDX(IDirect3DDevice9_SetPixelShaderConstantF(g_d3d9.device, 0, texture_size, 1)); + err = err || FAILED(IDirect3DDevice9_SetPixelShaderConstantF(g_d3d9.device, 0, texture_size, 1)); } } else @@ -506,52 +471,52 @@ static BOOL d3d9_set_states() { if (g_config.d3d9_filter == FILTER_LANCZOS && g_d3d9.pixel_shader_upscale && - (g_ddraw.render.viewport.width != g_ddraw.width || - g_ddraw.render.viewport.height != g_ddraw.height) && - SUCCEEDEDX(IDirect3DDevice9_SetPixelShader(g_d3d9.device, g_d3d9.pixel_shader_upscale))) + (g_ddraw->render.viewport.width != g_ddraw->width || + g_ddraw->render.viewport.height != g_ddraw->height) && + SUCCEEDED(IDirect3DDevice9_SetPixelShader(g_d3d9.device, g_d3d9.pixel_shader_upscale))) { float texture_size[4] = { (float)g_d3d9.tex_width, (float)g_d3d9.tex_height, 0, 0 }; - err = err || FAILEDX(IDirect3DDevice9_SetPixelShaderConstantF(g_d3d9.device, 0, texture_size, 1)); + err = err || FAILED(IDirect3DDevice9_SetPixelShaderConstantF(g_d3d9.device, 0, texture_size, 1)); } else if ( - SUCCEEDEDX(IDirect3DDevice9_SetSamplerState(g_d3d9.device, 0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR)) && - SUCCEEDEDX(IDirect3DDevice9_SetSamplerState(g_d3d9.device, 0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR)) && + SUCCEEDED(IDirect3DDevice9_SetSamplerState(g_d3d9.device, 0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR)) && + SUCCEEDED(IDirect3DDevice9_SetSamplerState(g_d3d9.device, 0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR)) && g_config.d3d9_filter == FILTER_CUBIC && g_d3d9.pixel_shader_upscale && - (g_ddraw.render.viewport.width != g_ddraw.width || - g_ddraw.render.viewport.height != g_ddraw.height) && - SUCCEEDEDX(IDirect3DDevice9_SetPixelShader(g_d3d9.device, g_d3d9.pixel_shader_upscale))) + (g_ddraw->render.viewport.width != g_ddraw->width || + g_ddraw->render.viewport.height != g_ddraw->height) && + SUCCEEDED(IDirect3DDevice9_SetPixelShader(g_d3d9.device, g_d3d9.pixel_shader_upscale))) { float texture_size[4] = { (float)g_d3d9.tex_width, (float)g_d3d9.tex_height, 0, 0 }; - err = err || FAILEDX(IDirect3DDevice9_SetPixelShaderConstantF(g_d3d9.device, 0, texture_size, 1)); + err = err || FAILED(IDirect3DDevice9_SetPixelShaderConstantF(g_d3d9.device, 0, texture_size, 1)); } } } /* D3DVIEWPORT9 view_data = { - g_ddraw.render.viewport.x, - g_ddraw.render.viewport.y, - g_ddraw.render.viewport.width, - g_ddraw.render.viewport.height, + g_ddraw->render.viewport.x, + g_ddraw->render.viewport.y, + g_ddraw->render.viewport.width, + g_ddraw->render.viewport.height, 0.0f, 1.0f }; - err = err || FAILEDX(IDirect3DDevice9_SetViewport(g_d3d9.device, &view_data)); + err = err || FAILED(IDirect3DDevice9_SetViewport(g_d3d9.device, &view_data)); */ return !err; } static BOOL d3d9_update_vertices(BOOL upscale_hack, BOOL stretch) { - float vp_x = stretch ? (float)g_ddraw.render.viewport.x : 0.0f; - float vp_y = stretch ? (float)g_ddraw.render.viewport.y : 0.0f; + float vp_x = stretch ? (float)g_ddraw->render.viewport.x : 0.0f; + float vp_y = stretch ? (float)g_ddraw->render.viewport.y : 0.0f; - float vp_w = stretch ? (float)(g_ddraw.render.viewport.width + g_ddraw.render.viewport.x) : (float)g_ddraw.width; - float vp_h = stretch ? (float)(g_ddraw.render.viewport.height + g_ddraw.render.viewport.y) : (float)g_ddraw.height; + float vp_w = stretch ? (float)(g_ddraw->render.viewport.width + g_ddraw->render.viewport.x) : (float)g_ddraw->width; + float vp_h = stretch ? (float)(g_ddraw->render.viewport.height + g_ddraw->render.viewport.y) : (float)g_ddraw->height; - float s_h = upscale_hack ? g_d3d9.scale_h * ((float)g_ddraw.upscale_hack_height / g_ddraw.height) : g_d3d9.scale_h; - float s_w = upscale_hack ? g_d3d9.scale_w * ((float)g_ddraw.upscale_hack_width / g_ddraw.width) : g_d3d9.scale_w; + float s_h = upscale_hack ? g_d3d9.scale_h * ((float)g_ddraw->upscale_hack_height / g_ddraw->height) : g_d3d9.scale_h; + float s_w = upscale_hack ? g_d3d9.scale_w * ((float)g_ddraw->upscale_hack_width / g_ddraw->width) : g_d3d9.scale_w; CUSTOMVERTEX vertices[] = { @@ -562,7 +527,7 @@ static BOOL d3d9_update_vertices(BOOL upscale_hack, BOOL stretch) }; void* data; - if (g_d3d9.vertex_buf && SUCCEEDEDX(IDirect3DVertexBuffer9_Lock(g_d3d9.vertex_buf, 0, 0, (void**)&data, 0))) + if (g_d3d9.vertex_buf && SUCCEEDED(IDirect3DVertexBuffer9_Lock(g_d3d9.vertex_buf, 0, 0, (void**)&data, 0))) { memcpy(data, vertices, sizeof(vertices)); @@ -581,11 +546,10 @@ DWORD WINAPI d3d9_render_main(void) BOOL needs_update = FALSE; - DWORD timeout = g_config.minfps > 0 ? g_ddraw.minfps_tick_len : INFINITE; + DWORD timeout = g_config.minfps > 0 ? g_ddraw->minfps_tick_len : INFINITE; - while (g_ddraw.render.run && - (g_config.minfps < 0 || WaitForSingleObject(g_ddraw.render.sem, timeout) != WAIT_FAILED) && - g_ddraw.render.run) + while (g_ddraw->render.run && + (g_config.minfps < 0 || WaitForSingleObject(g_ddraw->render.sem, timeout) != WAIT_FAILED)) { #if _DEBUG dbg_draw_frame_info_start(); @@ -595,72 +559,72 @@ DWORD WINAPI d3d9_render_main(void) fpsl_frame_start(); - EnterCriticalSection(&g_ddraw.cs); + EnterCriticalSection(&g_ddraw->cs); - if (g_ddraw.primary && - g_ddraw.primary->bpp == g_ddraw.bpp && - g_ddraw.primary->width == g_ddraw.width && - g_ddraw.primary->height == g_ddraw.height && - (g_ddraw.bpp == 16 || g_ddraw.bpp == 32 || g_ddraw.primary->palette)) + if (g_ddraw->primary && + g_ddraw->primary->bpp == g_ddraw->bpp && + g_ddraw->primary->width == g_ddraw->width && + g_ddraw->primary->height == g_ddraw->height && + (g_ddraw->bpp == 16 || g_ddraw->bpp == 32 || g_ddraw->primary->palette)) { if (g_config.lock_surfaces) - EnterCriticalSection(&g_ddraw.primary->cs); + EnterCriticalSection(&g_ddraw->primary->cs); if (g_config.vhack) { if (util_detect_low_res_screen()) { - if (!InterlockedExchange(&g_ddraw.upscale_hack_active, TRUE)) + if (!InterlockedExchange(&g_ddraw->upscale_hack_active, TRUE)) d3d9_update_vertices(TRUE, TRUE); } else { - if (InterlockedExchange(&g_ddraw.upscale_hack_active, FALSE)) + if (InterlockedExchange(&g_ddraw->upscale_hack_active, FALSE)) d3d9_update_vertices(FALSE, TRUE); } } D3DLOCKED_RECT lock_rc; - if (InterlockedExchange(&g_ddraw.render.surface_updated, FALSE) || g_config.minfps == -2) + if (InterlockedExchange(&g_ddraw->render.surface_updated, FALSE) || g_config.minfps == -2) { if (++tex_index >= D3D9_TEXTURE_COUNT) tex_index = 0; - RECT rc = { 0, 0, g_ddraw.width, g_ddraw.height }; + RECT rc = { 0, 0, g_ddraw->width, g_ddraw->height }; - if (SUCCEEDEDX(IDirect3DDevice9_SetTexture(g_d3d9.device, 0, (IDirect3DBaseTexture9*)g_d3d9.surface_tex[tex_index])) && - SUCCEEDEDX(IDirect3DTexture9_LockRect(g_d3d9.surface_tex[tex_index], 0, &lock_rc, &rc, 0))) + if (SUCCEEDED(IDirect3DDevice9_SetTexture(g_d3d9.device, 0, (IDirect3DBaseTexture9*)g_d3d9.surface_tex[tex_index])) && + SUCCEEDED(IDirect3DTexture9_LockRect(g_d3d9.surface_tex[tex_index], 0, &lock_rc, &rc, 0))) { blt_clean( lock_rc.pBits, 0, 0, - g_ddraw.primary->width, - g_ddraw.primary->height, + g_ddraw->primary->width, + g_ddraw->primary->height, lock_rc.Pitch, - g_ddraw.primary->surface, + g_ddraw->primary->surface, 0, 0, - g_ddraw.primary->pitch, - g_ddraw.primary->bpp); + g_ddraw->primary->pitch, + g_ddraw->primary->bpp); IDirect3DTexture9_UnlockRect(g_d3d9.surface_tex[tex_index], 0); } } - if (g_ddraw.bpp == 8 && - (InterlockedExchange(&g_ddraw.render.palette_updated, FALSE) || g_config.minfps == -2)) + if (g_ddraw->bpp == 8 && + (InterlockedExchange(&g_ddraw->render.palette_updated, FALSE) || g_config.minfps == -2)) { if (++pal_index >= D3D9_TEXTURE_COUNT) pal_index = 0; RECT rc = { 0,0,256,1 }; - if (SUCCEEDEDX(IDirect3DDevice9_SetTexture(g_d3d9.device, 1, (IDirect3DBaseTexture9*)g_d3d9.palette_tex[pal_index])) && - SUCCEEDEDX(IDirect3DTexture9_LockRect(g_d3d9.palette_tex[pal_index], 0, &lock_rc, &rc, 0))) + if (SUCCEEDED(IDirect3DDevice9_SetTexture(g_d3d9.device, 1, (IDirect3DBaseTexture9*)g_d3d9.palette_tex[pal_index])) && + SUCCEEDED(IDirect3DTexture9_LockRect(g_d3d9.palette_tex[pal_index], 0, &lock_rc, &rc, 0))) { - memcpy(lock_rc.pBits, g_ddraw.primary->palette->data_rgb, 256 * sizeof(int)); + memcpy(lock_rc.pBits, g_ddraw->primary->palette->data_rgb, 256 * sizeof(int)); IDirect3DTexture9_UnlockRect(g_d3d9.palette_tex[pal_index], 0); } @@ -668,12 +632,13 @@ DWORD WINAPI d3d9_render_main(void) if (g_config.fixchilds) { - g_ddraw.child_window_exists = FALSE; - EnumChildWindows(g_ddraw.hwnd, util_enum_child_proc, (LPARAM)g_ddraw.primary); + g_ddraw->child_window_exists = FALSE; + InterlockedExchangePointer((void*)&g_ddraw->video_window_hwnd, NULL); + EnumChildWindows(g_ddraw->hwnd, util_enum_child_proc, (LPARAM)g_ddraw->primary); - if (g_ddraw.render.width != g_ddraw.width || g_ddraw.render.height != g_ddraw.height) + if (g_ddraw->render.width != g_ddraw->width || g_ddraw->render.height != g_ddraw->height) { - if (g_ddraw.child_window_exists) + if (g_ddraw->child_window_exists) { IDirect3DDevice9_Clear(g_d3d9.device, 0, NULL, D3DCLEAR_TARGET, D3DCOLOR_XRGB(0, 0, 0), 1.0f, 0); @@ -689,12 +654,12 @@ DWORD WINAPI d3d9_render_main(void) } if (g_config.lock_surfaces) - LeaveCriticalSection(&g_ddraw.primary->cs); + LeaveCriticalSection(&g_ddraw->primary->cs); } - LeaveCriticalSection(&g_ddraw.cs); + LeaveCriticalSection(&g_ddraw->cs); - if (g_ddraw.render.viewport.x != 0 || g_ddraw.render.viewport.y != 0) + if (g_ddraw->render.viewport.x != 0 || g_ddraw->render.viewport.y != 0) { IDirect3DDevice9_Clear(g_d3d9.device, 0, NULL, D3DCLEAR_TARGET, D3DCOLOR_XRGB(0, 0, 0), 1.0f, 0); } @@ -703,7 +668,7 @@ DWORD WINAPI d3d9_render_main(void) IDirect3DDevice9_DrawPrimitive(g_d3d9.device, D3DPT_TRIANGLESTRIP, 0, 2); IDirect3DDevice9_EndScene(g_d3d9.device); - if (g_ddraw.bnet_active) + if (g_ddraw->bnet_active) { IDirect3DDevice9_Clear(g_d3d9.device, 0, NULL, D3DCLEAR_TARGET, D3DCOLOR_XRGB(0, 0, 0), 1.0f, 0); } @@ -711,22 +676,11 @@ DWORD WINAPI d3d9_render_main(void) if (FAILED(IDirect3DDevice9_Present(g_d3d9.device, NULL, NULL, NULL, NULL))) { DWORD_PTR result; - SendMessageTimeout(g_ddraw.hwnd, WM_D3D9DEVICELOST, 0, 0, 0, 1000, &result); + SendMessageTimeout(g_ddraw->hwnd, WM_D3D9DEVICELOST, 0, 0, 0, 1000, &result); - ReleaseSemaphore(g_ddraw.render.sem, 1, NULL); + ReleaseSemaphore(g_ddraw->render.sem, 1, NULL); Sleep(50); } - else - { - /* Force redraw for GDI games (ClueFinders) */ - if (!g_ddraw.primary) - { - RedrawWindow(g_ddraw.hwnd, NULL, NULL, RDW_INVALIDATE | RDW_ALLCHILDREN); - } - } - - if (!g_ddraw.render.run) - break; #if _DEBUG dbg_draw_frame_info_end(); @@ -736,7 +690,7 @@ DWORD WINAPI d3d9_render_main(void) } if (g_config.vhack) - InterlockedExchange(&g_ddraw.upscale_hack_active, FALSE); + InterlockedExchange(&g_ddraw->upscale_hack_active, FALSE); return 0; } diff --git a/src/render_gdi.c b/src/render_gdi.c index c7292ed..8576450 100644 --- a/src/render_gdi.c +++ b/src/render_gdi.c @@ -16,16 +16,16 @@ DWORD WINAPI gdi_render_main(void) static DWORD warning_end_tick = 0; static char warning_text[512] = { 0 }; - if (g_ddraw.show_driver_warning) + if (g_ddraw->show_driver_warning) { - g_ddraw.show_driver_warning = FALSE; + g_ddraw->show_driver_warning = FALSE; TRACE(" Switched to GDI renderer\n"); warning_end_tick = timeGetTime() + (15 * 1000); if (!g_config.windowed) - PostMessage(g_ddraw.hwnd, WM_AUTORENDERER, 0, 0); + PostMessage(g_ddraw->hwnd, WM_AUTORENDERER, 0, 0); _snprintf( warning_text, @@ -38,11 +38,10 @@ DWORD WINAPI gdi_render_main(void) fpsl_init(); - DWORD timeout = g_config.minfps > 0 ? g_ddraw.minfps_tick_len : INFINITE; + DWORD timeout = g_config.minfps > 0 ? g_ddraw->minfps_tick_len : INFINITE; - while (g_ddraw.render.run && - (g_config.minfps < 0 || WaitForSingleObject(g_ddraw.render.sem, timeout) != WAIT_FAILED) && - g_ddraw.render.run) + while (g_ddraw->render.run && + (g_config.minfps < 0 || WaitForSingleObject(g_ddraw->render.sem, timeout) != WAIT_FAILED)) { #if _DEBUG dbg_draw_frame_info_start(); @@ -50,25 +49,25 @@ DWORD WINAPI gdi_render_main(void) fpsl_frame_start(); - EnterCriticalSection(&g_ddraw.cs); + EnterCriticalSection(&g_ddraw->cs); - if (g_ddraw.primary && - g_ddraw.primary->bpp == g_ddraw.bpp && - g_ddraw.primary->width == g_ddraw.width && - g_ddraw.primary->height == g_ddraw.height && - (g_ddraw.bpp == 16 || g_ddraw.bpp == 32 || g_ddraw.primary->palette)) + if (g_ddraw->primary && + g_ddraw->primary->bpp == g_ddraw->bpp && + g_ddraw->primary->width == g_ddraw->width && + g_ddraw->primary->height == g_ddraw->height && + (g_ddraw->bpp == 16 || g_ddraw->bpp == 32 || g_ddraw->primary->palette)) { if (g_config.lock_surfaces) - EnterCriticalSection(&g_ddraw.primary->cs); + EnterCriticalSection(&g_ddraw->primary->cs); if (warning_end_tick) { if (timeGetTime() < warning_end_tick) { HDC primary_dc; - dds_GetDC(g_ddraw.primary, &primary_dc); + dds_GetDC(g_ddraw->primary, &primary_dc); - RECT rc = { 0, 0, g_ddraw.width, g_ddraw.height }; + RECT rc = { 0, 0, g_ddraw->width, g_ddraw->height }; DrawText(primary_dc, warning_text, -1, &rc, DT_NOCLIP | DT_CENTER); } else @@ -80,100 +79,88 @@ DWORD WINAPI gdi_render_main(void) BOOL upscale_hack = g_config.vhack && util_detect_low_res_screen(); if (g_config.vhack) - InterlockedExchange(&g_ddraw.upscale_hack_active, upscale_hack); + InterlockedExchange(&g_ddraw->upscale_hack_active, upscale_hack); if (g_config.fixchilds) { - g_ddraw.child_window_exists = FALSE; - EnumChildWindows(g_ddraw.hwnd, util_enum_child_proc, (LPARAM)g_ddraw.primary); + g_ddraw->child_window_exists = FALSE; + InterlockedExchangePointer((void*)&g_ddraw->video_window_hwnd, NULL); + EnumChildWindows(g_ddraw->hwnd, util_enum_child_proc, (LPARAM)g_ddraw->primary); } - if (g_ddraw.bpp == 8 && g_ddraw.primary->palette) + if (g_ddraw->bpp == 8 && g_ddraw->primary->palette) { - memcpy(&g_ddraw.primary->bmi->bmiColors[0], g_ddraw.primary->palette->data_rgb, 256 * sizeof(int)); + memcpy(&g_ddraw->primary->bmi->bmiColors[0], g_ddraw->primary->palette->data_rgb, 256 * sizeof(int)); } - if (InterlockedExchange(&g_ddraw.render.clear_screen, FALSE) || g_ddraw.child_window_exists) + if (InterlockedExchange(&g_ddraw->render.clear_screen, FALSE)) { - RECT rc = { 0, 0, g_ddraw.render.width, g_ddraw.render.height }; - FillRect(g_ddraw.render.hdc, &rc, (HBRUSH)GetStockObject(BLACK_BRUSH)); + RECT rc = { 0, 0, g_ddraw->render.width, g_ddraw->render.height }; + FillRect(g_ddraw->render.hdc, &rc, (HBRUSH)GetStockObject(BLACK_BRUSH)); } - int lines_copied = 0; - - if (g_ddraw.bnet_active) + if (g_ddraw->bnet_active) { - RECT rc = { 0, 0, g_ddraw.render.width, g_ddraw.render.height }; - FillRect(g_ddraw.render.hdc, &rc, (HBRUSH)GetStockObject(BLACK_BRUSH)); - lines_copied = 1; + RECT rc = { 0, 0, g_ddraw->render.width, g_ddraw->render.height }; + FillRect(g_ddraw->render.hdc, &rc, (HBRUSH)GetStockObject(BLACK_BRUSH)); } else if (upscale_hack) { - lines_copied = real_StretchDIBits( - g_ddraw.render.hdc, - g_ddraw.render.viewport.x, - g_ddraw.render.viewport.y, - g_ddraw.render.viewport.width, - g_ddraw.render.viewport.height, + real_StretchDIBits( + g_ddraw->render.hdc, + g_ddraw->render.viewport.x, + g_ddraw->render.viewport.y, + g_ddraw->render.viewport.width, + g_ddraw->render.viewport.height, 0, - g_ddraw.height - g_ddraw.upscale_hack_height, - g_ddraw.upscale_hack_width, - g_ddraw.upscale_hack_height, - g_ddraw.primary->surface, - g_ddraw.primary->bmi, + g_ddraw->height - g_ddraw->upscale_hack_height, + g_ddraw->upscale_hack_width, + g_ddraw->upscale_hack_height, + g_ddraw->primary->surface, + g_ddraw->primary->bmi, DIB_RGB_COLORS, SRCCOPY); } - else if (!g_ddraw.child_window_exists && - (g_ddraw.render.width != g_ddraw.width || g_ddraw.render.height != g_ddraw.height)) + else if (!g_ddraw->child_window_exists && + (g_ddraw->render.width != g_ddraw->width || g_ddraw->render.height != g_ddraw->height)) { - lines_copied = real_StretchDIBits( - g_ddraw.render.hdc, - g_ddraw.render.viewport.x, - g_ddraw.render.viewport.y, - g_ddraw.render.viewport.width, - g_ddraw.render.viewport.height, + real_StretchDIBits( + g_ddraw->render.hdc, + g_ddraw->render.viewport.x, + g_ddraw->render.viewport.y, + g_ddraw->render.viewport.width, + g_ddraw->render.viewport.height, 0, 0, - g_ddraw.width, - g_ddraw.height, - g_ddraw.primary->surface, - g_ddraw.primary->bmi, + g_ddraw->width, + g_ddraw->height, + g_ddraw->primary->surface, + g_ddraw->primary->bmi, DIB_RGB_COLORS, SRCCOPY); } - - if (lines_copied == 0 || lines_copied == GDI_ERROR) + else { real_SetDIBitsToDevice( - g_ddraw.render.hdc, + g_ddraw->render.hdc, 0, 0, - g_ddraw.width, - g_ddraw.height, + g_ddraw->width, + g_ddraw->height, 0, 0, 0, - g_ddraw.height, - g_ddraw.primary->surface, - g_ddraw.primary->bmi, + g_ddraw->height, + g_ddraw->primary->surface, + g_ddraw->primary->bmi, DIB_RGB_COLORS); } if (g_config.lock_surfaces) - LeaveCriticalSection(&g_ddraw.primary->cs); + LeaveCriticalSection(&g_ddraw->primary->cs); } - LeaveCriticalSection(&g_ddraw.cs); - - /* Force redraw for GDI games (ClueFinders) */ - if (!g_ddraw.primary) - { - RedrawWindow(g_ddraw.hwnd, NULL, NULL, RDW_INVALIDATE | RDW_ALLCHILDREN); - } - - if (!g_ddraw.render.run) - break; + LeaveCriticalSection(&g_ddraw->cs); #if _DEBUG dbg_draw_frame_info_end(); diff --git a/src/render_ogl.c b/src/render_ogl.c index aae1d34..6ff9a2c 100644 --- a/src/render_ogl.c +++ b/src/render_ogl.c @@ -13,169 +13,66 @@ static HGLRC ogl_create_core_context(HDC hdc); +static HGLRC ogl_create_context(HDC hdc); static void ogl_build_programs(); static void ogl_create_textures(int width, int height); static void ogl_init_main_program(); -static void ogl_init_shader1_program(); -static void ogl_init_shader2_program(); +static void ogl_init_scale_program(); static void ogl_render(); -static BOOL ogl_release_resources(); +static void ogl_delete_context(HGLRC context); static BOOL ogl_texture_upload_test(); static BOOL ogl_shader_test(); -static void ogl_check_error(const char* stmt); static OGLRENDERER g_ogl; -BOOL ogl_create() -{ - if (g_ogl.hwnd == g_ddraw.hwnd && g_ogl.hdc == g_ddraw.render.hdc && g_ogl.context) - { - return TRUE; - } - - ogl_release(); - - g_ogl.context = xwglCreateContext(g_ddraw.render.hdc); - if (g_ogl.context) - { - g_ogl.hwnd = g_ddraw.hwnd; - g_ogl.hdc = g_ddraw.render.hdc; - - GLenum err = GL_NO_ERROR; - BOOL made_current = FALSE; - - for (int i = 0; i < 5; i++) - { - if ((made_current = xwglMakeCurrent(g_ogl.hdc, g_ogl.context))) - break; - - Sleep(50); - } - - if (made_current && (err = glGetError()) == GL_NO_ERROR) - { - GL_CHECK(oglu_init()); - - TRACE("+--OpenGL-----------------------------------------\n"); - TRACE("| GL_VERSION: %s\n", glGetString(GL_VERSION)); - TRACE("| GL_VENDOR: %s\n", glGetString(GL_VENDOR)); - TRACE("| GL_RENDERER: %s\n", glGetString(GL_RENDERER)); - TRACE("| GL_SHADING_LANGUAGE_VERSION: %s\n", glGetString(GL_SHADING_LANGUAGE_VERSION)); - TRACE("+------------------------------------------------\n"); - -#ifdef _DEBUG - while (glGetError() != GL_NO_ERROR); /* Ignore errors from glGetString */ -#endif - - GL_CHECK(g_ogl.context = ogl_create_core_context(g_ogl.hdc)); - } - else - { - TRACE("OpenGL error %08x, GetLastError %lu (xwglMakeCurrent())\n", err, GetLastError()); - ogl_check_error("xwglMakeCurrent()"); - } - - for (int i = 0; i < 5; i++) - { - if (xwglMakeCurrent(NULL, NULL)) - break; - - Sleep(50); - } - - return TRUE; - } - - g_ogl.hwnd = NULL; - g_ogl.hdc = NULL; - - return FALSE; -} - DWORD WINAPI ogl_render_main(void) { Sleep(250); g_ogl.got_error = g_ogl.use_opengl = FALSE; - GLenum err = GL_NO_ERROR; - BOOL made_current = FALSE; - for (int i = 0; i < 5; i++) + g_ogl.context = ogl_create_context(g_ddraw->render.hdc); + if (g_ogl.context) { - if ((made_current = xwglMakeCurrent(g_ogl.hdc, g_ogl.context))) - break; + oglu_init(); - Sleep(50); - } + TRACE("+--OpenGL-----------------------------------------\n"); + TRACE("| GL_VERSION: %s\n", glGetString(GL_VERSION)); + TRACE("| GL_VENDOR: %s\n", glGetString(GL_VENDOR)); + TRACE("| GL_RENDERER: %s\n", glGetString(GL_RENDERER)); + TRACE("| GL_SHADING_LANGUAGE_VERSION: %s\n", glGetString(GL_SHADING_LANGUAGE_VERSION)); + TRACE("+------------------------------------------------\n"); - if (made_current && (err = glGetError()) == GL_NO_ERROR) - { - GL_CHECK(oglu_init()); + g_ogl.context = ogl_create_core_context(g_ddraw->render.hdc); - g_ogl.got_error = g_ogl.got_error || (err = glGetError()) != GL_NO_ERROR; - - BOOL got_swap_ctrl; - GL_CHECK(got_swap_ctrl = oglu_ext_exists("WGL_EXT_swap_control", g_ogl.hdc)); - - if (got_swap_ctrl && wglSwapIntervalEXT) + if (oglu_ext_exists("WGL_EXT_swap_control", g_ddraw->render.hdc) && wglSwapIntervalEXT) wglSwapIntervalEXT(g_config.vsync ? 1 : 0); fpsl_init(); - GL_CHECK(ogl_build_programs()); - GL_CHECK(ogl_create_textures(g_ddraw.width, g_ddraw.height)); - GL_CHECK(ogl_init_main_program()); - GL_CHECK(ogl_init_shader1_program()); - GL_CHECK(ogl_init_shader2_program()); + ogl_build_programs(); + ogl_create_textures(g_ddraw->width, g_ddraw->height); + ogl_init_main_program(); + ogl_init_scale_program(); - g_ogl.got_error = g_ogl.got_error || (err = glGetError()) != GL_NO_ERROR; - GL_CHECK(g_ogl.got_error = g_ogl.got_error || !ogl_texture_upload_test()); - GL_CHECK(g_ogl.got_error = g_ogl.got_error || !ogl_shader_test()); - g_ogl.got_error = g_ogl.got_error || (err = glGetError()) != GL_NO_ERROR; + g_ogl.got_error = g_ogl.got_error || !ogl_texture_upload_test(); + g_ogl.got_error = g_ogl.got_error || !ogl_shader_test(); + g_ogl.got_error = g_ogl.got_error || glGetError() != GL_NO_ERROR; + g_ogl.use_opengl = (g_ogl.main_program || g_ddraw->bpp == 16 || g_ddraw->bpp == 32) && !g_ogl.got_error; - g_ogl.use_opengl = (g_ogl.main_program || g_ddraw.bpp == 16 || g_ddraw.bpp == 32) && !g_ogl.got_error; + ogl_render(); - GL_CHECK(ogl_render()); - - GL_CHECK(ogl_release_resources()); - - while (glGetError() != GL_NO_ERROR); - } - else - { - TRACE("OpenGL error %08x, GetLastError %lu (xwglMakeCurrent())\n", err, GetLastError()); - ogl_check_error("xwglMakeCurrent()"); + ogl_delete_context(g_ogl.context); } - for (int i = 0; i < 5; i++) - { - if (xwglMakeCurrent(NULL, NULL)) - break; - - Sleep(50); - } - if (!g_ogl.use_opengl) { - g_ddraw.show_driver_warning = TRUE; - g_ddraw.renderer = gdi_render_main; + g_ddraw->show_driver_warning = TRUE; + g_ddraw->renderer = gdi_render_main; gdi_render_main(); } return 0; } - -static void ogl_check_error(const char* stmt) -{ -#ifdef _DEBUG - GLenum err; - while ((err = glGetError()) != GL_NO_ERROR) - { - g_ogl.got_error = TRUE; - TRACE("OpenGL error %08x (%s)\n", err, stmt); - } -#endif -} - static HGLRC ogl_create_core_context(HDC hdc) { if (!wglCreateContextAttribsARB) @@ -213,80 +110,78 @@ static HGLRC ogl_create_core_context(HDC hdc) return g_ogl.context; } +static HGLRC ogl_create_context(HDC hdc) +{ + HGLRC context = xwglCreateContext(hdc); + BOOL made_current = context && xwglMakeCurrent(hdc, context); + + if (!made_current || glGetError() != GL_NO_ERROR) + { + if (made_current) + { + xwglMakeCurrent(NULL, NULL); + xwglDeleteContext(context); + } + + context = 0; + } + + return context; +} + static void ogl_build_programs() { - g_ogl.main_program = g_ogl.shader1_program = g_ogl.shader2_program = 0; + g_ogl.main_program = g_ogl.scale_program = 0; - g_ogl.shader2_upscale = FALSE; BOOL core_profile = wglCreateContextAttribsARB != NULL; if (g_oglu_got_version3) { - if (g_ddraw.bpp == 8) + if (g_ddraw->bpp == 8) { g_ogl.main_program = oglu_build_program(PASSTHROUGH_VERT_SHADER, PALETTE_FRAG_SHADER, core_profile); } - else if (g_ddraw.bpp == 16 && g_config.rgb555) + else if (g_ddraw->bpp == 16 && g_config.rgb555) { g_ogl.main_program = oglu_build_program(PASSTHROUGH_VERT_SHADER, RGB555_FRAG_SHADER, core_profile); } - else if (g_ddraw.bpp == 16 || g_ddraw.bpp == 32) + else if (g_ddraw->bpp == 16 || g_ddraw->bpp == 32) { g_ogl.main_program = oglu_build_program(PASSTHROUGH_VERT_SHADER, PASSTHROUGH_FRAG_SHADER, core_profile); } BOOL bilinear = FALSE; - char shader_path[MAX_PATH] = { 0 }; if (g_ogl.main_program) { + char shader_path[MAX_PATH] = { 0 }; + strncpy(shader_path, g_config.shader, sizeof(shader_path)); - shader_path[sizeof(shader_path) - 1] = '\0'; /* strncpy fix */ if (GetFileAttributes(shader_path) == INVALID_FILE_ATTRIBUTES) { _snprintf(shader_path, sizeof(shader_path) - 1, "%s%s", g_config.dll_path, g_config.shader); } - /* Hack for Intel HD 4000 driver bug - force default shader */ - - if (_stricmp(g_oglu_version_long, "4.0.0 - Build 10.18.10.4252") == 0 || - _stricmp(g_oglu_version_long, "4.0.0 - Build 10.18.10.5161") == 0) - { - //shader_path[0] = 0; - //g_config.shader[0] = 0; - } - /* detect common upscaling shaders and disable them if no upscaling is required */ BOOL is_upscaler = - strstr(g_config.shader, "fsr.glsl") != NULL || strstr(g_config.shader, "catmull-rom-bilinear.glsl") != NULL || strstr(g_config.shader, "lanczos2-sharp.glsl") != NULL || strstr(g_config.shader, "xbr-lv2-noblend.glsl") != NULL || - strstr(g_config.shader, "xbrz-freescale-multipass.glsl") != NULL || strstr(g_config.shader, "xbrz-freescale.glsl") != NULL; if (!is_upscaler || - g_ddraw.render.viewport.width != g_ddraw.width || - g_ddraw.render.viewport.height != g_ddraw.height || - g_config.vhack) + g_ddraw->render.viewport.width != g_ddraw->width || + g_ddraw->render.viewport.height != g_ddraw->height) { - g_ogl.shader1_program = oglu_build_program_from_file(shader_path, core_profile); + g_ogl.scale_program = oglu_build_program_from_file(shader_path, core_profile); - if (g_ogl.shader1_program && - (strstr(g_config.shader, "xbrz-freescale-multipass.glsl") != NULL || - strstr(g_config.shader, "-pass1scale") != NULL)) + if (!g_ogl.scale_program && + (g_ddraw->render.viewport.width != g_ddraw->width || + g_ddraw->render.viewport.height != g_ddraw->height)) { - g_ogl.shader2_upscale = TRUE; - } - - if (!g_ogl.shader1_program && - (g_ddraw.render.viewport.width != g_ddraw.width || - g_ddraw.render.viewport.height != g_ddraw.height || - g_config.vhack)) - { - g_ogl.shader1_program = + g_ogl.scale_program = oglu_build_program( _stricmp(g_config.shader, "xBR-lv2") == 0 ? XBR_LV2_VERT_SHADER : PASSTHROUGH_VERT_SHADER, @@ -309,26 +204,16 @@ static void ogl_build_programs() g_oglu_got_version3 = FALSE; } - if (g_ogl.shader1_program) - { - if (strlen(shader_path) <= sizeof(shader_path) - 8) - { - strcat(shader_path, ".pass1"); - - g_ogl.shader2_program = oglu_build_program_from_file(shader_path, core_profile); - } - } - g_ogl.filter_bilinear = strstr(g_config.shader, "bilinear.glsl") != NULL || bilinear; } if (g_oglu_got_version2 && !g_ogl.main_program) { - if (g_ddraw.bpp == 8) + if (g_ddraw->bpp == 8) { g_ogl.main_program = oglu_build_program(PASSTHROUGH_VERT_SHADER_110, PALETTE_FRAG_SHADER_110, FALSE); } - else if (g_ddraw.bpp == 16 || g_ddraw.bpp == 32) + else if (g_ddraw->bpp == 16 || g_ddraw->bpp == 32) { g_ogl.main_program = oglu_build_program(PASSTHROUGH_VERT_SHADER_110, PASSTHROUGH_FRAG_SHADER_110, FALSE); } @@ -337,16 +222,14 @@ static void ogl_build_programs() static void ogl_create_textures(int width, int height) { - GLenum err = GL_NO_ERROR; - - int w = g_ogl.shader2_program ? max(width, g_ddraw.render.viewport.width) : width; - int h = g_ogl.shader2_program ? max(height, g_ddraw.render.viewport.height) : height; - g_ogl.surface_tex_width = - w <= 1024 ? 1024 : w <= 2048 ? 2048 : w <= 4096 ? 4096 : w <= 8192 ? 8192 : w; + width <= 1024 ? 1024 : width <= 2048 ? 2048 : width <= 4096 ? 4096 : width; g_ogl.surface_tex_height = - h <= 512 ? 512 : h <= 1024 ? 1024 : h <= 2048 ? 2048 : h <= 4096 ? 4096 : h <= 8192 ? 8192 : h; + height <= 512 ? 512 : height <= 1024 ? 1024 : height <= 2048 ? 2048 : height <= 4096 ? 4096 : height; + + g_ogl.surface_tex = + HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, g_ogl.surface_tex_width * g_ogl.surface_tex_height * sizeof(int)); g_ogl.scale_w = (float)width / g_ogl.surface_tex_width; g_ogl.scale_h = (float)height / g_ogl.surface_tex_height; @@ -359,17 +242,11 @@ static void ogl_create_textures(int width, int height) glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - g_ogl.got_error = g_ogl.got_error || (err = glGetError()) != GL_NO_ERROR; - - if (err != GL_NO_ERROR) - { - TRACE("OpenGL error %08x (ogl_create_textures())\n", err); - ogl_check_error("ogl_create_textures()"); - } + g_ogl.got_error = g_ogl.got_error || glGetError() != GL_NO_ERROR; while (glGetError() != GL_NO_ERROR); - if (g_ddraw.bpp == 32) + if (g_ddraw->bpp == 32) { glTexImage2D( GL_TEXTURE_2D, @@ -382,7 +259,7 @@ static void ogl_create_textures(int width, int height) g_ogl.surface_type = GL_UNSIGNED_BYTE, 0); } - else if (g_ddraw.bpp == 16 && g_config.rgb555) + else if (g_ddraw->bpp == 16 && g_config.rgb555) { if (g_oglu_got_version3) { @@ -411,7 +288,7 @@ static void ogl_create_textures(int width, int height) 0); } } - else if (g_ddraw.bpp == 16) + else if (g_ddraw->bpp == 16) { glTexImage2D( GL_TEXTURE_2D, @@ -439,7 +316,7 @@ static void ogl_create_textures(int width, int height) 0); } } - else if (g_ddraw.bpp == 8) + else if (g_ddraw->bpp == 8) { glTexImage2D( GL_TEXTURE_2D, @@ -483,7 +360,7 @@ static void ogl_create_textures(int width, int height) } } - if (g_ddraw.bpp == 8) + if (g_ddraw->bpp == 8) { glGenTextures(TEXTURE_COUNT, g_ogl.palette_tex_ids); @@ -508,7 +385,7 @@ static void ogl_init_main_program() glUniform1i(glGetUniformLocation(g_ogl.main_program, "Texture"), 0); - if (g_ddraw.bpp == 8) + if (g_ddraw->bpp == 8) glUniform1i(glGetUniformLocation(g_ogl.main_program, "PaletteTexture"), 1); if (g_oglu_got_version3) @@ -518,7 +395,7 @@ static void ogl_init_main_program() glGenBuffers(3, g_ogl.main_vbos); - if (g_ogl.shader1_program) + if (g_ogl.scale_program) { glBindBuffer(GL_ARRAY_BUFFER, g_ogl.main_vbos[0]); static const GLfloat vertex_coord[] = { @@ -597,303 +474,53 @@ static void ogl_init_main_program() } } -static void ogl_init_shader1_program() +static void ogl_init_scale_program() { - if (!g_ogl.shader1_program) + if (!g_ogl.scale_program) return; - glUseProgram(g_ogl.shader1_program); + glUseProgram(g_ogl.scale_program); - GLint vertex_coord_attr_loc = glGetAttribLocation(g_ogl.shader1_program, "VertexCoord"); - if (vertex_coord_attr_loc == -1) // dosbox staging - vertex_coord_attr_loc = glGetAttribLocation(g_ogl.shader1_program, "a_position"); + GLint vertex_coord_attr_loc = glGetAttribLocation(g_ogl.scale_program, "VertexCoord"); + g_ogl.scale_tex_coord_attr_loc = glGetAttribLocation(g_ogl.scale_program, "TexCoord"); + g_ogl.frame_count_uni_loc = glGetUniformLocation(g_ogl.scale_program, "FrameCount"); - g_ogl.shader1_tex_coord_attr_loc = glGetAttribLocation(g_ogl.shader1_program, "TexCoord"); + glGenBuffers(3, g_ogl.scale_vbos); - glGenBuffers(3, g_ogl.shader1_vbos); - - if (g_ogl.shader2_program) - { - glBindBuffer(GL_ARRAY_BUFFER, g_ogl.shader1_vbos[0]); - static const GLfloat vertext_coord[] = { - -1.0f,-1.0f, - -1.0f, 1.0f, - 1.0f, 1.0f, - 1.0f,-1.0f, - }; - glBufferData(GL_ARRAY_BUFFER, sizeof(vertext_coord), vertext_coord, GL_STATIC_DRAW); - glBindBuffer(GL_ARRAY_BUFFER, 0); - - glBindBuffer(GL_ARRAY_BUFFER, g_ogl.shader1_vbos[1]); - GLfloat tex_coord[] = { - 0.0f, 0.0f, - 0.0f, g_ogl.scale_h, - g_ogl.scale_w, g_ogl.scale_h, - g_ogl.scale_w, 0.0f, - }; - glBufferData(GL_ARRAY_BUFFER, sizeof(tex_coord), tex_coord, GL_STATIC_DRAW); - glBindBuffer(GL_ARRAY_BUFFER, 0); - } - else - { - glBindBuffer(GL_ARRAY_BUFFER, g_ogl.shader1_vbos[0]); - static const GLfloat vertext_coord[] = { - -1.0f, 1.0f, - 1.0f, 1.0f, - 1.0f,-1.0f, - -1.0f,-1.0f, - }; - glBufferData(GL_ARRAY_BUFFER, sizeof(vertext_coord), vertext_coord, GL_STATIC_DRAW); - glBindBuffer(GL_ARRAY_BUFFER, 0); - - glBindBuffer(GL_ARRAY_BUFFER, g_ogl.shader1_vbos[1]); - GLfloat tex_coord[] = { - 0.0f, 0.0f, - g_ogl.scale_w, 0.0f, - g_ogl.scale_w, g_ogl.scale_h, - 0.0f, g_ogl.scale_h, - }; - glBufferData(GL_ARRAY_BUFFER, sizeof(tex_coord), tex_coord, GL_STATIC_DRAW); - glBindBuffer(GL_ARRAY_BUFFER, 0); - } - - glGenVertexArrays(1, &g_ogl.shader1_vao); - glBindVertexArray(g_ogl.shader1_vao); - - glBindBuffer(GL_ARRAY_BUFFER, g_ogl.shader1_vbos[0]); - glVertexAttribPointer(vertex_coord_attr_loc, 2, GL_FLOAT, GL_FALSE, 0, NULL); - glEnableVertexAttribArray(vertex_coord_attr_loc); - glBindBuffer(GL_ARRAY_BUFFER, 0); - - if (g_ogl.shader1_tex_coord_attr_loc != -1) - { - glBindBuffer(GL_ARRAY_BUFFER, g_ogl.shader1_vbos[1]); - glVertexAttribPointer(g_ogl.shader1_tex_coord_attr_loc, 2, GL_FLOAT, GL_FALSE, 0, NULL); - glEnableVertexAttribArray(g_ogl.shader1_tex_coord_attr_loc); - glBindBuffer(GL_ARRAY_BUFFER, 0); - } - - glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, g_ogl.shader1_vbos[2]); - static const GLushort indices[] = - { - 0, 1, 2, - 0, 2, 3, - }; - glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(indices), indices, GL_STATIC_DRAW); - - glBindVertexArray(0); - - float input_size[2] = { 0 }, output_size[2] = { 0 }, texture_size[2] = { 0 }; - - input_size[0] = (float)g_ddraw.width; - input_size[1] = (float)g_ddraw.height; - texture_size[0] = (float)g_ogl.surface_tex_width; - texture_size[1] = (float)g_ogl.surface_tex_height; - output_size[0] = (float)g_ddraw.render.viewport.width; - output_size[1] = (float)g_ddraw.render.viewport.height; - - GLint loc = glGetUniformLocation(g_ogl.shader1_program, "OutputSize"); - if (loc == -1) - loc = glGetUniformLocation(g_ogl.shader1_program, "rubyOutputSize"); - - if (loc != -1) - glUniform2fv(loc, 1, output_size); - - - loc = glGetUniformLocation(g_ogl.shader1_program, "TextureSize"); - if (loc == -1) - loc = glGetUniformLocation(g_ogl.shader1_program, "rubyTextureSize"); - - if (loc != -1) - glUniform2fv(loc, 1, texture_size); - - - loc = glGetUniformLocation(g_ogl.shader1_program, "InputSize"); - if (loc == -1) - loc = glGetUniformLocation(g_ogl.shader1_program, "rubyInputSize"); - - if (loc != -1) - glUniform2fv(loc, 1, input_size); - - - loc = glGetUniformLocation(g_ogl.shader1_program, "Texture"); - if (loc == -1) - loc = glGetUniformLocation(g_ogl.shader1_program, "rubyTexture"); - - if (loc != -1) - glUniform1i(loc, 0); - - - loc = glGetUniformLocation(g_ogl.shader1_program, "FrameDirection"); - if (loc != -1) - glUniform1i(loc, 1); - - g_ogl.shader1_frame_count_uni_loc = glGetUniformLocation(g_ogl.shader1_program, "FrameCount"); - if (g_ogl.shader1_frame_count_uni_loc == -1) - g_ogl.shader1_frame_count_uni_loc = glGetUniformLocation(g_ogl.shader1_program, "rubyFrameCount"); - - const float mvp_matrix[16] = { - 1,0,0,0, - 0,1,0,0, - 0,0,1,0, - 0,0,0,1, - }; - - loc = glGetUniformLocation(g_ogl.shader1_program, "MVPMatrix"); - if (loc != -1) - glUniformMatrix4fv(loc, 1, GL_FALSE, mvp_matrix); - - glGenFramebuffers(FBO_COUNT, g_ogl.frame_buffer_id); - glGenTextures(FBO_COUNT, g_ogl.frame_buffer_tex_id); - - int fbo_count = g_ogl.shader2_program ? 2 : 1; - - for (int i = 0; i < fbo_count; i++) - { - glBindFramebuffer(GL_FRAMEBUFFER, g_ogl.frame_buffer_id[i]); - - glBindTexture(GL_TEXTURE_2D, g_ogl.frame_buffer_tex_id[i]); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, g_ogl.filter_bilinear ? GL_LINEAR : GL_NEAREST); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, g_ogl.filter_bilinear ? GL_LINEAR : GL_NEAREST); - glTexImage2D( - GL_TEXTURE_2D, - 0, - GL_RGBA8, - g_ogl.surface_tex_width, - g_ogl.surface_tex_height, - 0, - GL_RGBA, - GL_UNSIGNED_BYTE, - 0); - - glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, g_ogl.frame_buffer_tex_id[i], 0); - - GLenum draw_buffers[1] = { GL_COLOR_ATTACHMENT0 }; - glDrawBuffers(1, draw_buffers); - - if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) - { - glDeleteTextures(FBO_COUNT, g_ogl.frame_buffer_tex_id); - - if (glDeleteFramebuffers) - glDeleteFramebuffers(FBO_COUNT, g_ogl.frame_buffer_id); - - glUseProgram(0); - - if (glDeleteProgram) - { - glDeleteProgram(g_ogl.shader1_program); - - if (g_ogl.shader2_program) - glDeleteProgram(g_ogl.shader2_program); - } - - g_ogl.shader1_program = 0; - g_ogl.shader2_program = 0; - - if (glDeleteBuffers) - glDeleteBuffers(3, g_ogl.shader1_vbos); - - if (glDeleteVertexArrays) - glDeleteVertexArrays(1, &g_ogl.shader1_vao); - - if (g_ogl.main_program) - { - glBindVertexArray(g_ogl.main_vao); - glBindBuffer(GL_ARRAY_BUFFER, g_ogl.main_vbos[0]); - static const GLfloat vertex_coord_pal[] = { - -1.0f, 1.0f, - 1.0f, 1.0f, - 1.0f,-1.0f, - -1.0f,-1.0f, - }; - glBufferData(GL_ARRAY_BUFFER, sizeof(vertex_coord_pal), vertex_coord_pal, GL_STATIC_DRAW); - glVertexAttribPointer(g_ogl.main_vertex_coord_attr_loc, 2, GL_FLOAT, GL_FALSE, 0, NULL); - glEnableVertexAttribArray(g_ogl.main_vertex_coord_attr_loc); - glBindBuffer(GL_ARRAY_BUFFER, 0); - glBindVertexArray(0); - - glBindVertexArray(g_ogl.main_vao); - glBindBuffer(GL_ARRAY_BUFFER, g_ogl.main_vbos[1]); - GLfloat tex_coord_pal[] = { - 0.0f, 0.0f, - g_ogl.scale_w, 0.0f, - g_ogl.scale_w, g_ogl.scale_h, - 0.0f, g_ogl.scale_h, - }; - glBufferData(GL_ARRAY_BUFFER, sizeof(tex_coord_pal), tex_coord_pal, GL_STATIC_DRAW); - glVertexAttribPointer(g_ogl.main_tex_coord_attr_loc, 2, GL_FLOAT, GL_FALSE, 0, NULL); - glEnableVertexAttribArray(g_ogl.main_tex_coord_attr_loc); - glBindBuffer(GL_ARRAY_BUFFER, 0); - glBindVertexArray(0); - } - - break; - } - else - { - glClear(GL_COLOR_BUFFER_BIT); - } - } - - glBindFramebuffer(GL_FRAMEBUFFER, 0); -} - -static void ogl_init_shader2_program() -{ - if (!g_ogl.shader1_program || !g_ogl.shader2_program) - return; - - glUseProgram(g_ogl.shader2_program); - - GLint vertex_coord_attr_loc = glGetAttribLocation(g_ogl.shader2_program, "VertexCoord"); - if (vertex_coord_attr_loc == -1) - vertex_coord_attr_loc = glGetAttribLocation(g_ogl.shader2_program, "a_position"); - - g_ogl.shader2_tex_coord_attr_loc = glGetAttribLocation(g_ogl.shader2_program, "TexCoord"); - - glGenBuffers(3, g_ogl.shader2_vbos); - - glBindBuffer(GL_ARRAY_BUFFER, g_ogl.shader2_vbos[0]); - GLfloat vertex_coord[] = { + glBindBuffer(GL_ARRAY_BUFFER, g_ogl.scale_vbos[0]); + static const GLfloat vertext_coord[] = { -1.0f, 1.0f, 1.0f, 1.0f, 1.0f,-1.0f, -1.0f,-1.0f, }; - glBufferData(GL_ARRAY_BUFFER, sizeof(vertex_coord), vertex_coord, GL_STATIC_DRAW); + glBufferData(GL_ARRAY_BUFFER, sizeof(vertext_coord), vertext_coord, GL_STATIC_DRAW); glBindBuffer(GL_ARRAY_BUFFER, 0); - float scale_w = g_ogl.shader2_upscale ? g_ogl.scale_w : (float)g_ddraw.render.viewport.width / g_ogl.surface_tex_width; - float scale_h = g_ogl.shader2_upscale ? g_ogl.scale_h : (float)g_ddraw.render.viewport.height / g_ogl.surface_tex_height; - - glBindBuffer(GL_ARRAY_BUFFER, g_ogl.shader2_vbos[1]); + glBindBuffer(GL_ARRAY_BUFFER, g_ogl.scale_vbos[1]); GLfloat tex_coord[] = { - 0.0f, 0.0f, - scale_w, 0.0f, - scale_w, scale_h, - 0.0f, scale_h, + 0.0f, 0.0f, + g_ogl.scale_w, 0.0f, + g_ogl.scale_w, g_ogl.scale_h, + 0.0f, g_ogl.scale_h, }; glBufferData(GL_ARRAY_BUFFER, sizeof(tex_coord), tex_coord, GL_STATIC_DRAW); glBindBuffer(GL_ARRAY_BUFFER, 0); - glGenVertexArrays(1, &g_ogl.shader2_vao); - glBindVertexArray(g_ogl.shader2_vao); + glGenVertexArrays(1, &g_ogl.scale_vao); + glBindVertexArray(g_ogl.scale_vao); - glBindBuffer(GL_ARRAY_BUFFER, g_ogl.shader2_vbos[0]); + glBindBuffer(GL_ARRAY_BUFFER, g_ogl.scale_vbos[0]); glVertexAttribPointer(vertex_coord_attr_loc, 2, GL_FLOAT, GL_FALSE, 0, NULL); glEnableVertexAttribArray(vertex_coord_attr_loc); glBindBuffer(GL_ARRAY_BUFFER, 0); - if (g_ogl.shader2_tex_coord_attr_loc != -1) - { - glBindBuffer(GL_ARRAY_BUFFER, g_ogl.shader2_vbos[1]); - glVertexAttribPointer(g_ogl.shader2_tex_coord_attr_loc, 2, GL_FLOAT, GL_FALSE, 0, NULL); - glEnableVertexAttribArray(g_ogl.shader2_tex_coord_attr_loc); - glBindBuffer(GL_ARRAY_BUFFER, 0); - } + glBindBuffer(GL_ARRAY_BUFFER, g_ogl.scale_vbos[1]); + glVertexAttribPointer(g_ogl.scale_tex_coord_attr_loc, 2, GL_FLOAT, GL_FALSE, 0, NULL); + glEnableVertexAttribArray(g_ogl.scale_tex_coord_attr_loc); + glBindBuffer(GL_ARRAY_BUFFER, 0); - glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, g_ogl.shader2_vbos[2]); + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, g_ogl.scale_vbos[2]); static const GLushort indices[] = { 0, 1, 2, @@ -903,73 +530,117 @@ static void ogl_init_shader2_program() glBindVertexArray(0); - float input_size[2] = { 0 }, output_size[2] = { 0 }, texture_size[2] = { 0 }; + float input_size[2], output_size[2], texture_size[2]; - input_size[0] = g_ogl.shader2_upscale ? (float)g_ddraw.width : (float)g_ddraw.render.viewport.width; - input_size[1] = g_ogl.shader2_upscale ? (float)g_ddraw.height : (float)g_ddraw.render.viewport.height; + input_size[0] = (float)g_ddraw->width; + input_size[1] = (float)g_ddraw->height; texture_size[0] = (float)g_ogl.surface_tex_width; texture_size[1] = (float)g_ogl.surface_tex_height; - output_size[0] = (float)g_ddraw.render.viewport.width; - output_size[1] = (float)g_ddraw.render.viewport.height; + output_size[0] = (float)g_ddraw->render.viewport.width; + output_size[1] = (float)g_ddraw->render.viewport.height; - GLint loc = glGetUniformLocation(g_ogl.shader2_program, "OutputSize"); - if (loc == -1) - loc = glGetUniformLocation(g_ogl.shader2_program, "rubyOutputSize"); - - if (loc != -1) + GLint loc = glGetUniformLocation(g_ogl.scale_program, "OutputSize"); + if (loc != -1) glUniform2fv(loc, 1, output_size); - - loc = glGetUniformLocation(g_ogl.shader2_program, "TextureSize"); - if (loc == -1) - loc = glGetUniformLocation(g_ogl.shader2_program, "rubyTextureSize"); - - if (loc != -1) + loc = glGetUniformLocation(g_ogl.scale_program, "TextureSize"); + if (loc != -1) glUniform2fv(loc, 1, texture_size); - - loc = glGetUniformLocation(g_ogl.shader2_program, "InputSize"); - if (loc == -1) - loc = glGetUniformLocation(g_ogl.shader2_program, "rubyInputSize"); - - if (loc != -1) + loc = glGetUniformLocation(g_ogl.scale_program, "InputSize"); + if (loc != -1) glUniform2fv(loc, 1, input_size); + loc = glGetUniformLocation(g_ogl.scale_program, "FrameDirection"); + if (loc != -1) + glUniform1i(loc, 1); - loc = glGetUniformLocation(g_ogl.shader2_program, "Texture"); - if (loc == -1) - loc = glGetUniformLocation(g_ogl.shader2_program, "rubyTexture"); - - if (loc != -1) + loc = glGetUniformLocation(g_ogl.scale_program, "Texture"); + if (loc != -1) glUniform1i(loc, 0); - - loc = glGetUniformLocation(g_ogl.shader2_program, "PassPrev2Texture"); - if (loc != -1) - glUniform1i(loc, 1); - - loc = glGetUniformLocation(g_ogl.shader2_program, "PassPrev2TextureSize"); - if (loc != -1) - glUniform2fv(loc, 1, texture_size); - - loc = glGetUniformLocation(g_ogl.shader2_program, "FrameDirection"); - if (loc != -1) - glUniform1i(loc, 1); - - g_ogl.shader2_frame_count_uni_loc = glGetUniformLocation(g_ogl.shader2_program, "FrameCount"); - if (g_ogl.shader2_frame_count_uni_loc == -1) - g_ogl.shader2_frame_count_uni_loc = glGetUniformLocation(g_ogl.shader2_program, "rubyFrameCount"); - const float mvp_matrix[16] = { 1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1, }; + glUniformMatrix4fv(glGetUniformLocation(g_ogl.scale_program, "MVPMatrix"), 1, GL_FALSE, mvp_matrix); - loc = glGetUniformLocation(g_ogl.shader2_program, "MVPMatrix"); - if (loc != -1) - glUniformMatrix4fv(loc, 1, GL_FALSE, mvp_matrix); + glGenFramebuffers(1, &g_ogl.frame_buffer_id); + glBindFramebuffer(GL_FRAMEBUFFER, g_ogl.frame_buffer_id); + + glGenTextures(1, &g_ogl.frame_buffer_tex_id); + glBindTexture(GL_TEXTURE_2D, g_ogl.frame_buffer_tex_id); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, g_ogl.filter_bilinear ? GL_LINEAR : GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, g_ogl.filter_bilinear ? GL_LINEAR : GL_NEAREST); + glTexImage2D( + GL_TEXTURE_2D, + 0, + GL_RGBA8, + g_ogl.surface_tex_width, + g_ogl.surface_tex_height, + 0, + GL_RGBA, + GL_UNSIGNED_BYTE, + g_ogl.surface_tex); + + glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, g_ogl.frame_buffer_tex_id, 0); + + GLenum draw_buffers[1] = { GL_COLOR_ATTACHMENT0 }; + glDrawBuffers(1, draw_buffers); + + if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) + { + glDeleteTextures(1, &g_ogl.frame_buffer_tex_id); + + if (glDeleteFramebuffers) + glDeleteFramebuffers(1, &g_ogl.frame_buffer_id); + + if (glDeleteProgram) + glDeleteProgram(g_ogl.scale_program); + + g_ogl.scale_program = 0; + + if (glDeleteBuffers) + glDeleteBuffers(3, g_ogl.scale_vbos); + + if (glDeleteVertexArrays) + glDeleteVertexArrays(1, &g_ogl.scale_vao); + + if (g_ogl.main_program) + { + glBindVertexArray(g_ogl.main_vao); + glBindBuffer(GL_ARRAY_BUFFER, g_ogl.main_vbos[0]); + static const GLfloat vertex_coord_pal[] = { + -1.0f, 1.0f, + 1.0f, 1.0f, + 1.0f,-1.0f, + -1.0f,-1.0f, + }; + glBufferData(GL_ARRAY_BUFFER, sizeof(vertex_coord_pal), vertex_coord_pal, GL_STATIC_DRAW); + glVertexAttribPointer(g_ogl.main_vertex_coord_attr_loc, 2, GL_FLOAT, GL_FALSE, 0, NULL); + glEnableVertexAttribArray(g_ogl.main_vertex_coord_attr_loc); + glBindBuffer(GL_ARRAY_BUFFER, 0); + glBindVertexArray(0); + + glBindVertexArray(g_ogl.main_vao); + glBindBuffer(GL_ARRAY_BUFFER, g_ogl.main_vbos[1]); + GLfloat tex_coord_pal[] = { + 0.0f, 0.0f, + g_ogl.scale_w, 0.0f, + g_ogl.scale_w, g_ogl.scale_h, + 0.0f, g_ogl.scale_h, + }; + glBufferData(GL_ARRAY_BUFFER, sizeof(tex_coord_pal), tex_coord_pal, GL_STATIC_DRAW); + glVertexAttribPointer(g_ogl.main_tex_coord_attr_loc, 2, GL_FLOAT, GL_FALSE, 0, NULL); + glEnableVertexAttribArray(g_ogl.main_tex_coord_attr_loc); + glBindBuffer(GL_ARRAY_BUFFER, 0); + glBindVertexArray(0); + } + } + + glBindFramebuffer(GL_FRAMEBUFFER, 0); } static void ogl_render() @@ -977,37 +648,31 @@ static void ogl_render() BOOL needs_update = FALSE; glViewport( - g_ddraw.render.viewport.x, - g_ddraw.render.viewport.y + g_ddraw.render.opengl_y_align, - g_ddraw.render.viewport.width, - g_ddraw.render.viewport.height); + g_ddraw->render.viewport.x, + g_ddraw->render.viewport.y + g_ddraw->render.opengl_y_align, + g_ddraw->render.viewport.width, + g_ddraw->render.viewport.height); if (g_ogl.main_program) { glUseProgram(g_ogl.main_program); } - else if (g_ddraw.bpp == 16 || g_ddraw.bpp == 32) + else if (g_ddraw->bpp == 16 || g_ddraw->bpp == 32) { glEnable(GL_TEXTURE_2D); } - else // 8 bpp only works with a shader (opengl 2.0 or above) - { - g_ogl.use_opengl = FALSE; - return; - } - DWORD timeout = g_config.minfps > 0 ? g_ddraw.minfps_tick_len : INFINITE; + DWORD timeout = g_config.minfps > 0 ? g_ddraw->minfps_tick_len : INFINITE; - while (g_ogl.use_opengl && g_ddraw.render.run && - (g_config.minfps < 0 || WaitForSingleObject(g_ddraw.render.sem, timeout) != WAIT_FAILED) && - g_ddraw.render.run) + while (g_ogl.use_opengl && g_ddraw->render.run && + (g_config.minfps < 0 || WaitForSingleObject(g_ddraw->render.sem, timeout) != WAIT_FAILED)) { #if _DEBUG dbg_draw_frame_info_start(); #endif - g_ogl.scale_w = (float)g_ddraw.width / g_ogl.surface_tex_width; - g_ogl.scale_h = (float)g_ddraw.height / g_ogl.surface_tex_height; + g_ogl.scale_w = (float)g_ddraw->width / g_ogl.surface_tex_width; + g_ogl.scale_h = (float)g_ddraw->height / g_ogl.surface_tex_height; static int tex_index = 0, pal_index = 0; @@ -1015,36 +680,36 @@ static void ogl_render() fpsl_frame_start(); - EnterCriticalSection(&g_ddraw.cs); + EnterCriticalSection(&g_ddraw->cs); - if (g_ddraw.primary && - g_ddraw.primary->bpp == g_ddraw.bpp && - g_ddraw.primary->width == g_ddraw.width && - g_ddraw.primary->height == g_ddraw.height && - (g_ddraw.bpp == 16 || g_ddraw.bpp == 32 || g_ddraw.primary->palette)) + if (g_ddraw->primary && + g_ddraw->primary->bpp == g_ddraw->bpp && + g_ddraw->primary->width == g_ddraw->width && + g_ddraw->primary->height == g_ddraw->height && + (g_ddraw->bpp == 16 || g_ddraw->bpp == 32 || g_ddraw->primary->palette)) { if (g_config.lock_surfaces) - EnterCriticalSection(&g_ddraw.primary->cs); + EnterCriticalSection(&g_ddraw->primary->cs); if (g_config.vhack) { if (util_detect_low_res_screen()) { - g_ogl.scale_w *= (float)g_ddraw.upscale_hack_width / g_ddraw.width; - g_ogl.scale_h *= (float)g_ddraw.upscale_hack_height / g_ddraw.height; + g_ogl.scale_w *= (float)g_ddraw->upscale_hack_width / g_ddraw->width; + g_ogl.scale_h *= (float)g_ddraw->upscale_hack_height / g_ddraw->height; - if (!InterlockedExchange(&g_ddraw.upscale_hack_active, TRUE)) + if (!InterlockedExchange(&g_ddraw->upscale_hack_active, TRUE)) scale_changed = TRUE; } else { - if (InterlockedExchange(&g_ddraw.upscale_hack_active, FALSE)) + if (InterlockedExchange(&g_ddraw->upscale_hack_active, FALSE)) scale_changed = TRUE; } } - if (g_ddraw.bpp == 8 && - (InterlockedExchange(&g_ddraw.render.palette_updated, FALSE) || g_config.minfps == -2)) + if (g_ddraw->bpp == 8 && + (InterlockedExchange(&g_ddraw->render.palette_updated, FALSE) || g_config.minfps == -2)) { if (++pal_index >= TEXTURE_COUNT) pal_index = 0; @@ -1060,19 +725,19 @@ static void ogl_render() 1, GL_RGBA, GL_UNSIGNED_BYTE, - g_ddraw.primary->palette->data_bgr); + g_ddraw->primary->palette->data_bgr); } - if (InterlockedExchange(&g_ddraw.render.surface_updated, FALSE) || g_config.minfps == -2) + if (InterlockedExchange(&g_ddraw->render.surface_updated, FALSE) || g_config.minfps == -2) { if (++tex_index >= TEXTURE_COUNT) tex_index = 0; glBindTexture(GL_TEXTURE_2D, g_ogl.surface_tex_ids[tex_index]); - DWORD row_len = g_ddraw.primary->pitch ? g_ddraw.primary->pitch / g_ddraw.primary->bytes_pp : 0; + DWORD row_len = g_ddraw->primary->pitch ? g_ddraw->primary->pitch / g_ddraw->primary->bytes_pp : 0; - if (row_len != g_ddraw.primary->width) + if (row_len != g_ddraw->primary->width) glPixelStorei(GL_UNPACK_ROW_LENGTH, row_len); glTexSubImage2D( @@ -1080,13 +745,13 @@ static void ogl_render() 0, 0, 0, - g_ddraw.width, - g_ddraw.height, + g_ddraw->width, + g_ddraw->height, g_ogl.surface_format, g_ogl.surface_type, - g_ddraw.primary->surface); + g_ddraw->primary->surface); - if (row_len != g_ddraw.primary->width) + if (row_len != g_ddraw->primary->width) glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); } @@ -1099,38 +764,34 @@ static void ogl_render() GLenum err = glGetError(); if (err != GL_NO_ERROR && err != GL_INVALID_FRAMEBUFFER_OPERATION) - { g_ogl.use_opengl = FALSE; - - TRACE("OpenGL error %08x (ogl_render())\n", err); - ogl_check_error("ogl_render()"); - } } if (g_config.fixchilds) { - g_ddraw.child_window_exists = FALSE; - EnumChildWindows(g_ddraw.hwnd, util_enum_child_proc, (LPARAM)g_ddraw.primary); + g_ddraw->child_window_exists = FALSE; + InterlockedExchangePointer((void*)&g_ddraw->video_window_hwnd, NULL); + EnumChildWindows(g_ddraw->hwnd, util_enum_child_proc, (LPARAM)g_ddraw->primary); - if (g_ddraw.render.width != g_ddraw.width || g_ddraw.render.height != g_ddraw.height) + if (g_ddraw->render.width != g_ddraw->width || g_ddraw->render.height != g_ddraw->height) { - if (g_ddraw.child_window_exists) + if (g_ddraw->child_window_exists) { glClear(GL_COLOR_BUFFER_BIT); if (!needs_update) { - glViewport(0, g_ddraw.render.height - g_ddraw.height, g_ddraw.width, g_ddraw.height); + glViewport(0, g_ddraw->render.height - g_ddraw->height, g_ddraw->width, g_ddraw->height); needs_update = TRUE; } } else if (needs_update) { glViewport( - g_ddraw.render.viewport.x, - g_ddraw.render.viewport.y + g_ddraw.render.opengl_y_align, - g_ddraw.render.viewport.width, - g_ddraw.render.viewport.height); + g_ddraw->render.viewport.x, + g_ddraw->render.viewport.y + g_ddraw->render.opengl_y_align, + g_ddraw->render.viewport.width, + g_ddraw->render.viewport.height); needs_update = FALSE; } @@ -1138,72 +799,31 @@ static void ogl_render() } if (g_config.lock_surfaces) - LeaveCriticalSection(&g_ddraw.primary->cs); + LeaveCriticalSection(&g_ddraw->primary->cs); } - LeaveCriticalSection(&g_ddraw.cs); + LeaveCriticalSection(&g_ddraw->cs); - if (g_ddraw.render.viewport.x != 0 || g_ddraw.render.viewport.y != 0) + if (g_ddraw->render.viewport.x != 0 || g_ddraw->render.viewport.y != 0) { glClear(GL_COLOR_BUFFER_BIT); } if (scale_changed) { - if (g_ogl.shader2_upscale && g_ogl.shader2_program && g_ogl.shader1_program && g_ogl.main_program) + if (g_ogl.scale_program && g_ogl.main_program) { - glBindVertexArray(g_ogl.shader2_vao); - glBindBuffer(GL_ARRAY_BUFFER, g_ogl.shader2_vbos[1]); - GLfloat tex_coord[] = { + glBindVertexArray(g_ogl.scale_vao); + glBindBuffer(GL_ARRAY_BUFFER, g_ogl.scale_vbos[1]); + GLfloat texCoord[] = { 0.0f, 0.0f, g_ogl.scale_w, 0.0f, g_ogl.scale_w, g_ogl.scale_h, 0.0f, g_ogl.scale_h, }; - glBufferData(GL_ARRAY_BUFFER, sizeof(tex_coord), tex_coord, GL_STATIC_DRAW); - if (g_ogl.shader2_tex_coord_attr_loc != -1) - { - glVertexAttribPointer(g_ogl.shader2_tex_coord_attr_loc, 2, GL_FLOAT, GL_FALSE, 0, NULL); - glEnableVertexAttribArray(g_ogl.shader2_tex_coord_attr_loc); - } - glBindBuffer(GL_ARRAY_BUFFER, 0); - glBindVertexArray(0); - } - else if (g_ogl.shader2_program && g_ogl.shader1_program && g_ogl.main_program) - { - glBindVertexArray(g_ogl.shader1_vao); - glBindBuffer(GL_ARRAY_BUFFER, g_ogl.shader1_vbos[1]); - GLfloat tex_coord[] = { - 0.0f, 0.0f, - 0.0f, g_ogl.scale_h, - g_ogl.scale_w, g_ogl.scale_h, - g_ogl.scale_w, 0.0f, - }; - glBufferData(GL_ARRAY_BUFFER, sizeof(tex_coord), tex_coord, GL_STATIC_DRAW); - if (g_ogl.shader1_tex_coord_attr_loc != -1) - { - glVertexAttribPointer(g_ogl.shader1_tex_coord_attr_loc, 2, GL_FLOAT, GL_FALSE, 0, NULL); - glEnableVertexAttribArray(g_ogl.shader1_tex_coord_attr_loc); - } - glBindBuffer(GL_ARRAY_BUFFER, 0); - glBindVertexArray(0); - } - else if (g_ogl.shader1_program && g_ogl.main_program) - { - glBindVertexArray(g_ogl.shader1_vao); - glBindBuffer(GL_ARRAY_BUFFER, g_ogl.shader1_vbos[1]); - GLfloat tex_coord[] = { - 0.0f, 0.0f, - g_ogl.scale_w, 0.0f, - g_ogl.scale_w, g_ogl.scale_h, - 0.0f, g_ogl.scale_h, - }; - glBufferData(GL_ARRAY_BUFFER, sizeof(tex_coord), tex_coord, GL_STATIC_DRAW); - if (g_ogl.shader1_tex_coord_attr_loc != -1) - { - glVertexAttribPointer(g_ogl.shader1_tex_coord_attr_loc, 2, GL_FLOAT, GL_FALSE, 0, NULL); - glEnableVertexAttribArray(g_ogl.shader1_tex_coord_attr_loc); - } + glBufferData(GL_ARRAY_BUFFER, sizeof(texCoord), texCoord, GL_STATIC_DRAW); + glVertexAttribPointer(g_ogl.scale_tex_coord_attr_loc, 2, GL_FLOAT, GL_FALSE, 0, NULL); + glEnableVertexAttribArray(g_ogl.scale_tex_coord_attr_loc); glBindBuffer(GL_ARRAY_BUFFER, 0); glBindVertexArray(0); } @@ -1211,13 +831,13 @@ static void ogl_render() { glBindVertexArray(g_ogl.main_vao); glBindBuffer(GL_ARRAY_BUFFER, g_ogl.main_vbos[1]); - GLfloat tex_coord[] = { + GLfloat texCoord[] = { 0.0f, 0.0f, g_ogl.scale_w, 0.0f, g_ogl.scale_w, g_ogl.scale_h, 0.0f, g_ogl.scale_h, }; - glBufferData(GL_ARRAY_BUFFER, sizeof(tex_coord), tex_coord, GL_STATIC_DRAW); + glBufferData(GL_ARRAY_BUFFER, sizeof(texCoord), texCoord, GL_STATIC_DRAW); glVertexAttribPointer(g_ogl.main_tex_coord_attr_loc, 2, GL_FLOAT, GL_FALSE, 0, NULL); glEnableVertexAttribArray(g_ogl.main_tex_coord_attr_loc); glBindBuffer(GL_ARRAY_BUFFER, 0); @@ -1225,12 +845,10 @@ static void ogl_render() } } - if (glActiveTexture) - glActiveTexture(GL_TEXTURE0); - + glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, g_ogl.surface_tex_ids[tex_index]); - if (g_ddraw.bpp == 8) + if (g_ddraw->bpp == 8) { glActiveTexture(GL_TEXTURE1); glBindTexture(GL_TEXTURE_2D, g_ogl.palette_tex_ids[pal_index]); @@ -1238,17 +856,14 @@ static void ogl_render() glActiveTexture(GL_TEXTURE0); } - if (g_ogl.shader1_program && g_ogl.shader2_program && g_ogl.main_program) + if (g_ogl.scale_program && g_ogl.main_program) { - static int frames = 0; - frames++; - /* draw surface into framebuffer */ glUseProgram(g_ogl.main_program); - glViewport(0, 0, g_ddraw.width, g_ddraw.height); + glViewport(0, 0, g_ddraw->width, g_ddraw->height); - glBindFramebuffer(GL_FRAMEBUFFER, g_ogl.frame_buffer_id[0]); + glBindFramebuffer(GL_FRAMEBUFFER, g_ogl.frame_buffer_id); glBindVertexArray(g_ogl.main_vao); glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, 0); @@ -1259,102 +874,30 @@ static void ogl_render() glActiveTexture(GL_TEXTURE1); glBindTexture(GL_TEXTURE_2D, 0); - /* apply shader1 */ - - if (!g_ogl.shader2_upscale) + if (g_ddraw->child_window_exists) { - glViewport(0, 0, g_ddraw.render.viewport.width, g_ddraw.render.viewport.height); - } - - glUseProgram(g_ogl.shader1_program); - glActiveTexture(GL_TEXTURE0); - glBindTexture(GL_TEXTURE_2D, g_ogl.frame_buffer_tex_id[0]); - - glBindFramebuffer(GL_FRAMEBUFFER, g_ogl.frame_buffer_id[1]); - - if (g_ogl.shader1_frame_count_uni_loc != -1) - glUniform1i(g_ogl.shader1_frame_count_uni_loc, frames); - - glBindVertexArray(g_ogl.shader1_vao); - glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, 0); - glBindVertexArray(0); - - glBindFramebuffer(GL_FRAMEBUFFER, 0); - - /* apply shader2 */ - - if (g_ddraw.child_window_exists) - { - glViewport(0, g_ddraw.render.height - g_ddraw.height, g_ddraw.width, g_ddraw.height); + glViewport(0, g_ddraw->render.height - g_ddraw->height, g_ddraw->width, g_ddraw->height); } else { glViewport( - g_ddraw.render.viewport.x, - g_ddraw.render.viewport.y + g_ddraw.render.opengl_y_align, - g_ddraw.render.viewport.width, - g_ddraw.render.viewport.height); - } - - glUseProgram(g_ogl.shader2_program); - glActiveTexture(GL_TEXTURE0); - glBindTexture(GL_TEXTURE_2D, g_ogl.frame_buffer_tex_id[1]); - - glActiveTexture(GL_TEXTURE1); - glBindTexture(GL_TEXTURE_2D, g_ogl.frame_buffer_tex_id[0]); - - if (g_ogl.shader2_frame_count_uni_loc != -1) - glUniform1i(g_ogl.shader2_frame_count_uni_loc, frames); - - glBindVertexArray(g_ogl.shader2_vao); - glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, 0); - glBindVertexArray(0); - - glActiveTexture(GL_TEXTURE1); - glBindTexture(GL_TEXTURE_2D, 0); - } - else if (g_ogl.shader1_program && g_ogl.main_program) - { - /* draw surface into framebuffer */ - glUseProgram(g_ogl.main_program); - - glViewport(0, 0, g_ddraw.width, g_ddraw.height); - - glBindFramebuffer(GL_FRAMEBUFFER, g_ogl.frame_buffer_id[0]); - - glBindVertexArray(g_ogl.main_vao); - glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, 0); - glBindVertexArray(0); - - glBindFramebuffer(GL_FRAMEBUFFER, 0); - - glActiveTexture(GL_TEXTURE1); - glBindTexture(GL_TEXTURE_2D, 0); - - if (g_ddraw.child_window_exists) - { - glViewport(0, g_ddraw.render.height - g_ddraw.height, g_ddraw.width, g_ddraw.height); - } - else - { - glViewport( - g_ddraw.render.viewport.x, - g_ddraw.render.viewport.y + g_ddraw.render.opengl_y_align, - g_ddraw.render.viewport.width, - g_ddraw.render.viewport.height); + g_ddraw->render.viewport.x, + g_ddraw->render.viewport.y + g_ddraw->render.opengl_y_align, + g_ddraw->render.viewport.width, + g_ddraw->render.viewport.height); } /* apply filter */ - glUseProgram(g_ogl.shader1_program); + glUseProgram(g_ogl.scale_program); glActiveTexture(GL_TEXTURE0); - glBindTexture(GL_TEXTURE_2D, g_ogl.frame_buffer_tex_id[0]); + glBindTexture(GL_TEXTURE_2D, g_ogl.frame_buffer_tex_id); static int frames = 1; - if (g_ogl.shader1_frame_count_uni_loc != -1) - glUniform1i(g_ogl.shader1_frame_count_uni_loc, frames++); + if (g_ogl.frame_count_uni_loc != -1) + glUniform1i(g_ogl.frame_count_uni_loc, frames++); - glBindVertexArray(g_ogl.shader1_vao); + glBindVertexArray(g_ogl.scale_vao); glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, 0); glBindVertexArray(0); } @@ -1374,19 +917,10 @@ static void ogl_render() glEnd(); } - if (g_ddraw.bnet_active) + if (g_ddraw->bnet_active) glClear(GL_COLOR_BUFFER_BIT); - SwapBuffers(g_ogl.hdc); - - /* Force redraw for GDI games (ClueFinders) */ - if (!g_ddraw.primary) - { - RedrawWindow(g_ddraw.hwnd, NULL, NULL, RDW_INVALIDATE | RDW_ALLCHILDREN); - } - - if (!g_ddraw.render.run) - break; + SwapBuffers(g_ddraw->render.hdc); #if _DEBUG dbg_draw_frame_info_end(); @@ -1396,40 +930,34 @@ static void ogl_render() } if (g_config.vhack) - InterlockedExchange(&g_ddraw.upscale_hack_active, FALSE); + InterlockedExchange(&g_ddraw->upscale_hack_active, FALSE); } -static BOOL ogl_release_resources() +static void ogl_delete_context(HGLRC context) { + if (g_ogl.surface_tex) + HeapFree(GetProcessHeap(), 0, g_ogl.surface_tex); + glDeleteTextures(TEXTURE_COUNT, g_ogl.surface_tex_ids); - if (g_ddraw.bpp == 8) + if (g_ddraw->bpp == 8) glDeleteTextures(TEXTURE_COUNT, g_ogl.palette_tex_ids); if (glUseProgram) glUseProgram(0); - if (g_ogl.shader1_program) + if (g_ogl.scale_program) { - glDeleteTextures(FBO_COUNT, g_ogl.frame_buffer_tex_id); + glDeleteTextures(1, &g_ogl.frame_buffer_tex_id); if (glDeleteBuffers) - glDeleteBuffers(3, g_ogl.shader1_vbos); + glDeleteBuffers(3, g_ogl.scale_vbos); if (glDeleteFramebuffers) - glDeleteFramebuffers(FBO_COUNT, g_ogl.frame_buffer_id); + glDeleteFramebuffers(1, &g_ogl.frame_buffer_id); if (glDeleteVertexArrays) - glDeleteVertexArrays(1, &g_ogl.shader1_vao); - } - - if (g_ogl.shader2_program) - { - if (glDeleteBuffers) - glDeleteBuffers(3, g_ogl.shader2_vbos); - - if (glDeleteVertexArrays) - glDeleteVertexArrays(1, &g_ogl.shader2_vao); + glDeleteVertexArrays(1, &g_ogl.scale_vao); } if (glDeleteProgram) @@ -1437,11 +965,8 @@ static BOOL ogl_release_resources() if (g_ogl.main_program) glDeleteProgram(g_ogl.main_program); - if (g_ogl.shader1_program) - glDeleteProgram(g_ogl.shader1_program); - - if (g_ogl.shader2_program) - glDeleteProgram(g_ogl.shader2_program); + if (g_ogl.scale_program) + glDeleteProgram(g_ogl.scale_program); } if (g_oglu_got_version3) @@ -1456,33 +981,13 @@ static BOOL ogl_release_resources() } } - return TRUE; -} - -BOOL ogl_release() -{ - if (g_ddraw.render.thread) - return FALSE; - - if (g_ogl.context) - { - xwglMakeCurrent(NULL, NULL); - xwglDeleteContext(g_ogl.context); - g_ogl.context = NULL; - } - - return TRUE; + xwglMakeCurrent(NULL, NULL); + xwglDeleteContext(context); } static BOOL ogl_texture_upload_test() { - if (g_ogl.surface_tex_width > 4096 || g_ogl.surface_tex_height > 4096) - return TRUE; - - int* surface_tex = - HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, g_ogl.surface_tex_width * g_ogl.surface_tex_height * sizeof(int)); - - if (!surface_tex) + if (!g_ogl.surface_tex) return TRUE; static char test_data[] = { 0,1,2,0,0,2,3,0,0,4,5,0,0,6,7,0,0,8,9,0 }; @@ -1490,7 +995,7 @@ static BOOL ogl_texture_upload_test() int i; for (i = 0; i < TEXTURE_COUNT; i++) { - memcpy(surface_tex, test_data, sizeof(test_data)); + memcpy(g_ogl.surface_tex, test_data, sizeof(test_data)); glBindTexture(GL_TEXTURE_2D, g_ogl.surface_tex_ids[i]); @@ -1499,24 +1004,21 @@ static BOOL ogl_texture_upload_test() 0, 0, 0, - g_ddraw.width, - g_ddraw.height, + g_ddraw->width, + g_ddraw->height, g_ogl.surface_format, g_ogl.surface_type, - surface_tex); + g_ogl.surface_tex); - memset(surface_tex, 0, sizeof(test_data)); + memset(g_ogl.surface_tex, 0, sizeof(test_data)); - glGetTexImage(GL_TEXTURE_2D, 0, g_ogl.surface_format, g_ogl.surface_type, surface_tex); + glGetTexImage(GL_TEXTURE_2D, 0, g_ogl.surface_format, g_ogl.surface_type, g_ogl.surface_tex); - if (memcmp(surface_tex, test_data, sizeof(test_data)) != 0) - { - HeapFree(GetProcessHeap(), 0, surface_tex); + if (memcmp(g_ogl.surface_tex, test_data, sizeof(test_data)) != 0) return FALSE; - } } - if (g_ddraw.bpp == 8) + if (g_ddraw->bpp == 8) { for (i = 0; i < TEXTURE_COUNT; i++) { @@ -1531,41 +1033,32 @@ static BOOL ogl_texture_upload_test() 1, GL_RGBA, GL_UNSIGNED_BYTE, - surface_tex); + g_ogl.surface_tex); - memset(surface_tex, 0, sizeof(test_data)); + memset(g_ogl.surface_tex, 0, sizeof(test_data)); - glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, surface_tex); + glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, g_ogl.surface_tex); - if (memcmp(surface_tex, test_data, sizeof(test_data)) != 0) - { - HeapFree(GetProcessHeap(), 0, surface_tex); + if (memcmp(g_ogl.surface_tex, test_data, sizeof(test_data)) != 0) return FALSE; - } - } } - - HeapFree(GetProcessHeap(), 0, surface_tex); return TRUE; } static BOOL ogl_shader_test() { + if (!g_ogl.surface_tex) + return TRUE; + BOOL result = TRUE; - if (g_ddraw.bpp != 8 || g_ogl.surface_tex_width > 4096 || g_ogl.surface_tex_height > 4096) + if (g_ddraw->bpp != 8) return result; - int* surface_tex = - HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, g_ogl.surface_tex_width * g_ogl.surface_tex_height * sizeof(int)); - - if (!surface_tex) - return TRUE; - if (g_oglu_got_version3 && g_ogl.main_program) { - memset(surface_tex, 0, g_ogl.surface_tex_height * g_ogl.surface_tex_width * sizeof(int)); + memset(g_ogl.surface_tex, 0, g_ogl.surface_tex_height * g_ogl.surface_tex_width * sizeof(int)); GLuint fbo_id = 0; glGenFramebuffers(1, &fbo_id); @@ -1586,7 +1079,7 @@ static BOOL ogl_shader_test() 0, GL_RGBA, GL_UNSIGNED_BYTE, - surface_tex); + g_ogl.surface_tex); glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, fbo_tex_id, 0); @@ -1621,7 +1114,7 @@ static BOOL ogl_shader_test() g_ogl.surface_tex_height, g_ogl.surface_format, GL_UNSIGNED_BYTE, - surface_tex); + g_ogl.surface_tex); glViewport(0, 0, g_ogl.surface_tex_width, g_ogl.surface_tex_height); @@ -1640,18 +1133,15 @@ static BOOL ogl_shader_test() glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, fbo_tex_id); - glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, surface_tex); + glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, g_ogl.surface_tex); - if (glGetError() == GL_NO_ERROR) + int i; + for (i = 0; i < g_ogl.surface_tex_height * g_ogl.surface_tex_width; i++) { - int i; - for (i = 0; i < g_ogl.surface_tex_height * g_ogl.surface_tex_width; i++) + if (g_ogl.surface_tex[i] != 0x80808080) { - if (surface_tex[i] != 0x80808080) - { - result = FALSE; - break; - } + result = FALSE; + break; } } } @@ -1666,8 +1156,5 @@ static BOOL ogl_shader_test() glBindFramebuffer(GL_FRAMEBUFFER, 0); } - while (glGetError() != GL_NO_ERROR); - - HeapFree(GetProcessHeap(), 0, surface_tex); return result; } diff --git a/src/screenshot.c b/src/screenshot.c index 063955b..88d559c 100644 --- a/src/screenshot.c +++ b/src/screenshot.c @@ -134,7 +134,7 @@ BOOL ss_take_screenshot(IDirectDrawSurfaceImpl* src) char str_time[64]; time_t t = time(NULL); - strncpy(title, g_ddraw.title, sizeof(g_ddraw.title)); + strncpy(title, g_ddraw->title, sizeof(g_ddraw->title)); for (int i = 0; i < strlen(title); i++) { @@ -153,9 +153,6 @@ BOOL ss_take_screenshot(IDirectDrawSurfaceImpl* src) strftime(str_time, sizeof(str_time), "%Y-%m-%d_%H-%M-%S", localtime(&t)); _snprintf(filename, sizeof(filename) - 1, "%s%s_%s.png", g_config.screenshot_dir, title, str_time); - if (FILE_EXISTS(filename)) - return FALSE; - if (src->bpp == 8 && src->palette) { if (!ss_screenshot_8bit(filename, src)) diff --git a/src/utils.c b/src/utils.c index fafd4ed..91fbcaf 100644 --- a/src/utils.c +++ b/src/utils.c @@ -1,8 +1,6 @@ #include #include -#include #include -#include #include "ddraw.h" #include "debug.h" #include "dd.h" @@ -12,8 +10,6 @@ #include "render_d3d9.h" #include "utils.h" #include "config.h" -#include "versionhelpers.h" -#include "delay_imports.h" /* @@ -73,320 +69,6 @@ HMODULE WINAPI util_enumerate_modules(_In_opt_ HMODULE hModuleLast) return NULL; } -void util_set_process_affinity() -{ -#if (_WIN32_WINNT >= _WIN32_WINNT_WINXP) - HANDLE snap = CreateToolhelp32Snapshot(TH32CS_SNAPTHREAD, 0); - if (snap == INVALID_HANDLE_VALUE) - return; - - THREADENTRY32 entry = { 0 }; - entry.dwSize = sizeof(THREADENTRY32); - - if (!Thread32First(snap, &entry)) - { - CloseHandle(snap); - return; - } - - do - { - if (entry.th32OwnerProcessID == GetCurrentProcessId()) - { - util_set_thread_affinity(entry.th32ThreadID); - } - } while (Thread32Next(snap, &entry)); - - CloseHandle(snap); -#endif -} - -void util_set_thread_affinity(DWORD tid) -{ -#if (_WIN32_WINNT >= _WIN32_WINNT_WINXP) - HANDLE thread = OpenThread(THREAD_QUERY_INFORMATION | THREAD_SET_INFORMATION, FALSE, tid); - if (thread) - { - void* start = NULL; - NTSTATUS status = STATUS_PENDING; - - if (delay_NtQueryInformationThread) - { - status = - delay_NtQueryInformationThread(thread, ThreadQuerySetWin32StartAddress, &start, sizeof(start), NULL); - } - - if (status == STATUS_SUCCESS && start && delay_GetModuleHandleExA) - { - char game_exe_path[MAX_PATH] = { 0 }; - char game_dir[MAX_PATH] = { 0 }; - - if (GetModuleFileNameA(NULL, game_exe_path, sizeof(game_exe_path))) - { - _splitpath(game_exe_path, NULL, game_dir, NULL, NULL); - - char mod_path[MAX_PATH] = { 0 }; - char mod_dir[MAX_PATH] = { 0 }; - char mod_filename[MAX_PATH] = { 0 }; - HMODULE mod = NULL; - - if (delay_GetModuleHandleExA( - GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, start, &mod)) - { - if (GetModuleFileNameA(mod, mod_path, sizeof(mod_path))) - { - _splitpath(mod_path, NULL, mod_dir, mod_filename, NULL); - - if (_strnicmp(game_dir, mod_dir, strlen(game_dir)) == 0) // _strcmpi(mod_filename, "WINMM") == 0 - { - SetThreadAffinityMask(thread, 1); - } - } - } - } - } - else - { - SetThreadAffinityMask(thread, 1); - } - - CloseHandle(thread); - } -#endif -} - -void util_pull_messages() -{ - if (g_config.fix_not_responding && - g_ddraw.hwnd && - g_ddraw.last_msg_pull_tick + 1000 < timeGetTime() && - GetCurrentThreadId() == g_ddraw.gui_thread_id && - !IsWine()) - { - /* workaround for "Not Responding" window problem */ - //g_ddraw.last_msg_pull_tick = timeGetTime(); - MSG msg; - if (real_PeekMessageA(&msg, g_ddraw.hwnd, 0, 0, PM_REMOVE)) - { - TranslateMessage(&msg); - DispatchMessageA(&msg); - } - } -} - -DWORD util_get_timestamp(HMODULE mod) -{ - if (!mod || mod == INVALID_HANDLE_VALUE) - return 0; - - PIMAGE_DOS_HEADER dos_header = (PIMAGE_DOS_HEADER)mod; - if (dos_header->e_magic != IMAGE_DOS_SIGNATURE) - return 0; - - PIMAGE_NT_HEADERS nt_headers = (PIMAGE_NT_HEADERS)((DWORD)dos_header + (DWORD)dos_header->e_lfanew); - if (nt_headers->Signature != IMAGE_NT_SIGNATURE) - return 0; - - return nt_headers->FileHeader.TimeDateStamp; -} - -FARPROC util_get_iat_proc(HMODULE mod, char* module_name, char* function_name) -{ - if (!mod || mod == INVALID_HANDLE_VALUE) - return NULL; - - __try - { - PIMAGE_DOS_HEADER dos_header = (PIMAGE_DOS_HEADER)mod; - if (dos_header->e_magic != IMAGE_DOS_SIGNATURE) - return NULL; - - PIMAGE_NT_HEADERS nt_headers = (PIMAGE_NT_HEADERS)((DWORD)mod + (DWORD)dos_header->e_lfanew); - if (nt_headers->Signature != IMAGE_NT_SIGNATURE) - return NULL; - - DWORD import_desc_rva = nt_headers->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress; - if (!import_desc_rva) - return NULL; - - PIMAGE_IMPORT_DESCRIPTOR import_desc = (PIMAGE_IMPORT_DESCRIPTOR)((DWORD)mod + import_desc_rva); - - while (import_desc->FirstThunk) - { - if (!import_desc->OriginalFirstThunk || !import_desc->Name) - { - import_desc++; - continue; - } - - char* imp_module_name = (char*)((DWORD)mod + import_desc->Name); - - if (_stricmp(imp_module_name, module_name) == 0) - { - PIMAGE_THUNK_DATA first_thunk = (void*)((DWORD)mod + import_desc->FirstThunk); - PIMAGE_THUNK_DATA o_first_thunk = (void*)((DWORD)mod + import_desc->OriginalFirstThunk); - - while (first_thunk->u1.Function) - { - if (!o_first_thunk->u1.AddressOfData) - { - first_thunk++; - o_first_thunk++; - continue; - } - - PIMAGE_IMPORT_BY_NAME import = (void*)((DWORD)mod + o_first_thunk->u1.AddressOfData); - - if ((o_first_thunk->u1.Ordinal & IMAGE_ORDINAL_FLAG) == 0) - { -#if defined(__GNUC__) - if (util_is_bad_read_ptr((void*)import->Name)) - continue; -#endif - - if (strcmp((const char*)import->Name, function_name) == 0 && first_thunk->u1.Function) - { - return (FARPROC)first_thunk->u1.Function; - } - } - - first_thunk++; - o_first_thunk++; - } - } - - import_desc++; - } - } - __except (EXCEPTION_EXECUTE_HANDLER) - { - } - - return NULL; -} - -BOOL util_caller_is_ddraw_wrapper(void* return_address) -{ - if (!delay_GetModuleHandleExA) - return FALSE; - - void* directDrawCreate = (void*)util_get_iat_proc(GetModuleHandleA(NULL), "ddraw.dll", "DirectDrawCreate"); - void* directDrawCreateEx = (void*)util_get_iat_proc(GetModuleHandleA(NULL), "ddraw.dll", "DirectDrawCreateEx"); - - TRACE("%s directDrawCreate = %p, directDrawCreateEx = %p\n", __FUNCTION__, directDrawCreate, directDrawCreateEx); - - HMODULE mod = NULL; - DWORD flags = GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT; - - HMODULE D3dHook_dll = GetModuleHandleA("D3dHook.dll"); - if (D3dHook_dll) - { - if ((delay_GetModuleHandleExA(flags, return_address, &mod) && mod == D3dHook_dll) || - (delay_GetModuleHandleExA(flags, directDrawCreate, &mod) && mod == D3dHook_dll) || - (delay_GetModuleHandleExA(flags, directDrawCreateEx, &mod) && mod == D3dHook_dll)) - { - MessageBoxA( - NULL, - "Error: You cannot combine cnc-ddraw with other DirectDraw wrappers. \n\n" - "Please disable D3DWindower and then try to start the game again.", - "Conflicting DirectDraw wrapper detected - cnc-ddraw", - MB_OK | MB_TOPMOST); - - return TRUE; - } - } - - HMODULE wndmode_dll = GetModuleHandleA("wndmode.dll"); - if (wndmode_dll) - { - if ((delay_GetModuleHandleExA(flags, return_address, &mod) && mod == wndmode_dll) || - (delay_GetModuleHandleExA(flags, directDrawCreate, &mod) && mod == wndmode_dll) || - (delay_GetModuleHandleExA(flags, directDrawCreateEx, &mod) && mod == wndmode_dll)) - { - MessageBoxA( - NULL, - "Error: You cannot combine cnc-ddraw with other DirectDraw wrappers. \n\n" - "Please remove/disable wndmode.dll and then try to start the game again.", - "Conflicting DirectDraw wrapper detected - cnc-ddraw", - MB_OK | MB_TOPMOST); - - return TRUE; - } - } - - HMODULE windmode_dll = GetModuleHandleA("windmode.dll"); - if (windmode_dll) - { - if ((delay_GetModuleHandleExA(flags, return_address, &mod) && mod == windmode_dll) || - (delay_GetModuleHandleExA(flags, directDrawCreate, &mod) && mod == windmode_dll) || - (delay_GetModuleHandleExA(flags, directDrawCreateEx, &mod) && mod == windmode_dll)) - { - MessageBoxA( - NULL, - "Error: You cannot combine cnc-ddraw with other DirectDraw wrappers. \n\n" - "Please remove/disable windmode.dll and then try to start the game again.", - "Conflicting DirectDraw wrapper detected - cnc-ddraw", - MB_OK | MB_TOPMOST); - - return TRUE; - } - } - - HMODULE dxwnd_dll = GetModuleHandleA("dxwnd.dll"); - if (dxwnd_dll) - { - if ((delay_GetModuleHandleExA(flags, return_address, &mod) && mod == dxwnd_dll) || - (delay_GetModuleHandleExA(flags, directDrawCreate, &mod) && mod == dxwnd_dll) || - (delay_GetModuleHandleExA(flags, directDrawCreateEx, &mod) && mod == dxwnd_dll)) - { - MessageBoxA( - NULL, - "Error: You cannot combine cnc-ddraw with other DirectDraw wrappers. \n\n" - "Please disable DxWnd and then try to start the game again.", - "Conflicting DirectDraw wrapper detected - cnc-ddraw", - MB_OK | MB_TOPMOST); - - return TRUE; - } - } - - HMODULE age_dll = GetModuleHandleA("age.dll"); - if (age_dll) - { - if ((delay_GetModuleHandleExA(flags, return_address, &mod) && mod == age_dll) || - (delay_GetModuleHandleExA(flags, directDrawCreate, &mod) && mod == age_dll) || - (delay_GetModuleHandleExA(flags, directDrawCreateEx, &mod) && mod == age_dll)) - { - HKEY hkey; - LONG status = - RegOpenKeyExA(HKEY_CURRENT_USER, "SOFTWARE\\Voobly\\Voobly\\game\\13", 0L, KEY_READ, &hkey); - - if (status == ERROR_SUCCESS) - { - char windowed[256] = { 0 }; - DWORD size = sizeof(windowed); - RegQueryValueExA(hkey, "windowmode", NULL, NULL, (PVOID)&windowed, &size); - RegCloseKey(hkey); - - if (tolower(windowed[0]) == 't') - { - MessageBoxA( - NULL, - "Error: You cannot combine cnc-ddraw with other DirectDraw wrappers. \n\n" - "Please disable the other wrapper by clicking in the game room on the very top " - "on 'Game', now select 'DirectX' and disable 'Start in Window-Mode'.", - "Conflicting DirectDraw wrapper detected - cnc-ddraw", - MB_OK | MB_TOPMOST); - - return TRUE; - } - } - } - } - - return FALSE; -} - BOOL util_is_bad_read_ptr(void* p) { MEMORY_BASIC_INFORMATION mbi = { 0 }; @@ -418,13 +100,6 @@ BOOL util_is_minimized(HWND hwnd) return IsIconic(hwnd) || (real_GetClientRect(hwnd, &rc) && (rc.right - rc.left == 0 || rc.bottom - rc.top == 0)); } -BOOL util_in_foreground() -{ - DWORD process_id = 0; - - return GetWindowThreadProcessId(real_GetForegroundWindow(), &process_id) && process_id == GetCurrentProcessId(); -} - BOOL util_is_avx_supported() { const DWORD XMM_STATE_BIT = 1 << 1; @@ -470,59 +145,25 @@ BOOL util_is_avx_supported() void util_limit_game_ticks() { - if (GetCurrentThreadId() != g_ddraw.gui_thread_id) + if (GetCurrentThreadId() != g_ddraw->gui_thread_id) return; - /* - static void (WINAPI * getSystemTimePreciseAsFileTime)(LPFILETIME); - - if (!getSystemTimePreciseAsFileTime) - { - getSystemTimePreciseAsFileTime = GetProcAddress(LoadLibraryA("Kernel32.dll"), "GetSystemTimePreciseAsFileTime"); - - //if (!getSystemTimePreciseAsFileTime) - // getSystemTimePreciseAsFileTime = GetSystemTimeAsFileTime; - } - - - if (1) - { - FILETIME ft = { 0 }; - getSystemTimePreciseAsFileTime(&ft); - - if (CompareFileTime((FILETIME*)&g_ddraw.ticks_limiter.due_time, &ft) == -1) - { - memcpy(&g_ddraw.ticks_limiter.due_time, &ft, sizeof(LARGE_INTEGER)); - } - else - { - while (TRUE) - { - getSystemTimePreciseAsFileTime(&ft); - if (CompareFileTime((FILETIME*)&g_ddraw.ticks_limiter.due_time, &ft) <= 0) - break; - } - } - - g_ddraw.ticks_limiter.due_time.QuadPart += g_ddraw.ticks_limiter.tick_length_ns; - } - else */ - if (g_ddraw.ticks_limiter.htimer) + if (g_ddraw->ticks_limiter.htimer) { FILETIME ft = { 0 }; GetSystemTimeAsFileTime(&ft); - if (CompareFileTime((FILETIME*)&g_ddraw.ticks_limiter.due_time, &ft) == -1) + if (CompareFileTime((FILETIME*)&g_ddraw->ticks_limiter.due_time, &ft) == -1) { - memcpy(&g_ddraw.ticks_limiter.due_time, &ft, sizeof(LARGE_INTEGER)); + memcpy(&g_ddraw->ticks_limiter.due_time, &ft, sizeof(LARGE_INTEGER)); } else { - WaitForSingleObject(g_ddraw.ticks_limiter.htimer, g_ddraw.ticks_limiter.tick_length * 2); + WaitForSingleObject(g_ddraw->ticks_limiter.htimer, g_ddraw->ticks_limiter.tick_length * 2); } - g_ddraw.ticks_limiter.due_time.QuadPart += g_ddraw.ticks_limiter.tick_length_ns; - SetWaitableTimer(g_ddraw.ticks_limiter.htimer, &g_ddraw.ticks_limiter.due_time, 0, NULL, NULL, FALSE); + g_ddraw->ticks_limiter.due_time.QuadPart += g_ddraw->ticks_limiter.tick_length_ns; + SetWaitableTimer(g_ddraw->ticks_limiter.htimer, &g_ddraw->ticks_limiter.due_time, 0, NULL, NULL, FALSE); } else { @@ -534,12 +175,12 @@ void util_limit_game_ticks() return; } - next_game_tick += g_ddraw.ticks_limiter.tick_length; + next_game_tick += g_ddraw->ticks_limiter.tick_length; DWORD tick_count = timeGetTime(); int sleep_time = next_game_tick - tick_count; - if (sleep_time <= 0 || sleep_time > g_ddraw.ticks_limiter.tick_length) + if (sleep_time <= 0 || sleep_time > g_ddraw->ticks_limiter.tick_length) { next_game_tick = tick_count; } @@ -555,7 +196,7 @@ void util_update_bnet_pos(int new_x, int new_y) static int old_x = -32000; static int old_y = -32000; - if (old_x == -32000 || old_y == -32000 || !g_ddraw.bnet_active) + if (old_x == -32000 || old_y == -32000 || !g_ddraw->bnet_active) { old_x = new_x; old_y = new_y; @@ -563,10 +204,10 @@ void util_update_bnet_pos(int new_x, int new_y) } POINT pt = { 0, 0 }; - real_ClientToScreen(g_ddraw.hwnd, &pt); + real_ClientToScreen(g_ddraw->hwnd, &pt); RECT mainrc; - SetRect(&mainrc, pt.x, pt.y, pt.x + g_ddraw.width, pt.y + g_ddraw.height); + SetRect(&mainrc, pt.x, pt.y, pt.x + g_ddraw->width, pt.y + g_ddraw->height); int adj_y = 0; int adj_x = 0; @@ -589,7 +230,7 @@ void util_update_bnet_pos(int new_x, int new_y) 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); - if (rc.bottom - rc.top <= g_ddraw.height) + if (rc.bottom - rc.top <= g_ddraw->height) { if (rc.bottom > mainrc.bottom && abs(mainrc.bottom - rc.bottom) > abs(adj_y)) { @@ -601,7 +242,7 @@ void util_update_bnet_pos(int new_x, int new_y) } } - if (rc.right - rc.left <= g_ddraw.width) + if (rc.right - rc.left <= g_ddraw->width) { if (rc.right > mainrc.right && abs(mainrc.right - rc.right) > abs(adj_x)) { @@ -660,7 +301,7 @@ BOOL util_get_lowest_resolution( memset(&m, 0, sizeof(DEVMODE)); m.dmSize = sizeof(DEVMODE); - while (real_EnumDisplaySettingsA(NULL, i, &m)) + while (EnumDisplaySettings(NULL, i, &m)) { if (m.dmPelsWidth >= min_width && m.dmPelsHeight >= min_height && @@ -689,33 +330,26 @@ BOOL util_get_lowest_resolution( void util_toggle_maximize() { - if (!g_config.resizable || !g_config.windowed || g_config.fullscreen || !g_ddraw.width) - return; - - /* Do not allow cnc-ddraw maximize while macOS maximize is active */ - if (IsMacOS() && !g_config.window_rect.left && !g_config.window_rect.top) - return; - RECT client_rc; RECT dst_rc; - LONG style = real_GetWindowLongA(g_ddraw.hwnd, GWL_STYLE); - LONG exstyle = real_GetWindowLongA(g_ddraw.hwnd, GWL_EXSTYLE); - BOOL got_menu = GetMenu(g_ddraw.hwnd) != NULL; + LONG style = real_GetWindowLongA(g_ddraw->hwnd, GWL_STYLE); + LONG exstyle = real_GetWindowLongA(g_ddraw->hwnd, GWL_EXSTYLE); + BOOL got_menu = GetMenu(g_ddraw->hwnd) != NULL; - if (real_GetClientRect(g_ddraw.hwnd, &client_rc) && SystemParametersInfo(SPI_GETWORKAREA, 0, &dst_rc, 0)) + if (real_GetClientRect(g_ddraw->hwnd, &client_rc) && SystemParametersInfo(SPI_GETWORKAREA, 0, &dst_rc, 0)) { int width = (dst_rc.right - dst_rc.left); int height = (dst_rc.bottom - dst_rc.top); int x = dst_rc.left; int y = dst_rc.top; - if (client_rc.right != g_ddraw.width || client_rc.bottom != g_ddraw.height) + if (client_rc.right != g_ddraw->width || client_rc.bottom != g_ddraw->height) { dst_rc.left = 0; dst_rc.top = 0; - dst_rc.right = g_ddraw.width; - dst_rc.bottom = g_ddraw.height; + dst_rc.right = g_ddraw->width; + dst_rc.bottom = g_ddraw->height; AdjustWindowRectEx(&dst_rc, style, got_menu, exstyle); } @@ -723,15 +357,15 @@ void util_toggle_maximize() { dst_rc.left = 0; dst_rc.top = 0; - dst_rc.right = g_ddraw.width; - dst_rc.bottom = g_ddraw.height; + dst_rc.right = g_ddraw->width; + dst_rc.bottom = g_ddraw->height; for (int i = 20; i-- > 1;) { - if (width >= g_ddraw.width * i && height - 20 >= g_ddraw.height * i) + if (width >= g_ddraw->width * i && height - 20 >= g_ddraw->height * i) { - dst_rc.right = g_ddraw.width * i; - dst_rc.bottom = g_ddraw.height * i; + dst_rc.right = g_ddraw->width * i; + dst_rc.bottom = g_ddraw->height * i; break; } } @@ -745,23 +379,9 @@ void util_toggle_maximize() int w = dst_rc.right - dst_rc.left; int h = dst_rc.bottom - dst_rc.top; - double dst_ar; + double dst_ar = (double)g_ddraw->height / g_ddraw->width; double src_ar = (double)h / w; - if (g_config.aspect_ratio[0]) - { - char* e = &g_config.aspect_ratio[0]; - - DWORD cx = strtoul(e, &e, 0); - DWORD cy = strtoul(e + 1, &e, 0); - - dst_ar = (double)cy / cx; - } - else - { - dst_ar = (double)g_ddraw.height / g_ddraw.width; - } - dst_rc.top = 0; dst_rc.left = 0; dst_rc.right = w; @@ -796,12 +416,7 @@ void util_toggle_maximize() void util_toggle_fullscreen() { - /* Disable ALT+ENTER on battle.net and Infantry Online Zone List Window */ - if (g_ddraw.bnet_active || !g_ddraw.width || (g_config.infantryhack && GetMenu(g_ddraw.hwnd))) - return; - - /* Do not allow ALT+ENTER while macOS maximize is active */ - if (IsMacOS() && !g_config.window_rect.left && !g_config.window_rect.top) + if (g_ddraw->bnet_active) return; if (g_config.toggle_borderless && g_config.windowed) @@ -811,7 +426,7 @@ void util_toggle_fullscreen() mouse_unlock(); g_config.upscaled_state = g_config.fullscreen = TRUE; - dd_SetDisplayMode(0, 0, 0, 0); + dd_SetDisplayMode(g_ddraw->width, g_ddraw->height, g_ddraw->bpp, 0); mouse_lock(); } @@ -820,7 +435,7 @@ void util_toggle_fullscreen() mouse_unlock(); g_config.upscaled_state = g_config.fullscreen = FALSE; - dd_SetDisplayMode(0, 0, 0, 0); + dd_SetDisplayMode(g_ddraw->width, g_ddraw->height, g_ddraw->bpp, 0); //mouse_lock(); } @@ -837,7 +452,7 @@ void util_toggle_fullscreen() } g_config.window_state = g_config.windowed = FALSE; - dd_SetDisplayMode(0, 0, 0, SDM_LEAVE_WINDOWED); + dd_SetDisplayMode(g_ddraw->width, g_ddraw->height, g_ddraw->bpp, SDM_LEAVE_WINDOWED); util_update_bnet_pos(0, 0); mouse_lock(); @@ -853,27 +468,27 @@ void util_toggle_fullscreen() g_config.window_state = g_config.windowed = TRUE; - if (g_ddraw.renderer == d3d9_render_main && !g_config.nonexclusive) + if (g_ddraw->renderer == d3d9_render_main && !g_config.nonexclusive) { d3d9_reset(g_config.windowed); } else { - if (g_ddraw.render.thread) + if (g_ddraw->render.thread) { - EnterCriticalSection(&g_ddraw.cs); - g_ddraw.render.run = FALSE; - ReleaseSemaphore(g_ddraw.render.sem, 1, NULL); - LeaveCriticalSection(&g_ddraw.cs); + EnterCriticalSection(&g_ddraw->cs); + g_ddraw->render.run = FALSE; + ReleaseSemaphore(g_ddraw->render.sem, 1, NULL); + LeaveCriticalSection(&g_ddraw->cs); - WaitForSingleObject(g_ddraw.render.thread, INFINITE); - g_ddraw.render.thread = NULL; + WaitForSingleObject(g_ddraw->render.thread, INFINITE); + g_ddraw->render.thread = NULL; } - ChangeDisplaySettings(NULL, g_ddraw.bnet_active ? CDS_FULLSCREEN : 0); + ChangeDisplaySettings(NULL, g_ddraw->bnet_active ? CDS_FULLSCREEN : 0); } - dd_SetDisplayMode(0, 0, 0, SDM_LEAVE_FULLSCREEN); + dd_SetDisplayMode(g_ddraw->width, g_ddraw->height, g_ddraw->bpp, SDM_LEAVE_FULLSCREEN); //mouse_lock(); } } @@ -901,15 +516,15 @@ void util_set_window_rect(int x, int y, int width, int height, UINT flags) { if (g_config.windowed) { - if (g_ddraw.render.thread) + if (g_ddraw->render.thread) { - EnterCriticalSection(&g_ddraw.cs); - g_ddraw.render.run = FALSE; - ReleaseSemaphore(g_ddraw.render.sem, 1, NULL); - LeaveCriticalSection(&g_ddraw.cs); + EnterCriticalSection(&g_ddraw->cs); + g_ddraw->render.run = FALSE; + ReleaseSemaphore(g_ddraw->render.sem, 1, NULL); + LeaveCriticalSection(&g_ddraw->cs); - WaitForSingleObject(g_ddraw.render.thread, INFINITE); - g_ddraw.render.thread = NULL; + WaitForSingleObject(g_ddraw->render.thread, INFINITE); + g_ddraw->render.thread = NULL; } if ((flags & SWP_NOMOVE) == 0) @@ -924,42 +539,10 @@ void util_set_window_rect(int x, int y, int width, int height, UINT flags) g_config.window_rect.right = width; } - dd_SetDisplayMode(0, 0, 0, 0); + dd_SetDisplayMode(g_ddraw->width, g_ddraw->height, g_ddraw->bpp, 0); } } -BOOL CALLBACK util_enum_thread_wnd_proc(HWND hwnd, LPARAM lParam) -{ - RECT size = { 0 }; - real_GetClientRect(hwnd, &size); - - LONG sytle = real_GetWindowLongA(hwnd, GWL_STYLE); - - if (!g_ddraw.hwnd && !(sytle & WS_DISABLED) && size.right > 0 && size.bottom > 0) - g_ddraw.hwnd = hwnd; - -#ifdef _DEBUG - char class[MAX_PATH] = { 0 }; - GetClassNameA(hwnd, class, sizeof(class) - 1); - - char title[MAX_PATH] = { 0 }; - GetWindowTextA(hwnd, title, sizeof(title) - 1); - - RECT pos = { 0 }; - real_GetWindowRect(hwnd, &pos); - - LONG exsytle = real_GetWindowLongA(hwnd, GWL_EXSTYLE); - - TRACE( - "%s(class=%s, title=%s, X=%d, Y=%d, nWidth=%d, nHeight=%d)\n", - __FUNCTION__, class, title, pos.left, pos.top, size.right, size.bottom); - - dbg_dump_wnd_styles(sytle, exsytle); -#endif - - return TRUE; -} - BOOL CALLBACK util_enum_child_proc(HWND hwnd, LPARAM lparam) { IDirectDrawSurfaceImpl* this = (IDirectDrawSurfaceImpl*)lparam; @@ -967,45 +550,38 @@ BOOL CALLBACK util_enum_child_proc(HWND hwnd, LPARAM lparam) RECT size; RECT pos; - if (real_GetClientRect(hwnd, &size) && real_GetWindowRect(hwnd, &pos)) + if (real_GetClientRect(hwnd, &size) && real_GetWindowRect(hwnd, &pos) && size.right > 1 && size.bottom > 1) { + /* + TRACE( + " util_enum_child_proc right=%u, bottom=%u, left=%d, top=%d\n", + size.right, + size.bottom, + pos.left, + pos.top); + */ + char class_name[MAX_PATH] = { 0 }; GetClassNameA(hwnd, class_name, sizeof(class_name) - 1); - LONG exstyle = real_GetWindowLongA(hwnd, GWL_EXSTYLE); - HWND parent = GetParent(hwnd); + //TRACE(" AVIWINDOW class=%s\n", class_name); -#ifdef _DEBUG_X - LONG style = real_GetWindowLongA(hwnd, GWL_STYLE); - - TRACE("util_enum_child_proc class=%s, hwnd=%p, width=%u, height=%u, left=%d, top=%d, parent=%p, style=%08X\n", - class_name, hwnd, size.right, size.bottom, pos.left, pos.top, parent, style); - - dbg_dump_wnd_styles(style, exstyle); -#endif - - if (parent != g_ddraw.hwnd || size.right <= 1 || size.bottom <= 1 || _strcmpi(class_name, "Edit") == 0) - return TRUE; - - if (g_config.fixchilds == FIX_CHILDS_DETECT_HIDE || - g_config.fixchilds == FIX_CHILDS_DETECT_HIDE_NOSCALE || - strcmp(class_name, "Cc2EditClassTh") == 0 || - strcmp(class_name, "msctls_statusbar32") == 0 || + if (g_config.fixchilds == FIX_CHILDS_DETECT_HIDE || strcmp(class_name, "VideoRenderer") == 0 || - strcmp(class_name, "MCIQTZ_Window") == 0 || strcmp(class_name, "MCIAVI") == 0 || - strcmp(class_name, "AVIWnd32") == 0 || - strcmp(class_name, "MCIWndClass") == 0 || - strcmp(class_name, "AVI Window") == 0) + strcmp(class_name, "AVIWnd32") == 0 || + strcmp(class_name, "MCIWndClass") == 0) { - if (g_config.fixchilds == FIX_CHILDS_DETECT_HIDE_NOSCALE) + if (g_config.fixchilds != FIX_CHILDS_DETECT_HIDE) { - g_ddraw.got_child_windows = g_ddraw.child_window_exists = TRUE; - } + InterlockedExchangePointer((void*)&g_ddraw->video_window_hwnd, hwnd); + } - if (!(exstyle & WS_EX_TRANSPARENT)) + LONG style = real_GetWindowLongA(hwnd, GWL_EXSTYLE); + + if (!(style & WS_EX_TRANSPARENT)) { - real_SetWindowLongA(hwnd, GWL_EXSTYLE, exstyle | WS_EX_TRANSPARENT); + real_SetWindowLongA(hwnd, GWL_EXSTYLE, style | WS_EX_TRANSPARENT); real_SetWindowPos( hwnd, @@ -1018,9 +594,9 @@ BOOL CALLBACK util_enum_child_proc(HWND hwnd, LPARAM lparam) ); } } - else if (!(exstyle & WS_EX_TRANSPARENT)) + else { - g_ddraw.got_child_windows = g_ddraw.child_window_exists = TRUE; + g_ddraw->got_child_windows = g_ddraw->child_window_exists = TRUE; if (g_config.fixchilds == FIX_CHILDS_DETECT_PAINT) { @@ -1029,63 +605,36 @@ BOOL CALLBACK util_enum_child_proc(HWND hwnd, LPARAM lparam) dds_GetDC(this, &src_dc); - real_MapWindowPoints(HWND_DESKTOP, g_ddraw.hwnd, (LPPOINT)&pos, 2); + real_MapWindowPoints(HWND_DESKTOP, g_ddraw->hwnd, (LPPOINT)&pos, 2); - real_BitBlt(dst_dc, 0, 0, size.right, size.bottom, src_dc, pos.left, pos.top, SRCCOPY); + BitBlt(dst_dc, 0, 0, size.right, size.bottom, src_dc, pos.left, pos.top, SRCCOPY); ReleaseDC(hwnd, dst_dc); } } - - if (strcmp(class_name, "TMediaPlayer") == 0) - return TRUE; } -#ifdef _DEBUG_X - return TRUE; -#else return FALSE; -#endif } static unsigned char util_get_pixel(int x, int y) { return ((unsigned char*)dds_GetBuffer( - g_ddraw.primary))[y * g_ddraw.primary->pitch + x * g_ddraw.primary->bytes_pp]; + g_ddraw->primary))[y * g_ddraw->primary->pitch + x * g_ddraw->primary->bytes_pp]; } BOOL util_detect_low_res_screen() { - /* struct Copied from wkReSolution */ - typedef struct - { - PVOID UnkTable1; - DWORD Unk1, Unk2, Unk3, Unk4; - PVOID UnkDD, UnkTable2; - DWORD Unk5; - DWORD RenderWidth, RenderHeight; - DWORD Unk6, Unk7; - DWORD WidthRT, HeightRT; - DWORD HalfWidth, HalfHeight; - DWORD Unk8; - PCHAR UnkC; - LPDIRECTDRAW lpDD; - } * LPW2DDSTRUCT; - static int* in_movie = (int*)0x00665F58; static int* is_vqa_640 = (int*)0x0065D7BC; static BYTE* should_stretch = (BYTE*)0x00607D78; - static LPW2DDSTRUCT* pW2DS; - - if (!pW2DS) - pW2DS = (LPW2DDSTRUCT*)((DWORD)GetModuleHandleA(NULL) + 0x799C4); - if (g_ddraw.width <= g_ddraw.upscale_hack_width || g_ddraw.height <= g_ddraw.upscale_hack_height) + if (g_ddraw->width <= g_ddraw->upscale_hack_width || g_ddraw->height <= g_ddraw->upscale_hack_height) { return FALSE; } - if (g_ddraw.isredalert) + if (g_ddraw->isredalert) { if ((*in_movie && !*is_vqa_640) || *should_stretch) { @@ -1094,32 +643,15 @@ BOOL util_detect_low_res_screen() return FALSE; } - else if (g_ddraw.iscnc1) + else if (g_ddraw->iscnc1) { return - util_get_pixel(g_ddraw.upscale_hack_width + 1, 0) == 0 || - util_get_pixel(g_ddraw.upscale_hack_width + 5, 1) == 0; + util_get_pixel(g_ddraw->upscale_hack_width + 1, 0) == 0 || + util_get_pixel(g_ddraw->upscale_hack_width + 5, 1) == 0; } - else if (g_ddraw.iskkndx) + else if (g_ddraw->iskkndx) { - return util_get_pixel(g_ddraw.width - 3, 3) == 0; - } - else if (g_ddraw.isworms2) - { - DWORD w2_width = *pW2DS ? (*pW2DS)->RenderWidth : 0; - DWORD w2_height = *pW2DS ? (*pW2DS)->RenderHeight : 0; - - if (w2_width && w2_width < g_ddraw.width && w2_height && w2_height < g_ddraw.height) - { - if (g_ddraw.upscale_hack_width != w2_width || g_ddraw.upscale_hack_height != w2_height) - { - g_ddraw.upscale_hack_width = w2_width; - g_ddraw.upscale_hack_height = w2_height; - InterlockedExchange(&g_ddraw.upscale_hack_active, FALSE); - } - - return TRUE; - } + return util_get_pixel(g_ddraw->width - 3, 3) == 0; } return FALSE; diff --git a/src/versionhelpers.c b/src/versionhelpers.c deleted file mode 100644 index f9f35c2..0000000 --- a/src/versionhelpers.c +++ /dev/null @@ -1,36 +0,0 @@ -#include -#include "versionhelpers.h" -#include "delay_imports.h" - - -BOOL verhelp_verify_version(PRTL_OSVERSIONINFOEXW versionInfo, ULONG typeMask, ULONGLONG conditionMask) -{ - return delay_RtlVerifyVersionInfo ? - delay_RtlVerifyVersionInfo(versionInfo, typeMask, conditionMask) == 0 : - VerifyVersionInfoW(versionInfo, typeMask, conditionMask); -} - -ULONGLONG verhelp_set_mask(ULONGLONG ConditionMask, DWORD TypeMask, BYTE Condition) -{ - return delay_VerSetConditionMask ? delay_VerSetConditionMask(ConditionMask, TypeMask, Condition) : 0; -} - -const char* verhelp_wine_get_version() -{ - return delay_wine_get_version ? delay_wine_get_version() : NULL; -} - -void verhelp_wine_get_host_version(const char** sysname, const char** release) -{ - if (delay_wine_get_host_version) - { - delay_wine_get_host_version(sysname, release); - return; - } - - if (sysname) - *sysname = NULL; - - if (release) - *release = NULL; -} diff --git a/src/win2000.asm b/src/win2000.asm new file mode 100644 index 0000000..5995502 --- /dev/null +++ b/src/win2000.asm @@ -0,0 +1,15 @@ +.model flat + +.data +__imp__EncodePointer@4 dd dummy +__imp__DecodePointer@4 dd dummy +EXTERNDEF __imp__EncodePointer@4 : DWORD +EXTERNDEF __imp__DecodePointer@4 : DWORD + +.code +dummy proc +mov eax, [esp+4] +ret 4 +dummy endp + +end diff --git a/src/winapi_hooks.c b/src/winapi_hooks.c index 33655c1..6492f59 100644 --- a/src/winapi_hooks.c +++ b/src/winapi_hooks.c @@ -1,7 +1,6 @@ #include #include #include -#include #include "debug.h" #include "config.h" #include "dd.h" @@ -10,24 +9,19 @@ #include "config.h" #include "utils.h" #include "mouse.h" -#include "keyboard.h" #include "wndproc.h" #include "render_gdi.h" -#include "render_d3d9.h" -#include "render_ogl.h" #include "directinput.h" #include "ddsurface.h" #include "ddclipper.h" #include "dllmain.h" #include "hook.h" #include "directinput.h" -#include "ddpalette.h" -#include "palette.h" BOOL WINAPI fake_GetCursorPos(LPPOINT lpPoint) { - if (!g_ddraw.ref || !g_ddraw.hwnd || !g_ddraw.width) + if (!g_ddraw || !g_ddraw->hwnd || !g_ddraw->width) return real_GetCursorPos(lpPoint); POINT pt, realpt; @@ -35,50 +29,84 @@ BOOL WINAPI fake_GetCursorPos(LPPOINT lpPoint) if (!real_GetCursorPos(&pt)) return FALSE; - realpt = pt; + realpt.x = pt.x; + realpt.y = pt.y; - if ((g_mouse_locked || g_config.devmode || g_ddraw.bnet_active) && - (!g_config.windowed || real_ScreenToClient(g_ddraw.hwnd, &pt))) + if (g_mouse_locked && (!g_config.windowed || real_ScreenToClient(g_ddraw->hwnd, &pt))) { - int x = max(pt.x - g_ddraw.mouse.x_adjust, 0); - int y = max(pt.y - g_ddraw.mouse.y_adjust, 0); + /* fallback solution for possible ClipCursor failure */ + int diffx = 0, diffy = 0; - if (g_config.adjmouse && !g_ddraw.child_window_exists) + int max_width = g_config.adjmouse ? g_ddraw->render.viewport.width : g_ddraw->width; + int max_height = g_config.adjmouse ? g_ddraw->render.viewport.height : g_ddraw->height; + + pt.x -= g_ddraw->mouse.x_adjust; + pt.y -= g_ddraw->mouse.y_adjust; + + if (pt.x < 0) { - x = (DWORD)(roundf(x * g_ddraw.mouse.unscale_x)); - y = (DWORD)(roundf(y * g_ddraw.mouse.unscale_y)); + diffx = pt.x; + pt.x = 0; } - x = min(x, g_ddraw.width - 1); - y = min(y, g_ddraw.height - 1); - - if (g_config.vhack && - !g_ddraw.isworms2 && - !g_config.devmode && - !g_ddraw.bnet_active && - InterlockedExchangeAdd(&g_ddraw.upscale_hack_active, 0)) + if (pt.y < 0) { - int diffx = 0; - int diffy = 0; + diffy = pt.y; + pt.y = 0; + } - if (x > g_ddraw.upscale_hack_width) + if (pt.x > max_width) + { + diffx = pt.x - max_width; + pt.x = max_width; + } + + if (pt.y > max_height) + { + diffy = pt.y - max_height; + pt.y = max_height; + } + + if (diffx || diffy) + real_SetCursorPos(realpt.x - diffx, realpt.y - diffy); + + int x = 0; + int y = 0; + + if (g_config.adjmouse) + { + x = min((DWORD)(roundf(pt.x * g_ddraw->mouse.unscale_x)), g_ddraw->width - 1); + y = min((DWORD)(roundf(pt.y * g_ddraw->mouse.unscale_y)), g_ddraw->height - 1); + } + else + { + x = min(pt.x, g_ddraw->width - 1); + y = min(pt.y, g_ddraw->height - 1); + } + + if (g_config.vhack && InterlockedExchangeAdd(&g_ddraw->upscale_hack_active, 0)) + { + diffx = 0; + diffy = 0; + + if (x > g_ddraw->upscale_hack_width) { - diffx = x - g_ddraw.upscale_hack_width; - x = g_ddraw.upscale_hack_width; + diffx = x - g_ddraw->upscale_hack_width; + x = g_ddraw->upscale_hack_width; } - if (y > g_ddraw.upscale_hack_height) + if (y > g_ddraw->upscale_hack_height) { - diffy = y - g_ddraw.upscale_hack_height; - y = g_ddraw.upscale_hack_height; + diffy = y - g_ddraw->upscale_hack_height; + y = g_ddraw->upscale_hack_height; } if (diffx || diffy) real_SetCursorPos(realpt.x - diffx, realpt.y - diffy); } - InterlockedExchange((LONG*)&g_ddraw.cursor.x, x); - InterlockedExchange((LONG*)&g_ddraw.cursor.y, y); + InterlockedExchange((LONG*)&g_ddraw->cursor.x, x); + InterlockedExchange((LONG*)&g_ddraw->cursor.y, y); if (lpPoint) { @@ -88,11 +116,21 @@ BOOL WINAPI fake_GetCursorPos(LPPOINT lpPoint) return TRUE; } + else if (lpPoint && g_ddraw->bnet_active && real_ScreenToClient(g_ddraw->hwnd, &pt)) + { + if (pt.x > 0 && pt.x < g_ddraw->width && pt.y > 0 && pt.y < g_ddraw->height) + { + lpPoint->x = pt.x; + lpPoint->y = pt.y; + + return TRUE; + } + } if (lpPoint) { - lpPoint->x = InterlockedExchangeAdd((LONG*)&g_ddraw.cursor.x, 0); - lpPoint->y = InterlockedExchangeAdd((LONG*)&g_ddraw.cursor.y, 0); + lpPoint->x = InterlockedExchangeAdd((LONG*)&g_ddraw->cursor.x, 0); + lpPoint->y = InterlockedExchangeAdd((LONG*)&g_ddraw->cursor.y, 0); } return TRUE; @@ -100,13 +138,13 @@ BOOL WINAPI fake_GetCursorPos(LPPOINT lpPoint) BOOL WINAPI fake_ClipCursor(const RECT* lpRect) { - if (g_ddraw.ref && g_ddraw.hwnd && g_ddraw.width) + if (g_ddraw && g_ddraw->hwnd && g_ddraw->width) { RECT dst_rc = { 0, 0, - g_ddraw.width, - g_ddraw.height + g_ddraw->width, + g_ddraw->height }; if (lpRect) @@ -114,28 +152,28 @@ BOOL WINAPI fake_ClipCursor(const RECT* lpRect) if (g_config.adjmouse) { - dst_rc.left = (LONG)(roundf(dst_rc.left * g_ddraw.render.scale_w)); - dst_rc.top = (LONG)(roundf(dst_rc.top * g_ddraw.render.scale_h)); - dst_rc.bottom = (LONG)(roundf(dst_rc.bottom * g_ddraw.render.scale_h)); - dst_rc.right = (LONG)(roundf(dst_rc.right * g_ddraw.render.scale_w)); + dst_rc.left = (LONG)(roundf(dst_rc.left * g_ddraw->render.scale_w)); + dst_rc.top = (LONG)(roundf(dst_rc.top * g_ddraw->render.scale_h)); + dst_rc.bottom = (LONG)(roundf(dst_rc.bottom * g_ddraw->render.scale_h)); + dst_rc.right = (LONG)(roundf(dst_rc.right * g_ddraw->render.scale_w)); } - int max_width = g_config.adjmouse ? g_ddraw.render.viewport.width : g_ddraw.width; - int max_height = g_config.adjmouse ? g_ddraw.render.viewport.height : g_ddraw.height; + int max_width = g_config.adjmouse ? g_ddraw->render.viewport.width : g_ddraw->width; + int max_height = g_config.adjmouse ? g_ddraw->render.viewport.height : g_ddraw->height; dst_rc.bottom = min(dst_rc.bottom, max_height); dst_rc.right = min(dst_rc.right, max_width); OffsetRect( &dst_rc, - g_ddraw.mouse.x_adjust, - g_ddraw.mouse.y_adjust); + g_ddraw->mouse.x_adjust, + g_ddraw->mouse.y_adjust); - CopyRect(&g_ddraw.mouse.rc, &dst_rc); + CopyRect(&g_ddraw->mouse.rc, &dst_rc); - if (g_mouse_locked && !util_is_minimized(g_ddraw.hwnd)) + if (g_mouse_locked && !util_is_minimized(g_ddraw->hwnd)) { - real_MapWindowPoints(g_ddraw.hwnd, HWND_DESKTOP, (LPPOINT)&dst_rc, 2); + real_MapWindowPoints(g_ddraw->hwnd, HWND_DESKTOP, (LPPOINT)&dst_rc, 2); return real_ClipCursor(&dst_rc); } @@ -146,19 +184,19 @@ BOOL WINAPI fake_ClipCursor(const RECT* lpRect) int WINAPI fake_ShowCursor(BOOL bShow) { - if (g_ddraw.ref && g_ddraw.hwnd) + if (g_ddraw && g_ddraw->hwnd) { if (g_mouse_locked || g_config.devmode) { int count = real_ShowCursor(bShow); - InterlockedExchange((LONG*)&g_ddraw.show_cursor_count, count); + InterlockedExchange((LONG*)&g_ddraw->show_cursor_count, count); return count; } else { return bShow ? - InterlockedIncrement((LONG*)&g_ddraw.show_cursor_count) : - InterlockedDecrement((LONG*)&g_ddraw.show_cursor_count); + InterlockedIncrement((LONG*)&g_ddraw->show_cursor_count) : + InterlockedDecrement((LONG*)&g_ddraw->show_cursor_count); } } @@ -167,9 +205,9 @@ int WINAPI fake_ShowCursor(BOOL bShow) HCURSOR WINAPI fake_SetCursor(HCURSOR hCursor) { - if (g_ddraw.ref && g_ddraw.hwnd) + if (g_ddraw && g_ddraw->hwnd) { - HCURSOR cursor = (HCURSOR)InterlockedExchange((LONG*)&g_ddraw.old_cursor, (LONG)hCursor); + HCURSOR cursor = (HCURSOR)InterlockedExchange((LONG*)&g_ddraw->old_cursor, (LONG)hCursor); if (!g_mouse_locked && !g_config.devmode) return cursor; @@ -181,16 +219,15 @@ HCURSOR WINAPI fake_SetCursor(HCURSOR hCursor) BOOL WINAPI fake_GetWindowRect(HWND hWnd, LPRECT lpRect) { if (lpRect && - g_ddraw.ref && - g_ddraw.hwnd && - g_ddraw.width && - (g_config.hook != 2 || g_ddraw.renderer == gdi_render_main)) + g_ddraw && + g_ddraw->hwnd && + (g_config.hook != 2 || g_ddraw->renderer == gdi_render_main)) { - if (hWnd == g_ddraw.hwnd || hWnd == GetDesktopWindow()) + if (g_ddraw->hwnd == hWnd) { - lpRect->bottom = g_ddraw.height; + lpRect->bottom = g_ddraw->height; lpRect->left = 0; - lpRect->right = g_ddraw.width; + lpRect->right = g_ddraw->width; lpRect->top = 0; return TRUE; @@ -199,7 +236,7 @@ BOOL WINAPI fake_GetWindowRect(HWND hWnd, LPRECT lpRect) { if (real_GetWindowRect(hWnd, lpRect)) { - real_MapWindowPoints(HWND_DESKTOP, g_ddraw.hwnd, (LPPOINT)lpRect, 2); + real_MapWindowPoints(HWND_DESKTOP, g_ddraw->hwnd, (LPPOINT)lpRect, 2); return TRUE; } @@ -214,14 +251,13 @@ BOOL WINAPI fake_GetWindowRect(HWND hWnd, LPRECT lpRect) BOOL WINAPI fake_GetClientRect(HWND hWnd, LPRECT lpRect) { if (lpRect && - g_ddraw.ref && - g_ddraw.width && - (g_ddraw.hwnd == hWnd || hWnd == GetDesktopWindow()) && - (g_config.hook != 2 || g_ddraw.renderer == gdi_render_main)) + g_ddraw && + g_ddraw->hwnd == hWnd && + (g_config.hook != 2 || g_ddraw->renderer == gdi_render_main)) { - lpRect->bottom = g_ddraw.height; + lpRect->bottom = g_ddraw->height; lpRect->left = 0; - lpRect->right = g_ddraw.width; + lpRect->right = g_ddraw->width; lpRect->top = 0; return TRUE; @@ -232,29 +268,29 @@ BOOL WINAPI fake_GetClientRect(HWND hWnd, LPRECT lpRect) BOOL WINAPI fake_ClientToScreen(HWND hWnd, LPPOINT lpPoint) { - if (!g_ddraw.ref || !g_ddraw.hwnd) + if (!g_ddraw || !g_ddraw->hwnd) return real_ClientToScreen(hWnd, lpPoint); - if (g_ddraw.hwnd != hWnd) - return real_ClientToScreen(hWnd, lpPoint) && real_ScreenToClient(g_ddraw.hwnd, lpPoint); + if (g_ddraw->hwnd != hWnd) + return real_ClientToScreen(hWnd, lpPoint) && real_ScreenToClient(g_ddraw->hwnd, lpPoint); return TRUE; } BOOL WINAPI fake_ScreenToClient(HWND hWnd, LPPOINT lpPoint) { - if (!g_ddraw.ref || !g_ddraw.hwnd) + if (!g_ddraw || !g_ddraw->hwnd) return real_ScreenToClient(hWnd, lpPoint); - if (g_ddraw.hwnd != hWnd) - return real_ClientToScreen(g_ddraw.hwnd, lpPoint) && real_ScreenToClient(hWnd, lpPoint); + if (g_ddraw->hwnd != hWnd) + return real_ClientToScreen(g_ddraw->hwnd, lpPoint) && real_ScreenToClient(hWnd, lpPoint); return TRUE; } BOOL WINAPI fake_SetCursorPos(int X, int Y) { - if (!g_ddraw.ref || !g_ddraw.hwnd || !g_ddraw.width) + if (!g_ddraw || !g_ddraw->hwnd || !g_ddraw->width) return real_SetCursorPos(X, Y); if (!g_mouse_locked && !g_config.devmode) @@ -264,35 +300,35 @@ BOOL WINAPI fake_SetCursorPos(int X, int Y) if (g_config.adjmouse) { - pt.x = (LONG)(roundf(pt.x * g_ddraw.mouse.scale_x)); - pt.y = (LONG)(roundf(pt.y * g_ddraw.mouse.scale_y)); + pt.x = (LONG)(roundf(pt.x * g_ddraw->mouse.scale_x)); + pt.y = (LONG)(roundf(pt.y * g_ddraw->mouse.scale_y)); } - pt.x += g_ddraw.mouse.x_adjust; - pt.y += g_ddraw.mouse.y_adjust; + pt.x += g_ddraw->mouse.x_adjust; + pt.y += g_ddraw->mouse.y_adjust; - return real_ClientToScreen(g_ddraw.hwnd, &pt) && real_SetCursorPos(pt.x, pt.y); + return real_ClientToScreen(g_ddraw->hwnd, &pt) && real_SetCursorPos(pt.x, pt.y); } HWND WINAPI fake_WindowFromPoint(POINT Point) { - if (!g_ddraw.ref || !g_ddraw.hwnd) + if (!g_ddraw || !g_ddraw->hwnd) return real_WindowFromPoint(Point); POINT pt = { Point.x, Point.y }; - return real_ClientToScreen(g_ddraw.hwnd, &pt) ? real_WindowFromPoint(pt) : NULL; + return real_ClientToScreen(g_ddraw->hwnd, &pt) ? real_WindowFromPoint(pt) : NULL; } BOOL WINAPI fake_GetClipCursor(LPRECT lpRect) { - if (!g_ddraw.ref || !g_ddraw.width) + if (!g_ddraw || !g_ddraw->width) return real_GetClipCursor(lpRect); if (lpRect) { - lpRect->bottom = g_ddraw.height; + lpRect->bottom = g_ddraw->height; lpRect->left = 0; - lpRect->right = g_ddraw.width; + lpRect->right = g_ddraw->width; lpRect->top = 0; return TRUE; @@ -303,37 +339,21 @@ BOOL WINAPI fake_GetClipCursor(LPRECT lpRect) BOOL WINAPI fake_GetCursorInfo(PCURSORINFO pci) { - if (!g_ddraw.ref || !g_ddraw.hwnd) + if (!g_ddraw || !g_ddraw->hwnd) return real_GetCursorInfo(pci); - return pci && real_GetCursorInfo(pci) && real_ScreenToClient(g_ddraw.hwnd, &pci->ptScreenPos); + return pci && real_GetCursorInfo(pci) && real_ScreenToClient(g_ddraw->hwnd, &pci->ptScreenPos); } int WINAPI fake_GetSystemMetrics(int nIndex) { - DWORD width = 0; - DWORD height = 0; - - if (g_ddraw.ref && g_ddraw.width) - { - width = g_ddraw.width; - height = g_ddraw.height; - } - else if (g_config.fake_mode[0]) - { - char* e = &g_config.fake_mode[0]; - - width = strtoul(e, &e, 0); - height = strtoul(e + 1, &e, 0); - } - - if (width) + if (g_ddraw && g_ddraw->width) { if (nIndex == SM_CXSCREEN) - return width; + return g_ddraw->width; if (nIndex == SM_CYSCREEN) - return height; + return g_ddraw->height; } return real_GetSystemMetrics(nIndex); @@ -341,19 +361,19 @@ int WINAPI fake_GetSystemMetrics(int nIndex) BOOL WINAPI fake_SetWindowPos(HWND hWnd, HWND hWndInsertAfter, int X, int Y, int cx, int cy, UINT uFlags) { - if (g_ddraw.ref && g_ddraw.hwnd) + if (g_ddraw && g_ddraw->hwnd) { - if (g_ddraw.hwnd == hWnd) + if (g_ddraw->hwnd == hWnd) { UINT req_flags = SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER; if ((uFlags & req_flags) != req_flags) return TRUE; } - else if (!IsChild(g_ddraw.hwnd, hWnd) && !(real_GetWindowLongA(hWnd, GWL_STYLE) & WS_CHILD)) + else if (!IsChild(g_ddraw->hwnd, hWnd) && !(real_GetWindowLongA(hWnd, GWL_STYLE) & WS_CHILD)) { POINT pt = { 0, 0 }; - if (real_ClientToScreen(g_ddraw.hwnd, &pt)) + if (real_ClientToScreen(g_ddraw->hwnd, &pt)) { X += pt.x; Y += pt.y; @@ -366,47 +386,32 @@ BOOL WINAPI fake_SetWindowPos(HWND hWnd, HWND hWndInsertAfter, int X, int Y, int BOOL WINAPI fake_MoveWindow(HWND hWnd, int X, int Y, int nWidth, int nHeight, BOOL bRepaint) { - if (g_ddraw.ref && g_ddraw.hwnd) + if (g_ddraw && g_ddraw->hwnd) { - if (g_ddraw.hwnd == hWnd) + if (g_ddraw->hwnd == hWnd) { - if (g_ddraw.width && g_ddraw.height && (nWidth != g_ddraw.width || nHeight != g_ddraw.height)) + if (g_ddraw->width && g_ddraw->height && (nWidth != g_ddraw->width || nHeight != g_ddraw->height)) { - //real_SendMessageA(g_ddraw.hwnd, WM_MOVE_DDRAW, 0, MAKELPARAM(X, Y)); + //real_SendMessageA(g_ddraw->hwnd, WM_MOVE_DDRAW, 0, MAKELPARAM(X, Y)); real_SendMessageA( - g_ddraw.hwnd, + g_ddraw->hwnd, WM_SIZE_DDRAW, 0, - MAKELPARAM(min(nWidth, g_ddraw.width), min(nHeight, g_ddraw.height))); + MAKELPARAM(min(nWidth, g_ddraw->width), min(nHeight, g_ddraw->height))); } return TRUE; } - else if (!IsChild(g_ddraw.hwnd, hWnd) && !(real_GetWindowLongA(hWnd, GWL_STYLE) & WS_CHILD)) + else if (!IsChild(g_ddraw->hwnd, hWnd) && !(real_GetWindowLongA(hWnd, GWL_STYLE) & WS_CHILD)) { POINT pt = { 0, 0 }; - if (real_ClientToScreen(g_ddraw.hwnd, &pt)) + if (real_ClientToScreen(g_ddraw->hwnd, &pt)) { X += pt.x; Y += pt.y; } } - else if (hWnd == g_ddraw.textbox.hwnd && IsWindow(hWnd) && GetParent(hWnd) == g_ddraw.hwnd && g_ddraw.width) - { - /* Age Of Empires 2 textbox align */ - char class_name[MAX_PATH] = { 0 }; - GetClassNameA(hWnd, class_name, sizeof(class_name) - 1); - - if (_strcmpi(class_name, "Edit") == 0) - { - g_ddraw.textbox.x = X; - g_ddraw.textbox.y = Y; - - X = (int)(g_ddraw.render.viewport.x + (X * g_ddraw.render.scale_w)); - Y = (int)(g_ddraw.render.viewport.y + (Y * g_ddraw.render.scale_h)); - } - } } return real_MoveWindow(hWnd, X, Y, nWidth, nHeight, bRepaint); @@ -414,35 +419,35 @@ BOOL WINAPI fake_MoveWindow(HWND hWnd, int X, int Y, int nWidth, int nHeight, BO LRESULT WINAPI fake_SendMessageA(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { - if (!g_ddraw.ref || !g_ddraw.hwnd) + if (!g_ddraw || !g_ddraw->hwnd) return real_SendMessageA(hWnd, Msg, wParam, lParam); - if (g_ddraw.hwnd == hWnd && Msg == WM_MOUSEMOVE) + if (g_ddraw->hwnd == hWnd && Msg == WM_MOUSEMOVE) { int x = GET_X_LPARAM(lParam); int y = GET_Y_LPARAM(lParam); if (g_config.adjmouse) { - x = (int)(roundf(x * g_ddraw.mouse.scale_x)); - y = (int)(roundf(y * g_ddraw.mouse.scale_y)); + x = (int)(roundf(x * g_ddraw->mouse.scale_x)); + y = (int)(roundf(y * g_ddraw->mouse.scale_y)); } - lParam = MAKELPARAM(x + g_ddraw.mouse.x_adjust, y + g_ddraw.mouse.y_adjust); + lParam = MAKELPARAM(x + g_ddraw->mouse.x_adjust, y + g_ddraw->mouse.y_adjust); } - if (g_ddraw.hwnd == hWnd && Msg == WM_SIZE && g_config.hook != 2) + if (g_ddraw->hwnd == hWnd && Msg == WM_SIZE && g_config.hook != 2) { Msg = WM_SIZE_DDRAW; } LRESULT result = real_SendMessageA(hWnd, Msg, wParam, lParam); - if (result && g_ddraw.ref && Msg == CB_GETDROPPEDCONTROLRECT) + if (result && g_ddraw && Msg == CB_GETDROPPEDCONTROLRECT) { RECT* rc = (RECT*)lParam; if (rc) - real_MapWindowPoints(HWND_DESKTOP, g_ddraw.hwnd, (LPPOINT)rc, 2); + real_MapWindowPoints(HWND_DESKTOP, g_ddraw->hwnd, (LPPOINT)rc, 2); } return result; @@ -450,15 +455,15 @@ LRESULT WINAPI fake_SendMessageA(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lPar LONG WINAPI fake_SetWindowLongA(HWND hWnd, int nIndex, LONG dwNewLong) { - if (g_ddraw.ref && g_ddraw.hwnd && g_ddraw.hwnd == hWnd) + if (g_ddraw && g_ddraw->hwnd == hWnd) { if (nIndex == GWL_STYLE) return 0; if (nIndex == GWL_WNDPROC) { - WNDPROC old = g_ddraw.wndproc; - g_ddraw.wndproc = (WNDPROC)dwNewLong; + WNDPROC old = g_ddraw->wndproc; + g_ddraw->wndproc = (WNDPROC)dwNewLong; return (LONG)old; } @@ -467,24 +472,13 @@ LONG WINAPI fake_SetWindowLongA(HWND hWnd, int nIndex, LONG dwNewLong) return real_SetWindowLongA(hWnd, nIndex, dwNewLong); } -LONG WINAPI fake_SetWindowLongW(HWND hWnd, int nIndex, LONG dwNewLong) -{ - if (g_ddraw.ref && g_ddraw.hwnd && g_ddraw.hwnd == hWnd) - { - if (nIndex == GWL_STYLE) - return 0; - } - - return real_SetWindowLongW(hWnd, nIndex, dwNewLong); -} - LONG WINAPI fake_GetWindowLongA(HWND hWnd, int nIndex) { - if (g_ddraw.ref && g_ddraw.hwnd == hWnd) + if (g_ddraw && g_ddraw->hwnd == hWnd) { if (nIndex == GWL_WNDPROC) { - return (LONG)g_ddraw.wndproc; + return (LONG)g_ddraw->wndproc; } } @@ -493,7 +487,7 @@ LONG WINAPI fake_GetWindowLongA(HWND hWnd, int nIndex) BOOL WINAPI fake_EnableWindow(HWND hWnd, BOOL bEnable) { - if (g_ddraw.ref && g_ddraw.hwnd == hWnd) + if (g_ddraw && g_ddraw->hwnd == hWnd) { return FALSE; } @@ -503,31 +497,31 @@ BOOL WINAPI fake_EnableWindow(HWND hWnd, BOOL bEnable) int WINAPI fake_MapWindowPoints(HWND hWndFrom, HWND hWndTo, LPPOINT lpPoints, UINT cPoints) { - if (g_ddraw.ref && g_ddraw.hwnd) + if (g_ddraw && g_ddraw->hwnd) { if (hWndTo == HWND_DESKTOP) { - if (hWndFrom == g_ddraw.hwnd) + if (hWndFrom == g_ddraw->hwnd) { return 0; } else { - real_MapWindowPoints(hWndFrom, hWndTo, lpPoints, cPoints); - return real_MapWindowPoints(HWND_DESKTOP, g_ddraw.hwnd, lpPoints, cPoints); + //real_MapWindowPoints(hWndFrom, hWndTo, lpPoints, cPoints); + //return real_MapWindowPoints(HWND_DESKTOP, g_ddraw->hwnd, lpPoints, cPoints); } } if (hWndFrom == HWND_DESKTOP) { - if (hWndTo == g_ddraw.hwnd) + if (hWndTo == g_ddraw->hwnd) { return 0; } else { - real_MapWindowPoints(g_ddraw.hwnd, HWND_DESKTOP, lpPoints, cPoints); - return real_MapWindowPoints(hWndFrom, hWndTo, lpPoints, cPoints); + //real_MapWindowPoints(g_ddraw->hwnd, HWND_DESKTOP, lpPoints, cPoints); + //return real_MapWindowPoints(hWndFrom, hWndTo, lpPoints, cPoints); } } } @@ -537,28 +531,15 @@ int WINAPI fake_MapWindowPoints(HWND hWndFrom, HWND hWndTo, LPPOINT lpPoints, UI BOOL WINAPI fake_ShowWindow(HWND hWnd, int nCmdShow) { - /* Don't hide the taskbar (Some of The Learning Company games) */ - if (nCmdShow == SW_HIDE && hWnd && hWnd != g_ddraw.hwnd && hWnd == FindWindowA("Shell_TrayWnd", NULL)) + if (g_ddraw && g_ddraw->hwnd == hWnd) { - return TRUE; - } - - if (g_ddraw.ref && g_ddraw.hwnd == hWnd) - { - /* Make sure we got close/move menu items (Almost all of the The Learning Company games) */ - HMENU menu = GetSystemMenu(hWnd, FALSE); - if (!menu || GetMenuState(menu, SC_CLOSE, MF_BYCOMMAND) == -1 || GetMenuState(menu, SC_MOVE, MF_BYCOMMAND) == -1) - { - GetSystemMenu(hWnd, TRUE); - } - if (nCmdShow == SW_SHOWMAXIMIZED) nCmdShow = SW_SHOWNORMAL; if (nCmdShow == SW_MAXIMIZE) nCmdShow = SW_NORMAL; - if (nCmdShow == SW_MINIMIZE && g_config.hook != 2 && !g_config.tlc_hack) + if (nCmdShow == SW_MINIMIZE && g_config.hook != 2) return TRUE; } @@ -567,9 +548,9 @@ BOOL WINAPI fake_ShowWindow(HWND hWnd, int nCmdShow) HWND WINAPI fake_GetTopWindow(HWND hWnd) { - if (g_ddraw.ref && g_config.windowed && g_ddraw.hwnd && !hWnd) + if (g_ddraw && g_config.windowed && g_ddraw->hwnd && !hWnd) { - return g_ddraw.hwnd; + return g_ddraw->hwnd; } return real_GetTopWindow(hWnd); @@ -577,9 +558,9 @@ HWND WINAPI fake_GetTopWindow(HWND hWnd) HWND WINAPI fake_GetForegroundWindow() { - if (g_ddraw.ref && g_config.windowed && g_ddraw.hwnd) + if (g_ddraw && g_config.windowed && g_ddraw->hwnd) { - return g_ddraw.hwnd; + return g_ddraw->hwnd; } return real_GetForegroundWindow(); @@ -587,7 +568,7 @@ HWND WINAPI fake_GetForegroundWindow() BOOL WINAPI fake_SetForegroundWindow(HWND hWnd) { - if (g_ddraw.ref && g_ddraw.bnet_active) + if (g_ddraw && g_ddraw->bnet_active) { return TRUE; } @@ -597,101 +578,56 @@ BOOL WINAPI fake_SetForegroundWindow(HWND hWnd) HHOOK WINAPI fake_SetWindowsHookExA(int idHook, HOOKPROC lpfn, HINSTANCE hmod, DWORD dwThreadId) { - TRACE( - "SetWindowsHookExA(idHook=%d, lpfn=%p, hmod=%p, dwThreadId=%d) [%p]\n", - idHook, - lpfn, - hmod, - dwThreadId, - _ReturnAddress()); - - dbg_dump_hook_type(idHook); + TRACE("SetWindowsHookExA(idHook=%d, lpfn=%p, hmod=%p, dwThreadId=%d)\n", idHook, lpfn, hmod, dwThreadId); if (idHook == WH_KEYBOARD_LL && hmod && GetModuleHandle("AcGenral") == hmod) { return NULL; } - if (idHook == WH_MOUSE && lpfn && !hmod && !g_mouse_hook && g_config.sirtech_hack) + if (idHook == WH_MOUSE && lpfn && !hmod && !g_mouse_hook && g_config.fixmousehook) { g_mouse_proc = lpfn; return g_mouse_hook = real_SetWindowsHookExA(idHook, mouse_hook_proc, hmod, dwThreadId); } - HHOOK result = real_SetWindowsHookExA(idHook, lpfn, hmod, dwThreadId); - - if (idHook == WH_KEYBOARD) - { - keyboard_hook_init(); - } - - return result; + return real_SetWindowsHookExA(idHook, lpfn, hmod, dwThreadId); } -void HandleMessage(LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax, UINT wRemoveMsg) +BOOL HandleMessage(LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax) { - if (lpMsg && g_ddraw.ref && g_ddraw.hwnd && g_ddraw.width) + if (g_ddraw && g_ddraw->width) { - if (!g_config.windowed || real_ScreenToClient(g_ddraw.hwnd, &lpMsg->pt)) - { - int x = max(lpMsg->pt.x - g_ddraw.mouse.x_adjust, 0); - int y = max(lpMsg->pt.y - g_ddraw.mouse.y_adjust, 0); - - if (g_config.adjmouse) - { - x = (DWORD)(roundf(x * g_ddraw.mouse.unscale_x)); - y = (DWORD)(roundf(y * g_ddraw.mouse.unscale_y)); - } - - lpMsg->pt.x = min(x, g_ddraw.width - 1); - lpMsg->pt.y = min(y, g_ddraw.height - 1); - } - else - { - lpMsg->pt.x = InterlockedExchangeAdd((LONG*)&g_ddraw.cursor.x, 0); - lpMsg->pt.y = InterlockedExchangeAdd((LONG*)&g_ddraw.cursor.y, 0); - } - - if (lpMsg->hwnd != g_ddraw.hwnd || !g_config.hook_peekmessage) - return; - - switch (LOWORD(lpMsg->message)) + switch (lpMsg->message) { case WM_LBUTTONUP: case WM_RBUTTONUP: case WM_MBUTTONUP: { - if (!g_config.devmode && !g_mouse_locked && (wRemoveMsg & PM_REMOVE)) + if (!g_config.devmode && !g_mouse_locked) { int x = GET_X_LPARAM(lpMsg->lParam); int y = GET_Y_LPARAM(lpMsg->lParam); - if (x > g_ddraw.render.viewport.x + g_ddraw.render.viewport.width || - x < g_ddraw.render.viewport.x || - y > g_ddraw.render.viewport.y + g_ddraw.render.viewport.height || - y < g_ddraw.render.viewport.y) + if (x > g_ddraw->render.viewport.x + g_ddraw->render.viewport.width || + x < g_ddraw->render.viewport.x || + y > g_ddraw->render.viewport.y + g_ddraw->render.viewport.height || + y < g_ddraw->render.viewport.y) { - x = g_ddraw.width / 2; - y = g_ddraw.height / 2; + x = g_ddraw->width / 2; + y = g_ddraw->height / 2; } else { - x = (DWORD)((x - g_ddraw.render.viewport.x) * g_ddraw.mouse.unscale_x); - y = (DWORD)((y - g_ddraw.render.viewport.y) * g_ddraw.mouse.unscale_y); + x = (DWORD)((x - g_ddraw->render.viewport.x) * g_ddraw->mouse.unscale_x); + y = (DWORD)((y - g_ddraw->render.viewport.y) * g_ddraw->mouse.unscale_y); } - InterlockedExchange((LONG*)&g_ddraw.cursor.x, x); - InterlockedExchange((LONG*)&g_ddraw.cursor.y, y); + InterlockedExchange((LONG*)&g_ddraw->cursor.x, x); + InterlockedExchange((LONG*)&g_ddraw->cursor.y, y); mouse_lock(); - - if (!wMsgFilterMin && - !wMsgFilterMax && - !(wRemoveMsg & (PM_QS_INPUT | PM_QS_PAINT | PM_QS_POSTMESSAGE | PM_QS_SENDMESSAGE))) - { - lpMsg->message = WM_NULL; - break; - } + //return FALSE; } /* fall through for lParam */ } @@ -711,24 +647,19 @@ void HandleMessage(LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMa { if (!g_config.devmode && !g_mouse_locked) { - if (!wMsgFilterMin && - !wMsgFilterMax && - !(wRemoveMsg & (PM_QS_INPUT | PM_QS_PAINT | PM_QS_POSTMESSAGE | PM_QS_SENDMESSAGE))) - { - lpMsg->message = WM_NULL; - break; - } + // Does not work with 'New Robinson' + //return FALSE; } - if (LOWORD(lpMsg->message) == WM_MOUSEWHEEL) + if (lpMsg->message == WM_MOUSEWHEEL) { POINT pt = { GET_X_LPARAM(lpMsg->lParam), GET_Y_LPARAM(lpMsg->lParam) }; - real_ScreenToClient(g_ddraw.hwnd, &pt); + real_ScreenToClient(g_ddraw->hwnd, &pt); lpMsg->lParam = MAKELPARAM(pt.x, pt.y); } - int x = max(GET_X_LPARAM(lpMsg->lParam) - g_ddraw.mouse.x_adjust, 0); - int y = max(GET_Y_LPARAM(lpMsg->lParam) - g_ddraw.mouse.y_adjust, 0); + int x = max(GET_X_LPARAM(lpMsg->lParam) - g_ddraw->mouse.x_adjust, 0); + int y = max(GET_Y_LPARAM(lpMsg->lParam) - g_ddraw->mouse.y_adjust, 0); if (g_config.adjmouse) { @@ -742,304 +673,65 @@ void HandleMessage(LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMa } else { - x = (DWORD)(roundf(x * g_ddraw.mouse.unscale_x)); - y = (DWORD)(roundf(y * g_ddraw.mouse.unscale_y)); + x = (DWORD)(roundf(x * g_ddraw->mouse.unscale_x)); + y = (DWORD)(roundf(y * g_ddraw->mouse.unscale_y)); } } - x = min(x, g_ddraw.width - 1); - y = min(y, g_ddraw.height - 1); + x = min(x, g_ddraw->width - 1); + y = min(y, g_ddraw->height - 1); - InterlockedExchange((LONG*)&g_ddraw.cursor.x, x); - InterlockedExchange((LONG*)&g_ddraw.cursor.y, y); + InterlockedExchange((LONG*)&g_ddraw->cursor.x, x); + InterlockedExchange((LONG*)&g_ddraw->cursor.y, y); lpMsg->lParam = MAKELPARAM(x, y); - - lpMsg->pt.x = x; - lpMsg->pt.y = y; + fake_GetCursorPos(&lpMsg->pt); break; } + } } + + return TRUE; } BOOL WINAPI fake_GetMessageA(LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax) { - if (g_ddraw.ref && (!hWnd || hWnd == g_ddraw.hwnd)) - g_ddraw.last_msg_pull_tick = timeGetTime(); - BOOL result = real_GetMessageA(lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax); - if (result) - { - HandleMessage(lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax, PM_REMOVE); - } + + if (result && g_config.hook_getmessage) + HandleMessage(lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax); return result; } BOOL WINAPI fake_PeekMessageA(LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax, UINT wRemoveMsg) { - if (g_config.darkcolony_hack && !hWnd) - { - hWnd = g_ddraw.hwnd; - - MSG msg; - real_PeekMessageA(&msg, 0, 0, 0, PM_NOREMOVE); - } - - if (g_config.limiter_type == LIMIT_PEEKMESSAGE && - g_ddraw.ticks_limiter.tick_length > 0 && - InterlockedExchange(&g_ddraw.render.screen_updated, FALSE)) - { - util_limit_game_ticks(); - } - - if (g_ddraw.ref && (!hWnd || hWnd == g_ddraw.hwnd)) - g_ddraw.last_msg_pull_tick = timeGetTime(); - BOOL result = real_PeekMessageA(lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg); - if (result) - { - HandleMessage(lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg); - } + + if (result && g_config.hook_peekmessage) + HandleMessage(lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax); return result; } -BOOL WINAPI fake_GetWindowPlacement(HWND hWnd, WINDOWPLACEMENT* lpwndpl) -{ - BOOL result = real_GetWindowPlacement(hWnd, lpwndpl); - - if (result && - lpwndpl && - g_ddraw.ref && - g_ddraw.hwnd && - g_ddraw.width && - (g_config.hook != 2 || g_ddraw.renderer == gdi_render_main)) - { - if (hWnd == g_ddraw.hwnd || hWnd == GetDesktopWindow()) - { - lpwndpl->rcNormalPosition.bottom = g_ddraw.height; - lpwndpl->rcNormalPosition.left = 0; - lpwndpl->rcNormalPosition.right = g_ddraw.width; - lpwndpl->rcNormalPosition.top = 0; - } - else if (!IsChild(g_ddraw.hwnd, hWnd) && !(real_GetWindowLongA(hWnd, GWL_STYLE) & WS_CHILD)) - { - real_MapWindowPoints(HWND_DESKTOP, g_ddraw.hwnd, (LPPOINT)&lpwndpl->rcNormalPosition, 2); - } - } - - return result; -} - -BOOL WINAPI fake_SetWindowPlacement(HWND hWnd, const WINDOWPLACEMENT* lpwndpl) -{ - if (lpwndpl && g_ddraw.ref && g_ddraw.hwnd && hWnd == g_ddraw.hwnd) - { - if (lpwndpl->showCmd == SW_SHOWMAXIMIZED || lpwndpl->showCmd == SW_MAXIMIZE) - return TRUE; - } - - return real_SetWindowPlacement(hWnd, lpwndpl); -} - -BOOL WINAPI fake_EnumDisplaySettingsA(LPCSTR lpszDeviceName, DWORD iModeNum, DEVMODEA* lpDevMode) -{ - BOOL result = real_EnumDisplaySettingsA(lpszDeviceName, iModeNum, lpDevMode); - - if (result && !lpszDeviceName && lpDevMode && iModeNum == ENUM_CURRENT_SETTINGS) - { - if (g_ddraw.ref && g_ddraw.width) - { - lpDevMode->dmPelsWidth = g_ddraw.width; - lpDevMode->dmPelsHeight = g_ddraw.height; - lpDevMode->dmBitsPerPel = g_ddraw.bpp; - } - else if (g_config.fake_mode[0]) - { - char* e = &g_config.fake_mode[0]; - - lpDevMode->dmPelsWidth = strtoul(e, &e, 0); - lpDevMode->dmPelsHeight = strtoul(e + 1, &e, 0); - lpDevMode->dmBitsPerPel = strtoul(e + 1, &e, 0); - } - else - { - lpDevMode->dmPelsWidth = 1024; - lpDevMode->dmPelsHeight = 768; - lpDevMode->dmBitsPerPel = 16; - } - - lpDevMode->dmDisplayFrequency = 60; - } - - if (result && !lpszDeviceName && lpDevMode && iModeNum != ENUM_CURRENT_SETTINGS) - { - //lpDevMode->dmBitsPerPel = 16; - } - - return result; -} - -LRESULT WINAPI fake_DefWindowProcA(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) -{ - if (g_ddraw.ref && g_ddraw.hwnd && g_ddraw.hwnd == hWnd) - { - if (Msg == WM_NCHITTEST) - return HTCLIENT; - } - - return real_DefWindowProcA(hWnd, Msg, wParam, lParam); -} - -HWND WINAPI fake_SetParent(HWND hWndChild, HWND hWndNewParent) -{ - if (g_ddraw.ref && g_ddraw.hwnd && g_ddraw.hwnd == hWndNewParent) - { - char class_name[MAX_PATH] = { 0 }; - GetClassNameA(hWndChild, class_name, sizeof(class_name) - 1); - - if (strcmp(class_name, "VideoRenderer") == 0) - { - RECT rc_org; - fake_GetWindowRect(hWndChild, &rc_org); - - HWND result = real_SetParent(hWndChild, hWndNewParent); - - real_MoveWindow( - hWndChild, - rc_org.left, - rc_org.top, - (rc_org.right - rc_org.left), - (rc_org.bottom - rc_org.top), - FALSE); - - return result; - } - } - - return real_SetParent(hWndChild, hWndNewParent); -} - -HDC WINAPI fake_BeginPaint(HWND hWnd, LPPAINTSTRUCT lpPaint) -{ - if (g_ddraw.ref && g_ddraw.width && g_ddraw.hwnd && g_ddraw.hwnd == hWnd && lpPaint) - { - HDC result = real_BeginPaint(hWnd, lpPaint); - - if (result) - { - lpPaint->rcPaint.left = 0; - lpPaint->rcPaint.top = 0; - lpPaint->rcPaint.right = g_ddraw.width; - lpPaint->rcPaint.bottom = g_ddraw.height; - } - - return result; - } - - return real_BeginPaint(hWnd, lpPaint); -} - -SHORT WINAPI fake_GetKeyState(int nVirtKey) -{ - if (g_config.windowed && g_ddraw.ref && g_ddraw.hwnd && !util_in_foreground()) - { - return 0; - } - - return real_GetKeyState(nVirtKey); -} - -SHORT WINAPI fake_GetAsyncKeyState(int vKey) -{ - if (g_config.windowed && g_ddraw.ref && g_ddraw.hwnd && !util_in_foreground()) - { - return 0; - } - - return real_GetAsyncKeyState(vKey); -} - int WINAPI fake_GetDeviceCaps(HDC hdc, int index) { - DWORD bpp = 0; - DWORD width = 0; - DWORD height = 0; - - if (g_ddraw.ref && g_ddraw.bpp) + if (g_ddraw && + g_ddraw->bpp && + index == BITSPIXEL && + (g_config.hook != 2 || g_ddraw->renderer == gdi_render_main)) { - bpp = g_ddraw.bpp; - width = g_ddraw.width; - height = g_ddraw.height; + return g_ddraw->bpp; } - else if (g_config.fake_mode[0]) + + if (g_ddraw && + g_ddraw->bpp == 8 && + index == RASTERCAPS && + (g_config.hook != 2 || g_ddraw->renderer == gdi_render_main)) { - char* e = &g_config.fake_mode[0]; - - width = strtoul(e, &e, 0); - height = strtoul(e + 1, &e, 0); - bpp = strtoul(e + 1, &e, 0); - } - - if (bpp && index == BITSPIXEL) - { - return bpp; - } - - if (bpp == 8) - { - if (index == RASTERCAPS) - { - return RC_PALETTE | real_GetDeviceCaps(hdc, index); - } - - if (index == SIZEPALETTE) - { - return 256; - } - - if (index == NUMCOLORS) - { - if (WindowFromDC(hdc) == GetDesktopWindow()) - { - return 20; - } - else - { - return 256; - } - } - } - - if (width && ((g_ddraw.hwnd && WindowFromDC(hdc) == g_ddraw.hwnd) || WindowFromDC(hdc) == GetDesktopWindow())) - { - if (index == HORZRES) - { - return width; - } - - if (index == VERTRES) - { - return height; - } - } - - return real_GetDeviceCaps(hdc, index); -} - -int WINAPI fake_GetDeviceCaps_system(HDC hdc, int index) -{ - if (g_ddraw.ref && - g_ddraw.bpp == 8 && - ((g_ddraw.hwnd && WindowFromDC(hdc) == g_ddraw.hwnd) || WindowFromDC(hdc) == GetDesktopWindow())) - { - if (index == RASTERCAPS) - { - return RC_PALETTE | real_GetDeviceCaps(hdc, index); - } + return RC_PALETTE | real_GetDeviceCaps(hdc, index); } return real_GetDeviceCaps(hdc, index); @@ -1060,99 +752,44 @@ BOOL WINAPI fake_StretchBlt( { HWND hwnd = WindowFromDC(hdcDest); - if (g_ddraw.ref && g_ddraw.hwnd && hwnd == g_ddraw.hwnd && !g_ddraw.primary) - { - InterlockedExchange(&g_ddraw.render.screen_updated, TRUE); - } - char class_name[MAX_PATH] = { 0 }; - if (g_ddraw.ref && g_ddraw.hwnd && hwnd && hwnd != g_ddraw.hwnd) + if (g_ddraw && g_ddraw->hwnd && hwnd && hwnd != g_ddraw->hwnd) { GetClassNameA(hwnd, class_name, sizeof(class_name) - 1); } - if (g_ddraw.ref && g_ddraw.hwnd && - (hwnd == g_ddraw.hwnd || - (g_config.fixchilds && IsChild(g_ddraw.hwnd, hwnd) && + if (g_ddraw && g_ddraw->hwnd && + (hwnd == g_ddraw->hwnd || + (g_config.fixchilds && IsChild(g_ddraw->hwnd, hwnd) && (g_config.fixchilds == FIX_CHILDS_DETECT_HIDE || - strcmp(class_name, "VideoRenderer") == 0 || - strcmp(class_name, "AVI Window") == 0 || strcmp(class_name, "MCIAVI") == 0 || strcmp(class_name, "AVIWnd32") == 0 || strcmp(class_name, "MCIWndClass") == 0)))) { - if (g_ddraw.primary && (g_ddraw.primary->bpp == 16 || g_ddraw.primary->bpp == 32 || g_ddraw.primary->palette)) + if (g_ddraw->primary && (g_ddraw->primary->bpp == 16 || g_ddraw->primary->bpp == 32 || g_ddraw->primary->palette)) { HDC primary_dc; - dds_GetDC(g_ddraw.primary, &primary_dc); + dds_GetDC(g_ddraw->primary, &primary_dc); if (primary_dc) { - POINT pt = { 0 }; - real_MapWindowPoints(hwnd, g_ddraw.hwnd, &pt, 1); - - int org_mode = SetStretchBltMode(hdcDest, COLORONCOLOR); - SetStretchBltMode(hdcDest, org_mode); - - int mode = SetStretchBltMode(primary_dc, org_mode); - BOOL result = - real_StretchBlt( - primary_dc, - xDest + pt.x, - yDest + pt.y, - wDest, - hDest, - hdcSrc, - xSrc, - ySrc, - wSrc, - hSrc, - rop); + real_StretchBlt(primary_dc, xDest, yDest, wDest, hDest, hdcSrc, xSrc, ySrc, wSrc, hSrc, rop); - SetStretchBltMode(primary_dc, mode); - - dds_ReleaseDC(g_ddraw.primary, primary_dc); + dds_ReleaseDC(g_ddraw->primary, primary_dc); return result; } } - else if ( - g_ddraw.width > 0 && - g_ddraw.render.hdc && - (hwnd == g_ddraw.hwnd || - (real_GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TRANSPARENT) || - strcmp(class_name, "AVIWnd32") == 0)) + else if (g_ddraw->width > 0 && g_ddraw->render.hdc) { - POINT pt = { 0 }; - real_MapWindowPoints(hwnd, g_ddraw.hwnd, &pt, 1); - - if (hwnd != g_ddraw.hwnd && strcmp(class_name, "AVIWnd32") == 0) - { - LONG exstyle = real_GetWindowLongA(hwnd, GWL_EXSTYLE); - if (!(exstyle & WS_EX_TRANSPARENT)) - { - real_SetWindowLongA(hwnd, GWL_EXSTYLE, exstyle | WS_EX_TRANSPARENT); - - real_SetWindowPos( - hwnd, - 0, - 0, - 0, - 0, - 0, - SWP_ASYNCWINDOWPOS | SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER - ); - } - } - return real_StretchBlt( - hwnd == g_ddraw.hwnd ? hdcDest : g_ddraw.render.hdc, - (int)(roundf((xDest + pt.x) * g_ddraw.render.scale_w)) + g_ddraw.render.viewport.x, - (int)(roundf((yDest + pt.y) * g_ddraw.render.scale_h)) + g_ddraw.render.viewport.y, - (int)(roundf(wDest * g_ddraw.render.scale_w)), - (int)(roundf(hDest * g_ddraw.render.scale_h)), + g_ddraw->render.hdc, + xDest + g_ddraw->render.viewport.x, + yDest + g_ddraw->render.viewport.y, + (int)(wDest * g_ddraw->render.scale_w), + (int)(hDest * g_ddraw->render.scale_h), hdcSrc, xSrc, ySrc, @@ -1165,123 +802,6 @@ BOOL WINAPI fake_StretchBlt( return real_StretchBlt(hdcDest, xDest, yDest, wDest, hDest, hdcSrc, xSrc, ySrc, wSrc, hSrc, rop); } -BOOL WINAPI fake_WinGStretchBlt( - HDC hdcDest, - int xDest, - int yDest, - int wDest, - int hDest, - HDC hdcSrc, - int xSrc, - int ySrc, - int wSrc, - int hSrc) -{ - int mode = SetStretchBltMode(hdcDest, COLORONCOLOR); - BOOL result = fake_StretchBlt(hdcDest, xDest, yDest, wDest, hDest, hdcSrc, xSrc, ySrc, wSrc, hSrc, SRCCOPY); - SetStretchBltMode(hdcDest, mode); - - return result; -} - -BOOL WINAPI fake_BitBlt( - HDC hdc, - int x, - int y, - int cx, - int cy, - HDC hdcSrc, - int x1, - int y1, - DWORD rop) -{ - HWND hwnd = WindowFromDC(hdc); - - if (g_ddraw.ref && g_ddraw.hwnd && hwnd == g_ddraw.hwnd && !g_ddraw.primary) - { - InterlockedExchange(&g_ddraw.render.screen_updated, TRUE); - } - - char class_name[MAX_PATH] = { 0 }; - - if (g_ddraw.ref && g_ddraw.hwnd && hwnd && hwnd != g_ddraw.hwnd) - { - GetClassNameA(hwnd, class_name, sizeof(class_name) - 1); - } - - if (g_ddraw.ref && g_ddraw.hwnd && - (hwnd == g_ddraw.hwnd || - (g_config.fixchilds && IsChild(g_ddraw.hwnd, hwnd) && - (g_config.fixchilds == FIX_CHILDS_DETECT_HIDE || - strcmp(class_name, "VideoRenderer") == 0 || - strcmp(class_name, "AVI Window") == 0 || - strcmp(class_name, "MCIAVI") == 0 || - strcmp(class_name, "AVIWnd32") == 0 || - strcmp(class_name, "MCIWndClass") == 0)))) - { - if (g_ddraw.primary && (g_ddraw.primary->bpp == 16 || g_ddraw.primary->bpp == 32 || g_ddraw.primary->palette)) - { - HDC primary_dc; - dds_GetDC(g_ddraw.primary, &primary_dc); - - if (primary_dc) - { - POINT pt = { 0 }; - real_MapWindowPoints(hwnd, g_ddraw.hwnd, &pt, 1); - - int result = - real_BitBlt( - primary_dc, - x + pt.x, - y + pt.y, - cx, - cy, - hdcSrc, - x1, - y1, - rop); - - dds_ReleaseDC(g_ddraw.primary, primary_dc); - - return result; - } - } - else if ( - g_ddraw.width > 0 && - g_ddraw.render.hdc && - (hwnd == g_ddraw.hwnd || (real_GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TRANSPARENT))) - { - return real_StretchBlt( - hwnd == g_ddraw.hwnd ? hdc : g_ddraw.render.hdc, - (int)(roundf(x * g_ddraw.render.scale_w)) + g_ddraw.render.viewport.x, - (int)(roundf(y * g_ddraw.render.scale_h)) + g_ddraw.render.viewport.y, - (int)(roundf(cx * g_ddraw.render.scale_w)), - (int)(roundf(cy * g_ddraw.render.scale_h)), - hdcSrc, - x1, - y1, - cx, - cy, - rop); - } - } - - return real_BitBlt(hdc, x, y, cx, cy, hdcSrc, x1, y1, rop); -} - -BOOL WINAPI fake_WinGBitBlt( - HDC hdc, - int x, - int y, - int cx, - int cy, - HDC hdcSrc, - int x1, - int y1) -{ - return fake_BitBlt(hdc, x, y, cx, cy, hdcSrc, x1, y1, SRCCOPY); -} - int WINAPI fake_SetDIBitsToDevice( HDC hdc, int xDest, @@ -1296,81 +816,35 @@ int WINAPI fake_SetDIBitsToDevice( const BITMAPINFO* lpbmi, UINT ColorUse) { - HWND hwnd = WindowFromDC(hdc); - - if (g_ddraw.ref && g_ddraw.hwnd && hwnd == g_ddraw.hwnd && !g_ddraw.primary) + if (g_ddraw && g_ddraw->hwnd && WindowFromDC(hdc) == g_ddraw->hwnd) { - InterlockedExchange(&g_ddraw.render.screen_updated, TRUE); - } - - char class_name[MAX_PATH] = { 0 }; - - if (g_ddraw.ref && g_ddraw.hwnd && hwnd && hwnd != g_ddraw.hwnd) - { - GetClassNameA(hwnd, class_name, sizeof(class_name) - 1); - } - - if (g_ddraw.ref && g_ddraw.hwnd && - (hwnd == g_ddraw.hwnd || - (g_config.fixchilds && IsChild(g_ddraw.hwnd, hwnd) && - (g_config.fixchilds == FIX_CHILDS_DETECT_HIDE || - strcmp(class_name, "VideoRenderer") == 0 || - strcmp(class_name, "AVI Window") == 0 || - strcmp(class_name, "MCIAVI") == 0 || - strcmp(class_name, "AVIWnd32") == 0 || - strcmp(class_name, "MCIWndClass") == 0)))) - { - if (g_ddraw.primary && (g_ddraw.primary->bpp == 16 || g_ddraw.primary->bpp == 32 || g_ddraw.primary->palette)) + if (g_ddraw->primary && (g_ddraw->primary->bpp == 16 || g_ddraw->primary->bpp == 32 || g_ddraw->primary->palette)) { HDC primary_dc; - dds_GetDC(g_ddraw.primary, &primary_dc); + dds_GetDC(g_ddraw->primary, &primary_dc); if (primary_dc) { - POINT pt = { 0 }; - real_MapWindowPoints(hwnd, g_ddraw.hwnd, &pt, 1); - int result = real_SetDIBitsToDevice( - primary_dc, - xDest + pt.x, - yDest + pt.y, - w, - h, - xSrc, - ySrc, - StartScan, - cLines, - lpvBits, - lpbmi, + primary_dc, + xDest, + yDest, + w, + h, + xSrc, + ySrc, + StartScan, + cLines, + lpvBits, + lpbmi, ColorUse); - dds_ReleaseDC(g_ddraw.primary, primary_dc); + dds_ReleaseDC(g_ddraw->primary, primary_dc); return result; } } - else if ( - g_ddraw.width > 0 && - g_ddraw.render.hdc && - (hwnd == g_ddraw.hwnd || (real_GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TRANSPARENT))) - { - return - real_StretchDIBits( - hwnd == g_ddraw.hwnd ? hdc : g_ddraw.render.hdc, - (int)(roundf(xDest * g_ddraw.render.scale_w)) + g_ddraw.render.viewport.x, - (int)(roundf(yDest * g_ddraw.render.scale_h)) + g_ddraw.render.viewport.y, - (int)(roundf(w * g_ddraw.render.scale_w)), - (int)(roundf(h * g_ddraw.render.scale_h)), - xSrc, - ySrc, - w, - h, - lpvBits, - lpbmi, - ColorUse, - SRCCOPY); - } } return real_SetDIBitsToDevice(hdc, xDest, yDest, w, h, xSrc, ySrc, StartScan, cLines, lpvBits, lpbmi, ColorUse); @@ -1393,43 +867,33 @@ int WINAPI fake_StretchDIBits( { HWND hwnd = WindowFromDC(hdc); - if (g_ddraw.ref && g_ddraw.hwnd && hwnd == g_ddraw.hwnd && !g_ddraw.primary) - { - InterlockedExchange(&g_ddraw.render.screen_updated, TRUE); - } - char class_name[MAX_PATH] = { 0 }; - if (g_ddraw.ref && g_ddraw.hwnd && hwnd && hwnd != g_ddraw.hwnd) + if (g_ddraw && g_ddraw->hwnd && hwnd && hwnd != g_ddraw->hwnd) { GetClassNameA(hwnd, class_name, sizeof(class_name) - 1); } - if (g_ddraw.ref && g_ddraw.hwnd && - (hwnd == g_ddraw.hwnd || - (g_config.fixchilds && IsChild(g_ddraw.hwnd, hwnd) && + if (g_ddraw && g_ddraw->hwnd && + (hwnd == g_ddraw->hwnd || + (g_config.fixchilds && IsChild(g_ddraw->hwnd, hwnd) && (g_config.fixchilds == FIX_CHILDS_DETECT_HIDE || - strcmp(class_name, "VideoRenderer") == 0 || - strcmp(class_name, "AVI Window") == 0 || strcmp(class_name, "MCIAVI") == 0 || strcmp(class_name, "AVIWnd32") == 0 || strcmp(class_name, "MCIWndClass") == 0)))) { - if (g_ddraw.primary && (g_ddraw.primary->bpp == 16 || g_ddraw.primary->bpp == 32 || g_ddraw.primary->palette)) + if (g_ddraw->primary && (g_ddraw->primary->bpp == 16 || g_ddraw->primary->bpp == 32 || g_ddraw->primary->palette)) { HDC primary_dc; - dds_GetDC(g_ddraw.primary, &primary_dc); + dds_GetDC(g_ddraw->primary, &primary_dc); if (primary_dc) { - POINT pt = {0}; - real_MapWindowPoints(hwnd, g_ddraw.hwnd, &pt, 1); - int result = real_StretchDIBits( primary_dc, - xDest + pt.x, - yDest + pt.y, + xDest, + yDest, DestWidth, DestHeight, xSrc, @@ -1441,23 +905,20 @@ int WINAPI fake_StretchDIBits( iUsage, rop); - dds_ReleaseDC(g_ddraw.primary, primary_dc); + dds_ReleaseDC(g_ddraw->primary, primary_dc); return result; } } - else if ( - g_ddraw.width > 0 && - g_ddraw.render.hdc && - (hwnd == g_ddraw.hwnd || (real_GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TRANSPARENT))) + else if (g_ddraw->width > 0 && g_ddraw->render.hdc) { return real_StretchDIBits( - hwnd == g_ddraw.hwnd ? hdc : g_ddraw.render.hdc, - (int)(roundf(xDest * g_ddraw.render.scale_w)) + g_ddraw.render.viewport.x, - (int)(roundf(yDest * g_ddraw.render.scale_h)) + g_ddraw.render.viewport.y, - (int)(roundf(DestWidth * g_ddraw.render.scale_w)), - (int)(roundf(DestHeight * g_ddraw.render.scale_h)), + g_ddraw->render.hdc, + xDest + g_ddraw->render.viewport.x, + yDest + g_ddraw->render.viewport.y, + (int)(DestWidth * g_ddraw->render.scale_w), + (int)(DestHeight * g_ddraw->render.scale_h), xSrc, ySrc, SrcWidth, @@ -1548,97 +1009,6 @@ HFONT WINAPI fake_CreateFontA( lpszFace); } -UINT WINAPI fake_GetSystemPaletteEntries(HDC hdc, UINT iStart, UINT cEntries, LPPALETTEENTRY pPalEntries) -{ - TRACE( - "%s(hdc=%p, iStart=%u, cEntries=%u, pPalEntries=%p) [%p]\n", - __FUNCTION__, - hdc, - iStart, - cEntries, - pPalEntries, - _ReturnAddress()); - - if (g_ddraw.ref && g_ddraw.bpp == 8 && pPalEntries && GetObjectType(hdc) == OBJ_DC) - { - TRACE(" Display DC\n"); - - if (g_ddraw.primary && g_ddraw.primary->palette) - { - ddp_GetEntries(g_ddraw.primary->palette, 0, iStart, cEntries, pPalEntries); - } - else - { - for (int i = iStart, x = 0; i < iStart + cEntries && i < 256; i++, x++) - { - pPalEntries[x] = g_ddp_default_palette[i]; - } - } - - return cEntries; - } - - return real_GetSystemPaletteEntries(hdc, iStart, cEntries, pPalEntries); -} - -HPALETTE WINAPI fake_SelectPalette(HDC hdc, HPALETTE hPal, BOOL bForceBkgd) -{ - TRACE_EXT( - "%s(hdc=%p, hPal=%p, bForceBkgd=%d) [%p]\n", - __FUNCTION__, - hdc, - hPal, - bForceBkgd, - _ReturnAddress()); - - if (g_ddraw.ref && - g_ddraw.bpp == 8 && - ((g_ddraw.hwnd && WindowFromDC(hdc) == g_ddraw.hwnd) || WindowFromDC(hdc) == GetDesktopWindow())) - { - TRACE_EXT(" Display DC\n"); - - if (g_ddraw.primary && g_ddraw.primary->palette) - { - g_ddraw.primary->selected_pal_count = GetPaletteEntries(hPal, 0, 256, g_ddraw.primary->selected_pal); - - return real_SelectPalette(g_ddraw.primary->hdc, hPal, bForceBkgd);; - } - } - - return real_SelectPalette(hdc, hPal, bForceBkgd); -} - -UINT WINAPI fake_RealizePalette(HDC hdc) -{ - TRACE_EXT("%s(hdc=%p) [%p]\n", __FUNCTION__, hdc, _ReturnAddress()); - - if (g_ddraw.ref && - g_ddraw.bpp == 8 && - ((g_ddraw.hwnd && WindowFromDC(hdc) == g_ddraw.hwnd) || WindowFromDC(hdc) == GetDesktopWindow())) - { - TRACE_EXT(" Display DC\n"); - - if (g_ddraw.primary && g_ddraw.primary->palette) - { - if (g_ddraw.primary->selected_pal_count != 256) - { - TRACE_EXT(" selected_pal_count = %u\n", g_ddraw.primary->selected_pal_count); - } - - ddp_SetEntries( - g_ddraw.primary->palette, - DDPCAPS_REFRESH_CHANGED_ONLY, - 0, - g_ddraw.primary->selected_pal_count, - g_ddraw.primary->selected_pal); - - return g_ddraw.primary->selected_pal_count; - } - } - - return real_RealizePalette(hdc); -} - HMODULE WINAPI fake_LoadLibraryA(LPCSTR lpLibFileName) { HMODULE hmod_old = GetModuleHandleA(lpLibFileName); @@ -1648,7 +1018,7 @@ HMODULE WINAPI fake_LoadLibraryA(LPCSTR lpLibFileName) char mod_path[MAX_PATH] = { 0 }; if (hmod && hmod != hmod_old && GetModuleFileNameA(hmod, mod_path, MAX_PATH)) { - TRACE("LoadLibraryA Module %s = %p (%s) [%p]\n", mod_path, hmod, lpLibFileName, _ReturnAddress()); + TRACE("LoadLibraryA Module %s = %p (%s)\n", mod_path, hmod, lpLibFileName); } #endif @@ -1661,7 +1031,7 @@ HMODULE WINAPI fake_LoadLibraryA(LPCSTR lpLibFileName) if (hmod && hmod != hmod_old) { - hook_init(); + hook_init(FALSE); } return hmod; @@ -1676,7 +1046,7 @@ HMODULE WINAPI fake_LoadLibraryW(LPCWSTR lpLibFileName) char mod_path[MAX_PATH] = { 0 }; if (hmod && hmod != hmod_old && GetModuleFileNameA(hmod, mod_path, MAX_PATH)) { - TRACE("LoadLibraryW Module %s = %p [%p]\n", mod_path, hmod, _ReturnAddress()); + TRACE("LoadLibraryW Module %s = %p\n", mod_path, hmod); } #endif @@ -1689,7 +1059,7 @@ HMODULE WINAPI fake_LoadLibraryW(LPCWSTR lpLibFileName) if (hmod && hmod != hmod_old) { - hook_init(); + hook_init(FALSE); } return hmod; @@ -1704,7 +1074,7 @@ HMODULE WINAPI fake_LoadLibraryExA(LPCSTR lpLibFileName, HANDLE hFile, DWORD dwF char mod_path[MAX_PATH] = { 0 }; if (hmod && hmod != hmod_old && GetModuleFileNameA(hmod, mod_path, MAX_PATH)) { - TRACE("LoadLibraryExA Module %s = %p (%s) [%p]\n", mod_path, hmod, lpLibFileName, _ReturnAddress()); + TRACE("LoadLibraryExA Module %s = %p (%s)\n", mod_path, hmod, lpLibFileName); } #endif @@ -1717,7 +1087,7 @@ HMODULE WINAPI fake_LoadLibraryExA(LPCSTR lpLibFileName, HANDLE hFile, DWORD dwF if (hmod && hmod != hmod_old) { - hook_init(); + hook_init(FALSE); } return hmod; @@ -1732,7 +1102,7 @@ HMODULE WINAPI fake_LoadLibraryExW(LPCWSTR lpLibFileName, HANDLE hFile, DWORD dw char mod_path[MAX_PATH] = { 0 }; if (hmod && hmod != hmod_old && GetModuleFileNameA(hmod, mod_path, MAX_PATH)) { - TRACE("LoadLibraryExW Module %s = %p [%p]\n", mod_path, hmod, _ReturnAddress()); + TRACE("LoadLibraryExW Module %s = %p\n", mod_path, hmod); } #endif @@ -1745,7 +1115,7 @@ HMODULE WINAPI fake_LoadLibraryExW(LPCWSTR lpLibFileName, HANDLE hFile, DWORD dw if (hmod && hmod != hmod_old) { - hook_init(); + hook_init(FALSE); } return hmod; @@ -1757,7 +1127,7 @@ FARPROC WINAPI fake_GetProcAddress(HMODULE hModule, LPCSTR lpProcName) char mod_path[MAX_PATH] = { 0 }; if (hModule && GetModuleFileNameA(hModule, mod_path, MAX_PATH)) { - TRACE("GetProcAddress %s (%s) [%p]\n", HIWORD(lpProcName) ? lpProcName : NULL, mod_path, _ReturnAddress()); + TRACE("GetProcAddress %s (%s)\n", HIWORD(lpProcName) ? lpProcName : NULL, mod_path); } #endif @@ -1833,166 +1203,53 @@ BOOL WINAPI fake_GetDiskFreeSpaceA( return result; } -DWORD WINAPI fake_GetVersion() -{ - if (_strcmpi(g_config.win_version, "95") == 0) - return 0xC3B60004; - - if (_strcmpi(g_config.win_version, "98") == 0) - return 0xC0000A04; - - if (_strcmpi(g_config.win_version, "nt4") == 0) - return 0x05650004; - - if (_strcmpi(g_config.win_version, "2000") == 0) - return 0x08930005; - - if (_strcmpi(g_config.win_version, "xp") == 0) - return 0x0A280105; - - return real_GetVersion(); -} - -BOOL WINAPI fake_GetVersionExA(LPOSVERSIONINFOA info) -{ - if (g_config.win_version[0] && info && info->dwOSVersionInfoSize == sizeof(OSVERSIONINFOA)) - { - if (_strcmpi(g_config.win_version, "95") == 0) - { - *info = (OSVERSIONINFOA){ sizeof(OSVERSIONINFOA), 4, 0, 950, 1, "" }; - return TRUE; - } - - if (_strcmpi(g_config.win_version, "98") == 0) - { - *info = (OSVERSIONINFOA){ sizeof(OSVERSIONINFOA), 4, 10, 67766446, 1, "" }; - return TRUE; - } - - if (_strcmpi(g_config.win_version, "nt4") == 0) - { - *info = (OSVERSIONINFOA){ sizeof(OSVERSIONINFOA), 4, 0, 1381, 2, "Service Pack 5" }; - return TRUE; - } - - if (_strcmpi(g_config.win_version, "2000") == 0) - { - *info = (OSVERSIONINFOA){ sizeof(OSVERSIONINFOA), 5, 0, 2195, 2, "" }; - return TRUE; - } - - if (_strcmpi(g_config.win_version, "xp") == 0) - { - *info = (OSVERSIONINFOA){ sizeof(OSVERSIONINFOA), 5, 1, 2600, 2, "Service Pack 3" }; - return TRUE; - } - } - - if (g_config.win_version[0] && info && info->dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXA)) - { - LPOSVERSIONINFOEXA ex = (LPOSVERSIONINFOEXA)info; - if (_strcmpi(g_config.win_version, "95") == 0) - { - *ex = (OSVERSIONINFOEXA){ sizeof(OSVERSIONINFOEXA), 4, 0, 950, 1, "", 1, 0, 256, 1, 30 }; - return TRUE; - } - - if (_strcmpi(g_config.win_version, "98") == 0) - { - *ex = (OSVERSIONINFOEXA){ sizeof(OSVERSIONINFOEXA), 4, 10, 67766446, 1, "", 1, 0, 256, 1, 30 }; - return TRUE; - } - - if (_strcmpi(g_config.win_version, "nt4") == 0) - { - *ex = (OSVERSIONINFOEXA){ sizeof(OSVERSIONINFOEXA), 4, 0, 1381, 2, "Service Pack 5", 5, 0, 256, 1, 30 }; - return TRUE; - } - - if (_strcmpi(g_config.win_version, "2000") == 0) - { - *ex = (OSVERSIONINFOEXA){ sizeof(OSVERSIONINFOEXA), 5, 0, 2195, 2, "", 0, 0, 256, 1, 30 }; - return TRUE; - } - - if (_strcmpi(g_config.win_version, "xp") == 0) - { - *ex = (OSVERSIONINFOEXA){ sizeof(OSVERSIONINFOEXA), 5, 1, 2600, 2, "Service Pack 3", 3, 0, 256, 1, 30 }; - return TRUE; - } - } - - return real_GetVersionExA(info); -} - BOOL WINAPI fake_DestroyWindow(HWND hWnd) { - TRACE("DestroyWindow(hwnd=%p) - g_ddraw.hwnd=%p [%p]\n", hWnd, g_ddraw.hwnd, _ReturnAddress()); - - if (g_ddraw.ref && hWnd && hWnd == g_ddraw.hwnd) - { - dd_RestoreDisplayMode(); - - if (g_ddraw.renderer == d3d9_render_main) - { - d3d9_release(); - } - else if (g_ddraw.renderer == ogl_render_main) - { - ogl_release(); - } - } - BOOL result = real_DestroyWindow(hWnd); - if (result && g_ddraw.ref && hWnd && hWnd == g_ddraw.hwnd) + if (result && g_ddraw && hWnd == g_ddraw->hwnd) { - g_ddraw.hwnd = NULL; - g_ddraw.wndproc = NULL; - g_ddraw.render.hdc = NULL; - - if (g_config.fake_mode[0]) - { - dd_SetCooperativeLevel(NULL, DDSCL_NORMAL); - } + g_ddraw->hwnd = NULL; + g_ddraw->wndproc = NULL; + g_ddraw->render.hdc = NULL; } - if (g_ddraw.ref && g_ddraw.hwnd != hWnd && g_ddraw.bnet_active) + if (g_ddraw && g_ddraw->hwnd != hWnd && g_ddraw->bnet_active) { RedrawWindow(NULL, NULL, NULL, RDW_ERASE | RDW_INVALIDATE | RDW_ALLCHILDREN); if (!FindWindowEx(HWND_DESKTOP, NULL, "SDlgDialog", NULL)) { - g_ddraw.bnet_active = FALSE; - SetFocus(g_ddraw.hwnd); + g_ddraw->bnet_active = FALSE; + SetFocus(g_ddraw->hwnd); mouse_lock(); if (g_config.windowed) { - g_ddraw.bnet_pos.x = g_ddraw.bnet_pos.y = 0; - real_ClientToScreen(g_ddraw.hwnd, &g_ddraw.bnet_pos); + g_ddraw->bnet_pos.x = g_ddraw->bnet_pos.y = 0; + real_ClientToScreen(g_ddraw->hwnd, &g_ddraw->bnet_pos); - if (!g_ddraw.bnet_was_upscaled) + if (!g_ddraw->bnet_was_upscaled) { - int width = g_ddraw.bnet_win_rect.right - g_ddraw.bnet_win_rect.left; - int height = g_ddraw.bnet_win_rect.bottom - g_ddraw.bnet_win_rect.top; + int width = g_ddraw->bnet_win_rect.right - g_ddraw->bnet_win_rect.left; + int height = g_ddraw->bnet_win_rect.bottom - g_ddraw->bnet_win_rect.top; - UINT flags = width != g_ddraw.width || height != g_ddraw.height ? 0 : SWP_NOMOVE; + UINT flags = width != g_ddraw->width || height != g_ddraw->height ? 0 : SWP_NOMOVE; - int dst_width = width == g_ddraw.width ? 0 : width; - int dst_height = height == g_ddraw.height ? 0 : height; + int dst_width = width == g_ddraw->width ? 0 : width; + int dst_height = height == g_ddraw->height ? 0 : height; util_set_window_rect( - g_ddraw.bnet_win_rect.left, - g_ddraw.bnet_win_rect.top, + g_ddraw->bnet_win_rect.left, + g_ddraw->bnet_win_rect.top, dst_width, dst_height, flags); } - g_config.fullscreen = g_ddraw.bnet_was_upscaled; + g_config.fullscreen = g_ddraw->bnet_was_upscaled; - SetTimer(g_ddraw.hwnd, IDT_TIMER_LEAVE_BNET, 1000, (TIMERPROC)NULL); + SetTimer(g_ddraw->hwnd, IDT_TIMER_LEAVE_BNET, 1000, (TIMERPROC)NULL); g_config.resizable = TRUE; } @@ -2006,91 +1263,17 @@ HWND WINAPI fake_CreateWindowExA( DWORD dwExStyle, LPCSTR lpClassName, LPCSTR lpWindowName, DWORD dwStyle, int X, int Y, int nWidth, int nHeight, HWND hWndParent, HMENU hMenu, HINSTANCE hInstance, LPVOID lpParam) { - TRACE("-> CreateWindowExA(" - "dwExStyle=%08X, lpClassName=%p, lpWindowName=%p, dwStyle=%08X, X=%d, Y=%d, nWidth=%d, " - "nHeight=%d, hWndParent=%p, hMenu=%p, hInstance=%p, lpParam=%p) [%p]\n", - dwExStyle, - lpClassName, - lpWindowName, - dwStyle, - X, - Y, - nWidth, - nHeight, - hWndParent, - hMenu, - hInstance, - lpParam, - _ReturnAddress()); - - TRACE(" WindowName=%s, ClassName=%s, g_ddraw.hwnd=%p\n", lpWindowName, HIWORD(lpClassName) ? lpClassName : "", g_ddraw.hwnd); - - dbg_dump_wnd_styles(dwStyle, dwExStyle); - - /* Almost all of the Learning Company Games */ - if (!dwExStyle && - HIWORD(lpClassName) && _strcmpi(lpClassName, "OMWindowChildClass") == 0 && - !lpWindowName && - dwStyle == (WS_CHILD | WS_CHILDWINDOW | WS_CLIPSIBLINGS) && - !X && - !Y && - g_ddraw.ref && g_ddraw.width && g_ddraw.width == nWidth && g_ddraw.height == nHeight && - g_ddraw.hwnd && hWndParent == g_ddraw.hwnd && - !hMenu && - !g_config.game_section[0]) - { - dwExStyle = WS_EX_TRANSPARENT; - g_config.lock_mouse_top_left = TRUE; - g_config.adjmouse = FALSE; - dd_SetDisplayMode(0, 0, 0, 0); - } - - /* The American Girls Dress Designer */ - if (HIWORD(lpClassName) && _strcmpi(lpClassName, "AfxFrameOrView42s") == 0 && - g_ddraw.ref && g_ddraw.hwnd && hWndParent == g_ddraw.hwnd && - g_config.fake_mode[0] && - (dwStyle & (WS_POPUP | WS_CHILD)) == (WS_POPUP | WS_CHILD)) - { - dwStyle &= ~WS_POPUP; - } - - /* Dark Colony */ - if (HIWORD(lpClassName) && _strcmpi(lpClassName, "Merc Direct Draw Driver") == 0 && - lpWindowName && _strcmpi(lpWindowName, "Direct Draw Driver") == 0 && - !dwExStyle) - { - dwExStyle |= WS_EX_APPWINDOW; - } - - /* Fallout 1/2 */ - if (HIWORD(lpClassName) && _strcmpi(lpClassName, "GNW95 Class") == 0 && - lpWindowName && strstr(lpWindowName, "FALLOUT")) - { - /* Workaround for window not showing up in taskbar sometimes */ - dwExStyle |= WS_EX_APPWINDOW; - } - - /* Fallout Tactics */ - if (HIWORD(lpClassName) && _strcmpi(lpClassName, "bosWin32Class") == 0 && - lpWindowName && _strcmpi(lpWindowName, "Fallout: Tactics (TM)") == 0) - { - dwStyle |= WS_VISIBLE; - } - /* Center Claw DVD movies */ - if (HIWORD(lpClassName) && _strcmpi(lpClassName, "Afx:400000:3") == 0 && - g_ddraw.ref && g_ddraw.hwnd && hWndParent == g_ddraw.hwnd && - g_ddraw.width && + if (HIWORD(lpClassName) && + _strcmpi(lpClassName, "Afx:400000:3") == 0 && + g_ddraw && g_ddraw->hwnd && g_ddraw->width && (dwStyle & (WS_POPUP | WS_CHILD)) == (WS_POPUP | WS_CHILD)) { - //dwStyle &= ~WS_POPUP; - //dwExStyle = WS_EX_TRANSPARENT; - POINT pt = { 0, 0 }; - real_ClientToScreen(g_ddraw.hwnd, &pt); + real_ClientToScreen(g_ddraw->hwnd, &pt); - int added_height = g_ddraw.render.height - g_ddraw.height; - int added_width = g_ddraw.render.width - g_ddraw.width; + int added_height = g_ddraw->render.height - g_ddraw->height; + int added_width = g_ddraw->render.width - g_ddraw->width; int align_y = added_height > 0 ? added_height / 2 : 0; int align_x = added_width > 0 ? added_width / 2 : 0; @@ -2098,120 +1281,53 @@ HWND WINAPI fake_CreateWindowExA( Y = pt.y + align_y; } - /* Metal Knight Movies */ - if (HIWORD(lpClassName) && _strcmpi(lpClassName, "Afx:400000:3:0:1900011:0") == 0 && - lpWindowName && _strcmpi(lpWindowName, "AVI player") == 0 && - dwStyle == WS_POPUP && - dwExStyle == WS_EX_TOPMOST && - g_ddraw.ref && g_ddraw.hwnd && - g_ddraw.width) - { - dwExStyle = 0; - - POINT pt = { 0, 0 }; - real_ClientToScreen(g_ddraw.hwnd, &pt); - - int added_height = g_ddraw.render.height - g_ddraw.height; - int added_width = g_ddraw.render.width - g_ddraw.width; - int align_y = added_height > 0 ? added_height / 2 : 0; - int align_x = added_width > 0 ? added_width / 2 : 0; - - X += pt.x + align_x; - Y += pt.y + align_y; - } - - /* Disney Trivia Challenge */ - if (HIWORD(lpClassName) && _strcmpi(lpClassName, "Disney Trivia Challenge") == 0 && - hWndParent && (dwStyle & WS_CHILD)) - { - dwExStyle = WS_EX_TRANSPARENT; - } - - /* Center Lego Loco overlays */ - if (lpWindowName && _strcmpi(lpWindowName, "LEGO LOCO") == 0 && - g_ddraw.ref && g_ddraw.hwnd && hWndParent == g_ddraw.hwnd && - g_ddraw.width && - (dwStyle & WS_POPUP)) - { - /* not working currently, game probably moves it with SetWindowPos or MoveWindow afterwards - POINT pt = { 0, 0 }; - real_ClientToScreen(g_ddraw.hwnd, &pt); - - int added_height = g_ddraw.render.height - g_ddraw.height; - int added_width = g_ddraw.render.width - g_ddraw.width; - int align_y = added_height > 0 ? added_height / 2 : 0; - int align_x = added_width > 0 ? added_width / 2 : 0; - - X = pt.x + align_x; - Y = pt.y + align_y; - */ - } - - /* Road Rash movies */ - if (HIWORD(lpClassName) && _strcmpi(lpClassName, "AVI Window") == 0 && - g_ddraw.ref && g_ddraw.hwnd && g_ddraw.width && - (dwStyle & WS_POPUP)) - { - dwStyle = WS_CHILD; - hWndParent = g_ddraw.hwnd; - } - - /* A Bug's Life Action Game */ - //HIWORD(lpClassName) && _strcmpi(lpClassName, "Bugs") == 0 && - if (dwExStyle == 0x01000008) - { - dwExStyle = WS_EX_TOPMOST; - } - /* Fix for SMACKW32.DLL creating another window that steals the focus */ - if (HIWORD(lpClassName) && _strcmpi(lpClassName, "MouseTypeWind") == 0 && g_ddraw.ref && g_ddraw.hwnd) + if (HIWORD(lpClassName) && _strcmpi(lpClassName, "MouseTypeWind") == 0 && g_ddraw && g_ddraw->hwnd) { dwStyle &= ~WS_VISIBLE; } - /* Battle.net */ - if (HIWORD(lpClassName) && _strcmpi(lpClassName, "SDlgDialog") == 0 && g_ddraw.ref && g_ddraw.hwnd) + if (HIWORD(lpClassName) && _strcmpi(lpClassName, "SDlgDialog") == 0 && g_ddraw && g_ddraw->hwnd) { - if (!g_ddraw.bnet_active) + if (!g_ddraw->bnet_active) { - g_ddraw.bnet_was_upscaled = g_config.fullscreen; + g_ddraw->bnet_was_upscaled = g_config.fullscreen; g_config.fullscreen = FALSE; - if (!g_config.windowed && !g_ddraw.bnet_was_fullscreen) + if (!g_config.windowed && !g_ddraw->bnet_was_fullscreen) { int ws = g_config.window_state; util_toggle_fullscreen(); g_config.window_state = ws; - g_ddraw.bnet_was_fullscreen = TRUE; + g_ddraw->bnet_was_fullscreen = TRUE; } - real_GetClientRect(g_ddraw.hwnd, &g_ddraw.bnet_win_rect); - real_MapWindowPoints(g_ddraw.hwnd, HWND_DESKTOP, (LPPOINT)&g_ddraw.bnet_win_rect, 2); + real_GetClientRect(g_ddraw->hwnd, &g_ddraw->bnet_win_rect); + real_MapWindowPoints(g_ddraw->hwnd, HWND_DESKTOP, (LPPOINT)&g_ddraw->bnet_win_rect, 2); - int width = g_ddraw.bnet_win_rect.right - g_ddraw.bnet_win_rect.left; - int height = g_ddraw.bnet_win_rect.bottom - g_ddraw.bnet_win_rect.top; + int width = g_ddraw->bnet_win_rect.right - g_ddraw->bnet_win_rect.left; + int height = g_ddraw->bnet_win_rect.bottom - g_ddraw->bnet_win_rect.top; - int x = g_ddraw.bnet_pos.x || g_ddraw.bnet_pos.y ? g_ddraw.bnet_pos.x : -32000; - int y = g_ddraw.bnet_pos.x || g_ddraw.bnet_pos.y ? g_ddraw.bnet_pos.y : -32000; + int x = g_ddraw->bnet_pos.x || g_ddraw->bnet_pos.y ? g_ddraw->bnet_pos.x : -32000; + int y = g_ddraw->bnet_pos.x || g_ddraw->bnet_pos.y ? g_ddraw->bnet_pos.y : -32000; - UINT flags = width != g_ddraw.width || height != g_ddraw.height ? 0 : SWP_NOMOVE; + UINT flags = width != g_ddraw->width || height != g_ddraw->height ? 0 : SWP_NOMOVE; - int dst_width = g_config.window_rect.right ? g_ddraw.width : 0; - int dst_height = g_config.window_rect.bottom ? g_ddraw.height : 0; + int dst_width = g_config.window_rect.right ? g_ddraw->width : 0; + int dst_height = g_config.window_rect.bottom ? g_ddraw->height : 0; util_set_window_rect(x, y, dst_width, dst_height, flags); g_config.resizable = FALSE; - g_ddraw.bnet_active = TRUE; + g_ddraw->bnet_active = TRUE; mouse_unlock(); - ReleaseCapture(); } POINT pt = { 0, 0 }; - real_ClientToScreen(g_ddraw.hwnd, &pt); + real_ClientToScreen(g_ddraw->hwnd, &pt); - int added_height = g_ddraw.height - 480; - int added_width = g_ddraw.width - 640; + int added_height = g_ddraw->height - 480; + int added_width = g_ddraw->width - 640; int align_y = added_height > 0 ? added_height / 2 : 0; int align_x = added_width > 0 ? added_width / 2 : 0; @@ -2221,21 +1337,7 @@ HWND WINAPI fake_CreateWindowExA( dwStyle |= WS_CLIPCHILDREN; } - /* Limit window size to max surface size (Dune2000 1.02) */ - if (dwStyle & WS_POPUP) - { - if (nWidth != CW_USEDEFAULT) - { - nWidth = min(nWidth, 16384); - } - - if (nHeight != CW_USEDEFAULT) - { - nHeight = min(nHeight, 16384); - } - } - - HWND hwnd = real_CreateWindowExA( + return real_CreateWindowExA( dwExStyle, lpClassName, lpWindowName, @@ -2248,32 +1350,13 @@ HWND WINAPI fake_CreateWindowExA( hMenu, hInstance, lpParam); - - /* Age Of Empires 2 textbox align */ - if (!dwExStyle && - HIWORD(lpClassName) && _strcmpi(lpClassName, "edit") == 0 && - !lpWindowName && - g_ddraw.ref && g_ddraw.width && - g_ddraw.hwnd && hWndParent == g_ddraw.hwnd && - (int)hMenu == 1) - { - g_ddraw.textbox.hwnd = hwnd; - } - - TRACE("<- CreateWindowExA(hwnd=%p)\n", hwnd); - - return hwnd; } HRESULT WINAPI fake_CoCreateInstance(REFCLSID rclsid, LPUNKNOWN pUnkOuter, DWORD dwClsContext, REFIID riid, LPVOID* ppv) { if (rclsid && riid) { - TRACE( - "CoCreateInstance rclsid = %08X, riid = %08X [%p]\n", - ((GUID*)rclsid)->Data1, - ((GUID*)riid)->Data1, - _ReturnAddress()); + TRACE("CoCreateInstance rclsid = %08X, riid = %08X\n", ((GUID*)rclsid)->Data1, ((GUID*)riid)->Data1); if (IsEqualGUID(&CLSID_DirectDraw, rclsid) || IsEqualGUID(&CLSID_DirectDraw7, rclsid)) { @@ -2302,36 +1385,7 @@ HRESULT WINAPI fake_CoCreateInstance(REFCLSID rclsid, LPUNKNOWN pUnkOuter, DWORD } } - /* These dlls must be hooked for cutscene uscaling and windowed mode */ - HMODULE quartz_dll = GetModuleHandleA("quartz"); - HMODULE msvfw32_dll = GetModuleHandleA("msvfw32"); - - HRESULT result = real_CoCreateInstance(rclsid, pUnkOuter, dwClsContext, riid, ppv); - - if ((!quartz_dll && GetModuleHandleA("quartz")) || - (!msvfw32_dll && GetModuleHandleA("msvfw32"))) - { - hook_init(); - } - - return result; -} - -MCIERROR WINAPI fake_mciSendCommandA(MCIDEVICEID IDDevice, UINT uMsg, DWORD_PTR fdwCommand, DWORD_PTR dwParam) -{ - /* These dlls must be hooked for cutscene uscaling and windowed mode */ - HMODULE quartz_dll = GetModuleHandleA("quartz"); - HMODULE msvfw32_dll = GetModuleHandleA("msvfw32"); - - MCIERROR result = real_mciSendCommandA(IDDevice, uMsg, fdwCommand, dwParam); - - if ((!quartz_dll && GetModuleHandleA("quartz")) || - (!msvfw32_dll && GetModuleHandleA("msvfw32"))) - { - hook_init(); - } - - return result; + return real_CoCreateInstance(rclsid, pUnkOuter, dwClsContext, riid, ppv); } LPTOP_LEVEL_EXCEPTION_FILTER WINAPI fake_SetUnhandledExceptionFilter( @@ -2343,27 +1397,3 @@ LPTOP_LEVEL_EXCEPTION_FILTER WINAPI fake_SetUnhandledExceptionFilter( return old; //return real_SetUnhandledExceptionFilter(lpTopLevelExceptionFilter); } - -PGETFRAME WINAPI fake_AVIStreamGetFrameOpen(PAVISTREAM pavi, LPBITMAPINFOHEADER lpbiWanted) -{ - if (g_ddraw.ref && g_ddraw.primary && (DWORD)lpbiWanted == AVIGETFRAMEF_BESTDISPLAYFMT) - { - DDBITMAPINFO bmi; - memcpy(&bmi, g_ddraw.primary->bmi, sizeof(DDBITMAPINFO)); - - bmi.bmiHeader.biHeight = 0; - bmi.bmiHeader.biWidth = 0; - - if (g_ddraw.bpp == 8 && g_ddraw.primary->palette) - { - memcpy(&bmi.bmiColors[0], g_ddraw.primary->palette->data_rgb, sizeof(bmi.bmiColors)); - } - - PGETFRAME result = real_AVIStreamGetFrameOpen(pavi, (LPBITMAPINFOHEADER)&bmi); - - if (result) - return result; - } - - return real_AVIStreamGetFrameOpen(pavi, lpbiWanted); -} diff --git a/src/wndproc.c b/src/wndproc.c index 3555058..87285ea 100644 --- a/src/wndproc.c +++ b/src/wndproc.c @@ -13,7 +13,6 @@ #include "wndproc.h" #include "utils.h" #include "debug.h" -#include "versionhelpers.h" LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) @@ -22,7 +21,7 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam if (uMsg != WM_MOUSEMOVE && uMsg != WM_NCMOUSEMOVE && uMsg != WM_NCHITTEST && uMsg != WM_SETCURSOR && uMsg != WM_KEYUP && uMsg != WM_KEYDOWN && uMsg != WM_CHAR && uMsg != WM_DEADCHAR && uMsg != WM_INPUT && uMsg != WM_UNICHAR && uMsg != WM_IME_CHAR && uMsg != WM_IME_KEYDOWN && uMsg != WM_IME_KEYUP && uMsg != WM_TIMER && - uMsg != WM_D3D9DEVICELOST && uMsg != WM_NULL) + uMsg != WM_D3D9DEVICELOST) { TRACE( " uMsg = %s (%d), wParam = %08X (%d), lParam = %08X (%d, LO=%d HI=%d)\n", @@ -42,30 +41,28 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam switch (uMsg) { - case WM_NULL: case WM_MOVING: case WM_NCLBUTTONDOWN: case WM_NCLBUTTONUP: case WM_NCPAINT: case WM_CANCELMODE: case WM_DISPLAYCHANGE: - case WM_NCCALCSIZE: { - return real_DefWindowProcA(hWnd, uMsg, wParam, lParam); + return DefWindowProc(hWnd, uMsg, wParam, lParam); } case WM_GETMINMAXINFO: { MINMAXINFO* mmi = (MINMAXINFO*)lParam; - if (g_config.windowed && g_ddraw.width) + if (g_config.windowed && g_ddraw->width) { - RECT rc = { 0, 0, g_ddraw.render.width, g_ddraw.render.height }; + RECT rc = { 0, 0, g_ddraw->render.width, g_ddraw->render.height }; AdjustWindowRectEx( &rc, - real_GetWindowLongA(g_ddraw.hwnd, GWL_STYLE), - GetMenu(g_ddraw.hwnd) != NULL, - real_GetWindowLongA(g_ddraw.hwnd, GWL_EXSTYLE)); + real_GetWindowLongA(g_ddraw->hwnd, GWL_STYLE), + GetMenu(g_ddraw->hwnd) != NULL, + real_GetWindowLongA(g_ddraw->hwnd, GWL_EXSTYLE)); if (mmi->ptMaxTrackSize.x < rc.right - rc.left) mmi->ptMaxTrackSize.x = rc.right - rc.left; @@ -74,13 +71,13 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam mmi->ptMaxTrackSize.y = rc.bottom - rc.top; /* - RECT rcmin = { 0, 0, g_ddraw.width, g_ddraw.height }; + RECT rcmin = { 0, 0, g_ddraw->width, g_ddraw->height }; AdjustWindowRectEx( &rcmin, - real_GetWindowLongA(g_ddraw.hwnd, GWL_STYLE), - GetMenu(g_ddraw.hwnd) != NULL, - real_GetWindowLongA(g_ddraw.hwnd, GWL_EXSTYLE)); + real_GetWindowLongA(g_ddraw->hwnd, GWL_STYLE), + GetMenu(g_ddraw->hwnd) != NULL, + real_GetWindowLongA(g_ddraw->hwnd, GWL_EXSTYLE)); mmi->ptMinTrackSize.x = rcmin.right - rcmin.left; mmi->ptMinTrackSize.y = rcmin.bottom - rcmin.top; @@ -89,48 +86,20 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam return 0; } - return real_DefWindowProcA(hWnd, uMsg, wParam, lParam); + return DefWindowProc(hWnd, uMsg, wParam, lParam); } - case WM_KILLFOCUS: case WM_NCACTIVATE: { if (g_config.noactivateapp) { - return real_DefWindowProcA(hWnd, uMsg, wParam, lParam); + return DefWindowProc(hWnd, uMsg, wParam, lParam); } break; } case WM_NCHITTEST: { - if (g_mouse_locked || g_config.devmode) - { - POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; - - if (!g_config.windowed || real_ScreenToClient(g_ddraw.hwnd, &pt)) - { - int x = max(pt.x - g_ddraw.mouse.x_adjust, 0); - int y = max(pt.y - g_ddraw.mouse.y_adjust, 0); - - if (g_config.adjmouse) - { - x = (DWORD)(roundf(x * g_ddraw.mouse.unscale_x)); - y = (DWORD)(roundf(y * g_ddraw.mouse.unscale_y)); - } - - pt.x = min(x, g_ddraw.width - 1); - pt.y = min(y, g_ddraw.height - 1); - } - else - { - pt.x = InterlockedExchangeAdd((LONG*)&g_ddraw.cursor.x, 0); - pt.y = InterlockedExchangeAdd((LONG*)&g_ddraw.cursor.y, 0); - } - - CallWindowProcA(g_ddraw.wndproc, hWnd, uMsg, wParam, MAKELPARAM(pt.x, pt.y)); - } - - LRESULT result = real_DefWindowProcA(hWnd, uMsg, wParam, lParam); + LRESULT result = DefWindowProc(hWnd, uMsg, wParam, lParam); if (!g_config.resizable) { @@ -153,7 +122,7 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam case WM_SETCURSOR: { /* show resize cursor on window borders */ - if ((HWND)wParam == g_ddraw.hwnd) + if ((HWND)wParam == g_ddraw->hwnd) { WORD message = HIWORD(lParam); @@ -175,7 +144,7 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam case HTTOP: case HTTOPLEFT: case HTTOPRIGHT: - return real_DefWindowProcA(hWnd, uMsg, wParam, lParam); + return DefWindowProc(hWnd, uMsg, wParam, lParam); case HTCLIENT: if (!g_mouse_locked && !g_config.devmode) { @@ -207,8 +176,8 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam } case WM_D3D9DEVICELOST: { - if (((!g_config.windowed && !g_config.nonexclusive) || !util_is_minimized(g_ddraw.hwnd)) && - g_ddraw.renderer == d3d9_render_main && + if (((!g_config.windowed && !g_config.nonexclusive) || !util_is_minimized(g_ddraw->hwnd)) && + g_ddraw->renderer == d3d9_render_main && d3d9_on_device_lost()) { if (!g_config.windowed) @@ -222,35 +191,29 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam { case IDT_TIMER_LEAVE_BNET: { - KillTimer(g_ddraw.hwnd, IDT_TIMER_LEAVE_BNET); + KillTimer(g_ddraw->hwnd, IDT_TIMER_LEAVE_BNET); if (!g_config.windowed) - g_ddraw.bnet_was_fullscreen = FALSE; + g_ddraw->bnet_was_fullscreen = FALSE; - if (!g_ddraw.bnet_active) + if (!g_ddraw->bnet_active) { - if (g_ddraw.bnet_was_fullscreen) + if (g_ddraw->bnet_was_fullscreen) { int ws = g_config.window_state; util_toggle_fullscreen(); g_config.window_state = ws; - g_ddraw.bnet_was_fullscreen = FALSE; + g_ddraw->bnet_was_fullscreen = FALSE; } - else if (g_ddraw.bnet_was_upscaled) + else if (g_ddraw->bnet_was_upscaled) { util_set_window_rect(0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); - g_ddraw.bnet_was_upscaled = FALSE; + g_ddraw->bnet_was_upscaled = FALSE; } } return 0; } - case IDT_TIMER_LINUX_FIX_WINDOW_SIZE: - { - KillTimer(g_ddraw.hwnd, IDT_TIMER_LINUX_FIX_WINDOW_SIZE); - util_set_window_rect(0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); - return 0; - } } break; } @@ -265,12 +228,12 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam pos->hwndInsertAfter, pos->x, pos->y, pos->cx, pos->cy); */ - if (IsWine() && + if (g_config.is_wine && !g_config.windowed && (pos->x > 0 || pos->y > 0) && - g_ddraw.last_set_window_pos_tick + 500 < timeGetTime()) + g_ddraw->last_set_window_pos_tick + 500 < timeGetTime()) { - PostMessage(g_ddraw.hwnd, WM_WINEFULLSCREEN, 0, 0); + PostMessage(g_ddraw->hwnd, WM_WINEFULLSCREEN, 0, 0); } break; @@ -279,26 +242,24 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam { if (!g_config.windowed) { - g_ddraw.last_set_window_pos_tick = timeGetTime(); - - int menu_height = GetMenu(g_ddraw.hwnd) ? real_GetSystemMetrics(SM_CYMENU) : 0; + g_ddraw->last_set_window_pos_tick = timeGetTime(); real_SetWindowPos( - g_ddraw.hwnd, + g_ddraw->hwnd, HWND_TOPMOST, 1, 1, - g_ddraw.render.width, - g_ddraw.render.height + menu_height, + g_ddraw->render.width, + g_ddraw->render.height, SWP_SHOWWINDOW); real_SetWindowPos( - g_ddraw.hwnd, + g_ddraw->hwnd, HWND_TOPMOST, 0, 0, - g_ddraw.render.width, - g_ddraw.render.height + menu_height, + g_ddraw->render.width, + g_ddraw->render.height, SWP_SHOWWINDOW); } return 0; @@ -317,8 +278,8 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam { in_size_move = FALSE; - if (!g_ddraw.render.thread) - dd_SetDisplayMode(0, 0, 0, 0); + if (!g_ddraw->render.thread) + dd_SetDisplayMode(g_ddraw->width, g_ddraw->height, g_ddraw->bpp, 0); } break; } @@ -330,15 +291,15 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam { if (in_size_move) { - if (g_ddraw.render.thread) + if (g_ddraw->render.thread) { - EnterCriticalSection(&g_ddraw.cs); - g_ddraw.render.run = FALSE; - ReleaseSemaphore(g_ddraw.render.sem, 1, NULL); - LeaveCriticalSection(&g_ddraw.cs); + EnterCriticalSection(&g_ddraw->cs); + g_ddraw->render.run = FALSE; + ReleaseSemaphore(g_ddraw->render.sem, 1, NULL); + LeaveCriticalSection(&g_ddraw->cs); - WaitForSingleObject(g_ddraw.render.thread, INFINITE); - g_ddraw.render.thread = NULL; + WaitForSingleObject(g_ddraw->render.thread, INFINITE); + g_ddraw->render.thread = NULL; } RECT clientrc = { 0 }; @@ -353,24 +314,8 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam real_GetWindowLongA(hWnd, GWL_EXSTYLE)) && SetRect(&clientrc, 0, 0, clientrc.right - clientrc.left, clientrc.bottom - clientrc.top)) { - double scale_h; - double scale_w; - - if (g_config.aspect_ratio[0]) - { - char* e = &g_config.aspect_ratio[0]; - - DWORD cx = strtoul(e, &e, 0); - DWORD cy = strtoul(e + 1, &e, 0); - - scale_h = (double)cy / cx; - scale_w = (double)cx / cy; - } - else - { - scale_h = (double)g_ddraw.height / g_ddraw.width; - scale_w = (double)g_ddraw.width / g_ddraw.height; - } + double scaleH = (double)g_ddraw->height / g_ddraw->width; + double scaleW = (double)g_ddraw->width / g_ddraw->height; switch (wParam) { @@ -379,19 +324,19 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam case WMSZ_LEFT: case WMSZ_RIGHT: { - windowrc->bottom += (LONG)round(scale_h * clientrc.right - clientrc.bottom); + windowrc->bottom += (LONG)round(scaleH * clientrc.right - clientrc.bottom); break; } case WMSZ_TOP: case WMSZ_BOTTOM: { - windowrc->right += (LONG)round(scale_w * clientrc.bottom - clientrc.right); + windowrc->right += (LONG)round(scaleW * clientrc.bottom - clientrc.right); break; } case WMSZ_TOPRIGHT: case WMSZ_TOPLEFT: { - windowrc->top -= (LONG)round(scale_h * clientrc.right - clientrc.bottom); + windowrc->top -= (LONG)round(scaleH * clientrc.right - clientrc.bottom); break; } } @@ -406,7 +351,7 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam real_GetWindowLongA(hWnd, GWL_EXSTYLE)) && SetRect(&clientrc, 0, 0, clientrc.right - clientrc.left, clientrc.bottom - clientrc.top)) { - if (clientrc.right < g_ddraw.width) + if (clientrc.right < g_ddraw->width) { switch (wParam) { @@ -416,20 +361,20 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam case WMSZ_BOTTOM: case WMSZ_TOP: { - windowrc->right += g_ddraw.width - clientrc.right; + windowrc->right += g_ddraw->width - clientrc.right; break; } case WMSZ_TOPLEFT: case WMSZ_BOTTOMLEFT: case WMSZ_LEFT: { - windowrc->left -= g_ddraw.width - clientrc.right; + windowrc->left -= g_ddraw->width - clientrc.right; break; } } } - if (clientrc.bottom < g_ddraw.height) + if (clientrc.bottom < g_ddraw->height) { switch (wParam) { @@ -439,14 +384,14 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam case WMSZ_RIGHT: case WMSZ_LEFT: { - windowrc->bottom += g_ddraw.height - clientrc.bottom; + windowrc->bottom += g_ddraw->height - clientrc.bottom; break; } case WMSZ_TOPLEFT: case WMSZ_TOPRIGHT: case WMSZ_TOP: { - windowrc->top -= g_ddraw.height - clientrc.bottom; + windowrc->top -= g_ddraw->height - clientrc.bottom; break; } } @@ -476,81 +421,40 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam { if (g_config.windowed) { - WORD width = LOWORD(lParam); - WORD height = HIWORD(lParam); - if (wParam == SIZE_RESTORED) { - /* macOS maximize hack */ - if (in_size_move && g_ddraw.render.thread && IsMacOS()) + if (in_size_move && !g_ddraw->render.thread) { - EnterCriticalSection(&g_ddraw.cs); - g_ddraw.render.run = FALSE; - ReleaseSemaphore(g_ddraw.render.sem, 1, NULL); - LeaveCriticalSection(&g_ddraw.cs); - - WaitForSingleObject(g_ddraw.render.thread, INFINITE); - g_ddraw.render.thread = NULL; + g_config.window_rect.right = LOWORD(lParam); + g_config.window_rect.bottom = HIWORD(lParam); } - - if (in_size_move && !g_ddraw.render.thread) + /* + else if (g_ddraw->wine) { - g_config.window_rect.right = width; - g_config.window_rect.bottom = height; - } - else if (!in_size_move && g_ddraw.render.thread && !g_config.fullscreen && IsLinux()) - { - if (width != g_ddraw.render.width || height != g_ddraw.render.height) - { - KillTimer(g_ddraw.hwnd, IDT_TIMER_LINUX_FIX_WINDOW_SIZE); - - g_config.window_rect.right = width; - g_config.window_rect.bottom = height; - - dd_SetDisplayMode(0, 0, 0, 0); - - if (width < g_ddraw.width || height < g_ddraw.height) - { - /* Can't enforce minimum window size in linux because there is no WM_SIZING and - WM_GETMINMAXINFO is ignored for whatever reasons */ - - SetTimer(g_ddraw.hwnd, IDT_TIMER_LINUX_FIX_WINDOW_SIZE, 1000, (TIMERPROC)NULL); - } - } - } - } - else if (wParam == SIZE_MAXIMIZED) - { - if (!in_size_move && g_ddraw.render.thread && !g_config.fullscreen && IsLinux()) - { - if (width != g_ddraw.render.width || height != g_ddraw.render.height) - { - KillTimer(g_ddraw.hwnd, IDT_TIMER_LINUX_FIX_WINDOW_SIZE); - - g_config.window_rect.right = width; - g_config.window_rect.bottom = height; - - dd_SetDisplayMode(0, 0, 0, 0); - - if (width < g_ddraw.width || height < g_ddraw.height) - { - /* Can't enforce minimum window size in linux because there is no WM_SIZING and - WM_GETMINMAXINFO is ignored for whatever reasons */ - - SetTimer(g_ddraw.hwnd, IDT_TIMER_LINUX_FIX_WINDOW_SIZE, 1000, (TIMERPROC)NULL); - } - } + WindowRect.right = LOWORD(lParam); + WindowRect.bottom = HIWORD(lParam); + if (WindowRect.right != g_ddraw->render.width || WindowRect.bottom != g_ddraw->render.height) + dd_SetDisplayMode(g_ddraw->width, g_ddraw->height, g_ddraw->bpp); } + */ } } - if (g_ddraw.got_child_windows) + if (g_ddraw->got_child_windows) { redraw_count = 2; RedrawWindow(hWnd, NULL, NULL, RDW_INVALIDATE | RDW_ALLCHILDREN); } - return real_DefWindowProcA(hWnd, uMsg, wParam, lParam); /* Carmageddon fix */ + static BOOL initialized = FALSE; + + if (!initialized && (LOWORD(lParam) >= 460 && LOWORD(lParam) <= 540) && HIWORD(lParam) < 350 && GetMenu(g_ddraw->hwnd)) + { + initialized = TRUE; + dd_SetDisplayMode(515, 325, 32, 0); + } + + return DefWindowProc(hWnd, uMsg, wParam, lParam); /* Carmageddon fix */ } case WM_MOVE: { @@ -564,7 +468,7 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam util_update_bnet_pos(x, y); } - if (in_size_move || (IsLinux() && !g_config.fullscreen && g_ddraw.render.thread)) + if (in_size_move || (g_config.is_wine && !g_config.fullscreen && g_ddraw->render.thread)) { if (x != -32000) g_config.window_rect.left = x; /* -32000 = Exit/Minimize */ @@ -574,42 +478,38 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam } } - if (g_ddraw.got_child_windows) + if (g_ddraw->got_child_windows) RedrawWindow(hWnd, NULL, NULL, RDW_INVALIDATE | RDW_ALLCHILDREN); - return real_DefWindowProcA(hWnd, uMsg, wParam, lParam); /* Carmageddon fix */ + return DefWindowProc(hWnd, uMsg, wParam, lParam); /* Carmageddon fix */ } - case WM_RESTORE_STYLE: + case WM_NCMOUSELEAVE: { - if (!IsWine()) /* hack: disable aero snap */ + if (!g_config.is_wine) /* hack: disable aero snap */ { - LONG style = real_GetWindowLongA(g_ddraw.hwnd, GWL_STYLE); + LONG style = real_GetWindowLongA(g_ddraw->hwnd, GWL_STYLE); if (!(style & WS_MAXIMIZEBOX)) { - real_SetWindowLongA(g_ddraw.hwnd, GWL_STYLE, style | WS_MAXIMIZEBOX); + real_SetWindowLongA(g_ddraw->hwnd, GWL_STYLE, style | WS_MAXIMIZEBOX); } } - return 0; + break; } case WM_SYSCOMMAND: { - if ((wParam & ~0x0F) == SC_MOVE && !IsWine()) /* hack: disable aero snap */ + if ((wParam & ~0x0F) == SC_MOVE && !g_config.is_wine) /* hack: disable aero snap */ { - LONG style = real_GetWindowLongA(g_ddraw.hwnd, GWL_STYLE); + LONG style = real_GetWindowLongA(g_ddraw->hwnd, GWL_STYLE); if ((style & WS_MAXIMIZEBOX)) { - real_SetWindowLongA(g_ddraw.hwnd, GWL_STYLE, style & ~WS_MAXIMIZEBOX); - PostMessageA(g_ddraw.hwnd, WM_RESTORE_STYLE, 0, 0); + real_SetWindowLongA(g_ddraw->hwnd, GWL_STYLE, style & ~WS_MAXIMIZEBOX); } } if (wParam == SC_MAXIMIZE) { - if (IsWine()) - return real_DefWindowProcA(hWnd, uMsg, wParam, lParam); - if (g_config.resizable) { util_toggle_maximize(); @@ -620,18 +520,14 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam if (wParam == SC_CLOSE && !GameHandlesClose) { - if (g_config.terminate_process) - g_config.terminate_process = 2; - - ExitProcess(0); - //_exit(0); + _exit(0); } - if (wParam == SC_KEYMENU && GetMenu(g_ddraw.hwnd) == NULL) + if (wParam == SC_KEYMENU && GetMenu(g_ddraw->hwnd) == NULL) return 0; if (!GameHandlesClose) - return real_DefWindowProcA(hWnd, uMsg, wParam, lParam); + return DefWindowProc(hWnd, uMsg, wParam, lParam); break; } @@ -653,7 +549,7 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam { mouse_unlock(); - if (real_GetForegroundWindow() == g_ddraw.hwnd) + if (real_GetForegroundWindow() == g_ddraw->hwnd) mouse_lock(); } } @@ -666,13 +562,13 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam } case WM_ACTIVATE: { - if (LOWORD(wParam) == WA_ACTIVE || LOWORD(wParam) == WA_CLICKACTIVE) + if (wParam == WA_ACTIVE || wParam == WA_CLICKACTIVE) { - if (g_ddraw.got_child_windows) + if (g_ddraw->got_child_windows) RedrawWindow(hWnd, NULL, NULL, RDW_INVALIDATE | RDW_ALLCHILDREN); } - if (LOWORD(wParam) == WA_INACTIVE) + if (wParam == WA_INACTIVE) { if (g_config.windowed && !g_config.fullscreen && lParam && GetParent((HWND)lParam) == hWnd) { @@ -709,21 +605,10 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam } } - if (g_config.windowed || g_config.noactivateapp) - { - /* let it pass through once (Atrox) */ - static BOOL one_time; - - if (!one_time) - { - one_time = TRUE; - - if (LOWORD(wParam)) - break; - } + //if (g_ddraw->windowed || g_ddraw->noactivateapp) + if (!g_config.allow_wmactivate) return 0; - } break; } @@ -733,19 +618,19 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam { if (!g_config.windowed) { - if (g_ddraw.renderer != d3d9_render_main || g_config.nonexclusive) + if (g_ddraw->renderer != d3d9_render_main || g_config.nonexclusive) { - ChangeDisplaySettings(&g_ddraw.render.mode, CDS_FULLSCREEN); - real_ShowWindow(g_ddraw.hwnd, SW_RESTORE); + ChangeDisplaySettings(&g_ddraw->render.mode, CDS_FULLSCREEN); + real_ShowWindow(g_ddraw->hwnd, SW_RESTORE); mouse_lock(); } } - else if (g_config.fullscreen && real_GetForegroundWindow() == g_ddraw.hwnd) + else if (g_config.fullscreen && real_GetForegroundWindow() == g_ddraw->hwnd) { mouse_lock(); } - ReleaseSemaphore(g_ddraw.render.sem, 1, NULL); + ReleaseSemaphore(g_ddraw->render.sem, 1, NULL); } else { @@ -754,20 +639,20 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam mouse_unlock(); - if (IsWine() && g_ddraw.last_set_window_pos_tick + 500 > timeGetTime()) + if (g_config.is_wine && g_ddraw->last_set_window_pos_tick + 500 > timeGetTime()) return 0; if (!g_config.windowed) { - if (g_ddraw.renderer != d3d9_render_main || g_config.nonexclusive) + if (g_ddraw->renderer != d3d9_render_main || g_config.nonexclusive) { - real_ShowWindow(g_ddraw.hwnd, SW_MINIMIZE); - ChangeDisplaySettings(NULL, g_ddraw.bnet_active ? CDS_FULLSCREEN : 0); + real_ShowWindow(g_ddraw->hwnd, SW_MINIMIZE); + ChangeDisplaySettings(NULL, g_ddraw->bnet_active ? CDS_FULLSCREEN : 0); } } } - if (wParam && g_config.fix_alt_key_stuck) + if (wParam && g_config.releasealt) { INPUT ip; memset(&ip, 0, sizeof(ip)); @@ -788,22 +673,17 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam if (g_config.windowed || g_config.noactivateapp) { - /* let it pass through once (tiberian sun / ClueFinders) */ + /* let it pass through once (tiberian sun) */ static BOOL one_time; - - if (!one_time) + + if (wParam && !one_time && g_config.tshack) { one_time = TRUE; - - if (wParam) - break; + break; } - if (wParam && g_ddraw.alt_key_down && !g_config.fix_alt_key_stuck) - { - PostMessageA(g_ddraw.hwnd, WM_SYSKEYUP, VK_MENU, 0); - g_ddraw.alt_key_down = FALSE; - } + if (wParam && g_ddraw->alt_key_down && !g_config.releasealt) + PostMessageA(g_ddraw->hwnd, WM_SYSKEYUP, VK_MENU, 0); return 0; } @@ -812,8 +692,8 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam case WM_AUTORENDERER: { mouse_unlock(); - real_SetWindowPos(g_ddraw.hwnd, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); - real_SetWindowPos(g_ddraw.hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); + real_SetWindowPos(g_ddraw->hwnd, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); + real_SetWindowPos(g_ddraw->hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); mouse_lock(); return 0; } @@ -854,28 +734,93 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam } case WM_SYSKEYDOWN: { - if (wParam == VK_F4) + BOOL context_code = (lParam & (1 << 29)) != 0; + BOOL key_state = (lParam & (1 << 30)) != 0; + + if (g_config.hotkeys.toggle_fullscreen && + wParam == g_config.hotkeys.toggle_fullscreen && + (!g_config.fullscreen || g_config.toggle_upscaled || (g_config.windowed && g_config.toggle_borderless)) && + context_code && + !key_state) { - return real_DefWindowProcA(hWnd, uMsg, wParam, lParam); + util_toggle_fullscreen(); + return 0; + } + + if (g_config.hotkeys.toggle_maximize && + wParam == g_config.hotkeys.toggle_maximize && + g_config.resizable && + g_config.windowed && + !g_config.fullscreen) + { + util_toggle_maximize(); + return 0; + } + + if (wParam == VK_MENU) + { + g_ddraw->alt_key_down = TRUE; } break; } case WM_SYSKEYUP: { - if (wParam == VK_TAB || (wParam && wParam == g_config.hotkeys.toggle_fullscreen)) + if (wParam == VK_MENU) { - return real_DefWindowProcA(hWnd, uMsg, wParam, lParam); + g_ddraw->alt_key_down = FALSE; + } + + if (wParam == VK_TAB || (g_config.hotkeys.toggle_fullscreen && wParam == g_config.hotkeys.toggle_fullscreen)) + { + return DefWindowProc(hWnd, uMsg, wParam, lParam); } break; } case WM_KEYDOWN: { + if (g_config.hotkeys.unlock_cursor1 && + (wParam == VK_CONTROL || wParam == g_config.hotkeys.unlock_cursor1)) + { + if (GetAsyncKeyState(VK_CONTROL) & 0x8000 && GetAsyncKeyState(g_config.hotkeys.unlock_cursor1) & 0x8000) + { + mouse_unlock(); + return 0; + } + } + + if (g_config.hotkeys.unlock_cursor2 && + (wParam == g_config.hotkeys.unlock_cursor2 || wParam == VK_MENU || wParam == VK_CONTROL)) + { + if ((GetAsyncKeyState(VK_RMENU) & 0x8000) && GetAsyncKeyState(g_config.hotkeys.unlock_cursor2) & 0x8000) + { + mouse_unlock(); + return 0; + } + } + + HWND video_hwnd = (HWND)InterlockedExchangeAdd((LONG*)&g_ddraw->video_window_hwnd, 0); + if (video_hwnd) + { + PostMessageA(video_hwnd, uMsg, wParam, lParam); + return 0; + } + break; } case WM_KEYUP: { + if (g_config.hotkeys.screenshot && wParam == g_config.hotkeys.screenshot) + ss_take_screenshot(g_ddraw->primary); + + HWND video_hwnd = (HWND)InterlockedExchangeAdd((LONG*)&g_ddraw->video_window_hwnd, 0); + if (video_hwnd) + { + PostMessageA(video_hwnd, uMsg, wParam, lParam); + return 0; + } + break; } /* button up messages reactivate cursor lock */ @@ -888,25 +833,22 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam int x = GET_X_LPARAM(lParam); int y = GET_Y_LPARAM(lParam); - if (x > g_ddraw.render.viewport.x + g_ddraw.render.viewport.width || - x < g_ddraw.render.viewport.x || - y > g_ddraw.render.viewport.y + g_ddraw.render.viewport.height || - y < g_ddraw.render.viewport.y) + if (x > g_ddraw->render.viewport.x + g_ddraw->render.viewport.width || + x < g_ddraw->render.viewport.x || + y > g_ddraw->render.viewport.y + g_ddraw->render.viewport.height || + y < g_ddraw->render.viewport.y) { - x = g_ddraw.width / 2; - y = g_ddraw.height / 2; + x = g_ddraw->width / 2; + y = g_ddraw->height / 2; } else { - x = (DWORD)((x - g_ddraw.render.viewport.x) * g_ddraw.mouse.unscale_x); - y = (DWORD)((y - g_ddraw.render.viewport.y) * g_ddraw.mouse.unscale_y); + x = (DWORD)((x - g_ddraw->render.viewport.x) * g_ddraw->mouse.unscale_x); + y = (DWORD)((y - g_ddraw->render.viewport.y) * g_ddraw->mouse.unscale_y); } - x = min(x, g_ddraw.width - 1); - y = min(y, g_ddraw.height - 1); - - InterlockedExchange((LONG*)&g_ddraw.cursor.x, x); - InterlockedExchange((LONG*)&g_ddraw.cursor.y, y); + InterlockedExchange((LONG*)&g_ddraw->cursor.x, x); + InterlockedExchange((LONG*)&g_ddraw->cursor.y, y); mouse_lock(); return 0; @@ -935,12 +877,12 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam if (uMsg == WM_MOUSEWHEEL) { POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; - real_ScreenToClient(g_ddraw.hwnd, &pt); + real_ScreenToClient(g_ddraw->hwnd, &pt); lParam = MAKELPARAM(pt.x, pt.y); } - int x = max(GET_X_LPARAM(lParam) - g_ddraw.mouse.x_adjust, 0); - int y = max(GET_Y_LPARAM(lParam) - g_ddraw.mouse.y_adjust, 0); + int x = max(GET_X_LPARAM(lParam) - g_ddraw->mouse.x_adjust, 0); + int y = max(GET_Y_LPARAM(lParam) - g_ddraw->mouse.y_adjust, 0); if (g_config.adjmouse) { @@ -954,19 +896,26 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam } else { - x = (DWORD)(roundf(x * g_ddraw.mouse.unscale_x)); - y = (DWORD)(roundf(y * g_ddraw.mouse.unscale_y)); + x = (DWORD)(roundf(x * g_ddraw->mouse.unscale_x)); + y = (DWORD)(roundf(y * g_ddraw->mouse.unscale_y)); } } - x = min(x, g_ddraw.width - 1); - y = min(y, g_ddraw.height - 1); + x = min(x, g_ddraw->width - 1); + y = min(y, g_ddraw->height - 1); - InterlockedExchange((LONG*)&g_ddraw.cursor.x, x); - InterlockedExchange((LONG*)&g_ddraw.cursor.y, y); + InterlockedExchange((LONG*)&g_ddraw->cursor.x, x); + InterlockedExchange((LONG*)&g_ddraw->cursor.y, y); lParam = MAKELPARAM(x, y); + HWND video_hwnd = (HWND)InterlockedExchangeAdd((LONG*)&g_ddraw->video_window_hwnd, 0); + if (video_hwnd) + { + PostMessageA(video_hwnd, uMsg, wParam, lParam); + return 0; + } + break; } case WM_PARENTNOTIFY: @@ -983,28 +932,11 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam { if (!g_config.devmode && !g_mouse_locked) { - int x = GET_X_LPARAM(lParam); - int y = GET_Y_LPARAM(lParam); + int x = (DWORD)((GET_X_LPARAM(lParam) - g_ddraw->render.viewport.x) * g_ddraw->mouse.unscale_x); + int y = (DWORD)((GET_Y_LPARAM(lParam) - g_ddraw->render.viewport.y) * g_ddraw->mouse.unscale_y); - if (x > g_ddraw.render.viewport.x + g_ddraw.render.viewport.width || - x < g_ddraw.render.viewport.x || - y > g_ddraw.render.viewport.y + g_ddraw.render.viewport.height || - y < g_ddraw.render.viewport.y) - { - x = g_ddraw.width / 2; - y = g_ddraw.height / 2; - } - else - { - x = (DWORD)((x - g_ddraw.render.viewport.x) * g_ddraw.mouse.unscale_x); - y = (DWORD)((y - g_ddraw.render.viewport.y) * g_ddraw.mouse.unscale_y); - } - - x = min(x, g_ddraw.width - 1); - y = min(y, g_ddraw.height - 1); - - InterlockedExchange((LONG*)&g_ddraw.cursor.x, x); - InterlockedExchange((LONG*)&g_ddraw.cursor.y, y); + InterlockedExchange((LONG*)&g_ddraw->cursor.x, x); + InterlockedExchange((LONG*)&g_ddraw->cursor.y, y); mouse_lock(); } @@ -1021,23 +953,19 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam RedrawWindow(hWnd, NULL, NULL, RDW_INVALIDATE | RDW_ALLCHILDREN); } - if (g_ddraw.primary) - { - ReleaseSemaphore(g_ddraw.render.sem, 1, NULL); - } - + ReleaseSemaphore(g_ddraw->render.sem, 1, NULL); break; } case WM_ERASEBKGND: { - if (g_ddraw.primary && (g_ddraw.render.viewport.x != 0 || g_ddraw.render.viewport.y != 0)) + if (g_ddraw->render.viewport.x != 0 || g_ddraw->render.viewport.y != 0) { - InterlockedExchange(&g_ddraw.render.clear_screen, TRUE); - ReleaseSemaphore(g_ddraw.render.sem, 1, NULL); + InterlockedExchange(&g_ddraw->render.clear_screen, TRUE); + ReleaseSemaphore(g_ddraw->render.sem, 1, NULL); } break; } } - return CallWindowProcA(g_ddraw.wndproc, hWnd, uMsg, wParam, lParam); + return CallWindowProcA(g_ddraw->wndproc, hWnd, uMsg, wParam, lParam); }