wine/ include/msi.h dlls/msi/msi.spec dlls/msi ...

[Alexandre Julliard]

ChangeSet ID:	21049
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	[e-mail]	2005/11/02 13:54:31

Modified files:
    include        : msi.h 
    dlls/msi       : msi.spec msi.c

Log message:
    Mike McCormack 
    Stub implementation for MsiAdvertiseScriptA/W.

Patch: http://cvs.winehq.org/patch.py?id=21049

Old revision  New revision  Changes     Path
 1.34          1.35          +16 -0      wine/include/msi.h
 1.49          1.50          +2 -2       wine/dlls/msi/msi.spec
 1.112         1.113         +22 -0      wine/dlls/msi/msi.c

Index: wine/include/msi.h
diff -u -p wine/include/msi.h:1.34 wine/include/msi.h:1.35
--- wine/include/msi.h:1.34	2 Nov 2005 19:54:31 -0000
+++ wine/include/msi.h	2 Nov 2005 19:54:31 -0000
@@ -152,6 +152,18 @@ typedef enum tagADVERTISEFLAGS
     ADVERTISEFLAGS_USERASSIGN = 1
 } ADVERTISEFLAGS;

+typedef enum tagSCRIPTFLAGS
+{
+    SCRIPTFLAGS_CACHEINFO = 1,
+    SCRIPTFLAGS_SHORTCUTS = 4,
+    SCRIPTFLAGS_MACHINEASSIGN = 8,
+    SCRIPTFLAGS_REGDATA_APPINFO = 0x10,
+    SCRIPTFLAGS_REGDATA_CNFGINFO = 0x20,
+    SCRIPTFLAGS_VALIDATE_TRANSFORMS_LIST = 0x40,
+    SCRIPTFLAGS_REGDATA_CLASSINFO = 0x80,
+    SCRIPTFLAGS_REGDATA_EXTENSIONINFO = 0x100,
+} SCRIPTFLAGS;
+
 typedef enum tagINSTALLTYPE
 {
     INSTALLTYPE_DEFAULT = 0,
@@ -540,6 +552,10 @@ UINT WINAPI MsiGetFileHashA(LPCSTR, DWOR
 UINT WINAPI MsiGetFileHashW(LPCWSTR, DWORD, PMSIFILEHASHINFO);
 #define     MsiGetFileHash WINELIB_NAME_AW(MsiGetFileHash)

+UINT WINAPI MsiAdvertiseScriptA(LPCSTR, DWORD, PHKEY, BOOL);
+UINT WINAPI MsiAdvertiseScriptW(LPCWSTR, DWORD, PHKEY, BOOL);
+#define     MsiAdvertiseScript WINELIB_NAME_AW(MsiAdvertiseScript)
+
 /* Non Unicode */
 UINT WINAPI MsiCloseHandle(MSIHANDLE);
 UINT WINAPI MsiCloseAllHandles(void);
Index: wine/dlls/msi/msi.spec
diff -u -p wine/dlls/msi/msi.spec:1.49 wine/dlls/msi/msi.spec:1.50
--- wine/dlls/msi/msi.spec:1.49	2 Nov 2005 19:54:31 -0000
+++ wine/dlls/msi/msi.spec	2 Nov 2005 19:54:31 -0000
@@ -169,8 +169,8 @@
 173 stdcall MsiGetComponentPathW(wstr wstr ptr ptr)
 174 stdcall MsiApplyPatchA(str str long str)
 175 stdcall MsiApplyPatchW(wstr wstr long wstr)
-176 stub MsiAdvertiseScriptA
-177 stub MsiAdvertiseScriptW
+176 stdcall MsiAdvertiseScriptA(str long ptr long)
+177 stdcall MsiAdvertiseScriptW(wstr long ptr long)
 178 stub MsiGetPatchInfoA
 179 stub MsiGetPatchInfoW
 180 stdcall MsiEnumPatchesA(str long ptr ptr ptr)
Index: wine/dlls/msi/msi.c
diff -u -p wine/dlls/msi/msi.c:1.112 wine/dlls/msi/msi.c:1.113
--- wine/dlls/msi/msi.c:1.112	2 Nov 2005 19:54:31 -0000
+++ wine/dlls/msi/msi.c	2 Nov 2005 19:54:31 -0000
@@ -2008,3 +2008,25 @@ UINT WINAPI MsiGetFileHashA( LPCSTR szFi
     FIXME("%s %08lx %p\n", debugstr_a(szFilePath), dwOptions, pHash );
     return ERROR_CALL_NOT_IMPLEMENTED;
 }
+
+/***********************************************************************
+ * MsiAdvertiseScriptW        [MSI.@]
+ */
+UINT WINAPI MsiAdvertiseScriptW( LPCWSTR szScriptFile, DWORD dwFlags,
+                                 PHKEY phRegData, BOOL fRemoveItems )
+{
+    FIXME("%s %08lx %p %d\n",
+          debugstr_w( szScriptFile ), dwFlags, phRegData, fRemoveItems );
+    return ERROR_CALL_NOT_IMPLEMENTED;
+}
+
+/***********************************************************************
+ * MsiAdvertiseScriptA        [MSI.@]
+ */
+UINT WINAPI MsiAdvertiseScriptA( LPCSTR szScriptFile, DWORD dwFlags,
+                                 PHKEY phRegData, BOOL fRemoveItems )
+{
+    FIXME("%s %08lx %p %d\n",
+          debugstr_a( szScriptFile ), dwFlags, phRegData, fRemoveItems );
+    return ERROR_CALL_NOT_IMPLEMENTED;
+}