Changeset 5618 for trunk/src/shell32/shelllink.c

Timestamp:

Apr 28, 2001, 3:33:49 PM (24 years ago)

Author:

sandervl

Message:

resync with latest wine

File:

• trunk/src/shell32/shelllink.c (modified) (22 diffs)

trunk/src/shell32/shelllink.c

@@ -1 @@
-/* $Id: shelllink.c,v 1.2 2000-11-06 10:20:56 sandervl Exp $ */
 /*
  *
@@ -6 +5 @@
  *
  */
-#ifdef __WIN32OS2__
-#define ICOM_CINTERFACE 1
-#include <odin.h>
-#endif
+
+#include "config.h"
 
 #include <string.h>
@@ -18 +15 @@
 #endif
 #include <errno.h>
-#ifndef __WIN32OS2__
-#include <sys/wait.h>
+#ifdef HAVE_SYS_WAIT_H
+# include <sys/wait.h>
 #endif
-
 #include "debugtools.h"
 #include "winerror.h"
 #include "winbase.h"
 #include "winnls.h"
+#include "winreg.h"
 
 #include "shlobj.h"
-#include "wine/winestring.h"
 #include "wine/undocshell.h"
 #ifndef __WIN32OS2__
@@ -38 +34 @@
 #include "shell32_main.h"
 #include "shlguid.h"
-#include "file.h"
-#include "options.h"
 
 DEFAULT_DEBUG_CHANNEL(shell);
@@ -355 +349 @@
 
     if (!(hModule = LoadLibraryExA(szFileName, 0, LOAD_LIBRARY_AS_DATAFILE)))
+    {
+        TRACE("LoadLibraryExA (%s) failed, error %ld\n", szFileName, GetLastError());
         goto error1;
+    }
 
     if (nIndex)
+    {
         hResInfo = FindResourceA(hModule, MAKEINTRESOURCEA(nIndex), RT_GROUP_ICONA);
+        TRACE("FindResourceA (%s) called, return 0x%x, error %ld\n", szFileName, hResInfo, GetLastError());
+    }
     else
         if (EnumResourceNamesA(hModule, RT_GROUP_ICONA, &EnumResNameProc, (LONG) &hResInfo))
+        {
+            TRACE("EnumResourceNamesA failed, error %ld\n", GetLastError());
             goto error2;
+        }
 
     if (!hResInfo)
+    {
+        TRACE("ExtractFromEXEDLL failed, error %ld\n", GetLastError());
         goto error2;
+    }
 
     if (!(hResData = LoadResource(hModule, hResInfo)))
+    {
+        TRACE("LoadResource failed, error %ld\n", GetLastError());
         goto error2;
+    }
     if (!(pIconDir = LockResource(hResData)))
+    {
+        TRACE("LockResource failed, error %ld\n", GetLastError());
         goto error3;
+    }
 
     for (i = 0; i < pIconDir->idCount; i++)
@@ -381 +393 @@
 
     if (!(hResInfo = FindResourceA(hModule, lpName, RT_ICONA)))
+    {
+        TRACE("Second FindResourceA failed, error %ld\n", GetLastError());
         goto error2;
+    }
     if (!(hResData = LoadResource(hModule, hResInfo)))
+    {
+        TRACE("Second LoadResource failed, error %ld\n", GetLastError());
         goto error2;
+    }
     if (!(pIcon = LockResource(hResData)))
+    {
+        TRACE("Second LockResource failed, error %ld\n", GetLastError());
         goto error3;
+    }
 
     if(!SaveIconResAsXPM(pIcon, szXPMFileName))
+    {
+        TRACE("Failed saving icon as XPM, error %ld\n", GetLastError());
         goto error3;
+    }
 
     FreeResource(hResData);
@@ -461 +485 @@
 inline static char *get_unix_file_name( const char *dos )
 {
-    DOS_FULL_NAME path;
-
-    if (!DOSFS_GetFullName( dos, FALSE, &path )) return NULL;
-    return HEAP_strdupA( GetProcessHeap(), 0, path.long_name );
+    char buffer[MAX_PATH];
+
+    if (!wine_get_unix_file_name( dos, buffer, sizeof(buffer) )) return NULL;
+    return HEAP_strdupA( GetProcessHeap(), 0, buffer );
 }
 
@@ -491 +515 @@
     return NULL;
 }
-#endif //#ifndef __WIN32OS2__
-
+#endif //__WIN32OS2__
 
 static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFileName, BOOL fRemember)
@@ -505 +528 @@
     char *work_dir = NULL;
     BOOL bDesktop;
+    HKEY hkey;
 
     _ICOM_THIS_From_IPersistFile(IShellLinkImpl, iface);
@@ -522 +546 @@
     return NOERROR;
 #else
-    PROFILE_GetWineIniString( "wine", "ShellLinker", "", buffer, sizeof(buffer) );
+    buffer[0] = 0;
+    if (!RegOpenKeyExA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Wine\\Config\\Wine",
+                        0, KEY_ALL_ACCESS, &hkey ))
+    {
+        DWORD type, count = sizeof(buffer);
+        if (RegQueryValueExA( hkey, "ShellLinker", 0, &type, buffer, &count )) buffer[0] = 0;
+        RegCloseKey( hkey );
+    }
     if (!*buffer) return NOERROR;
     shell_link_app = HEAP_strdupA( GetProcessHeap(), 0, buffer );
@@ -571 +602 @@
 
     /* extract the icon */
