RFC PATCH: Fix unixism in shelllink.c

Steven Edwards Steven_Ed4153 at yahoo.com
Mon Jul 1 03:42:59 CDT 2002


I dont know if this will work or not and its untested under *nix as wine 
and my slack 8.1 install are still not getting along. WINE already implements 
_cwait so we should use it although I think this is wrong. 

Can someone check and fix it?

http://www.opengroup.org/onlinepubs/007908799/xsh/wait.html
http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore98/html/_crt__cwait.asp

The next one may be a bigger PITA because shelllink.c calls fork =(


Changelog:  Replace Unixism in shell32


cvs diff -u Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/shell32/Makefile.in,v
retrieving revision 1.50
diff -u -r1.50 Makefile.in
--- Makefile.in    14 Jun 2002 23:48:27 -0000    1.50
+++ Makefile.in    1 Jul 2002 08:29:24 -0000
@@ -5,7 +5,7 @@
 VPATH     = @srcdir@
 MODULE    = shell32.dll
 # fixme: avoid ole32.dll import
-IMPORTS   = ole32 shlwapi comctl32 user32 gdi32 advapi32 kernel32
+IMPORTS   = ole32 shlwapi comctl32 user32 gdi32 advapi32 kernel32 msvcrt
 ALTNAMES  = shell.dll
 EXTRALIBS = $(LIBUUID) $(LIBUNICODE)

cvs diff -u shelllink.c
Index: shelllink.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shelllink.c,v
retrieving revision 1.40
diff -u -r1.40 shelllink.c
--- shelllink.c    31 May 2002 23:25:52 -0000    1.40
+++ shelllink.c    1 Jul 2002 08:29:52 -0000
@@ -720,7 +720,7 @@
         _exit(1);
     }
 
-    while (waitpid( pid, &status, 0 ) == -1)
+    while (_cwait( &status, pid, 0 ) == -1)
     {
         if (errno != EINTR)
         {








More information about the wine-devel mailing list