Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 12:55:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[user32]

Browse source 
- Fix several compilation issues with msvc

svn path=/trunk/; revision=52219
This commit is contained in:
Giannis Adamopoulos 2011-06-13 19:49:46 +00:00
parent f500fbfbde
commit cf2fbe1b6d
4 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
reactos/dll/win32/user32/controls/icontitle.c
View file

@ -188,7 +188,6 @@ LRESULT WINAPI IconTitleWndProc( HWND hWnd, UINT msg,
{ {
HWND owner = GetWindow( hWnd, GW_OWNER ); HWND owner = GetWindow( hWnd, GW_OWNER );
if (!IsWindow(hWnd)) return 0;
#ifdef __REACTOS__ // Do this now, remove after Server side is fixed. #ifdef __REACTOS__ // Do this now, remove after Server side is fixed.
PWND pWnd; PWND pWnd;
@ -202,6 +201,8 @@ LRESULT WINAPI IconTitleWndProc( HWND hWnd, UINT msg,
} }
#endif #endif
if (!IsWindow(hWnd)) return 0;
switch( msg ) switch( msg )
{ {
case WM_CREATE: case WM_CREATE:

10
reactos/dll/win32/user32/controls/scrollbar.c
View file

@ -1243,11 +1243,6 @@ ScrollTrackScrollBar(HWND Wnd, INT SBType, POINT Pt)
LRESULT WINAPI LRESULT WINAPI
ScrollBarWndProc(WNDPROC DefWindowProc, HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam) ScrollBarWndProc(WNDPROC DefWindowProc, HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam)
{ {
if (! IsWindow(Wnd))
{
return 0;
}
#ifdef __REACTOS__ // Do this now, remove after Server side is fixed. #ifdef __REACTOS__ // Do this now, remove after Server side is fixed.
PWND pWnd; PWND pWnd;
@ -1261,6 +1256,11 @@ ScrollBarWndProc(WNDPROC DefWindowProc, HWND Wnd, UINT Msg, WPARAM wParam, LPARA
} }
#endif #endif
if (! IsWindow(Wnd))
{
return 0;
}
switch (Msg) switch (Msg)
{ {
case WM_CREATE: case WM_CREATE:

6
reactos/dll/win32/user32/windows/defwnd.c
View file

@ -753,6 +753,7 @@ DefWndTrackScrollBar(HWND Wnd, WPARAM wParam, POINT Pt)
ScrollTrackScrollBar(Wnd, ScrollBar, Pt ); ScrollTrackScrollBar(Wnd, ScrollBar, Pt );
} }
LRESULT WINAPI DoAppSwitch( WPARAM wParam, LPARAM lParam);
LRESULT LRESULT
DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, LPARAM lParam) DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
@ -824,7 +825,7 @@ DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
case SC_SCREENSAVE: case SC_SCREENSAVE:
NtUserMessageCall( hWnd, WM_SYSCOMMAND, wParam, lParam, (ULONG_PTR)&lResult, FNID_DEFWINDOWPROC, FALSE); NtUserMessageCall( hWnd, WM_SYSCOMMAND, wParam, lParam, (ULONG_PTR)&lResult, FNID_DEFWINDOWPROC, FALSE);
break; break;
LRESULT WINAPI DoAppSwitch( WPARAM wParam, LPARAM lParam);
case SC_NEXTWINDOW: case SC_NEXTWINDOW:
case SC_PREVWINDOW: case SC_PREVWINDOW:
DoAppSwitch( wParam, lParam); DoAppSwitch( wParam, lParam);
@ -833,9 +834,10 @@ LRESULT WINAPI DoAppSwitch( WPARAM wParam, LPARAM lParam);
case SC_HOTKEY: case SC_HOTKEY:
{ {
HWND hwnd, hWndLastActive; HWND hwnd, hWndLastActive;
PWND pWnd;
hwnd = (HWND)lParam; hwnd = (HWND)lParam;
PWND pWnd = ValidateHwnd(hwnd); pWnd = ValidateHwnd(hwnd);
if (pWnd) if (pWnd)
{ {
hWndLastActive = GetLastActivePopup(hwnd); hWndLastActive = GetLastActivePopup(hwnd);

6
reactos/dll/win32/user32/windows/menu.c
View file

@ -1791,7 +1791,6 @@ MenuMoveSelection(HWND WndOwner, PROSMENUINFO MenuInfo, INT Offset)
// //
LRESULT WINAPI PopupMenuWndProcA(HWND Wnd, UINT Message, WPARAM wParam, LPARAM lParam) LRESULT WINAPI PopupMenuWndProcA(HWND Wnd, UINT Message, WPARAM wParam, LPARAM lParam)
{ {
TRACE("YES! hwnd=%x msg=0x%04x wp=0x%04lx lp=0x%08lx\n", Wnd, Message, wParam, lParam);
#ifdef __REACTOS__ #ifdef __REACTOS__
PWND pWnd; PWND pWnd;
@ -1805,6 +1804,8 @@ LRESULT WINAPI PopupMenuWndProcA(HWND Wnd, UINT Message, WPARAM wParam, LPARAM l
} }
#endif #endif
TRACE("YES! hwnd=%x msg=0x%04x wp=0x%04lx lp=0x%08lx\n", Wnd, Message, wParam, lParam);
switch(Message) switch(Message)
{ {
case WM_CREATE: case WM_CREATE:
@ -1879,7 +1880,6 @@ LRESULT WINAPI PopupMenuWndProcA(HWND Wnd, UINT Message, WPARAM wParam, LPARAM l
LRESULT WINAPI LRESULT WINAPI
PopupMenuWndProcW(HWND Wnd, UINT Message, WPARAM wParam, LPARAM lParam) PopupMenuWndProcW(HWND Wnd, UINT Message, WPARAM wParam, LPARAM lParam)
{ {
TRACE("hwnd=%x msg=0x%04x wp=0x%04lx lp=0x%08lx\n", Wnd, Message, wParam, lParam);
#ifdef __REACTOS__ // Do this now, remove after Server side is fixed. #ifdef __REACTOS__ // Do this now, remove after Server side is fixed.
PWND pWnd; PWND pWnd;
@ -1893,6 +1893,8 @@ PopupMenuWndProcW(HWND Wnd, UINT Message, WPARAM wParam, LPARAM lParam)
} }
#endif #endif
TRACE("hwnd=%x msg=0x%04x wp=0x%04lx lp=0x%08lx\n", Wnd, Message, wParam, lParam);
switch(Message) switch(Message)
{ {
case WM_CREATE: case WM_CREATE: