diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index b6563e2fffb..be7f6038e66 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1635,8 +1635,20 @@ UINT WINAPI MsiGetUserInfoW(LPCWSTR szProduct, LPWSTR lpUserNameBuf, 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; } diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index b06593a4afd..6b95de654cb 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -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) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index ea80fa561ba..12344bc58b7 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -289,8 +289,9 @@ extern BOOL TABLE_Exists( MSIDATABASE *db, LPWSTR name ); 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 */ diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index d0916a7eb49..61c03c63e5c 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -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