Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

merge Wine commits

Browse source 
svn path=/trunk/; revision=8980
This commit is contained in:
Martin Fuchs 2004-04-05 21:19:48 +00:00
parent bd69e8d121
commit beedced608
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/lib/shell32/shell32_It.rc
View file

@ -1,6 +1,6 @@
/* /*
* Copyright 1998 Juergen Schmied * 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 * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public

2
reactos/lib/shell32/shelllink.c
View file

@ -241,7 +241,7 @@ static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR pszFile
r = IPersistStream_Load(StreamThis, stm); r = IPersistStream_Load(StreamThis, stm);
ShellLink_UpdatePath(This->sPathRel, pszFileName, This->sWorkDir, &This->sPath); ShellLink_UpdatePath(This->sPathRel, pszFileName, This->sWorkDir, &This->sPath);
IStream_Release( stm ); IStream_Release( stm );
This->bDirty = TRUE; This->bDirty = FALSE;
} }
return r; return r;

2
reactos/lib/shell32/shlexec.c
View file

@ -325,7 +325,7 @@ static UINT SHELL_ExecuteW(const WCHAR *lpCmd, void *env, BOOL shWait,
/* Give 30 seconds to the app to come up, if desired. Probably only needed /* Give 30 seconds to the app to come up, if desired. Probably only needed
when starting app immediately before making a DDE connection. */ when starting app immediately before making a DDE connection. */
if (shWait) if (shWait)
if (WaitForInputIdle( info.hProcess, 30000 ) == -1) if (WaitForInputIdle( info.hProcess, 30000 ) == WAIT_FAILED)
WARN("WaitForInputIdle failed: Error %ld\n", GetLastError() ); WARN("WaitForInputIdle failed: Error %ld\n", GetLastError() );
retval = 33; retval = 33;