mirror of
https://github.com/reactos/reactos.git
synced 2024-12-29 02:25:17 +00:00
Robert Shearman <rob@codeweavers.com>
- Rename DllRegisterServer and DllUnregisterServer to avoid confusion with the COM functions of different signatures. svn path=/trunk/; revision=15630
This commit is contained in:
parent
2ba2487f4b
commit
99a53a6f13
1 changed files with 4 additions and 4 deletions
|
@ -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)
|
||||||
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)
|
||||||
}
|
}
|
||||||
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)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue