Re: [ros-cvs] CVS Update: reactos

[James Tabor]

Hi,

chorns(a)cvs.reactos.com wrote:
>   CVSROOT:	/CVS/ReactOS
>  Module name:	reactos
>  Repository:	reactos/tools/
>  Changes by:	chorns(a)mok.osexperts.com	04/10/02 01:44:54
>  
>  Modified files:
>  	./: ChangeLog 
>  	reactos/lib/gdiplus/tests/: .cvsignore Makefile 
>  	reactos/lib/gdiplus/tests/tests/: test-1.c 
>  	reactos/regtests/shared/: regtests.h 
>  	reactos/tools/: helper.mk regtests.c 
>  Added files:
>  	reactos/lib/gdiplus/tests/: stubs.tst 
>  Removed files:
>  	reactos/lib/gdiplus/tests/: passthrough.c 
>  
>  Log message:
>  	2004-10-02  Casper S. Hornstrup  <chorns(a)users.sourceforge.net>
>  	
>  	* lib/gdiplus/tests/.cvsignore: Ignore _hooks.c and _stubs.S.
>  	* lib/gdiplus/tests/Makefile (TARGET_OBJECTS): Remove passthrough.o and
>  	add _hooks.o and _stubs.o.
>  	* lib/gdiplus/tests/tests/test-1.c: Test API hooking.
>  	* regtests/shared/regtests.h: Add support for API hooking.
>  	* tools/helper.mk: Generate stubs.
>  	* tools/regtests.c: Add support for generating stubs and hooks.
>  	* lib/gdiplus/tests/passthrough.c: Remove.
>  	* lib/gdiplus/tests/stubs.tst: New file.
>   
Build problem,

i386-mingw32-gcc -I../include -DUNICODE -Wall -Werror -fno-builtin -D__USE_W32API
-DWINVER=0x0600 
-D_WIN32_WINNT=0x0501 -I../../../regtests/shared -I. -I../../../include
-I../../../w32api/include 
-pipe -march=i486 -D_M_IX86 -g -c _hooks.c -o _hooks.o
_hooks.c:7:17: missing terminating " character
_hooks.c:8:1: missing terminating " character
_hooks.c:9: error: parse error before '{' token
_hooks.c:9:17: missing terminating " character
_hooks.c:10:1: missing terminating " character
_hooks.c:11:18: missing terminating " character
_hooks.c:12:1: missing terminating " character
_hooks.c:13: error: parse error before ';' token
make[1]: *** [_hooks.o] Error 1
make[1]: Leaving directory `/home/ros/reactos/lib/gdiplus/tests'
make: *** [tests/_regtests.c] Error 2

Thanks,
James

[Casper Hornstrup]

Which gcc version do you use? Can you send me your _hooks.c?

Casper

>   -----Original Message-----
>  From: ros-dev-bounces(a)reactos.com 
>  [mailto:[e-mail]] On Behalf Of James Tabor
>  Sent: 3. oktober 2004 18:48
>  To: ros-dev(a)reactos.com
>  Subject: [ros-dev] Re: [ros-cvs] CVS Update: reactos
>  
>  Hi,
>  
>  chorns(a)cvs.reactos.com wrote:
> >   CVSROOT:	/CVS/ReactOS
> >  Module name:	reactos
> >  Repository:	reactos/tools/
> >  Changes by:	chorns(a)mok.osexperts.com	04/10/02 01:44:54
> >  
> >  Modified files:
> >  	./: ChangeLog 
> >  	reactos/lib/gdiplus/tests/: .cvsignore Makefile 
> >  	reactos/lib/gdiplus/tests/tests/: test-1.c 
> >  	reactos/regtests/shared/: regtests.h 
> >  	reactos/tools/: helper.mk regtests.c Added files:
> >  	reactos/lib/gdiplus/tests/: stubs.tst Removed files:
> >  	reactos/lib/gdiplus/tests/: passthrough.c
> >  
> >  Log message:
> >  	2004-10-02  Casper S. Hornstrup  <chorns(a)users.sourceforge.net>
> >  	
> >  	* lib/gdiplus/tests/.cvsignore: Ignore _hooks.c and _stubs.S.
> >  	* lib/gdiplus/tests/Makefile (TARGET_OBJECTS): Remove  
>  passthrough.o and
> >   	add _hooks.o and _stubs.o.
> >  	* lib/gdiplus/tests/tests/test-1.c: Test API hooking.
> >  	* regtests/shared/regtests.h: Add support for API hooking.
> >  	* tools/helper.mk: Generate stubs.
> >  	* tools/regtests.c: Add support for generating stubs and hooks.
> >  	* lib/gdiplus/tests/passthrough.c: Remove.
> >  	* lib/gdiplus/tests/stubs.tst: New file.
> >   
>  
>  Build problem,
>  
>  i386-mingw32-gcc -I../include -DUNICODE -Wall -Werror 
>  -fno-builtin -D__USE_W32API -DWINVER=0x0600
>  -D_WIN32_WINNT=0x0501 -I../../../regtests/shared -I. 
>  -I../../../include -I../../../w32api/include -pipe 
>  -march=i486 -D_M_IX86 -g -c _hooks.c -o _hooks.o
>  _hooks.c:7:17: missing terminating " character
>  _hooks.c:8:1: missing terminating " character
>  _hooks.c:9: error: parse error before '{' token
>  _hooks.c:9:17: missing terminating " character
>  _hooks.c:10:1: missing terminating " character
>  _hooks.c:11:18: missing terminating " character
>  _hooks.c:12:1: missing terminating " character
>  _hooks.c:13: error: parse error before ';' token
>  make[1]: *** [_hooks.o] Error 1
>  make[1]: Leaving directory `/home/ros/reactos/lib/gdiplus/tests'
>  make: *** [tests/_regtests.c] Error 2
>  
>  Thanks,
>  James
>  _______________________________________________
>  Ros-dev mailing list
>  Ros-dev(a)reactos.com
>  http://reactos.com:8080/mailman/listinfo/ros-dev
>

