Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

2003-07-11 Casper S. Hornstrup <chorns@users.sourceforge.net>

Browse source 
* lib/user32/controls/button.c (PB_Paint, GB_Paint): Declare variables
	before any statements are processed in the scope.
	* lib/user32/controls/combo.c (CBPaintButton): Ditto.
	* lib/user32/windows/accel.c (TranslateAcceleratorA): Ditto.
	* subsys/win32k/include/class.h (W32kGetClassLong): Fix prototype.
	* subsys/win32k/ntuser/class.c (W32kGetClassLong): Match prototype.
	* subsys/win32k/ntuser/windc.c (DceAllocDCE): Ditto.
	* subsys/win32k/ntuser/window.c (DestroyThreadWindows): Ditto.

svn path=/trunk/; revision=5078
This commit is contained in:
Casper Hornstrup 2003-07-11 17:08:44 +00:00
parent dadc689465
commit 06a9aa1f74
8 changed files with 29 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
reactos/ChangeLog
View file

@ -1,3 +1,14 @@
2003-07-11 Casper S. Hornstrup <chorns@users.sourceforge.net>
* lib/user32/controls/button.c (PB_Paint, GB_Paint): Declare variables
before any statements are processed in the scope.
* lib/user32/controls/combo.c (CBPaintButton): Ditto.
* lib/user32/windows/accel.c (TranslateAcceleratorA): Ditto.
* subsys/win32k/include/class.h (W32kGetClassLong): Fix prototype.
* subsys/win32k/ntuser/class.c (W32kGetClassLong): Match prototype.
* subsys/win32k/ntuser/windc.c (DceAllocDCE): Ditto.
* subsys/win32k/ntuser/window.c (DestroyThreadWindows): Ditto.
2003-07-11 Casper S. Hornstrup <chorns@users.sourceforge.net> 2003-07-11 Casper S. Hornstrup <chorns@users.sourceforge.net>
* tools/rgenstat/rgenstat.c (process_directory): Fix building on Windows. * tools/rgenstat/rgenstat.c (process_directory): Fix building on Windows.

8
reactos/lib/user32/controls/button.c
View file

@ -1,4 +1,4 @@
/* $Id: button.c,v 1.4 2003/06/27 17:49:07 chorns Exp $ /* $Id: button.c,v 1.5 2003/07/11 17:08:44 chorns Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS User32 * PROJECT: ReactOS User32
@ -693,6 +693,7 @@ static void PB_Paint( HWND hwnd, HDC hDC, UINT action )
LONG state = get_button_state( hwnd ); LONG state = get_button_state( hwnd );
LONG style = GetWindowLongA( hwnd, GWL_STYLE ); LONG style = GetWindowLongA( hwnd, GWL_STYLE );
BOOL pushedState = (state & BUTTON_HIGHLIGHTED); BOOL pushedState = (state & BUTTON_HIGHLIGHTED);
UINT uState;
GetClientRect( hwnd, &rc ); GetClientRect( hwnd, &rc );
@ -709,7 +710,7 @@ static void PB_Paint( HWND hwnd, HDC hDC, UINT action )
InflateRect( &rc, -1, -1 ); InflateRect( &rc, -1, -1 );
} }
UINT uState = DFCS_BUTTONPUSH | DFCS_ADJUSTRECT; uState = DFCS_BUTTONPUSH | DFCS_ADJUSTRECT;
if (style & BS_FLAT) if (style & BS_FLAT)
uState |= DFCS_MONO; uState |= DFCS_MONO;
@ -922,6 +923,7 @@ static void GB_Paint( HWND hwnd, HDC hDC, UINT action )
HBRUSH hbr; HBRUSH hbr;
HFONT hFont; HFONT hFont;
UINT dtFlags; UINT dtFlags;
TEXTMETRICW tm;
LONG style = GetWindowLongA( hwnd, GWL_STYLE ); LONG style = GetWindowLongA( hwnd, GWL_STYLE );
if (action != ODA_DRAWENTIRE) return; if (action != ODA_DRAWENTIRE) return;
@ -934,7 +936,7 @@ static void GB_Paint( HWND hwnd, HDC hDC, UINT action )
(WPARAM)hDC, (LPARAM)hwnd); (WPARAM)hDC, (LPARAM)hwnd);
GetClientRect( hwnd, &rc); GetClientRect( hwnd, &rc);
TEXTMETRICW tm;
rcFrame = rc; rcFrame = rc;
GetTextMetricsW (hDC, &tm); GetTextMetricsW (hDC, &tm);

4
reactos/lib/user32/controls/combo.c
View file

@ -682,10 +682,12 @@ static void CBPaintButton(
HDC hdc, HDC hdc,
RECT rectButton) RECT rectButton)
{ {
UINT buttonState;
if( lphc->wState & CBF_NOREDRAW ) if( lphc->wState & CBF_NOREDRAW )
return; return;
UINT buttonState = DFCS_SCROLLCOMBOBOX; buttonState = DFCS_SCROLLCOMBOBOX;
if (lphc->wState & CBF_BUTTONDOWN) if (lphc->wState & CBF_BUTTONDOWN)
{ {

5
reactos/lib/user32/windows/accel.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: accel.c,v 1.8 2003/07/10 21:04:31 chorns Exp $ /* $Id: accel.c,v 1.9 2003/07/11 17:08:44 chorns Exp $
* *
* PROJECT: ReactOS user32.dll * PROJECT: ReactOS user32.dll
* FILE: lib/user32/windows/input.c * FILE: lib/user32/windows/input.c
@ -372,10 +372,11 @@ int WINAPI TranslateAcceleratorA(HWND hWnd, HACCEL hAccTable, LPMSG lpMsg)
MSG mCopy = *lpMsg; MSG mCopy = *lpMsg;
CHAR cChar; CHAR cChar;
WCHAR wChar; WCHAR wChar;
NTSTATUS nErrCode;
if(!U32IsValidAccelMessage(lpMsg->message)) return 0; if(!U32IsValidAccelMessage(lpMsg->message)) return 0;
NTSTATUS nErrCode = nErrCode =
RtlMultiByteToUnicodeN(&wChar, sizeof(wChar), NULL, &cChar, sizeof(cChar)); RtlMultiByteToUnicodeN(&wChar, sizeof(wChar), NULL, &cChar, sizeof(cChar));
if(!nErrCode) if(!nErrCode)

2
reactos/subsys/win32k/include/class.h
View file

@ -38,7 +38,7 @@ W32kCreateClass(LPWNDCLASSEXW lpwcx,
BOOL bUnicodeClass); BOOL bUnicodeClass);
struct _WINDOW_OBJECT; struct _WINDOW_OBJECT;
ULONG FASTCALL ULONG FASTCALL
W32kGetClassLong(struct _WINDOW_OBJECT* WindowObject, ULONG Offset); W32kGetClassLong(struct _WINDOW_OBJECT *WindowObject, ULONG Offset);
#endif /* __WIN32K_CLASS_H */ #endif /* __WIN32K_CLASS_H */

