Changeset 1292 for trunk/src/kernel32/heapstring.cpp

Timestamp:

Oct 14, 1999, 7:15:26 PM (26 years ago)

Author:

phaller

Message:

Fix: lstrcpyAW taking NULL parameters (broken WINE controls?)

File:

• trunk/src/kernel32/heapstring.cpp (modified) (4 diffs)

trunk/src/kernel32/heapstring.cpp

@@ -1 @@
-/* $Id: heapstring.cpp,v 1.14 1999-10-14 09:21:41 sandervl Exp $ */
+/* $Id: heapstring.cpp,v 1.15 1999-10-14 17:15:26 phaller Exp $ */
 
 /*
@@ -12 +12 @@
  * Includes                                                                  *
  *****************************************************************************/
-#undef DEBUG
+
+#include <odin.h>
+#include <odinwrap.h>
+#include <os2sel.h>
 
 #include <os2win.h>
@@ -29 +32 @@
  * Defines                                                                   *
  *****************************************************************************/
+
+ODINDEBUGCHANNEL(KERNEL32-HEAPSTRING)
 
 
@@ -323 +328 @@
  *****************************************************************************/
 
-LPSTR WIN32API lstrcpyA(LPSTR arg1, LPCSTR  arg2)
-{
-  dprintf(("KERNEL32: lstrcpy(%08xh,%s)\n",
-           arg1,
-           arg2));
-
-  return O32_lstrcpy(arg1, arg2);
-}
-
-
-/*****************************************************************************
- * Name      :
- * Purpose   :
- * Parameters:
- * Variables :
- * Result    :
- * Remark    :
- * Status    :
- *
- * Author    : Patrick Haller [Thu, 1999/08/05 20:46]
- *****************************************************************************/
-
-LPWSTR WIN32API lstrcpyW(LPWSTR dest, LPCWSTR src)
-{
-  dprintf(("KERNEL32: lstrcpyW(%08xh,%08xh)",
-           dest,
-           src));
+ODINFUNCTION2(LPSTR,lstrcpyA,LPSTR, dest,
+                             LPCSTR,src)
+{
+  if ( (src == NULL) || (dest == NULL) ) // stupid parameter checking
+     return NULL;
+
+  return O32_lstrcpy(dest, src);
+}
+
+
+/*****************************************************************************
+ * Name      :
+ * Purpose   :
+ * Parameters:
+ * Variables :
+ * Result    :
+ * Remark    :
+ * Status    :
+ *
+ * Author    : Patrick Haller [Thu, 1999/08/05 20:46]
+ *****************************************************************************/
+
+ODINFUNCTION2(LPWSTR,lstrcpyW,LPWSTR, dest,
+                              LPCWSTR,src)
+{
+  if ( (src == NULL) || (dest == NULL) ) // stupid parameter checking
+     return NULL;
 
   UniStrcpy( (UniChar*)dest,