Merge branch 'raimo/64-bit-driver-api/OTP-9795'

* raimo/64-bit-driver-api/OTP-9795: (22 commits)
  driver_SUITE.erl: Fix sys info drivers
  emulator test drivers: Conform to updated driver API
  runtime_tools's drivers: Conform to updated driver API
  ws's xwe_driver.c: Conform to updated driver API
  megaco's flex scanner: Conform to updated driver API
  seq_trace_SUITE_data/echo_drv.c: Conform to updated driver API
  erl_interface tests: Conform port_call_drv.c updated driver API
  erl_drv_thread_SUITE_data/testcase_driver.c: Conform to updated driver API
  float_SUITE_data/fp_drv.c: Conform to updated driver API
  port_SUITE_data/*_drv.c: Conform to updated driver API
  port_bif_SUITE_data/control_drv.c: Conform to updated driver API
  send_term_SUITE_data/send_term_drv.c: Conform to updated driver API
  system_profile_SUITE_data/echo_drv.c: Conform to updated driver API
  trace_port_SUITE_data/echo_drv.c: Conform to updated driver API
  Remove support for old drivers without ERL_DRV_EXTENDED_MARKER
  built-in drivers: Add ERL_DRV_EXTENDED_MARKER and version numbers
  Bump driver version to 2.0
  erl_driver.h: Enlarge type on return value from call
  erl_driver.h: Enlarge types on driver callbacks output, control and call
  erl_driver.h: Enlarge types in driver output functions
  ...

Conflicts:
	erts/emulator/test/driver_SUITE_data/monitor_drv.c
	erts/emulator/test/driver_SUITE_data/timer_drv.c

1 files changed, 16 insertions, 5 deletions

diff --git a/erts/emulator/drivers/win32/registry_drv.c b/erts/emulator/drivers/win32/registry_drv.c
index 05fd2ea55f..1fad34e380 100644
--- a/erts/emulator/drivers/win32/registry_drv.c
+++ b/erts/emulator/drivers/win32/registry_drv.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1997-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2011. All Rights Reserved.
  * 
  * The contents of this file are subject to the Erlang Public License,
  * Version 1.1, (the "License"); you may not use this file except in
@@ -84,7 +84,7 @@ static int maperror(DWORD error);
 static int reg_init(void);
 static ErlDrvData reg_start(ErlDrvPort, char*);
 static void reg_stop(ErlDrvData);
-static void reg_from_erlang(ErlDrvData, char*, int);
+static void reg_from_erlang(ErlDrvData, char*, ErlDrvSizeT);
 
 struct erl_drv_entry registry_driver_entry = {
     reg_init,
@@ -95,10 +95,21 @@ struct erl_drv_entry registry_driver_entry = {
     NULL,
     "registry__drv__",
     NULL,
+    NULL, /* handle */
+    NULL, /* control */
+    NULL, /* timeout */
+    NULL, /* outputv */
+    NULL, /* ready_async */
+    NULL, /* flush */
+    NULL, /* call */
+    NULL, /* event */
+    ERL_DRV_EXTENDED_MARKER,
+    ERL_DRV_EXTENDED_MAJOR_VERSION,
+    ERL_DRV_EXTENDED_MINOR_VERSION,
+    0,
     NULL,
     NULL,
     NULL,
-    NULL
 };
 
 static int
@@ -158,7 +169,7 @@ reg_stop(ErlDrvData clientData)
 }
 
 static void
-reg_from_erlang(ErlDrvData clientData, char* buf, int count)
+reg_from_erlang(ErlDrvData clientData, char* buf, ErlDrvSizeT count)
 {
     RegPort* rp = (RegPort *) clientData;
     int cmd;
@@ -301,7 +312,7 @@ reg_from_erlang(ErlDrvData clientData, char* buf, int count)
 		buf = (char *) &dword;
 		ASSERT(count == 4);
 	    }
-	    result = RegSetValueEx(rp->hkey, name, 0, type, buf, count);
+	    result = RegSetValueEx(rp->hkey, name, 0, type, buf, (DWORD)count);
 	    reply(rp, result);
 	}
 	break;