Skip to content

W
wine-cw
Commit 733a0333 authored by Robert Shearman's avatar Robert Shearman Committed by Alexandre Julliard
Browse files
Options

Rename DllRegisterServer and DllUnregisterServer to avoid confusion

with the COM functions of different signatures.
parent 714c60f0
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
programs/msiexec/msiexec.c
View file @ 733a0333
...@@ -273,7 +273,7 @@ static VOID *LoadProc(LPCWSTR DllName, LPCSTR ProcName, HMODULE* DllHandle) ...@@ -273,7 +273,7 @@ static VOID *LoadProc(LPCWSTR DllName, LPCSTR ProcName, HMODULE* DllHandle)
return proc; return proc;
} }
static DWORD DllRegisterServer(LPCWSTR DllName) static DWORD DoDllRegisterServer(LPCWSTR DllName)
{ {
HRESULT hr; HRESULT hr;
DLLREGISTERSERVER pfDllRegisterServer = NULL; DLLREGISTERSERVER pfDllRegisterServer = NULL;
...@@ -293,7 +293,7 @@ static DWORD DllRegisterServer(LPCWSTR DllName) ...@@ -293,7 +293,7 @@ static DWORD DllRegisterServer(LPCWSTR DllName)
return 0; return 0;
} }
static DWORD DllUnregisterServer(LPCWSTR DllName) static DWORD DoDllUnregisterServer(LPCWSTR DllName)
{ {
HRESULT hr; HRESULT hr;
DLLUNREGISTERSERVER pfDllUnregisterServer = NULL; DLLUNREGISTERSERVER pfDllUnregisterServer = NULL;
...@@ -887,11 +887,11 @@ int main(int argc, char **argv) ...@@ -887,11 +887,11 @@ int main(int argc, char **argv)
} }
else if(FunctionDllRegisterServer) else if(FunctionDllRegisterServer)
{ {
ReturnCode = DllRegisterServer(DllName); ReturnCode = DoDllRegisterServer(DllName);
} }
else if(FunctionDllUnregisterServer) else if(FunctionDllUnregisterServer)
{ {
ReturnCode = DllUnregisterServer(DllName); ReturnCode = DoDllUnregisterServer(DllName);
} }
else if (FunctionRegServer) else if (FunctionRegServer)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment