[PATCH 2/2] credui: Remove unneeded parameter from CredDialogHideBalloonTip

Detlef Riekenberg wine.dev at web.de
Thu Jul 5 17:35:50 CDT 2012


There is no reason the read the cred_dialog_params from the
dialog userdata in every call to CredDialogHideBalloonTip

Receive the params only once in CredDialogHideBalloonTip
is enough.

--
By by ... Detlef
---
 dlls/credui/credui_main.c |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c
index 1409c20..31475d4 100644
--- a/dlls/credui/credui_main.c
+++ b/dlls/credui/credui_main.c
@@ -316,9 +316,10 @@ static void CredDialogShowCapsLockBalloon(HWND hwndDlg, struct cred_dialog_param
     params->fBalloonTipActive = TRUE;
 }
 
-static void CredDialogHideBalloonTip(HWND hwndDlg, struct cred_dialog_params *params)
+static void CredDialogHideBalloonTip(HWND hwndDlg)
 {
     TTTOOLINFOW toolinfo;
+    struct cred_dialog_params *params = (struct cred_dialog_params *)GetWindowLongPtrW(hwndDlg, DWLP_USER);
 
     if (!params->hwndBalloonTip)
         return;
@@ -353,7 +354,7 @@ static LRESULT CALLBACK CredDialogPasswordSubclassProc(HWND hwnd, UINT uMsg,
             if (CredDialogCapsLockOn())
                 CredDialogShowCapsLockBalloon(hwndDlg, params);
             else
-                CredDialogHideBalloonTip(hwndDlg, params);
+                CredDialogHideBalloonTip(hwndDlg);
         }
         break;
     case WM_DESTROY:
@@ -508,19 +509,14 @@ static INT_PTR CALLBACK CredDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam,
                     return TRUE;
                 case MAKELONG(IDC_PASSWORD, EN_KILLFOCUS):
                 {
-                    struct cred_dialog_params *params =
-                        (struct cred_dialog_params *)GetWindowLongPtrW(hwndDlg, DWLP_USER);
                     /* the user is no longer typing their password, so allow
                      * other windows to become foreground ones */
                     LockSetForegroundWindow(LSFW_UNLOCK);
-                    CredDialogHideBalloonTip(hwndDlg, params);
-                    return TRUE;
                 }
+                /* fall through */
                 case MAKELONG(IDC_PASSWORD, EN_CHANGE):
                 {
-                    struct cred_dialog_params *params =
-                        (struct cred_dialog_params *)GetWindowLongPtrW(hwndDlg, DWLP_USER);
-                    CredDialogHideBalloonTip(hwndDlg, params);
+                    CredDialogHideBalloonTip(hwndDlg);
                     return TRUE;
                 }
             }
@@ -528,9 +524,7 @@ static INT_PTR CALLBACK CredDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam,
         case WM_TIMER:
             if (wParam == ID_CAPSLOCKPOP)
             {
-                struct cred_dialog_params *params =
-                    (struct cred_dialog_params *)GetWindowLongPtrW(hwndDlg, DWLP_USER);
-                CredDialogHideBalloonTip(hwndDlg, params);
+                CredDialogHideBalloonTip(hwndDlg);
                 return TRUE;
             }
             return FALSE;
-- 
1.7.5.4




More information about the wine-patches mailing list