Alexandre Julliard : wine.inf: Use the new fake dlls mechanism to create placeholders for

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: d404fb5bf84206b5990516e85f48096196f8cd55
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=d404fb5bf84206b5990516e8...

Author: Alexandre Julliard 
Date:   Tue Mar 21 11:40:11 2006 +0100

wine.inf: Use the new fake dlls mechanism to create placeholders for
applications instead of using symlinks.

---

tools/wine.inf            |   19 +++++++++++++++++++
 tools/wineprefixcreate.in |   34 ----------------------------------
 2 files changed, 19 insertions(+), 34 deletions(-)

diff --git a/tools/wine.inf b/tools/wine.inf
index 580c3bb..747eb83 100644
--- a/tools/wine.inf
+++ b/tools/wine.inf
@@ -27,6 +27,7 @@ signature="$CHICAGO$"

[DefaultInstall]
 RegisterDlls=RegisterDllsSection
+WineFakeDlls=FakeDllsSection
 UpdateInis=SystemIni
 AddReg=\
     Classes,\
@@ -48,6 +49,7 @@ AddReg=\

[DefaultInstall.NT]
 RegisterDlls=RegisterDllsSection
+WineFakeDlls=FakeDllsSection
 UpdateInis=SystemIni
 AddReg=\
     Classes,\
@@ -2100,6 +2102,23 @@ HKLM,%CurrentVersion%\Telephony\Country 
 11,,shell32.dll,1
 11,,urlmon.dll,1

+[FakeDllsSection]
+10,,notepad.exe
+10,,regedit.exe
+10,,rundll32.exe
+10,,winebrowser.exe
+10,,winhelp.exe
+10,,winhlp32.exe,winhelp.exe
+10,command,start.exe
+11,,control.exe
+11,,help.exe,winhelp.exe
+11,,msiexec.exe
+11,,notepad.exe
+11,,progman.exe
+11,,regsvr32.exe
+11,,wcmd.exe
+11,,winver.exe
+
 [SystemIni]
 system.ini, mci,,"MPEGVideo=mciqtz.drv" 
 system.ini, mci,,"MPEGVideo2=mciqtz.drv" 
diff --git a/tools/wineprefixcreate.in b/tools/wineprefixcreate.in
index 8a7e6d8..d716991 100644
--- a/tools/wineprefixcreate.in
+++ b/tools/wineprefixcreate.in
@@ -164,40 +164,6 @@ do
     [ -d "$i" ] || mkdir "$i"
 done

-# Create the application symlinks
-
-link_app()
-{
-    if [ ! -f "$2" ]
-    then
-        # make a copy if the original is writable
-        if [ -w "$dlldir/$1.exe.so" ]
-        then
-            cp "$dlldir/$1.exe.so" "$2" || echo "Warning: failed to create $2"
-        else
-            ln -s "$dlldir/$1.exe.so" "$2" || echo "Warning: failed to create $2"
-        fi
-    fi
-}
-
-link_app start        "$CROOT/windows/command/start.exe"
-link_app notepad      "$CROOT/windows/notepad.exe"
-link_app regedit      "$CROOT/windows/regedit.exe"
-link_app rundll32     "$CROOT/windows/rundll32.exe"
-link_app wcmd         "$CROOT/windows/system32/wcmd.exe"
-link_app control      "$CROOT/windows/system32/control.exe"
-link_app winhelp      "$CROOT/windows/system32/help.exe"
-link_app msiexec      "$CROOT/windows/system32/msiexec.exe"
-link_app notepad      "$CROOT/windows/system32/notepad.exe"
-link_app progman      "$CROOT/windows/system32/progman.exe"
-link_app regsvr32     "$CROOT/windows/system32/regsvr32.exe"
-link_app winemine     "$CROOT/windows/system32/winmine.exe"
-link_app winver       "$CROOT/windows/system32/winver.exe"
-link_app uninstaller  "$CROOT/windows/uninstall.exe"
-link_app winhelp      "$CROOT/windows/winhelp.exe"
-link_app winhelp      "$CROOT/windows/winhlp32.exe"
-link_app winebrowser  "$CROOT/windows/winebrowser.exe"
-
 # Copy the .inf script and run it

cp "$datadir/wine.inf" "$CROOT/windows/inf/wine.inf"