From 96fcea9b722b8486a545ff45847a504259723b51 Mon Sep 17 00:00:00 2001 From: Aleksey Bragin Date: Thu, 6 Dec 2007 15:44:23 +0000 Subject: [PATCH] - Fix Greatlordisms: * Don't try to link *user*mode program to static *kernelmode* libcntpr. msvcrt.dll exists for this. * Fix main()'s declaration and definition. * The above changes fix compiling of rostest module. svn path=/trunk/; revision=31043 --- .../D3DParseUnknownCommand_show.rbuild | 1 - rostests/tests/D3DParseUnknownCommand_show/main.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/rostests/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild b/rostests/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild index 8a3162ef6ac..7963453c4fe 100644 --- a/rostests/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild +++ b/rostests/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild @@ -5,7 +5,6 @@ kernel32 gdi32 ddraw - libcntpr user32 main.c \ No newline at end of file diff --git a/rostests/tests/D3DParseUnknownCommand_show/main.c b/rostests/tests/D3DParseUnknownCommand_show/main.c index c96d6c1ea40..84a8142341d 100644 --- a/rostests/tests/D3DParseUnknownCommand_show/main.c +++ b/rostests/tests/D3DParseUnknownCommand_show/main.c @@ -22,10 +22,10 @@ * */ -INT main(INT argc, CHAR argv[]); +INT main(INT argc, TCHAR *argv[]); VOID BuildReturnCode(DWORD * ReturnCode); -INT main(INT argc, TCHAR argv[]) +INT main(INT argc, TCHAR *argv[]) { DWORD ReturnCode[256]; @@ -44,6 +44,6 @@ VOID BuildReturnCode(DWORD * ReturnCode) { dp2command.bCommand = t; ReturnCode[t] = D3DParseUnknownCommand ( (LPVOID) &dp2command, (LPVOID *) lplpvReturnedCommand) ; - printf("D3DParseUnknownCommand return code = %x command %d \n", ReturnCode[t], t); + printf("D3DParseUnknownCommand return code = %x command %d \n", (UINT)ReturnCode[t], t); } }