Changeset 380

Timestamp:

May 22, 2009, 4:47:07 PM (16 years ago)

Author:

pr

Message:

Add reference counting.

Files:

• branches/branch-1-0/src/helpers/acpih.c (modified) (7 diffs)
• trunk/src/helpers/acpih.c (modified) (7 diffs)

branches/branch-1-0/src/helpers/acpih.c

@@ -17 +17 @@
 
 /*
- *      Copyright (C) 2006 Paul Ratcliffe.
+ *      Copyright (C) 2006-2009 Paul Ratcliffe.
  *      This file is part of the "XWorkplace helpers" source package.
  *      This is free software; you can redistribute it and/or modify
@@ -49 +49 @@
  ********************************************************************/
 
-HMODULE       hmodACPI = NULLHANDLE;
+HMODULE       G_hmodACPI = NULLHANDLE;
+ULONG         G_ulCount = 0;
 
 ACPISTARTAPI  *pAcpiStartApi = NULL;
@@ -69 +70 @@
     APIRET arc = NO_ERROR;
 
-    if (!hmodACPI)
+    if (!G_hmodACPI)
         if (!(arc = DosLoadModule(NULL,
                                   0,
                                   "ACPI32",
-                                  &hmodACPI)))
+                                  &G_hmodACPI)))
         {
-            arc = DosQueryProcAddr(hmodACPI,
+            arc = DosQueryProcAddr(G_hmodACPI,
                                    ORD_ACPISTARTAPI,
                                    NULL,
                                    (PFN *) &pAcpiStartApi);
             if (!arc)
-                arc = DosQueryProcAddr(hmodACPI,
+                arc = DosQueryProcAddr(G_hmodACPI,
                                    ORD_ACPIENDAPI,
                                    NULL,
@@ -86 +87 @@
 
             if (!arc)
-                arc = DosQueryProcAddr(hmodACPI,
+                arc = DosQueryProcAddr(G_hmodACPI,
                                    ORD_ACPIGOTOSLEEP,
                                    NULL,
@@ -92 +93 @@
             if (arc)
             {
-                DosFreeModule(hmodACPI);
-                hmodACPI = NULLHANDLE;
+                DosFreeModule(G_hmodACPI);
+                G_hmodACPI = NULLHANDLE;
                 pAcpiStartApi = NULL;
                 pAcpiEndApi = NULL;
@@ -104 +105 @@
         return(arc);
     else
+    {
+        G_ulCount++;
         return(pAcpiStartApi(phACPI));
+    }
 }
 
@@ -115 +119 @@
 {
     if (pAcpiEndApi)
+    {
         pAcpiEndApi(phACPI);
+        G_ulCount--;
+    }
+
+    if (!G_ulCount)
+    {
+        DosFreeModule(G_hmodACPI);
+        G_hmodACPI = NULLHANDLE;
+        pAcpiStartApi = NULL;
+        pAcpiEndApi = NULL;
+        pAcpiGoToSleep = NULL;
+    }
 }
 

trunk/src/helpers/acpih.c

@@ -17 +17 @@
 
 /*
- *      Copyright (C) 2006 Paul Ratcliffe.
+ *      Copyright (C) 2006-2009 Paul Ratcliffe.
  *      This file is part of the "XWorkplace helpers" source package.
  *      This is free software; you can redistribute it and/or modify
@@ -49 +49 @@
  ********************************************************************/
 
-HMODULE       hmodACPI = NULLHANDLE;
+HMODULE       G_hmodACPI = NULLHANDLE;
+ULONG         G_ulCount = 0;
 
 ACPISTARTAPI  *pAcpiStartApi = NULL;
@@ -69 +70 @@
     APIRET arc = NO_ERROR;
 
-    if (!hmodACPI)
+    if (!G_hmodACPI)
         if (!(arc = DosLoadModule(NULL,
                                   0,
                                   "ACPI32",
-                                  &hmodACPI)))
+                                  &G_hmodACPI)))
         {
-            arc = DosQueryProcAddr(hmodACPI,
+            arc = DosQueryProcAddr(G_hmodACPI,
                                    ORD_ACPISTARTAPI,
                                    NULL,
                                    (PFN *) &pAcpiStartApi);
             if (!arc)
-                arc = DosQueryProcAddr(hmodACPI,
+                arc = DosQueryProcAddr(G_hmodACPI,
                                    ORD_ACPIENDAPI,
                                    NULL,
@@ -86 +87 @@
 
             if (!arc)
-                arc = DosQueryProcAddr(hmodACPI,
+                arc = DosQueryProcAddr(G_hmodACPI,
                                    ORD_ACPIGOTOSLEEP,
                                    NULL,
@@ -92 +93 @@
             if (arc)
             {
-                DosFreeModule(hmodACPI);
-                hmodACPI = NULLHANDLE;
+                DosFreeModule(G_hmodACPI);
+                G_hmodACPI = NULLHANDLE;
                 pAcpiStartApi = NULL;
                 pAcpiEndApi = NULL;
@@ -104 +105 @@
         return(arc);
     else
+    {
+        G_ulCount++;
         return(pAcpiStartApi(phACPI));
+    }
 }
 
@@ -115 +119 @@
 {
     if (pAcpiEndApi)
+    {
         pAcpiEndApi(phACPI);
+        G_ulCount--;
+    }
+
+    if (!G_ulCount)
+    {
+        DosFreeModule(G_hmodACPI);
+        G_hmodACPI = NULLHANDLE;
+        pAcpiStartApi = NULL;
+        pAcpiEndApi = NULL;
+        pAcpiGoToSleep = NULL;
+    }
 }