[James Tabor]

Hi!
Casper Hornstrup wrote:
>   Which gcc version do you use? Can you send me your
> _hooks.c?
>  
>  Casper
>  
>   
gcc 3.3.1 ../configure --prefix=/usr --target=i386-mingw32 -v and bin 2.15.90.

Something is wrong with the lf/cr's.
James

/* This file is autogenerated. */
#include <windows.h>
#include "regtests.h"

API_DESCRIPTION ExternalDependencies[] =
{
  {"ntdll.dll", "RtlAllocateHeap@12
", NULL, NULL},
  {"ntdll.dll", "RtlFreeHeap@12
", NULL, NULL},
  {"msvcrt.dll", "printf
", NULL, NULL},
};

#define ExternalDependencyCount 4
ULONG MaxExternalDependency = ExternalDependencyCount - 1;

PVOID STDCALL
FrameworkGetHook(ULONG index)
{
  return FrameworkGetHookInternal(index);
}

[James Tabor]

_stubs.S

i386-mingw32-gcc -c -x assembler-with-cpp -g  -I../../../include -I../../../w32api/include
-D__ASM__ 
-D_M_IX86 -c _stubs.S -o _stubs.o
_stubs.S: Assembler messages:
_stubs.S:13: Error: invalid character '_' in mnemonic
_stubs.S:14: Warning: rest of line ignored; first ignored character is `:'
_stubs.S:20: Error: invalid character '_' in mnemonic
_stubs.S:21: Warning: rest of line ignored; first ignored character is `:'
_stubs.S:27: Error: invalid character '_' in mnemonic
_stubs.S:28: Warning: rest of line ignored; first ignored character is `:'
make: *** [_stubs.o] Error 1

James Tabor wrote:
>   Hi!
>  Casper Hornstrup wrote:
>  
> >   Which gcc version do you use? Can you send me
> > your _hooks.c?
> >
> >  Casper
> >
> >  
>  gcc 3.3.1 ../configure --prefix=/usr --target=i386-mingw32 -v and bin 
>  2.15.90.
>  
>  Something is wrong with the lf/cr's.
>  James
>  
>  
>  ------------------------------------------------------------------------
>  
>  /* This file is autogenerated. */
>  #include <windows.h>
>  #include "regtests.h"
>  
>  API_DESCRIPTION ExternalDependencies[] =
>  {
>    {"ntdll.dll", "RtlAllocateHeap@12
>  ", NULL, NULL},
>    {"ntdll.dll", "RtlFreeHeap@12
>  ", NULL, NULL},
>    {"msvcrt.dll", "printf
>  ", NULL, NULL},
>  };
>  
>  #define ExternalDependencyCount 4
>  ULONG MaxExternalDependency = ExternalDependencyCount - 1;
>  
>  PVOID STDCALL
>  FrameworkGetHook(ULONG index)
>  {
>    return FrameworkGetHookInternal(index);
>  }
>   
/* This file is autogenerated. */
passthrough:
  call _FrameworkGetHook@4
  test %eax, %eax
  je .return
  jmp *%eax
.return:
  /* This will most likely corrupt the stack */
  ret

.globl _RtlAllocateHeap@12

_RtlAllocateHeap@12
:
  pushl $0
  jmp passthrough

.globl _RtlFreeHeap@12

_RtlFreeHeap@12
:
  pushl $1
  jmp passthrough

.globl _printf

_printf
:
  pushl $2
  jmp passthrough

[Casper Hornstrup]

>   -----Original Message-----
>  From: ros-dev-bounces(a)reactos.com 
>  [mailto:[e-mail]] On Behalf Of James Tabor
>  Sent: 3. oktober 2004 21:23
>  To: ReactOS Development List
>  Subject: Re: [ros-dev] Re: [ros-cvs] CVS Update: reactos
>  
>  Hi!
>  Casper Hornstrup wrote:
> >   Which gcc version do you use? Can you send me
> > your _hooks.c?
> >  
> >  Casper
> >  
> >   
>  gcc 3.3.1 ../configure --prefix=/usr --target=i386-mingw32 -v 
>  and bin 2.15.90.
>  
>  Something is wrong with the lf/cr's.
>  James 
Does this patch fix the problem on Linux? Remember to do a make clean in lib/gdiplus.

Casper

[James Tabor]

Hi,
No, one thing, it did fix make clean, both _stubs.S and _hooks.c were removed.
Thanks,
James

Casper Hornstrup wrote:
>   
>  
>  Does this patch fix the problem on Linux? Remember to do a make clean in lib/gdiplus.
>  
>  Casper
>