Changeset 21742 for branches/gcc-kmk/src

Timestamp:

Oct 25, 2011, 7:13:55 PM (14 years ago)

Author:

dmik

Message:

Add C++ version of ODINHelperStripUNC() for non-const strings.

Location:

branches/gcc-kmk/src/kernel32

Files:

• Fileio.cpp (modified) (2 diffs)
• oslibdos.h (modified) (1 diff)

branches/gcc-kmk/src/kernel32/Fileio.cpp

@@ -1184 +1184 @@
   DWORD sp = 0, lp = 0,attr;
   LPSTR tmpshortpath,tmplongpath;
-  LPSTR lpszShortPath1, lpszLongPath1;
+  LPCSTR lpszShortPath1;
+  LPSTR lpszLongPath1;
 
    dprintf(("GetLongPathNameA %s %x %d", lpszShortPath, lpszLongPath, cchBuffer));
@@ -1203 +1204 @@
    }
 
-   lpszShortPath1 = ODINHelperStripUNC((char*)lpszShortPath);
-   lpszLongPath1 = ODINHelperStripUNC((char*)lpszLongPath);
+   lpszShortPath1 = ODINHelperStripUNC(lpszShortPath);
+   lpszLongPath1 = ODINHelperStripUNC(lpszLongPath);
 
    lstrcpyA(tmpshortpath,lpszShortPath1);

branches/gcc-kmk/src/kernel32/oslibdos.h

@@ -367 +367 @@
 #endif
 
+#ifdef __cplusplus
+INLINE LPSTR ODINHelperStripUNC(LPSTR strUNC)
+{
+    return (LPSTR)ODINHelperStripUNC((LPCSTR) strUNC);
+}
+#endif
+
 #endif //__OSLIBDOS_H__