Ticket #1355: free-cursors.patch

source/lib/res/h_mgr.h

@@ -384 +384 @@
 extern Status h_free(Handle& h, H_Type type);
 
 
+// Forcibly frees all handles of a specified type.
+void h_mgr_free_type(const H_Type type);
+
+
 // find and return a handle by key (typically filename hash)
 // currently O(log n).
 //

source/lib/res/h_mgr.cpp

@@ -787 +787 @@
     pool_destroy(&hpool);
 }
 
+void h_mgr_free_type(const H_Type type)
+{
+    ignoreDoubleFree = true;
 
+    H_ScopedLock s;
+
+    // forcibly close all open handles of the specified type
+    for(HDATA* hd = (HDATA*)hpool.da.base; hd < (HDATA*)(hpool.da.base + hpool.da.pos); hd = (HDATA*)(uintptr_t(hd)+hpool.el_size))
+    {
+        // free if not previously freed and only free the proper type
+        if (hd->key == 0 || hd->type != type)
+            continue;
+
+        // disable caching; we need to release the resource now.
+        hd->keep_open = 0;
+        hd->refs = 0;
+
+        h_free_hd(hd);
+    }
+}
+
 void h_mgr_init()
 {
     ModuleInit(&initState, Init);

source/lib/res/graphics/cursor.cpp

@@ -295 +295 @@
     return h_alloc(H_Cursor, vfs, name, 0, (int)forceGL);
 }
 
+void cursor_shutdown()
+{
+    h_mgr_free_type(H_Cursor);
+}
+
 static Status cursor_free(Handle& h)
 {
     return h_free(h, H_Cursor);

source/lib/res/graphics/cursor.h

@@ -46 +46 @@
  **/
 extern Status cursor_draw(const PIVFS& vfs, const wchar_t* name, int x, int y, bool forceGL);
 
+/**
+ * Forcibly frees all cursor handles.
+ *
+ * Currently used just prior to SDL shutdown.
+ */
+void cursor_shutdown();
+
 #endif  // #ifndef INCLUDED_GRAPHICS_CURSOR

source/ps/GameSetup/GameSetup.cpp

@@ -636 +636 @@
 
 static void ShutdownSDL()
 {
+    // Free cursors before shutting down SDL, as they may depend on SDL. 
+    cursor_shutdown();
+
     SDL_Quit();
     sys_cursor_reset();
 }