Fix MsiDatabaseIsTablePersistentA/W prototype

Update msi_ros.diff file for upcoming update

svn path=/trunk/; revision=24001
This commit is contained in:
Hervé Poussineau 2006-09-09 17:42:28 +00:00
parent 8e420b3974
commit b5957ce896
3 changed files with 5270 additions and 5276 deletions

View file

@ -2422,13 +2422,7 @@ Index: msi.rbuild
===================================================================
--- msi.rbuild (revision 23808)
+++ msi.rbuild (working copy)
@@ -1,4 +1,5 @@
<module name="msi" type="win32dll" baseaddress="${BASEADDRESS_MSI}" installbase="system32" installname="msi.dll" allowwarnings="true">
+ <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
<importlibrary definition="msi.spec.def" />
<include base="msi">.</include>
<include base="ReactOS">include/reactos/wine</include>
@@ -28,6 +29,7 @@
@@ -29,6 +29,7 @@
<file>alter.c</file>
<file>appsearch.c</file>
<file>classes.c</file>
@ -2436,7 +2430,7 @@ Index: msi.rbuild
<file>create.c</file>
<file>custom.c</file>
<file>database.c</file>
@@ -53,6 +55,7 @@
@@ -54,6 +55,7 @@
<file>regsvr.c</file>
<file>select.c</file>
<file>source.c</file>
@ -5341,7 +5335,7 @@ Index: tokenize.c
===================================================================
--- tokenize.c (revision 23808)
+++ tokenize.c (working copy)
@@ -154,7 +154,7 @@
@@ -156,7 +156,7 @@
static const Keyword aKeywordTable[] = {
{ ABORT_W, TK_ABORT },
{ AFTER_W, TK_AFTER },

View file

@ -867,7 +867,7 @@ UINT WINAPI MsiDatabaseGetPrimaryKeysA(MSIHANDLE hdb,
}
MSICONDITION WINAPI MsiDatabaseIsTablePersistentA(
MSIHANDLE hDatabase, LPSTR szTableName)
MSIHANDLE hDatabase, LPCSTR szTableName)
{
LPWSTR szwTableName = NULL;
MSICONDITION r;
@ -887,7 +887,7 @@ MSICONDITION WINAPI MsiDatabaseIsTablePersistentA(
}
MSICONDITION WINAPI MsiDatabaseIsTablePersistentW(
MSIHANDLE hDatabase, LPWSTR szTableName)
MSIHANDLE hDatabase, LPCWSTR szTableName)
{
FIXME("%lx %s\n", hDatabase, debugstr_w(szTableName));
return MSICONDITION_FALSE;

View file

@ -273,8 +273,8 @@ UINT WINAPI MsiOpenDatabaseW(LPCWSTR, LPCWSTR, MSIHANDLE*);
UINT WINAPI MsiOpenDatabaseA(LPCSTR, LPCSTR, MSIHANDLE*);
#define MsiOpenDatabase WINELIB_NAME_AW(MsiOpenDatabase)
MSICONDITION WINAPI MsiDatabaseIsTablePersistentA(MSIHANDLE, LPSTR);
MSICONDITION WINAPI MsiDatabaseIsTablePersistentW(MSIHANDLE, LPWSTR);
MSICONDITION WINAPI MsiDatabaseIsTablePersistentA(MSIHANDLE, LPCSTR);
MSICONDITION WINAPI MsiDatabaseIsTablePersistentW(MSIHANDLE, LPCWSTR);
#define MsiDatabaseIsTablePersistent WINELIB_NAME_AW(MsiDatabaseIsTablePersistent)
UINT WINAPI MsiSequenceA(MSIHANDLE, LPCSTR, INT);