X-Git-Url: https://git.sven.stormbind.net/?p=sven%2Fexfat-utils.git;a=blobdiff_plain;f=libexfat%2Futf.c;h=983c7930ba856e359ce12137edffb3eaa93d0458;hp=3f0dc1971ba04368a414112c3eec81bb1c9d00d4;hb=70a4b10edcf53a90140e6dd80ccaa045f3647ad7;hpb=9799d681703e3a63dbbf876c16c9bb51b20c8fab

diff --git a/libexfat/utf.c b/libexfat/utf.c
index 3f0dc19..983c793 100644
--- a/libexfat/utf.c
+++ b/libexfat/utf.c
@@ -2,7 +2,7 @@
 	utf.c (13.09.09)
 	exFAT file system implementation library.
 
-	Copyright (C) 2009, 2010  Andrew Nayenko
+	Copyright (C) 2010-2012  Andrew Nayenko
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -89,6 +89,7 @@ static const le16_t* utf16_to_wchar(const le16_t* input, wchar_t* wc,
 			return NULL;
 		*wc = ((wchar_t) (le16_to_cpu(input[0]) & 0x3ff) << 10);
 		*wc |= (le16_to_cpu(input[1]) & 0x3ff);
+		*wc += 0x10000;
 		return input + 2;
 	}
 	else
@@ -186,6 +187,7 @@ static le16_t* wchar_to_utf16(le16_t* output, wchar_t wc, size_t outsize)
 	}
 	if (outsize < 2)
 		return NULL;
+	wc -= 0x10000;
 	output[0] = cpu_to_le16(0xd800 | ((wc >> 10) & 0x3ff));
 	output[1] = cpu_to_le16(0xdc00 | (wc & 0x3ff));
 	return output + 2;