+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>
* tools/rgenstat/rgenstat.c (process_directory): Fix building on Windows.
-/* $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
* PROJECT: ReactOS User32
LONG state = get_button_state( hwnd );
LONG style = GetWindowLongA( hwnd, GWL_STYLE );
BOOL pushedState = (state & BUTTON_HIGHLIGHTED);
+ UINT uState;
GetClientRect( hwnd, &rc );
InflateRect( &rc, -1, -1 );
}
- UINT uState = DFCS_BUTTONPUSH | DFCS_ADJUSTRECT;
+ uState = DFCS_BUTTONPUSH | DFCS_ADJUSTRECT;
if (style & BS_FLAT)
uState |= DFCS_MONO;
HBRUSH hbr;
HFONT hFont;
UINT dtFlags;
+ TEXTMETRICW tm;
LONG style = GetWindowLongA( hwnd, GWL_STYLE );
if (action != ODA_DRAWENTIRE) return;
(WPARAM)hDC, (LPARAM)hwnd);
GetClientRect( hwnd, &rc);
- TEXTMETRICW tm;
+
rcFrame = rc;
GetTextMetricsW (hDC, &tm);
HDC hdc,
RECT rectButton)
{
+ UINT buttonState;
+
if( lphc->wState & CBF_NOREDRAW )
return;
- UINT buttonState = DFCS_SCROLLCOMBOBOX;
+ buttonState = DFCS_SCROLLCOMBOBOX;
if (lphc->wState & CBF_BUTTONDOWN)
{
* along with this program; if not, write to the Free Software
* 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
* FILE: lib/user32/windows/input.c
MSG mCopy = *lpMsg;
CHAR cChar;
WCHAR wChar;
+ NTSTATUS nErrCode;
if(!U32IsValidAccelMessage(lpMsg->message)) return 0;
- NTSTATUS nErrCode =
+ nErrCode =
RtlMultiByteToUnicodeN(&wChar, sizeof(wChar), NULL, &cChar, sizeof(cChar));
if(!nErrCode)
BOOL bUnicodeClass);
struct _WINDOW_OBJECT;
ULONG FASTCALL
-W32kGetClassLong(struct _WINDOW_OBJECT* WindowObject, ULONG Offset);
+W32kGetClassLong(struct _WINDOW_OBJECT *WindowObject, ULONG Offset);
#endif /* __WIN32K_CLASS_H */
* along with this program; if not, write to the Free Software
* 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
* PROJECT: ReactOS kernel
}
ULONG FASTCALL
-W32kGetClassLong(PWINDOW_OBJECT WindowObject, ULONG Offset)
+W32kGetClassLong(struct _WINDOW_OBJECT *WindowObject, ULONG Offset)
{
LONG Ret;
switch (Offset)
* along with this program; if not, write to the Free Software
* 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
* PROJECT: ReactOS kernel
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;
DCE* Dce;
* along with this program; if not, write to the Free Software
* 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
* PROJECT: ReactOS kernel
}
VOID FASTCALL
-DestroyThreadWindows(PETHREAD Thread)
+DestroyThreadWindows(struct _ETHREAD *Thread)
{
PLIST_ENTRY LastHead;
PW32PROCESS Win32Process;