Changeset 898 for trunk/src

Timestamp:

Sep 9, 1999, 10:48:40 PM (26 years ago)

Author:

phaller

Message:

.

Location:

trunk/src/shell32/new

Files:

• shell.cpp (modified) (2 diffs)
• shell32.def (modified) (2 diffs)
• shell32_main.cpp (modified) (5 diffs)
• shellguid.cpp (modified) (1 diff)
• shellord.cpp (modified) (1 diff)
• shlview.cpp (modified) (1 diff)

trunk/src/shell32/new/shell.cpp

@@ -32 +32 @@
 //#include "syslevel.h"
 #include "imagelist.h"
+#include "shell32_main.h"
 
 #include <heapstring.h>
@@ -182 +183 @@
     GlobalUnlock(hDrop);
     return i;
+}
+
+
+/*****************************************************************************
+ * Name      : UINT DragQueryFileAorW
+ * Purpose   :
+ * Parameters: HDROP  hDrop    - drop structure handle
+ *             UINT   iFile    - index of file to query
+ *             LPTSTR lpszFile - target buffer
+ *             UINT   cch      - target buffer size
+ * Variables :
+ * Result    :
+ * Remark    :
+ * Status    : UNTESTED STUB
+ *
+ * Author    : Patrick Haller [Tue, 1999/06/09 20:00]
+ *****************************************************************************/
+
+UINT WIN32API DragQueryFileAorW(HDROP  hDrop,
+                                UINT   iFile,
+                                LPTSTR lpszFile,
+                                UINT   cch)
+{
+  dprintf(("SHELL32: DragQueryFileAorW(%08xh,%08xh,%s,%08xh).\n",
+           hDrop,
+           iFile,
+           lpszFile,
+           cch));
+
+  // @@@PH maybe they want automatic determination here
+  if (VERSION_OsIsUnicode())
+    return DragQueryFileW(hDrop, iFile, (LPWSTR)lpszFile, cch);
+  else
+    return DragQueryFileA(hDrop, iFile, lpszFile, cch);
 }
 

trunk/src/shell32/new/shell32.def

@@ -1 @@
-; $Id: shell32.def,v 1.4 1999-09-09 20:17:45 phaller Exp $
+; $Id: shell32.def,v 1.5 1999-09-09 20:48:40 phaller Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -78 +78 @@
 ;   SHCreateDefClassObject            = _SHCreateDefClassObject@?             @70
     Shell_GetImageList                = _Shell_GetImageList@8                 @71
-    Shell_GetCachedImageIndex         = _Shell_GetCachedImageIndex@12         @72
+    Shell_GetCachedImageIndex         = _Shell_GetCachedImageIndexAW@12       @72
+    Shell_GetCachedImageIndexW        = _Shell_GetCachedImageIndexW@12
+    Shell_GetCachedImageIndexA        = _Shell_GetCachedImageIndexA@12
     SHShellFolderView_Message         = _SHShellFolderView_Message@12         @73
 ;   SHCreateStdEnumFmtEtc             = _SHCreateStdEnumFmtEtc@?              @74

trunk/src/shell32/new/shell32_main.cpp

@@ -396 +396 @@
 #define         DROP_FIELD_TOP          (-15)
 #define         DROP_FIELD_HEIGHT       15
-
-extern HICON hIconTitleFont;
 
 static BOOL __get_dropline( HWND hWnd, LPRECT lprect )
@@ -467 +465 @@
  * ShellExecuteA                        [SHELL32.245]
  */
+
 HINSTANCE WINAPI ShellExecuteA( HWND hWnd, LPCSTR lpOperation,
                                     LPCSTR lpFile, LPCSTR lpParameters,
                                     LPCSTR lpDirectory, INT iShowCmd )
