Merge branch 'master' into msbuilddll2
[mono.git] / mono / metadata / process.c
old mode 100644 (file)
new mode 100755 (executable)
index be93265..4b1c43b
@@ -4,8 +4,8 @@
  * Author:
  *     Dick Porter (dick@ximian.com)
  *
- * (C) 2002 Ximian, Inc.
- * Copyright (c) 2002-2006 Novell, Inc.
+ * Copyright 2002 Ximian, Inc.
+ * Copyright 2002-2006 Novell, Inc.
  */
 
 #include <config.h>
@@ -13,7 +13,7 @@
 #include <glib.h>
 #include <string.h>
 
-#include <mono/metadata/object.h>
+#include <mono/metadata/object-internals.h>
 #include <mono/metadata/process.h>
 #include <mono/metadata/assembly.h>
 #include <mono/metadata/appdomain.h>
 #include <mono/metadata/cil-coff.h>
 #include <mono/metadata/exception.h>
 #include <mono/utils/strenc.h>
+#include <mono/utils/mono-proclib.h>
 #include <mono/io-layer/io-layer.h>
+#if defined (MINGW_CROSS_COMPILE) && defined (HAVE_GETPROCESSID)
+#undef HAVE_GETPROCESSID
+#endif
+#ifndef HAVE_GETPROCESSID
+#if defined(_MSC_VER) || defined(HAVE_WINTERNL_H)
+#include <winternl.h>
+#ifndef NT_SUCCESS
+#define NT_SUCCESS(status) ((NTSTATUS) (status) >= 0)
+#endif /* !NT_SUCCESS */
+#else /* ! (defined(_MSC_VER) || defined(HAVE_WINTERNL_H)) */
+#include <ddk/ntddk.h>
+#include <ddk/ntapi.h>
+#endif /* (defined(_MSC_VER) || defined(HAVE_WINTERNL_H)) */
+#endif /* !HAVE_GETPROCESSID */
 /* FIXME: fix this code to not depend so much on the inetrnals */
 #include <mono/metadata/class-internals.h>
 
-#undef DEBUG
+#define LOGDEBUG(...)  
+/* define LOGDEBUG(...) g_message(__VA_ARGS__)  */
+
 
 HANDLE ves_icall_System_Diagnostics_Process_GetProcess_internal (guint32 pid)
 {
@@ -59,11 +76,14 @@ void ves_icall_System_Diagnostics_Process_Process_free_internal (MonoObject *thi
        MONO_ARCH_SAVE_REGS;
 
 #ifdef THREAD_DEBUG
-       g_message (G_GNUC_PRETTY_FUNCTION ": Closing process %p, handle %p",
-                  this, process);
+       g_message ("%s: Closing process %p, handle %p", __func__, this, process);
 #endif
 
+#if defined(TARGET_WIN32) || defined(HOST_WIN32)
        CloseHandle (process);
+#else
+       CloseProcess (process);
+#endif
 }
 
 #define STASH_SYS_ASS(this) \
@@ -85,66 +105,16 @@ static guint32 unicode_chars (const gunichar2 *str)
        } while(1);
 }
 
