From 9bab45b05a557bfb2a53634287b4139abef63d4b Mon Sep 17 00:00:00 2001 From: Thomas Bluemel Date: Sat, 14 Aug 2004 01:03:38 +0000 Subject: [PATCH] fixed a few parameters svn path=/trunk/; revision=10523 --- reactos/lib/rosky/libskygi/libskygi.c | 18 ++++++++++-------- reactos/lib/rosky/libskygi/stubs.c | 14 +++++++------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/reactos/lib/rosky/libskygi/libskygi.c b/reactos/lib/rosky/libskygi/libskygi.c index 91c8f131722..a6b6d92200f 100644 --- a/reactos/lib/rosky/libskygi/libskygi.c +++ b/reactos/lib/rosky/libskygi/libskygi.c @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * 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 * FILE: lib/libskygi/libskygi.c @@ -1018,11 +1018,11 @@ GC_destroy(GC *Gc) * @implemented */ widget_menu* __cdecl -GI_create_menu(HANDLE Window) +GI_create_menu(s_window *win) { 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)); if (Menu == NULL) @@ -1038,8 +1038,10 @@ GI_create_menu(HANDLE Window) return NULL; } - if (Window) - SetMenu(((PSKY_WINDOW)Window)->hWnd, Menu->hMenu); + if (win) + { + SetMenu(((PSKY_WINDOW)win)->hWnd, Menu->hMenu); + } return (widget_menu *)Menu; } @@ -1127,7 +1129,7 @@ GI_add_menu_sub(widget_menu *Menu, * @unimplemented */ int __cdecl -GI_messagebox(HANDLE Window, +GI_messagebox(s_window *win, unsigned int Flags, char *Title, char *Fmt, @@ -1137,14 +1139,14 @@ GI_messagebox(HANDLE Window, va_list ArgList; DBG("GI_messagebox(0x%x, 0x%x, 0x%x, 0x%x, ...)\n", - Window, Flags, Title, Fmt); + win, Flags, Title, Fmt); va_start(ArgList, Fmt); _vsnprintf(Buffer, sizeof(Buffer) / sizeof(Buffer[0]), Fmt, ArgList); va_end(ArgList); /** @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); return 1; diff --git a/reactos/lib/rosky/libskygi/stubs.c b/reactos/lib/rosky/libskygi/stubs.c index c9c8c23e687..67d9cd1afb5 100644 --- a/reactos/lib/rosky/libskygi/stubs.c +++ b/reactos/lib/rosky/libskygi/stubs.c @@ -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 * PROJECT: SkyOS GI library @@ -18,10 +18,10 @@ * @unimplemented */ int __cdecl -DefaultWindowFunc(HANDLE hWin, +DefaultWindowFunc(s_window *win, 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; } @@ -162,9 +162,9 @@ GI_CreateApplication(sCreateApplication *application) * @unimplemented */ 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; } @@ -223,14 +223,14 @@ GI_init(void) * @unimplemented */ int __cdecl -GI_set_dimension(HANDLE hWnd, +GI_set_dimension(s_window *win, int notify, int x1, int y1, unsigned int width, 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; }