ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Define MSIDBOPEN_ constants using LPCWSTR when compiling Wine.

This commit is contained in:
Mike McCormack 2005-10-30 19:21:51 +00:00 committed by Alexandre Julliard
parent fa292e4bb2
commit ec5edeebf4
5 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/msi/action.c
View File

@ -46,8 +46,6 @@ http://msdn.microsoft.com/library/default.asp?url=/library/en-us/msi/setup/stand
#define REG_PROGRESS_VALUE 13200 #define REG_PROGRESS_VALUE 13200
#define COMPONENT_PROGRESS_VALUE 24000 #define COMPONENT_PROGRESS_VALUE 24000
#define LPCTSTR LPCWSTR
WINE_DEFAULT_DEBUG_CHANNEL(msi); WINE_DEFAULT_DEBUG_CHANNEL(msi);
/* /*

8
dlls/msi/database.c
View File

@ -38,14 +38,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(msi); WINE_DEFAULT_DEBUG_CHANNEL(msi);
/*
* The MSVC headers define the MSIDBOPEN_* macros cast to LPCTSTR,
* which is a problem because LPCTSTR isn't defined when compiling wine.
* To work around this problem, we need to define LPCTSTR as LPCWSTR here,
* and make sure to only use it in W functions.
*/
#define LPCTSTR LPCWSTR
DEFINE_GUID( CLSID_MsiDatabase, 0x000c1084, 0x0000, 0x0000, DEFINE_GUID( CLSID_MsiDatabase, 0x000c1084, 0x0000, 0x0000,
0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46);
DEFINE_GUID( CLSID_MsiPatch, 0x000c1086, 0x0000, 0x0000, DEFINE_GUID( CLSID_MsiPatch, 0x000c1086, 0x0000, 0x0000,

8
dlls/msi/msi.c
View File

@ -43,14 +43,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(msi); WINE_DEFAULT_DEBUG_CHANNEL(msi);
/*
* The MSVC headers define the MSIDBOPEN_* macros cast to LPCTSTR,
* which is a problem because LPCTSTR isn't defined when compiling wine.
* To work around this problem, we need to define LPCTSTR as LPCWSTR here,
* and make sure to only use it in W functions.
*/
#define LPCTSTR LPCWSTR
/* the UI level */ /* the UI level */
INSTALLUILEVEL gUILevel = INSTALLUILEVEL_BASIC; INSTALLUILEVEL gUILevel = INSTALLUILEVEL_BASIC;
HWND gUIhwnd = 0; HWND gUIhwnd = 0;

8
dlls/msi/package.c
View File

@ -41,14 +41,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(msi); WINE_DEFAULT_DEBUG_CHANNEL(msi);
/*
* The MSVC headers define the MSIDBOPEN_* macros cast to LPCTSTR,
* which is a problem because LPCTSTR isn't defined when compiling wine.
* To work around this problem, we need to define LPCTSTR as LPCWSTR here,
* and make sure to only use it in W functions.
*/
#define LPCTSTR LPCWSTR
static void MSI_FreePackage( MSIOBJECTHDR *arg) static void MSI_FreePackage( MSIOBJECTHDR *arg)
{ {
MSIPACKAGE *package= (MSIPACKAGE*) arg; MSIPACKAGE *package= (MSIPACKAGE*) arg;

8
include/msiquery.h
View File

@ -53,11 +53,19 @@ typedef enum tagMSIMODIFY
MSIMODIFY_VALIDATE_DELETE = 11 MSIMODIFY_VALIDATE_DELETE = 11
} MSIMODIFY; } MSIMODIFY;
#ifndef __WINESRC__
#define MSIDBOPEN_READONLY (LPCTSTR)0 #define MSIDBOPEN_READONLY (LPCTSTR)0
#define MSIDBOPEN_TRANSACT (LPCTSTR)1 #define MSIDBOPEN_TRANSACT (LPCTSTR)1
#define MSIDBOPEN_DIRECT (LPCTSTR)2 #define MSIDBOPEN_DIRECT (LPCTSTR)2
#define MSIDBOPEN_CREATE (LPCTSTR)3 #define MSIDBOPEN_CREATE (LPCTSTR)3
#define MSIDBOPEN_CREATEDIRECT (LPCTSTR)4 #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
typedef enum tagMSIRUNMODE typedef enum tagMSIRUNMODE
{ {