James Hawkins : advpack: Fix the return type of RegisterOCX.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 940af1b41cdbf6652a63cac56a0e52f6dae26801
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=940af1b41cdbf6652a63cac56a0e52f6dae26801

Author: James Hawkins <truiken at gmail.com>
Date:   Mon Apr 17 01:48:34 2006 -0500

advpack: Fix the return type of RegisterOCX.

---

 dlls/advpack/advpack.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c
index eb8ca31..198480d 100644
--- a/dlls/advpack/advpack.c
+++ b/dlls/advpack/advpack.c
@@ -404,7 +404,8 @@ HRESULT WINAPI RebootCheckOnInstallW(HWN
  *   show    [I] How the window should be shown.
  *
  * RETURNS
- *   This function does not return anything.
+ *   Success: S_OK.
+ *   Failure: E_FAIL.
  *
  * NOTES
  *   OCX - Filename of the OCX to register.
@@ -413,7 +414,7 @@ HRESULT WINAPI RebootCheckOnInstallW(HWN
  *    'N' No reboot.
  *   install_cmd - Command line to pass to the OCX's DllInstall.
  */
-void WINAPI RegisterOCX(HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show)
+HRESULT WINAPI RegisterOCX(HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show)
 {
     WCHAR wszBuff[MAX_PATH];
     WCHAR* pwcComma;
@@ -432,7 +433,7 @@ void WINAPI RegisterOCX(HWND hWnd, HINST
     if (!hm)
     {
         ERR("Couldn't load DLL: %s\n", debugstr_w(wszBuff));
-        return;
+        return E_FAIL;
     }
 
     pfnRegister = (DLLREGISTER)GetProcAddress(hm, "DllRegisterServer");
@@ -452,6 +453,7 @@ void WINAPI RegisterOCX(HWND hWnd, HINST
     TRACE("Successfully registered OCX\n");
 
     FreeLibrary(hm);
+    return S_OK;
 }
 
 /***********************************************************************