Changeset 4698 for trunk/src/kernel32/oslibdos.cpp

Timestamp:

Nov 25, 2000, 5:56:57 PM (25 years ago)

Author:

sandervl

Message:

Workaround for OS/2 shared memory name limitation (no colons)

File:

• trunk/src/kernel32/oslibdos.cpp (modified) (5 diffs)

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.50 2000-11-05 13:40:45 sandervl Exp $ */
+/* $Id: oslibdos.cpp,v 1.51 2000-11-25 16:56:57 sandervl Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -325 +325 @@
 //******************************************************************************
 //NOTE: If name == NULL, allocated gettable unnamed shared memory
+//OS/2 returns error 123 (invalid name) if the shared memory name includes 
+//colons. We need to replace them with underscores.
 //******************************************************************************
 DWORD OSLibDosAllocSharedMem(LPVOID *lplpMemAddr, DWORD size, DWORD flags, LPSTR name)
 {
  APIRET rc;
- char  *sharedmemname = NULL;
+ char  *sharedmemname = NULL, *tmp;
 
   if(name) {
@@ -338 +340 @@
   else  flags |= OBJ_GETTABLE;
 
+  //SvL: Colons are unacceptable in shared memory names (for whatever reason)
+  tmp = sharedmemname;
+  while(*tmp != 0) {
+        if(*tmp == ':') {
+            *tmp = '_';
+        }
+        tmp++;
+  }
+
   rc = DosAllocSharedMem(lplpMemAddr, sharedmemname, size, flags);
   if(name) {
@@ -350 +361 @@
 {
  APIRET rc;
- char  *sharedmemname = NULL;
+ char  *sharedmemname = NULL, *tmp;
 
   if(name) {
@@ -356 +367 @@
         strcpy(sharedmemname, "\\SHAREMEM\\");
         strcat(sharedmemname, name);
+
+        //SvL: Colons are unacceptable in shared memory names (for whatever reason)
+        tmp = sharedmemname;
+        while(*tmp != 0) {
+            if(*tmp == ':') {
+                *tmp = '_';
+            }
+            tmp++;
+        }
         rc = DosGetNamedSharedMem(lplpMemAddr, sharedmemname, PAG_READ|PAG_WRITE);
         if(name) {