MSI: add a few more stub implementations

Mike McCormack mike at codeweavers.com
Tue Jan 25 21:16:13 CST 2005


This patch syncs the state of MSI in the CodeWeavers CVS tree with that 
in the WineHQ CVS.

Mike


ChangeLog:
Aric Stewart <aric at codeweavers.com>
* add a few more stub implementations
-------------- next part --------------
Index: dlls/msi/msi.c
===================================================================
RCS file: /home/wine/wine/dlls/msi/msi.c,v
retrieving revision 1.54
diff -u -p -r1.54 msi.c
--- dlls/msi/msi.c	25 Jan 2005 10:58:36 -0000	1.54
+++ dlls/msi/msi.c	26 Jan 2005 03:14:35 -0000
@@ -1635,8 +1635,20 @@ UINT WINAPI MsiGetUserInfoW(LPCWSTR szPr
     return USERINFOSTATE_UNKNOWN; 
 }
 
-UINT WINAPI MsiCollectUserInfoW(LPWSTR szProduct)
+UINT WINAPI MsiCollectUserInfoW(LPCWSTR szProduct)
 {
     FIXME("%s\n",debugstr_w(szProduct));
-    return ERROR_FUNCTION_FAILED;
+    return ERROR_CALL_NOT_IMPLEMENTED;
+}
+
+UINT WINAPI MsiCollectUserInfoA(LPCSTR szProduct)
+{
+    FIXME("%s\n",debugstr_a(szProduct));
+    return ERROR_CALL_NOT_IMPLEMENTED;
+}
+
+UINT WINAPI MsiCreateAndVerifyInstallerDirectory(void)
+{
+    FIXME("\n");
+    return ERROR_CALL_NOT_IMPLEMENTED;
 }
Index: dlls/msi/msi.spec
===================================================================
RCS file: /home/wine/wine/dlls/msi/msi.spec,v
retrieving revision 1.29
diff -u -p -r1.29 msi.spec
--- dlls/msi/msi.spec	25 Jan 2005 16:41:33 -0000	1.29
+++ dlls/msi/msi.spec	26 Jan 2005 03:14:35 -0000
@@ -6,7 +6,7 @@
 6 stdcall MsiAdvertiseProductW(wstr wstr wstr long)
 7 stdcall MsiCloseAllHandles()
 8 stdcall MsiCloseHandle(long)
-9 stub MsiCollectUserInfoA
+9 stdcall MsiCollectUserInfoA(str)
 10 stdcall MsiCollectUserInfoW(wstr)
 11 stub MsiConfigureFeatureA
 12 stub MsiConfigureFeatureFromDescriptorA
@@ -186,8 +186,8 @@
 186 stub MsiCreateTransformSummaryInfoW
 187 stub MsiQueryFeatureStateFromDescriptorA
 188 stub MsiQueryFeatureStateFromDescriptorW
-189 stub MsiConfigureProductExA
-190 stdcall MsiConfigureProductExW (wstr long long wstr)
+189 stdcall MsiConfigureProductExA(str long long str)
+190 stdcall MsiConfigureProductExW(wstr long long wstr)
 191 stub MsiInvalidateFeatureCache
 192 stub MsiUseFeatureExA
 193 stdcall MsiUseFeatureExW(wstr wstr long long)
@@ -197,8 +197,8 @@
 197 stdcall MsiLoadStringW(long long long long long)
 198 stdcall MsiMessageBoxA(long long long long long long)
 199 stdcall MsiMessageBoxW(long long long long long long)
-200 stdcall MsiDecomposeDescriptorA(str str ptr ptr ptr)
-201 stdcall MsiDecomposeDescriptorW(wstr wstr ptr ptr ptr)
+200 stdcall MsiDecomposeDescriptorA(str ptr ptr ptr ptr)
+201 stdcall MsiDecomposeDescriptorW(wstr ptr ptr ptr ptr)
 202 stub MsiProvideQualifiedComponentExA
 203 stdcall MsiProvideQualifiedComponentExW(wstr wstr long wstr long long ptr ptr)
 204 stdcall MsiEnumRelatedProductsA(str long long ptr)
@@ -219,7 +219,7 @@
 219 stub MsiGetFileHashW
 220 stub MsiEnumComponentCostsA
 221 stub MsiEnumComponentCostsW
-222 stub MsiCreateAndVerifyInstallerDirectory
+222 stdcall MsiCreateAndVerifyInstallerDirectory()
 223 stdcall MsiGetFileSignatureInformationA(str long ptr ptr ptr)
 224 stdcall MsiGetFileSignatureInformationW(wstr long ptr ptr ptr)
 225 stdcall MsiProvideAssemblyA(str str long long str ptr)
Index: dlls/msi/msipriv.h
===================================================================
RCS file: /home/wine/wine/dlls/msi/msipriv.h,v
retrieving revision 1.41
diff -u -p -r1.41 msipriv.h
--- dlls/msi/msipriv.h	25 Jan 2005 20:17:09 -0000	1.41
+++ dlls/msi/msipriv.h	26 Jan 2005 03:14:35 -0000
@@ -289,8 +289,9 @@ extern BOOL TABLE_Exists( MSIDATABASE *d
 
 extern UINT read_raw_stream_data( MSIDATABASE*, LPCWSTR stname,
                               USHORT **pdata, UINT *psz );
+
+/* action internals */
 extern UINT ACTION_DoTopLevelINSTALL( MSIPACKAGE *, LPCWSTR, LPCWSTR );
-extern void ACTION_remove_tracked_tempfiles( MSIPACKAGE* );
 extern void ACTION_free_package_structures( MSIPACKAGE* );
 
 /* record internals */
Index: dlls/msi/registry.c
===================================================================
RCS file: /home/wine/wine/dlls/msi/registry.c,v
retrieving revision 1.2
diff -u -p -r1.2 registry.c
--- dlls/msi/registry.c	25 Jan 2005 16:41:33 -0000	1.2
+++ dlls/msi/registry.c	26 Jan 2005 03:14:35 -0000
@@ -1,7 +1,7 @@
 /*
  * Implementation of the Microsoft Installer (msi.dll)
  *
- * Copyright 2005 Mike McCormak for CodeWeavers
+ * Copyright 2005 Mike McCormack for CodeWeavers
  * Copyright 2005 Aric Stewart for CodeWeavers
  *
  * This library is free software; you can redistribute it and/or


More information about the wine-patches mailing list