server: Do not cast zero.
Michael Stefaniuc
mstefani at redhat.de
Tue Nov 4 16:35:07 CST 2008
---
server/console.c | 2 +-
server/trace.c | 130 +++++++++++++++++++++++++++---------------------------
2 files changed, 66 insertions(+), 66 deletions(-)
diff --git a/server/console.c b/server/console.c
index b931e05..2ad686c 100644
--- a/server/console.c
+++ b/server/console.c
@@ -1380,7 +1380,7 @@ DECL_HANDLER(open_console)
struct object *obj = NULL;
reply->handle = 0;
- if (req->from == (obj_handle_t)0)
+ if (req->from == NULL)
{
if (current->process->console && current->process->console->renderer)
obj = grab_object( (struct object*)current->process->console );
diff --git a/server/trace.c b/server/trace.c
index 39fda8c..5a4aa00 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -4041,29 +4041,29 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = {
(dump_func)dump_get_new_process_info_reply,
(dump_func)dump_new_thread_reply,
(dump_func)dump_get_startup_info_reply,
- (dump_func)0,
+ NULL,
(dump_func)dump_init_thread_reply,
(dump_func)dump_terminate_process_reply,
(dump_func)dump_terminate_thread_reply,
(dump_func)dump_get_process_info_reply,
- (dump_func)0,
+ NULL,
(dump_func)dump_get_thread_info_reply,
- (dump_func)0,
+ NULL,
(dump_func)dump_get_dll_info_reply,
(dump_func)dump_suspend_thread_reply,
(dump_func)dump_resume_thread_reply,
- (dump_func)0,
- (dump_func)0,
+ NULL,
+ NULL,
(dump_func)dump_queue_apc_reply,
(dump_func)dump_get_apc_result_reply,
- (dump_func)0,
+ NULL,
(dump_func)dump_set_handle_info_reply,
(dump_func)dump_dup_handle_reply,
(dump_func)dump_open_process_reply,
(dump_func)dump_open_thread_reply,
(dump_func)dump_select_reply,
(dump_func)dump_create_event_reply,
- (dump_func)0,
+ NULL,
(dump_func)dump_open_event_reply,
(dump_func)dump_create_mutex_reply,
(dump_func)dump_release_mutex_reply,
@@ -4077,35 +4077,35 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = {
(dump_func)dump_get_handle_fd_reply,
(dump_func)dump_flush_file_reply,
(dump_func)dump_lock_file_reply,
- (dump_func)0,
+ NULL,
(dump_func)dump_create_socket_reply,
(dump_func)dump_accept_socket_reply,
- (dump_func)0,
+ NULL,
(dump_func)dump_get_socket_event_reply,
- (dump_func)0,
- (dump_func)0,
+ NULL,
+ NULL,
(dump_func)dump_alloc_console_reply,
- (dump_func)0,
+ NULL,
(dump_func)dump_get_console_renderer_events_reply,
(dump_func)dump_open_console_reply,
(dump_func)dump_get_console_wait_event_reply,
(dump_func)dump_get_console_mode_reply,
- (dump_func)0,
- (dump_func)0,
+ NULL,
+ NULL,
(dump_func)dump_get_console_input_info_reply,
- (dump_func)0,
+ NULL,
(dump_func)dump_get_console_input_history_reply,
(dump_func)dump_create_console_output_reply,
- (dump_func)0,
+ NULL,
(dump_func)dump_get_console_output_info_reply,
(dump_func)dump_write_console_input_reply,
(dump_func)dump_read_console_input_reply,
(dump_func)dump_write_console_output_reply,
(dump_func)dump_fill_console_output_reply,
(dump_func)dump_read_console_output_reply,
- (dump_func)0,
- (dump_func)0,
- (dump_func)0,
+ NULL,
+ NULL,
+ NULL,
(dump_func)dump_read_change_reply,
(dump_func)dump_create_mapping_reply,
(dump_func)dump_open_mapping_reply,
@@ -4117,26 +4117,26 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = {
(dump_func)dump_wait_debug_event_reply,
(dump_func)dump_queue_exception_event_reply,
(dump_func)dump_get_exception_status_reply,
- (dump_func)0,
- (dump_func)0,
- (dump_func)0,
+ NULL,
+ NULL,
+ NULL,
(dump_func)dump_debug_break_reply,
- (dump_func)0,
+ NULL,
(dump_func)dump_read_process_memory_reply,
- (dump_func)0,
+ NULL,
(dump_func)dump_create_key_reply,
(dump_func)dump_open_key_reply,
- (dump_func)0,
- (dump_func)0,
+ NULL,
+ NULL,
(dump_func)dump_enum_key_reply,
- (dump_func)0,
+ NULL,
(dump_func)dump_get_key_value_reply,
(dump_func)dump_enum_key_value_reply,
- (dump_func)0,
- (dump_func)0,
- (dump_func)0,
- (dump_func)0,
- (dump_func)0,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
(dump_func)dump_create_timer_reply,
(dump_func)dump_open_timer_reply,
(dump_func)dump_set_timer_reply,
@@ -4146,37 +4146,37 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = {
(dump_func)dump_set_thread_context_reply,
(dump_func)dump_get_selector_entry_reply,
(dump_func)dump_add_atom_reply,
- (dump_func)0,
+ NULL,
(dump_func)dump_find_atom_reply,
(dump_func)dump_get_atom_information_reply,
- (dump_func)0,
- (dump_func)0,
+ NULL,
+ NULL,
(dump_func)dump_init_atom_table_reply,
(dump_func)dump_get_msg_queue_reply,
- (dump_func)0,
+ NULL,
(dump_func)dump_set_queue_mask_reply,
(dump_func)dump_get_queue_status_reply,
(dump_func)dump_get_process_idle_event_reply,
- (dump_func)0,
- (dump_func)0,
- (dump_func)0,
+ NULL,
+ NULL,
+ NULL,
(dump_func)dump_get_message_reply,
- (dump_func)0,
- (dump_func)0,
+ NULL,
+ NULL,
(dump_func)dump_get_message_reply_reply,
(dump_func)dump_set_win_timer_reply,
- (dump_func)0,
+ NULL,
(dump_func)dump_is_window_hung_reply,
(dump_func)dump_get_serial_info_reply,
- (dump_func)0,
- (dump_func)0,
- (dump_func)0,
+ NULL,
+ NULL,
+ NULL,
(dump_func)dump_ioctl_reply,
(dump_func)dump_get_ioctl_result_reply,
(dump_func)dump_create_named_pipe_reply,
(dump_func)dump_get_named_pipe_info_reply,
(dump_func)dump_create_window_reply,
- (dump_func)0,
+ NULL,
(dump_func)dump_get_desktop_window_reply,
(dump_func)dump_set_window_owner_reply,
(dump_func)dump_get_window_info_reply,
@@ -4189,36 +4189,36 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = {
(dump_func)dump_set_window_pos_reply,
(dump_func)dump_get_window_rectangles_reply,
(dump_func)dump_get_window_text_reply,
- (dump_func)0,
+ NULL,
(dump_func)dump_get_windows_offset_reply,
(dump_func)dump_get_visible_region_reply,
(dump_func)dump_get_window_region_reply,
- (dump_func)0,
+ NULL,
(dump_func)dump_get_update_region_reply,
- (dump_func)0,
- (dump_func)0,
- (dump_func)0,
+ NULL,
+ NULL,
+ NULL,
(dump_func)dump_remove_window_property_reply,
(dump_func)dump_get_window_property_reply,
(dump_func)dump_get_window_properties_reply,
(dump_func)dump_create_winstation_reply,
(dump_func)dump_open_winstation_reply,
- (dump_func)0,
+ NULL,
(dump_func)dump_get_process_winstation_reply,
- (dump_func)0,
+ NULL,
(dump_func)dump_enum_winstation_reply,
(dump_func)dump_create_desktop_reply,
(dump_func)dump_open_desktop_reply,
- (dump_func)0,
+ NULL,
(dump_func)dump_get_thread_desktop_reply,
- (dump_func)0,
+ NULL,
(dump_func)dump_enum_desktop_reply,
(dump_func)dump_set_user_object_info_reply,
- (dump_func)0,
+ NULL,
(dump_func)dump_get_thread_input_reply,
(dump_func)dump_get_last_input_time_reply,
(dump_func)dump_get_key_state_reply,
- (dump_func)0,
+ NULL,
(dump_func)dump_set_foreground_window_reply,
(dump_func)dump_set_focus_window_reply,
(dump_func)dump_set_active_window_reply,
@@ -4228,7 +4228,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = {
(dump_func)dump_set_hook_reply,
(dump_func)dump_remove_hook_reply,
(dump_func)dump_start_hook_chain_reply,
- (dump_func)0,
+ NULL,
(dump_func)dump_get_hook_info_reply,
(dump_func)dump_create_class_reply,
(dump_func)dump_destroy_class_reply,
@@ -4243,7 +4243,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = {
(dump_func)dump_access_check_reply,
(dump_func)dump_get_token_user_reply,
(dump_func)dump_get_token_groups_reply,
- (dump_func)0,
+ NULL,
(dump_func)dump_get_security_object_reply,
(dump_func)dump_create_mailslot_reply,
(dump_func)dump_set_mailslot_info_reply,
@@ -4254,24 +4254,24 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = {
(dump_func)dump_open_symlink_reply,
(dump_func)dump_query_symlink_reply,
(dump_func)dump_get_object_info_reply,
- (dump_func)0,
+ NULL,
(dump_func)dump_get_token_impersonation_level_reply,
(dump_func)dump_allocate_locally_unique_id_reply,
(dump_func)dump_create_device_manager_reply,
(dump_func)dump_create_device_reply,
- (dump_func)0,
+ NULL,
(dump_func)dump_get_next_device_request_reply,
(dump_func)dump_make_process_system_reply,
(dump_func)dump_get_token_statistics_reply,
(dump_func)dump_create_completion_reply,
(dump_func)dump_open_completion_reply,
- (dump_func)0,
+ NULL,
(dump_func)dump_remove_completion_reply,
(dump_func)dump_query_completion_reply,
- (dump_func)0,
- (dump_func)0,
+ NULL,
+ NULL,
(dump_func)dump_get_window_layered_info_reply,
- (dump_func)0,
+ NULL,
};
static const char * const req_names[REQ_NB_REQUESTS] = {
--
1.6.0.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20081104/91af8249/attachment.pgp
More information about the wine-patches
mailing list