Commit in reactos/lib/shell32 on MAIN
shell32_It.rc+1-11.2 -> 1.3
shelllink.c+1-11.14 -> 1.15
shlexec.c+1-11.30 -> 1.31
+3-3
3 modified files
merge Wine commits

reactos/lib/shell32
shell32_It.rc 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- shell32_It.rc	24 Jan 2004 23:00:51 -0000	1.2
+++ shell32_It.rc	5 Apr 2004 21:19:48 -0000	1.3
@@ -1,6 +1,6 @@
 /*
  * Copyright 1998 Juergen Schmied
- * Copyright 2003 Ivan Leo Murray-Smith
+ * Copyright 2003-2004 Ivan Leo Murray-Smith
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

reactos/lib/shell32
shelllink.c 1.14 -> 1.15
diff -u -r1.14 -r1.15
--- shelllink.c	27 Mar 2004 09:16:08 -0000	1.14
+++ shelllink.c	5 Apr 2004 21:19:48 -0000	1.15
@@ -241,7 +241,7 @@
             r = IPersistStream_Load(StreamThis, stm);
             ShellLink_UpdatePath(This->sPathRel, pszFileName, This->sWorkDir, &This->sPath);
             IStream_Release( stm );
-            This->bDirty = TRUE;
+            This->bDirty = FALSE;
         }
 
         return r;

reactos/lib/shell32
shlexec.c 1.30 -> 1.31
diff -u -r1.30 -r1.31
--- shlexec.c	27 Mar 2004 21:19:27 -0000	1.30
+++ shlexec.c	5 Apr 2004 21:19:48 -0000	1.31
@@ -325,7 +325,7 @@
         /* Give 30 seconds to the app to come up, if desired. Probably only needed
            when starting app immediately before making a DDE connection. */
         if (shWait)
-            if (WaitForInputIdle( info.hProcess, 30000 ) == -1)
+            if (WaitForInputIdle( info.hProcess, 30000 ) == WAIT_FAILED)
                 WARN("WaitForInputIdle failed: Error %ld\n", GetLastError() );
         retval = 33;
 
CVSspam 0.2.8