From a023a96e979c99297986e5ce9d9712036648f8ca Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michal=20Mal=C3=BD?= Date: Wed, 10 Feb 2016 20:25:31 +0100 Subject: [PATCH] Correctly check for old and new format in when reading wavelength --- libhpcs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libhpcs.c b/libhpcs.c index 13a353a..7a48a92 100644 --- a/libhpcs.c +++ b/libhpcs.c @@ -522,7 +522,7 @@ static enum HPCS_ParseCode read_dad_wavelength(FILE* datafile, struct HPCS_Wavel measured->interval = 0; reference->wavelength = 0; reference->interval = 0; - pret = read_string_at_offset(datafile, devsig_info_offset, &str, gentype); + pret = read_string_at_offset(datafile, devsig_info_offset, &str, OLD_FORMAT(gentype)); if (pret != PARSE_OK) return pret; @@ -1261,7 +1261,7 @@ static enum HPCS_ParseCode __win32_latin1_to_utf8(char** target, const char *s) wchar_t* intermediate; size_t mb_size; - size_t w_size = MultiByteToWideChar(28591, MB_ERR_INVALID_CHARS, s, -1, NULL, 0); + size_t w_size = MultiByteToWideChar(28591, MB_COMPOSITE, s, -1, NULL, 0); if (w_size == 0) { PR_DEBUGF("Count MultiByteToWideChar() error 0x%x\n", GetLastError()); return PARSE_E_INTERNAL; @@ -1272,7 +1272,7 @@ static enum HPCS_ParseCode __win32_latin1_to_utf8(char** target, const char *s) if (intermediate == NULL) return PARSE_E_NO_MEM; - if (MultiByteToWideChar(28591, MB_ERR_INVALID_CHARS, s, -1, intermediate, 0) == 0) { + if (MultiByteToWideChar(28591, MB_COMPOSITE, s, -1, intermediate, 0) == 0) { PR_DEBUGF("Convert MultiByteToWideChar() error 0x%x\n", GetLastError()); return PARSE_E_INTERNAL; } -- 2.43.5