Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-25 23:41:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

[USER32] defwnd.c only formatting, no functional change

Browse source 
For preparing a backport I do slightly improve the formatting:
- for the 2 SetScrollInfo() calls, that I do intend to port back
- fix last place where we had mixed space and tab indentation in this file at the DefWindowProc signatures
- strip some exclamation marks in some dbg-prints
- improve the header
- strip a space at some rather long lines NtUserMessageCall()
This commit is contained in:
Joachim Henze 2024-05-04 12:30:43 +02:00
parent 7ce96fd364
commit a69532ec4a
1 changed files with 12 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
win32ss/user/user32/windows/defwnd.c
View file

@ -1,12 +1,8 @@
/* /*
*
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS user32.dll * PROJECT: ReactOS user32.dll
* FILE: win32ss/user/user32/windows/defwnd.c
* PURPOSE: Window management * PURPOSE: Window management
* PROGRAMMER: Casper S. Hornstrup (chorns@users.sourceforge.net) * PROGRAMMER: 2001 Casper S. Hornstrup <chorns@users.sourceforge.net>
* UPDATE HISTORY:
* 06-06-2001 CSH Created
*/ */
#include <user32.h> #include <user32.h>
@ -161,7 +157,7 @@ DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
case SC_RESTORE: case SC_RESTORE:
case SC_CLOSE: case SC_CLOSE:
case SC_HOTKEY: case SC_HOTKEY:
NtUserMessageCall( hWnd, WM_SYSCOMMAND, wParam, lParam, (ULONG_PTR)&lResult, FNID_DEFWINDOWPROC, FALSE); NtUserMessageCall(hWnd, WM_SYSCOMMAND, wParam, lParam, (ULONG_PTR)&lResult, FNID_DEFWINDOWPROC, FALSE);
return 0; return 0;
default: default:
@ -170,13 +166,12 @@ DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
if (ISITHOOKED(WH_CBT)) if (ISITHOOKED(WH_CBT))
{ {
NtUserMessageCall( hWnd, WM_SYSCOMMAND, wParam, lParam, (ULONG_PTR)&lResult, FNID_DEFWINDOWPROC, FALSE); NtUserMessageCall(hWnd, WM_SYSCOMMAND, wParam, lParam, (ULONG_PTR)&lResult, FNID_DEFWINDOWPROC, FALSE);
if (lResult) return 0; if (lResult) return 0;
} }
switch (wParam & 0xfff0) switch (wParam & 0xfff0)
{ {
case SC_VSCROLL: case SC_VSCROLL:
case SC_HSCROLL: case SC_HSCROLL:
{ {
@ -618,7 +613,7 @@ User32DefWindowProc(HWND hWnd,
if (Flags & UISF_ACTIVE) if (Flags & UISF_ACTIVE)
{ {
WARN("WM_CHANGEUISTATE does not yet support UISF_ACTIVE!\n"); WARN("WM_CHANGEUISTATE does not yet support UISF_ACTIVE\n");
} }
if (Action == UIS_INITIALIZE) if (Action == UIS_INITIALIZE)
@ -700,7 +695,7 @@ User32DefWindowProc(HWND hWnd,
if (Flags & UISF_ACTIVE) if (Flags & UISF_ACTIVE)
{ {
WARN("WM_UPDATEUISTATE does not yet support UISF_ACTIVE!\n"); WARN("WM_UPDATEUISTATE does not yet support UISF_ACTIVE\n");
} }
if (Action == UIS_INITIALIZE) if (Action == UIS_INITIALIZE)
@ -806,7 +801,7 @@ User32DefWindowProc(HWND hWnd,
GoSS: GoSS:
{ {
LRESULT lResult; LRESULT lResult;
NtUserMessageCall( hWnd, Msg, wParam, lParam, (ULONG_PTR)&lResult, FNID_DEFWINDOWPROC, !bUnicode); NtUserMessageCall(hWnd, Msg, wParam, lParam, (ULONG_PTR)&lResult, FNID_DEFWINDOWPROC, !bUnicode);
return lResult; return lResult;
} }
} }
@ -1068,9 +1063,9 @@ RealDefWindowProcW(HWND hWnd,
{ {
SCROLLINFO si = {sizeof si, SIF_ALL, 0, 100, 0, 0, 0}; SCROLLINFO si = {sizeof si, SIF_ALL, 0, 100, 0, 0, 0};
if (Wnd->style & WS_HSCROLL) if (Wnd->style & WS_HSCROLL)
SetScrollInfo( hWnd, SB_HORZ, &si, FALSE ); SetScrollInfo(hWnd, SB_HORZ, &si, FALSE);
if (Wnd->style & WS_VSCROLL) if (Wnd->style & WS_VSCROLL)
SetScrollInfo( hWnd, SB_VERT, &si, FALSE ); SetScrollInfo(hWnd, SB_VERT, &si, FALSE);
} }
} }
@ -1239,10 +1234,7 @@ NormalImeMsgHandling:
} }
LRESULT WINAPI LRESULT WINAPI
DefWindowProcA(HWND hWnd, DefWindowProcA(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
UINT Msg,
WPARAM wParam,
LPARAM lParam)
{ {
BOOL Hook, msgOverride = FALSE; BOOL Hook, msgOverride = FALSE;
LRESULT Result = 0; LRESULT Result = 0;
@ -1269,7 +1261,7 @@ DefWindowProcA(HWND hWnd,
} }
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{ {
ERR("Got exception in hooked DefWindowProcA!\n"); ERR("Got exception in hooked DefWindowProcA\n");
} }
_SEH2_END; _SEH2_END;
@ -1279,10 +1271,7 @@ DefWindowProcA(HWND hWnd,
} }
LRESULT WINAPI LRESULT WINAPI
DefWindowProcW(HWND hWnd, DefWindowProcW(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
UINT Msg,
WPARAM wParam,
LPARAM lParam)
{ {
BOOL Hook, msgOverride = FALSE; BOOL Hook, msgOverride = FALSE;
LRESULT Result = 0; LRESULT Result = 0;
@ -1309,7 +1298,7 @@ DefWindowProcW(HWND hWnd,
} }
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{ {
ERR("Got exception in hooked DefWindowProcW!\n"); ERR("Got exception in hooked DefWindowProcW\n");
} }
_SEH2_END; _SEH2_END;