From f99155a469ed663b8ba8b42fa9d374078fdcbedc Mon Sep 17 00:00:00 2001 From: korenkonder Date: Sat, 16 Sep 2023 16:52:33 +0300 Subject: [PATCH] Small refactor --- src/CRE/Glitter/curve.cpp | 4 +-- src/CRE/Glitter/effect.cpp | 4 +-- src/CRE/Glitter/file_reader.cpp | 14 ++++---- src/CRE/Glitter/file_writer.cpp | 2 +- src/CRE/Glitter/render_group.cpp | 4 +-- src/CRE/data.cpp | 4 +-- src/CRE/object.cpp | 2 +- src/CRE/ogg_vorbis.cpp | 2 +- src/CRE/post_process/blur.cpp | 12 +++---- src/CRE/rob/rob.cpp | 7 ++-- src/CRE/shader.cpp | 44 ++++++++++++------------- src/CRE/task_effect.cpp | 19 +++++------ src/CRE/texture.cpp | 6 ++-- src/DivaGL/shader_table.cpp | 4 +-- src/DivaGL/string.cpp | 4 +-- src/DivaGL/vector.hpp | 4 +-- src/KKdLib/a3da.cpp | 2 +- src/KKdLib/aet.cpp | 4 +-- src/KKdLib/database/aet.cpp | 4 +-- src/KKdLib/database/bone.cpp | 8 ++--- src/KKdLib/database/object.cpp | 8 ++--- src/KKdLib/database/sprite.cpp | 4 +-- src/KKdLib/database/stage.cpp | 4 +-- src/KKdLib/database/texture.cpp | 4 +-- src/KKdLib/default.cpp | 8 ++--- src/KKdLib/default.hpp | 11 ++++++- src/KKdLib/dsc.cpp | 4 +-- src/KKdLib/enbaya.cpp | 6 ++-- src/KKdLib/farc.cpp | 6 ++-- src/KKdLib/io/json.cpp | 2 +- src/KKdLib/io/stream.cpp | 4 +-- src/KKdLib/key_val.cpp | 4 +-- src/KKdLib/light_param/face.cpp | 2 +- src/KKdLib/light_param/fog.cpp | 2 +- src/KKdLib/light_param/glow.cpp | 2 +- src/KKdLib/light_param/ibl.cpp | 6 ++-- src/KKdLib/light_param/light.cpp | 2 +- src/KKdLib/light_param/wind.cpp | 2 +- src/KKdLib/mot.cpp | 10 +++--- src/KKdLib/msgpack.cpp | 2 +- src/KKdLib/obj.cpp | 28 ++++++++-------- src/KKdLib/pv_exp.cpp | 8 ++--- src/KKdLib/sort.cpp | 12 +++---- src/KKdLib/sound/diva.cpp | 6 ++-- src/KKdLib/sound/vag.cpp | 16 ++++----- src/KKdLib/sound/wav.cpp | 4 +-- src/KKdLib/stage_param/fog_ring.cpp | 2 +- src/KKdLib/stage_param/leaf.cpp | 2 +- src/KKdLib/stage_param/litproj.cpp | 2 +- src/KKdLib/stage_param/rain.cpp | 2 +- src/KKdLib/stage_param/ripple.cpp | 2 +- src/KKdLib/stage_param/snow.cpp | 2 +- src/KKdLib/stage_param/splash.cpp | 2 +- src/KKdLib/stage_param/star.cpp | 2 +- src/KKdLib/str_utils.cpp | 44 ++++++++++++------------- src/KKdLib/txp.cpp | 12 +++---- src/ReDIVA/classes/glitter_editor.cpp | 10 +++--- src/ReDIVA/classes/information/task.cpp | 2 +- src/ReDIVA/main.cpp | 8 ++--- src/ReDIVA/nvenc/nvenc_encoder.cpp | 2 +- src/ReDIVA/render.cpp | 2 +- src/ReDIVA/x_pv_game.cpp | 10 +++--- 62 files changed, 217 insertions(+), 210 deletions(-) diff --git a/src/CRE/Glitter/curve.cpp b/src/CRE/Glitter/curve.cpp index 75b0f280..bca99a87 100644 --- a/src/CRE/Glitter/curve.cpp +++ b/src/CRE/Glitter/curve.cpp @@ -212,8 +212,8 @@ namespace Glitter { const uint8_t step = curve_baked_half ? 2 : 1; end_time = start_time + (int32_t)((count - 1) * step); - float_t* arr_a = force_malloc_s(float_t, count); - float_t* arr_b = force_malloc_s(float_t, count); + float_t* arr_a = force_malloc(count); + float_t* arr_b = force_malloc(count); if (!arr_a || !arr_b) { free_def(arr_a); free_def(arr_b); diff --git a/src/CRE/Glitter/effect.cpp b/src/CRE/Glitter/effect.cpp index 4daf8e97..294300f6 100644 --- a/src/CRE/Glitter/effect.cpp +++ b/src/CRE/Glitter/effect.cpp @@ -44,11 +44,11 @@ namespace Glitter { if (eff.data.ext_anim) if (!data.ext_anim_is_x) { - data.ext_anim = force_malloc_s(Effect::ExtAnim, 1); + data.ext_anim = force_malloc(); *data.ext_anim = *eff.data.ext_anim; } else { - data.ext_anim_x = force_malloc_s(Effect::ExtAnimX, 1); + data.ext_anim_x = force_malloc(); *data.ext_anim_x = *eff.data.ext_anim_x; } diff --git a/src/CRE/Glitter/file_reader.cpp b/src/CRE/Glitter/file_reader.cpp index 3271102c..c7cbf9d2 100644 --- a/src/CRE/Glitter/file_reader.cpp +++ b/src/CRE/Glitter/file_reader.cpp @@ -753,7 +753,7 @@ namespace Glitter { || eff_group->resources_count != count) return false; - texture_id* ids = force_malloc_s(texture_id, count); + texture_id* ids = force_malloc(count); for (size_t i = 0; i < count; i++) { ids[i] = texture_id(0x2A, GPM_VAL->texture_counter); GPM_VAL->texture_counter++; @@ -909,7 +909,7 @@ namespace Glitter { if (type == 1) enum_or(eff->data.flags, EFFECT_LOCAL); else if (type == 2) { - Effect::ExtAnimX* ext_anim_x = force_malloc_s(Effect::ExtAnimX, 1); + Effect::ExtAnimX* ext_anim_x = force_malloc(); eff->data.ext_anim_x = ext_anim_x; if (ext_anim_x) { if (big_endian) { @@ -930,7 +930,7 @@ namespace Glitter { } else if (type == 3) { if (eff->version == 8) { - Effect::ExtAnimX* ext_anim_x = force_malloc_s(Effect::ExtAnimX, 1); + Effect::ExtAnimX* ext_anim_x = force_malloc(); eff->data.ext_anim_x = ext_anim_x; if (ext_anim_x) { if (big_endian) { @@ -955,7 +955,7 @@ namespace Glitter { } } else if (eff->version == 10) { - Effect::ExtAnimX* ext_anim_x = force_malloc_s(Effect::ExtAnimX, 1); + Effect::ExtAnimX* ext_anim_x = force_malloc(); eff->data.ext_anim_x = ext_anim_x; if (ext_anim_x) { if (big_endian) { @@ -980,7 +980,7 @@ namespace Glitter { } } else { - Effect::ExtAnimX* ext_anim_x = force_malloc_s(Effect::ExtAnimX, 1); + Effect::ExtAnimX* ext_anim_x = force_malloc(); eff->data.ext_anim_x = ext_anim_x; if (ext_anim_x) { if (big_endian) { @@ -1079,7 +1079,7 @@ namespace Glitter { if (type == 1) enum_or(eff->data.flags, EFFECT_LOCAL); else if (type == 2) { - Effect::ExtAnim* ext_anim = force_malloc_s(Effect::ExtAnim, 1); + Effect::ExtAnim* ext_anim = force_malloc(); eff->data.ext_anim = ext_anim; if (ext_anim) { if (big_endian) { @@ -1099,7 +1099,7 @@ namespace Glitter { } } else if (type == 3) { - Effect::ExtAnim* ext_anim = force_malloc_s(Effect::ExtAnim, 1); + Effect::ExtAnim* ext_anim = force_malloc(); eff->data.ext_anim = ext_anim; if (ext_anim) { if (big_endian) { diff --git a/src/CRE/Glitter/file_writer.cpp b/src/CRE/Glitter/file_writer.cpp index a2e0ec5d..1c1b0c9c 100644 --- a/src/CRE/Glitter/file_writer.cpp +++ b/src/CRE/Glitter/file_writer.cpp @@ -1250,7 +1250,7 @@ namespace Glitter { farc f; { size_t file_len = utf8_length(file); - char* temp = force_malloc_s(char, file_len + 5); + char* temp = force_malloc(file_len + 5); if (!temp) return; diff --git a/src/CRE/Glitter/render_group.cpp b/src/CRE/Glitter/render_group.cpp index d10966aa..8d5b438a 100644 --- a/src/CRE/Glitter/render_group.cpp +++ b/src/CRE/Glitter/render_group.cpp @@ -96,7 +96,7 @@ namespace Glitter { if (is_quad) { size_t count = max_count / 4 * 5; - uint32_t* ebo_data = force_malloc_s(uint32_t, count - 1); + uint32_t* ebo_data = force_malloc(count - 1); for (size_t i = 0, j = 0, k = count / 5 - 1; i < count; i += 5, j += 4, k--) { ebo_data[i + 0] = (uint32_t)(j + 0); ebo_data[i + 1] = (uint32_t)(j + 1); @@ -441,7 +441,7 @@ namespace Glitter { if (is_quad) { size_t count = max_count / 4 * 5; - uint32_t* ebo_data = force_malloc_s(uint32_t, count - 1); + uint32_t* ebo_data = force_malloc(count - 1); for (size_t i = 0, j = 0, k = count / 5 - 1; i < count; i += 5, j += 4, k--) { ebo_data[i + 0] = (uint32_t)(j + 0); ebo_data[i + 1] = (uint32_t)(j + 1); diff --git a/src/CRE/data.cpp b/src/CRE/data.cpp index a810f227..78c27b2b 100644 --- a/src/CRE/data.cpp +++ b/src/CRE/data.cpp @@ -918,7 +918,7 @@ static void data_load_inner(stream& s) { std::string main_rom_path; std::string add_data_rom_path; - ssize_t* t_len = force_malloc_s(ssize_t, count); + ssize_t* t_len = force_malloc(count); if (!t_len) { data_free_inner(ds); continue; @@ -1009,7 +1009,7 @@ static void data_load_glitter_list(data_struct* ds, const char* path) { file_stream s; s.open(path, "rb"); size_t length = s.length; - uint8_t* data = force_malloc_s(uint8_t, length); + uint8_t* data = force_malloc(length); s.read(data, length); s.close(); diff --git a/src/CRE/object.cpp b/src/CRE/object.cpp index 51c01ecf..104f18d5 100644 --- a/src/CRE/object.cpp +++ b/src/CRE/object.cpp @@ -48,7 +48,7 @@ bool obj_mesh_index_buffer::load(obj_mesh& mesh) { return true; } - uint16_t* indices = force_malloc_s(uint16_t, num_index); + uint16_t* indices = force_malloc(num_index); obj_mesh_index_buffer::fill_data(indices, mesh); bool ret = load_data(num_index * sizeof(uint16_t), indices); diff --git a/src/CRE/ogg_vorbis.cpp b/src/CRE/ogg_vorbis.cpp index 50ed8b51..6f6d4de2 100644 --- a/src/CRE/ogg_vorbis.cpp +++ b/src/CRE/ogg_vorbis.cpp @@ -231,7 +231,7 @@ bool OggFile::OpenFile(const char* path, double_t time_seek) { if (file) goto Reset; - file = force_malloc_s(OggVorbis_File, 1); + file = force_malloc(); if (!file) goto Reset; diff --git a/src/CRE/post_process/blur.cpp b/src/CRE/post_process/blur.cpp index bf2eebf5..ac7c8712 100644 --- a/src/CRE/post_process/blur.cpp +++ b/src/CRE/post_process/blur.cpp @@ -206,27 +206,27 @@ void post_process_blur::init_fbo(int32_t width, int32_t height) { int32_t* height_down = this->height_down; if (!tex_down) - tex_down = force_malloc_s(RenderTexture, i); + tex_down = force_malloc(i); else if (count_down < i) { - RenderTexture* temp = force_malloc_s(RenderTexture, i); + RenderTexture* temp = force_malloc(i); memcpy(temp, tex_down, sizeof(RenderTexture) * count_down); free_def(tex_down); tex_down = temp; } if (!width_down) - width_down = force_malloc_s(int32_t, i); + width_down = force_malloc(i); else if (count_down < i) { - int32_t* temp = force_malloc_s(int32_t, i); + int32_t* temp = force_malloc(i); memcpy(temp, width_down, sizeof(int32_t) * count_down); free_def(width_down); width_down = temp; } if (!height_down) - height_down = force_malloc_s(int32_t, i); + height_down = force_malloc(i); else if (count_down < i) { - int32_t* temp = force_malloc_s(int32_t, i); + int32_t* temp = force_malloc(i); memcpy(temp, height_down, sizeof(int32_t) * count_down); free_def(height_down); height_down = temp; diff --git a/src/CRE/rob/rob.cpp b/src/CRE/rob/rob.cpp index a386939b..13b78bfa 100644 --- a/src/CRE/rob/rob.cpp +++ b/src/CRE/rob/rob.cpp @@ -7398,7 +7398,7 @@ static void opd_data_decode(const int16_t* src_data, size_t count, uint8_t shift static bool opd_decode(const osage_play_data_header* file_head, float_t** opd_decod_buf, osage_play_data_header* head) { const osage_play_data_node_header* node = (osage_play_data_node_header*)&file_head[1]; - float_t* buf = force_malloc_s(float_t, 3ULL * file_head->frame_count * file_head->nodes_count); + float_t* buf = force_malloc(3ULL * file_head->frame_count * file_head->nodes_count); *opd_decod_buf = buf; if (!buf) return false; @@ -17347,8 +17347,7 @@ void rob_chara_age_age_object::load(object_info obj_info, int32_t count) { size_t vertex_data_size = vertex_array_size * count; this->vertex_data_size = (uint32_t)vertex_data_size; - rob_chara_age_age_object_vertex* vtx_data = force_malloc_s( - rob_chara_age_age_object_vertex, vertex_data_size); + rob_chara_age_age_object_vertex* vtx_data = force_malloc(vertex_data_size); vertex_data = vtx_data; obj_vertex_data* vertex_array = m->vertex_array; @@ -17365,7 +17364,7 @@ void rob_chara_age_age_object::load(object_info obj_info, int32_t count) { this->num_index = num_index + 1; uint32_t num_idx_data = (uint32_t)(count * (num_index + 1)); - uint16_t* idx_data = force_malloc_s(uint16_t, num_idx_data); + uint16_t* idx_data = force_malloc(num_idx_data); uint32_t* index_array = sm->index_array; uint32_t index_offset = 0; uint32_t l = 0; diff --git a/src/CRE/shader.cpp b/src/CRE/shader.cpp index af266305..11c0d595 100644 --- a/src/CRE/shader.cpp +++ b/src/CRE/shader.cpp @@ -85,7 +85,7 @@ bool shader::parse_define(const char* data, char** temp, size_t* temp_size) { if (len + 1 > *temp_size) { free_def(*temp); *temp_size = len + 1; - *temp = force_malloc_s(char, *temp_size); + *temp = force_malloc(*temp_size); } memcpy(*temp, data, len); @@ -105,7 +105,7 @@ bool shader::parse_define(const char* data, char** temp, size_t* temp_size) { if (len + 1 > *temp_size) { free_def(*temp); *temp_size = len + 1; - *temp = force_malloc_s(char, *temp_size); + *temp = force_malloc(*temp_size); } size_t pos = 0; @@ -128,7 +128,7 @@ bool shader::parse_define(const char* data, int32_t num_uniform, if (len + 1 > *temp_size) { free_def(*temp); *temp_size = len + 1; - *temp = force_malloc_s(char, *temp_size); + *temp = force_malloc(*temp_size); } memcpy(*temp, data, len); @@ -159,7 +159,7 @@ bool shader::parse_define(const char* data, int32_t num_uniform, if (len + 1 > *temp_size) { free_def(*temp); *temp_size = len + 1; - *temp = force_malloc_s(char, *temp_size); + *temp = force_malloc(*temp_size); } size_t pos = 0; @@ -195,10 +195,10 @@ char* shader::parse_include(char* data, farc* f) { count++; } - char** temp = force_malloc_s(char*, count); - size_t* temp_len = force_malloc_s(size_t, count); - char** temp_ptr0 = force_malloc_s(char*, count); - char** temp_ptr1 = force_malloc_s(char*, count); + char** temp = force_malloc(count); + size_t* temp_len = force_malloc(count); + char** temp_ptr0 = force_malloc(count); + char** temp_ptr1 = force_malloc(count); if (!temp || !temp_len || !temp_ptr0 || !temp_ptr1) { free_def(temp); free_def(temp_len); @@ -220,7 +220,7 @@ char* shader::parse_include(char* data, farc* f) { i0 += 10; size_t s = i1 - i0; i1 += 2; - char* t = force_malloc_s(char, s + 1); + char* t = force_malloc(s + 1); if (!t) continue; @@ -232,7 +232,7 @@ char* shader::parse_include(char* data, farc* f) { if (!ff) continue; - t = force_malloc_s(char, ff->size + 1); + t = force_malloc(ff->size + 1); if (t) { memcpy(t, ff->data, ff->size); t[ff->size] = 0; @@ -253,7 +253,7 @@ char* shader::parse_include(char* data, farc* f) { len += temp_len[i]; } - char* temp_data = force_malloc_s(char, len + 1); + char* temp_data = force_malloc(len + 1); size_t pos = 0; memcpy(temp_data + pos, data, temp_ptr0[0] - data); pos += temp_ptr0[0] - data; @@ -436,13 +436,13 @@ void shader_set_data::load(farc* f, bool ignore_cache, GLsizei buffer_size = 0x100000; void* binary = force_malloc(buffer_size); size_t temp_vert_size = 0x10000; - char* temp_vert = force_malloc_s(char, temp_vert_size); + char* temp_vert = force_malloc(temp_vert_size); size_t temp_frag_size = 0x10000; - char* temp_frag = force_malloc_s(char, temp_frag_size); + char* temp_frag = force_malloc(temp_frag_size); std::vector vec_vert; std::vector vec_frag; std::vector program_data_binary; - shader* shaders = force_malloc_s(shader, size); + shader* shaders = force_malloc(size); this->shaders = shaders; this->size = size; for (size_t i = 0; i < size; i++) { @@ -450,7 +450,7 @@ void shader_set_data::load(farc* f, bool ignore_cache, shader->name = shaders_table[i].name; shader->name_index = shaders_table[i].name_index; shader->num_sub = shaders_table[i].num_sub; - shader->sub = force_malloc_s(shader_sub, shader->num_sub); + shader->sub = force_malloc(shader->num_sub); shader->num_uniform = shaders_table[i].num_uniform; shader->use_uniform = shaders_table[i].use_uniform; shader->use_permut = shaders_table[i].use_permut; @@ -473,7 +473,7 @@ void shader_set_data::load(farc* f, bool ignore_cache, char* vert_data = 0; if (vert_ff && vert_ff->data) { - vert_data = force_malloc_s(char, vert_ff->size + 1); + vert_data = force_malloc(vert_ff->size + 1); if (vert_data) { memcpy(vert_data, vert_ff->data, vert_ff->size); vert_data[vert_ff->size] = 0; @@ -486,7 +486,7 @@ void shader_set_data::load(farc* f, bool ignore_cache, char* frag_data = 0; if (frag_ff && frag_ff->data) { - frag_data = force_malloc_s(char, frag_ff->size + 1); + frag_data = force_malloc(frag_ff->size + 1); if (frag_data) { memcpy(frag_data, frag_ff->data, frag_ff->size); frag_data[frag_ff->size] = 0; @@ -550,7 +550,7 @@ void shader_set_data::load(farc* f, bool ignore_cache, if (!ignore_cache) program_data_binary.reserve(unival_shad_count); - shader_sub_shader* shaders = force_malloc_s(shader_sub_shader, unival_shad_count); + shader_sub_shader* shaders = force_malloc(unival_shad_count); sub->shaders = shaders; if (shaders) { strcpy_s(vert_buf, sizeof(vert_buf), sub_table->vp); @@ -619,7 +619,7 @@ void shader_set_data::load(farc* f, bool ignore_cache, } else { program_data_binary.reserve(1); - shader_sub_shader* shaders = force_malloc_s(shader_sub_shader, 1); + shader_sub_shader* shaders = force_malloc(); sub->shaders = shaders; if (shaders) { strcpy_s(vert_buf, sizeof(vert_buf), sub_table->vp); @@ -781,7 +781,7 @@ static GLuint shader_compile_shader(GLenum type, const char* data, const char* f if (!success) { GLint length = 0; glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &length); - GLchar* info_log = force_malloc_s(GLchar, length); + GLchar* info_log = force_malloc(length); glGetShaderInfoLog(shader, length, 0, info_log); const char* type_str = "Unknown"; switch (type) { @@ -848,7 +848,7 @@ static GLuint shader_compile(const char* vert, const char* frag, const char* vp, if (!success) { GLint length = 0; glGetProgramiv(program, GL_INFO_LOG_LENGTH, &length); - GLchar* info_log = force_malloc_s(GLchar, length); + GLchar* info_log = force_malloc(length); glGetProgramInfoLog(program, length, 0, info_log); printf_debug("Program Shader Permut linking error:\nvp: %s; fp: %s\n%s\n", vp, fp, info_log); @@ -924,7 +924,7 @@ static GLuint shader_compile_binary(const char* vert, const char* frag, const ch if (!success) { GLint length = 0; glGetProgramiv(program, GL_INFO_LOG_LENGTH, &length); - GLchar* info_log = force_malloc_s(GLchar, length); + GLchar* info_log = force_malloc(length); glGetProgramInfoLog(program, length, 0, info_log); printf_debug("Program Shader Permut linking error:\nvp: %s; fp: %s\n%s\n", vp, fp, info_log); diff --git a/src/CRE/task_effect.cpp b/src/CRE/task_effect.cpp index edf7ca55..8aa8118b 100644 --- a/src/CRE/task_effect.cpp +++ b/src/CRE/task_effect.cpp @@ -1135,8 +1135,7 @@ void TaskEffectFogRing::Data::SetStageIndices(std::vector& stage_indice ssbo.Destroy(); - ptcl_data = force_malloc_s(fog_ring_data, max_ptcls); - ptcl_data = new (ptcl_data) fog_ring_data[max_ptcls]; + ptcl_data = new (force_malloc(max_ptcls)) fog_ring_data[max_ptcls]; if (!vao) glGenVertexArrays(1, &vao); @@ -3489,7 +3488,7 @@ static void draw_ripple_emit(render_context* rctx, struc_101* data) { vec3* vertex = data->vertex; color4u8* color = data->color; - vec3* vtx_data = force_malloc_s(vec3, count); + vec3* vtx_data = force_malloc(count); for (size_t i = count; i; i--, vtx_data++, vertex++, color++) *vtx_data = { vertex->x, vertex->z, (float_t)color->a * (float_t)(1.0 / 255.0) }; @@ -3546,7 +3545,7 @@ static void leaf_particle_init(bool change_stage) { const size_t leaf_ptcl_vtx_count = leaf_ptcl_count * 0x08; - leaf_ptcl_data = force_malloc_s(leaf_particle_data, leaf_ptcl_count); + leaf_ptcl_data = force_malloc(leaf_ptcl_count); leaf_particle_num_ptcls = stage_param_data_leaf_current->num_initial_ptcls; @@ -3588,7 +3587,7 @@ static void leaf_particle_init(bool change_stage) { (void*)offsetof(leaf_particle_vertex_data, normal)); size_t ebo_count = leaf_ptcl_vtx_count / 4 * 6; - uint32_t* ebo_data = force_malloc_s(uint32_t, ebo_count); + uint32_t* ebo_data = force_malloc(ebo_count); for (size_t i = 0, j = 0; i < ebo_count; i += 6, j += 4) { ebo_data[i + 0] = (uint32_t)(j + 0); ebo_data[i + 1] = (uint32_t)(j + 1); @@ -3832,7 +3831,7 @@ static void particle_init(vec3* offset) { const size_t ptcl_vtx_count = ptcl_count * 0x06; - ptcl_data = force_malloc_s(particle_rot_data, ptcl_count); + ptcl_data = force_malloc(ptcl_count); particle_rot_data* data = ptcl_data; for (size_t i = 0; i < ptcl_count; i++, data++) @@ -4112,7 +4111,7 @@ static void rain_particle_init(bool change_stage) { if (!rain_vao) glGenVertexArrays(1, &rain_vao); - vec3* vtx_data = force_malloc_s(vec3, rain_ptcl_count); + vec3* vtx_data = force_malloc(rain_ptcl_count); for (int32_t i = 0; i < rain_ptcl_count; i++) { vec3 position; position.x = rand_state_array_get_float(4); @@ -4286,7 +4285,7 @@ static void snow_particle_init(bool change_stage) { snow_ssbo.Create(sizeof(snow_particle_vertex_data) * snow->num_snow); - snow_particle_gpu_vertex_data* vtx_data = force_malloc_s(snow_particle_gpu_vertex_data, snow_ptcl_count); + snow_particle_gpu_vertex_data* vtx_data = force_malloc(snow_ptcl_count); for (int32_t i = 0; i < snow_ptcl_count; i++, vtx_data++) { vtx_data->position.x = rand_state_array_get_float(4); @@ -4416,10 +4415,10 @@ static void snow_particle_ctrl() { static void snow_particle_data_init() { if (!snow_ptcl_data) - snow_ptcl_data = force_malloc_s(particle_data, stage_param_data_snow_current->num_snow); + snow_ptcl_data = force_malloc(stage_param_data_snow_current->num_snow); if (!snow_ptcl_fallen_data) - snow_ptcl_fallen_data = force_malloc_s(particle_data, snow_ptcl_fallen_count); + snow_ptcl_fallen_data = force_malloc(snow_ptcl_fallen_count); } static void snow_particle_data_emit_fallen(particle_data* data) { diff --git a/src/CRE/texture.cpp b/src/CRE/texture.cpp index c9f4c125..a27acbbe 100644 --- a/src/CRE/texture.cpp +++ b/src/CRE/texture.cpp @@ -153,7 +153,7 @@ texture* texture_txp_load(txp* t, texture_id id) { return 0; int32_t count = t->array_size * t->mipmaps_count; - void** data_ptr = force_malloc_s(void*, count); + void** data_ptr = force_malloc(count); for (uint32_t i = 0, k = 0; i < t->array_size; i++) for (uint32_t j = 0; j < t->mipmaps_count; j++, k++) data_ptr[k] = t->mipmaps[k].data.data(); @@ -349,7 +349,7 @@ bool texture_txp_set_load(txp_set* t, texture*** texs, uint32_t* ids) { return false; size_t count = t->textures.size(); - *texs = force_malloc_s(texture*, count + 1); + *texs = force_malloc(count + 1); texture** tex = *texs; for (size_t i = 0; i < count; i++) tex[i] = texture_txp_load(&t->textures[i], texture_id(0, ids[i])); @@ -362,7 +362,7 @@ bool texture_txp_set_load(txp_set* t, texture*** texs, texture_id* ids) { return false; size_t count = t->textures.size(); - *texs = force_malloc_s(texture*, count + 1); + *texs = force_malloc(count + 1); texture** tex = *texs; for (size_t i = 0; i < count; i++) tex[i] = texture_txp_load(&t->textures[i], ids[i]); diff --git a/src/DivaGL/shader_table.cpp b/src/DivaGL/shader_table.cpp index 0298eba5..c375da9d 100644 --- a/src/DivaGL/shader_table.cpp +++ b/src/DivaGL/shader_table.cpp @@ -263,8 +263,8 @@ void FASTCALL shader_load_all_shaders() { subs->fp_unival_max = (int32_t*)sub->fp_unival_max; subs->num_vp = sub->num_vp; subs->num_fp = sub->num_fp; - subs->vp = force_malloc_s(int32_t, sub->num_vp); - subs->fp = force_malloc_s(int32_t, sub->num_fp); + subs->vp = force_malloc(sub->num_vp); + subs->fp = force_malloc(sub->num_fp); _glGenProgramsARB(sub->num_vp, (GLuint*)subs->vp); _glGenProgramsARB(sub->num_fp, (GLuint*)subs->fp); diff --git a/src/DivaGL/string.cpp b/src/DivaGL/string.cpp index 81278a29..5d2e5126 100644 --- a/src/DivaGL/string.cpp +++ b/src/DivaGL/string.cpp @@ -261,7 +261,7 @@ static void string_reserve(string* s, ssize_t size) { char* src = string_data(s); char* dst; if (capacity > STRING_NULL_LENGTH) - dst = force_malloc_s(char, capacity + 1); + dst = force_malloc(capacity + 1); else dst = s->data; @@ -292,7 +292,7 @@ static void wstring_reserve(wstring* s, ssize_t size) { wchar_t* src = wstring_data(s); wchar_t* dst; if (capacity > STRING_NULL_LENGTH) - dst = force_malloc_s(wchar_t, capacity + 1); + dst = force_malloc(capacity + 1); else dst = s->data; diff --git a/src/DivaGL/vector.hpp b/src/DivaGL/vector.hpp index dc980bd3..1683fecb 100644 --- a/src/DivaGL/vector.hpp +++ b/src/DivaGL/vector.hpp @@ -69,7 +69,7 @@ void vector_old_##t##_reserve(vector_old_##t* vec, ssize_t size) { \ \ t* temp = 0; \ if (capacity) \ - temp = (t*)force_malloc_s(t, capacity); \ + temp = (t*)force_malloc(capacity); \ \ if (!temp) \ return; \ @@ -234,7 +234,7 @@ void vector_old_ptr_##t##_reserve(vector_old_ptr_##t* vec, ssize_t size) { \ \ t** temp = 0; \ if (capacity) \ - temp = (t**)force_malloc_s(t*, capacity); \ + temp = (t**)force_malloc(capacity); \ \ if (!temp) \ return; \ diff --git a/src/KKdLib/a3da.cpp b/src/KKdLib/a3da.cpp index 904a1be5..85f40948 100644 --- a/src/KKdLib/a3da.cpp +++ b/src/KKdLib/a3da.cpp @@ -2496,7 +2496,7 @@ static bool key_val_read_raw_data(key_val* kv, return false; char b[0x200]; - float_t* fs = force_malloc_s(float_t, c); + float_t* fs = force_malloc(c); s = value_list; for (size_t i = 0; i < c; i++) { const char* t = s; diff --git a/src/KKdLib/aet.cpp b/src/KKdLib/aet.cpp index 83bacf6e..343b07e4 100644 --- a/src/KKdLib/aet.cpp +++ b/src/KKdLib/aet.cpp @@ -242,7 +242,7 @@ static void aet_set_classic_read_inner(aet_set* as, prj::shared_ptrallocate(scenes_count); as->scenes = (const aet_scene**)scenes; - uint32_t* data = force_malloc_s(uint32_t, scenes_count); + uint32_t* data = force_malloc(scenes_count); s.set_position(0, SEEK_SET); for (uint32_t i = 0; i < scenes_count; i++) data[i] = s.read_uint32_t(); @@ -298,7 +298,7 @@ static void aet_set_modern_read_inner(aet_set* as, prj::shared_ptrallocate(scenes_count); as->scenes = (const aet_scene**)scenes; - int64_t* data = force_malloc_s(int64_t, scenes_count); + int64_t* data = force_malloc(scenes_count); s_aetc.set_position(0, SEEK_SET); if (!is_x) for (uint32_t i = 0; i < scenes_count; i++) diff --git a/src/KKdLib/database/aet.cpp b/src/KKdLib/database/aet.cpp index 44cdc04e..07ab1073 100644 --- a/src/KKdLib/database/aet.cpp +++ b/src/KKdLib/database/aet.cpp @@ -81,7 +81,7 @@ void aet_database_file::read(const char* path, bool modern) { file_stream s; s.open(path_bin, "rb"); if (s.check_not_null()) { - uint8_t* data = force_malloc_s(uint8_t, s.length); + uint8_t* data = force_malloc(s.length); s.read(data, s.length); memory_stream s_bin; s_bin.open(data, s.length); @@ -117,7 +117,7 @@ void aet_database_file::read(const wchar_t* path, bool modern) { file_stream s; s.open(path_bin, L"rb"); if (s.check_not_null()) { - uint8_t* data = force_malloc_s(uint8_t, s.length); + uint8_t* data = force_malloc(s.length); s.read(data, s.length); memory_stream s_bin; s_bin.open(data, s.length); diff --git a/src/KKdLib/database/bone.cpp b/src/KKdLib/database/bone.cpp index 4b447445..52be6bf4 100644 --- a/src/KKdLib/database/bone.cpp +++ b/src/KKdLib/database/bone.cpp @@ -64,7 +64,7 @@ void bone_database::read(const char* path, bool modern) { file_stream s; s.open(path_bin, "rb"); if (s.check_not_null()) { - uint8_t* data = force_malloc_s(uint8_t, s.length); + uint8_t* data = force_malloc(s.length); s.read(data, s.length); memory_stream s_bin; s_bin.open(data, s.length); @@ -100,7 +100,7 @@ void bone_database::read(const wchar_t* path, bool modern) { file_stream s; s.open(path_bin, L"rb"); if (s.check_not_null()) { - uint8_t* data = force_malloc_s(uint8_t, s.length); + uint8_t* data = force_malloc(s.length); s.read(data, s.length); memory_stream s_bin; s_bin.open(data, s.length); @@ -565,7 +565,7 @@ static void bone_database_classic_write_inner(bone_database* bone_data, stream& std::vector strings; std::vector string_offsets; - int64_t* skeleton_offsets = force_malloc_s(int64_t, skeleton_count); + int64_t* skeleton_offsets = force_malloc(skeleton_count); for (uint32_t i = 0; i < skeleton_count; i++) { bone_database_skeleton* skel = &bone_data->skeleton[i]; @@ -1076,7 +1076,7 @@ static void bone_database_modern_write_inner(bone_database* bone_data, stream& s s_bone.align_write(0x10); } - bone_database_skeleton_header* skh = force_malloc_s(bone_database_skeleton_header, skeleton_count); + bone_database_skeleton_header* skh = force_malloc(skeleton_count); if (!is_x) for (uint32_t i = 0; i < skeleton_count; i++) { diff --git a/src/KKdLib/database/object.cpp b/src/KKdLib/database/object.cpp index 2d2597fb..6e89ff18 100644 --- a/src/KKdLib/database/object.cpp +++ b/src/KKdLib/database/object.cpp @@ -71,7 +71,7 @@ void object_database_file::read(const char* path, bool modern) { file_stream s; s.open(path_bin, "rb"); if (s.check_not_null()) { - uint8_t* data = force_malloc_s(uint8_t, s.length); + uint8_t* data = force_malloc(s.length); s.read(data, s.length); memory_stream s_bin; s_bin.open(data, s.length); @@ -107,7 +107,7 @@ void object_database_file::read(const wchar_t* path, bool modern) { file_stream s; s.open(path_bin, L"rb"); if (s.check_not_null()) { - uint8_t* data = force_malloc_s(uint8_t, s.length); + uint8_t* data = force_malloc(s.length); s.read(data, s.length); memory_stream s_bin; s_bin.open(data, s.length); @@ -472,7 +472,7 @@ static void object_database_file_classic_read_inner(object_database_file* obj_db } s.position_pop(); - size_t* object_set_object_count = force_malloc_s(size_t, object_set_count); + size_t* object_set_object_count = force_malloc(object_set_count); s.position_push(objects_offset, SEEK_SET); for (uint32_t i = 0; i < object_count; i++) { uint32_t id = s.read_uint16_t(); @@ -642,7 +642,7 @@ static void object_database_file_modern_read_inner(object_database_file* obj_db, } s.position_pop(); - size_t* object_set_object_count = force_malloc_s(size_t, object_set_count); + size_t* object_set_object_count = force_malloc(object_set_count); s.position_push(objects_offset, SEEK_SET); if (!is_x) for (uint32_t i = 0; i < object_count; i++) { diff --git a/src/KKdLib/database/sprite.cpp b/src/KKdLib/database/sprite.cpp index 611a5279..f76742aa 100644 --- a/src/KKdLib/database/sprite.cpp +++ b/src/KKdLib/database/sprite.cpp @@ -78,7 +78,7 @@ void sprite_database_file::read(const char* path, bool modern) { file_stream s; s.open(path_bin, "rb"); if (s.check_not_null()) { - uint8_t* data = force_malloc_s(uint8_t, s.length); + uint8_t* data = force_malloc(s.length); s.read(data, s.length); memory_stream s_bin; s_bin.open(data, s.length); @@ -114,7 +114,7 @@ void sprite_database_file::read(const wchar_t* path, bool modern) { file_stream s; s.open(path_bin, L"rb"); if (s.check_not_null()) { - uint8_t* data = force_malloc_s(uint8_t, s.length); + uint8_t* data = force_malloc(s.length); s.read(data, s.length); memory_stream s_bin; s_bin.open(data, s.length); diff --git a/src/KKdLib/database/stage.cpp b/src/KKdLib/database/stage.cpp index 00d14728..cf8ab9ec 100644 --- a/src/KKdLib/database/stage.cpp +++ b/src/KKdLib/database/stage.cpp @@ -97,7 +97,7 @@ void stage_database_file::read(const char* path, bool modern) { file_stream s; s.open(path_bin, "rb"); if (s.check_not_null()) { - uint8_t* data = force_malloc_s(uint8_t, s.length); + uint8_t* data = force_malloc(s.length); s.read(data, s.length); memory_stream s_bin; s_bin.open(data, s.length); @@ -133,7 +133,7 @@ void stage_database_file::read(const wchar_t* path, bool modern) { file_stream s; s.open(path_bin, L"rb"); if (s.check_not_null()) { - uint8_t* data = force_malloc_s(uint8_t, s.length); + uint8_t* data = force_malloc(s.length); s.read(data, s.length); memory_stream s_bin; s_bin.open(data, s.length); diff --git a/src/KKdLib/database/texture.cpp b/src/KKdLib/database/texture.cpp index 0a054969..2beac65f 100644 --- a/src/KKdLib/database/texture.cpp +++ b/src/KKdLib/database/texture.cpp @@ -55,7 +55,7 @@ void texture_database_file::read(const char* path, bool modern) { file_stream s; s.open(path_bin, "rb"); if (s.check_not_null()) { - uint8_t* data = force_malloc_s(uint8_t, s.length); + uint8_t* data = force_malloc(s.length); s.read(data, s.length); memory_stream s_bin; s_bin.open(data, s.length); @@ -91,7 +91,7 @@ void texture_database_file::read(const wchar_t* path, bool modern) { file_stream s; s.open(path_bin, L"rb"); if (s.check_not_null()) { - uint8_t* data = force_malloc_s(uint8_t, s.length); + uint8_t* data = force_malloc(s.length); s.read(data, s.length); memory_stream s_bin; s_bin.open(data, s.length); diff --git a/src/KKdLib/default.cpp b/src/KKdLib/default.cpp index 38d8a888..526ec0b2 100644 --- a/src/KKdLib/default.cpp +++ b/src/KKdLib/default.cpp @@ -23,7 +23,7 @@ wchar_t* utf8_to_utf16(const char* s) { uint32_t c = 0; size_t length = utf8_to_utf16_length(s); - wchar_t* str = force_malloc_s(wchar_t, length + 1); + wchar_t* str = force_malloc(length + 1); if (!str) return 0; @@ -78,7 +78,7 @@ wchar_t* utf8_to_utf16(const char* s, size_t length) { uint32_t c = 0; size_t _length = utf8_to_utf16_length(s); - wchar_t* str = force_malloc_s(wchar_t, _length + 1); + wchar_t* str = force_malloc(_length + 1); if (!str) return 0; @@ -134,7 +134,7 @@ char* utf16_to_utf8(const wchar_t* s) { uint32_t c = 0; size_t length = utf16_to_utf8_length(s); - char* str = force_malloc_s(char, length + 1); + char* str = force_malloc(length + 1); if (!str) return 0; @@ -186,7 +186,7 @@ char* utf16_to_utf8(const wchar_t* s, size_t length) { uint32_t c = 0; size_t _length = utf16_to_utf8_length(s); - char* str = force_malloc_s(char, _length + 1); + char* str = force_malloc(_length + 1); if (!str) return 0; diff --git a/src/KKdLib/default.hpp b/src/KKdLib/default.hpp index 9d0cf2af..f3474a21 100644 --- a/src/KKdLib/default.hpp +++ b/src/KKdLib/default.hpp @@ -90,7 +90,16 @@ null(ssize_t) #define lerp_def(x, y, blend) ((1.0f - (blend)) * (x) + (blend) * (y)) extern void* force_malloc(size_t size); -#define force_malloc_s(s, size) (s*)force_malloc(sizeof(s) * (size)) + +template +inline T* force_malloc() { + return (T*)force_malloc(sizeof(T)); +} + +template +inline T* force_malloc(size_t size) { + return (T*)force_malloc(sizeof(T) * (size)); +} #define enum_or(s0, s1) \ (s0) = (decltype(s0))((int32_t)(s0) | (s1)) diff --git a/src/KKdLib/dsc.cpp b/src/KKdLib/dsc.cpp index 45829597..6c282351 100644 --- a/src/KKdLib/dsc.cpp +++ b/src/KKdLib/dsc.cpp @@ -3210,7 +3210,7 @@ void dsc::unparse(void** data, size_t* size) { data_dsc = (uint32_t*)st.data.data(); } else - data_dsc = force_malloc_s(uint32_t, data_size); + data_dsc = force_malloc(data_size); uint32_t* func_data = data_dsc; switch (type) { @@ -3307,7 +3307,7 @@ dsc_replace::dsc_replace(dsc_type src_type, dsc_type dst_type, dsc_get_func_name src_get_func_name = dsc_type_get_dsc_get_func_name(src_type); dsc_get_func_name dst_get_func_name = dsc_type_get_dsc_get_func_name(dst_type); dsc_get_func_length dst_get_func_length = dsc_type_get_dsc_get_func_length(dst_type, dst_has_perf_id); - dsc_replace_data* replace_data = force_malloc_s(dsc_replace_data, src_func_count); + dsc_replace_data* replace_data = force_malloc(src_func_count); this->replace_data = replace_data; for (int32_t i = 0; i < src_func_count; i++) { diff --git a/src/KKdLib/enbaya.cpp b/src/KKdLib/enbaya.cpp index ca4df1c1..4ef8c0fe 100644 --- a/src/KKdLib/enbaya.cpp +++ b/src/KKdLib/enbaya.cpp @@ -62,7 +62,7 @@ int32_t enb_process(uint8_t* data_in, uint8_t** data_out, return -7; *data_out_len = sizeof(quat_trans) * head->track_count * *frames + 0x10; - *data_out = force_malloc_s(uint8_t, *data_out_len); + *data_out = force_malloc(*data_out_len); if (!*data_out) return -8; @@ -93,7 +93,7 @@ int32_t enb_initialize(uint8_t* data, enb_play_head** play_head) { *play_head = 0; enb_head* head = (enb_head*)data; - enb_play_head* ph = force_malloc_s(enb_play_head, 1); + enb_play_head* ph = force_malloc(); if (!ph) return -3; @@ -102,7 +102,7 @@ int32_t enb_initialize(uint8_t* data, enb_play_head** play_head) { ph->data_header = head; enb_init(ph, head); - ph->track_data = force_malloc_s(enb_track, head->track_count); + ph->track_data = force_malloc(head->track_count); if (!ph->track_data) { free_def(ph); diff --git a/src/KKdLib/farc.cpp b/src/KKdLib/farc.cpp index fed4a890..de4cd62f 100644 --- a/src/KKdLib/farc.cpp +++ b/src/KKdLib/farc.cpp @@ -474,7 +474,7 @@ static void farc_pack_files(farc* f, stream& s, farc_compress_mode mode, bool ge f->compression_level = clamp_def(f->compression_level, 0, 12); if (get_files) { - char* temp = force_malloc_s(char, dir_len + 2 + MAX_PATH); + char* temp = force_malloc(dir_len + 2 + MAX_PATH); memcpy(temp, f->directory_path.c_str(), sizeof(char) * dir_len); temp[dir_len] = '\\'; for (farc_file& i : f->files) { @@ -704,7 +704,7 @@ static errno_t farc_read_header(farc* f, stream& s) { uint8_t* dt; int32_t length = 0; - dt = d_t = force_malloc_s(uint8_t, header_length); + dt = d_t = force_malloc(header_length); s.read(d_t, header_length); if (f->ft) { header_length -= 0x10; @@ -833,7 +833,7 @@ static void farc_unpack_files(farc* f, stream& s, bool save) { free_def(dir_temp); } - char* temp_path = force_malloc_s(char, max_path_len + 1); + char* temp_path = force_malloc(max_path_len + 1); memcpy(temp_path, f->directory_path.c_str(), sizeof(char) * dir_len); temp_path[dir_len] = '\\'; diff --git a/src/KKdLib/io/json.cpp b/src/KKdLib/io/json.cpp index 0faed94b..fe2792a7 100644 --- a/src/KKdLib/io/json.cpp +++ b/src/KKdLib/io/json.cpp @@ -322,7 +322,7 @@ static char* io_json_read_string_inner(stream& s, io_json_read_buffer* buf, int3 int64_t pos_end = s.get_position() - buf->length; io_json_seek(s, buf, pos_end - pos); - char* temp = force_malloc_s(char, len + 1); + char* temp = force_malloc(len + 1); for (size_t i = 0; i < len;) { *c = io_json_read_char(s, buf); diff --git a/src/KKdLib/io/stream.cpp b/src/KKdLib/io/stream.cpp index ca1d51bf..b08e92d6 100644 --- a/src/KKdLib/io/stream.cpp +++ b/src/KKdLib/io/stream.cpp @@ -141,7 +141,7 @@ char* stream::read_utf8_string_null_terminated_offset(int64_t offset) { return 0; } - char* str = force_malloc_s(char, len + 1); + char* str = force_malloc(len + 1); position_push(offset, SEEK_SET); read(str, len); str[len] = 0; @@ -156,7 +156,7 @@ wchar_t* stream::read_utf16_string_null_terminated_offset(int64_t offset) { return 0; } - wchar_t* str = force_malloc_s(wchar_t, len + 1); + wchar_t* str = force_malloc(len + 1); position_push(offset, SEEK_SET); read(str, sizeof(wchar_t) * len); str[len] = 0; diff --git a/src/KKdLib/key_val.cpp b/src/KKdLib/key_val.cpp index 111b0ddd..a84ab3f1 100644 --- a/src/KKdLib/key_val.cpp +++ b/src/KKdLib/key_val.cpp @@ -54,7 +54,7 @@ void key_val::file_read(const char* path) { file_stream s; s.open(path, "rb"); if (s.check_not_null()) { - char* d = force_malloc_s(char, s.length); + char* d = force_malloc(s.length); s.read(d, s.length); parse((uint8_t*)d, s.length); free_def(d); @@ -68,7 +68,7 @@ void key_val::file_read(const wchar_t* path) { file_stream s; s.open(path, L"rb"); if (s.check_not_null()) { - char* d = force_malloc_s(char, s.length); + char* d = force_malloc(s.length); s.read(d, s.length); parse((uint8_t*)d, s.length); free_def(d); diff --git a/src/KKdLib/light_param/face.cpp b/src/KKdLib/light_param/face.cpp index 66dd5433..c56f2ff4 100644 --- a/src/KKdLib/light_param/face.cpp +++ b/src/KKdLib/light_param/face.cpp @@ -103,7 +103,7 @@ bool light_param_face::load_file(void* data, const char* path, const char* file, } static void light_param_face_read_inner(light_param_face* face, stream& s) { - char* data = force_malloc_s(char, s.length + 1); + char* data = force_malloc(s.length + 1); s.read(data, s.length); data[s.length] = 0; diff --git a/src/KKdLib/light_param/fog.cpp b/src/KKdLib/light_param/fog.cpp index 0080450e..10f21aaa 100644 --- a/src/KKdLib/light_param/fog.cpp +++ b/src/KKdLib/light_param/fog.cpp @@ -108,7 +108,7 @@ density(), has_linear(), linear_start(), linear_end(), has_color(), color() { } static void light_param_fog_read_inner(light_param_fog* fog, stream& s) { - char* data = force_malloc_s(char, s.length + 1); + char* data = force_malloc(s.length + 1); s.read(data, s.length); data[s.length] = 0; diff --git a/src/KKdLib/light_param/glow.cpp b/src/KKdLib/light_param/glow.cpp index 5251414e..8dab7967 100644 --- a/src/KKdLib/light_param/glow.cpp +++ b/src/KKdLib/light_param/glow.cpp @@ -107,7 +107,7 @@ bool light_param_glow::load_file(void* data, const char* path, const char* file, } static void light_param_glow_read_inner(light_param_glow* glow, stream& s) { - char* data = force_malloc_s(char, s.length + 1); + char* data = force_malloc(s.length + 1); s.read(data, s.length); data[s.length] = 0; diff --git a/src/KKdLib/light_param/ibl.cpp b/src/KKdLib/light_param/ibl.cpp index 60ffb26e..9846c090 100644 --- a/src/KKdLib/light_param/ibl.cpp +++ b/src/KKdLib/light_param/ibl.cpp @@ -84,7 +84,7 @@ light_param_ibl_specular::~light_param_ibl_specular() { } static void light_param_ibl_read_inner(light_param_ibl* ibl, stream& s) { - char* data = force_malloc_s(char, s.length + 1); + char* data = force_malloc(s.length + 1); s.read(data, s.length); data[s.length] = 0; @@ -263,8 +263,8 @@ static void light_param_ibl_specular_generate_mipmaps(light_param_ibl_specular* int32_t max_level = specular->max_level; float_t* data_f32[2]; - data_f32[0] = force_malloc_s(float_t, 4 * (size * size) * 6); - data_f32[1] = force_malloc_s(float_t, 4 * ((size / 2) * (size / 2)) * 6); + data_f32[0] = force_malloc(4 * (size * size) * 6); + data_f32[1] = force_malloc(4 * ((size / 2) * (size / 2)) * 6); for (int32_t i = 0; i < max_level; i++, size /= 2) { size_t data_size = 4 * (size * size) * 6; size_t data_size_2 = 4 * ((size / 2) * (size / 2)) * 6; diff --git a/src/KKdLib/light_param/light.cpp b/src/KKdLib/light_param/light.cpp index fd0a0a13..ac37ea81 100644 --- a/src/KKdLib/light_param/light.cpp +++ b/src/KKdLib/light_param/light.cpp @@ -114,7 +114,7 @@ light_param_light_group::light_param_light_group() { } static void light_param_light_read_inner(light_param_light* light, stream& s) { - char* data = force_malloc_s(char, s.length + 1); + char* data = force_malloc(s.length + 1); s.read(data, s.length); data[s.length] = 0; diff --git a/src/KKdLib/light_param/wind.cpp b/src/KKdLib/light_param/wind.cpp index 43ffea25..698492a7 100644 --- a/src/KKdLib/light_param/wind.cpp +++ b/src/KKdLib/light_param/wind.cpp @@ -108,7 +108,7 @@ light_param_wind_spc::light_param_wind_spc() : cos(), sin() { } static void light_param_wind_read_inner(light_param_wind* wind, stream& s) { - char* data = force_malloc_s(char, s.length + 1); + char* data = force_malloc(s.length + 1); s.read(data, s.length); data[s.length] = 0; diff --git a/src/KKdLib/mot.cpp b/src/KKdLib/mot.cpp index 2ff7f803..78642ce1 100644 --- a/src/KKdLib/mot.cpp +++ b/src/KKdLib/mot.cpp @@ -357,7 +357,7 @@ static void mot_classic_read_inner(mot_set* ms, prj::shared_ptrmot_num = mot_num; s.set_position(0x00, SEEK_SET); - mot_header_classic* mh = force_malloc_s(mot_header_classic, mot_num); + mot_header_classic* mh = force_malloc(mot_num); for (uint32_t i = 0; i < mot_num; i++) { mh[i].key_set_info_offset = s.read_uint32_t(); mh[i].key_set_types_offset = s.read_uint32_t(); @@ -410,7 +410,7 @@ static void mot_classic_read_inner(mot_set* ms, prj::shared_ptrtype == MOT_KEY_SET_STATIC) { key_set->keys_count = 1; key_set->frames = 0; - key_set->values = alloc->allocate(1); + key_set->values = alloc->allocate(); key_set->values[0] = s.read_float_t(); } else { @@ -446,7 +446,7 @@ static void mot_classic_write_inner(mot_set* ms, stream& s) { uint32_t mot_num = ms->mot_num; s.set_position(mot_num * 0x10ULL + 0x10, SEEK_SET); - mot_header_classic* mh = force_malloc_s(mot_header_classic, mot_num); + mot_header_classic* mh = force_malloc(mot_num); for (size_t i = 0; i < mot_num; i++) { ::mot_data* m = &mot_data[i]; @@ -622,7 +622,7 @@ static void mot_modern_read_inner(mot_set* ms, prj::shared_ptrtype == MOT_KEY_SET_STATIC) { key_set->keys_count = 1; key_set->frames = 0; - key_set->values = alloc->allocate(1); + key_set->values = alloc->allocate(); key_set->values[0] = s.read_float_t(); } else { @@ -876,7 +876,7 @@ static void mot_modern_write_inner(mot_set* ms, stream& s) { mot_bone_info* bone_info_array = m->bone_info_array; - size_t* bone_info_offsets = force_malloc_s(size_t, bone_info_count); + size_t* bone_info_offsets = force_malloc(bone_info_count); mh.bone_info_offset = s_motc.get_position(); if (!is_x) for (int32_t j = 0; j < bone_info_count; j++) diff --git a/src/KKdLib/msgpack.cpp b/src/KKdLib/msgpack.cpp index 2ccc21f2..2367fe16 100644 --- a/src/KKdLib/msgpack.cpp +++ b/src/KKdLib/msgpack.cpp @@ -412,7 +412,7 @@ char* msgpack::read_utf8_string(const char* name) { msgpack* m = name ? get_by_name(name) : this; if (m && m->type == MSGPACK_STRING) { size_t length = m->data.str->size(); - char* val = force_malloc_s(char, length + 1); + char* val = force_malloc(length + 1); memcpy(val, m->data.str->c_str(), length); val[length] = 0; return val; diff --git a/src/KKdLib/obj.cpp b/src/KKdLib/obj.cpp index c837b1df..33b79de3 100644 --- a/src/KKdLib/obj.cpp +++ b/src/KKdLib/obj.cpp @@ -648,8 +648,8 @@ static void obj_vertex_generate_tangents(obj_mesh* mesh) { uint32_t num_vertex = mesh->num_vertex; - vec3* tangents = force_malloc_s(vec3, num_vertex); - vec3* bitangents = force_malloc_s(vec3, num_vertex); + vec3* tangents = force_malloc(num_vertex); + vec3* bitangents = force_malloc(num_vertex); obj_vertex_data* vtx = mesh->vertex_array; uint32_t num_submesh = mesh->num_submesh; @@ -1225,7 +1225,7 @@ static void obj_set_classic_read_inner(obj_set* set, prj::shared_ptrobj_data[i] = alloc->allocate<::obj>(); - uint32_t* data = force_malloc_s(uint32_t, obj_num * 3ULL); + uint32_t* data = force_malloc(obj_num * 3ULL); uint32_t* obj_data = 0; if (osh.obj_data) { @@ -1316,7 +1316,7 @@ static void obj_set_classic_write_inner(obj_set* set, stream& s) { s.write_int32_t(0); s.align_write(0x10); - int32_t* data = force_malloc_s(int32_t, obj_num); + int32_t* data = force_malloc(obj_num); int32_t* obj_data = data; for (uint32_t i = 0; i < obj_num; i++) { @@ -1524,7 +1524,7 @@ static void obj_classic_write_model(obj* obj, stream& s, int64_t base_offset) { if (num_mesh) { oh.mesh_array = s.get_position() - base_offset; - obj_mesh_header* mhs = force_malloc_s(obj_mesh_header, num_mesh); + obj_mesh_header* mhs = force_malloc(num_mesh); for (uint32_t i = 0; i < num_mesh; i++) { obj_mesh* mesh = &obj->mesh_array[i]; obj_mesh_header* mh = &mhs[i]; @@ -2111,7 +2111,7 @@ static void obj_classic_write_skin(obj_skin* sk, stream& s, int64_t base_offset) s.write_int32_t(0); s.align_write(0x10); - bhs = force_malloc_s(obj_skin_block_header, ex->num_block); + bhs = force_malloc(ex->num_block); for (uint32_t i = 0; i < ex->num_block; i++) { obj_skin_block* block = &ex->block_array[i]; if (block->type != OBJ_SKIN_BLOCK_OSAGE) @@ -2601,7 +2601,7 @@ static obj_skin_ex_data* obj_classic_read_skin_ex_data(prj::shared_ptrnum_block++; } - obj_skin_block_header* bhs = force_malloc_s(obj_skin_block_header, ex->num_block); + obj_skin_block_header* bhs = force_malloc(ex->num_block); s.set_position(exh.block_array_offset, SEEK_SET); for (uint32_t i = 0; i < ex->num_block; i++) { bhs[i].block_signature_offset = s.read_uint32_t(); @@ -3938,7 +3938,7 @@ static void obj_set_modern_read_inner(obj_set* set, prj::shared_ptrobj_data[i] = alloc->allocate<::obj>(); - int64_t* data = force_malloc_s(int64_t, obj_num * 3ULL); + int64_t* data = force_malloc(obj_num * 3ULL); int64_t* obj_data = 0; if (osh.obj_data) { @@ -4202,7 +4202,7 @@ static void obj_set_modern_write_inner(obj_set* set, stream& s) { s_mosd.write_uint32_t_reverse_endianness(set->tex_id_data[i]); s_mosd.align_write(0x10); - int64_t* obj_name_data = force_malloc_s(int64_t, obj_num); + int64_t* obj_name_data = force_malloc(obj_num); for (uint32_t i = 0; i < obj_num; i++) { obj_name_data[i] = (int32_t)s_mosd.get_position(); s_mosd.write_utf8_string_null_terminated(set->obj_data[i]->name); @@ -4665,8 +4665,8 @@ static void obj_modern_write_model(obj* obj, stream& s, if (num_mesh) { oh.mesh_array = s.get_position() - base_offset; - obj_mesh_header* mhs = force_malloc_s(obj_mesh_header, num_mesh); - obj_sub_mesh_header** smhss = force_malloc_s(obj_sub_mesh_header*, num_mesh); + obj_mesh_header* mhs = force_malloc(num_mesh); + obj_sub_mesh_header** smhss = force_malloc(num_mesh); for (uint32_t i = 0; i < num_mesh; i++) { obj_mesh* mesh = &obj->mesh_array[i]; @@ -4744,7 +4744,7 @@ static void obj_modern_write_model(obj* obj, stream& s, uint32_t num_submesh = mesh->num_submesh; if (num_submesh) { - smhs = force_malloc_s(obj_sub_mesh_header, num_submesh); + smhs = force_malloc(num_submesh); smhss[i] = smhs; for (uint32_t j = 0; j < num_submesh; j++) { obj_sub_mesh* sub_mesh = &mesh->submesh_array[j]; @@ -5878,7 +5878,7 @@ static void obj_modern_write_skin(obj_skin* sk, stream& s, } s.align_write(0x10); - bhs = force_malloc_s(obj_skin_block_header, ex->num_block); + bhs = force_malloc(ex->num_block); if (!is_x) for (uint32_t i = 0; i < ex->num_block; i++) { obj_skin_block* block = &ex->block_array[i]; @@ -6650,7 +6650,7 @@ static obj_skin_ex_data* obj_modern_read_skin_ex_data(prj::shared_ptrnum_block++; } - obj_skin_block_header* bhs = force_malloc_s(obj_skin_block_header, ex->num_block); + obj_skin_block_header* bhs = force_malloc(ex->num_block); s.set_position(exh.block_array_offset, SEEK_SET); if (!is_x) for (uint32_t i = 0; i < ex->num_block; i++) { diff --git a/src/KKdLib/pv_exp.cpp b/src/KKdLib/pv_exp.cpp index c41e027f..8308e921 100644 --- a/src/KKdLib/pv_exp.cpp +++ b/src/KKdLib/pv_exp.cpp @@ -138,7 +138,7 @@ static void pv_exp_classic_read_inner(pv_exp* exp, prj::shared_ptr(motion_num * 3ULL); int64_t* face_offset = offsets; int64_t* face_cl_offset = offsets + motion_num; int64_t* name_offset = offsets + motion_num * 2ULL; @@ -238,7 +238,7 @@ static void pv_exp_classic_write_inner(pv_exp* exp, stream& s) { } s.align_write(0x20); - int64_t* offsets = force_malloc_s(int64_t, motion_num * 3ULL); + int64_t* offsets = force_malloc(motion_num * 3ULL); int64_t* face_offset = offsets; int64_t* face_cl_offset = offsets + motion_num; int64_t* name_offset = offsets + motion_num * 2ULL; @@ -327,7 +327,7 @@ static void pv_exp_modern_read_inner(pv_exp* exp, prj::shared_ptr(motion_num * 3ULL); int64_t* face_offset = offsets; int64_t* face_cl_offset = offsets + motion_num; int64_t* name_offset = offsets + motion_num * 2ULL; @@ -450,7 +450,7 @@ static void pv_exp_modern_write_inner(pv_exp* exp, stream& s) { } s_expc.align_write(0x20); - int64_t* offsets = force_malloc_s(int64_t, motion_num * 3ULL); + int64_t* offsets = force_malloc(motion_num * 3ULL); int64_t* face_offset = offsets; int64_t* face_cl_offset = offsets + motion_num; int64_t* name_offset = offsets + motion_num * 2ULL; diff --git a/src/KKdLib/sort.cpp b/src/KKdLib/sort.cpp index 32cb9c62..580e3483 100644 --- a/src/KKdLib/sort.cpp +++ b/src/KKdLib/sort.cpp @@ -44,7 +44,7 @@ void radix_sort_uint8_t(uint8_t* arr, size_t n) { return; size_t c[RADIX]; - uint8_t* o = force_malloc_s(uint8_t, n); + uint8_t* o = force_malloc(n); uint8_t* org_arr = arr; for (size_t shift = 0, s = 0; shift < sizeof(uint8_t) * 8 / RADIX_BASE; shift++, s += RADIX_BASE) { @@ -91,7 +91,7 @@ void radix_sort_uint16_t(uint16_t* arr, size_t n) { return; size_t c[RADIX]; - uint16_t* o = force_malloc_s(uint16_t, n); + uint16_t* o = force_malloc(n); uint16_t* org_arr = arr; for (size_t shift = 0, s = 0; shift < sizeof(uint16_t) * 8 / RADIX_BASE; shift++, s += RADIX_BASE) { @@ -138,7 +138,7 @@ void radix_sort_uint32_t(uint32_t* arr, size_t n) { return; size_t c[RADIX]; - uint32_t* o = force_malloc_s(uint32_t, n); + uint32_t* o = force_malloc(n); uint32_t* org_arr = arr; for (size_t shift = 0, s = 0; shift < sizeof(uint32_t) * 8 / RADIX_BASE; shift++, s += RADIX_BASE) { @@ -185,7 +185,7 @@ void radix_sort_uint64_t(uint64_t* arr, size_t n) { return; size_t c[RADIX]; - uint64_t* o = force_malloc_s(uint64_t, n); + uint64_t* o = force_malloc(n); uint64_t* org_arr = arr; for (size_t shift = 0, s = 0; shift < sizeof(uint64_t) * 8 / RADIX_BASE; shift++, s += RADIX_BASE) { @@ -232,7 +232,7 @@ void radix_sort_size_t(size_t* arr, size_t n) { return; size_t c[RADIX]; - size_t* o = force_malloc_s(size_t, n); + size_t* o = force_malloc(n); size_t* org_arr = arr; for (size_t shift = 0, s = 0; shift < sizeof(size_t) * 8 / RADIX_BASE; shift++, s += RADIX_BASE) { @@ -268,7 +268,7 @@ void radix_sort_custom(void* arr, size_t n, size_t size, size_t idx_len, radix_i return; size_t c[RADIX]; - uint8_t* o = force_malloc_s(uint8_t, size * n); + uint8_t* o = force_malloc(size * n); uint8_t* a = (uint8_t*)arr; void* org_arr = arr; diff --git a/src/KKdLib/sound/diva.cpp b/src/KKdLib/sound/diva.cpp index 71486fad..1b99ac80 100644 --- a/src/KKdLib/sound/diva.cpp +++ b/src/KKdLib/sound/diva.cpp @@ -150,8 +150,8 @@ static bool diva_read_inner(diva* d, stream& s, float_t*& data) { size_t ch = d->channels; size_t samples_count = d->samples_count; - data = force_malloc_s(float_t, samples_count * ch); - ima_storage* storage = force_malloc_s(ima_storage, ch); + data = force_malloc(samples_count * ch); + ima_storage* storage = force_malloc(ch); float_t* temp_data = data; for (size_t i = 0; i < samples_count; i++) @@ -187,7 +187,7 @@ static void diva_write_inner(diva* d, stream& s, float_t* data) { size_t ch = d->channels; size_t samples_count = d->samples_count; - ima_storage* storage = force_malloc_s(ima_storage, ch); + ima_storage* storage = force_malloc(ch); float_t* temp_data = data; for (size_t i = 0; i < samples_count; i++) diff --git a/src/KKdLib/sound/vag.cpp b/src/KKdLib/sound/vag.cpp index 38d269b1..8b1f4030 100644 --- a/src/KKdLib/sound/vag.cpp +++ b/src/KKdLib/sound/vag.cpp @@ -281,9 +281,9 @@ static bool vag_read_inner(vag* v, stream& s, float_t*& data, size_t& num_blocks size_t vag_block_size = BLOCK_SIZE * ch; num_blocks = (v->size / v->channels) >> 4; - int32_t* samp = force_malloc_s(int32_t, ch * 4); - data = force_malloc_s(float_t, num_blocks * vag_block_size); - flags = force_malloc_s(uint8_t, num_blocks); + int32_t* samp = force_malloc(ch * 4); + data = force_malloc(num_blocks * vag_block_size); + flags = force_malloc(num_blocks); uint8_t nibble[BLOCK_SIZE]; float_t* temp_data = data; @@ -378,7 +378,7 @@ static void vag_write_inner(vag* v, stream& s, const float_t* data, const uint8_ size_t c, i, i1, i2, j; int32_t ch = v->channels; - int32_t* samp = force_malloc_s(int32_t, hevag ? v->channels * 8ULL : 4ULL); + int32_t* samp = force_malloc(hevag ? v->channels * 8ULL : 4ULL); if (hevag && coef_index_count > 29) { uint8_t flag, sample; int32_t temp_data[BLOCK_SIZE]; @@ -530,8 +530,8 @@ static void vag_read_wav(vag* v, const wchar_t* path, float_t*& data, size_t& sa } count += add_loop; - float_t** wav_data = force_malloc_s(float_t*, count); - size_t* wav_samples = force_malloc_s(size_t, count); + float_t** wav_data = force_malloc(count); + size_t* wav_samples = force_malloc(count); for (size_t i = 0; i < count; i++) { if (add_loop && i + 1 == count) @@ -564,7 +564,7 @@ static void vag_read_wav(vag* v, const wchar_t* path, float_t*& data, size_t& sa l = false; size_t ch = v->channels; - data = force_malloc_s(float_t, samples * ch); + data = force_malloc(samples * ch); float_t* data_temp = data; for (size_t i = 0; i < count; i++) { size_t i3; @@ -583,7 +583,7 @@ static void vag_read_wav(vag* v, const wchar_t* path, float_t*& data, size_t& sa } l = false; - flags = force_malloc_s(uint8_t, samples / BLOCK_SIZE); + flags = force_malloc(samples / BLOCK_SIZE); uint8_t* f = flags; for (size_t i = 0; i < count; i++) { size_t num_blocks; diff --git a/src/KKdLib/sound/wav.cpp b/src/KKdLib/sound/wav.cpp index 13fcb5d9..105e2a06 100644 --- a/src/KKdLib/sound/wav.cpp +++ b/src/KKdLib/sound/wav.cpp @@ -65,7 +65,7 @@ void wav::write(const wchar_t* path, const float_t* data, size_t samples) { } wav* wav_init() { - wav* w = force_malloc_s(wav, 1); + wav* w = force_malloc(); return w; } @@ -111,7 +111,7 @@ static void wav_read_inner(wav* w, stream& s, float_t*& data, size_t& samples) { *w = w_t; samples = w->size / w->channels / w->bytes; - data = force_malloc_s(float_t, w->size / w->bytes); + data = force_malloc(w->size / w->bytes); size_t t_s = samples; float_t* t_d = data; diff --git a/src/KKdLib/stage_param/fog_ring.cpp b/src/KKdLib/stage_param/fog_ring.cpp index a14f313d..8ccb477b 100644 --- a/src/KKdLib/stage_param/fog_ring.cpp +++ b/src/KKdLib/stage_param/fog_ring.cpp @@ -106,7 +106,7 @@ bool stage_param_fog_ring::load_file(void* data, const char* path, const char* f } static void stage_param_fog_ring_read_inner(stage_param_fog_ring* fog_ring, stream& s) { - char* data = force_malloc_s(char, s.length + 1); + char* data = force_malloc(s.length + 1); s.read(data, s.length); data[s.length] = 0; diff --git a/src/KKdLib/stage_param/leaf.cpp b/src/KKdLib/stage_param/leaf.cpp index 6072c586..bc43c01c 100644 --- a/src/KKdLib/stage_param/leaf.cpp +++ b/src/KKdLib/stage_param/leaf.cpp @@ -110,7 +110,7 @@ bool stage_param_leaf::load_file(void* data, const char* path, const char* file, } static void stage_param_leaf_read_inner(stage_param_leaf* leaf, stream& s) { - char* data = force_malloc_s(char, s.length + 1); + char* data = force_malloc(s.length + 1); s.read(data, s.length); data[s.length] = 0; diff --git a/src/KKdLib/stage_param/litproj.cpp b/src/KKdLib/stage_param/litproj.cpp index a88da5f3..606eb468 100644 --- a/src/KKdLib/stage_param/litproj.cpp +++ b/src/KKdLib/stage_param/litproj.cpp @@ -103,7 +103,7 @@ bool stage_param_litproj::load_file(void* data, const char* path, const char* fi } static void stage_param_litproj_read_inner(stage_param_litproj* litproj, stream& s) { - char* data = force_malloc_s(char, s.length + 1); + char* data = force_malloc(s.length + 1); s.read(data, s.length); data[s.length] = 0; diff --git a/src/KKdLib/stage_param/rain.cpp b/src/KKdLib/stage_param/rain.cpp index 62282b32..d60b3ed2 100644 --- a/src/KKdLib/stage_param/rain.cpp +++ b/src/KKdLib/stage_param/rain.cpp @@ -105,7 +105,7 @@ bool stage_param_rain::load_file(void* data, const char* path, const char* file, } static void stage_param_rain_read_inner(stage_param_rain* rain, stream& s) { - char* data = force_malloc_s(char, s.length + 1); + char* data = force_malloc(s.length + 1); s.read(data, s.length); data[s.length] = 0; diff --git a/src/KKdLib/stage_param/ripple.cpp b/src/KKdLib/stage_param/ripple.cpp index ed909625..4cfc9781 100644 --- a/src/KKdLib/stage_param/ripple.cpp +++ b/src/KKdLib/stage_param/ripple.cpp @@ -108,7 +108,7 @@ bool stage_param_ripple::load_file(void* data, const char* path, const char* fil } static void stage_param_ripple_read_inner(stage_param_ripple* ripple, stream& s) { - char* data = force_malloc_s(char, s.length + 1); + char* data = force_malloc(s.length + 1); s.read(data, s.length); data[s.length] = 0; diff --git a/src/KKdLib/stage_param/snow.cpp b/src/KKdLib/stage_param/snow.cpp index c7bb1ef5..3034df6d 100644 --- a/src/KKdLib/stage_param/snow.cpp +++ b/src/KKdLib/stage_param/snow.cpp @@ -110,7 +110,7 @@ bool stage_param_snow::load_file(void* data, const char* path, const char* file, } static void stage_param_snow_read_inner(stage_param_snow* snow, stream& s) { - char* data = force_malloc_s(char, s.length + 1); + char* data = force_malloc(s.length + 1); s.read(data, s.length); data[s.length] = 0; diff --git a/src/KKdLib/stage_param/splash.cpp b/src/KKdLib/stage_param/splash.cpp index 11fb2b0d..bfd22aea 100644 --- a/src/KKdLib/stage_param/splash.cpp +++ b/src/KKdLib/stage_param/splash.cpp @@ -106,7 +106,7 @@ bool stage_param_splash::load_file(void* data, const char* path, const char* fil } static void stage_param_splash_read_inner(stage_param_splash* splash, stream& s) { - char* data = force_malloc_s(char, s.length + 1); + char* data = force_malloc(s.length + 1); s.read(data, s.length); data[s.length] = 0; diff --git a/src/KKdLib/stage_param/star.cpp b/src/KKdLib/stage_param/star.cpp index 686187f3..cdedb490 100644 --- a/src/KKdLib/stage_param/star.cpp +++ b/src/KKdLib/stage_param/star.cpp @@ -125,7 +125,7 @@ bool stage_param_star::load_file(void* data, const char* path, const char* file, } static void stage_param_star_read_inner(stage_param_star* star, stream& s) { - char* data = force_malloc_s(char, s.length + 1); + char* data = force_malloc(s.length + 1); s.read(data, s.length); data[s.length] = 0; diff --git a/src/KKdLib/str_utils.cpp b/src/KKdLib/str_utils.cpp index 6b6f110f..6b841c7c 100644 --- a/src/KKdLib/str_utils.cpp +++ b/src/KKdLib/str_utils.cpp @@ -113,7 +113,7 @@ char* str_utils_split_get_right(const char* str, const char split) { t++; size_t len = utf8_length(t); - char* p = force_malloc_s(char, len + 1); + char* p = force_malloc(len + 1); memcpy(p, t, len); p[len] = 0; return p; @@ -129,7 +129,7 @@ wchar_t* str_utils_split_get_right(const wchar_t* str, const wchar_t split) { t++; size_t len = utf16_length(t); - wchar_t* p = force_malloc_s(wchar_t, len + 1); + wchar_t* p = force_malloc(len + 1); memcpy(p, t, sizeof(wchar_t) * len); p[len] = 0; return p; @@ -142,7 +142,7 @@ char* str_utils_split_get_left(const char* str, const char split) { const char* t = strchr(str, split); size_t len = t ? t - str : utf8_length(str); - char* p = force_malloc_s(char, len + 1); + char* p = force_malloc(len + 1); memcpy(p, str, len); p[len] = 0; return p; @@ -155,7 +155,7 @@ wchar_t* str_utils_split_get_left(const wchar_t* str, const wchar_t split) { const wchar_t* t = wcschr(str, split); size_t len = t ? t - str : utf16_length(str); - wchar_t* p = force_malloc_s(wchar_t, len + 1); + wchar_t* p = force_malloc(len + 1); memcpy(p, str, sizeof(wchar_t) * len); p[len] = 0; return p; @@ -170,7 +170,7 @@ char* str_utils_split_get_right_include(const char* str, const char split) { return str_utils_copy(str); size_t len = utf8_length(t); - char* p = force_malloc_s(char, len + 1); + char* p = force_malloc(len + 1); memcpy(p, t, len); p[len] = 0; return p; @@ -185,7 +185,7 @@ wchar_t* str_utils_split_get_right_include(const wchar_t* str, const wchar_t spl return str_utils_copy(str); size_t len = utf16_length(t); - wchar_t* p = force_malloc_s(wchar_t, len + 1); + wchar_t* p = force_malloc(len + 1); memcpy(p, t, sizeof(wchar_t) * len); p[len] = 0; return p; @@ -199,7 +199,7 @@ char* str_utils_split_get_left_include(const char* str, const char split) { t++; size_t len = t ? t - str : utf8_length(str); - char* p = force_malloc_s(char, len + 1); + char* p = force_malloc(len + 1); memcpy(p, str, len); p[len] = 0; return p; @@ -213,7 +213,7 @@ wchar_t* str_utils_split_get_left_include(const wchar_t* str, const wchar_t spli t++; size_t len = t ? t - str : utf16_length(str); - wchar_t* p = force_malloc_s(wchar_t, len + 1); + wchar_t* p = force_malloc(len + 1); memcpy(p, str, sizeof(wchar_t) * len); p[len] = 0; return p; @@ -229,7 +229,7 @@ char* str_utils_split_right_get_right(const char* str, const char split) { t++; size_t len = t - str; - char* p = force_malloc_s(char, len + 1); + char* p = force_malloc(len + 1); memcpy(p, t, len); p[len] = 0; return p; @@ -245,7 +245,7 @@ wchar_t* str_utils_split_right_get_right(const wchar_t* str, const wchar_t split t++; size_t len = t - str; - wchar_t* p = force_malloc_s(wchar_t, len + 1); + wchar_t* p = force_malloc(len + 1); memcpy(p, t, sizeof(wchar_t) * len); p[len] = 0; return p; @@ -258,7 +258,7 @@ char* str_utils_split_right_get_left(const char* str, const char split) { const char* t = strrchr(str, split); size_t len = t ? t - str : utf8_length(str); - char* p = force_malloc_s(char, len + 1); + char* p = force_malloc(len + 1); memcpy(p, str, len); p[len] = 0; return p; @@ -271,7 +271,7 @@ wchar_t* str_utils_split_right_get_left(const wchar_t* str, const wchar_t split) const wchar_t* t = wcsrchr(str, split); size_t len = t ? t - str : utf16_length(str); - wchar_t* p = force_malloc_s(wchar_t, len + 1); + wchar_t* p = force_malloc(len + 1); memcpy(p, str, sizeof(wchar_t) * len); p[len] = 0; return p; @@ -286,7 +286,7 @@ char* str_utils_split_right_get_right_include(const char* str, const char split) return str_utils_copy(str); size_t len = utf8_length(t); - char* p = force_malloc_s(char, len + 1); + char* p = force_malloc(len + 1); memcpy(p, t, len); p[len] = 0; return p; @@ -301,7 +301,7 @@ wchar_t* str_utils_split_right_get_right_include(const wchar_t* str, const wchar return str_utils_copy(str); size_t len = utf16_length(t); - wchar_t* p = force_malloc_s(wchar_t, len + 1); + wchar_t* p = force_malloc(len + 1); memcpy(p, t, sizeof(wchar_t) * len); p[len] = 0; return p; @@ -316,7 +316,7 @@ char* str_utils_split_right_get_left_include(const char* str, const char split) t++; size_t len = t ? t - str : utf8_length(str); - char* p = force_malloc_s(char, len + 1); + char* p = force_malloc(len + 1); memcpy(p, str, len); p[len] = 0; return p; @@ -331,7 +331,7 @@ wchar_t* str_utils_split_right_get_left_include(const wchar_t* str, const wchar_ t++; size_t len = t ? t - str : utf16_length(str); - wchar_t* p = force_malloc_s(wchar_t, len + 1); + wchar_t* p = force_malloc(len + 1); memcpy(p, str, sizeof(wchar_t) * len); p[len] = 0; return p; @@ -373,7 +373,7 @@ char* str_utils_add(const char* str0, const char* str1) { if (str0 && str1) { size_t str0_len = utf8_length(str0); size_t str1_len = utf8_length(str1); - char* p = force_malloc_s(char, str0_len + str1_len + 1); + char* p = force_malloc(str0_len + str1_len + 1); memcpy(p, str0, str0_len + 1); memcpy(p + str0_len, str1, str1_len + 1); return p; @@ -390,7 +390,7 @@ wchar_t* str_utils_add(const wchar_t* str0, const wchar_t* str1) { if (str0 && str1) { size_t str0_len = utf16_length(str0); size_t str1_len = utf16_length(str1); - wchar_t* p = force_malloc_s(wchar_t, str0_len + str1_len + 1); + wchar_t* p = force_malloc(str0_len + str1_len + 1); memcpy(p, str0, sizeof(wchar_t) * (str0_len + 1)); memcpy(p + str0_len, str1, sizeof(wchar_t) * (str1_len + 1)); return p; @@ -408,7 +408,7 @@ char* str_utils_copy(const char* str) { return 0; size_t len = utf8_length(str) + 1; - char* p = force_malloc_s(char, len); + char* p = force_malloc(len); memcpy(p, str, len); return p; } @@ -418,7 +418,7 @@ wchar_t* str_utils_copy(const wchar_t* str) { return 0; size_t len = utf16_length(str) + 1; - wchar_t* p = force_malloc_s(wchar_t, len); + wchar_t* p = force_malloc(len); memcpy(p, str, sizeof(wchar_t) * len); return p; } @@ -634,8 +634,8 @@ bool str_utils_text_file_parse(const void* data, size_t size, lf = false; t = d; - char* temp_buf = force_malloc_s(char, buf_len); - char** temp_lines = force_malloc_s(char*, c); + char* temp_buf = force_malloc(buf_len); + char** temp_lines = force_malloc(c); char* b = temp_buf; for (size_t i = 0, j = 0, l = 0, m = 0; j < c; i++) { diff --git a/src/KKdLib/txp.cpp b/src/KKdLib/txp.cpp index da4e81e6..2db21266 100644 --- a/src/KKdLib/txp.cpp +++ b/src/KKdLib/txp.cpp @@ -93,11 +93,11 @@ bool txp_set::pack_file(void** data, size_t* size, bool big_endian) { if (count < 1) return false; - size_t* txp4_offset = force_malloc_s(size_t, count); - size_t** txp2_offset = force_malloc_s(size_t*, count); + size_t* txp4_offset = force_malloc(count); + size_t** txp2_offset = force_malloc(count); tex = textures.data(); for (size_t i = 0; i < count; i++, tex++) - txp2_offset[i] = force_malloc_s(size_t, (size_t)tex->mipmaps_count * tex->array_size); + txp2_offset[i] = force_malloc((size_t)tex->mipmaps_count * tex->array_size); l = 12 + count * 4; @@ -175,11 +175,11 @@ bool txp_set::pack_file(std::vector& data, bool big_endian) { if (count < 1) return false; - size_t* txp4_offset = force_malloc_s(size_t, count); - size_t** txp2_offset = force_malloc_s(size_t*, count); + size_t* txp4_offset = force_malloc(count); + size_t** txp2_offset = force_malloc(count); tex = textures.data(); for (size_t i = 0; i < count; i++, tex++) - txp2_offset[i] = force_malloc_s(size_t, (size_t)tex->mipmaps_count * tex->array_size); + txp2_offset[i] = force_malloc((size_t)tex->mipmaps_count * tex->array_size); l = 12 + count * 4; diff --git a/src/ReDIVA/classes/glitter_editor.cpp b/src/ReDIVA/classes/glitter_editor.cpp index 46ffd9e8..24591122 100644 --- a/src/ReDIVA/classes/glitter_editor.cpp +++ b/src/ReDIVA/classes/glitter_editor.cpp @@ -340,7 +340,7 @@ bool glitter_editor_init(class_data* data, render_context* rctx) { *t = 0; } - uint64_t* hashes = force_malloc_s(uint64_t, count); + uint64_t* hashes = force_malloc(count); for (size_t i = 0; i < count; i++) { size_t len = utf8_length(lines[i]); hashes[i] = hash_murmurhash(lines[i], min_def(len, 0x7F)); @@ -488,7 +488,7 @@ bool glitter_editor_init(class_data* data, render_context* rctx) { *t = 0; } - uint64_t* hashes = force_malloc_s(uint64_t, count); + uint64_t* hashes = force_malloc(count); for (size_t i = 0; i < count; i++) { size_t len = utf8_length(lines[i]); hashes[i] = hash_murmurhash(lines[i], min_def(len, 0x7F)); @@ -1917,7 +1917,7 @@ static bool glitter_editor_list_open_window(Glitter::EffectGroup* eg) { file_stream s; s.open(file, L"rb"); size_t length = s.length; - uint8_t* data = force_malloc_s(uint8_t, length); + uint8_t* data = force_malloc(length); s.read(data, length); s.close(); @@ -1933,7 +1933,7 @@ static bool glitter_editor_list_open_window(Glitter::EffectGroup* eg) { uint64_t empty_hash = eg->type != Glitter::FT ? hash_murmurhash_empty : hash_fnv1a64m_empty; - uint64_t* hashes = force_malloc_s(uint64_t, count); + uint64_t* hashes = force_malloc(count); if (eg->type != Glitter::FT) for (size_t i = 0; i < count; i++) { size_t len = utf8_length(lines[i]); @@ -3040,7 +3040,7 @@ static void glitter_editor_property_effect(GlitterEditor* glt_edt, class_data* d enum_and(effect->data.flags, ~Glitter::EFFECT_LOCAL); if (type == 2 || type == 3) { if (!effect->data.ext_anim) - effect->data.ext_anim = force_malloc_s(Glitter::Effect::ExtAnim, 1); + effect->data.ext_anim = force_malloc(); if (type == 2) enum_or(effect->data.ext_anim->flags, Glitter::EFFECT_EXT_ANIM_CHARA_ANIM); else diff --git a/src/ReDIVA/classes/information/task.cpp b/src/ReDIVA/classes/information/task.cpp index 1ed94b18..7448357b 100644 --- a/src/ReDIVA/classes/information/task.cpp +++ b/src/ReDIVA/classes/information/task.cpp @@ -20,7 +20,7 @@ static int32_t task_sort_by_disp(void const* src1, void const* src2); static int32_t task_sort_by_name(void const* src1, void const* src2); bool information_task_init(class_data* data, render_context* rctx) { - data->data = force_malloc_s(int32_t, 2); + data->data = force_malloc(2); information_task_dispose(data); return true; } diff --git a/src/ReDIVA/main.cpp b/src/ReDIVA/main.cpp index 92121b94..eae223f3 100644 --- a/src/ReDIVA/main.cpp +++ b/src/ReDIVA/main.cpp @@ -346,9 +346,9 @@ void compile_shaders(farc* f, farc* of, const shader_table* shaders_table, const GLsizei buffer_size = 0x20000; void* spv = force_malloc(buffer_size); size_t temp_vert_size = 0x10000; - char* temp_vert = force_malloc_s(char, temp_vert_size); + char* temp_vert = force_malloc(temp_vert_size); size_t temp_frag_size = 0x10000; - char* temp_frag = force_malloc_s(char, temp_frag_size); + char* temp_frag = force_malloc(temp_frag_size); std::vector vec_vert; std::vector vec_frag; std::vector program_data_vert_spv; @@ -370,7 +370,7 @@ void compile_shaders(farc* f, farc* of, const shader_table* shaders_table, const char* vert_data = 0; if (vert_ff && vert_ff->data) { - vert_data = force_malloc_s(char, vert_ff->size + 1); + vert_data = force_malloc(vert_ff->size + 1); if (vert_data) { memcpy(vert_data, vert_ff->data, vert_ff->size); vert_data[vert_ff->size] = 0; @@ -384,7 +384,7 @@ void compile_shaders(farc* f, farc* of, const shader_table* shaders_table, const char* frag_data = 0; if (frag_ff && frag_ff->data) { - frag_data = force_malloc_s(char, frag_ff->size + 1); + frag_data = force_malloc(frag_ff->size + 1); if (frag_data) { memcpy(frag_data, frag_ff->data, frag_ff->size); frag_data[frag_ff->size] = 0; diff --git a/src/ReDIVA/nvenc/nvenc_encoder.cpp b/src/ReDIVA/nvenc/nvenc_encoder.cpp index 5873fd4f..e0839f32 100644 --- a/src/ReDIVA/nvenc/nvenc_encoder.cpp +++ b/src/ReDIVA/nvenc/nvenc_encoder.cpp @@ -57,7 +57,7 @@ nvenc_config(), nvenc_api(), encoder(), encoder_guid(), preset_guid(), output_bu PNVENCODEAPICREATEINSTANCEPROC nvEncodeAPICreateInstance = (PNVENCODEAPICREATEINSTANCEPROC)GetProcAddress(nvenc_dll, "NvEncodeAPICreateInstance"); - nvenc_api = force_malloc_s(NV_ENCODE_API_FUNCTION_LIST, 1); + nvenc_api = force_malloc(); nvenc_api->version = NV_ENCODE_API_FUNCTION_LIST_VER; print_nvenc_status(__LINE__, nvEncodeAPICreateInstance(nvenc_api)); diff --git a/src/ReDIVA/render.cpp b/src/ReDIVA/render.cpp index 0926312c..1f0acf82 100644 --- a/src/ReDIVA/render.cpp +++ b/src/ReDIVA/render.cpp @@ -397,7 +397,7 @@ void render_data::unload() { } void render_data::load_common_data() { - float_t* grid_verts = force_malloc_s(float_t, 3 * grid_vertex_count); + float_t* grid_verts = force_malloc(3 * grid_vertex_count); size_t v = 0; for (float_t x = -grid_size; x <= grid_size; x += grid_spacing) { diff --git a/src/ReDIVA/x_pv_game.cpp b/src/ReDIVA/x_pv_game.cpp index 0e675393..28b5fa42 100644 --- a/src/ReDIVA/x_pv_game.cpp +++ b/src/ReDIVA/x_pv_game.cpp @@ -4420,7 +4420,7 @@ bool x_pv_game::Ctrl() { sprintf_s(file_buf, sizeof(file_buf), "pv826\\pv_826_hand_%d.txt", i); s.open(file_buf, "rb"); size_t length = s.length; - uint8_t* data = force_malloc_s(uint8_t, length); + uint8_t* data = force_malloc(length); s.read(data, length); s.close(); @@ -5436,7 +5436,7 @@ static mot_key_set_type mot_write_motion_fit_keys_into_curve(std::vector u_lock(*bake_pv826_alloc_mutex); frames = 0; - values = (*bake_pv826_alloc)->allocate(1); + values = (*bake_pv826_alloc)->allocate(); } memcpy(values, _values.data(), sizeof(float_t)); break; @@ -5589,7 +5589,7 @@ static void mot_write_motion(mot_data_bake* bake) { key_set_data_x.frames = 0; { std::unique_lock u_lock(*bake_pv826_alloc_mutex); - key_set_data_x.values = alloc->allocate(1); + key_set_data_x.values = alloc->allocate(); key_set_data_x.values[0] = 0.0491406508f; } key_set_data_x.type = MOT_KEY_SET_STATIC; @@ -5622,7 +5622,7 @@ static void mot_write_motion(mot_data_bake* bake) { key_set_data_y.frames = 0; { std::unique_lock u_lock(*bake_pv826_alloc_mutex); - key_set_data_y.values = alloc->allocate(1); + key_set_data_y.values = alloc->allocate(); key_set_data_y.values[0] = 0.0331281610f; } key_set_data_y.type = MOT_KEY_SET_STATIC; @@ -9555,7 +9555,7 @@ static void x_pv_game_split_auth_3d_material_list(auth_3d_material_list& ml, } } - float_t* arr = force_malloc_s(float_t, count); + float_t* arr = force_malloc(count); material_list_color* val = values_src; const float_t reverse_bias = 0.0001f;