Lightly modified commit of lzma sdk version 9.20.android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-dev

The only change from stock lzma sdk is the removal of two
.exe files, which we don't need.

Change-Id: I46287cbc416161e93b449761ebe531acd758cf95

1 files changed, 73 insertions, 0 deletions

diff --git a/CPP/Common/StringConvert.h b/CPP/Common/StringConvert.h
new file mode 100755
index 0000000..1c7a951
--- /dev/null
+++ b/CPP/Common/StringConvert.h
@@ -0,0 +1,73 @@
+// Common/StringConvert.h

+

+#ifndef __COMMON_STRING_CONVERT_H

+#define __COMMON_STRING_CONVERT_H

+

+#include "MyWindows.h"

+#include "MyString.h"

+#include "Types.h"

+

+UString MultiByteToUnicodeString(const AString &srcString, UINT codePage = CP_ACP);

+AString UnicodeStringToMultiByte(const UString &srcString, UINT codePage, char defaultChar, bool &defaultCharWasUsed);

+AString UnicodeStringToMultiByte(const UString &srcString, UINT codePage = CP_ACP);

+

+

+inline const wchar_t* GetUnicodeString(const wchar_t* unicodeString)

+  { return unicodeString; }

+inline const UString& GetUnicodeString(const UString &unicodeString)

+  { return unicodeString; }

+inline UString GetUnicodeString(const AString &ansiString)

+  { return MultiByteToUnicodeString(ansiString); }

+inline UString GetUnicodeString(const AString &multiByteString, UINT codePage)

+  { return MultiByteToUnicodeString(multiByteString, codePage); }

+inline const wchar_t* GetUnicodeString(const wchar_t* unicodeString, UINT)

+  { return unicodeString; }

+inline const UString& GetUnicodeString(const UString &unicodeString, UINT)

+  { return unicodeString; }

+

+inline const char* GetAnsiString(const char* ansiString)

+  { return ansiString; }

+inline const AString& GetAnsiString(const AString &ansiString)

+  { return ansiString; }

+inline AString GetAnsiString(const UString &unicodeString)

+  { return UnicodeStringToMultiByte(unicodeString); }

+

+inline const char* GetOemString(const char* oemString)

+  { return oemString; }

+inline const AString& GetOemString(const AString &oemString)

+  { return oemString; }

+inline AString GetOemString(const UString &unicodeString)

+  { return UnicodeStringToMultiByte(unicodeString, CP_OEMCP); }

+

+

+#ifdef _UNICODE

+  inline const wchar_t* GetSystemString(const wchar_t* unicodeString)

+    { return unicodeString;}

+  inline const UString& GetSystemString(const UString &unicodeString)

+    { return unicodeString;}

+  inline const wchar_t* GetSystemString(const wchar_t* unicodeString, UINT /* codePage */)

+    { return unicodeString;}

+  inline const UString& GetSystemString(const UString &unicodeString, UINT /* codePage */)

+    { return unicodeString;}

+  inline UString GetSystemString(const AString &multiByteString, UINT codePage)

+    { return MultiByteToUnicodeString(multiByteString, codePage);}

+  inline UString GetSystemString(const AString &multiByteString)

+    { return MultiByteToUnicodeString(multiByteString);}

+#else

+  inline const char* GetSystemString(const char *ansiString)

+    { return ansiString; }

+  inline const AString& GetSystemString(const AString &multiByteString, UINT)

+    { return multiByteString; }

+  inline const char * GetSystemString(const char *multiByteString, UINT)

+    { return multiByteString; }

+  inline AString GetSystemString(const UString &unicodeString)

+    { return UnicodeStringToMultiByte(unicodeString); }

+  inline AString GetSystemString(const UString &unicodeString, UINT codePage)

+    { return UnicodeStringToMultiByte(unicodeString, codePage); }

+#endif

+

+#ifndef UNDER_CE

+AString SystemStringToOemString(const CSysString &srcString);

+#endif

+

+#endif