- Fix KDBG build that I've broken.

svn path=/trunk/; revision=12330

diff --git a/reactos/lib/kjs/ksrc/b_regexp.c b/reactos/lib/kjs/ksrc/b_regexp.c
index dad6cee..98dd7ab 100644 (file)
--- a/reactos/lib/kjs/ksrc/b_regexp.c
+++ b/reactos/lib/kjs/ksrc/b_regexp.c
@@ -24,7 +24,7 @@
 
 /*
  * $Source: /cygdrive/c/RCVS/CVS/ReactOS/reactos/lib/kjs/ksrc/b_regexp.c,v $
- * $Id: b_regexp.c,v 1.2 2004/12/24 23:01:35 navaraf Exp $
+ * $Id: b_regexp.c,v 1.3 2004/12/25 19:38:16 navaraf Exp $
  */
 
 #include "jsint.h"
@@ -370,6 +370,11 @@ method (JSVirtualMachine *vm, JSBuiltinInfo *builtin_info,
           js_vm_symname (vm, method));
   js_vm_error (vm);
 
+/* argument_type_error: */      
+  sprintf (vm->error, "RegExp.%s(): illegal argument",          
+           js_vm_symname (vm, method));         
+  js_vm_error (vm);     
+
  immutable:
   sprintf (vm->error, "RegExp.%s(): immutable object",
           js_vm_symname (vm, method));
@@ -765,7 +770,7 @@ delete_proc (JSBuiltinInfo *builtin_info, void *instance_context)
       js_free (ictx->source);
 
       if (ictx->compiled.buffer)
-       free (ictx->compiled.buffer);
+       js_free (ictx->compiled.buffer);
       if (ictx->compiled.fastmap)
        js_free (ictx->compiled.fastmap);
 
@@ -1043,9 +1048,9 @@ js_builtin_RegExp_replace (JSVirtualMachine *vm, char *data,
   EMIT_TO_RESULT (data + pos, datalen - pos);
 
   if (regs.start)
-    free (regs.start);
+    js_free (regs.start);
   if (regs.end)
-    free (regs.end);
+    js_free (regs.end);
 }
 
 
@@ -1126,7 +1131,7 @@ js_builtin_RegExp_split (JSVirtualMachine *vm, char *data,
     }
 
   if (regs.start)
-    free (regs.start);
+    js_free (regs.start);
   if (regs.end)
-    free (regs.end);
+    js_free (regs.end);
 }

diff --git a/reactos/lib/kjs/makefile b/reactos/lib/kjs/makefile
index 22a7e9f..312647d 100644 (file)
--- a/reactos/lib/kjs/makefile
+++ b/reactos/lib/kjs/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.2 2004/12/03 23:37:41 blight Exp $
+# $Id: makefile,v 1.3 2004/12/25 19:38:17 navaraf Exp $
 # Kernel JavaScript
 # 
 # You can use this for various things but the most obvious is as a powerful
@@ -70,8 +70,7 @@ ORIG_OBJECTS = src/b_array.o \
               src/dl_dummy.o \
               src/heap.o \
               src/utils.o
-TARGET_OBJECTS = $(ORIG_OBJECTS) $(MOD_OBJECTS) $(ARCH_OBJECTS) \
-               ../../dk/w32/lib/libntdll.a
+TARGET_OBJECTS = $(ORIG_OBJECTS) $(MOD_OBJECTS) $(ARCH_OBJECTS)
 DEP_OBJECTS = $(TARGET_OBJECTS)
 
 include $(PATH_TO_TOP)/rules.mak