From 4a202c21123924ed5fab6089741adff28bc93dd3 Mon Sep 17 00:00:00 2001 From: Mike McCormack Date: Fri, 16 Sep 2005 18:45:04 +0000 Subject: [PATCH] Fix the stub for MsiConfigureFeature. --- dlls/msi/msi.c | 16 +++++++++++++--- dlls/msi/msi.spec | 4 ++-- include/msi.h | 4 ++++ 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index c73d8cc4b1f..eae8018037b 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1696,14 +1696,24 @@ UINT WINAPI MsiCollectUserInfoA(LPCSTR szProduct) return rc; } -UINT WINAPI MsiConfigureFeatureW(LPWSTR szProduct, LPWSTR szFeature, INSTALLSTATE eInstallState) +/*********************************************************************** + * MsiConfigureFeatureA [MSI.@] + */ +UINT WINAPI MsiConfigureFeatureA(LPCSTR szProduct, LPCSTR szFeature, INSTALLSTATE eInstallState) +{ + FIXME("%s %s %i\n", debugstr_a(szProduct), debugstr_a(szFeature), eInstallState); + return ERROR_SUCCESS; +} + +/*********************************************************************** + * MsiConfigureFeatureW [MSI.@] + */ +UINT WINAPI MsiConfigureFeatureW(LPCWSTR szProduct, LPCWSTR szFeature, INSTALLSTATE eInstallState) { FIXME("%s %s %i\n", debugstr_w(szProduct), debugstr_w(szFeature), eInstallState); return ERROR_SUCCESS; } - - UINT WINAPI MsiCreateAndVerifyInstallerDirectory(DWORD dwReserved) { WCHAR path[MAX_PATH]; diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index e1ce430112b..86ea0174b5c 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -4,10 +4,10 @@ 8 stdcall MsiCloseHandle(long) 9 stdcall MsiCollectUserInfoA(str) 10 stdcall MsiCollectUserInfoW(wstr) -11 stub MsiConfigureFeatureA +11 stdcall MsiConfigureFeatureA(str str long) 12 stub MsiConfigureFeatureFromDescriptorA 13 stub MsiConfigureFeatureFromDescriptorW -14 stdcall MsiConfigureFeatureW(str str ptr) +14 stdcall MsiConfigureFeatureW(wstr wstr ptr) 15 stdcall MsiConfigureProductA(str long long) 16 stdcall MsiConfigureProductW(wstr long long) 17 stdcall MsiCreateRecord(long) diff --git a/include/msi.h b/include/msi.h index 8285d88e927..e889ace6df4 100644 --- a/include/msi.h +++ b/include/msi.h @@ -418,6 +418,10 @@ UINT WINAPI MsiConfigureProductExA(LPCSTR, int, INSTALLSTATE, LPCSTR); UINT WINAPI MsiConfigureProductExW(LPCWSTR, int, INSTALLSTATE, LPCWSTR); #define MsiConfigureProductEx WINELIB_NAME_AW(MsiConfigureProductEx); +UINT WINAPI MsiConfigureFeatureA(LPCSTR, LPCSTR, INSTALLSTATE); +UINT WINAPI MsiConfigureFeatureW(LPCWSTR, LPCWSTR, INSTALLSTATE); +#define MsiConfigureFeature WINELIB_NAME_AW(MsiConfigureFeature); + UINT WINAPI MsiGetProductCodeA(LPCSTR, LPSTR); UINT WINAPI MsiGetProductCodeW(LPCWSTR, LPWSTR); #define MsiGetProductCode WINELIB_NAME_AW(MsiGetProductCode)