[ros-diffs] [gvg] 15630: Robert Shearman <[e-mail]>

Robert Shearman <rob(a)codeweavers.com>
- Rename DllRegisterServer and DllUnregisterServer to avoid confusion
  with the COM functions of different signatures.
Modified: trunk/reactos/subsys/system/msiexec/msiexec.c
  _____  

Modified: trunk/reactos/subsys/system/msiexec/msiexec.c
--- trunk/reactos/subsys/system/msiexec/msiexec.c	2005-05-28
22:01:15 UTC (rev 15629)
+++ trunk/reactos/subsys/system/msiexec/msiexec.c	2005-05-28
22:04:24 UTC (rev 15630)
@@ -273,7 +273,7 @@

 	return proc;
 }
 
-static DWORD DllRegisterServer(LPCWSTR DllName)
+static DWORD DoDllRegisterServer(LPCWSTR DllName)
 {
 	HRESULT hr;
 	DLLREGISTERSERVER pfDllRegisterServer = NULL;
@@ -293,7 +293,7 @@
 	return 0;
 }
 
-static DWORD DllUnregisterServer(LPCWSTR DllName)
+static DWORD DoDllUnregisterServer(LPCWSTR DllName)
 {
 	HRESULT hr;
 	DLLUNREGISTERSERVER pfDllUnregisterServer = NULL;
@@ -887,11 +887,11 @@
 	}
 	else if(FunctionDllRegisterServer)
 	{
-		ReturnCode = DllRegisterServer(DllName);
+		ReturnCode = DoDllRegisterServer(DllName);
 	}
 	else if(FunctionDllUnregisterServer)
 	{
-		ReturnCode = DllUnregisterServer(DllName);
+		ReturnCode = DoDllUnregisterServer(DllName);
 	}
 	else if (FunctionRegServer)
 	{