merge commit for archive created by Sapling

Due to recent development of tools and discussions, this
is something that came up and has probably been overdue
for ages.

Document key concepts of how the iidx engine works regaring
rendering, game loop and (song) sync.

Add a “syncbook” that provides context and guidelines how
to configure any (modern) system to work properly with iidx.

Dockerfile.dev

@@ -1,21 +0,0 @@
-FROM --platform=amd64 debian:11.6-slim@sha256:f7d141c1ec6af549958a7a2543365a7829c2cdc4476308ec2e182f8a7c59b519
-
-LABEL description="Development environment for bemanitools"
-
-# mingw-w64-gcc has 32-bit and 64-bit toolchains
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    mingw-w64 \
-    mingw-w64-common \
-    make \
-    zip \
-    git \
-    clang-format \
-    python3-pip \
- && rm -rf /var/lib/apt/lists/*
-
-RUN pip3 install mdformat
-
-RUN mkdir /bemanitools
-WORKDIR /bemanitools
-
-ENV SHELL /bin/bash

GNUmakefile

@@ -13,10 +13,8 @@ BUILDDIR        ?= build
 
 builddir_docker 	  := $(BUILDDIR)/docker
 
-docker_build_container_name := "bemanitools-build"
-docker_build_image_name     := "bemanitools-build:latest"
-docker_dev_container_name := "bemanitools-dev"
-docker_dev_image_name     := "bemanitools-dev:latest"
+docker_container_name := "bemanitools-build"
+docker_image_name     := "bemanitools-build:latest"
 
 depdir                := $(BUILDDIR)/dep
 objdir                := $(BUILDDIR)/obj
@@ -43,7 +41,6 @@ FORCE:
 
 .PHONY: \
 build-docker \
-dev-docker \
 clean \
 code-format \
 doc-format \
@@ -92,38 +89,21 @@ version:
 	$(V)echo "$(gitrev)" > version
 
 build-docker:
-	$(V)docker rm -f $(docker_build_container_name) 2> /dev/null || true
+	$(V)docker rm -f $(docker_container_name) 2> /dev/null || true
 	$(V)docker \
 		build \
-		-t $(docker_build_image_name) \
-		-f Dockerfile.build \
+		-t $(docker_image_name) \
+		-f Dockerfile \
 		.
 	$(V)docker \
 		run \
 		--volume $(shell pwd):/bemanitools \
-		--name $(docker_build_container_name) \
-		$(docker_build_image_name)
-
-dev-docker:
-	$(V)docker rm -f $(docker_dev_container_name) 2> /dev/null || true
-	$(V)docker \
-		build \
-		-t $(docker_dev_image_name) \
-		-f Dockerfile.dev \
-		.
-	$(V)docker \
-		run \
-		--interactive \
-		--tty \
-		--volume $(shell pwd):/bemanitools \
-		--name $(docker_dev_container_name) \
-		$(docker_dev_image_name)
+		--name $(docker_container_name) \
+		$(docker_image_name)
 
 clean-docker:
-	$(V)docker rm -f $(docker_dev_container_name) || true
-	$(V)docker image rm -f $(docker_dev_image_name) || true
-	$(V)docker rm -f $(docker_build_container_name) || true
-	$(V)docker image rm -f $(docker_build_image_name) || true
+	$(V)docker rm -f $(docker_container_name) || true
+	$(V)docker image rm -f $(docker_image_name) || true
 	$(V)rm -rf $(BUILDDIR)
 
 #

Module.mk

@@ -100,7 +100,6 @@ include src/main/bstio/Module.mk
 include src/main/camhook/Module.mk
 include src/main/cconfig/Module.mk
 include src/main/config/Module.mk
-include src/main/core/Module.mk
 include src/main/d3d9-util/Module.mk
 include src/main/d3d9exhook/Module.mk
 include src/main/ddrhook-util/Module.mk
@@ -711,8 +710,6 @@ $(zipdir)/ddr-14-to-18.zip: \
 		build/bin/indep-32/eamio.dll \
 		build/bin/indep-32/geninput.dll \
 		dist/ddr/config.bat \
-		dist/ddr/gamestart-17.bat \
-		dist/ddr/gamestart-18.bat \
 		dist/ddr/gamestart-14.bat \
 		dist/ddr/gamestart-15.bat \
 		dist/ddr/gamestart-16.bat \
@@ -731,8 +728,6 @@ $(zipdir)/ddr-16-to-18-x64.zip: \
 		build/bin/indep-64/eamio.dll \
 		build/bin/indep-64/geninput.dll \
 		dist/ddr/config.bat \
-		dist/ddr/gamestart-17.bat \
-		dist/ddr/gamestart-18.bat \
 		dist/ddr/gamestart-16.bat \
 		dist/ddr/gamestart-17.bat \
 		dist/ddr/gamestart-18.bat \

doc/dev/journal/2025-02-09-iidx-engine.md

@@ -0,0 +1,319 @@
+# IIDX engine overview and how game-play is impacted by hardware and software
+
+Date: 2025-02-09 Author: icex2
+
+This document provides information and explains the following:
+
+* A sort-of taxonomy of the different major IIDX game engine versions
+* How the core game-play part of the engine works regarding
+  * Threading model
+  * Main render loop
+  * Timing and synchronization
+
+The goal is to capture key knowledge about how the game's engine works to enable a better
+understanding for developing bemanitools and how certain features can impact performance and
+synchronization during game-play.
+
+This document is not claiming to be complete or 100% accurate. It is based on my own personal
+research and understanding of the IIDX game engine. It is very likely that some of the information
+is wrong or misunderstood. Feel free to raise any questions or concerns in an issue as I want
+this document to be as accurate as possible.
+
+## Taxonomy of IIDX game engine versions
+
+With every version, there have been numerous changes and improvements to the game engine. The
+following is a rough taxonomy that is focused on cabinet and hardware changes. As these are likely
+the main driver for key changes to the software and game engine, they create fairly distinct
+stages throughout the different versions of the game. The key attributes to be considered here are:
+
+* Main PCB
+* IO board
+* Monitor
+
+All of these had significant impact on key software features appearing or changing.
+
+### Twinkle hardware era: 1st Style to 8th Style
+
+* [Twinkle PCB](https://github.com/shizmob/arcade-docs/blob/main/konami/boards.md#twinkle)
+* [Original rear projection monitor](https://github.com/shizmob/arcade-docs/blob/main/konami/products.md#iidx-rear-projection-monitor)
+* Homogenous hardware and software
+
+### 1st gen PC-based upgrade only: 9th Style
+
+* 9th Style came as an upgrade kit only to existing twinkle-based cabinet hardware
+* [KNM-845G3-A02 PCB](https://github.com/shizmob/arcade-docs/blob/main/konami/boards.md#knm-845g3-a02)
+* [C02 EZUSB FX USB IO board](https://github.com/shizmob/arcade-docs/blob/main/konami/io.md#gec02-pwbaa)
+* Magnetic card readers connected to ezusb IO board
+
+### 1st gen PC-based with dedicated cabinet: 10th Style to DistorteD (13)
+
+* From here on, old cabinets that received the "Twinkle hardware" upgrade kit could always receive software only
+  upgrades
+* [CRT monitor](https://github.com/shizmob/arcade-docs/blob/main/konami/products.md#iidx-crt-monitor) with new dedicated
+  cabinets
+* [D01 EZUSB FX USB IO board](https://github.com/shizmob/arcade-docs/blob/main/konami/io.md#d01-io)
+* Slotted card readers starting version 13
+
+### 2nd gen PC: GOLD (14) to Lincle (19)
+
+* [FAB-e945-KN205](https://github.com/shizmob/arcade-docs/blob/main/konami/boards.md#fab-e945-kn205)
+* All prior cabinet configurations can be upgraded with a PCB and software upgrade
+* New LCD monitor starting version 15
+  * Further variants of the LCD monitor appear starting version 18
+* [IO2 EZUSB FX2 USB IO board](https://github.com/shizmob/arcade-docs/blob/main/konami/io.md#usbio2) introduced with
+  version 14
+* Switch to wave pass readers on version 19
+
+### 3rd gen PC: Tricoro (20) to Sinobuz (24)
+
+* All prior cabinet configurations can be upgraded with a PCB and software upgrade
+* [ADE-HM65](https://github.com/shizmob/arcade-docs/blob/main/konami/boards.md#hm65)
+* Game engine supports HD mode (720p)
+* Many new LCD monitor variants appear with every new version
+
+### 4th gen PC: CANNON BALLERS (25) to RESIDENT (30)
+
+* All prior cabinet configurations can be upgraded with a PCB and software upgrade
+* [ADE-6291](https://github.com/shizmob/arcade-docs/blob/main/konami/boards.md#ade-6291)
+* [BIO2 IO board](https://github.com/shizmob/arcade-docs/blob/main/konami/boards.md#hm65)
+  * Upgrade cabinets required the [BIO2 sub-IO board](https://github.com/shizmob/arcade-docs/blob/main/konami/io.md#bio2-ldj-sub-io)
+* Drop of SD mode support starting version 27
+* Supporting 120 hz monitors starting version 27
+* Many new LCD monitor variants appear with every new version
+  * 42" 120 hz for lightning cabinets starting version 27
+  * 42" 60 hz for non-lightning cabinets starting version 25
+
+### 5th gen PC: RESIDENT (30) to EPOLIS (31)
+
+* All prior cabinet configurations can be upgraded with a PCB and software upgrade
+* [C300-xonarae](https://github.com/shizmob/arcade-docs/blob/main/konami/boards.md#c300-xonarae)
+* Game engine supports FHD mode (1080p)
+
+## Threading model and core responsibilities in PC-based games
+
+Since the early days of 9th Style to today (as of time of writing this: EPOLIS), the threading model
+hasn't changed significantly:
+
+* Main and rendering thread
+  * Runs your typical D3D9 render loop
+    * Using D3D9ex starting version 27
+  * Starting and managing other threads
+  * Any file and game asset loading
+  * Handles all the core game logic of the different screens starting from the initial boot screen
+    to the core game-play screen
+* IO thread
+  * Polls the main IO hardware and synchronizes the in-memory input and output state with the
+    hardware
+  * Executes commands issued by the main thread to the IO board such as dongle or card reader
+    commands (ezusb generation of IO only)
+* Card reader thread (not applicable to versions 9 to 12)
+  * Runs the protocol to read/write the hardware of the readers
+  * Async execution of higher level commands issued by the main thread to the card reader hardware,
+    e.g. card read, card eject etc.
+* Audio thread
+  * Streaming of audio data to the sound API
+    * DirectSound for versions 9 to 26
+    * WASAPI for versions 27 to 30 for non-lighting cabinets with ADE-6291 hardware
+    * ASIO for versions 27 and newer for lighting cabinets
+    * ASIO for version 30/31 and newer for non-lighting cabinets with C300-xonarae hardware
+  * Async execution of higher level commands issued by the main thread to the audio backend, e.g.
+    play audio, stop audio, etc.
+* Network thread
+  * Network plumbing with the xrpc protocol
+  * Async execution of request-response commands issued by the main thread
+
+## Main and rendering thread
+
+With the game having transitioning to different screens throughout it's lifecycle, the main render
+loop might contain different logic such as asset loading. The following focuses on the main
+game-play screen, only. Common rendering logic still applies to other screens.
+
+This follows your typical D3D9 single threaded rendering loop which boils down to the following:
+
+* Begin the scene (`BeginScene`)
+* Set the render target (`SetRenderTarget`)
+* Clear the back buffer (`Clear`)
+* Run engine step. This includes and is mixed with
+  * IO input evaluation
+  * Game engine state and (re-) drawing the scene
+  * Commands to the audio playback, e.g. play key sounds
+  * Setting IO outputs
+* End the scene (`EndScene`)
+* Target a minimum frame time
+  * Introduced with version 11
+  * Sleep (`Sleep` or `SleepEx`) to fill up the frame up to either 13 ms or 14 ms (depending on the
+    version)
+  * This was likely introduced to not have the game run at hundreds of FPS if v-sync was disabled
+    (probably when running in window mode for development/testing purposes)
+* Swapping the back buffers (`Present`)
+  * D3D9 is configured with v-sync enabled by default and targets 60 hz
+  * With this configuration, the call to `Present` fills up the remaining frame time to target the
+    configured 60 hz refresh rate
+
+### Rendering resolutions
+
+The game engine went through a couple of different rendering resolutions:
+
+* 640x240: version 1 to 8 (all twinkle hardware)
+* 640x480: version 9 to 19 (1st and 2nd gen PC-based)
+* 1280x720 (HD mode) and 640x480 (SD mode): version 20 to 27 (3rd and 4th gen PC-based)
+* 1280x720 (HD mode) only for version 28 to 29 (4th gen PC-based)
+* 1280x720 (HD mode) and 1920x1080 (FHD mode) for version 30 (4th gen PC-based)
+* 1920x1080 (FHD mode) only for version 30+ (5th gen PC-based)
+
+## Core engine timing and synchronization
+
+The following outlines and explains the core engine concepts related to timing and synchronization.
+
+### The origins, twinkle hardware
+
+* It appears that the game has been on the same codebase since it's inception.
+* This can be reasoned by the following observations
+  * 9th style as the first PC-based game very buggy on initial release 
+  * 9th style threading model very clunky with various thread settings showing they tried to
+    prioritize different processing on a single core CPU 
+  * Coming from twinkle hardware that is a realtime system vs. a Windows XP system
+    * Fixed playstation 1 based hardware with a refresh rate of
+      [59.8260978565 hz](https://github.com/mamedev/mame/blob/bf9df04e005697788ae988ef5aea91a1878fd631/src/devices/video/psx.cpp#L435)
+    * No need to assume getting anything else if the resource budget per frame is not exceeded
+    * All sub-systems were driven synchronously to that fixed time step
+    * No need for the engine to synchronize audio during the song. When the song is started
+      correctly, it stayed sync throughout the song
+* Observations and assumptions
+  * It appears the developers struggled a lot with the significant platform shift to PC as indicated
+    by various core engine improvements throughout the years still
+  * Switches of hardware generations further complicated the situation as these forced them to further
+    drift away from how the game engine was initially designed on the twinkle system
+
+### Frame time/timing and engine step
+
+* The game's engine step and timing is frame based
+* The main render loop defines the minimum valid timing window for the game engine to be able to
+  evaluate
+  * 60 hz/fps = 16.667 ms (rounded to three decimal places)
+  * 120 hz/fps = 8.333 ms (rounded to three decimal places), only relevant for lightning cabinets with their 120 hz
+    screen/mode
+* Depending on the GPU hardware and configuration, the GPU might drive the screen not exactly at
+  perfectly 60 hz/fps = 16.667 ms
+* As outlined in the [main render loop](#main-and-rendering-thread), the `Present` call is the
+  key function call to determine the frame time for the game engine
+* Just having v-sync enabled and telling D3D9 to **target** 60 hz, it still depends on how the GPU
+  driver is implemented and how the GPU driver's implementation of D3D9 executes on the `Present`
+  call
+* This is primarily determined by how the GPU driver is operating and driving connected display
+  hardware
+* The following factors can contribute to that either directly or indirectly
+  * Different monitor types analog vs. digital (CRT vs. LCD)
+  * Different monitor connections VGA vs. DVI/HDMI/DP
+  * Different GPU drivers
+  * Different GPU hardware and vendors
+  * Different GPU settings
+
+### Monitor check screen
+
+The monitor check screen was introduced with version 14. This was a solution to the problem of not
+guaranteeing a single fixed refresh rate throughout different GPU and monitor combinations. See
+a detailed explanation in the previous sub-subsection about
+[what influences the frame time](#frame-timetiming-and-engine-step) of the game.
+
+The goal of the monitor check is to measure the frame time of the main render loop and use the
+results for [driving the core engine step](#engine-step-and-synchronization).
+
+The monitor check evolved slightly as different GPU and monitor hardware, and GPU drivers yielded
+varying refresh rates that determined the frame times of the main game loop.
+
+Actual values are outlined further down in the [engine step time](#engine-step-time) section.
+
+There are two main versions of the monitor check, all of them have always been part of the boot
+process:
+
+* 14
+  * Measures a total of 3000 frames
+  * If total time this took < 50004 ms -> so average of 16.668 ms per frame =  59.9952 hz
+    * S-Video mode -> 59.95 hz (also shows S-VIDEO when the monitor check completes)
+    * Otherwise VGA mode -> 60.05 hz
+  * If VGA is determined, the game patches the chart event data when loading
+    * `event_timestamp * 0.99817199 + 0.40000001` 
+  * When S-Video no charts are patched and the timing data in the chart is used as is
+* 15 to 18
+  * Identical to 14 except that chart patching now happens in milliseconds instead of frames
+  * VGA mode: `16.65279`
+  * S-Video mode: `16.680567`
+  * `event_timestamp * (1.0 / frame_time) + 0.40000001)`
+* 19
+  * Identical to previous version
+  * Monitor check screen shows current FPS on the last revision of that version. However, it doesn't
+    use the value shown there by any means. Assuming this was added before the introduction of the
+    new monitor check on 20.
+* 20 to 26
+  * Runs on boot or when switching monitor modes SD vs. HD 
+  * Measures only 1200 frames
+  * Takes the average refresh rate of 1200 frames
+  * Applies the measured avg. frame time directly to the charts before song
+* 27 to 30 
+  * Frame rate measuring identical to prior versions
+  * Added additional logic after the frame time measurements for handling of 120 hz displays 
+  * Includes checking the monitor and if the framerate matches as expected
+* 30/31 LDJ-010 upgrade
+  * Added NvDisplayConfigLDJ tool which runs on system start and configures a custom timing in the
+    NVIDIA GPU driver to ensure a fixed monitor refresh rate
+* 31
+  * Same code as before
+  * Consider the first 460 frames of the measurement as warm-up frames
+  * Discard these for the actual measurement to get more stable frame times
+  * Use a base avg. value of 119.982 for the 120 hz monitors and 59.9 for 60 hz monitors. Further
+    frames measured are counted towards the average with the given base value
+
+### Engine core game-play with visual and audio synchronization
+
+#### Chart data
+
+* Chart data encodes note timing and timing window information
+* Chart data consists of *note events* encoding a timestamp and note information such as type
+  and key-sound information
+* Timing windows are defined per chart
+* Most infamous example: GAMBOL (7Key/Another)
+* Game engine timestamp evaluation and note event timestamp encoding
+  * 9 to 14: Refresh rate in hz
+  * 15 to 31: Milliseconds (equivalent to assuming 1000 fps)
+* Fundamentally, that doesn't change game play experience as it's just a different way of
+  evaluating the timestamps since refresh rate in hz/frame rate in fps can be converted lossless to
+  frame time in ms
+
+#### Engine step time
+
+The engine uses the following source for frame rate/time to drive internal logic on the following
+versions
+
+* 9 to 13: Hardcoded 59.95 hz
+* 14: Either 59.95 hz or 60.05 hz determined by which value is determined to be closer to the
+  measured one during the monitor check screen on startup
+* 15 to 19: 59.95 hz or 60.05 hz
+  * Monitor check on startup measures the frame time and picks the value closest to what's been
+    measured
+  * Monitor check result can be overridden with the *Output Type* setting in the operator menu
+    * *S-Video* to force to 59.95 hz
+    * *VGA* to force to 60.05 hz
+* 20 to 31: Monitor check on boot determines the frame time and uses the result throughout the
+  entire game session
+
+#### Engine step and synchronization
+
+Per frame engine step advancing and synchronization during game-play
+
+* Game-play needs synchronization of the following aspects
+  * Drawn content on the screen
+  * Background audio playback track
+  * Key sound effects
+* The game engine synchronizes these only at the start of a song
+  * It takes known/determined refresh rate/frame time as the fixed time for every frame cycle
+    throughout the entire song
+  * It starts playback of the background audio track together with playback of the chart data
+  * With every engine step/frame it advances internal calculations by that fixed amount of time.
+    Thus, the game engine expects this to be constant/stable throughout an entire song
+  * The chart data is advanced every frame by the engine
+  * Key sound events are turned into audio playback on command as the chart advances
+  * No re-synchronization or check-pointing between main rendering thread and audio is happening
+    throughout the song
+* Remark: The above does not consider any kind of offsetting and timing adjustments for the sake
+  of keeping this simple and focus on the absolute core concepts 

doc/iidxhook/iidx-syncbook.md

@@ -0,0 +1,224 @@
+# IIDX "Syncbook": A guide to ensuring sync and performant gameplay
+
+This is a guide applicable to all IIDX versions that are native Windows PC-based. The goal is to 
+enable proper configuration of those games to ensure the game engine "runs in-sync" with any of its
+IO (visual GPU/display output, audio output, user input) resulting in high and stable performance
+for smooth game-play.
+
+This document won't go into the implementation details of the game engine. Please refer to the
+[IIDX engine details journal](../dev/journal/2025-02-09-iidx-engine.md) for a more in-depth
+information.
+
+## Understanding the problems and options to address them
+
+First, let's understand what the key problems are and how they contribute to different issues
+that impact game-play.
+
+### Song de-syncing
+
+Symptom: Throughout playing a song, the audio is de-syncing even it was fine when the song started.
+
+Cause: The game engine is fundamentally designed to run on a fixed and consistent frame
+rate/time per engine step. A mismatch of expected frame time by the game engine and actually delivered
+frame time by the GPU driver. This can come either as a stable frame time that just mismatches in
+general or (highly) fluctuating frame times.
+
+* G-sync on modern displays causes known fluctuations because it adjusts dynamically the monitor
+  refresh rate
+* V-sync not correctly configured/enforced or even vsync-off override in driver is causing
+  inconsistent frame times
+* Incorrect display timings causing refresh rate fluctuations resulting in inconsistent frame times
+
+Stable frame times but not having the correct ones that the game engine expects is a different
+problem that can be addressed by:
+
+* Knowing the refresh rates expected by the game engine of the different game versions
+* Configuring your GPU driver's display timings to match the expected frame times
+* Or, patch the game's chart data with your custom display timings so the game engine gets uses
+  *your* "correct" frame times
+  * Note: Offline patching the chart data doesn't work for several game versions as the monitor
+    check does override this data, but not as flexible as required
+  * Use the chart patch feature of bemanitools instead
+
+### Micro-stuttering and non-smooth note scrolling
+
+This is a trickier problem as it can be caused by a few different things.
+
+* GPU related
+  * Fluctuating refresh rates result in fluctuating frame times in the main game loop
+  * GPU power configuration in non-performance mode (e.g. "power saving") causes processing latency
+    due to sleep states
+* Display related
+  * Display firmware buggy and/or internal scalers that expect to run at very specific refresh rates
+    and cannot adapt to any custom display timings enforced by the GPU
+  * A known example is the official
+    [PENDUAL LCD monitor](https://github.com/shizmob/arcade-docs/blob/6ac99975cdb2bf668362f65fa9fa3ffb2127308b/konami/product/GULDJ-JI.md#notes-and-known-issues) that does not v-sync correctly to any other refresh-rate than 60.000 hz
+* CPU related
+  * CPU power configuration on Windows in non-performance mode (e.g. "power saving") causes
+    processing latency due to sleep states
+  * Correct CPU C-states configuration in BIOS/UEFI
+    * These cannot be configured in Windows and are separate from Windows's power configuration
+* Other stuff running in the background of the system causing fluctuations
+  * (Synchronous) Disk I/O heavy applications stealing CPU time
+  * Or any other process creating a considerable amount of CPU or GPU load
+
+## Configuration guide for different game versions
+
+### Measuring monitor refresh rate
+
+Let's start with configuring the system to meet the game engine's expectation regarding the
+target monitor refresh rate and requiring vsync.
+
+First, use the [d3d9-monitor-check tool](../tools/d3d9-monitor-check.md) to measure the currently
+configured refresh rate of your monitor. Note that your monitor might yield different timings on
+different resolutions and different game versions run on
+[different rendering resolutions](../dev/journal/2025-02-09-iidx-engine.md#rendering-resolutions).
+
+For example, the game version is 31 with the rendering resolution of 1920x1080 in FHD mode that you
+want to target:
+
+```bat
+d3d9-monitor-check.exe cmdline refresh-rate-test 1920 1080 60
+```
+
+The test shows the current monitor refresh rate and the average refresh rate over the course of
+the test. Check that the avg. refresh rate is stable during the measuring phase (during warm-up,
+it's ok if it fluctuates).
+
+This test allows you to determine/check:
+
+* Refresh rate/frame time fluctuations: if you see (high) fluctuations on the first or second
+  decimal place
+* What's your current target refresh rate the GPU is driving your monitor at
+* If vsync isn't overridden by some other driver setting as you want to see a refresh rate around
+  the 60 hz mark
+
+### Measuring vsync issues
+
+Some displays or the GPU configuration might lead to vsync issues which can be detected with the
+`d3d9-monitor-check.exe` tool as well.
+
+```bat
+d3d9-monitor-check.exe cmdline vsync-test 1920 1080 60
+```
+
+This runs a test with a VSYNC text that alternates red and cyan colors. If the text appears grey
+all the time, everything's fine. If you spot brief red or cyan text either occasionally or
+periodically, your current configuration has vsync issues resulting in skipped frames or old
+frames displaying longer.
+
+### Configuration
+
+The following are recommended configurations for the different game versions. If any of these
+don't work as expected, you have to troubleshoot and tweak these potentially. Please refer to the
+[guidelines above](#configuration-guide-for-different-game-versions) to understand how to use
+the tooling and test your changes.
+
+#### Recommended configuration with NVIDIA GPU and driver
+
+We want to achieve the following configuration on the GPU driver:
+
+* Turn-off g-sync if you have a monitor that supports it
+* Disable power saving mode on GPU driver
+* V-sync is not forced off
+* Run the display on a target refresh rate of `59.950 hz` which has been determined to be
+  [the most compatible across all PC-based versions](../dev/journal/2025-02-09-iidx-engine.md#engine-step-time).
+
+##### Turn-off g-sync
+
+Create a new GPU profile for IIDX, if it doesn't exist yet:
+
+```bat
+nvgpu.exe profile create iidx
+```
+
+Add the application names when the profile needs to be applied:
+
+```bat
+:: For iidx versions 9 to 17
+nvgpu.exe profile application-add iidx bm2dx.exe
+:: For iidx versions 18+
+nvgpu.exe profile application-add iidx launcher.exe
+```
+
+Disable G-SYNC for the profile:
+
+```bat
+nvgpu.exe profile gsync-disable iidx
+```
+
+##### Disable power saving mode
+
+Set GPU power state to maximum for the profile (assumes you have a 
+[GPU profile called `iidx` already created](#turn-off-g-sync)):
+
+```bat
+nvgpu.exe profile gpu-power-state-max iidx
+```
+
+##### Configure and verify target refresh rate of 59.950 hz and vsync
+
+Get display ID of your primary display:
+
+```bat
+nvgpu.exe display primary-display-id
+```
+
+Copy the hex-value of the display ID and use it in the following commands.
+
+Test the custom display timing first, e.g. for versions that run in 1920x1080
+(Replace `<DISPLAY_ID> ` with the primary display ID you got):
+
+```bat
+nvgpu.exe display custom-resolution-test <DISPLAY_ID> 1920 1080 59.95 10
+```
+
+This will test it for 10 seconds and then revert. If the result looked good, i.e. the screen didn't
+go blank or the display output was garbage, apply it:
+
+```bat
+nvgpu.exe display custom-resolution-set <DISPLAY_ID> 1920 1080 59.95
+```
+
+Test and verify the configuration is applied and works correctly:
+
+```bat
+d3d9-monitor-check.exe cmdline refresh-rate-test 1920 1080 60
+```
+
+Test if the enforced refresh rate is compatible with your display and vsync is working correctly:
+
+```bat
+d3d9-monitor-check.exe cmdline vsync-test 1920 1080 60
+```
+
+##### Alternative refresh rate configuration
+
+If for some reason your display doesn't support 59.950 hz properly, i.e. display artifacts or vsync
+issues, you can use any other 60 hz compatible refresh rate, e.g. anything between 59.900 hz and
+60.100 hz that your display supports properly.
+
+Follow the same steps [as above](#configure-and-verify-target-refresh-rate-of-59950-hz-and-vsync) 
+but use a different refresh rate, e.g. 60.000 hz.
+
+Verify using the `d3d9-monitor-check.exe` with the outlined steps if you need to play around to find
+a refresh rate that works for your setup.
+
+For the game versions 9 to 19, you have to use the chart patch feature of bemanitools to patch
+the charts to your custom refresh rate. Otherwise, the game engine will run on your configured
+refresh rate, but it will take the non-matching refresh rate from the chart data which causes
+song de-syncing.
+
+For example, to configure a refresh rate of 60.000 hz in the iidxhook config file:
+
+```text
+gfx.monitor_check=60.000
+```
+
+##### ATI/AMD
+
+Currently, there is no tooling provided by bemanitools to configure the AMD GPU driver. The basic
+concepts of what needs to be configured still applies as outlined in the NVIDIA sections above
+though, e.g. through AMD's GPU control panel.
+
+Further steps and instructions TBD

doc/iidxhook/iidxhook1.md

@@ -146,16 +146,7 @@ This can be related to various issues:
 start "" /relatime "gamestart.bat"
 ```
 
-- Enforce v-sync enabled in your GPU settings.
-- Ensure that you have a constant refresh rate around the 60 hz (59.9xx or 60.0xx) that is not
-  jumping around. Use the timebase feature of one of the newer games to check that or enable
-  iidxhook's timebase and check the log output for the determined value. Run this a few times and
-  check if the results differ.
-- Use iidxhook's frame rate limiter feature (see further below) to software lock the refresh rate.
-  This might be necessary on Windows 7 and newer for D3D8 games, e.g. iidx 9 to 12, which seem to
-  ignore GPU side v-sync.
-- Use iidxhook's auto timebase feature (see further below) or set a pre-determined value to cut down
-  start-up times.
+Also refer to the [iidx-syncbook](iidx-syncbook.md).
 
 ### The game still stutters (randomly) and drifts off-sync
 
@@ -173,9 +164,7 @@ This can be caused by:
 
 ## My songs are offsync
 
-- Make sure your machine's refresh rate is stable
-- If you don't get a close to 59.94hz refresh rate, use the software monitor check/auto timebase
-  that's built into iidxhook (refer to help/config file)
+Refer to the [iidx-syncbook](iidx-syncbook.md).
 
 ## The game crashes instantly (10th, RED, HAPPY SKY)
 
@@ -233,6 +222,8 @@ file) or use a CLVSD.ax codec which has the debugger checks removed.
 
 ## I used the auto timebase option and/or limited my refresh rate but the songs are still going offsync
 
+Refer to the [iidx-syncbook](iidx-syncbook.md) if you haven't already.
+
 There aren't many options left. The old games were developed for specific hardware and are not
 guaranteed to work well on (especially) newer hardware. Multiple monitor setups can also have a bad
 impact on a stable refresh rate. Try a setup with just a single monitor you want to use for gameplay

doc/iidxhook/iidxhook2.md

@@ -115,16 +115,7 @@ This can be related to various issues:
 start "" /relatime "gamestart.bat"
 ```
 
-- Enforce v-sync enabled in your GPU settings.
-- Ensure that you have a constant refresh rate around the 60 hz (59.9xx or 60.0xx) that is not
-  jumping around. Use the timebase feature of one of the newer games to check that or enable
-  iidxhook's timebase and check the log output for the determined value. Run this a few times and
-  check if the results differ.
-- Use iidxhook's frame rate limiter feature (see further below) to software lock the refresh rate.
-  This might be necessary on Windows 7 and newer for D3D8 games, e.g. iidx 9 to 12, which seem to
-  ignore GPU side v-sync.
-- Use iidxhook's auto timebase feature (see further below) or set a pre-determined value to cut down
-  start-up times.
+Also refer to the [iidx-syncbook](iidx-syncbook.md).
 
 ### The game still stutters (randomly) and drifts off-sync
 
@@ -142,9 +133,7 @@ This can be caused by:
 
 ## My songs are offsync
 
-- Make sure your machine's refresh rate is stable
-- If you don't get a close to 59.94hz refresh rate, use the software monitor check/auto timebase
-  that's built into iidxhook (refer to help/config file)
+Refer to the [iidx-syncbook](iidx-syncbook.md).
 
 ## The game crashes instantly
 
@@ -192,6 +181,8 @@ CLVSD.ax codec which has the debugger checks removed.
 
 ## I used the auto timebase option and/or limited my refresh rate but the songs are still going offsync
 
+Refer to the [iidx-syncbook](iidx-syncbook.md) if you haven't already.
+
 There aren't many options left. The old games were developed for specific hardware and are not
 guaranteed to work well on (especially) newer hardware. Multiple monitor setups can also have a bad
 impact on a stable refresh rate. Try a setup with just a single monitor you want to use for gameplay

doc/iidxhook/iidxhook3.md

@@ -132,16 +132,7 @@ This can be related to various issues:
 start "" /relatime "gamestart.bat"
 ```
 
-- Enforce v-sync enabled in your GPU settings.
-- Ensure that you have a constant refresh rate around the 60 hz (59.9xx or 60.0xx) that is not
-  jumping around. Use the timebase feature of one of the newer games to check that or enable
-  iidxhook's timebase and check the log output for the determined value. Run this a few times and
-  check if the results differ.
-- Use iidxhook's frame rate limiter feature (see further below) to software lock the refresh rate.
-  This might be necessary on Windows 7 and newer for D3D8 games, e.g. iidx 9 to 12, which seem to
-  ignore GPU side v-sync.
-- Use iidxhook's auto timebase feature (see further below) or set a pre-determined value to cut down
-  start-up times.
+Also refer to the [iidx-syncbook](iidx-syncbook.md).
 
 ## "NETWORK WARNING" instead of "NETWORK OK"
 
@@ -154,15 +145,7 @@ This can be caused by:
 
 ## My songs are offsync
 
-The built-in monitor check just determines if the game should sync to either 59.94 hz (S-Video
-setting) or 60.04 hz (VGA setting). If you don't have a setup that runs on (as close as possible)
-these values:
-
-- Make sure your machine's refresh rate is stable, e.g. 60.00x hz.
-- If you don't get a close to 59.94hz (S-Video setting) or 60.04 hz (VGA setting) refresh rate, go
-  an set the output mode in the operator menu to "VGA" to enforce the game to run chart syncing on
-  60.04 hz refresh rate (even if your setup does not have that value). Next, use the software
-  monitor check/auto timebase that's built into iidxhook (refer to cmd help/configfile).
+Refer to the [iidx-syncbook](iidx-syncbook.md).
 
 ## My game runs too fast
 
@@ -205,6 +188,8 @@ CLVSD.ax codec which has the debugger checks removed.
 
 ## I used the auto timebase option and/or limited my refresh rate but the songs are still going offsync
 
+Refer to the [iidx-syncbook](iidx-syncbook.md) if you haven't already.
+
 There aren't many options left. The old games were developed for specific hardware and are not
 guaranteed to work well on (especially) newer hardware. Multiple monitor setups can also have a bad
 impact on a stable refresh rate. Try a setup with just a single monitor you want to use for gameplay

doc/iidxhook/iidxhook4.md

@@ -143,16 +143,7 @@ This can be related to various issues:
 start "" /relatime "gamestart.bat"
 ```
 
-- Enforce v-sync enabled in your GPU settings.
-- Ensure that you have a constant refresh rate around the 60 hz (59.9xx or 60.0xx) that is not
-  jumping around. Use the timebase feature of one of the newer games to check that or enable
-  iidxhook's timebase and check the log output for the determined value. Run this a few times and
-  check if the results differ.
-- Use iidxhook's frame rate limiter feature (see further below) to software lock the refresh rate.
-  This might be necessary on Windows 7 and newer for D3D8 games, e.g. iidx 9 to 12, which seem to
-  ignore GPU side v-sync.
-- Use iidxhook's auto timebase feature (see further below) or set a pre-determined value to cut down
-  start-up times.
+Also refer to the [iidx-syncbook](iidx-syncbook.md).
 
 ## "NETWORK WARNING" instead of "NETWORK OK"
 
@@ -165,15 +156,7 @@ This can be caused by:
 
 ## My songs are offsync
 
-The built-in monitor check just determines if the game should sync to either 59.94 hz (S-Video
-setting) or 60.04 hz (VGA setting). If you don't have a setup that runs on (as close as possible)
-these values:
-
-- Make sure your machine's refresh rate is stable, e.g. 60.00x hz.
-- If you don't get a close to 59.94hz (S-Video setting) or 60.04 hz (VGA setting) refresh rate, go
-  an set the output mode in the operator menu to "VGA" to enforce the game to run chart syncing on
-  60.04 hz refresh rate (even if your setup does not have that value). Next, use the software
-  monitor check/auto timebase that's built into iidxhook (refer to cmd help/configfile).
+Refer to the [iidx-syncbook](iidx-syncbook.md).
 
 ## My game runs too fast
 
@@ -211,6 +194,8 @@ CLVSD.ax codec which has the debugger checks removed.
 
 ## I used the auto timebase option and/or limited my refresh rate but the songs are still going offsync
 
+Refer to the [iidx-syncbook](iidx-syncbook.md) if you haven't already.
+
 There aren't many options left. The old games were developed for specific hardware and are not
 guaranteed to work well on (especially) newer hardware. Multiple monitor setups can also have a bad
 impact on a stable refresh rate. Try a setup with just a single monitor you want to use for gameplay

doc/iidxhook/iidxhook5.md

@@ -143,16 +143,7 @@ This can be related to various issues:
 start "" /relatime "gamestart.bat"
 ```
 
-- Enforce v-sync enabled in your GPU settings.
-- Ensure that you have a constant refresh rate around the 60 hz (59.9xx or 60.0xx) that is not
-  jumping around. Use the timebase feature of one of the newer games to check that or enable
-  iidxhook's timebase and check the log output for the determined value. Run this a few times and
-  check if the results differ.
-- Use iidxhook's frame rate limiter feature (see further below) to software lock the refresh rate.
-  This might be necessary on Windows 7 and newer for D3D8 games, e.g. iidx 9 to 12, which seem to
-  ignore GPU side v-sync.
-- Use iidxhook's auto timebase feature (see further below) or set a pre-determined value to cut down
-  start-up times.
+Also refer to the [iidx-syncbook](iidx-syncbook.md).
 
 ## "NETWORK WARNING" instead of "NETWORK OK"
 
@@ -165,11 +156,7 @@ This can be caused by:
 
 ## My songs are offsync
 
-From this version onwards (if you use the very final data of Lincle), the game comes with a built-in
-auto timebase option ("monitor check" on startup) which dynamically, detects the refresh rate of
-your current setup. Thus, BT5's timebase option is not included from this hook version onwards,
-anymore. Ensure that refresh rate displayed is very stable, e.g. 60.00x hz, and the game should be
-able to provide you with a smooth and sync game experience.
+Refer to the [iidx-syncbook](iidx-syncbook.md).
 
 ## My game runs too fast
 

doc/iidxhook/iidxhook6.md

@@ -155,11 +155,7 @@ This can be related to various issues:
 start "" /relatime "gamestart.bat"
 ```
 
-- Enforce v-sync enabled in your GPU settings.
-- Ensure that you have a constant refresh rate around the 60 hz (59.9xx or 60.0xx) that is not
-  jumping around. Use the timebase feature of one of the newer games to check that or enable
-  iidxhook's timebase and check the log output for the determined value. Run this a few times and
-  check if the results differ.
+Also refer to the [iidx-syncbook](iidx-syncbook.md).
 
 ## "NETWORK WARNING" instead of "NETWORK OK"
 
@@ -172,11 +168,7 @@ This can be caused by:
 
 ## My songs are offsync
 
-From this version onwards (or Lincle very final revision), the game comes with a built-in auto
-timebase option ("monitor check" on startup) which dynamically, detects the refresh rate of your
-current setup. Thus, BT5's timebase option is not included from this hook version onwards, anymore.
-Ensure that refresh rate displayed is very stable, e.g. 60.00x hz, and the game should be able to
-provide you with a smooth and sync game experience.
+Refer to the [iidx-syncbook](iidx-syncbook.md).
 
 ## My game runs too fast
 

doc/iidxhook/iidxhook7.md

@@ -159,11 +159,7 @@ This can be related to various issues:
 start "" /relatime "gamestart.bat"
 ```
 
-- Enforce v-sync enabled in your GPU settings.
-- Ensure that you have a constant refresh rate around the 60 hz (59.9xx or 60.0xx) that is not
-  jumping around. Use the timebase feature of one of the newer games to check that or enable
-  iidxhook's timebase and check the log output for the determined value. Run this a few times and
-  check if the results differ.
+Also refer to the [iidx-syncbook](iidx-syncbook.md).
 
 ## "NETWORK WARNING" instead of "NETWORK OK"
 
@@ -176,11 +172,7 @@ This can be caused by:
 
 ## My songs are offsync
 
-From IIDX 20 (or Lincle very final revision) onwards, the game comes with a built-in auto timebase
-option ("monitor check" on startup) which dynamically, detects the refresh rate of your current
-setup. Thus, BT5's timebase option is not included from this hook version onwards, anymore. Ensure
-that refresh rate displayed is very stable, e.g. 60.00x hz, and the game should be able to provide
-you with a smooth and sync game experience.
+Refer to the [iidx-syncbook](iidx-syncbook.md).
 
 ## My game runs too fast
 

doc/iidxhook/iidxhook8.md

@@ -158,11 +158,7 @@ This can be related to various issues:
 start "" /relatime "gamestart.bat"
 ```
 
-- Enforce v-sync enabled in your GPU settings.
-- Ensure that you have a constant refresh rate around the 60 hz (59.9xx or 60.0xx) that is not
-  jumping around. Use the timebase feature of one of the newer games to check that or enable
-  iidxhook's timebase and check the log output for the determined value. Run this a few times and
-  check if the results differ.
+Also refer to the [iidx-syncbook](iidx-syncbook.md).
 
 ## "NETWORK WARNING" instead of "NETWORK OK"
 
@@ -175,11 +171,7 @@ This can be caused by:
 
 ## My songs are offsync
 
-From IIDX 20 (or Lincle very final revision) onwards, the game comes with a built-in auto timebase
-option ("monitor check" on startup) which dynamically, detects the refresh rate of your current
-setup. Thus, BT5's timebase option is not included from this hook version onwards, anymore. Ensure
-that refresh rate displayed is very stable, e.g. 60.00x hz, and the game should be able to provide
-you with a smooth and sync game experience.
+Refer to the [iidx-syncbook](iidx-syncbook.md).
 
 ## My game runs too fast
 

doc/iidxhook/iidxhook9.md

@@ -205,11 +205,7 @@ This can be related to various issues:
 start "" /relatime "gamestart.bat"
 ```
 
-- Enforce v-sync enabled in your GPU settings.
-- Ensure that you have a constant refresh rate around the 60 hz (59.9xx or 60.0xx) that is not
-  jumping around. Use the timebase feature of one of the newer games to check that or enable
-  iidxhook's timebase and check the log output for the determined value. Run this a few times and
-  check if the results differ.
+Also refer to the [iidx-syncbook](iidx-syncbook.md).
 
 ## "NETWORK WARNING" instead of "NETWORK OK"
 
@@ -222,11 +218,7 @@ This can be caused by:
 
 ## My songs are offsync
 
-From IIDX 20 (or Lincle very final revision) onwards, the game comes with a built-in auto timebase
-option ("monitor check" on startup) which dynamically, detects the refresh rate of your current
-setup. Thus, BT5's timebase option is not included from this hook version onwards, anymore. Ensure
-that refresh rate displayed is very stable, e.g. 60.00x hz, and the game should be able to provide
-you with a smooth and sync game experience.
+Refer to the [iidx-syncbook](iidx-syncbook.md).
 
 ## My game runs too fast
 

src/api/log.h

@@ -1,31 +0,0 @@
-#ifndef BEMANITOOLS_API_THREAD_H
-#define BEMANITOOLS_API_THREAD_H
-
-#include <stdint.h>
-
-#ifdef __GNUC__
-/* Bemanitools is compiled with GCC (MinGW, specifically) as of version 5 */
-#define LOG_CHECK_FMT __attribute__((format(printf, 2, 3)))
-#else
-/* Compile it out for MSVC plebs */
-#define LOG_CHECK_FMT
-#endif
-
-/* An AVS-style logger function. Comes in four flavors: misc, info, warning,
-   and fatal, with increasing severity. Fatal loggers do not return, they
-   abort the running process after writing their message to the log.
-
-   "module" is an arbitrary short string identifying the source of the log
-   message. The name of the calling DLL is a good default choice for this
-   string, although you might want to identify a module within your DLL here
-   instead.
-
-   "fmt" is a printf-style format string. Depending on the context in which
-   your DLL is running you might end up calling a logger function exported
-   from libavs, which has its own printf implementation (including a number of
-   proprietary extensions), so don't use any overly exotic formats. */
-
-typedef void (*btapi_log_formatter_t)(const char *module, const char *fmt, ...)
-    LOG_CHECK_FMT;
-
-#endif

