Commit d2456b6e4c60801d861938bed96ca25fc540425d
2022-01-21T11:50:40
os2, geniconv: default functions pointers to Uni*() API, In case they get accessed before SDL_Init() was called.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67
diff --git a/src/core/os2/geniconv/geniconv.c b/src/core/os2/geniconv/geniconv.c
index d4f3fa1..5976fe7 100644
--- a/src/core/os2/geniconv/geniconv.c
+++ b/src/core/os2/geniconv/geniconv.c
@@ -46,17 +46,17 @@ extern size_t _System os2_iconv (iconv_t cd,
char **outbuf, size_t *outbytesleft);
extern int _System os2_iconv_close (iconv_t cd);
-/* Functions pointers types */
+/* Functions pointers */
typedef iconv_t (_System *FNICONV_OPEN)(const char*, const char*);
typedef size_t (_System *FNICONV) (iconv_t, char **, size_t *, char **, size_t *);
typedef int (_System *FNICONV_CLOSE)(iconv_t);
-/* Used DLL module handle */
static HMODULE hmIconv = NULLHANDLE;
-/* Functions pointers */
-static FNICONV_OPEN fn_iconv_open = NULL;
-static FNICONV fn_iconv = NULL;
-static FNICONV_CLOSE fn_iconv_close = NULL;
+static FNICONV_OPEN fn_iconv_open = os2_iconv_open;
+static FNICONV fn_iconv = os2_iconv;
+static FNICONV_CLOSE fn_iconv_close = os2_iconv_close;
+
+static int geniconv_init = 0;
static BOOL _loadDLL(const char *dllname,
@@ -102,10 +102,12 @@ static BOOL _loadDLL(const char *dllname,
static void _init(void)
{
- if (fn_iconv_open != NULL) {
+ if (geniconv_init) {
return; /* Already initialized */
}
+ geniconv_init = 1;
+
/* Try to load kiconv.dll, iconv2.dll or iconv.dll */
if (!_loadDLL("KICONV", "_libiconv_open", "_libiconv", "_libiconv_close") &&
!_loadDLL("ICONV2", "_libiconv_open", "_libiconv", "_libiconv_close") &&
@@ -123,16 +125,19 @@ static void _init(void)
* ----------------
*/
-/* Non-standard function for iconv to unload the used dynamic library */
+/* function to unload the used iconv dynamic library */
void libiconv_clean(void)
{
+ geniconv_init = 0;
+
+ /* reset the function pointers. */
+ fn_iconv_open = os2_iconv_open;
+ fn_iconv = os2_iconv;
+ fn_iconv_close = os2_iconv_close;
+
if (hmIconv != NULLHANDLE) {
DosFreeModule(hmIconv);
hmIconv = NULLHANDLE;
-
- fn_iconv_open = NULL;
- fn_iconv = NULL;
- fn_iconv_close = NULL;
}
}