Changeset 6712 for trunk/src/msacm32/internal.c

Timestamp:

Sep 15, 2001, 11:47:44 AM (24 years ago)

Author:

sandervl

Message:

restored old version

File:

• trunk/src/msacm32/internal.c (modified) (7 diffs)

trunk/src/msacm32/internal.c

@@ -1 +1 @@
 /* -*- tab-width: 8; c-basic-offset: 4 -*- */
-/* $Id: internal.c,v 1.2 2001-09-05 13:11:26 bird Exp $ */
+
 /*
  *      MSACM32 library
  *
  *      Copyright 1998  Patrik Stridvall
- *        1999  Eric Pouech
+ *                1999  Eric Pouech
  */
 
@@ -34 +34 @@
 
 /***********************************************************************
- *           MSACM_RegisterDriver()
+ *           MSACM_RegisterDriver() 
  */
 PWINE_ACMDRIVERID MSACM_RegisterDriver(LPSTR pszDriverAlias, LPSTR pszFileName,
-                       HINSTANCE hinstModule)
-{
+                                       HINSTANCE hinstModule)
+{ 
     PWINE_ACMDRIVERID padid;
 
@@ -64 +64 @@
     padid->pPrevACMDriverID = MSACM_pLastACMDriverID;
     if (MSACM_pLastACMDriverID)
-    MSACM_pLastACMDriverID->pNextACMDriverID = padid;
+        MSACM_pLastACMDriverID->pNextACMDriverID = padid;
     MSACM_pLastACMDriverID = padid;
     if (!MSACM_pFirstACMDriverID)
-    MSACM_pFirstACMDriverID = padid;
-
+        MSACM_pFirstACMDriverID = padid;
+    
     return padid;
 }
 
 /***********************************************************************
- *           MSACM_RegisterAllDrivers()
+ *           MSACM_RegisterAllDrivers() 
  */
 void MSACM_RegisterAllDrivers(void)
@@ -80 +80 @@
     DWORD dwBufferLength;
 
-    /* FIXME
+    /* FIXME 
      *  What if the user edits system.ini while the program is running?
      *  Does Windows handle that?
      */
     if (MSACM_pFirstACMDriverID)
-    return;
-
+        return;
+    
     /* FIXME: Do not work! How do I determine the section length? */
     dwBufferLength = 1024;
-/* EPP  GetPrivateProfileSectionA("drivers32", NULL, 0, "system.ini"); */
-
+/* EPP  GetPrivateProfileSectionA("drivers32", NULL, 0, "system.ini"); */
+    
     pszBuffer = (LPSTR) HeapAlloc(MSACM_hHeap, 0, dwBufferLength);
     if (GetPrivateProfileSectionA("drivers32", pszBuffer, dwBufferLength, "system.ini")) {
-    char* s = pszBuffer;
-    while (*s) {
-        if (!strncasecmp("MSACM.", s, 6)) {
-        char *s2 = s;
-        while (*s2 != '\0' && *s2 != '=') s2++;
-        if (*s2) {
-            *s2 = '\0';
-            MSACM_RegisterDriver(s, s2 + 1, 0);
-            *s2 = '=';
-        }
-        }
-        s += strlen(s) + 1; /* Either next char or \0 */
+        char* s = pszBuffer;
+        while (*s) {
+            if (!strncasecmp("MSACM.", s, 6)) {
+                char *s2 = s;
+                while (*s2 != '\0' && *s2 != '=') s2++;
+                if (*s2) {
+                    *s2 = '\0';
+                    MSACM_RegisterDriver(s, s2 + 1, 0);
+                    *s2 = '=';
+                }
+            }  
+            s += strlen(s) + 1; /* Either next char or \0 */
+        }
     }
-    }
-
+    
     HeapFree(MSACM_hHeap, 0, pszBuffer);
 
@@ -119 +119 @@
 {
     PWINE_ACMDRIVERID pNextACMDriverID;
-
+    
     while (p->pACMDriverList)
-    acmDriverClose((HACMDRIVER) p->pACMDriverList, 0);
-
+        acmDriverClose((HACMDRIVER) p->pACMDriverList, 0);
+    
     if (p->pszDriverAlias)
-    HeapFree(MSACM_hHeap, 0, p->pszDriverAlias);
+        HeapFree(MSACM_hHeap, 0, p->pszDriverAlias);
     if (p->pszFileName)
-    HeapFree(MSACM_hHeap, 0, p->pszFileName);
-
+        HeapFree(MSACM_hHeap, 0, p->pszFileName);
+    
     if (p == MSACM_pFirstACMDriverID)
-    MSACM_pFirstACMDriverID = p->pNextACMDriverID;
+        MSACM_pFirstACMDriverID = p->pNextACMDriverID;
     if (p == MSACM_pLastACMDriverID)
-    MSACM_pLastACMDriverID = p->pPrevACMDriverID;
+        MSACM_pLastACMDriverID = p->pPrevACMDriverID;
 
     if (p->pPrevACMDriverID)
-    p->pPrevACMDriverID->pNextACMDriverID = p->pNextACMDriverID;
+        p->pPrevACMDriverID->pNextACMDriverID = p->pNextACMDriverID;
     if (p->pNextACMDriverID)
-    p->pNextACMDriverID->pPrevACMDriverID = p->pPrevACMDriverID;
-
+        p->pNextACMDriverID->pPrevACMDriverID = p->pPrevACMDriverID;
+    
     pNextACMDriverID = p->pNextACMDriverID;
-
+    
     HeapFree(MSACM_hHeap, 0, p);
-
+    
     return pNextACMDriverID;
 }
@@ -162 +162 @@
 PWINE_ACMOBJ MSACM_GetObj(HACMOBJ hObj, DWORD type)
 {
-    PWINE_ACMOBJ    pao = (PWINE_ACMOBJ)hObj;
+    PWINE_ACMOBJ        pao = (PWINE_ACMOBJ)hObj;
 
     if (pao == NULL || IsBadReadPtr(pao, sizeof(WINE_ACMOBJ)) ||
-    ((type != WINE_ACMOBJ_DONTCARE) && (type != pao->dwType)))
-    return NULL;
+        ((type != WINE_ACMOBJ_DONTCARE) && (type != pao->dwType)))
+        return NULL;
     return pao;
 }
 
 /***********************************************************************
- *           MSACM_GetDriverID()
+ *           MSACM_GetDriverID() 
  */
 PWINE_ACMDRIVERID MSACM_GetDriverID(HACMDRIVERID hDriverID)
@@ -191 +191 @@
 MMRESULT MSACM_Message(HACMDRIVER had, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
 {
-    PWINE_ACMDRIVER pad = MSACM_GetDriver(had);
+    PWINE_ACMDRIVER     pad = MSACM_GetDriver(had);
 
     return pad ? SendDriverMessage(pad->hDrvr, uMsg, lParam1, lParam2) : MMSYSERR_INVALHANDLE;