fixed a few parameters

svn path=/trunk/; revision=10523
This commit is contained in:
Thomas Bluemel 2004-08-14 01:03:38 +00:00
parent 62e97aca3c
commit 9bab45b05a
2 changed files with 17 additions and 15 deletions

View file

@ -16,7 +16,7 @@
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/* $Id: libskygi.c,v 1.8 2004/08/14 00:44:06 weiden Exp $ /* $Id: libskygi.c,v 1.9 2004/08/14 01:03:38 weiden Exp $
* *
* PROJECT: SkyOS GI library * PROJECT: SkyOS GI library
* FILE: lib/libskygi/libskygi.c * FILE: lib/libskygi/libskygi.c
@ -1018,11 +1018,11 @@ GC_destroy(GC *Gc)
* @implemented * @implemented
*/ */
widget_menu* __cdecl widget_menu* __cdecl
GI_create_menu(HANDLE Window) GI_create_menu(s_window *win)
{ {
PSKY_MENU Menu; PSKY_MENU Menu;
DBG("GI_create_menu(0x%x)\n", Window); DBG("GI_create_menu(0x%x)\n", win);
Menu = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SKY_MENU)); Menu = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SKY_MENU));
if (Menu == NULL) if (Menu == NULL)
@ -1038,8 +1038,10 @@ GI_create_menu(HANDLE Window)
return NULL; return NULL;
} }
if (Window) if (win)
SetMenu(((PSKY_WINDOW)Window)->hWnd, Menu->hMenu); {
SetMenu(((PSKY_WINDOW)win)->hWnd, Menu->hMenu);
}
return (widget_menu *)Menu; return (widget_menu *)Menu;
} }
@ -1127,7 +1129,7 @@ GI_add_menu_sub(widget_menu *Menu,
* @unimplemented * @unimplemented
*/ */
int __cdecl int __cdecl
GI_messagebox(HANDLE Window, GI_messagebox(s_window *win,
unsigned int Flags, unsigned int Flags,
char *Title, char *Title,
char *Fmt, char *Fmt,
@ -1137,14 +1139,14 @@ GI_messagebox(HANDLE Window,
va_list ArgList; va_list ArgList;
DBG("GI_messagebox(0x%x, 0x%x, 0x%x, 0x%x, ...)\n", DBG("GI_messagebox(0x%x, 0x%x, 0x%x, 0x%x, ...)\n",
Window, Flags, Title, Fmt); win, Flags, Title, Fmt);
va_start(ArgList, Fmt); va_start(ArgList, Fmt);
_vsnprintf(Buffer, sizeof(Buffer) / sizeof(Buffer[0]), Fmt, ArgList); _vsnprintf(Buffer, sizeof(Buffer) / sizeof(Buffer[0]), Fmt, ArgList);
va_end(ArgList); va_end(ArgList);
/** @todo Convert flags and fix return value! */ /** @todo Convert flags and fix return value! */
MessageBoxA(Window ? ((PSKY_WINDOW)Window)->hWnd : NULL, MessageBoxA(win ? ((PSKY_WINDOW)win)->hWnd : NULL,
Buffer, Title, MB_OK); Buffer, Title, MB_OK);
return 1; return 1;

View file

@ -1,4 +1,4 @@
/* $Id: stubs.c,v 1.7 2004/08/13 20:14:40 navaraf Exp $ /* $Id: stubs.c,v 1.8 2004/08/14 01:03:38 weiden Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: SkyOS GI library * PROJECT: SkyOS GI library
@ -18,10 +18,10 @@
* @unimplemented * @unimplemented
*/ */
int __cdecl int __cdecl
DefaultWindowFunc(HANDLE hWin, DefaultWindowFunc(s_window *win,
s_gi_msg *pMsg) s_gi_msg *pMsg)
{ {
STUB("DefaultWindowFunc(0x%x, 0x%x) returns 0!\n", hWin, pMsg); STUB("DefaultWindowFunc(0x%x, 0x%x) returns 0!\n", win, pMsg);
return 0; return 0;
} }
@ -162,9 +162,9 @@ GI_CreateApplication(sCreateApplication *application)
* @unimplemented * @unimplemented
*/ */
int __cdecl int __cdecl
GI_EnableMouseTracking(HANDLE hWnd) GI_EnableMouseTracking(s_window *win)
{ {
STUB("GI_EnableMouseTracking(0x%x) returns 0!\n", hWnd); STUB("GI_EnableMouseTracking(0x%x) returns 0!\n", win);
return 0; return 0;
} }
@ -223,14 +223,14 @@ GI_init(void)
* @unimplemented * @unimplemented
*/ */
int __cdecl int __cdecl
GI_set_dimension(HANDLE hWnd, GI_set_dimension(s_window *win,
int notify, int notify,
int x1, int x1,
int y1, int y1,
unsigned int width, unsigned int width,
unsigned int height) unsigned int height)
{ {
STUB("GI_set_dimension(0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x) returns 0!\n", hWnd, notify, x1, y1, width, height); STUB("GI_set_dimension(0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x) returns 0!\n", win, notify, x1, y1, width, height);
return 0; return 0;
} }