-static guint32 unicode_bytes (const gunichar2 *str)
-{
-       guint32 len=0;
-       
-       do {
-               if(str[len]=='\0') {
-                       /* Include the terminators */
-                       return((len*2)+2);
-               }
-               len++;
-       } while(1);
-}
-
-static gunichar2*
-unicode_get (const gunichar2 *str)
-{
-       gunichar2 *swapped;
-       int i, len;
-
-       len = unicode_bytes (str);
-       swapped = g_malloc0 (len);
-       i = 0;
-       while (str [i]) {
-               swapped [i] = GUINT16_FROM_LE (str [i]);
-               i ++;
-       }
-
-       return swapped;
-}
-
-/* 
- * compare a little-endian null-terminated utf16 string and a normal string.
- * Can be used only for ascii or latin1 chars.
- */
-static gboolean
-unicode_string_equals (const gunichar2 *str1, const gchar *str2)
-{
-       while (*str1 && *str2) {
-               if (GUINT16_TO_LE (*str1) != *str2)
-                       return FALSE;
-               ++str1;
-               ++str2;
-       }
-       return *str1 == *str2;
-}
-
 static void process_set_field_object (MonoObject *obj, const gchar *fieldname,
                                      MonoObject *data)
 {
        MonoClassField *field;
 
-#ifdef DEBUG
-       g_message (G_GNUC_PRETTY_FUNCTION ": Setting field %s to object at %p",
-                  fieldname, data);
-#endif
+       LOGDEBUG (g_message ("%s: Setting field %s to object at %p", __func__, fieldname, data));
 
        field=mono_class_get_field_from_name (mono_object_class (obj),
                                              fieldname);
-       /* FIXME: moving GC */
-       *(MonoObject **)(((char *)obj) + field->offset)=data;
+       mono_gc_wbarrier_generic_store (((char *)obj) + field->offset, data);
 }
 
 static void process_set_field_string (MonoObject *obj, const gchar *fieldname,
@@ -153,52 +123,37 @@ static void process_set_field_string (MonoObject *obj, const gchar *fieldname,
        MonoClassField *field;
        MonoString *string;
 
-#ifdef DEBUG
-       g_message (G_GNUC_PRETTY_FUNCTION ": Setting field %s to [%s]",
-                  fieldname, g_utf16_to_utf8 (val, len, NULL, NULL, NULL));
-#endif
+       LOGDEBUG (g_message ("%s: Setting field %s to [%s]", __func__, fieldname, g_utf16_to_utf8 (val, len, NULL, NULL, NULL)));
 
        string=mono_string_new_utf16 (mono_object_domain (obj), val, len);
        
        field=mono_class_get_field_from_name (mono_object_class (obj),
                                              fieldname);
-       /* FIXME: moving GC */
-       *(MonoString **)(((char *)obj) + field->offset)=string;
+       mono_gc_wbarrier_generic_store (((char *)obj) + field->offset, (MonoObject*)string);
 }
 
-static void process_set_field_string_utf8 (MonoObject *obj,
-                                          const gchar *fieldname,
-                                          const gchar *val)
+static void process_set_field_int (MonoObject *obj, const gchar *fieldname,
+                                  guint32 val)
 {
        MonoClassField *field;
-       MonoString *string;
 
-#ifdef DEBUG
-       g_message (G_GNUC_PRETTY_FUNCTION ": Setting field %s to [%s]",
-                  fieldname, val);
-#endif
-
-       string=mono_string_new (mono_object_domain (obj), val);
+       LOGDEBUG (g_message ("%s: Setting field %s to %d", __func__,fieldname, val));
        
        field=mono_class_get_field_from_name (mono_object_class (obj),
                                              fieldname);
-       /* FIXME: moving GC */
-       *(MonoString **)(((char *)obj) + field->offset)=string;
+       *(guint32 *)(((char *)obj) + field->offset)=val;
 }
 
-static void process_set_field_int (MonoObject *obj, const gchar *fieldname,
-                                  guint32 val)
+static void process_set_field_intptr (MonoObject *obj, const gchar *fieldname,
+                                     gpointer val)
 {
        MonoClassField *field;
 
-#ifdef DEBUG
-       g_message (G_GNUC_PRETTY_FUNCTION ": Setting field %s to %d",
-                  fieldname, val);
-#endif
+       LOGDEBUG (g_message ("%s: Setting field %s to %p", __func__, fieldname, val));
        
        field=mono_class_get_field_from_name (mono_object_class (obj),
                                              fieldname);
-       *(guint32 *)(((char *)obj) + field->offset)=val;
+       *(gpointer *)(((char *)obj) + field->offset)=val;
 }
 
 static void process_set_field_bool (MonoObject *obj, const gchar *fieldname,
@@ -206,388 +161,223 @@ static void process_set_field_bool (MonoObject *obj, const gchar *fieldname,
 {
        MonoClassField *field;
 
-#ifdef DEBUG
-       g_message (G_GNUC_PRETTY_FUNCTION ": Setting field %s to %s",
-                  fieldname, val?"TRUE":"FALSE");
-#endif
+       LOGDEBUG (g_message ("%s: Setting field %s to %s", __func__, fieldname, val?"TRUE":"FALSE"));
        
        field=mono_class_get_field_from_name (mono_object_class (obj),
                                              fieldname);
        *(guint8 *)(((char *)obj) + field->offset)=val;
 }
 
-typedef struct {
-       guint16 data_len;
-       guint16 value_len;
-       guint16 type;
-       gunichar2 *key;
-} version_data;
-
-/* Returns a pointer to the value data, because theres no way to know
- * how big that data is (value_len is set to zero for most blocks :-()
- */
-static gpointer process_get_versioninfo_block (gpointer data,
-                                              version_data *block)
+#define SFI_COMMENTS           "\\StringFileInfo\\%02X%02X%02X%02X\\Comments"
+#define SFI_COMPANYNAME                "\\StringFileInfo\\%02X%02X%02X%02X\\CompanyName"
+#define SFI_FILEDESCRIPTION    "\\StringFileInfo\\%02X%02X%02X%02X\\FileDescription"
+#define SFI_FILEVERSION                "\\StringFileInfo\\%02X%02X%02X%02X\\FileVersion"
+#define SFI_INTERNALNAME       "\\StringFileInfo\\%02X%02X%02X%02X\\InternalName"
+#define SFI_LEGALCOPYRIGHT     "\\StringFileInfo\\%02X%02X%02X%02X\\LegalCopyright"
+#define SFI_LEGALTRADEMARKS    "\\StringFileInfo\\%02X%02X%02X%02X\\LegalTrademarks"
+#define SFI_ORIGINALFILENAME   "\\StringFileInfo\\%02X%02X%02X%02X\\OriginalFilename"
+#define SFI_PRIVATEBUILD       "\\StringFileInfo\\%02X%02X%02X%02X\\PrivateBuild"
+#define SFI_PRODUCTNAME                "\\StringFileInfo\\%02X%02X%02X%02X\\ProductName"
+#define SFI_PRODUCTVERSION     "\\StringFileInfo\\%02X%02X%02X%02X\\ProductVersion"
+#define SFI_SPECIALBUILD       "\\StringFileInfo\\%02X%02X%02X%02X\\SpecialBuild"
+#define EMPTY_STRING           (gunichar2*)"\000\000"
+
+static void process_module_string_read (MonoObject *filever, gpointer data,
+                                       const gchar *fieldname,
+                                       guchar lang_hi, guchar lang_lo,
+                                       const gchar *key)
 {
-       block->data_len=GUINT16_TO_LE (*((guint16 *)data));
-       data = (char *)data + sizeof(guint16);
-       block->value_len=GUINT16_TO_LE (*((guint16 *)data));
-       data = (char *)data + sizeof(guint16);
-
-       /* No idea what the type is supposed to indicate */
-       block->type=GUINT16_TO_LE (*((guint16 *)data));
-       data = (char *)data + sizeof(guint16);
-       block->key=((gunichar2 *)data);
-
-       /* skip over the key (including the terminator) */
-       data=((gunichar2 *)data)+(unicode_chars (block->key)+1);
-
-       /* align on a 32-bit boundary */
-       data=(gpointer)((char *)data + 3);
-       data=(gpointer)((char *)data - (GPOINTER_TO_INT(data) & 3));
-       
-       return(data);
-}
-
-/* Returns a pointer to the byte following the Var block */
-static gpointer process_read_var_block (MonoObject *filever, gpointer data_ptr,
-                                       guint16 data_len)
-{
-       /* Not currently interested in the VarFileInfo block.  This
-        * might change if language support is needed for file version
-        * strings (VarFileInfo contains lists of supported
-        * languages.)
-        */
-       version_data block;
+       gchar *lang_key_utf8;
+       gunichar2 *lang_key, *buffer;
+       UINT chars;
 
-       /* data_ptr is pointing at a Var block of length data_len */
-       data_ptr=process_get_versioninfo_block (data_ptr, &block);
-       data_ptr=((guchar *)data_ptr)+block.value_len;
+       lang_key_utf8 = g_strdup_printf (key, lang_lo, lang_hi, 0x04, 0xb0);
 
-       return(data_ptr);
-}
+       LOGDEBUG (g_message ("%s: asking for [%s]", __func__, lang_key_utf8));
 
-/* Returns a pointer to the byte following the String block, or NULL
- * if the data read hits padding.  We can't recover from this because
- * the data length does not include padding bytes, so it's not
- * possible to just return the start position + length.
- */
-static gpointer process_read_string_block (MonoObject *filever,
-                                          gpointer data_ptr,
-                                          guint16 data_len,
-                                          gboolean store)
-{
-       version_data block;
-       guint16 string_len=28; /* Length of the StringTable block */
+       lang_key = g_utf8_to_utf16 (lang_key_utf8, -1, NULL, NULL, NULL);
 
-       /* data_ptr is pointing at an array of one or more String
-        * blocks with total length (not including alignment padding)
-        * of data_len.
-        */
-       while(string_len<data_len) {
-               gunichar2 *value;
-               
-               /* align on a 32-bit boundary */
-               data_ptr=(gpointer)((char *)data_ptr + 3);
-               data_ptr=(gpointer)((char *)data_ptr -
-                   (GPOINTER_TO_INT(data_ptr) & 3));
-
-               data_ptr=process_get_versioninfo_block (data_ptr, &block);
-               if(block.data_len==0) {
-                       /* We must have hit padding, so give up
-                        * processing now
-                        */
-#ifdef DEBUG
-                       g_message (G_GNUC_PRETTY_FUNCTION
-                                  ": Hit 0-length block, giving up");
-#endif
-                       return(NULL);
-               }
-               
-               string_len=string_len+block.data_len;
-               value=unicode_get ((gunichar2 *)data_ptr);
-               /* Skip over the value */
-               data_ptr=((gunichar2 *)data_ptr)+block.value_len;
-
-               if(store==TRUE) {
-                       if (unicode_string_equals (block.key, "Comments")) {
-                               process_set_field_string (filever, "comments", value, unicode_chars (value));
-                       } else if (unicode_string_equals (block.key, "CompanyName")) {
-                               process_set_field_string (filever, "companyname", value, unicode_chars (value));
-                       } else if (unicode_string_equals (block.key, "FileDescription")) {
-                               process_set_field_string (filever, "filedescription", value, unicode_chars (value));
-                       } else if (unicode_string_equals (block.key, "FileVersion")) {
-                               process_set_field_string (filever, "fileversion", value, unicode_chars (value));
-                       } else if (unicode_string_equals (block.key, "InternalName")) {
-                               process_set_field_string (filever, "internalname", value, unicode_chars (value));
-                       } else if (unicode_string_equals (block.key, "LegalCopyright")) {
-                               process_set_field_string (filever, "legalcopyright", value, unicode_chars (value));
-                       } else if (unicode_string_equals (block.key, "LegalTrademarks")) {
-                               process_set_field_string (filever, "legaltrademarks", value, unicode_chars (value));
-                       } else if (unicode_string_equals (block.key, "OriginalFilename")) {
-                               process_set_field_string (filever, "originalfilename", value, unicode_chars (value));
-                       } else if (unicode_string_equals (block.key, "PrivateBuild")) {
-                               process_set_field_string (filever, "privatebuild", value, unicode_chars (value));
-                       } else if (unicode_string_equals (block.key, "ProductName")) {
-                               process_set_field_string (filever, "productname", value, unicode_chars (value));
-                       } else if (unicode_string_equals (block.key, "ProductVersion")) {
-                               process_set_field_string (filever, "productversion", value, unicode_chars (value));
-                       } else if (unicode_string_equals (block.key, "SpecialBuild")) {
-                               process_set_field_string (filever, "specialbuild", value, unicode_chars (value));
-                       } else {
-                               /* Not an error, just not interesting
-                                * in this case
-                                */
-                       }
-               }
-               g_free (value);
+       if (VerQueryValue (data, lang_key, (gpointer *)&buffer, &chars) && chars > 0) {
+               LOGDEBUG (g_message ("%s: found %d chars of [%s]", __func__, chars, g_utf16_to_utf8 (buffer, chars, NULL, NULL, NULL)));
+               /* chars includes trailing null */
+               process_set_field_string (filever, fieldname, buffer, chars - 1);
+       } else {
+               process_set_field_string (filever, fieldname, EMPTY_STRING, 0);
        }
-       
-       return(data_ptr);
-}
 
-/* returns a pointer to the byte following the Stringtable block, or
- * NULL if the data read hits padding.  We can't recover from this
- * because the data length does not include padding bytes, so it's not
- * possible to just return the start position + length
- */
-static gpointer process_read_stringtable_block (MonoObject *filever,
-                                               gpointer data_ptr,
-                                               guint16 data_len)
-{
-       version_data block;
-       gunichar2 *value;
-       gchar *language;
-       guint16 string_len=36;  /* length of the StringFileInfo block */
-
-       /* data_ptr is pointing at an array of StringTable blocks,
-        * with total length (not including alignment padding) of
-        * data_len.
-        */
-
-       while(string_len<data_len) {
-               /* align on a 32-bit boundary */
-               data_ptr=(gpointer)((char *)data_ptr + 3);
-               data_ptr=(gpointer)((char *)data_ptr -
-                   (GPOINTER_TO_INT(data_ptr) & 3));
-
-               data_ptr=process_get_versioninfo_block (data_ptr, &block);
-               if(block.data_len==0) {
-                       /* We must have hit padding, so give up
-                        * processing now
-                        */
-#ifdef DEBUG
-                       g_message (G_GNUC_PRETTY_FUNCTION
-                                  ": Hit 0-length block, giving up");
-#endif
-                       return(NULL);
-               }
-               string_len=string_len+block.data_len;
-
-               value = unicode_get (block.key);
-               language = g_utf16_to_utf8 (value, unicode_bytes (block.key), NULL, NULL, NULL);
-               g_strdown (language);
-
-               /* Kludge: treat en_US as neutral too */
-               if (!strcmp (language, "007f04b0") ||
-                   !strcmp (language, "000004b0") ||
-                   !strcmp (language, "040904b0")) {
-                       /* Got the one we're interested in */
-                       process_set_field_string_utf8 (filever, "language",
-                                                      "Language Neutral");
-                       
-                       data_ptr=process_read_string_block (filever, data_ptr,
-                                                           block.data_len,
-                                                           TRUE);
-               } else {
-                       /* Some other language.  We might want to do
-                        * something with this in the future.
-                        */
-                       data_ptr=process_read_string_block (filever, data_ptr,
-                                                           block.data_len,
-                                                           FALSE);
-               }
-               g_free (language);
-               g_free (value);
-               
-               if(data_ptr==NULL) {
-                       /* Child block hit padding */
-#ifdef DEBUG
-                       g_message (G_GNUC_PRETTY_FUNCTION ": Child block hit 0-length block, giving up");
-#endif
-                       return(NULL);
-               }
-       }
-               
-       return(data_ptr);
+       g_free (lang_key);
+       g_free (lang_key_utf8);
 }
 
-static void process_read_fixedfileinfo_block (MonoObject *filever,
-                                             VS_FIXEDFILEINFO *ffi)
+static void process_module_stringtable (MonoObject *filever, gpointer data,
+                                       guchar lang_hi, guchar lang_lo)
 {
-#ifdef DEBUG
-       g_message (G_GNUC_PRETTY_FUNCTION ": ffi: sig 0x%x, strucver 0x%x, fileverm 0x%x, fileverl 0x%x, prodverm 0x%x, prodverl 0x%x, ffmask 0x%x, ff 0x%x, os 0x%x, type 0x%x, subtype 0x%x, datem 0x%x, datel 0x%x", ffi->dwSignature, ffi->dwStrucVersion, ffi->dwFileVersionMS, ffi->dwFileVersionLS, ffi->dwProductVersionMS, ffi->dwProductVersionLS, ffi->dwFileFlagsMask, ffi->dwFileFlags, ffi->dwFileOS, ffi->dwFileType, ffi->dwFileSubtype, ffi->dwFileDateMS, ffi->dwFileDateLS);
-#endif
-               
-       process_set_field_int (filever, "filemajorpart",
-                              HIWORD (ffi->dwFileVersionMS));
-       process_set_field_int (filever, "fileminorpart",
-                              LOWORD (ffi->dwFileVersionMS));
-       process_set_field_int (filever, "filebuildpart",
-                              HIWORD (ffi->dwFileVersionLS));
-       process_set_field_int (filever, "fileprivatepart",
-                              LOWORD (ffi->dwFileVersionLS));
-               
-       process_set_field_int (filever, "productmajorpart",
-                              HIWORD (ffi->dwProductVersionMS));
-       process_set_field_int (filever, "productminorpart",
-                              LOWORD (ffi->dwProductVersionMS));
-       process_set_field_int (filever, "productbuildpart",
-                              HIWORD (ffi->dwProductVersionLS));
-       process_set_field_int (filever, "productprivatepart",
-                              LOWORD (ffi->dwProductVersionLS));
-       
-       process_set_field_bool (filever, "isdebug",
-                               ffi->dwFileFlags&VS_FF_DEBUG);
-       process_set_field_bool (filever, "isprerelease",
-                               ffi->dwFileFlags&VS_FF_PRERELEASE);
-       process_set_field_bool (filever, "ispatched",
-                               ffi->dwFileFlags&VS_FF_PATCHED);
-       process_set_field_bool (filever, "isprivatebuild",
-                               ffi->dwFileFlags&VS_FF_PRIVATEBUILD);
-       process_set_field_bool (filever, "isspecialbuild",
-                               ffi->dwFileFlags&VS_FF_SPECIALBUILD);
+       process_module_string_read (filever, data, "comments", lang_hi, lang_lo,
+                                   SFI_COMMENTS);
+       process_module_string_read (filever, data, "companyname", lang_hi,
+                                   lang_lo, SFI_COMPANYNAME);
+       process_module_string_read (filever, data, "filedescription", lang_hi,
+                                   lang_lo, SFI_FILEDESCRIPTION);
+       process_module_string_read (filever, data, "fileversion", lang_hi,
+                                   lang_lo, SFI_FILEVERSION);
+       process_module_string_read (filever, data, "internalname", lang_hi,
+                                   lang_lo, SFI_INTERNALNAME);
+       process_module_string_read (filever, data, "legalcopyright", lang_hi,
+                                   lang_lo, SFI_LEGALCOPYRIGHT);
+       process_module_string_read (filever, data, "legaltrademarks", lang_hi,
+                                   lang_lo, SFI_LEGALTRADEMARKS);
+       process_module_string_read (filever, data, "originalfilename", lang_hi,
+                                   lang_lo, SFI_ORIGINALFILENAME);
+       process_module_string_read (filever, data, "privatebuild", lang_hi,
+                                   lang_lo, SFI_PRIVATEBUILD);
+       process_module_string_read (filever, data, "productname", lang_hi,
+                                   lang_lo, SFI_PRODUCTNAME);
+       process_module_string_read (filever, data, "productversion", lang_hi,
+                                   lang_lo, SFI_PRODUCTVERSION);
+       process_module_string_read (filever, data, "specialbuild", lang_hi,
+                                   lang_lo, SFI_SPECIALBUILD);
 }
 
-static void process_get_fileversion (MonoObject *filever, MonoImage *image)
+static void process_get_fileversion (MonoObject *filever, gunichar2 *filename)
 {
-       MonoPEResourceDataEntry *version_info;
-       gpointer data;
+       DWORD verinfohandle;
        VS_FIXEDFILEINFO *ffi;
-       gpointer data_ptr;
-       version_data block;
-       gint32 data_len; /* signed to guard against underflow */
-
-       version_info=mono_image_lookup_resource (image,
-                                                MONO_PE_RESOURCE_ID_VERSION,
-                                                0, NULL);
-#ifdef DEBUG
-       g_message (G_GNUC_PRETTY_FUNCTION ": image_lookup returned %p",
-                  version_info);
-#endif
-
-       if(version_info==NULL) {
-               return;
-       }
-       
-       data=mono_image_rva_map (image,
-                              version_info->rde_data_offset);
-       g_free (version_info);
-       if(data==NULL) {
-               return;
-       }
-
-       /* See io-layer/versioninfo.h for the gory details on how this
-        * data is laid out. (data should be pointing to
-        * VS_VERSIONINFO data).
-        */
-
-       data_ptr=process_get_versioninfo_block (data, &block);
-               
-       data_len=block.data_len;
-               
-       if(block.value_len!=sizeof(VS_FIXEDFILEINFO)) {
-#ifdef DEBUG
-               g_message (G_GNUC_PRETTY_FUNCTION
-                          ": FIXEDFILEINFO size mismatch");
-#endif
-               return;
-       }
-
-       if (!unicode_string_equals (block.key, "VS_VERSION_INFO")) {
-#ifdef DEBUG
-               g_message (G_GNUC_PRETTY_FUNCTION
-                          ": VS_VERSION_INFO mismatch");
-#endif
-               return;
-       }
-
-       ffi=((VS_FIXEDFILEINFO *)data_ptr);
-       data_ptr = (char *)data_ptr + sizeof(VS_FIXEDFILEINFO);
-       if((ffi->dwSignature!=VS_FFI_SIGNATURE) ||
-          (ffi->dwStrucVersion!=VS_FFI_STRUCVERSION)) {
-#ifdef DEBUG
-               g_message (G_GNUC_PRETTY_FUNCTION
-                          ": FIXEDFILEINFO bad signature");
-#endif
-               return;
-       }
-       process_read_fixedfileinfo_block (filever, ffi);
-       
-       /* Subtract the 92 bytes we've already seen */
-       data_len -= 92;
+       gpointer data;
+       DWORD datalen;
+       guchar *trans_data;
+       gunichar2 *query;
+       UINT ffi_size, trans_size;
+       BOOL ok;
+       gunichar2 lang_buf[128];
+       guint32 lang, lang_count;
+
+       datalen = GetFileVersionInfoSize (filename, &verinfohandle);
+       if (datalen) {
+               data = g_malloc0 (datalen);
+               ok = GetFileVersionInfo (filename, verinfohandle, datalen,
+                                        data);
+               if (ok) {
+                       query = g_utf8_to_utf16 ("\\", -1, NULL, NULL, NULL);
+                       if (query == NULL) {
+                               g_free (data);
+                               return;
+                       }
+                       
+                       if (VerQueryValue (data, query, (gpointer *)&ffi,
+                           &ffi_size)) {
+                               LOGDEBUG (g_message ("%s: recording assembly: FileName [%s] FileVersionInfo [%d.%d.%d.%d]", __func__, g_utf16_to_utf8 (filename, -1, NULL, NULL, NULL), HIWORD (ffi->dwFileVersionMS), LOWORD (ffi->dwFileVersionMS), HIWORD (ffi->dwFileVersionLS), LOWORD (ffi->dwFileVersionLS)));
        
-       /* There now follow zero or one StringFileInfo blocks and zero
-        * or one VarFileInfo blocks
-        */
-       while(data_len > 0) {
-               /* align on a 32-bit boundary */
-               data_ptr=(gpointer)((char *)data_ptr + 3);
-               data_ptr=(gpointer)((char *)data_ptr -
-                   (GPOINTER_TO_INT(data_ptr) & 3));
-
-               data_ptr=process_get_versioninfo_block (data_ptr, &block);
-               if(block.data_len==0) {
-                       /* We must have hit padding, so give up
-                        * processing now
-                        */
-#ifdef DEBUG
-                       g_message (G_GNUC_PRETTY_FUNCTION
-                                  ": Hit 0-length block, giving up");
-#endif
-                       return;
-               }
-               
-               data_len=data_len-block.data_len;
-
-               if (unicode_string_equals (block.key, "VarFileInfo")) {
-                       data_ptr=process_read_var_block (filever, data_ptr,
-                                                        block.data_len);
-               } else if (unicode_string_equals (block.key, "StringFileInfo")) {
-                       data_ptr=process_read_stringtable_block (filever, data_ptr, block.data_len);
-               } else {
-                       /* Bogus data */
-#ifdef DEBUG
-                       g_message (G_GNUC_PRETTY_FUNCTION
-                                  ": Not a valid VERSIONINFO child block");
-                       return;
-#endif
-               }
+                               process_set_field_int (filever, "filemajorpart", HIWORD (ffi->dwFileVersionMS));
+                               process_set_field_int (filever, "fileminorpart", LOWORD (ffi->dwFileVersionMS));
+                               process_set_field_int (filever, "filebuildpart", HIWORD (ffi->dwFileVersionLS));
+                               process_set_field_int (filever, "fileprivatepart", LOWORD (ffi->dwFileVersionLS));
+
+                               process_set_field_int (filever, "productmajorpart", HIWORD (ffi->dwProductVersionMS));
+                               process_set_field_int (filever, "productminorpart", LOWORD (ffi->dwProductVersionMS));
+                               process_set_field_int (filever, "productbuildpart", HIWORD (ffi->dwProductVersionLS));
+                               process_set_field_int (filever, "productprivatepart", LOWORD (ffi->dwProductVersionLS));
+
+                               process_set_field_bool (filever, "isdebug", (ffi->dwFileFlags & ffi->dwFileFlagsMask) & VS_FF_DEBUG);
+                               process_set_field_bool (filever, "isprerelease", (ffi->dwFileFlags & ffi->dwFileFlagsMask) & VS_FF_PRERELEASE);
+                               process_set_field_bool (filever, "ispatched", (ffi->dwFileFlags & ffi->dwFileFlagsMask) & VS_FF_PATCHED);
+                               process_set_field_bool (filever, "isprivatebuild", (ffi->dwFileFlags & ffi->dwFileFlagsMask) & VS_FF_PRIVATEBUILD);
+                               process_set_field_bool (filever, "isspecialbuild", (ffi->dwFileFlags & ffi->dwFileFlagsMask) & VS_FF_SPECIALBUILD);
+                       }
+                       g_free (query);
 
-               if(data_ptr==NULL) {
-                       /* Child block hit padding */
-#ifdef DEBUG
-                       g_message (G_GNUC_PRETTY_FUNCTION ": Child block hit 0-length block, giving up");
-#endif
-                       return;
+                       query = g_utf8_to_utf16 ("\\VarFileInfo\\Translation", -1, NULL, NULL, NULL);
+                       if (query == NULL) {
+                               g_free (data);
+                               return;
+                       }
+                       
+                       if (VerQueryValue (data, query,
+                                          (gpointer *)&trans_data,
+                                          &trans_size)) {
+                               /* use the first language ID we see
+                                */
+                               if (trans_size >= 4) {
+                                       LOGDEBUG (g_message("%s: %s has 0x%0x 0x%0x 0x%0x 0x%0x", __func__, g_utf16_to_utf8 (filename, -1, NULL, NULL, NULL), trans_data[0], trans_data[1], trans_data[2], trans_data[3]));
+                                       lang = (trans_data[0]) |
+                                               (trans_data[1] << 8) |
+                                               (trans_data[2] << 16) |
+                                               (trans_data[3] << 24);
+                                       /* Only give the lower 16 bits
+                                        * to VerLanguageName, as
+                                        * Windows gets confused
+                                        * otherwise
+                                        */
+                                       lang_count = VerLanguageName (lang & 0xFFFF, lang_buf, 128);
+                                       if (lang_count) {
+                                               process_set_field_string (filever, "language", lang_buf, lang_count);
+                                       }
+                                       process_module_stringtable (filever, data, trans_data[0], trans_data[1]);
+                               }
+                       } else {
+                               /* No strings, so set every field to
+                                * the empty string
+                                */
+                               process_set_field_string (filever,
+                                                         "comments",
+                                                         EMPTY_STRING, 0);
+                               process_set_field_string (filever,
+                                                         "companyname",
+                                                         EMPTY_STRING, 0);
+                               process_set_field_string (filever,
+                                                         "filedescription",
+                                                         EMPTY_STRING, 0);
+                               process_set_field_string (filever,
+                                                         "fileversion",
+                                                         EMPTY_STRING, 0);
+                               process_set_field_string (filever,
+                                                         "internalname",
+                                                         EMPTY_STRING, 0);
+                               process_set_field_string (filever,
+                                                         "legalcopyright",
+                                                         EMPTY_STRING, 0);
+                               process_set_field_string (filever,
+                                                         "legaltrademarks",
+                                                         EMPTY_STRING, 0);
+                               process_set_field_string (filever,
+                                                         "originalfilename",
+                                                         EMPTY_STRING, 0);
+                               process_set_field_string (filever,
+                                                         "privatebuild",
+                                                         EMPTY_STRING, 0);
+                               process_set_field_string (filever,
+                                                         "productname",
+                                                         EMPTY_STRING, 0);
+                               process_set_field_string (filever,
+                                                         "productversion",
+                                                         EMPTY_STRING, 0);
+                               process_set_field_string (filever,
+                                                         "specialbuild",
+                                                         EMPTY_STRING, 0);
+
+                               /* And language seems to be set to
+                                * en_US according to bug 374600
+                                */
+                               lang_count = VerLanguageName (0x0409, lang_buf, 128);
+                               if (lang_count) {
+                                       process_set_field_string (filever, "language", lang_buf, lang_count);
+                               }
+                       }
+                       
+                       g_free (query);
                }
+               g_free (data);
        }
 }
 
-static void process_add_module (GPtrArray *modules, MonoAssembly *ass)
+static MonoObject* process_add_module (HANDLE process, HMODULE mod, gunichar2 *filename, gunichar2 *modulename)
 {
        MonoClass *proc_class, *filever_class;
        MonoObject *item, *filever;
        MonoDomain *domain=mono_domain_get ();
-       gchar *modulename;
-       const char* filename;
+       MODULEINFO modinfo;
+       BOOL ok;
        
        /* Build a System.Diagnostics.ProcessModule with the data.
-        * Leave BaseAddress and EntryPointAddress set to NULL,
-        * FileName is ass->image->name, FileVersionInfo is an object
-        * constructed from the PE image data referenced by
-        * ass->image, ModuleMemorySize set to 0, ModuleName the last
-        * component of FileName.
         */
        proc_class=mono_class_from_name (system_assembly, "System.Diagnostics",
                                         "ProcessModule");
@@ -597,100 +387,80 @@ static void process_add_module (GPtrArray *modules, MonoAssembly *ass)
                                            "System.Diagnostics",
                                            "FileVersionInfo");
        filever=mono_object_new (domain, filever_class);
-       
-#ifdef DEBUG
-       g_message (G_GNUC_PRETTY_FUNCTION ": recording assembly: FileName [%s] FileVersionInfo [%d.%d.%d.%d], ModuleName [%s]", ass->image->name, ass->aname.major, ass->aname.minor, ass->aname.build, ass->aname.revision, ass->image->name);
-#endif
-
-       process_get_fileversion (filever, mono_assembly_get_image (ass));
 
-       filename = mono_image_get_filename (mono_assembly_get_image (ass));
-       process_set_field_string_utf8 (filever, "filename", filename);
-       process_set_field_string_utf8 (item, "filename", filename);
-       process_set_field_object (item, "version_info", filever);
+       process_get_fileversion (filever, filename);
 
-       modulename=g_path_get_basename (filename);
-       process_set_field_string_utf8 (item, "modulename", modulename);
-       g_free (modulename);
+       process_set_field_string (filever, "filename", filename,
+                                 unicode_chars (filename));
 
-       /* FIXME: moving GC */
-       g_ptr_array_add (modules, item);
-}
-
-static void process_scan_modules (gpointer data, gpointer user_data)
-{
-       MonoAssembly *ass=data;
-       GPtrArray *modules=user_data;
-
-       /* The main assembly is already in the list */
-       if(mono_assembly_get_main () != ass) {
-               process_add_module (modules, ass);
+       ok = GetModuleInformation (process, mod, &modinfo, sizeof(MODULEINFO));
+       if (ok) {
+               process_set_field_intptr (item, "baseaddr",
+                                         modinfo.lpBaseOfDll);
+               process_set_field_intptr (item, "entryaddr",
+                                         modinfo.EntryPoint);
+               process_set_field_int (item, "memory_size",
+                                      modinfo.SizeOfImage);
        }
-}
+       process_set_field_string (item, "filename", filename,
+                                 unicode_chars (filename));
+       process_set_field_string (item, "modulename", modulename,
+                                 unicode_chars (modulename));
+       process_set_field_object (item, "version_info", filever);
 
+       return item;
+}
 
 /* Returns an array of System.Diagnostics.ProcessModule */
-MonoArray *ves_icall_System_Diagnostics_Process_GetModules_internal (MonoObject *this)
+MonoArray *ves_icall_System_Diagnostics_Process_GetModules_internal (MonoObject *this, HANDLE process)
 {
-       /* I was going to use toolhelp for this, but then realised I
-        * was being an idiot :)
-        *
-        * (Toolhelp would give shared libraries open by the runtime,
-        * as well as open assemblies.  On windows my tests didnt find
-        * the assemblies loaded by mono either.)
-        */
-       GPtrArray *modules_list=g_ptr_array_new ();
+       MonoArray *temp_arr = NULL;
        MonoArray *arr;
-       guint32 i;
-       
-       MONO_ARCH_SAVE_REGS;
+       HMODULE mods[1024];
+       gunichar2 filename[MAX_PATH];
+       gunichar2 modname[MAX_PATH];
+       DWORD needed;
+       guint32 count = 0;
+       guint32 i, num_added = 0;
 
        STASH_SYS_ASS (this);
-       
-       /* Make sure the first entry is the main module */
-       process_add_module (modules_list, mono_assembly_get_main ());
-       
-       mono_assembly_foreach (process_scan_modules, modules_list);
 
-       /* Build a MonoArray out of modules_list */
-       arr=mono_array_new (mono_domain_get (), mono_get_object_class (),
-                           modules_list->len);
-       
-       for(i=0; i<modules_list->len; i++) {
-               mono_array_setref (arr, i, g_ptr_array_index (modules_list, i));
+       if (EnumProcessModules (process, mods, sizeof(mods), &needed)) {
+               count = needed / sizeof(HMODULE);
+               temp_arr = mono_array_new (mono_domain_get (), mono_get_object_class (), count);
+               for (i = 0; i < count; i++) {
+                       if (GetModuleBaseName (process, mods[i], modname, MAX_PATH) &&
+                                       GetModuleFileNameEx (process, mods[i], filename, MAX_PATH)) {
+                               MonoObject *module = process_add_module (process, mods[i],
+                                               filename, modname);
+                               mono_array_setref (temp_arr, num_added++, module);
+                       }
+               }
        }
-       
-       g_ptr_array_free (modules_list, TRUE);
-       
-       return(arr);
+
+       if (count == num_added) {
+               arr = temp_arr;
+       } else {
+               /* shorter version of the array */
+               arr = mono_array_new (mono_domain_get (), mono_get_object_class (), num_added);
+
+               for (i = 0; i < num_added; i++)
+                       mono_array_setref (arr, i, mono_array_get (temp_arr, MonoObject*, i));
+       }
+
+       return arr;
 }
 
 void ves_icall_System_Diagnostics_FileVersionInfo_GetVersionInfo_internal (MonoObject *this, MonoString *filename)
 {
-       MonoImage *image;
-       gchar *filename_utf8;
-       
        MONO_ARCH_SAVE_REGS;
 
        STASH_SYS_ASS (this);
        
-       filename_utf8 = mono_string_to_utf8 (filename);
-       image = mono_pe_file_open (filename_utf8, NULL);
-       g_free (filename_utf8);
-       
-       if(image==NULL) {
-               /* FIXME: an exception might be appropriate here */
-#ifdef DEBUG
-               g_message (G_GNUC_PRETTY_FUNCTION ": Failed to load image");
-#endif
-
-               return;
-       }
-       
-       process_get_fileversion (this, image);
-       process_set_field_string_utf8 (this, "filename", mono_image_get_filename (image));
-       
-       mono_image_close (image);
+       process_get_fileversion (this, mono_string_chars (filename));
+       process_set_field_string (this, "filename",
+                                 mono_string_chars (filename),
+                                 mono_string_length (filename));
 }
 
 /* Only used when UseShellExecute is false */
@@ -698,7 +468,7 @@ static gchar *
 quote_path (const gchar *path)
 {
        gchar *res = g_shell_quote (path);
-#ifdef PLATFORM_WIN32
+#ifdef TARGET_WIN32
        {
        gchar *q = res;
        while (*q) {
@@ -715,43 +485,129 @@ quote_path (const gchar *path)
 static gboolean
 complete_path (const gunichar2 *appname, gchar **completed)
 {
-       gchar *utf8app;
+       gchar *utf8app, *utf8appmemory;
        gchar *found;
 
-       utf8app = g_utf16_to_utf8 (appname, -1, NULL, NULL, NULL);
+       utf8appmemory = utf8app = g_utf16_to_utf8 (appname, -1, NULL, NULL, NULL);
+#ifdef TARGET_WIN32 // Should this happen on all platforms? 
+       {
+               // remove the quotes around utf8app.
+               size_t len;
+               len = strlen (utf8app);
+               if (len) {
+                       if (utf8app[len-1] == '\"')
+                               utf8app[len-1] = '\0';
+                       if (utf8app[0] == '\"')
+                               utf8app++;
+               }
+       }
+#endif
+
        if (g_path_is_absolute (utf8app)) {
                *completed = quote_path (utf8app);
-               g_free (utf8app);
+               g_free (utf8appmemory);
                return TRUE;
        }
 
        if (g_file_test (utf8app, G_FILE_TEST_IS_EXECUTABLE) && !g_file_test (utf8app, G_FILE_TEST_IS_DIR)) {
                *completed = quote_path (utf8app);
-               g_free (utf8app);
+               g_free (utf8appmemory);
                return TRUE;
        }
        
        found = g_find_program_in_path (utf8app);
        if (found == NULL) {
                *completed = NULL;
-               g_free (utf8app);
+               g_free (utf8appmemory);
                return FALSE;
        }
 
        *completed = quote_path (found);
        g_free (found);
-       g_free (utf8app);
+       g_free (utf8appmemory);
        return TRUE;
 }
 
+#ifndef HAVE_GETPROCESSID
+/* Run-time GetProcessId detection for Windows */
+#ifdef TARGET_WIN32
+#define HAVE_GETPROCESSID
+
+typedef DWORD (WINAPI *GETPROCESSID_PROC) (HANDLE);
+typedef DWORD (WINAPI *NTQUERYINFORMATIONPROCESS_PROC) (HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG);
+typedef DWORD (WINAPI *RTLNTSTATUSTODOSERROR_PROC) (NTSTATUS);
+
+static DWORD WINAPI GetProcessId_detect (HANDLE process);
+
+static GETPROCESSID_PROC GetProcessId = &GetProcessId_detect;
+static NTQUERYINFORMATIONPROCESS_PROC NtQueryInformationProcess_proc = NULL;
+static RTLNTSTATUSTODOSERROR_PROC RtlNtStatusToDosError_proc = NULL;
+
+static DWORD WINAPI GetProcessId_ntdll (HANDLE process)
+{
+       PROCESS_BASIC_INFORMATION pi;
+       NTSTATUS status;
+
+       status = NtQueryInformationProcess_proc (process, ProcessBasicInformation, &pi, sizeof (pi), NULL);
+       if (NT_SUCCESS (status)) {
+               return pi.UniqueProcessId;
+       } else {
+               SetLastError (RtlNtStatusToDosError_proc (status));
+               return 0;
+       }
+}
+
+static DWORD WINAPI GetProcessId_stub (HANDLE process)
+{
+       SetLastError (ERROR_CALL_NOT_IMPLEMENTED);
+       return 0;
+}
+
+static DWORD WINAPI GetProcessId_detect (HANDLE process)
+{
+       HMODULE module_handle;
+       GETPROCESSID_PROC GetProcessId_kernel;
+
+       /* Windows XP SP1 and above have GetProcessId API */
+       module_handle = GetModuleHandle (L"kernel32.dll");
+       if (module_handle != NULL) {
+               GetProcessId_kernel = (GETPROCESSID_PROC) GetProcAddress (module_handle, "GetProcessId");
+               if (GetProcessId_kernel != NULL) {
+                       GetProcessId = GetProcessId_kernel;
+                       return GetProcessId (process);
+               }
+       }
+
+       /* Windows 2000 and above have deprecated NtQueryInformationProcess API */
+       module_handle = GetModuleHandle (L"ntdll.dll");
+       if (module_handle != NULL) {
+               NtQueryInformationProcess_proc = (NTQUERYINFORMATIONPROCESS_PROC) GetProcAddress (module_handle, "NtQueryInformationProcess");
+               if (NtQueryInformationProcess_proc != NULL) {
+                       RtlNtStatusToDosError_proc = (RTLNTSTATUSTODOSERROR_PROC) GetProcAddress (module_handle, "RtlNtStatusToDosError");
+                       if (RtlNtStatusToDosError_proc != NULL) {
+                               GetProcessId = &GetProcessId_ntdll;
+                               return GetProcessId (process);
+                       }
+               }
+       }
+
+       /* Fall back to ERROR_CALL_NOT_IMPLEMENTED */
+       GetProcessId = &GetProcessId_stub;
+       return GetProcessId (process);
+}
+#endif /* HOST_WIN32 */
+#endif /* !HAVE_GETPROCESSID */
+
 MonoBoolean ves_icall_System_Diagnostics_Process_ShellExecuteEx_internal (MonoProcessStartInfo *proc_start_info, MonoProcInfo *process_info)
 {
        SHELLEXECUTEINFO shellex = {0};
        gboolean ret;
 
        shellex.cbSize = sizeof(SHELLEXECUTEINFO);
-       shellex.fMask = SEE_MASK_FLAG_DDEWAIT | SEE_MASK_NOCLOSEPROCESS | SEE_MASK_UNICODE;
-       shellex.nShow = SW_SHOWNORMAL;
+       shellex.fMask = SEE_MASK_FLAG_DDEWAIT | SEE_MASK_UNICODE;
+       shellex.nShow = proc_start_info->window_style;
+       shellex.nShow = (shellex.nShow == 0) ? 1 : (shellex.nShow == 1 ? 0 : shellex.nShow);
+       
        
        if (proc_start_info->filename != NULL) {
                shellex.lpFile = mono_string_chars (proc_start_info->filename);
@@ -771,23 +627,13 @@ MonoBoolean ves_icall_System_Diagnostics_Process_ShellExecuteEx_internal (MonoPr
                shellex.lpDirectory = mono_string_chars (proc_start_info->working_directory);
        }
 
-       ret = ShellExecuteEx (&shellex);
-       if (ret == FALSE) {
-               process_info->pid = -GetLastError ();
+       if (proc_start_info->error_dialog) {    
+               shellex.hwnd = proc_start_info->error_dialog_parent_handle;
        } else {
-               process_info->process_handle = shellex.hProcess;
-               process_info->thread_handle = NULL;
-               /* It appears that there's no way to get the pid from a
-                * process handle before windows xp.  Really.
-                */
-#ifdef HAVE_GETPROCESSID
-               process_info->pid = GetProcessId (shellex.hProcess);
-#else
-               process_info->pid = 0;
-#endif
-               process_info->tid = 0;
+               shellex.fMask |= SEE_MASK_FLAG_NO_UI;
        }
 
+       ret = ShellExecuteEx (&shellex);
        return (ret);
 }
 
@@ -802,7 +648,7 @@ MonoBoolean ves_icall_System_Diagnostics_Process_CreateProcess_internal (MonoPro
        gboolean free_shell_path = TRUE;
        gchar *spath = NULL;
        MonoString *cmd = proc_start_info->arguments;
-       guint32 creation_flags;
+       guint32 creation_flags, logon_flags;
        
        startinfo.cb=sizeof(STARTUPINFO);
        startinfo.dwFlags=STARTF_USESTDHANDLES;
@@ -820,7 +666,7 @@ MonoBoolean ves_icall_System_Diagnostics_Process_CreateProcess_internal (MonoPro
                process_info->pid = -ERROR_FILE_NOT_FOUND;
                return FALSE;
        }
-#ifdef PLATFORM_WIN32
+#ifdef TARGET_WIN32
        /* Seems like our CreateProcess does not work as the windows one.
         * This hack is needed to deal with paths containing spaces */
        shell_path = NULL;
@@ -885,13 +731,18 @@ MonoBoolean ves_icall_System_Diagnostics_Process_CreateProcess_internal (MonoPro
        /* The default dir name is "".  Turn that into NULL to mean
         * "current directory"
         */
-       if(mono_string_length (proc_start_info->working_directory)==0) {
+       if(proc_start_info->working_directory == NULL || mono_string_length (proc_start_info->working_directory)==0) {
                dir=NULL;
        } else {
                dir=mono_string_chars (proc_start_info->working_directory);
        }
 
-       ret=CreateProcess (shell_path, cmd? mono_string_chars (cmd): NULL, NULL, NULL, TRUE, creation_flags, env_vars, dir, &startinfo, &procinfo);
+       if (process_info->username) {
+               logon_flags = process_info->load_user_profile ? LOGON_WITH_PROFILE : 0;
+               ret=CreateProcessWithLogonW (mono_string_chars (process_info->username), process_info->domain ? mono_string_chars (process_info->domain) : NULL, process_info->password, logon_flags, shell_path, cmd? mono_string_chars (cmd): NULL, creation_flags, env_vars, dir, &startinfo, &procinfo);
+       } else {
+               ret=CreateProcess (shell_path, cmd? mono_string_chars (cmd): NULL, NULL, NULL, TRUE, creation_flags, env_vars, dir, &startinfo, &procinfo);
+       }
 
        g_free (env_vars);
        if (free_shell_path)
@@ -931,6 +782,22 @@ MonoBoolean ves_icall_System_Diagnostics_Process_WaitForExit_internal (MonoObjec
        }
 }
 
+MonoBoolean ves_icall_System_Diagnostics_Process_WaitForInputIdle_internal (MonoObject *this, HANDLE process, gint32 ms)
+{
+       guint32 ret;
+       
+       MONO_ARCH_SAVE_REGS;
+
+       if(ms<0) {
+               /* Wait forever */
+               ret=WaitForInputIdle (process, INFINITE);
+       } else {
+               ret=WaitForInputIdle (process, ms);
+       }
+
+       return (ret) ? FALSE : TRUE;
+}
+
 gint64 ves_icall_System_Diagnostics_Process_ExitTime_internal (HANDLE process)
 {
        gboolean ret;
@@ -973,15 +840,13 @@ gint64 ves_icall_System_Diagnostics_Process_StartTime_internal (HANDLE process)
 
 gint32 ves_icall_System_Diagnostics_Process_ExitCode_internal (HANDLE process)
 {
-       guint32 code;
+       DWORD code;
        
        MONO_ARCH_SAVE_REGS;
 
        GetExitCodeProcess (process, &code);
        
-#ifdef DEBUG
-       g_message (G_GNUC_PRETTY_FUNCTION ": process exit code is %d", code);
-#endif
+       LOGDEBUG (g_message ("%s: process exit code is %d", __func__, code));
        
        return(code);
 }
@@ -992,7 +857,7 @@ MonoString *ves_icall_System_Diagnostics_Process_ProcessName_internal (HANDLE pr
        gboolean ok;
        HMODULE mod;
        gunichar2 name[MAX_PATH];
-       guint32 needed;
+       DWORD needed;
        guint32 len;
        
        MONO_ARCH_SAVE_REGS;
@@ -1007,10 +872,7 @@ MonoString *ves_icall_System_Diagnostics_Process_ProcessName_internal (HANDLE pr
                return(NULL);
        }
        
-#ifdef DEBUG
-       g_message (G_GNUC_PRETTY_FUNCTION ": process name is [%s]",
-                  g_utf16_to_utf8 (name, -1, NULL, NULL, NULL));
-#endif
+       LOGDEBUG (g_message ("%s: process name is [%s]", __func__, g_utf16_to_utf8 (name, -1, NULL, NULL, NULL)));
        
        string=mono_string_new_utf16 (mono_domain_get (), name, len);
        
@@ -1022,31 +884,45 @@ MonoArray *ves_icall_System_Diagnostics_Process_GetProcesses_internal (void)
 {
        MonoArray *procs;
        gboolean ret;
-       guint32 needed, count, i;
-       guint32 pids[1024];
+       DWORD needed;
+       guint32 count;
+       guint32 *pids;
 
        MONO_ARCH_SAVE_REGS;
 
-       ret=EnumProcesses (pids, sizeof(pids), &needed);
-       if(ret==FALSE) {
-               /* FIXME: throw an exception */
-               return(NULL);
-       }
-       
-       count=needed/sizeof(guint32);
-       procs=mono_array_new (mono_domain_get (), mono_get_int32_class (),
-                             count);
-       for(i=0; i<count; i++) {
-               mono_array_set (procs, guint32, i, pids[i]);
-       }
+       count = 512;
+       do {
+               pids = g_new0 (guint32, count);
+               ret = EnumProcesses (pids, count * sizeof (guint32), &needed);
+               if (ret == FALSE) {
+                       MonoException *exc;
+
+                       g_free (pids);
+                       pids = NULL;
+                       exc = mono_get_exception_not_supported ("This system does not support EnumProcesses");
+                       mono_raise_exception (exc);
+                       g_assert_not_reached ();
+               }
+               if (needed < (count * sizeof (guint32)))
+                       break;
+               g_free (pids);
+               pids = NULL;
+               count = (count * 3) / 2;
+       } while (TRUE);
+
+       count = needed / sizeof (guint32);
+       procs = mono_array_new (mono_domain_get (), mono_get_int32_class (), count);
+       memcpy (mono_array_addr (procs, guint32, 0), pids, needed);
+       g_free (pids);
+       pids = NULL;
        
-       return(procs);
+       return procs;
 }
 
 MonoBoolean ves_icall_System_Diagnostics_Process_GetWorkingSet_internal (HANDLE process, guint32 *min, guint32 *max)
 {
        gboolean ret;
-       size_t ws_min, ws_max;
+       SIZE_T ws_min, ws_max;
        
        MONO_ARCH_SAVE_REGS;
 
@@ -1060,8 +936,8 @@ MonoBoolean ves_icall_System_Diagnostics_Process_GetWorkingSet_internal (HANDLE
 MonoBoolean ves_icall_System_Diagnostics_Process_SetWorkingSet_internal (HANDLE process, guint32 min, guint32 max, MonoBoolean use_min)
 {
        gboolean ret;
-       size_t ws_min;
-       size_t ws_max;
+       SIZE_T ws_min;
+       SIZE_T ws_max;
        
        MONO_ARCH_SAVE_REGS;
 
@@ -1071,9 +947,9 @@ MonoBoolean ves_icall_System_Diagnostics_Process_SetWorkingSet_internal (HANDLE
        }
        
        if(use_min==TRUE) {
-               ws_min=min;
+               ws_min=(SIZE_T)min;
        } else {
-               ws_max=max;
+               ws_max=(SIZE_T)max;
        }
        
        ret=SetProcessWorkingSetSize (process, ws_min, ws_max);
@@ -1091,3 +967,72 @@ ves_icall_System_Diagnostics_Process_Kill_internal (HANDLE process, gint32 sig)
        return TerminateProcess (process, -sig);
 }
 
+gint64
+ves_icall_System_Diagnostics_Process_Times (HANDLE process, gint32 type)
+{
+       FILETIME create_time, exit_time, kernel_time, user_time;
+       
+       if (GetProcessTimes (process, &create_time, &exit_time, &kernel_time, &user_time)) {
+               if (type == 0)
+                       return *(gint64*)&user_time;
+               else if (type == 1)
+                       return *(gint64*)&kernel_time;
+               /* system + user time: FILETIME can be (memory) cast to a 64 bit int */
+               return *(gint64*)&kernel_time + *(gint64*)&user_time;
+       }
+       return 0;
+}
+
+gint32
+ves_icall_System_Diagnostics_Process_GetPriorityClass (HANDLE process, gint32 *error)
+{
+       gint32 ret = GetPriorityClass (process);
+       *error = ret == 0 ? GetLastError () : 0;
+       return ret;
+}
+
+MonoBoolean
+ves_icall_System_Diagnostics_Process_SetPriorityClass (HANDLE process, gint32 priority_class, gint32 *error)
+{
+       gboolean ret = SetPriorityClass (process, priority_class);
+       *error = ret == 0 ? GetLastError () : 0;
+       return ret;
+}
+
+HANDLE
+ves_icall_System_Diagnostics_Process_ProcessHandle_duplicate (HANDLE process)
+{
+       HANDLE ret;
+
+       MONO_ARCH_SAVE_REGS;
+
+       LOGDEBUG (g_message ("%s: Duplicating process handle %p", __func__, process));
+       
+       DuplicateHandle (GetCurrentProcess (), process, GetCurrentProcess (),
+                        &ret, THREAD_ALL_ACCESS, TRUE, 0);
+       
+       return ret;
+}
+
+void
+ves_icall_System_Diagnostics_Process_ProcessHandle_close (HANDLE process)
+{
+       MONO_ARCH_SAVE_REGS;
+
+       LOGDEBUG (g_message ("%s: Closing process handle %p", __func__, process));
+
+       CloseHandle (process);
+}
+
+gint64
+ves_icall_System_Diagnostics_Process_GetProcessData (int pid, gint32 data_type, gint32 *error)
+{
+       MonoProcessError perror;
+       guint64 res;
+
+       res = mono_process_get_data_with_error (GINT_TO_POINTER (pid), data_type, &perror);
+       if (error)
+               *error = perror;
+       return res;
+}
+