From: Gé van Geldorp <ge@gse.nl>
Date: Sat, 28 May 2005 22:04:24 +0000 (+0000)
Subject: Robert Shearman <rob@codeweavers.com>
X-Git-Tag: backups/xen@40467^2~79
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=99a53a6f13036261f8407187188b7a8cc4efa70c

Robert Shearman <rob@codeweavers.com>
- Rename DllRegisterServer and DllUnregisterServer to avoid confusion
  with the COM functions of different signatures.

svn path=/trunk/; revision=15630
---

diff --git a/reactos/subsys/system/msiexec/msiexec.c b/reactos/subsys/system/msiexec/msiexec.c
index cecb7a78ed2..f20f29b3f12 100644
--- a/reactos/subsys/system/msiexec/msiexec.c
+++ b/reactos/subsys/system/msiexec/msiexec.c
@@ -273,7 +273,7 @@ static VOID *LoadProc(LPCWSTR DllName, LPCSTR ProcName, HMODULE* DllHandle)
 	return proc;
 }
 
-static DWORD DllRegisterServer(LPCWSTR DllName)
+static DWORD DoDllRegisterServer(LPCWSTR DllName)
 {
 	HRESULT hr;
 	DLLREGISTERSERVER pfDllRegisterServer = NULL;
@@ -293,7 +293,7 @@ static DWORD DllRegisterServer(LPCWSTR DllName)
 	return 0;
 }
 
-static DWORD DllUnregisterServer(LPCWSTR DllName)
+static DWORD DoDllUnregisterServer(LPCWSTR DllName)
 {
 	HRESULT hr;
 	DLLUNREGISTERSERVER pfDllUnregisterServer = NULL;
@@ -887,11 +887,11 @@ int main(int argc, char **argv)
 	}
 	else if(FunctionDllRegisterServer)
 	{
-		ReturnCode = DllRegisterServer(DllName);
+		ReturnCode = DoDllRegisterServer(DllName);
 	}
 	else if(FunctionDllUnregisterServer)
 	{
-		ReturnCode = DllUnregisterServer(DllName);
+		ReturnCode = DoDllUnregisterServer(DllName);
 	}
 	else if (FunctionRegServer)
 	{