mirror of
https://github.com/reactos/reactos.git
synced 2025-08-03 20:45:44 +00:00
2003-08-09 Casper S. Hornstrup <chorns@users.sourceforge.net>
* lib/user32/windows/dialog.c (GetDlgItemInt): Fix unsigned/signed warning. * lib/user32/windows/menu.c (IsMenu): Ditto. * lib/user32/windows/messagebox.c (MSGBOX_OnInit): Ditto. * ntoskrnl/mm/ppool.c: Ditto. svn path=/trunk/; revision=5488
This commit is contained in:
parent
798b12d6be
commit
9654fc7a75
5 changed files with 23 additions and 13 deletions
|
@ -1,7 +1,16 @@
|
|||
2003-09-09 Martin Fuchs <martin-fuchs@gmx.net>
|
||||
2003-08-09 Casper S. Hornstrup <chorns@users.sourceforge.net>
|
||||
|
||||
* lib/user32/windows/dialog.c (GetDlgItemInt): Fix unsigned/signed
|
||||
warning.
|
||||
* lib/user32/windows/menu.c (IsMenu): Ditto.
|
||||
* lib/user32/windows/messagebox.c (MSGBOX_OnInit): Ditto.
|
||||
* ntoskrnl/mm/ppool.c: Ditto.
|
||||
|
||||
2003-08-09 Martin Fuchs <martin-fuchs@gmx.net>
|
||||
|
||||
* include/func.h: added GetShellWindow()
|
||||
* lib/user32/misc/desktop.c: implemented GetShellWindow(), SetShellWindow() and SetShellWindowEx().
|
||||
* lib/user32/misc/desktop.c: implemented GetShellWindow(),
|
||||
SetShellWindow() and SetShellWindowEx().
|
||||
* lib/user32/user32.def: Ditto.
|
||||
* lib/user32/user32.edf: Ditto.
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
/* $Id: dialog.c,v 1.14 2003/07/28 08:09:51 ekohl Exp $
|
||||
/* $Id: dialog.c,v 1.15 2003/08/09 14:25:07 chorns Exp $
|
||||
*
|
||||
* PROJECT: ReactOS user32.dll
|
||||
* FILE: lib/user32/windows/dialog.c
|
||||
|
@ -1740,7 +1740,7 @@ GetDlgItemInt(
|
|||
if (!endptr || (endptr == str)) /* Conversion was unsuccessful */
|
||||
return 0;
|
||||
/* FIXME: errno? */
|
||||
if ((result == ULONG_MAX)/* && (errno == ERANGE) */) return 0;
|
||||
if ((result == LONG_MAX)/* && (errno == ERANGE) */) return 0;
|
||||
}
|
||||
if (lpTranslated) *lpTranslated = TRUE;
|
||||
return (UINT)result;
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
/* $Id: menu.c,v 1.22 2003/08/08 02:57:54 royce Exp $
|
||||
/* $Id: menu.c,v 1.23 2003/08/09 14:25:07 chorns Exp $
|
||||
*
|
||||
* PROJECT: ReactOS user32.dll
|
||||
* FILE: lib/user32/windows/menu.c
|
||||
|
@ -843,7 +843,7 @@ IsMenu(
|
|||
DWORD ret;
|
||||
SetLastError(ERROR_SUCCESS);
|
||||
ret = NtUserBuildMenuItemList(hMenu, NULL, 0, 0);
|
||||
return ((ret == -1) || (GetLastError() == ERROR_INVALID_MENU_HANDLE));
|
||||
return ((ret == (DWORD)-1) || (GetLastError() == ERROR_INVALID_MENU_HANDLE));
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
/* $Id: messagebox.c,v 1.10 2003/08/07 04:03:24 royce Exp $
|
||||
/* $Id: messagebox.c,v 1.11 2003/08/09 14:25:07 chorns Exp $
|
||||
*
|
||||
* PROJECT: ReactOS user32.dll
|
||||
* FILE: lib/user32/windows/messagebox.c
|
||||
|
@ -86,7 +86,8 @@ static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMS lpmb)
|
|||
RECT rect;
|
||||
HWND hItem;
|
||||
HDC hdc;
|
||||
int i, buttons;
|
||||
DWORD buttons;
|
||||
int i;
|
||||
int bspace, bw, bh, theight, tleft, wwidth, wheight, bpos;
|
||||
int borheight, borwidth, iheight, ileft, iwidth, twidth, tiheight;
|
||||
BOOL sdefbtn = FALSE;
|
||||
|
@ -288,7 +289,7 @@ static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMS lpmb)
|
|||
tleft = ileft;
|
||||
if (iwidth)
|
||||
tleft += ileft + iwidth;
|
||||
twidth = max((bw + bspace) * buttons + bspace - tleft, rect.right);
|
||||
twidth = max((LONG) ((bw + bspace) * buttons + bspace - tleft), rect.right);
|
||||
theight = rect.bottom;
|
||||
|
||||
if (hFont)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: ppool.c,v 1.16 2003/08/04 08:26:19 hbirr Exp $
|
||||
/* $Id: ppool.c,v 1.17 2003/08/09 14:25:08 chorns Exp $
|
||||
*
|
||||
* COPYRIGHT: See COPYING in the top level directory
|
||||
* PROJECT: ReactOS kernel
|
||||
|
@ -33,15 +33,15 @@
|
|||
|
||||
typedef struct _MM_PPOOL_FREE_BLOCK_HEADER
|
||||
{
|
||||
LONG Size;
|
||||
ULONG Size;
|
||||
struct _MM_PPOOL_FREE_BLOCK_HEADER* NextFree;
|
||||
} MM_PPOOL_FREE_BLOCK_HEADER, *PMM_PPOOL_FREE_BLOCK_HEADER;
|
||||
|
||||
typedef struct _MM_PPOOL_USED_BLOCK_HEADER
|
||||
{
|
||||
LONG Size;
|
||||
ULONG Size;
|
||||
#if MM_PPOOL_BOUNDARY_BYTES
|
||||
LONG UserSize; // how many bytes the user actually asked for...
|
||||
ULONG UserSize; // how many bytes the user actually asked for...
|
||||
#endif//MM_PPOOL_BOUNDARY_BYTES
|
||||
} MM_PPOOL_USED_BLOCK_HEADER, *PMM_PPOOL_USED_BLOCK_HEADER;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue