Skip to content

Commit 5812515

Browse files
32th-System32th-System
committed
Forward all Jansson imports through thcrap.dll
Next steps: reimplementing the Jansson API inside thcrap through json5pp (so that we don't rely on two separate JSON libraries and so we're not parsing JSON twice)
1 parent 1eee061 commit 5812515

File tree

5 files changed

+166
-2
lines changed

5 files changed

+166
-2
lines changed

‎thcrap.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)libs/;$(SolutionDir)thcrap/src/;$(SolutionDir)libs/win32_utf8/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
2020
</ClCompile>
2121
<Link>
22-
<AdditionalDependencies>win32_utf8$(Suffix).lib;jansson$(Suffix).lib;zdll-ng$(Suffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
22+
<AdditionalDependencies>win32_utf8$(Suffix).lib;zdll-ng$(Suffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
2323
</Link>
2424
</ItemDefinitionGroup>
2525
</Project>

‎thcrap/thcrap.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</ClCompile>
4040
<Link>
4141
<SubSystem>Windows</SubSystem>
42-
<AdditionalDependencies>shlwapi.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
42+
<AdditionalDependencies>jansson$(Suffix).lib;shlwapi.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
4343
<AdditionalDependencies Condition="'$(Platform)'=='x64'">thcrap_x64_injector$(DebugSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
4444
<ModuleDefinitionFile Condition="'$(Platform)'!='x64'">thcrap_x86.def</ModuleDefinitionFile>
4545
<ModuleDefinitionFile Condition="'$(Platform)'=='x64'">thcrap_x64.def</ModuleDefinitionFile>

‎thcrap/thcrap_x64.def‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,88 @@ EXPORTS
135135
thcrap_inject_into_running
136136
thcrap_inject_into_new
137137

138+
; Jansson forwards
139+
; ----------------
140+
jansson_version_str=jansson.jansson_version_str
141+
json_array=jansson.json_array
142+
json_array_append_new=jansson.json_array_append_new
143+
json_array_clear=jansson.json_array_clear
144+
json_array_extend=jansson.json_array_extend
145+
json_array_get=jansson.json_array_get
146+
json_array_insert_new=jansson.json_array_insert_new
147+
json_array_remove=jansson.json_array_remove
148+
json_array_set_new=jansson.json_array_set_new
149+
json_array_size=jansson.json_array_size
150+
json_copy=jansson.json_copy
151+
json_deep_copy=jansson.json_deep_copy
152+
json_delete=jansson.json_delete
153+
json_dump_callback=jansson.json_dump_callback
154+
json_dump_file=jansson.json_dump_file
155+
json_dumpb=jansson.json_dumpb
156+
json_dumpf=jansson.json_dumpf
157+
json_dumpfd=jansson.json_dumpfd
158+
json_dumps=jansson.json_dumps
159+
json_equal=jansson.json_equal
160+
json_false=jansson.json_false
161+
json_get_alloc_funcs=jansson.json_get_alloc_funcs
162+
json_integer=jansson.json_integer
163+
json_integer_set=jansson.json_integer_set
164+
json_integer_value=jansson.json_integer_value
165+
json_load_callback=jansson.json_load_callback
166+
json_load_file=jansson.json_load_file
167+
json_loadb=jansson.json_loadb
168+
json_loadf=jansson.json_loadf
169+
json_loadfd=jansson.json_loadfd
170+
json_loads=jansson.json_loads
171+
json_null=jansson.json_null
172+
json_number_value=jansson.json_number_value
173+
json_object=jansson.json_object
174+
json_object_clear=jansson.json_object_clear
175+
json_object_del=jansson.json_object_del
176+
json_object_deln=jansson.json_object_deln
177+
json_object_get=jansson.json_object_get
178+
json_object_getn=jansson.json_object_getn
179+
json_object_iter=jansson.json_object_iter
180+
json_object_iter_at=jansson.json_object_iter_at
181+
json_object_iter_key=jansson.json_object_iter_key
182+
json_object_iter_key_len=jansson.json_object_iter_key_len
183+
json_object_iter_next=jansson.json_object_iter_next
184+
json_object_iter_set_new=jansson.json_object_iter_set_new
185+
json_object_iter_value=jansson.json_object_iter_value
186+
json_object_key_to_iter=jansson.json_object_key_to_iter
187+
json_object_seed=jansson.json_object_seed
188+
json_object_set_new=jansson.json_object_set_new
189+
json_object_set_new_nocheck=jansson.json_object_set_new_nocheck
190+
json_object_setn_new=jansson.json_object_setn_new
191+
json_object_setn_new_nocheck=jansson.json_object_setn_new_nocheck
192+
json_object_size=jansson.json_object_size
193+
json_object_update=jansson.json_object_update
194+
json_object_update_existing=jansson.json_object_update_existing
195+
json_object_update_missing=jansson.json_object_update_missing
196+
json_object_update_recursive=jansson.json_object_update_recursive
197+
json_pack=jansson.json_pack
198+
json_pack_ex=jansson.json_pack_ex
199+
json_real=jansson.json_real
200+
json_real_set=jansson.json_real_set
201+
json_real_value=jansson.json_real_value
202+
json_sprintf=jansson.json_sprintf
203+
json_string=jansson.json_string
204+
json_string_length=jansson.json_string_length
205+
json_string_nocheck=jansson.json_string_nocheck
206+
json_string_set=jansson.json_string_set
207+
json_string_set_nocheck=jansson.json_string_set_nocheck
208+
json_string_setn=jansson.json_string_setn
209+
json_string_setn_nocheck=jansson.json_string_setn_nocheck
210+
json_string_value=jansson.json_string_value
211+
json_stringn=jansson.json_stringn
212+
json_stringn_nocheck=jansson.json_stringn_nocheck
213+
json_true=jansson.json_true
214+
json_unpack=jansson.json_unpack
215+
json_unpack_ex=jansson.json_unpack_ex
216+
json_vpack_ex=jansson.json_vpack_ex
217+
json_vsprintf=jansson.json_vsprintf
218+
json_vunpack_ex=jansson.json_vunpack_ex
219+
138220
; JSON extensions
139221
; ---------------
140222
json_decref_safe

‎thcrap/thcrap_x86.def‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,87 @@ EXPORTS
135135
thcrap_inject_into_running
136136
thcrap_inject_into_new
137137

138+
; Jansson forwards
139+
jansson_version_str=jansson.jansson_version_str
140+
json_array=jansson.json_array
141+
json_array_append_new=jansson.json_array_append_new
142+
json_array_clear=jansson.json_array_clear
143+
json_array_extend=jansson.json_array_extend
144+
json_array_get=jansson.json_array_get
145+
json_array_insert_new=jansson.json_array_insert_new
146+
json_array_remove=jansson.json_array_remove
147+
json_array_set_new=jansson.json_array_set_new
148+
json_array_size=jansson.json_array_size
149+
json_copy=jansson.json_copy
150+
json_deep_copy=jansson.json_deep_copy
151+
json_delete=jansson.json_delete
152+
json_dump_callback=jansson.json_dump_callback
153+
json_dump_file=jansson.json_dump_file
154+
json_dumpb=jansson.json_dumpb
155+
json_dumpf=jansson.json_dumpf
156+
json_dumpfd=jansson.json_dumpfd
157+
json_dumps=jansson.json_dumps
158+
json_equal=jansson.json_equal
159+
json_false=jansson.json_false
160+
json_get_alloc_funcs=jansson.json_get_alloc_funcs
161+
json_integer=jansson.json_integer
162+
json_integer_set=jansson.json_integer_set
163+
json_integer_value=jansson.json_integer_value
164+
json_load_callback=jansson.json_load_callback
165+
json_load_file=jansson.json_load_file
166+
json_loadb=jansson.json_loadb
167+
json_loadf=jansson.json_loadf
168+
json_loadfd=jansson.json_loadfd
169+
json_loads=jansson.json_loads
170+
json_null=jansson.json_null
171+
json_number_value=jansson.json_number_value
172+
json_object=jansson.json_object
173+
json_object_clear=jansson.json_object_clear
174+
json_object_del=jansson.json_object_del
175+
json_object_deln=jansson.json_object_deln
176+
json_object_get=jansson.json_object_get
177+
json_object_getn=jansson.json_object_getn
178+
json_object_iter=jansson.json_object_iter
179+
json_object_iter_at=jansson.json_object_iter_at
180+
json_object_iter_key=jansson.json_object_iter_key
181+
json_object_iter_key_len=jansson.json_object_iter_key_len
182+
json_object_iter_next=jansson.json_object_iter_next
183+
json_object_iter_set_new=jansson.json_object_iter_set_new
184+
json_object_iter_value=jansson.json_object_iter_value
185+
json_object_key_to_iter=jansson.json_object_key_to_iter
186+
json_object_seed=jansson.json_object_seed
187+
json_object_set_new=jansson.json_object_set_new
188+
json_object_set_new_nocheck=jansson.json_object_set_new_nocheck
189+
json_object_setn_new=jansson.json_object_setn_new
190+
json_object_setn_new_nocheck=jansson.json_object_setn_new_nocheck
191+
json_object_size=jansson.json_object_size
192+
json_object_update=jansson.json_object_update
193+
json_object_update_existing=jansson.json_object_update_existing
194+
json_object_update_missing=jansson.json_object_update_missing
195+
json_object_update_recursive=jansson.json_object_update_recursive
196+
json_pack=jansson.json_pack
197+
json_pack_ex=jansson.json_pack_ex
198+
json_real=jansson.json_real
199+
json_real_set=jansson.json_real_set
200+
json_real_value=jansson.json_real_value
201+
json_sprintf=jansson.json_sprintf
202+
json_string=jansson.json_string
203+
json_string_length=jansson.json_string_length
204+
json_string_nocheck=jansson.json_string_nocheck
205+
json_string_set=jansson.json_string_set
206+
json_string_set_nocheck=jansson.json_string_set_nocheck
207+
json_string_setn=jansson.json_string_setn
208+
json_string_setn_nocheck=jansson.json_string_setn_nocheck
209+
json_string_value=jansson.json_string_value
210+
json_stringn=jansson.json_stringn
211+
json_stringn_nocheck=jansson.json_stringn_nocheck
212+
json_true=jansson.json_true
213+
json_unpack=jansson.json_unpack
214+
json_unpack_ex=jansson.json_unpack_ex
215+
json_vpack_ex=jansson.json_vpack_ex
216+
json_vsprintf=jansson.json_vsprintf
217+
json_vunpack_ex=jansson.json_vunpack_ex
218+
138219
; JSON extensions
139220
; ---------------
140221
json_decref_safe

‎thcrap_i18n/thcrap_i18n.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<Link>
3636
<SubSystem>Windows</SubSystem>
3737
<ModuleDefinitionFile>thcrap_i18n.def</ModuleDefinitionFile>
38+
<AdditionalDependencies>thcrap$(Suffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
3839
</Link>
3940
<ClCompile>
4041
<PreprocessorDefinitions>THCRAP_ALLOW_INTERNAL_APIS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

0 commit comments

Comments
 (0)