-    if (!(icon_name = extract_icon( This->sIcoPath ? This->sIcoPath : This->sPath,
-                                    This->iIcoNdx ))) goto done;
+    if (!(icon_name = extract_icon( This->sIcoPath && strlen(This->sIcoPath) ? 
+                                      This->sIcoPath : This->sPath,
+                                      This->iIcoNdx ))) goto done;
+
 
     TRACE("linker app='%s' link='%s' mode=%s path='%s' args='%s' icon='%s' workdir='%s' descr='%s'\n",
@@ -590 +623 @@
         argv[pos++] = path_name;
         argv[pos++] = bDesktop ? "--desktop" : "--menu";
-        if (This->sArgs)
+        if (This->sArgs && strlen(This->sArgs))
         {
             argv[pos++] = "--args";
@@ -600 +633 @@
             argv[pos++] = icon_name;
         }
-        if (This->sWorkDir)
+        if (This->sWorkDir && strlen(This->sWorkDir))
         {
             argv[pos++] = "--workdir";
             argv[pos++] = This->sWorkDir;
         }
-        if (This->sDescription)
+        if (This->sDescription && strlen(This->sDescription))
         {
             argv[pos++] = "--descr";
@@ -633 +666 @@
     HeapFree( GetProcessHeap(), 0, work_dir );
     return ret;
-#endif //__WIN32OS2__
+#endif
 }
 
@@ -1020 +1053 @@
         ICOM_THIS(IShellLinkImpl, iface);
         
-        FIXME("(%p)->()\n",This);
-        lstrcpynA(pszDir,"c:\\", cchMaxPath);
+        TRACE("(%p)->(%p len=%u)\n", This, pszDir, cchMaxPath);
+
+        lstrcpynA( pszDir, This->sWorkDir ? This->sWorkDir : "", cchMaxPath );
+
         return NOERROR;
 }
@@ -1041 +1076 @@
         ICOM_THIS(IShellLinkImpl, iface);
         
-        FIXME("(%p)->(%p len=%u)\n",This, pszArgs, cchMaxPath);
-        lstrcpynA(pszArgs, "", cchMaxPath);
+        TRACE("(%p)->(%p len=%u)\n", This, pszArgs, cchMaxPath);
+
+        lstrcpynA( pszArgs, This->sArgs ? This->sArgs : "", cchMaxPath );
+
         return NOERROR;
 }
@@ -1097 +1134 @@
         ICOM_THIS(IShellLinkImpl, iface);
         
-        FIXME("(%p)->(%p len=%u iicon=%p)\n",This, pszIconPath, cchIconPath, piIcon);
-        lstrcpynA(pszIconPath,"shell32.dll",cchIconPath);
-        *piIcon=1;
+        TRACE("(%p)->(%p len=%u iicon=%p)\n", This, pszIconPath, cchIconPath, piIcon);
+
+        lstrcpynA( pszIconPath, This->sIcoPath ? This->sIcoPath : "", cchIconPath );
+        *piIcon = This->iIcoNdx;
+
         return NOERROR;
 }
@@ -1215 +1254 @@
         
         FIXME("(%p)->(pfile=%p len=%u find_data=%p flags=%lu)\n",This, pszFile, cchMaxPath, pfd, fFlags);
-        lstrcpynAtoW(pszFile,"c:\\foo.bar", cchMaxPath);
+        MultiByteToWideChar( CP_ACP, 0, "c:\\foo.bar", -1, pszFile, cchMaxPath );
         return NOERROR;
 }
@@ -1241 +1280 @@
         
         FIXME("(%p)->(%p len=%u)\n",This, pszName, cchMaxName);
-        lstrcpynAtoW(pszName,"Description, FIXME",cchMaxName);
+        MultiByteToWideChar( CP_ACP, 0, "Description, FIXME", -1, pszName, cchMaxName );
         return NOERROR;
 }
@@ -1263 +1302 @@
         _ICOM_THIS_From_IShellLinkW(IShellLinkImpl, iface);
         
-        FIXME("(%p)->()\n",This);
-        lstrcpynAtoW(pszDir,"c:\\", cchMaxPath);
+        TRACE("(%p)->(%p len %u)\n", This, pszDir, cchMaxPath);
+
+        MultiByteToWideChar( CP_ACP, 0, This->sWorkDir ? This->sWorkDir : "", -1, pszDir, cchMaxPath );
+
         return NOERROR;
 }
@@ -1286 +1327 @@
         _ICOM_THIS_From_IShellLinkW(IShellLinkImpl, iface);
         
-        FIXME("(%p)->(%p len=%u)\n",This, pszArgs, cchMaxPath);
-        lstrcpynAtoW(pszArgs, "", cchMaxPath);
+        TRACE("(%p)->(%p len=%u)\n", This, pszArgs, cchMaxPath);
+
+        MultiByteToWideChar( CP_ACP, 0, This->sArgs ? This->sArgs : "", -1, pszArgs, cchMaxPath );
+
         return NOERROR;
 }
@@ -1343 +1386 @@
         _ICOM_THIS_From_IShellLinkW(IShellLinkImpl, iface);
         
-        FIXME("(%p)->(%p len=%u iicon=%p)\n",This, pszIconPath, cchIconPath, piIcon);
-        lstrcpynAtoW(pszIconPath,"shell32.dll",cchIconPath);
-        *piIcon=1;
+        TRACE("(%p)->(%p len=%u iicon=%p)\n", This, pszIconPath, cchIconPath, piIcon);
+
+        MultiByteToWideChar( CP_ACP, 0, This->sIcoPath ? This->sIcoPath : "", -1, pszIconPath, cchIconPath );
+        *piIcon = This->iIcoNdx;
+
         return NOERROR;
 }