C89 compatibility and fixed a pointer bug ( conferred with Thomas on his intensions first ).

svn path=/trunk/; revision=5748
This commit is contained in:
Royce Mitchell III 2003-08-22 13:27:09 +00:00
parent 942ea1645e
commit 5f5441389e

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: menu.c,v 1.25 2003/08/21 21:52:06 weiden Exp $ /* $Id: menu.c,v 1.26 2003/08/22 13:27:09 royce Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -345,11 +345,12 @@ PMENU_OBJECT FASTCALL
IntCloneMenu(PMENU_OBJECT Source) IntCloneMenu(PMENU_OBJECT Source)
{ {
HANDLE Handle; HANDLE Handle;
PMENU_OBJECT MenuObject;
if(!Source) if(!Source)
return NULL; return NULL;
PMENU_OBJECT MenuObject = (PMENU_OBJECT)ObmCreateObject( MenuObject = (PMENU_OBJECT)ObmCreateObject(
PsGetWin32Process()->WindowStation->HandleTable, Handle, PsGetWin32Process()->WindowStation->HandleTable, Handle,
otMenu, sizeof(MENU_OBJECT)); otMenu, sizeof(MENU_OBJECT));
if(!MenuObject) if(!MenuObject)
@ -921,9 +922,9 @@ IntGetMenuDefaultItem(PMENU_OBJECT MenuObject, UINT fByPos, UINT gmdiFlags,
ExAcquireFastMutexUnsafe(&SubMenuObject->MenuItemsLock); ExAcquireFastMutexUnsafe(&SubMenuObject->MenuItemsLock);
ExReleaseFastMutexUnsafe(&MenuObject->MenuItemsLock); ExReleaseFastMutexUnsafe(&MenuObject->MenuItemsLock);
*gismc++; (*gismc)++;
sres = IntGetMenuDefaultItem(SubMenuObject, fByPos, gmdiFlags, gismc); sres = IntGetMenuDefaultItem(SubMenuObject, fByPos, gmdiFlags, gismc);
*gismc--; (*gismc)--;
ExReleaseFastMutexUnsafe(&SubMenuObject->MenuItemsLock); ExReleaseFastMutexUnsafe(&SubMenuObject->MenuItemsLock);
ExAcquireFastMutexUnsafe(&MenuObject->MenuItemsLock); ExAcquireFastMutexUnsafe(&MenuObject->MenuItemsLock);