Rob Shearman : msi: Remove some unused functions.
Alexandre Julliard
julliard at winehq.org
Tue Feb 19 08:05:16 CST 2008
Module: wine
Branch: master
Commit: 9b5d3677dff7ffdd974a6c2f5cb9d77b0b92c829
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b5d3677dff7ffdd974a6c2f5cb9d77b0b92c829
Author: Rob Shearman <rob at codeweavers.com>
Date: Mon Feb 18 19:37:18 2008 +0000
msi: Remove some unused functions.
---
dlls/msi/msipriv.h | 2 --
dlls/msi/registry.c | 43 -------------------------------------------
2 files changed, 0 insertions(+), 45 deletions(-)
diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h
index a735025..e23261b 100644
--- a/dlls/msi/msipriv.h
+++ b/dlls/msi/msipriv.h
@@ -749,12 +749,10 @@ extern UINT MSIREG_OpenUninstallKey(LPCWSTR szProduct, HKEY* key, BOOL create);
extern UINT MSIREG_DeleteUninstallKey(LPCWSTR szProduct);
extern UINT MSIREG_OpenUserProductsKey(LPCWSTR szProduct, HKEY* key, BOOL create);
extern UINT MSIREG_OpenUserPatchesKey(LPCWSTR szPatch, HKEY* key, BOOL create);
-extern UINT MSIREG_OpenFeatures(HKEY* key);
extern UINT MSIREG_OpenFeaturesKey(LPCWSTR szProduct, HKEY* key, BOOL create);
extern UINT MSIREG_OpenUserDataFeaturesKey(LPCWSTR szProduct, HKEY *key, BOOL create);
extern UINT MSIREG_OpenComponents(HKEY* key);
extern UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create);
-extern UINT MSIREG_OpenComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create);
extern UINT MSIREG_OpenUserDataComponentKey(LPCWSTR szComponent, HKEY *key, BOOL create);
extern UINT MSIREG_OpenProductsKey(LPCWSTR szProduct, HKEY* key, BOOL create);
extern UINT MSIREG_OpenPatchesKey(LPCWSTR szPatch, HKEY* key, BOOL create);
diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c
index 5c9c251..a3b63b5 100644
--- a/dlls/msi/registry.c
+++ b/dlls/msi/registry.c
@@ -52,14 +52,6 @@ static const WCHAR szUserFeatures_fmt[] = {
'F','e','a','t','u','r','e','s','\\',
'%','s',0};
-static const WCHAR szInstaller_Features[] = {
-'S','o','f','t','w','a','r','e','\\',
-'M','i','c','r','o','s','o','f','t','\\',
-'W','i','n','d','o','w','s','\\',
-'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\',
-'I','n','s','t','a','l','l','e','r','\\',
-'F','e','a','t','u','r','e','s',0 };
-
static const WCHAR szUserDataFeatures_fmt[] = {
'S','o','f','t','w','a','r','e','\\',
'M','i','c','r','o','s','o','f','t','\\',
@@ -87,15 +79,6 @@ static const WCHAR szInstaller_Components[] = {
'I','n','s','t','a','l','l','e','r','\\',
'C','o','m','p','o','n','e','n','t','s',0 };
-static const WCHAR szInstaller_Components_fmt[] = {
-'S','o','f','t','w','a','r','e','\\',
-'M','i','c','r','o','s','o','f','t','\\',
-'W','i','n','d','o','w','s','\\',
-'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\',
-'I','n','s','t','a','l','l','e','r','\\',
-'C','o','m','p','o','n','e','n','t','s','\\',
-'%','s',0};
-
static const WCHAR szUser_Components_fmt[] = {
'S','o','f','t','w','a','r','e','\\',
'M','i','c','r','o','s','o','f','t','\\',
@@ -608,11 +591,6 @@ UINT MSIREG_DeleteUserFeaturesKey(LPCWSTR szProduct)
return RegDeleteTreeW(HKEY_CURRENT_USER, keypath);
}
-UINT MSIREG_OpenFeatures(HKEY* key)
-{
- return RegCreateKeyW(HKEY_LOCAL_MACHINE,szInstaller_Features,key);
-}
-
UINT MSIREG_OpenFeaturesKey(LPCWSTR szProduct, HKEY* key, BOOL create)
{
UINT rc;
@@ -669,27 +647,6 @@ UINT MSIREG_OpenComponents(HKEY* key)
return RegCreateKeyW(HKEY_LOCAL_MACHINE,szInstaller_Components,key);
}
-UINT MSIREG_OpenComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create)
-{
- UINT rc;
- WCHAR squished_cc[GUID_SIZE];
- WCHAR keypath[0x200];
-
- TRACE("%s\n",debugstr_w(szComponent));
- if (!squash_guid(szComponent,squished_cc))
- return ERROR_FUNCTION_FAILED;
- TRACE("squished (%s)\n", debugstr_w(squished_cc));
-
- sprintfW(keypath,szInstaller_Components_fmt,squished_cc);
-
- if (create)
- rc = RegCreateKeyW(HKEY_LOCAL_MACHINE,keypath,key);
- else
- rc = RegOpenKeyW(HKEY_LOCAL_MACHINE,keypath,key);
-
- return rc;
-}
-
UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create)
{
UINT rc;
More information about the wine-cvs
mailing list