4
reactos/subsys/win32k/ntuser/class.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: class.c,v 1.18 2003/06/20 16:26:14 ekohl Exp $ /* $Id: class.c,v 1.19 2003/07/11 17:08:44 chorns Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -282,7 +282,7 @@ NtUserRegisterClassExWOW(LPWNDCLASSEXW lpwcx,
} }
ULONG FASTCALL ULONG FASTCALL
W32kGetClassLong(PWINDOW_OBJECT WindowObject, ULONG Offset) W32kGetClassLong(struct _WINDOW_OBJECT *WindowObject, ULONG Offset)
{ {
LONG Ret; LONG Ret;
switch (Offset) switch (Offset)

4
reactos/subsys/win32k/ntuser/windc.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: windc.c,v 1.13 2003/07/10 00:24:04 chorns Exp $ /* $Id: windc.c,v 1.14 2003/07/11 17:08:44 chorns Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -274,7 +274,7 @@ NtUserGetDC(HWND hWnd)
return NtUserGetDCEx(hWnd, NULL, NULL == hWnd ? DCX_CACHE | DCX_WINDOW : DCX_USESTYLE); return NtUserGetDCEx(hWnd, NULL, NULL == hWnd ? DCX_CACHE | DCX_WINDOW : DCX_USESTYLE);
} }
DCE * FASTCALL DceAllocDCE(HWND hWnd, DCE_TYPE Type) PDCE FASTCALL DceAllocDCE(HWND hWnd, DCE_TYPE Type)
{ {
HDCE DceHandle; HDCE DceHandle;
DCE* Dce; DCE* Dce;

4
reactos/subsys/win32k/ntuser/window.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: window.c,v 1.62 2003/07/10 00:24:04 chorns Exp $ /* $Id: window.c,v 1.63 2003/07/11 17:08:44 chorns Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -1197,7 +1197,7 @@ NtUserDestroyWindow(HWND Wnd)
} }
VOID FASTCALL VOID FASTCALL
DestroyThreadWindows(PETHREAD Thread) DestroyThreadWindows(struct _ETHREAD *Thread)
{ {
PLIST_ENTRY LastHead; PLIST_ENTRY LastHead;
PW32PROCESS Win32Process; PW32PROCESS Win32Process;