Jacek Caban : hhctrl.ocx: Clean up Help_WndProc.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 803cf4f40c7b14e3ce4d0b70cdd1d06a3d7e44c2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=803cf4f40c7b14e3ce4d0b70cd...

Author: Jacek Caban 
Date:   Wed Feb 28 03:51:59 2007 +0100

hhctrl.ocx: Clean up Help_WndProc.

---

dlls/hhctrl.ocx/help.c |   40 +++++++++++++++++-----------------------
 1 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c
index 5e327ed..fb9eca8 100644
--- a/dlls/hhctrl.ocx/help.c
+++ b/dlls/hhctrl.ocx/help.c
@@ -30,7 +30,7 @@

WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);

-static void Help_OnSize(HWND hWnd);
+static LRESULT Help_OnSize(HWND hWnd);

/* Window type defaults */

@@ -584,14 +584,14 @@ static BOOL HH_AddHTMLPane(HHInfo *pHHInfo)

/* Viewer Window */

-static void Help_OnSize(HWND hWnd)
+static LRESULT Help_OnSize(HWND hWnd)
 {
     HHInfo *pHHInfo = (HHInfo *)GetWindowLongPtrW(hWnd, GWLP_USERDATA);
     DWORD dwSize;
     RECT rc;

if (!pHHInfo)
-        return;
+        return 0;

NP_GetNavigationRect(pHHInfo, &rc);
     SetWindowPos(pHHInfo->WinType.hwndNavigation, HWND_TOP, 0, 0,
@@ -613,32 +613,26 @@ static void Help_OnSize(HWND hWnd)
     /* Resize browser window taking the frame size into account */
     dwSize = GetSystemMetrics(SM_CXFRAME);
     ResizeWebBrowser(pHHInfo, rc.right - dwSize, rc.bottom - dwSize);
+
+    return 0;
 }

static LRESULT CALLBACK Help_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
-    PAINTSTRUCT ps;
-    HDC hdc;
-
     switch (message)
     {
-        case WM_COMMAND:
-            if (HIWORD(wParam) == BN_CLICKED)
-                TB_OnClick(hWnd, LOWORD(wParam));
-            break;
-        case WM_SIZE:
-            Help_OnSize(hWnd);
-            break;
-        case WM_PAINT:
-            hdc = BeginPaint(hWnd, &ps);
-            EndPaint(hWnd, &ps);
-            break;
-        case WM_DESTROY:
-            PostQuitMessage(0);
-            break;
-
-        default:
-            return DefWindowProcW(hWnd, message, wParam, lParam);
+    case WM_COMMAND:
+        if (HIWORD(wParam) == BN_CLICKED)
+            TB_OnClick(hWnd, LOWORD(wParam));
+        break;
+    case WM_SIZE:
+        return Help_OnSize(hWnd);
+    case WM_DESTROY:
+        PostQuitMessage(0);
+        break;
+
+    default:
+        return DefWindowProcW(hWnd, message, wParam, lParam);
     }

return 0;