diff options
Diffstat (limited to 'src/osd/windows/output.c')
-rw-r--r-- | src/osd/windows/output.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/osd/windows/output.c b/src/osd/windows/output.c index d81643e610e..bd5278583d7 100644 --- a/src/osd/windows/output.c +++ b/src/osd/windows/output.c @@ -105,7 +105,7 @@ static int create_window_class(void); static LRESULT CALLBACK output_window_proc(HWND wnd, UINT message, WPARAM wparam, LPARAM lparam); static LRESULT register_client(HWND hwnd, LPARAM id); static LRESULT unregister_client(HWND hwnd, LPARAM id); -static LRESULT send_id_string(running_machine *machine, HWND hwnd, LPARAM id); +static LRESULT send_id_string(running_machine &machine, HWND hwnd, LPARAM id); static void notifier_callback(const char *outname, INT32 value, void *param); @@ -114,12 +114,12 @@ static void notifier_callback(const char *outname, INT32 value, void *param); // winoutput_init //============================================================ -void winoutput_init(running_machine *machine) +void winoutput_init(running_machine &machine) { int result; // ensure we get cleaned up - machine->add_notifier(MACHINE_NOTIFY_EXIT, winoutput_exit); + machine.add_notifier(MACHINE_NOTIFY_EXIT, winoutput_exit); // reset globals clientlist = NULL; @@ -143,7 +143,7 @@ void winoutput_init(running_machine *machine) assert(output_hwnd != NULL); // set a pointer to the running machine - SetWindowLongPtr(output_hwnd, GWLP_USERDATA, (LONG_PTR)machine); + SetWindowLongPtr(output_hwnd, GWLP_USERDATA, (LONG_PTR)&machine); // allocate message ids om_mame_start = RegisterWindowMessage(OM_MAME_START); @@ -222,7 +222,7 @@ static int create_window_class(void) static LRESULT CALLBACK output_window_proc(HWND wnd, UINT message, WPARAM wparam, LPARAM lparam) { LONG_PTR ptr = GetWindowLongPtr(wnd, GWLP_USERDATA); - running_machine *machine = (running_machine *)ptr; + running_machine &machine = *(running_machine *)ptr; // register a new client if (message == om_mame_register_client) @@ -300,7 +300,7 @@ static LRESULT unregister_client(HWND hwnd, LPARAM id) // send_id_string //============================================================ -static LRESULT send_id_string(running_machine *machine, HWND hwnd, LPARAM id) +static LRESULT send_id_string(running_machine &machine, HWND hwnd, LPARAM id) { copydata_id_string *temp; COPYDATASTRUCT copydata; @@ -309,7 +309,7 @@ static LRESULT send_id_string(running_machine *machine, HWND hwnd, LPARAM id) // id 0 is the name of the game if (id == 0) - name = machine->system().name; + name = machine.system().name; else name = output_id_to_name(id); |