-{   TRACE_(shell)("\n");
-    return ShellExecute16( hWnd, lpOperation, lpFile, lpParameters,
-                           lpDirectory, iShowCmd );
-}
+{   HINSTANCE retval=31;
+    char old_dir[1024];
+    char cmd[256];
+
+    TRACE_(shell)("(%04x,'%s','%s','%s','%s',%x)\n",
+                hWnd, lpOperation ? lpOperation:"<null>", lpFile ? lpFile:"<null>",
+                lpParameters ? lpParameters : "<null>",
+                lpDirectory ? lpDirectory : "<null>", iShowCmd);
+
+    if (lpFile==NULL) return 0; /* should not happen */
+    if (lpOperation==NULL) /* default is open */
+      lpOperation="open";
+
+    if (lpDirectory)
+    { GetCurrentDirectoryA( sizeof(old_dir), old_dir );
+        SetCurrentDirectoryA( lpDirectory );
+    }
+
+    retval = SHELL_FindExecutable( lpFile, lpOperation, cmd );
+
+    if (retval > 32)  /* Found */
+    {
+        if (lpParameters)
+        {
+            strcat(cmd," ");
+            strcat(cmd,lpParameters);
+        }
+
+        TRACE_(shell)("starting %s\n",cmd);
+        retval = WinExec( cmd, iShowCmd );
+    }
+    if (lpDirectory)
+      SetCurrentDirectoryA( old_dir );
+    return retval;
+}
+
 
 /*************************************************************************
@@ -518 +549 @@
                 hWndCtl = GetDlgItem(hWnd, IDC_LISTBOX);
                 SendMessageA( hWndCtl, WM_SETREDRAW, 0, 0 );
-                SendMessageA( hWndCtl, WM_SETFONT, hIconTitleFont, 0 );
                 while (*pstr)
           { SendMessageA( hWndCtl, LB_ADDSTRING, (WPARAM)-1, (LPARAM)*pstr );
@@ -685 +715 @@
 
 /*************************************************************************
+ * Shell_NotifyIcon                     [SHELL32.297]
+ *      FIXME
+ *      This function is supposed to deal with the systray.
+ *      Any ideas on how this is to be implimented?
+ */
+BOOL WINAPI Shell_NotifyIconA(DWORD dwMessage, PNOTIFYICONDATAA pnid )
+{   TRACE_(shell)("\n");
+    return FALSE;
+}
+
+/*************************************************************************
+ * Shell_NotifyIcon                     [SHELL32.?]
+ *      FIXME
+ *      This function is supposed to deal with the systray.
+ *      Any ideas on how this is to be implimented?
+ */
+BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW pnid )
+{   TRACE_(shell)("\n");
+    return FALSE;
+}
+
+
+/*************************************************************************
  * Shell_NotifyIcon                     [SHELL32.296]
  *      FIXME
@@ -692 +745 @@
 BOOL WINAPI Shell_NotifyIcon(   DWORD dwMessage, PNOTIFYICONDATAA pnid )
 {   TRACE_(shell)("\n");
-    return FALSE;
-}
-
-/*************************************************************************
- * Shell_NotifyIcon                     [SHELL32.297]
- *      FIXME
- *      This function is supposed to deal with the systray.
- *      Any ideas on how this is to be implimented?
- */
-BOOL WINAPI Shell_NotifyIconA(DWORD dwMessage, PNOTIFYICONDATAA pnid )
-{   TRACE_(shell)("\n");
-    return FALSE;
+  if (VERSION_OsIsUnicode())
+    return(Shell_NotifyIconW(dwMessage,(PNOTIFYICONDATAW)pnid));
+  else
+    return(Shell_NotifyIconA(dwMessage,pnid));
 }
 

trunk/src/shell32/new/shellguid.cpp

@@ -25 +25 @@
 #include <wine/obj_extracticon.h>
 #include <wine/obj_shellextinit.h>
-//#include <docobj.h>
+#include <docobj.h>
 
 /*

trunk/src/shell32/new/shellord.cpp

@@ -864 +864 @@
 }
 /*************************************************************************
+ * SHRegQueryValueA                             [NT4.0:SHELL32.?]
+ *
+ */
+HRESULT WINAPI SHRegQueryValueA (HKEY hkey, LPSTR lpszSubKey,
+                                 LPSTR lpszData, LPDWORD lpcbData )
+{       WARN("0x%04x %s %p %p semi-stub\n",
+                hkey, lpszSubKey, lpszData, lpcbData);
+        return RegQueryValueA( hkey, lpszSubKey, lpszData, (LPLONG)lpcbData );
+}
+
+/*************************************************************************
  * SHRegQueryValueExA                           [SHELL32.509]
  *

trunk/src/shell32/new/shlview.cpp

@@ -39 +39 @@
 
 DEFAULT_DEBUG_CHANNEL(shell)
+
 
 typedef struct