gdharness 1.3.39 → 1.3.40

package/build/cli.js

@@ -852,7 +852,18 @@ public static class GdharnessDesktop {
   }
 
   [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-  static extern IntPtr CreateDesktopW(string name, IntPtr device, IntPtr mode, uint flags, uint access, IntPtr attributes);
+  static extern IntPtr CreateDesktopExW(string name, IntPtr device, IntPtr mode, uint flags, uint access, IntPtr attributes, uint heapKilobytes, IntPtr reserved);
+  [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+  static extern IntPtr CreateWindowStationW(string name, uint flags, uint access, IntPtr attributes);
+  [DllImport("user32.dll", SetLastError = true)] static extern IntPtr GetProcessWindowStation();
+  [DllImport("user32.dll", SetLastError = true)] static extern bool SetProcessWindowStation(IntPtr station);
+  [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+  static extern bool GetUserObjectInformationW(IntPtr handle, int index, StringBuilder into, int size, out int needed);
+  const uint WindowStationAllAccess = 0x37F;
+  const int ObjectName = 2;
+  // What Windows gives an interactive desktop. A non-interactive station's desktops get a small
+  // fraction of that by default, and one desktop here holds every engine a run starts.
+  const uint DesktopHeapKilobytes = 20480;
 
   [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
   static extern bool CreateProcessW(string application, StringBuilder commandLine, IntPtr processAttributes, IntPtr threadAttributes, bool inherit, uint flags, IntPtr environment, string directory, ref StartupInfo startup, out Started started);
@@ -943,12 +954,34 @@ public static class GdharnessDesktop {
     StartupInfo startup = new StartupInfo();
     startup.cb = Marshal.SizeOf(typeof(StartupInfo));
     if (desktop.Length > 0) {
-      Step(stepFile, "creating the " + desktop + " desktop");
-      IntPtr held = CreateDesktopW(desktop, IntPtr.Zero, IntPtr.Zero, 0, GenericAll, IntPtr.Zero);
+      Step(stepFile, "opening the session's own window station");
+      IntPtr station = CreateWindowStationW(null, 0, WindowStationAllAccess, IntPtr.Zero);
+      if (station == IntPtr.Zero) {
+        throw new Win32Exception(Marshal.GetLastWin32Error(), "CreateWindowStationW");
+      }
+      StringBuilder stationName = new StringBuilder(256);
+      int needed;
+      if (!GetUserObjectInformationW(station, ObjectName, stationName, stationName.Capacity * 2, out needed)) {
+        throw new Win32Exception(Marshal.GetLastWin32Error(), "GetUserObjectInformationW");
+      }
+      // A desktop is made in the calling process's station, so this one is the caller's while it is.
+      IntPtr own = GetProcessWindowStation();
+      if (!SetProcessWindowStation(station)) {
+        throw new Win32Exception(Marshal.GetLastWin32Error(), "SetProcessWindowStation");
+      }
+      IntPtr held;
+      int made;
+      try {
+        Step(stepFile, "creating the " + desktop + " desktop");
+        held = CreateDesktopExW(desktop, IntPtr.Zero, IntPtr.Zero, 0, GenericAll, IntPtr.Zero, DesktopHeapKilobytes, IntPtr.Zero);
+        made = Marshal.GetLastWin32Error();
+      } finally {
+        SetProcessWindowStation(own);
+      }
       if (held == IntPtr.Zero) {
-        throw new Win32Exception(Marshal.GetLastWin32Error(), "CreateDesktopW " + desktop);
+        throw new Win32Exception(made, "CreateDesktopExW " + stationName + "\\\\" + desktop);
       }
-      startup.desktop = desktop;
+      startup.desktop = stationName + "\\\\" + desktop;
     }
     startup.flags = UseStdHandles;
     if (noActivate) {
@@ -17604,7 +17637,7 @@ var init_tool_definitions = __esm(() => {
         visible: {
           type: "boolean",
           ops: ["start"],
-          description: "start: on Windows, show the window on the desktop in use. By default a windowed run this server starts goes on a desktop of its own, where it renders and runtime_capture works but the window never shows and never takes the keyboard. A game a visible editor plays opens on the desktop in use, and one a hidden editor (editor_launch hidden: true) plays goes on its desktop. Elsewhere than Windows the window shows either way. Default false."
+          description: "start: on Windows, show the window on the desktop in use. By default a windowed run this server starts goes on a desktop of its own, where it renders and runtime_capture works but the window never shows and never takes the keyboard or the pointer. A game a visible editor plays opens on the desktop in use, and one a hidden editor (editor_launch hidden: true) plays goes on its desktop. Elsewhere than Windows the window shows either way. Default false."
         },
         silent: {
           type: "boolean",
@@ -58235,7 +58268,7 @@ that is running, and the project on disk. ${TOOL_SPECS.length} tools, named \`do
 These need the runtime autoload, which \`gdharness setup\` registers. \`runtime_capture\` needs a
 window and refuses headless rather than handing back the last frame anything drew. On Windows a
 windowed run this server starts is on a desktop of its own, where it draws and can be captured but
-never shows or takes the keyboard.
+never shows or takes the keyboard or the pointer.
 
 The autoload reads these settings and no others. \`${BIND_ADDRESS_SETTING}\`
 is \`127.0.0.1\` and should stay there: the command set includes \`call_method\`, \`set_property\`

package/build/godot/addons/gdharness_editor/animation_reads.gd

@@ -125,15 +125,16 @@ static func no_animation(player: AnimationPlayer, called: String, animation_name
 
 static func _summary(anim: Animation) -> Dictionary:
 	return {
-		"length": anim.length,
+		"length": held_seconds(anim.length),
 		"loopMode": LOOP_MODE_NAMES.get(anim.loop_mode, str(anim.loop_mode)),
-		"step": anim.step,
+		"step": held_seconds(anim.step),
 	}
 
 
-## [param seconds], a key's time, as the shortest decimal holding the same 32-bit float. A scene keeps
-## key times as 32-bit floats, so a key put at 0.7 read back as 0.699999988079071.
-static func key_time(seconds: float) -> float:
+## [param seconds], a key's time or an animation's length or step, as the shortest decimal holding
+## the same 32-bit float. An animation keeps all three as 32-bit floats, so a key put at 0.7 read
+## back as 0.699999988079071 and a step of 0.1 as 0.100000001490116.
+static func held_seconds(seconds: float) -> float:
 	var held: float = PackedFloat32Array([seconds])[0]
 	for places: int in range(0, 10):
 		var shorter: float = String.num(held, places).to_float()
@@ -159,7 +160,7 @@ static func _track(anim: Animation, track: int, values: GdhSerialisation) -> Dic
 	var keyframes: Array[Dictionary] = []
 	var methods: Dictionary = {}
 	for key: int in anim.track_get_key_count(track):
-		var keyframe: Dictionary = {"time": key_time(anim.track_get_key_time(track, key))}
+		var keyframe: Dictionary = {"time": held_seconds(anim.track_get_key_time(track, key))}
 		if kind == Animation.TYPE_METHOD:
 			var method: String = str(anim.method_track_get_name(track, key))
 			methods[method] = true

package/build/godot/addons/gdharness_editor/tools/animation_tools.gd

@@ -320,7 +320,10 @@ func create_animation(args: Dictionary) -> Dictionary:
 			return "%s would not be in the scene when it loads." % animation_name
 		return ""
 	var answer: Dictionary = {
-		"ok": true, "animationName": animation_name, "length": anim.length, "loopMode": loop_mode_name
+		"ok": true,
+		"animationName": animation_name,
+		"length": GdhAnimationReads.held_seconds(anim.length),
+		"loopMode": loop_mode_name
 	}
 	if library[2]:
 		answer["libraryMade"] = animation_name.get_slice("/", 0) if animation_name.contains("/") else ""
@@ -477,9 +480,9 @@ func set_animation(args: Dictionary) -> Dictionary:
 	var answer: Dictionary = {
 		"ok": true,
 		"animationName": animation_name,
-		"length": anim.length,
+		"length": GdhAnimationReads.held_seconds(anim.length),
 		"loopMode": GdhAnimationReads.LOOP_MODE_NAMES.get(anim.loop_mode, str(anim.loop_mode)),
-		"step": anim.step,
+		"step": GdhAnimationReads.held_seconds(anim.step),
 	}
 	var past: String = _past_length(anim, animation_name)
 	if not past.is_empty():

package/build/godot/addons/gdharness_editor/tools/animation_tracks.gd

@@ -444,7 +444,7 @@ static func _keys_at(anim: Animation, calling: Array, times: Array) -> Array:
 			if pair[1] >= 0 and key != pair[1]:
 				continue
 			var time: float = anim.track_get_key_time(index, key)
-			var _listed: bool = held.append(str(GdhAnimationReads.key_time(time)))
+			var _listed: bool = held.append(str(GdhAnimationReads.held_seconds(time)))
 			for given: float in times:
 				if GdhAnimationReads.same_time(time, given):
 					at.append([index, key])

package/build/godot/addons/gdharness_runtime/runtime_input.gd

@@ -61,9 +61,11 @@ func _init(host: Node, values: GdhValues) -> void:
 ## pointer when the game is on one.
 ##
 ## For the root window the engine asks Windows where the pointer is, and GetCursorPos refuses a
-## process on a desktop that is not in use: measured on one of gdharness's own, it answered false
-## with access denied and left the point unwritten. The engine does not check, so a game driven
-## there read get_mouse_position() as x 836852416 after a motion to 1310, 314. Nothing here can
+## process on a desktop that is not in use: on one of gdharness's own it answers false and leaves the
+## point unwritten, with access denied in the user's window station and with
+## ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION in the one gdharness's desktop is in. The engine does
+## not check, so a game driven there read get_mouse_position() as x 836852416 after a motion to
+## 1310, 314. Nothing here can
 ## put a pointer on that desktop: Windows moves one only on the desktop in use, and making this one
 ## that would take the screen. What reads the injected event is right, tooltips included, since the
 ## engine places a tooltip from the motion that reached the control.

package/build/godot/operations/animation_reads.gd

@@ -125,15 +125,16 @@ static func no_animation(player: AnimationPlayer, called: String, animation_name
 
 static func _summary(anim: Animation) -> Dictionary:
 	return {
-		"length": anim.length,
+		"length": held_seconds(anim.length),
 		"loopMode": LOOP_MODE_NAMES.get(anim.loop_mode, str(anim.loop_mode)),
-		"step": anim.step,
+		"step": held_seconds(anim.step),
 	}
 
 
-## [param seconds], a key's time, as the shortest decimal holding the same 32-bit float. A scene keeps
-## key times as 32-bit floats, so a key put at 0.7 read back as 0.699999988079071.
-static func key_time(seconds: float) -> float:
+## [param seconds], a key's time or an animation's length or step, as the shortest decimal holding
+## the same 32-bit float. An animation keeps all three as 32-bit floats, so a key put at 0.7 read
+## back as 0.699999988079071 and a step of 0.1 as 0.100000001490116.
+static func held_seconds(seconds: float) -> float:
 	var held: float = PackedFloat32Array([seconds])[0]
 	for places: int in range(0, 10):
 		var shorter: float = String.num(held, places).to_float()
@@ -159,7 +160,7 @@ static func _track(anim: Animation, track: int, values: GdhSerialisation) -> Dic
 	var keyframes: Array[Dictionary] = []
 	var methods: Dictionary = {}
 	for key: int in anim.track_get_key_count(track):
-		var keyframe: Dictionary = {"time": key_time(anim.track_get_key_time(track, key))}
+		var keyframe: Dictionary = {"time": held_seconds(anim.track_get_key_time(track, key))}
 		if kind == Animation.TYPE_METHOD:
 			var method: String = str(anim.method_track_get_name(track, key))
 			methods[method] = true

package/build/keeper.js

@@ -7053,7 +7053,18 @@ public static class GdharnessDesktop {
   }
 
   [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-  static extern IntPtr CreateDesktopW(string name, IntPtr device, IntPtr mode, uint flags, uint access, IntPtr attributes);
+  static extern IntPtr CreateDesktopExW(string name, IntPtr device, IntPtr mode, uint flags, uint access, IntPtr attributes, uint heapKilobytes, IntPtr reserved);
+  [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+  static extern IntPtr CreateWindowStationW(string name, uint flags, uint access, IntPtr attributes);
+  [DllImport("user32.dll", SetLastError = true)] static extern IntPtr GetProcessWindowStation();
+  [DllImport("user32.dll", SetLastError = true)] static extern bool SetProcessWindowStation(IntPtr station);
+  [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+  static extern bool GetUserObjectInformationW(IntPtr handle, int index, StringBuilder into, int size, out int needed);
+  const uint WindowStationAllAccess = 0x37F;
+  const int ObjectName = 2;
+  // What Windows gives an interactive desktop. A non-interactive station's desktops get a small
+  // fraction of that by default, and one desktop here holds every engine a run starts.
+  const uint DesktopHeapKilobytes = 20480;
 
   [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
   static extern bool CreateProcessW(string application, StringBuilder commandLine, IntPtr processAttributes, IntPtr threadAttributes, bool inherit, uint flags, IntPtr environment, string directory, ref StartupInfo startup, out Started started);
@@ -7144,12 +7155,34 @@ public static class GdharnessDesktop {
     StartupInfo startup = new StartupInfo();
     startup.cb = Marshal.SizeOf(typeof(StartupInfo));
     if (desktop.Length > 0) {
-      Step(stepFile, "creating the " + desktop + " desktop");
-      IntPtr held = CreateDesktopW(desktop, IntPtr.Zero, IntPtr.Zero, 0, GenericAll, IntPtr.Zero);
+      Step(stepFile, "opening the session's own window station");
+      IntPtr station = CreateWindowStationW(null, 0, WindowStationAllAccess, IntPtr.Zero);
+      if (station == IntPtr.Zero) {
+        throw new Win32Exception(Marshal.GetLastWin32Error(), "CreateWindowStationW");
+      }
+      StringBuilder stationName = new StringBuilder(256);
+      int needed;
+      if (!GetUserObjectInformationW(station, ObjectName, stationName, stationName.Capacity * 2, out needed)) {
+        throw new Win32Exception(Marshal.GetLastWin32Error(), "GetUserObjectInformationW");
+      }
+      // A desktop is made in the calling process's station, so this one is the caller's while it is.
+      IntPtr own = GetProcessWindowStation();
+      if (!SetProcessWindowStation(station)) {
+        throw new Win32Exception(Marshal.GetLastWin32Error(), "SetProcessWindowStation");
+      }
+      IntPtr held;
+      int made;
+      try {
+        Step(stepFile, "creating the " + desktop + " desktop");
+        held = CreateDesktopExW(desktop, IntPtr.Zero, IntPtr.Zero, 0, GenericAll, IntPtr.Zero, DesktopHeapKilobytes, IntPtr.Zero);
+        made = Marshal.GetLastWin32Error();
+      } finally {
+        SetProcessWindowStation(own);
+      }
       if (held == IntPtr.Zero) {
-        throw new Win32Exception(Marshal.GetLastWin32Error(), "CreateDesktopW " + desktop);
+        throw new Win32Exception(made, "CreateDesktopExW " + stationName + "\\\\" + desktop);
       }
-      startup.desktop = desktop;
+      startup.desktop = stationName + "\\\\" + desktop;
     }
     startup.flags = UseStdHandles;
     if (noActivate) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gdharness",
-  "version": "1.3.39",
+  "version": "1.3.40",
   "mcpName": "io.github.Aureliolo/gdharness",
   "description": "A harness for driving a Godot 4 project from an agent: editor addons, a runtime bridge into the running game, an MCP server in front of them, and a CLI that installs and diagnoses the Godot side.",
   "type": "module",