src/api/thread.h

@@ -1,20 +0,0 @@
-#ifndef BEMANITOOLS_API_THREAD_H
-#define BEMANITOOLS_API_THREAD_H
-
-#include <stdint.h>
-
-/* An API for spawning threads. This API is defined by libavs, although
-   Bemanitools itself may supply compatible implementations of these functions
-   to your DLL, depending on the context in which it runs.
-
-   NOTE: You may only use the logging functions from a thread where Bemanitools
-   calls you, or a thread that you create using this API. Failure to observe
-   this restriction will cause the process to crash. This is a limitation of
-   libavs itself, not Bemanitools. */
-
-typedef int (*btapi_thread_create_t)(
-    int (*proc)(void *), void *ctx, uint32_t stack_sz, unsigned int priority);
-typedef void (*btapi_thread_join_t)(int thread_id, int *result);
-typedef void (*btapi_thread_destroy_t)(int thread_id);
-
-#endif

src/imports/avs.h

@@ -220,9 +220,6 @@ void property_file_write(struct property *prop, const char *path);
 int property_set_flag(struct property *prop, int flags, int mask);
 void property_destroy(struct property *prop);
 
-avs_error property_get_error(struct property *prop);
-void property_clear_error(struct property *prop);
-
 int property_psmap_import(
     struct property *prop,
     struct property_node *root,

src/imports/import_32_0_avs.def

@@ -25,8 +25,6 @@ EXPORTS
     property_destroy
     property_file_write
     property_insert_read
-    property_clear_error
-    property_get_error
     property_mem_write
     property_read_query_memsize
     property_search

src/imports/import_32_1002_avs.def

@@ -28,8 +28,6 @@ EXPORTS
     property_destroy
     property_file_write
     property_insert_read
-    property_clear_error
-    property_get_error
     property_mem_write
     property_read_query_memsize
     property_search

src/imports/import_32_1101_avs.def

@@ -26,8 +26,6 @@ EXPORTS
     property_desc_to_buffer @246 NONAME
     property_destroy @247 NONAME
     property_insert_read @255 NONAME
-    property_clear_error @573 NONAME
-    property_get_error @573 NONAME
     property_node_create @266 NONAME
     property_node_datasize @267 NONAME
     property_node_name @274 NONAME

src/imports/import_32_1304_avs.def

@@ -25,8 +25,6 @@ EXPORTS
     property_desc_to_buffer @201 NONAME
     property_destroy @264 NONAME
     property_insert_read @23 NONAME
-    property_clear_error @573 NONAME
-    property_get_error @573 NONAME
     property_node_create @316 NONAME
     property_node_datasize @249 NONAME
     property_node_name @255 NONAME

src/imports/import_32_1306_avs.def

@@ -25,8 +25,6 @@ EXPORTS
     property_desc_to_buffer @201 NONAME == XC058ba50000cd
     property_destroy @264 NONAME == XC058ba500010f
     property_insert_read @23 NONAME == XC058ba5000016
-    property_clear_error @573 NONAME
-    property_get_error @573 NONAME
     property_node_create @316 NONAME == XC058ba5000143
     property_node_datasize @249 NONAME == XC058ba5000100
     property_node_name @255 NONAME == XC058ba5000106

src/imports/import_32_1403_avs.def

@@ -24,8 +24,6 @@ EXPORTS
     property_desc_to_buffer @131 NONAME
     property_destroy @130 NONAME
     property_insert_read @133 NONAME
-    property_clear_error @573 NONAME
-    property_get_error @573 NONAME
     property_node_name @573 NONAME == 
     property_node_read @573 NONAME == 
     property_node_remove @148 NONAME

src/imports/import_32_1508_avs.def

@@ -26,8 +26,6 @@ EXPORTS
     property_desc_to_buffer @129 NONAME
     property_destroy @128 NONAME
     property_insert_read @131 NONAME
-    property_clear_error @573 NONAME
-    property_get_error @573 NONAME
     property_node_create @145 NONAME
     property_node_name @150 NONAME
     property_node_read @154 NONAME == XCd229cc0000f3

src/imports/import_32_1601_avs.def

@@ -19,8 +19,6 @@ EXPORTS
     property_destroy @125 NONAME
     property_desc_to_buffer @126 NONAME
     property_insert_read @128 NONAME
-    property_clear_error @573 NONAME
-    property_get_error @573 NONAME
     property_search @141 NONAME
     property_node_create @142 NONAME
     property_node_name @147 NONAME == XCnbrep7000092

src/imports/import_32_1603_avs.def

@@ -19,8 +19,6 @@ EXPORTS
     property_destroy @146 NONAME
     property_desc_to_buffer @147 NONAME
     property_insert_read @149 NONAME
-    property_clear_error @158 NONAME == XCnbrep700009d
-    property_get_error @159 NONAME == XCnbrep700009e
     property_search @162 NONAME
     property_node_create @163 NONAME
     property_node_name @168 NONAME == XCnbrep70000a7

src/imports/import_32_1700_avs.def

@@ -21,8 +21,6 @@ EXPORTS
     property_destroy @146 NONAME
     property_desc_to_buffer @147 NONAME
     property_insert_read @149 NONAME
-    property_clear_error @158 NONAME == XCgsqzn000009d
-    property_get_error @159 NONAME == XCgsqzn000009e
     property_search @162 NONAME
     property_node_create @163 NONAME
     property_node_name @168 NONAME == XCgsqzn00000a7

src/imports/import_32_803_avs.def

@@ -25,8 +25,6 @@ EXPORTS
     property_destroy
     property_file_write
     property_insert_read
-    property_clear_error
-    property_get_error
     property_mem_write
     property_read_query_memsize
     property_search

src/imports/import_64_1508_avs.def

@@ -26,8 +26,6 @@ EXPORTS
     property_desc_to_buffer @129 NONAME
     property_destroy @128 NONAME
     property_insert_read @131 NONAME
-    property_clear_error @573 NONAME
-    property_get_error @573 NONAME
     property_node_create @145 NONAME
     property_node_name @150 NONAME
     property_node_read @154 NONAME == XCd229cc0000f3

src/imports/import_64_1509_avs.def

@@ -26,8 +26,6 @@ EXPORTS
     property_desc_to_buffer @129 NONAME
     property_destroy @128 NONAME
     property_insert_read @131 NONAME
-    property_clear_error @573 NONAME
-    property_get_error @573 NONAME
     property_node_create @145 NONAME
     property_node_name @573 NONAME == 
     property_node_read @573 NONAME == 

src/imports/import_64_1601_avs.def

@@ -19,8 +19,6 @@ EXPORTS
     property_destroy @125 NONAME
     property_desc_to_buffer @126 NONAME
     property_insert_read @128 NONAME
-    property_clear_error @573 NONAME
-    property_get_error @573 NONAME
     property_search @141 NONAME
     property_node_create @142 NONAME
     property_node_name @147 NONAME == XCnbrep7000092

src/imports/import_64_1603_avs.def

@@ -19,14 +19,12 @@ EXPORTS
     property_destroy @146 NONAME
     property_desc_to_buffer @147 NONAME
     property_insert_read @149 NONAME
-    property_clear_error @158 NONAME == XCnbrep700009d
-    property_get_error @159 NONAME == XCnbrep700009e
     property_search @162 NONAME
     property_node_create @163 NONAME
     property_node_name @168 NONAME == XCnbrep70000a7
     property_node_remove @164 NONAME
     property_node_type @169 NONAME == XCnbrep70000a8
-    property_node_clone @165 NONAME == XCnbrep70000a4
+    property_node_clone @165 NONAME
     property_node_traversal @167 NONAME
     property_node_refdata @166 NONAME == XCnbrep70000a5
     property_node_datasize @171 NONAME == XCnbrep70000aa

src/imports/import_64_1700_avs.def

@@ -21,8 +21,6 @@ EXPORTS
     property_destroy @146 NONAME
     property_desc_to_buffer @147 NONAME
     property_insert_read @149 NONAME
-    property_clear_error @158 NONAME == XCgsqzn000009d
-    property_get_error @159 NONAME == XCgsqzn000009e
     property_search @162 NONAME
     property_node_create @163 NONAME
     property_node_name @168 NONAME == XCgsqzn00000a7

src/main/aciodrv-proc/Module.mk

@@ -1,7 +1,6 @@
 libs            += aciodrv-proc
 
 libs_aciodrv-proc     := \
-    core \
 
 src_aciodrv-proc     := \
     panb.c \

src/main/aciodrv-proc/panb.c

@@ -5,9 +5,8 @@
 #include "aciodrv/device.h"
 #include "aciodrv/panb.h"
 
-#include "core/thread.h"
-
-#include "core/log.h"
+#include "util/log.h"
+#include "util/thread.h"
 
 static int auto_poll_proc(void *auto_poll_param);
 static int auto_poll_threadid;
@@ -51,7 +50,7 @@ bool aciodrv_proc_panb_init(struct aciodrv_device_ctx *device)
     InitializeCriticalSection(&keypair_lock);
     InitializeCriticalSection(&auto_poll_stop_lock);
     auto_poll_threadid =
-        core_thread_create(auto_poll_proc, (void *) device, 0x4000, 0);
+        thread_create(auto_poll_proc, (void *) device, 0x4000, 0);
 
     return true;
 }
