Changeset 10259 for trunk/src

Timestamp:

Oct 2, 2003, 12:39:22 PM (22 years ago)

Author:

sandervl

Message:

Added stubs for SHGetNewLinkInfoA/W ; Add support for Unicode adding of files to 'recent document'

Location:

trunk/src/shell32

Files:

• shell32.def (modified) (4 diffs)
• shell32dbg.def (modified) (4 diffs)
• shellord.c (modified) (4 diffs)
• shellstub.cpp (modified) (2 diffs)

trunk/src/shell32/shell32.def

@@ -1 @@
-; $Id: shell32.def,v 1.39 2003-02-14 10:07:18 sandervl Exp $
+; $Id: shell32.def,v 1.40 2003-10-02 10:39:21 sandervl Exp $
 
 ; Based on Windows 95
@@ -188 +188 @@
 ;   DAD_SetDragImageFromListView      = _DAD_SetDragImageFromListView@?       @177
 ;   SHObjectProperties                = _SHObjectProperties@?                 @178
-;   SHGetNewLinkInfoA                 = _SHGetNewLinkInfoA@?                  @179
-;   SHGetNewLinkInfoW                 = _SHGetNewLinkInfoW@?                  @180
+    SHGetNewLinkInfoA                 = _SHGetNewLinkInfoA@20                 @179
+    SHGetNewLinkInfoW                 = _SHGetNewLinkInfoW@20                 @180
     RegisterShellHook                 = _RegisterShellHook@8                  @181
     ShellMessageBoxW                  = _ShellMessageBoxW                     @182 ;cdecl
@@ -369 +369 @@
     WriteCabinetState                 = _WriteCabinetState@4                  @652
     PathProcessCommand                = _PathProcessCommandAW@16              @653
-                                        _SHELL32_654@8                        @654
+                                        _SHELL32_654@8                        @654 NONAME
     FileIconInit                      = _FileIconInit@4                       @660
     IsUserAdmin                       = _IsUserAdmin@0                        @680
@@ -394 +394 @@
     DllCanUnloadNow                   = _SHELL32_DllCanUnloadNow@0            @1221
 
-    _StrFormatByteSizeA@12                @1041
-    _StrFormatByteSizeW@12                @1042
+    _StrFormatByteSizeA@12                @1041 NONAME
+    _StrFormatByteSizeW@12                @1042 NONAME

trunk/src/shell32/shell32dbg.def

@@ -1 @@
-; $Id: shell32dbg.def,v 1.4 2003-02-14 10:07:18 sandervl Exp $
+; $Id: shell32dbg.def,v 1.5 2003-10-02 10:39:22 sandervl Exp $
 
 ; Based on Windows 95
@@ -188 +188 @@
 ;   DAD_SetDragImageFromListView      = _DbgDAD_SetDragImageFromListView@?       @177
 ;   SHObjectProperties                = _DbgSHObjectProperties@?                 @178
-;   SHGetNewLinkInfoA                 = _DbgSHGetNewLinkInfoA@?                  @179
-;   SHGetNewLinkInfoW                 = _DbgSHGetNewLinkInfoW@?                  @180
+    SHGetNewLinkInfoA                 = _SHGetNewLinkInfoA@20                    @179
+    SHGetNewLinkInfoW                 = _SHGetNewLinkInfoW@20                    @180
     RegisterShellHook                 = _DbgRegisterShellHook@8                  @181
     ShellMessageBoxW                  = _ShellMessageBoxW                     @182 ;cdecl
@@ -369 +369 @@
     WriteCabinetState                 = _DbgWriteCabinetState@4                  @652
     PathProcessCommand                = _DbgPathProcessCommandAW@16              @653
-                                        _SHELL32_654@8                        @654
+                                        _SHELL32_654@8                        @654 NONAME
     FileIconInit                      = _DbgFileIconInit@4                       @660
     IsUserAdmin                       = _DbgIsUserAdmin@0                        @680
@@ -394 +394 @@
     DllCanUnloadNow                   = _DbgSHELL32_DllCanUnloadNow@0            @1221
 
-    _StrFormatByteSizeA@12                @1041
-    _StrFormatByteSizeW@12                @1042
+    _StrFormatByteSizeA@12                @1041 NONAME
+    _StrFormatByteSizeW@12                @1042 NONAME

trunk/src/shell32/shellord.c

@@ -746 +746 @@
     /* Get the pure document name from the input
      */
+#ifdef __WIN32OS2__
+    if (uFlags == SHARD_PIDL)
+        SHGetPathFromIDListA((LPCITEMIDLIST) pv, doc_name);
+    else 
+        if (uFlags == SHARD_PATHW)
+                lstrcpyWtoA(doc_name, (LPWSTR) pv);
+        else
+                lstrcpyA(doc_name, (LPSTR) pv);
+#else
     if (uFlags & SHARD_PIDL) {
         SHGetPathFromIDListA((LPCITEMIDLIST) pv, doc_name);
@@ -752 +761 @@
         lstrcpyA(doc_name, (LPSTR) pv);
     }
+#endif
     TRACE("full document name %s\n", doc_name);
     PathStripPathA(doc_name);
@@ -891 +901 @@
 
             /* Set the document path or pidl */
+#ifdef __WIN32OS2__
+            if (uFlags == SHARD_PIDL)
+                hres = IShellLinkA_SetIDList(psl, (LPCITEMIDLIST) pv);
+            else 
+             if (uFlags == SHARD_PIDL)
+                hres = IShellLinkW_SetPath(psl, (LPCWSTR) pv);
+             else 
+                hres = IShellLinkA_SetPath(psl, (LPCWSTR) pv);
+#else
+
             if (uFlags & SHARD_PIDL) {
                 hres = IShellLinkA_SetIDList(psl, (LPCITEMIDLIST) pv);
@@ -896 +916 @@
                 hres = IShellLinkA_SetPath(psl, (LPCSTR) pv);
             }
+#endif
             if(FAILED(hres)) {
                 /* bombed */

trunk/src/shell32/shellstub.cpp

@@ -1 @@
-/* $Id: shellstub.cpp,v 1.5 2002-02-14 12:10:11 sandervl Exp $ */
+/* $Id: shellstub.cpp,v 1.6 2003-10-02 10:39:22 sandervl Exp $ */
 
 /*
@@ -110 +110 @@
   return 0;
 }
+
+BOOL WIN32API SHGetNewLinkInfoA(LPCTSTR pszLinkTo, LPCTSTR pszDir,
+                                LPTSTR pszName, BOOL *pfMustCopy,
+                                UINT uFlags)
+{
+  dprintf(("NOT IMPLEMENTED: SHGetNewLinkInfoA %s %s %s %x %x", pszLinkTo, pszDir, pszName, pfMustCopy, uFlags));
+  return FALSE;
+}
+
+BOOL WIN32API SHGetNewLinkInfoW(LPCWSTR pszLinkTo, LPCWSTR pszDir,
+                                LPWSTR pszName, BOOL *pfMustCopy,
+                                UINT uFlags)
+{
+  dprintf(("NOT IMPLEMENTED: SHGetNewLinkInfoA %ls %ls %ls %x %x", pszLinkTo, pszDir, pszName, pfMustCopy, uFlags));
+  return FALSE;
+}