Changeset 4964 for trunk/src

Timestamp:

Jan 18, 2001, 7:14:16 PM (25 years ago)

Author:

sandervl

Message:

MultiByteToWideChar & lstrcpynA bugfixes; added cdaudio system.ini section

Location:

trunk/src/kernel32

Files:

• heapstring.cpp (modified) (2 diffs)
• initsystem.cpp (modified) (3 diffs)
• unicode.cpp (modified) (2 diffs)

trunk/src/kernel32/heapstring.cpp

@@ -1 @@
-/* $Id: heapstring.cpp,v 1.35 2000-11-21 14:10:08 sandervl Exp $ */
+/* $Id: heapstring.cpp,v 1.36 2001-01-18 18:14:16 sandervl Exp $ */
 
 /*
@@ -356 +356 @@
            arg2,
            arg3));
+
+  if(arg3 == 0) {
+    return NULL;
+  }
 
   //PH: looks like either \0 or arg3 terminate the copy

trunk/src/kernel32/initsystem.cpp

@@ -1 @@
-/* $Id: initsystem.cpp,v 1.25 2001-01-14 17:16:54 sandervl Exp $ */
+/* $Id: initsystem.cpp,v 1.26 2001-01-18 18:14:16 sandervl Exp $ */
 /*
  * Odin system initialization (registry, directories & environment)
@@ -101 +101 @@
 #define DEVICE_GROUP_SCSICDROM  "SCSI CDROM Class"
 
+const char szMci[] = "mci";
+const char szCDAudio[] = "cdaudio";
+const char szMciCDA[] = "mcicda.drv";
+
 //******************************************************************************
 //******************************************************************************
@@ -676 +680 @@
        PROFILE_SetOdinIniString(ODINFONTSECTION, "MS Sans Serif", "WarpSans");
    }
-
+   //Create system.ini with [mci] section
+   strcpy(shellpath, InternalGetWindowsDirectoryA());
+   strcat(shellpath, "\\system.ini");
+   
+   if(GetPrivateProfileStringA(szMci, szCDAudio, szMciCDA, &temp, 0, shellpath) <= 1) {
+      WritePrivateProfileStringA(szMci, szCDAudio, szMciCDA, shellpath);
+   }
    return TRUE;
 

trunk/src/kernel32/unicode.cpp

@@ -1 @@
-/* $Id: unicode.cpp,v 1.23 2000-04-29 18:26:59 sandervl Exp $ */
+/* $Id: unicode.cpp,v 1.24 2001-01-18 18:14:16 sandervl Exp $ */
 
 /*
@@ -83 +83 @@
 
     dprintf2(("MultiByteToWideChar: %d %x (%s %d) (%x %d)", page, flags, src, srclen, dst, dstlen));
+
+    if (!src || (!dst && dstlen))
+    {
+        SetLastError( ERROR_INVALID_PARAMETER );
+        return 0;
+    }
+    //-1 means the input string is null terminated and we need to calculate
+    //its length
     if (srclen == -1)
         srclen = lstrlenA(src)+1;
-    if (!dstlen || !dst)
-        return srclen;
+
+    if (!dstlen)
+        return srclen;
 
     ret = srclen;