Hello, License: LGPL, X11 Changelog: Michael Stefaniuc <mstefani@redhat.com> - compile the msvcrt dll with -DSTRICT bye michael -- Michael Stefaniuc Tel.: +49-711-96437-199 System Administration Fax.: +49-711-96437-111 Red Hat GmbH Email: mstefani@redhat.com Hauptstaetterstr. 58 http://www.redhat.de/ D-70178 Stuttgart
Index: dlls/msvcrt/Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/msvcrt/Makefile.in,v
retrieving revision 1.10
diff -u -u -r1.10 Makefile.in
--- dlls/msvcrt/Makefile.in 18 Oct 2002 23:46:29 -0000 1.10
+++ dlls/msvcrt/Makefile.in 24 Oct 2002 18:29:51 -0000
@@ -1,4 +1,4 @@
-EXTRADEFS = -DUSE_MSVCRT_PREFIX -D_MT -DWINE_NO_STRICT
+EXTRADEFS = -DUSE_MSVCRT_PREFIX -D_MT
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
Index: dlls/msvcrt/dir.c
===================================================================
RCS file: /home/wine/wine/dlls/msvcrt/dir.c,v
retrieving revision 1.14
diff -u -u -r1.14 dir.c
--- dlls/msvcrt/dir.c 17 Sep 2002 18:32:53 -0000 1.14
+++ dlls/msvcrt/dir.c 24 Oct 2002 18:29:51 -0000
@@ -153,8 +153,8 @@
return -1;
}
msvcrt_fttofd(&find_data,ft);
- TRACE(":got handle %d\n",hfind);
- return hfind;
+ TRACE(":got handle %p\n",hfind);
+ return (long)hfind;
}
/*********************************************************************
@@ -172,8 +172,8 @@
return -1;
}
msvcrt_wfttofd(&find_data,ft);
- TRACE(":got handle %d\n",hfind);
- return hfind;
+ TRACE(":got handle %p\n",hfind);
+ return (long)hfind;
}
/*********************************************************************
@@ -183,7 +183,7 @@
{
WIN32_FIND_DATAA find_data;
- if (!FindNextFileA(hand, &find_data))
+ if (!FindNextFileA((HANDLE)hand, &find_data))
{
*MSVCRT__errno() = MSVCRT_ENOENT;
return -1;
@@ -200,7 +200,7 @@
{
WIN32_FIND_DATAW find_data;
- if (!FindNextFileW(hand, &find_data))
+ if (!FindNextFileW((HANDLE)hand, &find_data))
{
*MSVCRT__errno() = MSVCRT_ENOENT;
return -1;
Index: dlls/msvcrt/file.c
===================================================================
RCS file: /home/wine/wine/dlls/msvcrt/file.c,v
retrieving revision 1.39
diff -u -u -r1.39 file.c
--- dlls/msvcrt/file.c 17 Sep 2002 18:32:53 -0000 1.39
+++ dlls/msvcrt/file.c 24 Oct 2002 18:29:52 -0000
@@ -131,7 +131,7 @@
{
int fd = MSVCRT_fdstart;
- TRACE(":handle (%d) allocating fd (%d)\n",hand,fd);
+ TRACE(":handle (%p) allocating fd (%d)\n",hand,fd);
if (fd >= MSVCRT_MAX_FILES)
{
WARN(":files exhausted!\n");
@@ -192,7 +192,7 @@
MSVCRT_handles[2] = GetStdHandle(STD_ERROR_HANDLE);
MSVCRT_flags[2] = MSVCRT__iob[2]._flag = MSVCRT__IOWRT;
- TRACE(":handles (%d)(%d)(%d)\n",MSVCRT_handles[0],
+ TRACE(":handles (%p)(%p)(%p)\n",MSVCRT_handles[0],
MSVCRT_handles[1],MSVCRT_handles[2]);
for (i = 0; i < 3; i++)
@@ -366,7 +366,7 @@
{
HANDLE hand = msvcrt_fdtoh(fd);
- TRACE(":fd (%d) handle (%d)\n",fd,hand);
+ TRACE(":fd (%d) handle (%p)\n",fd,hand);
if (hand == INVALID_HANDLE_VALUE)
return -1;
/* flush stdio buffers */
@@ -409,7 +409,7 @@
{
HANDLE hand = msvcrt_fdtoh(fd);
- TRACE(":fd (%d) handle (%d)\n",fd,hand);
+ TRACE(":fd (%d) handle (%p)\n",fd,hand);
if (hand == INVALID_HANDLE_VALUE)
return -1;
@@ -438,7 +438,7 @@
DWORD curpos,endpos;
HANDLE hand = msvcrt_fdtoh(fd);
- TRACE(":fd (%d) handle (%d)\n",fd,hand);
+ TRACE(":fd (%d) handle (%p)\n",fd,hand);
if (hand == INVALID_HANDLE_VALUE)
return -1;
@@ -486,7 +486,7 @@
DWORD ret;
HANDLE hand = msvcrt_fdtoh(fd);
- TRACE(":fd (%d) handle (%d)\n",fd,hand);
+ TRACE(":fd (%d) handle (%p)\n",fd,hand);
if (hand == INVALID_HANDLE_VALUE)
return -1;
@@ -534,7 +534,7 @@
DWORD cur_locn;
HANDLE hand = msvcrt_fdtoh(fd);
- TRACE(":fd (%d) handle (%d)\n",fd,hand);
+ TRACE(":fd (%d) handle (%p)\n",fd,hand);
if (hand == INVALID_HANDLE_VALUE)
return -1;
@@ -746,7 +746,7 @@
{
HANDLE hand = msvcrt_fdtoh(fd);
HANDLE newhand = hand;
- TRACE(":fd (%d) handle (%d)\n",fd,hand);
+ TRACE(":fd (%d) handle (%p)\n",fd,hand);
if (hand != INVALID_HANDLE_VALUE)
{
@@ -762,7 +762,7 @@
DuplicateHandle(GetCurrentProcess(),hand,GetCurrentProcess(),
&newhand,0,TRUE,DUPLICATE_SAME_ACCESS);
}
- return newhand;
+ return (long)newhand;
}
/*********************************************************************
@@ -772,7 +772,7 @@
{
HANDLE hand = msvcrt_fdtoh(fd);
- TRACE(":fd (%d) handle (%d)\n",fd,hand);
+ TRACE(":fd (%d) handle (%p)\n",fd,hand);
if (hand == INVALID_HANDLE_VALUE)
return 0;
@@ -954,7 +954,7 @@
fd = msvcrt_alloc_fd(hand, ioflag);
- TRACE(":fd (%d) handle (%d)\n",fd, hand);
+ TRACE(":fd (%d) handle (%p)\n",fd, hand);
if (fd > 0)
{
@@ -1057,7 +1057,7 @@
{
/* _O_RDONLY (0) always matches, so set the read flag*/
/* FIXME: handle more flags */
- int fd= msvcrt_alloc_fd(hand,flags|MSVCRT__IOREAD);
+ int fd= msvcrt_alloc_fd((HANDLE)hand,flags|MSVCRT__IOREAD);
TRACE(":handle (%ld) fd (%d) flags 0x%08x\n",hand,fd, flags |MSVCRT__IOREAD);
return fd;
}
@@ -1091,7 +1091,7 @@
/* Dont trace small reads, it gets *very* annoying */
if (count > 4)
- TRACE(":fd (%d) handle (%d) buf (%p) len (%d)\n",fd,hand,buf,count);
+ TRACE(":fd (%d) handle (%p) buf (%p) len (%d)\n",fd,hand,buf,count);
if (hand == INVALID_HANDLE_VALUE)
return -1;
Index: dlls/msvcrt/main.c
===================================================================
RCS file: /home/wine/wine/dlls/msvcrt/main.c,v
retrieving revision 1.11
diff -u -u -r1.11 main.c
--- dlls/msvcrt/main.c 19 Jul 2002 03:24:50 -0000 1.11
+++ dlls/msvcrt/main.c 24 Oct 2002 18:29:52 -0000
@@ -43,7 +43,7 @@
{
MSVCRT_thread_data *tls;
- TRACE("(0x%08x, %s, %p) pid(%ld), tid(%ld), tls(%ld)\n",
+ TRACE("(%p, %s, %p) pid(%ld), tid(%ld), tls(%ld)\n",
hinstDLL, msvcrt_get_reason(fdwReason), lpvReserved,
(long)GetCurrentProcessId(), (long)GetCurrentThreadId(),
(long)MSVCRT_tls_index);
Index: dlls/msvcrt/thread.c
===================================================================
RCS file: /home/wine/wine/dlls/msvcrt/thread.c,v
retrieving revision 1.11
diff -u -u -r1.11 thread.c
--- dlls/msvcrt/thread.c 20 Jul 2002 20:30:57 -0000 1.11
+++ dlls/msvcrt/thread.c 24 Oct 2002 18:29:52 -0000
@@ -92,7 +92,8 @@
trampoline->arglist = arglist;
/* FIXME */
- return CreateThread(NULL, stack_size, _beginthread_trampoline, trampoline, 0, NULL);
+ return (unsigned long)CreateThread(NULL, stack_size, _beginthread_trampoline,
+ trampoline, 0, NULL);
}
/*********************************************************************
@@ -109,8 +110,9 @@
TRACE("(%p, %d, %p, %p, %d, %p)\n", security, stack_size, start_address, arglist, initflag, thrdaddr);
/* FIXME */
- return CreateThread(security, stack_size, (LPTHREAD_START_ROUTINE) start_address,
- arglist, initflag, (LPDWORD) thrdaddr);
+ return (unsigned long)CreateThread(security, stack_size,
+ (LPTHREAD_START_ROUTINE) start_address,
+ arglist, initflag, (LPDWORD) thrdaddr);
}
/*********************************************************************
Attachment:
pgp00074.pgp
Description: PGP signature
