summaryrefslogtreecommitdiffstats
path: root/libmsi
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2012-10-22 11:00:13 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2012-10-22 14:18:59 +0200
commit3dc2025a38b7fccd3cec8990bf46710009c9fa38 (patch)
tree023449bb9ce888595fa6b1df08962caebdb433d2 /libmsi
parent68d68359140097c626a5f10e322b8ba7e9fb723d (diff)
downloadmsitools-3dc2025a38b7fccd3cec8990bf46710009c9fa38.tar.gz
msitools-3dc2025a38b7fccd3cec8990bf46710009c9fa38.tar.xz
msitools-3dc2025a38b7fccd3cec8990bf46710009c9fa38.zip
Wine source code uses Unicode
Diffstat (limited to 'libmsi')
-rw-r--r--libmsi/Makefile.am2
-rw-r--r--libmsi/msiquery.h8
2 files changed, 1 insertions, 9 deletions
diff --git a/libmsi/Makefile.am b/libmsi/Makefile.am
index 599b84f..eb1c60c 100644
--- a/libmsi/Makefile.am
+++ b/libmsi/Makefile.am
@@ -1,6 +1,6 @@
lib_LTLIBRARIES = libmsi.la
-AM_CPPFLAGS = -I$(srcdir) -I. -D__WINESRC__
+AM_CPPFLAGS = -I$(srcdir) -I. -D__WINESRC__ -DUNICODE -D_UNICODE
AM_YFLAGS = -d
BUILT_SOURCES = msiserver.h msiserver_i.c sql-parser.c sql-parser.h cond-parser.c cond-parser.h
diff --git a/libmsi/msiquery.h b/libmsi/msiquery.h
index 99c1439..eb8ff8d 100644
--- a/libmsi/msiquery.h
+++ b/libmsi/msiquery.h
@@ -62,19 +62,11 @@ typedef enum tagMSIMODIFY
MSIMODIFY_VALIDATE_DELETE = 11
} MSIMODIFY;
-#ifndef WINE_NO_UNICODE_MACROS
-#define MSIDBOPEN_READONLY (LPCTSTR)0
-#define MSIDBOPEN_TRANSACT (LPCTSTR)1
-#define MSIDBOPEN_DIRECT (LPCTSTR)2
-#define MSIDBOPEN_CREATE (LPCTSTR)3
-#define MSIDBOPEN_CREATEDIRECT (LPCTSTR)4
-#else
#define MSIDBOPEN_READONLY (LPCWSTR)0
#define MSIDBOPEN_TRANSACT (LPCWSTR)1
#define MSIDBOPEN_DIRECT (LPCWSTR)2
#define MSIDBOPEN_CREATE (LPCWSTR)3
#define MSIDBOPEN_CREATEDIRECT (LPCWSTR)4
-#endif
#define MSIDBOPEN_PATCHFILE 32 / sizeof(*MSIDBOPEN_READONLY)