ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

advpack: Factor out OCX registering into do_ocx_reg.

This commit is contained in:
James Hawkins 2006-04-17 01:51:37 -05:00 committed by Alexandre Julliard
parent 1bc69125af
commit 3f784a7339
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlls/advpack/advpack.c
View File

@ -392,6 +392,22 @@ HRESULT WINAPI RebootCheckOnInstallW(HWND hWnd, LPCWSTR pszINF,
return E_FAIL;
}
/* registers the OCX if do_reg is TRUE, unregisters it otherwise */
HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg)
{
DLLREGISTER reg_func;
if (do_reg)
reg_func = (DLLREGISTER)GetProcAddress(hocx, "DllRegisterServer");
else
reg_func = (DLLREGISTER)GetProcAddress(hocx, "DllUnregisterServer");
if (!reg_func)
return E_FAIL;
return reg_func();
}
/***********************************************************************
* RegisterOCX (ADVPACK.@)
*
@ -419,7 +435,6 @@ HRESULT WINAPI RegisterOCX(HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show)
LPWSTR ocx_filename, str_flags, param;
LPWSTR cmdline_copy, cmdline_ptr;
UNICODE_STRING cmdlineW;
DLLREGISTER pfnRegister;
HRESULT hr = E_FAIL;
HMODULE hm = NULL;
DWORD size;
@ -444,11 +459,7 @@ HRESULT WINAPI RegisterOCX(HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show)
if (!hm)
goto done;
pfnRegister = (DLLREGISTER)GetProcAddress(hm, "DllRegisterServer");
if (!pfnRegister)
goto done;
hr = pfnRegister();
hr = do_ocx_reg(hm, TRUE);
done:
FreeLibrary(hm);