Skip to content

Commit 62fb548

Browse files
committed
updated for version 7.3.382
Problem: IME characters are inserted twice. Solution: Do not call DefWindowProc() if the event was handled. (Yasuhiro Matsumoto)
1 parent 7feea41 commit 62fb548

File tree

2 files changed

+19
-6
lines changed

2 files changed

+19
-6
lines changed

src/gui_w32.c

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,7 @@ _WndProc(
798798
if (pt.y < rect.top)
799799
{
800800
show_tabline_popup_menu();
801-
return 0;
801+
return 0L;
802802
}
803803
}
804804
return MyWindowProc(hwnd, uMsg, wParam, lParam);
@@ -828,7 +828,10 @@ _WndProc(
828828

829829
case WM_ENDSESSION:
830830
if (wParam) /* system only really goes down when wParam is TRUE */
831+
{
831832
_OnEndSession();
833+
return 0L;
834+
}
832835
break;
833836

834837
case WM_CHAR:
@@ -866,15 +869,15 @@ _WndProc(
866869
* are received, mouse pointer remains hidden. */
867870
return MyWindowProc(hwnd, uMsg, wParam, lParam);
868871
#else
869-
return 0;
872+
return 0L;
870873
#endif
871874

872875
case WM_SIZING: /* HANDLE_MSG doesn't seem to handle this one */
873876
return _DuringSizing((UINT)wParam, (LPRECT)lParam);
874877

875878
case WM_MOUSEWHEEL:
876879
_OnMouseWheel(hwnd, HIWORD(wParam));
877-
break;
880+
return 0L;
878881

879882
/* Notification for change in SystemParametersInfo() */
880883
case WM_SETTINGCHANGE:
@@ -987,13 +990,19 @@ _WndProc(
987990
case TCN_SELCHANGE:
988991
if (gui_mch_showing_tabline()
989992
&& ((LPNMHDR)lParam)->hwndFrom == s_tabhwnd)
993+
{
990994
send_tabline_event(TabCtrl_GetCurSel(s_tabhwnd) + 1);
995+
return 0L;
996+
}
991997
break;
992998

993999
case NM_RCLICK:
9941000
if (gui_mch_showing_tabline()
9951001
&& ((LPNMHDR)lParam)->hwndFrom == s_tabhwnd)
1002+
{
9961003
show_tabline_popup_menu();
1004+
return 0L;
1005+
}
9971006
break;
9981007
# endif
9991008
default:
@@ -1037,6 +1046,7 @@ _WndProc(
10371046
out_flush();
10381047
did_menu_tip = TRUE;
10391048
}
1049+
return 0L;
10401050
}
10411051
break;
10421052
#endif
@@ -1079,18 +1089,19 @@ _WndProc(
10791089
case WM_IME_NOTIFY:
10801090
if (!_OnImeNotify(hwnd, (DWORD)wParam, (DWORD)lParam))
10811091
return MyWindowProc(hwnd, uMsg, wParam, lParam);
1082-
break;
1092+
return 1L;
1093+
10831094
case WM_IME_COMPOSITION:
10841095
if (!_OnImeComposition(hwnd, wParam, lParam))
10851096
return MyWindowProc(hwnd, uMsg, wParam, lParam);
1086-
break;
1097+
return 1L;
10871098
#endif
10881099

10891100
default:
10901101
if (uMsg == msh_msgmousewheel && msh_msgmousewheel != 0)
10911102
{ /* handle MSH_MOUSEWHEEL messages for Intellimouse */
10921103
_OnMouseWheel(hwnd, HIWORD(wParam));
1093-
break;
1104+
return 0L;
10941105
}
10951106
#ifdef MSWIN_FIND_REPLACE
10961107
else if (uMsg == s_findrep_msg && s_findrep_msg != 0)

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,8 @@ static char *(features[]) =
714714

715715
static int included_patches[] =
716716
{ /* Add new patch number below this line */
717+
/**/
718+
382,
717719
/**/
718720
381,
719721
/**/

0 commit comments

Comments
 (0)