@@ -81,8 +80,8 @@ void aciodrv_proc_panb_fini(struct aciodrv_device_ctx *device)
     auto_poll_stop = true;
     LeaveCriticalSection(&auto_poll_stop_lock);
 
-    core_thread_join(auto_poll_threadid, NULL);
-    core_thread_destroy(auto_poll_threadid);
+    thread_join(auto_poll_threadid, NULL);
+    thread_destroy(auto_poll_threadid);
 
     DeleteCriticalSection(&keypair_lock);
     DeleteCriticalSection(&auto_poll_stop_lock);

src/main/aciodrv/device.c

@@ -7,9 +7,8 @@
 
 #include "aciodrv/port.h"
 
-#include "core/log.h"
-
 #include "util/hex.h"
+#include "util/log.h"
 #include "util/mem.h"
 
 /* Enable to dump all data to the logger */

src/main/aciodrv/h44b.c

@@ -7,7 +7,7 @@
 
 #include "aciodrv/device.h"
 
-#include "core/log.h"
+#include "util/log.h"
 
 bool aciodrv_h44b_init(struct aciodrv_device_ctx *device, uint8_t node_id)
 {

src/main/aciodrv/icca.c

@@ -5,7 +5,7 @@
 #include "aciodrv/device.h"
 #include "aciodrv/icca.h"
 
-#include "core/log.h"
+#include "util/log.h"
 
 static bool aciodrv_icca_queue_loop_start(
     struct aciodrv_device_ctx *device, uint8_t node_id)

src/main/aciodrv/kfca.c

@@ -5,7 +5,7 @@
 
 #include "aciodrv/device.h"
 
-#include "core/log.h"
+#include "util/log.h"
 
 static bool
 aciodrv_kfca_watchdog_start(struct aciodrv_device_ctx *device, uint8_t node_id)

src/main/aciodrv/panb.c

@@ -5,7 +5,8 @@
 #include "aciodrv/device.h"
 #include "aciodrv/panb.h"
 
-#include "core/log.h"
+#include "util/log.h"
+#include "util/thread.h"
 
 bool aciodrv_panb_start_auto_input(
     struct aciodrv_device_ctx *device, uint8_t node_id, uint8_t node_count)

src/main/aciodrv/port.c

@@ -6,7 +6,7 @@
 
 #include <windows.h>
 
-#include "core/log.h"
+#include "util/log.h"
 
 HANDLE aciodrv_port_open(const char *port_path, int baud)
 {

src/main/aciodrv/rvol.c

@@ -5,7 +5,7 @@
 
 #include "aciodrv/device.h"
 
-#include "core/log.h"
+#include "util/log.h"
 
 static bool aciodrv_rvol_change_expand_mode(
     struct aciodrv_device_ctx *device, uint8_t node_id, uint8_t mode)

src/main/acioemu/addr.c

@@ -5,7 +5,7 @@
 #include "acioemu/addr.h"
 #include "acioemu/emu.h"
 
-#include "core/log.h"
+#include "util/log.h"
 
 void ac_io_emu_cmd_assign_addrs(
     struct ac_io_emu *emu, const struct ac_io_message *req, uint8_t node_count)

src/main/acioemu/emu.c

@@ -14,10 +14,9 @@
 #include "acioemu/emu.h"
 #include "acioemu/pipe.h"
 
-#include "core/log.h"
-
 #include "hook/iohook.h"
 
+#include "util/log.h"
 #include "util/str.h"
 
 static HRESULT ac_io_emu_open(struct ac_io_emu *emu, struct irp *irp);

src/main/acioemu/hdxs.c

@@ -6,7 +6,7 @@
 #include "acioemu/emu.h"
 #include "acioemu/hdxs.h"
 
-#include "core/log.h"
+#include "util/log.h"
 
 static void ac_io_emu_hdxs_cmd_send_version(
     struct ac_io_emu_hdxs *hdxs, const struct ac_io_message *req);

src/main/acioemu/pipe.h

@@ -7,10 +7,9 @@
 
 #include "acio/acio.h"
 
-#include "core/log.h"
-
 #include "util/iobuf.h"
 #include "util/list.h"
+#include "util/log.h"
 
 /* This uses the USB convention where OUT and IN are from the host's (game's)
    perspective. So an OUT transaction comes in to us and vice versa.

src/main/aciomgr/Module.mk

@@ -1,7 +1,6 @@
 dlls            += aciomgr
 
 libs_aciomgr    := \
-    core \
     aciodrv \
     util \
 

src/main/aciomgr/manager.c

@@ -5,15 +5,14 @@
 #include <stdatomic.h>
 
 #include "aciomgr/manager-init.h"
+
 #include "aciomgr/manager.h"
 
 #include "acio/acio.h"
 
 #include "aciodrv/device.h"
-
-#include "core/log.h"
-
 #include "util/array.h"
+#include "util/log.h"
 
 #define MAX_PORT_PATH_LENGTH 256
 
@@ -91,7 +90,7 @@ void aciomgr_set_loggers(
     log_formatter_t warning,
     log_formatter_t fatal)
 {
-    core_log_impl_set(misc, warning, info, fatal);
+    log_to_external(misc, info, warning, fatal);
 }
 
 struct aciomgr_port_dispatcher *aciomgr_port_init(const char *path, int baud)

src/main/aciotest/Module.mk

@@ -1,7 +1,6 @@
 exes            += aciotest
 
 libs_aciotest     := \
-    core \
     bio2drv \
     aciodrv \
     aciodrv-proc \

src/main/aciotest/main.c

@@ -15,14 +15,7 @@
 #include "aciotest/panb.h"
 #include "aciotest/rvol.h"
 
-#include "core/log-bt-ext.h"
-#include "core/log-bt.h"
-#include "core/log.h"
-#include "core/thread-crt-ext.h"
-#include "core/thread-crt.h"
-#include "core/thread.h"
-
-#include "core/log.h"
+#include "util/log.h"
 
 static uint8_t aciotest_cnt = 0;
 static uint8_t bi2a_mode = 255;
@@ -119,10 +112,7 @@ int main(int argc, char **argv)
         }
     }
 
-    core_thread_crt_ext_impl_set();
-    core_log_bt_ext_impl_set();
-
-    core_log_bt_ext_init_with_stdout();
+    log_to_writer(log_writer_stdout, NULL);
 
     struct aciodrv_device_ctx *device =
         aciodrv_device_open_path(argv[1], atoi(argv[2]));

src/main/asio/asio-reghook.c

@@ -10,14 +10,13 @@
 
 #include <stdio.h>
 
-#include "asio/asio-reghook.h"
-
-#include "core/log.h"
-
 #include "hook/com-proxy.h"
 #include "hook/table.h"
 
+#include "asio/asio-reghook.h"
+
 #include "util/defs.h"
+#include "util/log.h"
 #include "util/str.h"
 #include "util/time.h"
 

src/main/asio/config-asio.c

@@ -1,9 +1,9 @@
 #include "cconfig/cconfig-util.h"
 
-#include "core/log.h"
-
 #include "asio/config-asio.h"
 
+#include "util/log.h"
+
 #define ASIOHOOK_CONFIG_IO_FORCE_ASIO_KEY "asio.force_asio"
 #define ASIOHOOK_CONFIG_IO_FORCE_WASAPI_KEY "asio.force_wasapi"
 #define ASIOHOOK_CONFIG_IO_ASIO_DEVICE_NAME_KEY "asio.device_name"

src/main/avs-util/Module.mk

@@ -3,5 +3,4 @@ libs            += avs-util
 libs_avs-util     := \
 
 src_avs-util     := \
-    core-interop.c \
     error.c \

src/main/avs-util/core-interop.c

@@ -1,16 +0,0 @@
-#include "core/log.h"
-#include "core/thread.h"
-
-#include "imports/avs.h"
-
-void avs_util_core_interop_log_avs_impl_set()
-{
-    core_log_impl_set(
-        log_body_misc, log_body_info, log_body_warning, log_body_fatal);
-}
-
-void avs_util_core_interop_thread_avs_impl_set()
-{
-    core_thread_impl_set(
-        avs_thread_create, avs_thread_join, avs_thread_destroy);
-}

src/main/avs-util/core-interop.h

@@ -1,7 +0,0 @@
-#ifndef AVS_UTIL_CORE_INTEROP_H
-#define AVS_UTIL_CORE_INTEROP_H
-
-void avs_util_core_interop_log_avs_impl_set();
-void avs_util_core_interop_thread_avs_impl_set();
-
-#endif

src/main/avs-util/error.c

@@ -96,14 +96,4 @@ const char *avs_util_error_str(avs_error error)
     }
 
     return avs_util_error_unknown;
-}
-
-const char *avs_util_property_error_get_and_clear(struct property *prop)
-{
-    avs_error error;
-
-    error = property_get_error(prop);
-    property_clear_error(prop);
-
-    return avs_util_error_str(error);
 }

src/main/avs-util/error.h

@@ -5,6 +5,4 @@
 
 const char *avs_util_error_str(avs_error error);
 
-const char *avs_util_property_error_get_and_clear(struct property *prop);
-
-#endif
+#endif

src/main/bio2drv/Module.mk

@@ -1,11 +1,10 @@
 libs            += bio2drv
 
 libs_bio2drv     := \
-    core \
-    aciodrv \
+    aciodrv
 
 src_bio2drv     := \
     detect.c \
     config-bio2.c \
     bi2a-iidx.c \
-    bi2a-sdvx.c \
+    bi2a-sdvx.c

src/main/bio2drv/bi2a-iidx.c

@@ -7,7 +7,7 @@
 
 #include "aciodrv/device.h"
 
-#include "core/log.h"
+#include "util/log.h"
 
 // Must be provided on init command. Actual meaning unknown right now.
 // Not providing this will not initialize the IO correctly resulting

src/main/bio2drv/bi2a-sdvx.c

@@ -7,7 +7,7 @@
 
 #include "aciodrv/device.h"
 
-#include "core/log.h"
+#include "util/log.h"
 
 static const uint8_t _BIO2DR_BI2A_SDVX_INIT_DATA = 0x3B;
 

src/main/bio2drv/config-bio2.c

@@ -1,9 +1,9 @@
 #include "cconfig/cconfig-util.h"
 
-#include "core/log.h"
-
 #include "bio2drv/config-bio2.h"
 
+#include "util/log.h"
+
 #define BIO2DRV_CONFIG_BIO2_AUTO_KEY "bio2.autodetect"
 #define BIO2DRV_CONFIG_BIO2_PORT_KEY "bio2.port"
 #define BIO2DRV_CONFIG_BIO2_BAUD_KEY "bio2.baud"

src/main/bio2drv/detect.c

@@ -8,11 +8,11 @@
 
 #include "bio2drv/detect.h"
 
-#include "core/log.h"
-
 #include <stdio.h>
 #include <string.h>
 
+#include "util/log.h"
+
 DEFINE_GUID(
     GUID_COM_BUS_ENUMERATOR,
     0x4D36E978,
@@ -142,7 +142,7 @@ void bio2drv_set_loggers(
     log_formatter_t warning,
     log_formatter_t fatal)
 {
-    core_log_impl_set(misc, warning, info, fatal);
+    log_to_external(misc, info, warning, fatal);
 }
 
 bool bio2drv_detect(

src/main/bio2emu/emu.c

@@ -14,8 +14,6 @@
 #include "acioemu/addr.h"
 #include "acioemu/emu.h"
 
-#include "core/log.h"
-
 #include "hook/iohook.h"
 #include "hooklib/rs232.h"
 
@@ -27,6 +25,7 @@
 #include "util/array.h"
 #include "util/defs.h"
 #include "util/iobuf.h"
+#include "util/log.h"
 #include "util/str.h"
 
 static struct array bio2_active_ports;

src/main/bio2emu/setupapi.c

@@ -6,14 +6,13 @@
 #include <cfgmgr32.h>
 #include <setupapi.h>
 
-#include "core/log.h"
-
 #include "hook/table.h"
 
 #include "bio2emu/emu.h"
 #include "bio2emu/setupapi.h"
 
 #include "util/defs.h"
+#include "util/log.h"
 #include "util/str.h"
 #include "util/time.h"
 

src/main/bsthook/Module.mk

@@ -4,8 +4,6 @@ deplibs_bsthook	:= \
 	avs \
 
 libs_bsthook		:= \
-	avs-util \
-	core \
 	acioemu \
 	bstio \
 	hook \

src/main/bsthook/acio.c

@@ -19,14 +19,13 @@
 #include "bsthook/acio.h"
 #include "bsthook/kfca.h"
 
-#include "core/log.h"
-
 #include "hook/iohook.h"
 
 #include "imports/avs.h"
 
 #include "util/defs.h"
 #include "util/iobuf.h"
+#include "util/log.h"
 #include "util/str.h"
 
 static struct ac_io_emu ac_io_emu;

src/main/bsthook/dllmain.c

@@ -2,14 +2,9 @@
 
 #include <stdbool.h>
 
-#include "avs-util/core-interop.h"
-
 #include "bemanitools/bstio.h"
 #include "bemanitools/eamio.h"
 
-#include "core/log.h"
-#include "core/thread.h"
-
 #include "hook/iohook.h"
 
 #include "hooklib/app.h"
@@ -23,6 +18,7 @@
 
 #include "util/cmdline.h"
 #include "util/defs.h"
+#include "util/log.h"
 
 static bool my_dll_entry_init(char *sidcode, struct property_node *config);
 static bool my_dll_entry_main(void);
@@ -37,23 +33,19 @@ static bool my_dll_entry_init(char *sidcode, struct property_node *config)
 
     log_info("Starting up BeatStream IO backend");
 
-    core_log_impl_assign(bst_io_set_loggers);
+    bst_io_set_loggers(
+        log_body_misc, log_body_info, log_body_warning, log_body_fatal);
 
-    ok = bst_io_init(
-        core_thread_create_impl_get(),
-        core_thread_join_impl_get(),
-        core_thread_destroy_impl_get());
+    ok = bst_io_init(avs_thread_create, avs_thread_join, avs_thread_destroy);
 
     if (!ok) {
         goto bst_io_fail;
     }
 
-    core_log_impl_assign(eam_io_set_loggers);
+    eam_io_set_loggers(
+        log_body_misc, log_body_info, log_body_warning, log_body_fatal);
 
-    ok = eam_io_init(
-        core_thread_create_impl_get(),
-        core_thread_join_impl_get(),
-        core_thread_destroy_impl_get());
+    ok = eam_io_init(avs_thread_create, avs_thread_join, avs_thread_destroy);
 
     if (!ok) {
         goto eam_io_fail;
@@ -99,9 +91,8 @@ BOOL WINAPI DllMain(HMODULE self, DWORD reason, void *ctx)
         return TRUE;
     }
 
-    // Use AVS APIs
-    avs_util_core_interop_thread_avs_impl_set();
-    avs_util_core_interop_log_avs_impl_set();
+    log_to_external(
+        log_body_misc, log_body_info, log_body_warning, log_body_fatal);
 
     args_recover(&argc, &argv);
 

src/main/bsthook/gfx.c

@@ -3,8 +3,6 @@
 
 #include <stdbool.h>
 
-#include "core/log.h"
-
 #include "hook/com-proxy.h"
 #include "hook/pe.h"
 #include "hook/table.h"
@@ -12,6 +10,7 @@
 #include "sdvxhook/gfx.h"
 
 #include "util/defs.h"
+#include "util/log.h"
 
 static HRESULT STDCALL my_CreateDevice(
     IDirect3D9 *self,

src/main/bsthook/settings.c

@@ -7,11 +7,10 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "core/log.h"
-
 #include "hook/table.h"
 
 #include "util/defs.h"
+#include "util/log.h"
 #include "util/str.h"
 
 /* ------------------------------------------------------------------------- */

src/main/camhook/cam.c

@@ -15,14 +15,13 @@
 
 #include <stdio.h>
 
-#include "camhook/cam.h"
-
-#include "core/log.h"
-
 #include "hook/com-proxy.h"
 #include "hook/table.h"
 
+#include "camhook/cam.h"
+
 #include "util/defs.h"
+#include "util/log.h"
 #include "util/str.h"
 #include "util/time.h"
 

src/main/camhook/config-cam.c

@@ -1,9 +1,9 @@
 #include "cconfig/cconfig-util.h"
 
-#include "core/log.h"
-
 #include "camhook/config-cam.h"
 
+#include "util/log.h"
+
 #define CAMHOOK_CONFIG_CAM_DISABLE_EMU_KEY "cam.disable_emu"
 #define CAMHOOK_CONFIG_CAM_DEFAULT_DISABLE_EMU_VALUE false
 

src/main/cconfig/cconfig-main.c

@@ -6,9 +6,8 @@
 
 #include "cconfig/cconfig-main.h"
 
-#include "core/log.h"
-
 #include "util/cmdline.h"
+#include "util/log.h"
 
 bool cconfig_main_config_init(
     struct cconfig *config,
@@ -85,7 +84,7 @@ bool cconfig_main_config_init(
         }
 
         log_misc("Config state after file loading:");
-        cconfig_util_log(config, core_log_misc_impl_get());
+        cconfig_util_log(config, log_impl_misc);
     }
 
     log_misc("Parsing override config parameters from cmd");
@@ -97,7 +96,7 @@ bool cconfig_main_config_init(
     }
 
     log_misc("Config state after cmd parameter overrides:");
-    cconfig_util_log(config, core_log_misc_impl_get());
+    cconfig_util_log(config, log_impl_misc);
 
     goto success;
 

src/main/cconfig/cconfig-util.c

@@ -5,9 +5,8 @@
 
 #include "cconfig/cconfig-util.h"
 
-#include "core/log.h"
-
 #include "util/hex.h"
+#include "util/log.h"
 #include "util/mem.h"
 
 bool cconfig_util_get_int(
@@ -221,10 +220,10 @@ void cconfig_util_set_data(
     free(str);
 }
 
-void cconfig_util_log(struct cconfig *config, core_log_message_t log_message)
+void cconfig_util_log(struct cconfig *config, log_formatter_t log_formatter)
 {
     for (uint32_t i = 0; i < config->nentries; i++) {
-        log_message(
+        log_formatter(
             LOG_MODULE,
             "%s=%s",
             config->entries[i].key,

src/main/cconfig/cconfig-util.h

@@ -7,7 +7,7 @@
 
 #include "cconfig/cconfig.h"
 
-#include "core/log.h"
+#include "util/log.h"
 
 bool cconfig_util_get_int(
     struct cconfig *config,
@@ -57,6 +57,6 @@ void cconfig_util_set_data(
     size_t len,
     const char *desc);
 
-void cconfig_util_log(struct cconfig *config, core_log_message_t log_message);
+void cconfig_util_log(struct cconfig *config, log_formatter_t log_formatter);
 
 #endif

src/main/cconfig/cconfig.c

@@ -2,8 +2,7 @@
 
 #include "cconfig/cconfig.h"
 
-#include "core/log.h"
-
+#include "util/log.h"
 #include "util/mem.h"
 #include "util/str.h"
 

src/main/cconfig/cmd.c

@@ -7,9 +7,8 @@
 
 #include "cconfig/cmd.h"
 
-#include "core/log.h"
-
 #include "util/hex.h"
+#include "util/log.h"
 #include "util/str.h"
 
 static void

src/main/cconfig/conf.c

@@ -6,9 +6,8 @@
 
 #include "cconfig/conf.h"
 
-#include "core/log.h"
-
 #include "util/fs.h"
+#include "util/log.h"
 #include "util/str.h"
 
 enum cconfig_conf_error cconfig_conf_load_from_file(

src/main/config/Module.mk

@@ -3,7 +3,6 @@ rc_config       := config.rc
 cppflags_config := -DUNICODE
 
 libs_config     := \
-    core \
     eamio \
     geninput \
     util \

src/main/config/analogs.c

@@ -11,14 +11,13 @@
 #include "config/schema.h"
 #include "config/usages.h"
 
-#include "core/log.h"
-
 #include "geninput/hid-mgr.h"
 #include "geninput/input-config.h"
 #include "geninput/mapper.h"
 
 #include "util/array.h"
 #include "util/defs.h"
+#include "util/log.h"
 #include "util/mem.h"
 #include "util/str.h"
 

src/main/config/buttons.c

@@ -15,12 +15,11 @@
 #include "config/schema.h"
 #include "config/usages.h"
 
-#include "core/log.h"
-
 #include "geninput/input-config.h"
 #include "geninput/mapper.h"
 
 #include "util/defs.h"
+#include "util/log.h"
 #include "util/mem.h"
 #include "util/winres.h"
 

src/main/config/eam.c

@@ -13,8 +13,6 @@
 #include "config/resource.h"
 #include "config/schema.h"
 
-#include "core/log.h"
-
 #include "eamio/eam-config.h"
 
 #include "geninput/hid-mgr.h"
@@ -23,6 +21,7 @@
 
 #include "util/array.h"
 #include "util/defs.h"
+#include "util/log.h"
 #include "util/mem.h"
 #include "util/str.h"
 

src/main/config/gametype.c

@@ -6,9 +6,8 @@
 #include "config/resource.h"
 #include "config/schema.h"
 
-#include "core/log.h"
-
 #include "util/defs.h"
+#include "util/log.h"
 
 static INT_PTR CALLBACK
 game_type_dlg_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam);

src/main/config/main.c

@@ -14,19 +14,14 @@
 #include "config/spinner.h"
 #include "config/usages.h"
 
-#include "core/log-bt.h"
-#include "core/log-sink-debug.h"
-#include "core/log.h"
-#include "core/thread-crt-ext.h"
-#include "core/thread-crt.h"
-#include "core/thread.h"
-
 #include "eamio/eam-config.h"
 
 #include "geninput/input-config.h"
 
 #include "util/defs.h"
+#include "util/log.h"
 #include "util/str.h"
+#include "util/thread.h"
 #include "util/winres.h"
 
 HPROPSHEETPAGE
@@ -66,22 +61,11 @@ int main(int argc, char **argv)
     wchar_t text[1024];
     int max_light;
     size_t i;
-    struct core_log_sink sink;
 
     inst = GetModuleHandle(NULL);
 
-    core_thread_crt_ext_impl_set();
-
-    core_log_impl_set(
-        core_log_bt_log_misc,
-        core_log_bt_log_info,
-        core_log_bt_log_warning,
-        my_fatal);
-
-    core_log_sink_debug_open(&sink);
-
-    core_log_bt_init(&sink);
-    core_log_bt_level_set(CORE_LOG_BT_LOG_LEVEL_MISC);
+    log_to_writer(log_writer_debug, NULL);
+    log_to_external(log_impl_misc, log_impl_info, log_impl_warning, my_fatal);
 
     usages_init(inst);
 
@@ -112,17 +96,13 @@ int main(int argc, char **argv)
         }
     }
 
-    core_log_impl_assign(input_set_loggers);
-    input_init(
-        core_thread_create_impl_get(),
-        core_thread_join_impl_get(),
-        core_thread_destroy_impl_get());
+    input_set_loggers(
+        log_impl_misc, log_impl_info, log_impl_warning, log_impl_fatal);
+    input_init(crt_thread_create, crt_thread_join, crt_thread_destroy);
 
-    core_log_impl_assign(eam_io_set_loggers);
-    eam_io_init(
-        core_thread_create_impl_get(),
-        core_thread_join_impl_get(),
-        core_thread_destroy_impl_get());
+    eam_io_set_loggers(
+        log_impl_misc, log_impl_info, log_impl_warning, log_impl_fatal);
+    eam_io_init(crt_thread_create, crt_thread_join, crt_thread_destroy);
     eam_io_config_api = eam_io_get_config_api();
 
     // calculate these and check against the loaded config

src/main/config/snap.c

@@ -6,11 +6,10 @@
 
 #include "config/snap.h"
 
-#include "core/log.h"
-
 #include "geninput/hid-mgr.h"
 
 #include "util/defs.h"
+#include "util/log.h"
 #include "util/mem.h"
 
 enum snap_control_heuristic { CONTROL_CENTERING_AXIS, CONTROL_MULTISWITCH };

src/main/config/usages.c

@@ -9,9 +9,8 @@
 
 #include "config/resource.h"
 
-#include "core/log.h"
-
 #include "util/array.h"
+#include "util/log.h"
 #include "util/str.h"
 #include "util/winres.h"
 

src/main/core/Module.mk

@@ -1,20 +0,0 @@
-libs		+= core
-
-libs_core	:= \
-	util \
-
-src_core	:= \
-	log-bt-ext.c \
-	log-bt.c \
-	log-sink-async.c \
-	log-sink-debug.c \
-	log-sink-file.c \
-	log-sink-list.c \
-	log-sink-mutex.c \
-	log-sink-null.c \
-	log-sink-std.c \
-	log.c \
-	thread-crt-ext.c \
-	thread-crt.c \
-	thread.c \
-

src/main/core/log-bt-ext.c

@@ -1,67 +0,0 @@
-#include <stdbool.h>
-
-#include "core/log-bt.h"
-#include "core/log-sink-debug.h"
-#include "core/log-sink-file.h"
-#include "core/log-sink-list.h"
-#include "core/log-sink-mutex.h"
-#include "core/log-sink-std.h"
-#include "core/log.h"
-
-void core_log_bt_ext_impl_set()
-{
-    core_log_impl_set(
-        core_log_bt_log_misc,
-        core_log_bt_log_info,
-        core_log_bt_log_warning,
-        core_log_bt_log_fatal);
-}
-
-void core_log_bt_ext_init_with_stdout()
-{
-    struct core_log_sink sink;
-
-    core_log_sink_std_out_open(true, &sink);
-    core_log_bt_init(&sink);
-}
-
-void core_log_bt_ext_init_with_stderr()
-{
-    struct core_log_sink sink;
-
-    core_log_sink_std_err_open(true, &sink);
-    core_log_bt_init(&sink);
-}
-
-void core_log_bt_ext_init_with_debug()
-{
-    struct core_log_sink sink;
-
-    core_log_sink_debug_open(&sink);
-    core_log_bt_init(&sink);
-}
-
-void core_log_bt_ext_init_with_file(
-    const char *path, bool append, bool rotate, uint8_t max_rotations)
-{
-    struct core_log_sink sink;
-
-    core_log_sink_file_open(path, append, rotate, max_rotations, &sink);
-    core_log_bt_init(&sink);
-}
-
-void core_log_bt_ext_init_with_stdout_and_file(
-    const char *path, bool append, bool rotate, uint8_t max_rotations)
-{
-    struct core_log_sink sinks[2];
-    struct core_log_sink sink_composed;
-    struct core_log_sink sink_mutex;
-
-    core_log_sink_std_out_open(true, &sinks[0]);
-    core_log_sink_file_open(path, append, rotate, max_rotations, &sinks[1]);
-    core_log_sink_list_open(sinks, 2, &sink_composed);
-
-    core_log_sink_mutex_open(&sink_composed, &sink_mutex);
-
-    core_log_bt_init(&sink_mutex);
-}

src/main/core/log-bt-ext.h

@@ -1,59 +0,0 @@
-#ifndef CORE_LOG_BT_EXT_H
-#define CORE_LOG_BT_EXT_H
-
-#include <stdbool.h>
-#include <stdint.h>
-
-/**
- * Set the current thread API implementation to use the bemanitools log
- * implementation
- */
-void core_log_bt_ext_impl_set();
-
-/**
- * Helper to setup the bemanitools log implementation with a stdout sink.
- */
-void core_log_bt_ext_init_with_stdout();
-
-/**
- * Helper to setup the bemanitools log implementation with a stderr sink.
- */
-void core_log_bt_ext_init_with_stderr();
-
-/**
- * Helper to setup the bemanitools log implementation with a OutputDebugStr
- * sink.
- */
-void core_log_bt_ext_init_with_debug();
-
-/**
- * Helper to setup the bemanitools log implementation with a file sink
- *
- * @param path Path to the log file to write the log output to
- * @param append If true, then append to an existing file, false to overwrite
- *        any existing file
- * @param rotate If true, rotates an existing log file and creates a new one
- *        for this session
- * @param max_rotations Max number of rotations for the log files
- */
-void core_log_bt_ext_init_with_file(
-    const char *path, bool append, bool rotate, uint8_t max_rotations);
-
-/**
- * Helper to setup the bemanitools log implementation with a stdout and file
- * sink
- *
- * Important: This combined sink is guarded by a mutex to avoid data races on
- * logging to two different sinks.
- *
- * @param path Path to the log file to write the log output to
- * @param append If true, then append to an existing file, false to overwrite
- *        any existing file
- * @param rotate If true, rotates an existing log file and creates a new one
- *        for this session
- * @param max_rotations Max number of rotations for the log files
- */
-void core_log_bt_ext_init_with_stdout_and_file(
-    const char *path, bool append, bool rotate, uint8_t max_rotations);
-
-#endif

src/main/core/log-bt.c

@@ -1,129 +0,0 @@
-#include <stdarg.h>
-#include <stdlib.h>
-#include <time.h>
-
-#include "core/log-bt.h"
-#include "core/log-sink.h"
-#include "core/log.h"
-
-#include "util/mem.h"
-#include "util/str.h"
-
-static enum core_log_bt_log_level _core_log_bt_log_level;
-static struct core_log_sink *_core_log_bt_sink;
-
-static void _core_log_bt_vformat_write(
-    enum core_log_bt_log_level level,
-    const char *module,
-    const char *fmt,
-    va_list ap)
-{
-    static const char chars[] = "FFWIM";
-
-    char timestamp[64];
-    /* 64k so we can log data dumps of rs232 without crashing */
-    char msg[65536];
-    char line[65536];
-    int result;
-
-    time_t curtime;
-    struct tm *tm;
-
-    curtime = 0;
-    tm = NULL;
-
-    curtime = time(NULL);
-    tm = localtime(&curtime);
-
-    strftime(timestamp, sizeof(timestamp), "[%Y/%m/%d %H:%M:%S]", tm);
-
-    str_vformat(msg, sizeof(msg), fmt, ap);
-
-    result = str_format(
-        line,
-        sizeof(line),
-        "%s %c:%s: %s\n",
-        timestamp,
-        chars[level],
-        module,
-        msg);
-
-    _core_log_bt_sink->write(_core_log_bt_sink->ctx, line, result);
-}
-
-void core_log_bt_init(const struct core_log_sink *sink)
-{
-    if (sink == NULL) {
-        abort();
-    }
-
-    _core_log_bt_sink = xmalloc(sizeof(struct core_log_sink));
-    memcpy(_core_log_bt_sink, sink, sizeof(struct core_log_sink));
-
-    _core_log_bt_log_level = CORE_LOG_BT_LOG_LEVEL_OFF;
-}
-
-void core_log_bt_level_set(enum core_log_bt_log_level level)
-{
-    _core_log_bt_log_level = level;
-}
-
-void core_log_bt_fini()
-{
-    log_assert(_core_log_bt_sink);
-
-    _core_log_bt_sink->close(_core_log_bt_sink->ctx);
-
-    free(_core_log_bt_sink);
-}
-
-void core_log_bt_log_fatal(const char *module, const char *fmt, ...)
-{
-    va_list ap;
-
-    if (_core_log_bt_log_level >= CORE_LOG_BT_LOG_LEVEL_FATAL) {
-        va_start(ap, fmt);
-        _core_log_bt_vformat_write(
-            CORE_LOG_BT_LOG_LEVEL_FATAL, module, fmt, ap);
-        va_end(ap);
-    }
-}
-
-void core_log_bt_log_warning(const char *module, const char *fmt, ...)
-{
-    va_list ap;
-
-    if (_core_log_bt_log_level >= CORE_LOG_BT_LOG_LEVEL_WARNING) {
-        va_start(ap, fmt);
-        _core_log_bt_vformat_write(
-            CORE_LOG_BT_LOG_LEVEL_WARNING, module, fmt, ap);
-        va_end(ap);
-    }
-}
-
-void core_log_bt_log_info(const char *module, const char *fmt, ...)
-{
-    va_list ap;
-
-    if (_core_log_bt_log_level >= CORE_LOG_BT_LOG_LEVEL_INFO) {
-        va_start(ap, fmt);
-        _core_log_bt_vformat_write(CORE_LOG_BT_LOG_LEVEL_INFO, module, fmt, ap);
-        va_end(ap);
-    }
-}
-
-void core_log_bt_log_misc(const char *module, const char *fmt, ...)
-{
-    va_list ap;
-
-    if (_core_log_bt_log_level >= CORE_LOG_BT_LOG_LEVEL_MISC) {
-        va_start(ap, fmt);
-        _core_log_bt_vformat_write(CORE_LOG_BT_LOG_LEVEL_MISC, module, fmt, ap);
-        va_end(ap);
-    }
-}
-
-void core_log_bt_direct_sink_write(const char *chars, size_t nchars)
-{
-    _core_log_bt_sink->write(_core_log_bt_sink->ctx, chars, nchars);
-}

src/main/core/log-bt.h

@@ -1,87 +0,0 @@
-#ifndef CORE_LOG_BT_H
-#define CORE_LOG_BT_H
-
-#include "core/log-sink.h"
-
-/**
- * Log API implementation for games/applications without AVS
- */
-
-enum core_log_bt_log_level {
-    CORE_LOG_BT_LOG_LEVEL_OFF = 0,
-    CORE_LOG_BT_LOG_LEVEL_FATAL = 1,
-    CORE_LOG_BT_LOG_LEVEL_WARNING = 2,
-    CORE_LOG_BT_LOG_LEVEL_INFO = 3,
-    CORE_LOG_BT_LOG_LEVEL_MISC = 4,
-};
-
-/**
- * Initialize the logging backend
- *
- * This must be called as early as possible in your application to setup
- * a logging sink according to your needs. Until this is finished, no
- * log output is available.
- *
- * By default, logging is turned off entirely and must be enabled by setting
- * a desired logging level explicitly.
- *
- * @param sink Pointer to a log sink implementation. The caller owns the memory
- *             of this.
- */
-void core_log_bt_init(const struct core_log_sink *sink);
-
-/**
- * Set the current logging level. This can be changed at any given time, e.g.
- * to increase/decrease verbosity.
- *
- * @param level The logging level to set.
- */
-void core_log_bt_level_set(enum core_log_bt_log_level level);
-
-/**
- * Cleanup the logging backend.
- *
- * Ensure to call this on application exit and cleanup.
- */
-void core_log_bt_fini();
-
-/**
- * Implementation of the log API.
- */
-void core_log_bt_log_fatal(const char *module, const char *fmt, ...);
-
-/**
- * Implementation of the log API.
- */
-void core_log_bt_log_warning(const char *module, const char *fmt, ...);
-
-/**
- * Implementation of the log API.
- */
-void core_log_bt_log_info(const char *module, const char *fmt, ...);
-
-/**
- * Implementation of the log API.
- */
-void core_log_bt_log_misc(const char *module, const char *fmt, ...);
-
-/**
- * Allow AVS to by-pass the core log API/engine.
- *
- * This function must only be called by AVS in an appropriate log callback
- * function that is passed to avs_boot.
- *
- * AVS has it's own logging engine and manages aspects such as async logging,
- * log levels and decorating log messages.
- *
- * Thus, proper interoperability only requires the writer/sink part to be shared
- * with AVS.
- *
- * @param chars Buffer with text data to write to the configured sinks. The
- *              buffer might contain several log messages separated by newline
- *              characters.
- * @param nchars Number of chars to write to the sink.
- */
-void core_log_bt_direct_sink_write(const char *chars, size_t nchars);
-
-#endif

src/main/core/log-sink-async.c

@@ -1,23 +0,0 @@
-#include <stdlib.h>
-
-#include "core/log-sink.h"
-
-static void
-_core_log_sink_file_write(void *ctx, const char *chars, size_t nchars)
-{
-    // TODO
-}
-
-static void _core_log_sink_file_close(void *ctx)
-{
-    // TODO
-}
-
-void core_log_sink_async_open(struct core_log_sink *sink)
-{
-    // TODO
-
-    sink->ctx = NULL;
-    sink->write = _core_log_sink_file_write;
-    sink->close = _core_log_sink_file_close;
-}

src/main/core/log-sink-async.h

@@ -1,19 +0,0 @@
-#ifndef CORE_LOG_SINK_ASYNC_H
-#define CORE_LOG_SINK_ASYNC_H
-
-#include <stdint.h>
-#include <stdlib.h>
-
-#include "core/log-sink.h"
-
-/**
- * Open a async log sink
- *
- * The sink passes data to log to a separate thread which executes the actual
- * logging of the data.
- *
- * @param sink Pointer to allocated memory that receives the opened sink
- */
-void core_log_sink_async_open(struct core_log_sink *sink);
-
-#endif

src/main/core/log-sink-debug.c

@@ -1,23 +0,0 @@
-#include <debugapi.h>
-
-#include <stdlib.h>
-
-#include "core/log-sink.h"
-
-static void
-_core_log_sink_debug_write(void *ctx, const char *chars, size_t nchars)
-{
-    OutputDebugStringA(chars);
-}
-
-static void _core_log_sink_debug_close(void *ctx)
-{
-    // noop
-}
-
-void core_log_sink_debug_open(struct core_log_sink *sink)
-{
-    sink->ctx = NULL;
-    sink->write = _core_log_sink_debug_write;
-    sink->close = _core_log_sink_debug_close;
-}

src/main/core/log-sink-debug.h

@@ -1,15 +0,0 @@
-#ifndef CORE_LOG_SINK_DEBUG_H
-#define CORE_LOG_SINK_DEBUG_H
-
-#include <stdlib.h>
-
-#include "core/log-sink.h"
-
-/**
- * Open a log sink that uses OutputDebugStr
- *
- * @param sink Pointer to allocated memory that receives the opened sink
- */
-void core_log_sink_debug_open(struct core_log_sink *sink);
-
-#endif

src/main/core/log-sink-file.c

@@ -1,92 +0,0 @@
-#include <windows.h>
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "core/log-sink.h"
-
-#include "util/fs.h"
-#include "util/str.h"
-
-static void _core_log_sink_file_rotate(const char *path, uint8_t max_rotations)
-{
-    uint8_t i;
-    char rotate_file[MAX_PATH];
-    char rotate_file_next[MAX_PATH];
-    char version[8];
-    char version_next[8];
-
-    for (i = max_rotations; i > 0; i++) {
-        str_cpy(rotate_file, sizeof(rotate_file), path);
-        str_cpy(rotate_file_next, sizeof(rotate_file_next), path);
-
-        if (i - 1 != 0) {
-            sprintf(version, ".%d", i);
-        } else {
-            memset(version, 0, sizeof(version));
-        }
-
-        sprintf(version_next, ".%d", i);
-
-        str_cat(rotate_file, sizeof(rotate_file), version);
-        str_cat(rotate_file_next, sizeof(rotate_file_next), version_next);
-
-        if (path_exists(rotate_file)) {
-            CopyFile(rotate_file, rotate_file_next, FALSE);
-        }
-    }
-}
-
-static void
-_core_log_sink_file_write(void *ctx, const char *chars, size_t nchars)
-{
-    FILE *file;
-
-    file = (FILE *) ctx;
-
-    fwrite(chars, 1, nchars, file);
-}
-
-static void _core_log_sink_file_close(void *ctx)
-{
-    FILE *file;
-
-    file = (FILE *) ctx;
-
-    fflush(file);
-    fclose(file);
-}
-
-void core_log_sink_file_open(
-    const char *path,
-    bool append,
-    bool rotate,
-    uint8_t max_rotations,
-    struct core_log_sink *sink)
-{
-    FILE *file;
-
-    if (rotate) {
-        _core_log_sink_file_rotate(path, max_rotations);
-
-        // Appending doesn't matter when file is rotated anyway
-        file = fopen(path, "w+");
-    } else {
-        if (append) {
-            file = fopen(path, "a+");
-        } else {
-            file = fopen(path, "w+");
-        }
-    }
-
-    if (!file) {
-        printf("Cannot open log file: %s", path);
-        abort();
-    }
-
-    sink->ctx = (void *) file;
-    sink->write = _core_log_sink_file_write;
-    sink->close = _core_log_sink_file_close;
-}

src/main/core/log-sink-file.h

@@ -1,28 +0,0 @@
-#ifndef CORE_LOG_SINK_FILE_H
-#define CORE_LOG_SINK_FILE_H
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#include "core/log-sink.h"
-
-/**
- * Open a log sink writing data to a file
- *
- * @param path Path to the log file to write the log output to
- * @param append If true, then append to an existing file, false to overwrite
- *        any existing file
- * @param rotate If true, rotates an existing log file and creates a new one
- *        for this session
- * @param max_rotations Max number of rotations for the log files
- * @param sink Pointer to allocated memory that receives the opened sink
- */
-void core_log_sink_file_open(
-    const char *path,
-    bool append,
-    bool rotate,
-    uint8_t max_rotations,
-    struct core_log_sink *sink);
-
-#endif

src/main/core/log-sink-list.c

@@ -1,66 +0,0 @@
-#include <stdint.h>
-#include <stdlib.h>
-
-#include "core/log-sink-list.h"
-#include "core/log-sink.h"
-
-#include "util/mem.h"
-
-#define MAX_SINKS 8
-
-struct core_log_sink_list {
-    struct core_log_sink entries[MAX_SINKS];
-    uint8_t num;
-};
-
-static void
-_core_log_sink_list_write(void *ctx, const char *chars, size_t nchars)
-{
-    struct core_log_sink_list *sink_list;
-    int i;
-
-    sink_list = (struct core_log_sink_list *) ctx;
-
-    for (i = 0; i < sink_list->num; i++) {
-        sink_list->entries[i].write(sink_list->entries[i].ctx, chars, nchars);
-    }
-}
-
-static void _core_log_sink_list_close(void *ctx)
-{
-    struct core_log_sink_list *sink_list;
-    int i;
-
-    sink_list = (struct core_log_sink_list *) ctx;
-
-    for (i = 0; i < sink_list->num; i++) {
-        sink_list->entries[i].close(sink_list->entries[i].ctx);
-    }
-
-    free(sink_list);
-}
-
-void core_log_sink_list_open(
-    const struct core_log_sink *entry, uint8_t num, struct core_log_sink *sink)
-{
-    struct core_log_sink_list *sink_list;
-    int i;
-
-    if (num > MAX_SINKS) {
-        abort();
-    }
-
-    sink_list = xmalloc(sizeof(struct core_log_sink_list));
-
-    for (i = 0; i < num; i++) {
-        sink_list->entries[i].ctx = entry[i].ctx;
-        sink_list->entries[i].write = entry[i].write;
-        sink_list->entries[i].close = entry[i].close;
-    }
-
-    sink_list->num = num;
-
-    sink->ctx = (void *) sink_list;
-    sink->write = _core_log_sink_list_write;
-    sink->close = _core_log_sink_list_close;
-}

src/main/core/log-sink-list.h

@@ -1,24 +0,0 @@
-#ifndef CORE_LOG_SINK_LIST_H
-#define CORE_LOG_SINK_LIST_H
-
-#include <stdint.h>
-#include <stdlib.h>
-
-#include "core/log-sink.h"
-
-/**
- * Combine multiple log sinks into a list of sinks.
- *
- * Upon invoking a list sink, all sinks contained within the list are
- * being invoked in the configured order.
- *
- * @param entry A pointer to allocated memory with a sequence of opened sinks
- *              that you want to add to the list. Ownership of these sinks
- *              is transferred, i.e. closing the list sink closes its children.
- * @param num The number of elements in the sequence of opened sinks pointed to.
- * @param sink Pointer to allocated memory that receives the opened sink
- */
-void core_log_sink_list_open(
-    const struct core_log_sink *entry, uint8_t num, struct core_log_sink *sink);
-
-#endif

src/main/core/log-sink-mutex.c

@@ -1,53 +0,0 @@
-#include <windows.h>
-
-#include <stdlib.h>
-
-#include "core/log-sink.h"
-
-#include "util/mem.h"
-
-struct core_log_sink_mutex_ctx {
-    struct core_log_sink *child;
-    HANDLE mutex;
-};
-
-static void
-_core_log_sink_mutex_write(void *ctx_, const char *chars, size_t nchars)
-{
-    struct core_log_sink_mutex_ctx *ctx;
-
-    ctx = (struct core_log_sink_mutex_ctx *) ctx_;
-
-    WaitForSingleObject(ctx->mutex, INFINITE);
-
-    ctx->child->write(ctx->child->ctx, chars, nchars);
-
-    ReleaseMutex(ctx->mutex);
-}
-
-static void _core_log_sink_mutex_close(void *ctx_)
-{
-    struct core_log_sink_mutex_ctx *ctx;
-
-    ctx = (struct core_log_sink_mutex_ctx *) ctx_;
-
-    CloseHandle(ctx->mutex);
-
-    ctx->child->close(ctx->child->ctx);
-    free(ctx);
-}
-
-void core_log_sink_mutex_open(
-    const struct core_log_sink *child_sink, struct core_log_sink *sink)
-{
-    struct core_log_sink_mutex_ctx *ctx;
-
-    ctx = xmalloc(sizeof(struct core_log_sink_mutex_ctx));
-
-    memcpy(ctx->child, child_sink, sizeof(struct core_log_sink));
-    ctx->mutex = CreateMutex(NULL, FALSE, NULL);
-
-    sink->ctx = ctx;
-    sink->write = _core_log_sink_mutex_write;
-    sink->close = _core_log_sink_mutex_close;
-}