From 49553d066ba346b28286b72f54e5ee8739cbcef2 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 25 Nov 2009 14:42:24 +0100 Subject: [PATCH] librpc: rerun "make idl" metze --- librpc/gen_ndr/cli_echo.c | 8 ++++---- librpc/gen_ndr/cli_epmapper.c | 8 ++++---- librpc/gen_ndr/cli_eventlog.c | 8 ++++---- librpc/gen_ndr/cli_ntsvcs.c | 8 ++++---- librpc/gen_ndr/cli_spoolss.c | 36 ++++++++++++++++++------------------ librpc/gen_ndr/cli_srvsvc.c | 4 ++-- librpc/gen_ndr/cli_svcctl.c | 40 ++++++++++++++++++++-------------------- librpc/gen_ndr/cli_winreg.c | 16 ++++++++-------- librpc/gen_ndr/ndr_winreg.c | 4 ++-- source4/selftest/config.mk | 2 +- 10 files changed, 67 insertions(+), 67 deletions(-) diff --git a/librpc/gen_ndr/cli_echo.c b/librpc/gen_ndr/cli_echo.c index 52aa8c50bbe..04d4bbc46e7 100644 --- a/librpc/gen_ndr/cli_echo.c +++ b/librpc/gen_ndr/cli_echo.c @@ -219,7 +219,7 @@ static void rpccli_echo_EchoData_done(struct tevent_req *subreq) } /* Copy out parameters */ - memcpy(state->orig.out.out_data, state->tmp.out.out_data, state->tmp.in.len * sizeof(*state->orig.out.out_data)); + memcpy(state->orig.out.out_data, state->tmp.out.out_data, (state->tmp.in.len) * sizeof(*state->orig.out.out_data)); /* Reset temporary structure */ ZERO_STRUCT(state->tmp); @@ -274,7 +274,7 @@ NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli, } /* Return variables */ - memcpy(out_data, r.out.out_data, r.in.len * sizeof(*out_data)); + memcpy(out_data, r.out.out_data, (r.in.len) * sizeof(*out_data)); /* Return result */ return NT_STATUS_OK; @@ -484,7 +484,7 @@ static void rpccli_echo_SourceData_done(struct tevent_req *subreq) } /* Copy out parameters */ - memcpy(state->orig.out.data, state->tmp.out.data, state->tmp.in.len * sizeof(*state->orig.out.data)); + memcpy(state->orig.out.data, state->tmp.out.data, (state->tmp.in.len) * sizeof(*state->orig.out.data)); /* Reset temporary structure */ ZERO_STRUCT(state->tmp); @@ -537,7 +537,7 @@ NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli, } /* Return variables */ - memcpy(data, r.out.data, r.in.len * sizeof(*data)); + memcpy(data, r.out.data, (r.in.len) * sizeof(*data)); /* Return result */ return NT_STATUS_OK; diff --git a/librpc/gen_ndr/cli_epmapper.c b/librpc/gen_ndr/cli_epmapper.c index 4e5d160883f..c83dba6c86c 100644 --- a/librpc/gen_ndr/cli_epmapper.c +++ b/librpc/gen_ndr/cli_epmapper.c @@ -380,7 +380,7 @@ static void rpccli_epm_Lookup_done(struct tevent_req *subreq) /* Copy out parameters */ *state->orig.out.entry_handle = *state->tmp.out.entry_handle; *state->orig.out.num_ents = *state->tmp.out.num_ents; - memcpy(state->orig.out.entries, state->tmp.out.entries, state->tmp.in.max_ents * sizeof(*state->orig.out.entries)); + memcpy(state->orig.out.entries, state->tmp.out.entries, (state->tmp.in.max_ents) * sizeof(*state->orig.out.entries)); /* Copy result */ state->orig.out.result = state->tmp.out.result; @@ -453,7 +453,7 @@ NTSTATUS rpccli_epm_Lookup(struct rpc_pipe_client *cli, /* Return variables */ *entry_handle = *r.out.entry_handle; *num_ents = *r.out.num_ents; - memcpy(entries, r.out.entries, r.in.max_ents * sizeof(*entries)); + memcpy(entries, r.out.entries, (r.in.max_ents) * sizeof(*entries)); /* Return result */ return NT_STATUS_OK; @@ -549,7 +549,7 @@ static void rpccli_epm_Map_done(struct tevent_req *subreq) /* Copy out parameters */ *state->orig.out.entry_handle = *state->tmp.out.entry_handle; *state->orig.out.num_towers = *state->tmp.out.num_towers; - memcpy(state->orig.out.towers, state->tmp.out.towers, state->tmp.in.max_towers * sizeof(*state->orig.out.towers)); + memcpy(state->orig.out.towers, state->tmp.out.towers, (state->tmp.in.max_towers) * sizeof(*state->orig.out.towers)); /* Copy result */ state->orig.out.result = state->tmp.out.result; @@ -618,7 +618,7 @@ NTSTATUS rpccli_epm_Map(struct rpc_pipe_client *cli, /* Return variables */ *entry_handle = *r.out.entry_handle; *num_towers = *r.out.num_towers; - memcpy(towers, r.out.towers, r.in.max_towers * sizeof(*towers)); + memcpy(towers, r.out.towers, (r.in.max_towers) * sizeof(*towers)); /* Return result */ return NT_STATUS_OK; diff --git a/librpc/gen_ndr/cli_eventlog.c b/librpc/gen_ndr/cli_eventlog.c index 9e2c6bea66b..f5a86ca11a8 100644 --- a/librpc/gen_ndr/cli_eventlog.c +++ b/librpc/gen_ndr/cli_eventlog.c @@ -1556,7 +1556,7 @@ static void rpccli_eventlog_ReadEventLogW_done(struct tevent_req *subreq) } /* Copy out parameters */ - memcpy(state->orig.out.data, state->tmp.out.data, state->tmp.in.number_of_bytes * sizeof(*state->orig.out.data)); + memcpy(state->orig.out.data, state->tmp.out.data, (state->tmp.in.number_of_bytes) * sizeof(*state->orig.out.data)); *state->orig.out.sent_size = *state->tmp.out.sent_size; *state->orig.out.real_size = *state->tmp.out.real_size; @@ -1626,7 +1626,7 @@ NTSTATUS rpccli_eventlog_ReadEventLogW(struct rpc_pipe_client *cli, } /* Return variables */ - memcpy(data, r.out.data, r.in.number_of_bytes * sizeof(*data)); + memcpy(data, r.out.data, (r.in.number_of_bytes) * sizeof(*data)); *sent_size = *r.out.sent_size; *real_size = *r.out.real_size; @@ -3225,7 +3225,7 @@ static void rpccli_eventlog_GetLogInformation_done(struct tevent_req *subreq) } /* Copy out parameters */ - memcpy(state->orig.out.buffer, state->tmp.out.buffer, state->tmp.in.buf_size * sizeof(*state->orig.out.buffer)); + memcpy(state->orig.out.buffer, state->tmp.out.buffer, (state->tmp.in.buf_size) * sizeof(*state->orig.out.buffer)); *state->orig.out.bytes_needed = *state->tmp.out.bytes_needed; /* Copy result */ @@ -3291,7 +3291,7 @@ NTSTATUS rpccli_eventlog_GetLogInformation(struct rpc_pipe_client *cli, } /* Return variables */ - memcpy(buffer, r.out.buffer, r.in.buf_size * sizeof(*buffer)); + memcpy(buffer, r.out.buffer, (r.in.buf_size) * sizeof(*buffer)); *bytes_needed = *r.out.bytes_needed; /* Return result */ diff --git a/librpc/gen_ndr/cli_ntsvcs.c b/librpc/gen_ndr/cli_ntsvcs.c index 8f32944ee01..760ce53591d 100644 --- a/librpc/gen_ndr/cli_ntsvcs.c +++ b/librpc/gen_ndr/cli_ntsvcs.c @@ -1459,7 +1459,7 @@ static void rpccli_PNP_GetDeviceList_done(struct tevent_req *subreq) } /* Copy out parameters */ - memcpy(state->orig.out.buffer, state->tmp.out.buffer, *state->tmp.in.length * sizeof(*state->orig.out.buffer)); + memcpy(state->orig.out.buffer, state->tmp.out.buffer, (*state->tmp.in.length) * sizeof(*state->orig.out.buffer)); *state->orig.out.length = *state->tmp.out.length; /* Copy result */ @@ -1525,7 +1525,7 @@ NTSTATUS rpccli_PNP_GetDeviceList(struct rpc_pipe_client *cli, } /* Return variables */ - memcpy(buffer, r.out.buffer, *r.in.length * sizeof(*buffer)); + memcpy(buffer, r.out.buffer, (*r.in.length) * sizeof(*buffer)); *length = *r.out.length; /* Return result */ @@ -1918,7 +1918,7 @@ static void rpccli_PNP_GetDeviceRegProp_done(struct tevent_req *subreq) /* Copy out parameters */ *state->orig.out.reg_data_type = *state->tmp.out.reg_data_type; - memcpy(state->orig.out.buffer, state->tmp.out.buffer, *state->tmp.in.buffer_size * sizeof(*state->orig.out.buffer)); + memcpy(state->orig.out.buffer, state->tmp.out.buffer, (*state->tmp.in.buffer_size) * sizeof(*state->orig.out.buffer)); *state->orig.out.buffer_size = *state->tmp.out.buffer_size; *state->orig.out.needed = *state->tmp.out.needed; @@ -1992,7 +1992,7 @@ NTSTATUS rpccli_PNP_GetDeviceRegProp(struct rpc_pipe_client *cli, /* Return variables */ *reg_data_type = *r.out.reg_data_type; - memcpy(buffer, r.out.buffer, *r.in.buffer_size * sizeof(*buffer)); + memcpy(buffer, r.out.buffer, (*r.in.buffer_size) * sizeof(*buffer)); *buffer_size = *r.out.buffer_size; *needed = *r.out.needed; diff --git a/librpc/gen_ndr/cli_spoolss.c b/librpc/gen_ndr/cli_spoolss.c index d9bbe521aa6..635a817f23a 100644 --- a/librpc/gen_ndr/cli_spoolss.c +++ b/librpc/gen_ndr/cli_spoolss.c @@ -3611,7 +3611,7 @@ static void rpccli_spoolss_ReadPrinter_done(struct tevent_req *subreq) } /* Copy out parameters */ - memcpy(state->orig.out.data, state->tmp.out.data, state->tmp.in.data_size * sizeof(*state->orig.out.data)); + memcpy(state->orig.out.data, state->tmp.out.data, (state->tmp.in.data_size) * sizeof(*state->orig.out.data)); *state->orig.out._data_size = *state->tmp.out._data_size; /* Copy result */ @@ -3676,7 +3676,7 @@ NTSTATUS rpccli_spoolss_ReadPrinter(struct rpc_pipe_client *cli, } /* Return variables */ - memcpy(data, r.out.data, r.in.data_size * sizeof(*data)); + memcpy(data, r.out.data, (r.in.data_size) * sizeof(*data)); *_data_size = *r.out._data_size; /* Return result */ @@ -3913,7 +3913,7 @@ static void rpccli_spoolss_AddJob_done(struct tevent_req *subreq) /* Copy out parameters */ if (state->orig.out.buffer && state->tmp.out.buffer) { - memcpy(state->orig.out.buffer, state->tmp.out.buffer, state->tmp.in.offered * sizeof(*state->orig.out.buffer)); + memcpy(state->orig.out.buffer, state->tmp.out.buffer, (state->tmp.in.offered) * sizeof(*state->orig.out.buffer)); } *state->orig.out.needed = *state->tmp.out.needed; @@ -3983,7 +3983,7 @@ NTSTATUS rpccli_spoolss_AddJob(struct rpc_pipe_client *cli, /* Return variables */ if (buffer && r.out.buffer) { - memcpy(buffer, r.out.buffer, r.in.offered * sizeof(*buffer)); + memcpy(buffer, r.out.buffer, (r.in.offered) * sizeof(*buffer)); } *needed = *r.out.needed; @@ -11057,10 +11057,10 @@ static void rpccli_spoolss_EnumPrinterData_done(struct tevent_req *subreq) } /* Copy out parameters */ - memcpy(CONST_DISCARD(char *, state->orig.out.value_name), state->tmp.out.value_name, state->tmp.in.value_offered / 2 * sizeof(*state->orig.out.value_name)); + memcpy(discard_const_p(uint8_t, state->orig.out.value_name), state->tmp.out.value_name, (state->tmp.in.value_offered / 2) * sizeof(*state->orig.out.value_name)); *state->orig.out.value_needed = *state->tmp.out.value_needed; *state->orig.out.type = *state->tmp.out.type; - memcpy(state->orig.out.data, state->tmp.out.data, state->tmp.in.data_offered * sizeof(*state->orig.out.data)); + memcpy(state->orig.out.data, state->tmp.out.data, (state->tmp.in.data_offered) * sizeof(*state->orig.out.data)); *state->orig.out.data_needed = *state->tmp.out.data_needed; /* Copy result */ @@ -11132,10 +11132,10 @@ NTSTATUS rpccli_spoolss_EnumPrinterData(struct rpc_pipe_client *cli, } /* Return variables */ - memcpy(CONST_DISCARD(char *, value_name), r.out.value_name, r.in.value_offered / 2 * sizeof(*value_name)); + memcpy(discard_const_p(uint8_t, value_name), r.out.value_name, (r.in.value_offered / 2) * sizeof(*value_name)); *value_needed = *r.out.value_needed; *type = *r.out.type; - memcpy(data, r.out.data, r.in.data_offered * sizeof(*data)); + memcpy(data, r.out.data, (r.in.data_offered) * sizeof(*data)); *data_needed = *r.out.data_needed; /* Return result */ @@ -11943,7 +11943,7 @@ static void rpccli_spoolss_GetPrinterDataEx_done(struct tevent_req *subreq) /* Copy out parameters */ *state->orig.out.type = *state->tmp.out.type; - memcpy(state->orig.out.buffer, state->tmp.out.buffer, state->tmp.in.offered * sizeof(*state->orig.out.buffer)); + memcpy(state->orig.out.buffer, state->tmp.out.buffer, (state->tmp.in.offered) * sizeof(*state->orig.out.buffer)); *state->orig.out.needed = *state->tmp.out.needed; /* Copy result */ @@ -12014,7 +12014,7 @@ NTSTATUS rpccli_spoolss_GetPrinterDataEx(struct rpc_pipe_client *cli, /* Return variables */ *type = *r.out.type; - memcpy(buffer, r.out.buffer, r.in.offered * sizeof(*buffer)); + memcpy(buffer, r.out.buffer, (r.in.offered) * sizeof(*buffer)); *needed = *r.out.needed; /* Return result */ @@ -12278,7 +12278,7 @@ static void rpccli_spoolss_EnumPrinterKey_done(struct tevent_req *subreq) } /* Copy out parameters */ - memcpy(state->orig.out.key_buffer, state->tmp.out.key_buffer, state->tmp.in.offered / 2 * sizeof(*state->orig.out.key_buffer)); + memcpy(state->orig.out.key_buffer, state->tmp.out.key_buffer, (state->tmp.in.offered / 2) * sizeof(*state->orig.out.key_buffer)); *state->orig.out.needed = *state->tmp.out.needed; /* Copy result */ @@ -12345,7 +12345,7 @@ NTSTATUS rpccli_spoolss_EnumPrinterKey(struct rpc_pipe_client *cli, } /* Return variables */ - memcpy(key_buffer, r.out.key_buffer, r.in.offered / 2 * sizeof(*key_buffer)); + memcpy(key_buffer, r.out.key_buffer, (r.in.offered / 2) * sizeof(*key_buffer)); *needed = *r.out.needed; /* Return result */ @@ -13433,7 +13433,7 @@ static void rpccli_spoolss_XcvData_done(struct tevent_req *subreq) } /* Copy out parameters */ - memcpy(state->orig.out.out_data, state->tmp.out.out_data, state->tmp.in.out_data_size * sizeof(*state->orig.out.out_data)); + memcpy(state->orig.out.out_data, state->tmp.out.out_data, (state->tmp.in.out_data_size) * sizeof(*state->orig.out.out_data)); *state->orig.out.needed = *state->tmp.out.needed; *state->orig.out.status_code = *state->tmp.out.status_code; @@ -13507,7 +13507,7 @@ NTSTATUS rpccli_spoolss_XcvData(struct rpc_pipe_client *cli, } /* Return variables */ - memcpy(out_data, r.out.out_data, r.in.out_data_size * sizeof(*out_data)); + memcpy(out_data, r.out.out_data, (r.in.out_data_size) * sizeof(*out_data)); *needed = *r.out.needed; *status_code = *r.out.status_code; @@ -15373,7 +15373,7 @@ static void rpccli_spoolss_GetCorePrinterDrivers_done(struct tevent_req *subreq) } /* Copy out parameters */ - memcpy(state->orig.out.core_printer_drivers, state->tmp.out.core_printer_drivers, state->tmp.in.core_printer_driver_count * sizeof(*state->orig.out.core_printer_drivers)); + memcpy(state->orig.out.core_printer_drivers, state->tmp.out.core_printer_drivers, (state->tmp.in.core_printer_driver_count) * sizeof(*state->orig.out.core_printer_drivers)); /* Copy result */ state->orig.out.result = state->tmp.out.result; @@ -15442,7 +15442,7 @@ NTSTATUS rpccli_spoolss_GetCorePrinterDrivers(struct rpc_pipe_client *cli, } /* Return variables */ - memcpy(core_printer_drivers, r.out.core_printer_drivers, r.in.core_printer_driver_count * sizeof(*core_printer_drivers)); + memcpy(core_printer_drivers, r.out.core_printer_drivers, (r.in.core_printer_driver_count) * sizeof(*core_printer_drivers)); /* Return result */ if (werror) { @@ -15678,7 +15678,7 @@ static void rpccli_spoolss_GetPrinterDriverPackagePath_done(struct tevent_req *s /* Copy out parameters */ if (state->orig.out.driver_package_cab && state->tmp.out.driver_package_cab) { - memcpy(CONST_DISCARD(char *, state->orig.out.driver_package_cab), state->tmp.out.driver_package_cab, state->tmp.in.driver_package_cab_size * sizeof(*state->orig.out.driver_package_cab)); + memcpy(discard_const_p(uint8_t, state->orig.out.driver_package_cab), state->tmp.out.driver_package_cab, (state->tmp.in.driver_package_cab_size) * sizeof(*state->orig.out.driver_package_cab)); } *state->orig.out.required = *state->tmp.out.required; @@ -15752,7 +15752,7 @@ NTSTATUS rpccli_spoolss_GetPrinterDriverPackagePath(struct rpc_pipe_client *cli, /* Return variables */ if (driver_package_cab && r.out.driver_package_cab) { - memcpy(CONST_DISCARD(char *, driver_package_cab), r.out.driver_package_cab, r.in.driver_package_cab_size * sizeof(*driver_package_cab)); + memcpy(discard_const_p(uint8_t, driver_package_cab), r.out.driver_package_cab, (r.in.driver_package_cab_size) * sizeof(*driver_package_cab)); } *required = *r.out.required; diff --git a/librpc/gen_ndr/cli_srvsvc.c b/librpc/gen_ndr/cli_srvsvc.c index 9b2a507c955..045dd3c5a87 100644 --- a/librpc/gen_ndr/cli_srvsvc.c +++ b/librpc/gen_ndr/cli_srvsvc.c @@ -5044,7 +5044,7 @@ static void rpccli_srvsvc_NetPathCanonicalize_done(struct tevent_req *subreq) } /* Copy out parameters */ - memcpy(state->orig.out.can_path, state->tmp.out.can_path, state->tmp.in.maxbuf * sizeof(*state->orig.out.can_path)); + memcpy(state->orig.out.can_path, state->tmp.out.can_path, (state->tmp.in.maxbuf) * sizeof(*state->orig.out.can_path)); *state->orig.out.pathtype = *state->tmp.out.pathtype; /* Copy result */ @@ -5116,7 +5116,7 @@ NTSTATUS rpccli_srvsvc_NetPathCanonicalize(struct rpc_pipe_client *cli, } /* Return variables */ - memcpy(can_path, r.out.can_path, r.in.maxbuf * sizeof(*can_path)); + memcpy(can_path, r.out.can_path, (r.in.maxbuf) * sizeof(*can_path)); *pathtype = *r.out.pathtype; /* Return result */ diff --git a/librpc/gen_ndr/cli_svcctl.c b/librpc/gen_ndr/cli_svcctl.c index 59fabac4b37..80237c58890 100644 --- a/librpc/gen_ndr/cli_svcctl.c +++ b/librpc/gen_ndr/cli_svcctl.c @@ -682,7 +682,7 @@ static void rpccli_svcctl_QueryServiceObjectSecurity_done(struct tevent_req *sub } /* Copy out parameters */ - memcpy(state->orig.out.buffer, state->tmp.out.buffer, state->tmp.in.offered * sizeof(*state->orig.out.buffer)); + memcpy(state->orig.out.buffer, state->tmp.out.buffer, (state->tmp.in.offered) * sizeof(*state->orig.out.buffer)); *state->orig.out.needed = *state->tmp.out.needed; /* Copy result */ @@ -749,7 +749,7 @@ NTSTATUS rpccli_svcctl_QueryServiceObjectSecurity(struct rpc_pipe_client *cli, } /* Return variables */ - memcpy(buffer, r.out.buffer, r.in.offered * sizeof(*buffer)); + memcpy(buffer, r.out.buffer, (r.in.offered) * sizeof(*buffer)); *needed = *r.out.needed; /* Return result */ @@ -2116,7 +2116,7 @@ static void rpccli_svcctl_EnumDependentServicesW_done(struct tevent_req *subreq) } /* Copy out parameters */ - memcpy(state->orig.out.service_status, state->tmp.out.service_status, state->tmp.in.offered * sizeof(*state->orig.out.service_status)); + memcpy(state->orig.out.service_status, state->tmp.out.service_status, (state->tmp.in.offered) * sizeof(*state->orig.out.service_status)); *state->orig.out.needed = *state->tmp.out.needed; *state->orig.out.services_returned = *state->tmp.out.services_returned; @@ -2185,7 +2185,7 @@ NTSTATUS rpccli_svcctl_EnumDependentServicesW(struct rpc_pipe_client *cli, } /* Return variables */ - memcpy(service_status, r.out.service_status, r.in.offered * sizeof(*service_status)); + memcpy(service_status, r.out.service_status, (r.in.offered) * sizeof(*service_status)); *needed = *r.out.needed; *services_returned = *r.out.services_returned; @@ -2289,7 +2289,7 @@ static void rpccli_svcctl_EnumServicesStatusW_done(struct tevent_req *subreq) } /* Copy out parameters */ - memcpy(state->orig.out.service, state->tmp.out.service, state->tmp.in.offered * sizeof(*state->orig.out.service)); + memcpy(state->orig.out.service, state->tmp.out.service, (state->tmp.in.offered) * sizeof(*state->orig.out.service)); *state->orig.out.needed = *state->tmp.out.needed; *state->orig.out.services_returned = *state->tmp.out.services_returned; if (state->orig.out.resume_handle && state->tmp.out.resume_handle) { @@ -2365,7 +2365,7 @@ NTSTATUS rpccli_svcctl_EnumServicesStatusW(struct rpc_pipe_client *cli, } /* Return variables */ - memcpy(service, r.out.service, r.in.offered * sizeof(*service)); + memcpy(service, r.out.service, (r.in.offered) * sizeof(*service)); *needed = *r.out.needed; *services_returned = *r.out.services_returned; if (resume_handle && r.out.resume_handle) { @@ -4290,7 +4290,7 @@ static void rpccli_svcctl_EnumServicesStatusA_done(struct tevent_req *subreq) } /* Copy out parameters */ - memcpy(state->orig.out.service, state->tmp.out.service, state->tmp.in.offered * sizeof(*state->orig.out.service)); + memcpy(state->orig.out.service, state->tmp.out.service, (state->tmp.in.offered) * sizeof(*state->orig.out.service)); *state->orig.out.needed = *state->tmp.out.needed; *state->orig.out.services_returned = *state->tmp.out.services_returned; if (state->orig.out.resume_handle && state->tmp.out.resume_handle) { @@ -4366,7 +4366,7 @@ NTSTATUS rpccli_svcctl_EnumServicesStatusA(struct rpc_pipe_client *cli, } /* Return variables */ - memcpy(service, r.out.service, r.in.offered * sizeof(*service)); + memcpy(service, r.out.service, (r.in.offered) * sizeof(*service)); *needed = *r.out.needed; *services_returned = *r.out.services_returned; if (resume_handle && r.out.resume_handle) { @@ -4769,7 +4769,7 @@ static void rpccli_svcctl_QueryServiceConfigA_done(struct tevent_req *subreq) } /* Copy out parameters */ - memcpy(state->orig.out.query, state->tmp.out.query, state->tmp.in.offered * sizeof(*state->orig.out.query)); + memcpy(state->orig.out.query, state->tmp.out.query, (state->tmp.in.offered) * sizeof(*state->orig.out.query)); *state->orig.out.needed = *state->tmp.out.needed; /* Copy result */ @@ -4834,7 +4834,7 @@ NTSTATUS rpccli_svcctl_QueryServiceConfigA(struct rpc_pipe_client *cli, } /* Return variables */ - memcpy(query, r.out.query, r.in.offered * sizeof(*query)); + memcpy(query, r.out.query, (r.in.offered) * sizeof(*query)); *needed = *r.out.needed; /* Return result */ @@ -6130,7 +6130,7 @@ static void rpccli_svcctl_QueryServiceConfig2A_done(struct tevent_req *subreq) } /* Copy out parameters */ - memcpy(state->orig.out.buffer, state->tmp.out.buffer, state->tmp.in.offered * sizeof(*state->orig.out.buffer)); + memcpy(state->orig.out.buffer, state->tmp.out.buffer, (state->tmp.in.offered) * sizeof(*state->orig.out.buffer)); *state->orig.out.needed = *state->tmp.out.needed; /* Copy result */ @@ -6197,7 +6197,7 @@ NTSTATUS rpccli_svcctl_QueryServiceConfig2A(struct rpc_pipe_client *cli, } /* Return variables */ - memcpy(buffer, r.out.buffer, r.in.offered * sizeof(*buffer)); + memcpy(buffer, r.out.buffer, (r.in.offered) * sizeof(*buffer)); *needed = *r.out.needed; /* Return result */ @@ -6293,7 +6293,7 @@ static void rpccli_svcctl_QueryServiceConfig2W_done(struct tevent_req *subreq) } /* Copy out parameters */ - memcpy(state->orig.out.buffer, state->tmp.out.buffer, state->tmp.in.offered * sizeof(*state->orig.out.buffer)); + memcpy(state->orig.out.buffer, state->tmp.out.buffer, (state->tmp.in.offered) * sizeof(*state->orig.out.buffer)); *state->orig.out.needed = *state->tmp.out.needed; /* Copy result */ @@ -6360,7 +6360,7 @@ NTSTATUS rpccli_svcctl_QueryServiceConfig2W(struct rpc_pipe_client *cli, } /* Return variables */ - memcpy(buffer, r.out.buffer, r.in.offered * sizeof(*buffer)); + memcpy(buffer, r.out.buffer, (r.in.offered) * sizeof(*buffer)); *needed = *r.out.needed; /* Return result */ @@ -6456,7 +6456,7 @@ static void rpccli_svcctl_QueryServiceStatusEx_done(struct tevent_req *subreq) } /* Copy out parameters */ - memcpy(state->orig.out.buffer, state->tmp.out.buffer, state->tmp.in.offered * sizeof(*state->orig.out.buffer)); + memcpy(state->orig.out.buffer, state->tmp.out.buffer, (state->tmp.in.offered) * sizeof(*state->orig.out.buffer)); *state->orig.out.needed = *state->tmp.out.needed; /* Copy result */ @@ -6523,7 +6523,7 @@ NTSTATUS rpccli_svcctl_QueryServiceStatusEx(struct rpc_pipe_client *cli, } /* Return variables */ - memcpy(buffer, r.out.buffer, r.in.offered * sizeof(*buffer)); + memcpy(buffer, r.out.buffer, (r.in.offered) * sizeof(*buffer)); *needed = *r.out.needed; /* Return result */ @@ -6630,7 +6630,7 @@ static void rpccli_EnumServicesStatusExA_done(struct tevent_req *subreq) } /* Copy out parameters */ - memcpy(state->orig.out.services, state->tmp.out.services, state->tmp.in.offered * sizeof(*state->orig.out.services)); + memcpy(state->orig.out.services, state->tmp.out.services, (state->tmp.in.offered) * sizeof(*state->orig.out.services)); *state->orig.out.needed = *state->tmp.out.needed; *state->orig.out.service_returned = *state->tmp.out.service_returned; if (state->orig.out.resume_handle && state->tmp.out.resume_handle) { @@ -6710,7 +6710,7 @@ NTSTATUS rpccli_EnumServicesStatusExA(struct rpc_pipe_client *cli, } /* Return variables */ - memcpy(services, r.out.services, r.in.offered * sizeof(*services)); + memcpy(services, r.out.services, (r.in.offered) * sizeof(*services)); *needed = *r.out.needed; *service_returned = *r.out.service_returned; if (resume_handle && r.out.resume_handle) { @@ -6822,7 +6822,7 @@ static void rpccli_EnumServicesStatusExW_done(struct tevent_req *subreq) } /* Copy out parameters */ - memcpy(state->orig.out.services, state->tmp.out.services, state->tmp.in.offered * sizeof(*state->orig.out.services)); + memcpy(state->orig.out.services, state->tmp.out.services, (state->tmp.in.offered) * sizeof(*state->orig.out.services)); *state->orig.out.needed = *state->tmp.out.needed; *state->orig.out.service_returned = *state->tmp.out.service_returned; if (state->orig.out.resume_handle && state->tmp.out.resume_handle) { @@ -6902,7 +6902,7 @@ NTSTATUS rpccli_EnumServicesStatusExW(struct rpc_pipe_client *cli, } /* Return variables */ - memcpy(services, r.out.services, r.in.offered * sizeof(*services)); + memcpy(services, r.out.services, (r.in.offered) * sizeof(*services)); *needed = *r.out.needed; *service_returned = *r.out.service_returned; if (resume_handle && r.out.resume_handle) { diff --git a/librpc/gen_ndr/cli_winreg.c b/librpc/gen_ndr/cli_winreg.c index a476a127ebf..426454292ec 100644 --- a/librpc/gen_ndr/cli_winreg.c +++ b/librpc/gen_ndr/cli_winreg.c @@ -1668,7 +1668,7 @@ static void rpccli_winreg_EnumValue_done(struct tevent_req *subreq) *state->orig.out.type = *state->tmp.out.type; } if (state->orig.out.value && state->tmp.out.value) { - memcpy(state->orig.out.value, state->tmp.out.value, *state->tmp.in.size * sizeof(*state->orig.out.value)); + memcpy(state->orig.out.value, state->tmp.out.value, (*state->tmp.in.size) * sizeof(*state->orig.out.value)); } if (state->orig.out.size && state->tmp.out.size) { *state->orig.out.size = *state->tmp.out.size; @@ -1752,7 +1752,7 @@ NTSTATUS rpccli_winreg_EnumValue(struct rpc_pipe_client *cli, *type = *r.out.type; } if (value && r.out.value) { - memcpy(value, r.out.value, *r.in.size * sizeof(*value)); + memcpy(value, r.out.value, (*r.in.size) * sizeof(*value)); } if (size && r.out.size) { *size = *r.out.size; @@ -2823,7 +2823,7 @@ static void rpccli_winreg_QueryValue_done(struct tevent_req *subreq) *state->orig.out.type = *state->tmp.out.type; } if (state->orig.out.data && state->tmp.out.data) { - memcpy(state->orig.out.data, state->tmp.out.data, *state->tmp.in.data_size * sizeof(*state->orig.out.data)); + memcpy(state->orig.out.data, state->tmp.out.data, (*state->tmp.in.data_size) * sizeof(*state->orig.out.data)); } if (state->orig.out.data_size && state->tmp.out.data_size) { *state->orig.out.data_size = *state->tmp.out.data_size; @@ -2904,7 +2904,7 @@ NTSTATUS rpccli_winreg_QueryValue(struct rpc_pipe_client *cli, *type = *r.out.type; } if (data && r.out.data) { - memcpy(data, r.out.data, *r.in.data_size * sizeof(*data)); + memcpy(data, r.out.data, (*r.in.data_size) * sizeof(*data)); } if (data_size && r.out.data_size) { *data_size = *r.out.data_size; @@ -4627,9 +4627,9 @@ static void rpccli_winreg_QueryMultipleValues_done(struct tevent_req *subreq) } /* Copy out parameters */ - memcpy(state->orig.out.values, state->tmp.out.values, state->tmp.in.num_values * sizeof(*state->orig.out.values)); + memcpy(state->orig.out.values, state->tmp.out.values, (state->tmp.in.num_values) * sizeof(*state->orig.out.values)); if (state->orig.out.buffer && state->tmp.out.buffer) { - memcpy(state->orig.out.buffer, state->tmp.out.buffer, *state->tmp.in.buffer_size * sizeof(*state->orig.out.buffer)); + memcpy(state->orig.out.buffer, state->tmp.out.buffer, (*state->tmp.in.buffer_size) * sizeof(*state->orig.out.buffer)); } *state->orig.out.buffer_size = *state->tmp.out.buffer_size; @@ -4699,9 +4699,9 @@ NTSTATUS rpccli_winreg_QueryMultipleValues(struct rpc_pipe_client *cli, } /* Return variables */ - memcpy(values, r.out.values, r.in.num_values * sizeof(*values)); + memcpy(values, r.out.values, (r.in.num_values) * sizeof(*values)); if (buffer && r.out.buffer) { - memcpy(buffer, r.out.buffer, *r.in.buffer_size * sizeof(*buffer)); + memcpy(buffer, r.out.buffer, (*r.in.buffer_size) * sizeof(*buffer)); } *buffer_size = *r.out.buffer_size; diff --git a/librpc/gen_ndr/ndr_winreg.c b/librpc/gen_ndr/ndr_winreg.c index 21d97b8756f..b2147ef5d98 100644 --- a/librpc/gen_ndr/ndr_winreg.c +++ b/librpc/gen_ndr/ndr_winreg.c @@ -3680,7 +3680,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_winreg_QueryMultipleValues(struct ndr_pull * if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) { NDR_PULL_ALLOC_N(ndr, r->in.values, ndr_get_array_size(ndr, &r->in.values)); } - memcpy(r->out.values, r->in.values, ndr_get_array_size(ndr, &r->in.values) * sizeof(*r->in.values)); + memcpy(r->out.values, r->in.values, (ndr_get_array_size(ndr, &r->in.values)) * sizeof(*r->in.values)); _mem_save_values_1 = NDR_PULL_GET_MEM_CTX(ndr); NDR_PULL_SET_MEM_CTX(ndr, r->in.values, 0); for (cntr_values_1 = 0; cntr_values_1 < ndr_get_array_length(ndr, &r->in.values); cntr_values_1++) { @@ -3742,7 +3742,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_winreg_QueryMultipleValues(struct ndr_pull * if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) { NDR_PULL_ALLOC_N(ndr, r->out.values, ndr_get_array_size(ndr, &r->out.values)); } - memcpy(r->out.values, r->in.values, ndr_get_array_size(ndr, &r->out.values) * sizeof(*r->in.values)); + memcpy(r->out.values, r->in.values, (ndr_get_array_size(ndr, &r->out.values)) * sizeof(*r->in.values)); _mem_save_values_1 = NDR_PULL_GET_MEM_CTX(ndr); NDR_PULL_SET_MEM_CTX(ndr, r->out.values, 0); for (cntr_values_1 = 0; cntr_values_1 < ndr_get_array_length(ndr, &r->out.values); cntr_values_1++) { diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk index bdc46727adb..b62a691fdb1 100644 --- a/source4/selftest/config.mk +++ b/source4/selftest/config.mk @@ -32,7 +32,7 @@ test:: everything $(ST_RM) $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) $(DEFAULT_TEST_OPTIONS) $(TESTS) $(ST_TOUCH) | $(FILTER_XFAIL) --strip-passed-output $(ST_DONE_TEST) else -test:: everything +test:: $(ST_RM) $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) $(DEFAULT_TEST_OPTIONS) $(TESTS) $(ST_TOUCH) | $(FORMAT_TEST_OUTPUT) --immediate $(ST_DONE_TEST) endif -- 2.11.4.GIT