--- a/Win32OperatingSystem.st	Sat Nov 28 06:43:43 2015 +0100
+++ b/Win32OperatingSystem.st	Tue Dec 01 06:37:23 2015 +0100
@@ -894,6 +894,7 @@
     "Modified: 7.1.1997 / 19:36:11 / stefan"
 ! !
 
+
 !Win32OperatingSystem class methodsFor:'OS signal constants'!
 
 sigABRT
@@ -1704,7 +1705,7 @@
 
         if (rslt > 0) {
             fileSize  = __MKLARGEINT64(1, data.nFileSizeLow, data.nFileSizeHigh);
-            osPathname = __mkStringOrU16String_maxlen( data.cFileName );
+            osPathname = __mkStringOrU16String_maxlen( data.cFileName, MAXPATHLEN );
             osFileAttributes = __mkSmallInteger( data.dwFileAttributes );
 
             osCrtTime = FileTimeToOsTime(&data.ftCreationTime);
@@ -5200,7 +5201,7 @@
     if (ret == 0) {
         __threadErrno = __WIN32_ERR(GetLastError());
     }
-    RETURN(__mkStringOrU16String_maxlen(_aPathName));
+    RETURN(__mkStringOrU16String_maxlen(_aPathName, MAXPATHLEN));
 %}.
 
     "
@@ -5465,7 +5466,7 @@
          __threadErrno = __WIN32_ERR(GetLastError());
      }
 #endif
-     RETURN (__mkStringOrU16String_maxlen(_aPathName));
+     RETURN (__mkStringOrU16String_maxlen(_aPathName, MAXPATHLEN));
 
 badArgument:;
 %}.
@@ -5975,13 +5976,13 @@
 //        if (fileAttributeData.cFileName[0] != '\0') {
 //            bcopy(fileAttributeData.cFileName, fileNameBuffer, MAXPATHLEN*sizeof(wchar_t));
 //            fileNameBuffer[MAXPATHLEN] = '\0';
-//            fileName = __mkStringOrU16String_maxlen(fileNameBuffer);             /* FULL name */
+//            fileName = __mkStringOrU16String_maxlen(fileNameBuffer, MAXPATHLEN);             /* FULL name */
 //        }
 
 //        if (fileAttributeData.cAlternateFileName[0] != '\0') {
 //            bcopy(fileAttributeData.cAlternateFileName, alternativeFileNameBuffer, 14*sizeof(wchar_t));
 //            alternativeFileNameBuffer[14] = '\0';
-//            alternativeName = __mkStringOrU16String_maxlen(alternativeFileNameBuffer); /* DOS name */
+//            alternativeName = __mkStringOrU16String_maxlen(alternativeFileNameBuffer, 14); /* DOS name */
 //        }
 
         /*