Changeset 5618 for trunk/src/shell32

Timestamp:

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

Author:

sandervl

Message:

resync with latest wine

Location:

trunk/src/shell32

Files:

• brsfolder.c (modified) (2 diffs)
• control.c (added)
• dialogs.c (modified) (2 diffs)
• folders.c (modified) (2 diffs)
• iconcache.c (modified) (4 diffs)
• makefile (modified) (2 diffs)
• memorystream.c (modified) (2 diffs)
• pidl.c (modified) (20 diffs)
• pidl.h (modified) (5 diffs)
• sh.cpp (modified) (2 diffs)
• shell32.def (modified) (7 diffs)
• shell32_main.c (modified) (10 diffs)
• shell32_main.h (modified) (4 diffs)
• shellfolder.h (modified) (2 diffs)
• shellguid.c (modified) (2 diffs)
• shelllink.c (modified) (22 diffs)
• shellole.c (modified) (11 diffs)
• shellord.c (modified) (11 diffs)
• shellpath.c (modified) (15 diffs)
• shellreg.c (modified) (6 diffs)
• shellstring.c (modified) (3 diffs)
• shellstub.cpp (modified) (2 diffs)
• shlfolder.c (modified) (15 diffs)
• shlmenu.c (modified) (7 diffs)
• shlview.c (modified) (6 diffs)
• shpolicy.c (modified) (2 diffs)
• shpolicy.h (modified) (1 diff)
• shres.orc (modified) (2 diffs)
• shv_bg_cmenu.c (modified) (5 diffs)
• shv_item_cmenu.c (modified) (4 diffs)
• systray.c (modified) (11 diffs)

trunk/src/shell32/brsfolder.c

@@ -1 @@
-/* $Id: brsfolder.c,v 1.1 2000-08-30 13:52:50 sandervl Exp $ */
-#ifdef __WIN32OS2__
-#define ICOM_CINTERFACE 1
-#include <odin.h>
-#endif
 #include <stdlib.h>
 #include <string.h>
@@ -15 +10 @@
 #include "shresdef.h"
 
-DEFAULT_DEBUG_CHANNEL(shell)
+DEFAULT_DEBUG_CHANNEL(shell);
 
 static HWND             hwndTreeView;

trunk/src/shell32/dialogs.c

@@ -1 @@
-/* $Id: dialogs.c,v 1.1 2000-08-30 13:52:51 sandervl Exp $ */
+/* $Id: dialogs.c,v 1.2 2001-04-28 13:33:43 sandervl Exp $ */
 /*
  *      common shell dialogs
@@ -62 +62 @@
 {
         TRACE("(0x%08x)\n", hWndOwner);
+#ifdef __WIN32OS2__
+        if (MessageBoxA( hWndOwner, "Do you want to exit Odin?", "Shutdown", MB_YESNO|MB_ICONQUESTION) == IDOK)
+#else
         if (MessageBoxA( hWndOwner, "Do you want to exit WINE?", "Shutdown", MB_YESNO|MB_ICONQUESTION) == IDOK)
+#endif
         {
           SendMessageA ( hWndOwner, WM_QUIT, 0, 0);

trunk/src/shell32/folders.c

@@ -1 @@
-/* $Id: folders.c,v 1.7 2000-11-28 11:00:47 sandervl Exp $ */
+/* $Id: folders.c,v 1.8 2001-04-28 13:33:44 sandervl Exp $ */
 /*
  *  Copyright 1997  Marcus Meissner
@@ -410 +410 @@
 
     if (phiconLarge)
-      *phiconLarge = pImageList_GetIcon(ShellBigIconList, nIconIndex, ILD_TRANSPARENT);
+      *phiconLarge = ImageList_GetIcon(ShellBigIconList, nIconIndex, ILD_TRANSPARENT);
 
     if (phiconSmall)
-      *phiconSmall = pImageList_GetIcon(ShellSmallIconList, nIconIndex, ILD_TRANSPARENT);
+      *phiconSmall = ImageList_GetIcon(ShellSmallIconList, nIconIndex, ILD_TRANSPARENT);
 
     return S_OK;

trunk/src/shell32/iconcache.c

@@ -1 @@
-/* $Id: iconcache.c,v 1.3 2000-11-24 13:19:12 sandervl Exp $ */
+/* $Id: iconcache.c,v 1.4 2001-04-28 13:33:44 sandervl Exp $ */
 /*
  *      shell icon cache (SIC)
@@ -790 +790 @@
         else
         {
-          index = pImageList_AddIcon (ShellSmallIconList, hSmallIcon);
-          index1= pImageList_AddIcon (ShellBigIconList, hBigIcon);
+          index = ImageList_AddIcon (ShellSmallIconList, hSmallIcon);
+          index1= ImageList_AddIcon (ShellBigIconList, hBigIcon);
 
           if (index!=index1)
@@ -884 +884 @@
 
         if (bSmallIcon)
-          return pImageList_GetIcon(ShellSmallIconList, index, ILD_NORMAL);
-        return pImageList_GetIcon(ShellBigIconList, index, ILD_NORMAL);
+          return ImageList_GetIcon(ShellSmallIconList, index, ILD_NORMAL);
+        return ImageList_GetIcon(ShellBigIconList, index, ILD_NORMAL);
         
 }
@@ -912 +912 @@
         }
 
-        ShellSmallIconList = pImageList_Create(16,16,ILC_COLORDDB | ILC_MASK,0,0x20);
-        ShellBigIconList = pImageList_Create(32,32,ILC_COLORDDB | ILC_MASK,0,0x20);
-
-        pImageList_SetBkColor(ShellSmallIconList, GetSysColor(COLOR_WINDOW));
-        pImageList_SetBkColor(ShellBigIconList, GetSysColor(COLOR_WINDOW));
+        ShellSmallIconList = ImageList_Create(16,16,ILC_COLORDDB | ILC_MASK,0,0x20);
+        ShellBigIconList = ImageList_Create(32,32,ILC_COLORDDB | ILC_MASK,0,0x20);
+
+        ImageList_SetBkColor(ShellSmallIconList, GetSysColor(COLOR_WINDOW));
+        ImageList_SetBkColor(ShellBigIconList, GetSysColor(COLOR_WINDOW));
 
         for (index=1; index<46; index++)

trunk/src/shell32/makefile

@@ -1 @@
-# $Id: makefile,v 1.32 2000-12-02 23:57:22 bird Exp $
+# $Id: makefile,v 1.33 2001-04-28 13:33:44 sandervl Exp $
 
 #
@@ -54 +54 @@
 $(OBJDIR)\shv_item_cmenu.obj \
 $(OBJDIR)\unknown.obj \
+$(OBJDIR)\control.obj \
 $(OBJDIR)\misc.obj \
 $(OBJDIR)\she.obj \

trunk/src/shell32/memorystream.c

@@ -1 @@
-/* $Id: memorystream.c,v 1.1 2000-08-30 13:52:52 sandervl Exp $ */
 /*
  *      this class implements a pure IStream object
@@ -10 +9 @@
  *      access in a IStream to.
  */
-#ifdef __WIN32OS2__
-#define ICOM_CINTERFACE 1
-#include <odin.h>
-#endif
 
 #include <string.h>
 
-#include "wine/obj_storage.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "shlobj.h"
+#include "debugtools.h"
 #include "heap.h"
-#include "winerror.h"
-#include "debugtools.h"
 #include "shell32_main.h"
 
-DEFAULT_DEBUG_CHANNEL(shell)
+DEFAULT_DEBUG_CHANNEL(shell);
 
 static HRESULT WINAPI IStream_fnQueryInterface(IStream *iface, REFIID riid, LPVOID *ppvObj);

trunk/src/shell32/pidl.c

@@ -1 @@
-/* $Id: pidl.c,v 1.2 2000-08-30 14:18:47 sandervl Exp $ */
 /*
  *      pidl Handling
@@ -9 +8 @@
  *
  */
-#ifdef __WIN32OS2__
-#define ICOM_CINTERFACE 1
-#include <odin.h>
-#endif
 
 #include <ctype.h>
@@ -19 +14 @@
 #include "winbase.h"
 #include "debugtools.h"
-#include "shell.h"
 #include "shlguid.h"
 #include "winerror.h"
 #include "winnls.h"
+#include "wine/undocshell.h"
 #include "shell32_main.h"
 #include "shellapi.h"
+#include "shlwapi.h"
 
 #include "pidl.h"
-#include "wine/undocshell.h"
 
 DEFAULT_DEBUG_CHANNEL(pidl);
 DECLARE_DEBUG_CHANNEL(shell);
 
-#ifdef __WIN32OS2__
-#ifdef DEBUG
+#if defined( __WIN32OS2__) && defined(DEBUG)
 void pdump (LPCITEMIDLIST pidl)
 {
@@ -44 +38 @@
         /* silence the sub-functions */
         bIsShellDebug = TRACE_ON(shell);
-        __SET_DEBUGGING(__DBCL_TRACE, dbch_shell, FALSE);
-        __SET_DEBUGGING(__DBCL_TRACE, dbch_pidl, FALSE);
+        __SET_DEBUGGING(__DBCL_TRACE, __wine_dbch_shell, FALSE);
+        __SET_DEBUGGING(__DBCL_TRACE, __wine_dbch_pidl, FALSE);
 
         if (! pidltemp)
@@ -85 +79 @@
         }
 
-        __SET_DEBUGGING(__DBCL_TRACE, dbch_shell, bIsShellDebug);
-        __SET_DEBUGGING(__DBCL_TRACE, dbch_pidl, TRUE);
-
-}
-#endif //DEBUG
-#else
-void pdump (LPCITEMIDLIST pidl)
-{
-        BOOL bIsShellDebug;
-        
-        LPITEMIDLIST pidltemp = pidl;
-        if (!TRACE_ON(pidl))
-          return;
-
-        /* silence the sub-functions */
-        bIsShellDebug = TRACE_ON(shell);
-        __SET_DEBUGGING(__DBCL_TRACE, dbch_shell, FALSE);
-        __SET_DEBUGGING(__DBCL_TRACE, dbch_pidl, FALSE);
-
-        if (! pidltemp)
-        {
-          MESSAGE ("-------- pidl=NULL (Desktop)\n");
-        }
-        else
-        {
-          MESSAGE ("-------- pidl=%p\n", pidl);
-          if (pidltemp->mkid.cb)
-          { 
-            do
-            {
-              DWORD dwAttrib = 0;
-              LPPIDLDATA pData   = _ILGetDataPointer(pidltemp);
-              DWORD type         = pData->type;
-              LPSTR szLongName   = _ILGetTextPointer(pidltemp);
-              LPSTR szShortName  = _ILGetSTextPointer(pidltemp);
-              char szName[MAX_PATH];
-
-              _ILSimpleGetText(pidltemp, szName, MAX_PATH);
-              if( PT_FOLDER == type)
-                dwAttrib = pData->u.folder.uFileAttribs;
-              else if( PT_VALUE == type)
-                dwAttrib = pData->u.file.uFileAttribs;
-
-              MESSAGE ("-- pidl=%p size=%u type=%lx attr=0x%08lx name=%s (%s,%s)\n",
-                       pidltemp, pidltemp->mkid.cb,type,dwAttrib,szName,debugstr_a(szLongName), debugstr_a(szShortName));
-
-              pidltemp = ILGetNext(pidltemp);
-
-            } while (pidltemp->mkid.cb);
-          }
-          else
-          {
-            MESSAGE ("empty pidl (Desktop)\n");
-          }
-          pcheck(pidl);
-        }
-
-        __SET_DEBUGGING(__DBCL_TRACE, dbch_shell, bIsShellDebug);
-        __SET_DEBUGGING(__DBCL_TRACE, dbch_pidl, TRUE);
-
-}
-#endif //__WIN32OS2__
-
+        __SET_DEBUGGING(__DBCL_TRACE, __wine_dbch_shell, bIsShellDebug);
+        __SET_DEBUGGING(__DBCL_TRACE, __wine_dbch_pidl, TRUE);
+
+}
+#endif
 #define BYTES_PRINTED 32
 BOOL pcheck (LPCITEMIDLIST pidl)
@@ -156 +92 @@
 
         bIsPidlDebug = TRACE_ON(shell);
-        __SET_DEBUGGING(__DBCL_TRACE, dbch_pidl, FALSE);
+        __SET_DEBUGGING(__DBCL_TRACE, __wine_dbch_pidl, FALSE);
 
         if (pidltemp && pidltemp->mkid.cb)
@@ -175 +111 @@
               case PT_COMP:
               case PT_NETWORK:
+              case PT_IESPECIAL1:
+              case PT_IESPECIAL2:
               case PT_SHARE:
-              case PT_IESPECIAL:
                 break;
               default:
@@ -202 +139 @@
           } while (pidltemp->mkid.cb);
         }
-        __SET_DEBUGGING(__DBCL_TRACE, dbch_pidl, bIsPidlDebug);
+        __SET_DEBUGGING(__DBCL_TRACE, __wine_dbch_pidl, bIsPidlDebug);
         return ret;
 }
@@ -300 +237 @@
         return pidlNew;
 }
+
 /*************************************************************************
  * ILLoadFromStream
@@ -332 +270 @@
         }
         
-        /* we are not jet fully compatible */
+        /* we are not yet fully compatible */
         if (!pcheck(*ppPidl))
         { SHFree(*ppPidl);
@@ -343 +281 @@
         return ret;
 }
+
+/*************************************************************************
+ * ILSaveToStream
+ *
+ * NOTES
+ *   the first two bytes are the len, the pidl is following then
+ */
+HRESULT WINAPI ILSaveToStream (IStream * pStream, LPCITEMIDLIST pPidl)
+{
+        LPITEMIDLIST    pidl;
+        WORD            wLen = 0;
+        HRESULT         ret = E_FAIL;
+        
+        TRACE_(shell)("%p %p\n", pStream, pPidl);
+
+        IStream_AddRef (pStream);
+
+        pidl = pPidl;
+        while (pidl->mkid.cb)
+        {
+          wLen += sizeof(WORD) + pidl->mkid.cb;
+          pidl = ILGetNext(pidl);
+        }
+
+        if (SUCCEEDED(IStream_Write(pStream, (LPVOID)&wLen, 2, NULL)))
+        {
+          if (SUCCEEDED(IStream_Write(pStream, pPidl, wLen, NULL)))
+          { ret = S_OK;
+          }
+        }
+        
+
+        IStream_Release (pStream);
+
+        return ret;
+}
+
 /*************************************************************************
  * SHILCreateFromPath   [SHELL32.28]
@@ -357 +332 @@
         TRACE_(shell)("%s %p 0x%08lx\n",path,ppidl,attributes?*attributes:0);
 
-        lstrcpynAtoW(lpszDisplayName, path, MAX_PATH);
+        if (!MultiByteToWideChar( CP_ACP, 0, path, -1, lpszDisplayName, MAX_PATH ))
+            lpszDisplayName[MAX_PATH-1] = 0;
 
         if (SUCCEEDED (SHGetDesktopFolder(&sf)))
@@ -831 +807 @@
         TRACE("path=%s\n",debugstr_w(lpszPath));
 
-        lstrcpynWtoA(lpszTemp, lpszPath, MAX_PATH);     
+        if (!WideCharToMultiByte( CP_ACP, 0, lpszPath, -1, lpszTemp, sizeof(lpszTemp), NULL, NULL ))
+            lpszTemp[sizeof(lpszTemp)-1] = 0;
 
         return SHSimpleIDListFromPathA (lpszTemp);
@@ -994 +971 @@
                pfd->dwFileAttributes = _ILGetFileAttributes(pidl, NULL, 0);
                pfd->nFileSizeLow = _ILGetFileSize ( pidl, NULL, 0);
-               lstrcpynAtoW(pfd->cFileName,_ILGetTextPointer(pidl), MAX_PATH);
-               lstrcpynAtoW(pfd->cAlternateFileName,_ILGetSTextPointer(pidl), 14);
+               if (!MultiByteToWideChar( CP_ACP, 0, _ILGetTextPointer(pidl), -1,
+                                         pfd->cFileName, MAX_PATH ))
+                   pfd->cFileName[MAX_PATH-1] = 0;
+               if (!MultiByteToWideChar( CP_ACP, 0, _ILGetSTextPointer(pidl), -1,
+                                         pfd->cAlternateFileName, 14 ))
+                   pfd->cFileName[13] = 0;
             }
             return NOERROR;
@@ -1069 +1050 @@
 
         SHGetPathFromIDListA (pidl, sTemp);
-        lstrcpyAtoW(pszPath, sTemp);
+        MultiByteToWideChar( CP_ACP, 0, sTemp, -1, pszPath, MAX_PATH );
 
         TRACE_(shell)("-- (%s)\n",debugstr_w(pszPath));
@@ -1292 +1273 @@
  */
 
-LPITEMIDLIST _ILCreate(PIDLTYPE type, LPCVOID pIn, UINT16 uInSize)
+LPITEMIDLIST _ILCreate(PIDLTYPE type, LPCVOID pIn, UINT uInSize)
 {
         LPITEMIDLIST   pidlOut = NULL, pidlTemp = NULL;
         LPPIDLDATA     pData;
-        UINT16         uSize = 0;
+        UINT           uSize = 0;
         LPSTR   pszDest;
         
@@ -1374 +1355 @@
  *  strlen (lpszText)
  */
-DWORD _ILGetDrive(LPCITEMIDLIST pidl,LPSTR pOut, UINT16 uSize)
+DWORD _ILGetDrive(LPCITEMIDLIST pidl,LPSTR pOut, UINT uSize)
 {       TRACE("(%p,%p,%u)\n",pidl,pOut,uSize);
 
@@ -1474 +1455 @@
  * gets the text for the first item in the pidl (eg. simple pidl)
  *
- * returns the lenght of the string
+ * returns the length of the string
  */
 DWORD _ILSimpleGetText (LPCITEMIDLIST pidl, LPSTR szOut, UINT uOutSize)
@@ -1569 +1550 @@
             case PT_FOLDER1:
             case PT_VALUE:
-            case PT_IESPECIAL:
+            case PT_IESPECIAL1:
+            case PT_IESPECIAL2:
               return (LPSTR)&(pdata->u.file.szNames);
 
@@ -1597 +1579 @@
             case PT_FOLDER:
             case PT_VALUE:
-            case PT_IESPECIAL:
+            case PT_IESPECIAL1:
+            case PT_IESPECIAL2:
               return (LPSTR)(pdata->u.file.szNames + strlen (pdata->u.file.szNames) + 1);
 

trunk/src/shell32/pidl.h

@@ -1 @@
-/* $Id: pidl.h,v 1.6 2000-08-30 13:50:55 sandervl Exp $ */
 /*
  * internal pidl functions
@@ -76 +75 @@
 #define PT_COMP         0x42
 #define PT_NETWORK      0x47
-#define PT_IESPECIAL    0xb1
+#define PT_IESPECIAL1   0x61
+#define PT_IESPECIAL2   0xb1
 #define PT_SHARE        0xc3
 
@@ -129 +129 @@
 
 BOOL    _ILGetFileDateTime      (LPCITEMIDLIST pidl, FILETIME *ft);
-DWORD   _ILGetDrive             (LPCITEMIDLIST, LPSTR, UINT16);
+DWORD   _ILGetDrive             (LPCITEMIDLIST, LPSTR, UINT);
 
 /*
@@ -145 +145 @@
  * simple pidls from strings
  */
-LPITEMIDLIST    _ILCreate       (PIDLTYPE,LPCVOID,UINT16);
+LPITEMIDLIST    _ILCreate       (PIDLTYPE,LPCVOID,UINT);
 
 LPITEMIDLIST    _ILCreateDesktop        (void);
@@ -170 +170 @@
  * debug helper 
  */
-#ifdef __WIN32OS2__
-#ifdef DEBUG
-void pdump (LPCITEMIDLIST pidl);
-#else
-#define pdump(pidl)
-#endif
-//CB: needed in release build
-BOOL pcheck (LPCITEMIDLIST pidl);
-#else
 void    pdump   (LPCITEMIDLIST pidl);
 BOOL    pcheck  (LPCITEMIDLIST pidl);
-#endif
 
 /*

trunk/src/shell32/sh.cpp

@@ -1 @@
-/* $Id: sh.cpp,v 1.11 2000-08-18 02:01:18 phaller Exp $ */
+/* $Id: sh.cpp,v 1.12 2001-04-28 13:33:45 sandervl Exp $ */
 
 /*
@@ -320 +320 @@
 }
 
-
-/*****************************************************************************
- * Name      : HRESULT SHRegDeleteKeyA
- * Purpose   :
- * Parameters:
- * Variables :
- * Result    :
- * Remark    : SHELL32.513
- * Status    : UNTESTED STUB
- *
- * Author    : Patrick Haller [Tue, 1999/06/09 20:02]
- *****************************************************************************/
-
-ODINFUNCTION2(HRESULT, SHRegDeleteKeyA,
-              HKEY,    hkey,
-              LPSTR,   lpszKey)
-{
-  return RegDeleteKeyA(hkey,
-                       lpszKey);
-}
-

trunk/src/shell32/shell32.def

@@ -1 @@
-; $Id: shell32.def,v 1.34 2000-12-16 22:53:43 bird Exp $
+; $Id: shell32.def,v 1.35 2001-04-28 13:33:45 sandervl Exp $
 
 ; Based on Windows 95
@@ -80 +80 @@
     Shell_GetImageList                = _Shell_GetImageList@8                 @71
     Shell_GetCachedImageIndex         = _Shell_GetCachedImageIndexAW@12       @72
-    Shell_GetCachedImageIndexW        = _Shell_GetCachedImageIndexW@12
-    Shell_GetCachedImageIndexA        = _Shell_GetCachedImageIndexA@12
+    Shell_GetCachedImageIndexW        = _Shell_GetCachedImageIndexW@12        @1572
+    Shell_GetCachedImageIndexA        = _Shell_GetCachedImageIndexA@12        @1573
     SHShellFolderView_Message         = _SHShellFolderView_Message@12         @73
     SHCreateStdEnumFmtEtc             = _SHCreateStdEnumFmtEtc@12             @74
@@ -176 +176 @@
     SHCreateDirectory                 = _SHCreateDirectory@8                  @165
 ;   CallCPLEntry16                    = _CallCPLEntry16@?                     @166
-;   SHAddFromPropSheetExtArray        = _SHAddFromPropSheetExtArray@?         @167
-;   SHCreatePropSheetExtArray         = _SHCreatePropSheetExtArray@?          @168
-;   SHDestroyPropSheetExtArray        = _SHDestroyPropSheetExtArray@?         @169
-;   SHReplaceFromPropSheetExtArray    = _SHReplaceFromPropSheetExtArray@?     @170
+    SHAddFromPropSheetExtArray        = _SHAddFromPropSheetExtArray@12        @167
+    SHCreatePropSheetExtArray         = _SHCreatePropSheetExtArray@12         @168
+    SHDestroyPropSheetExtArray        = _SHDestroyPropSheetExtArray@4         @169
+    SHReplaceFromPropSheetExtArray    = _SHReplaceFromPropSheetExtArray@16    @170
     PathCleanupSpec                   = _PathCleanupSpecAW@8                  @171
 ;   SHCreateLinks                     = _SHCreateLinks@?                      @172
@@ -320 +320 @@
     StrCpyNA                          = _lstrcpynA@12                         @309
     StrCpyNW                          = _lstrcpynW@12                         @310
-;   StrNCmpA                          = _StrNCmpA@?                           @311
-;   StrNCmpIA                         = _StrNCmpIA@?                          @312
-;   StrNCmpIW                         = _StrNCmpIW@?                          @313
-;   StrNCmpW                          = _StrNCmpW@?                           @314
+    StrNCmpA                          = _StrCmpNA@12                          @311
+    StrNCmpIA                         = _StrCmpNIA@12                         @312
+    StrNCmpIW                         = _StrCmpNIW@12                         @313
+    StrNCmpW                          = _StrCmpNW@12                          @314
     StrNCpyA                          = _lstrcpynA@12                         @315
     StrNCpyW                          = _lstrcpynW@12                         @316
     StrRChrA                          = _StrRChrA@12                          @317
-;   StrRChrIA                         = _StrRChrIA@?                          @318
-;   StrRChrIW                         = _StrRChrIW@?                          @319
+;    StrRChrIA                         = _StrRChrIA@8                          @318
+;    StrRChrIW                         = _StrRChrIW@8                          @319
     StrRChrW                          = _StrRChrW@12                          @320
 ;   StrRStrA                          = _StrRStrA@?                           @321
-;   StrRStrIA                         = _StrRStrIA@?                          @322
-;   StrRStrIW                         = _StrRStrIW@?                          @323
+;    StrRStrIA                         = _StrRStrIA@8                          @322
+;    StrRStrIW                         = _StrRStrIW@8                          @323
 ;   StrRStrW                          = _StrRStrW@?                           @324
     StrStrA                           = _StrStrA@8                            @325
@@ -349 +349 @@
     SHRegDeleteKeyA                   = _SHRegDeleteKeyA@8                    @513 ;?
     SHAllocShared                     = _SHAllocShared@12                     @520
-    SHInitRestricted                  = _SHInitRestricted@8
+    SHInitRestricted                  = _SHInitRestricted@8                   @1521
     SHLockShared                      = _SHLockShared@8                       @521
     SHUnlockShared                    = _SHUnlockShared@4                     @522
@@ -377 +377 @@
     SHGetSpecialFolderPathA           = _SHGetSpecialFolderPathA@16           @690
 
-    SHGetSettings                     = _SHGetSettings@12                     @691
+    SHGetSettings                     = _SHGetSettings@8                      @691
 
 ;
@@ -390 +390 @@
 
     DllGetVersion                     = _SHELL32_DllGetVersion@4              @1220
+    DllCanUnloadNow                   = _SHELL32_DllCanUnloadNow@0            @1221
 
     _StrFormatByteSizeA@12                @1041

trunk/src/shell32/shell32_main.c

@@ -1 @@
-/* $Id: shell32_main.c,v 1.1 2000-08-30 13:52:54 sandervl Exp $ */
+/* $Id: shell32_main.c,v 1.2 2001-04-28 13:33:45 sandervl Exp $ */
 /*
  *                              Shell basics
@@ -89 +89 @@
 }
 
-/*************************************************************************
- * Control_RunDLL                       [SHELL32.12]
- *
- * Wild speculation in the following!
- *
- * http://premium.microsoft.com/msdn/library/techart/msdn193.htm
- */
-
-void WINAPI Control_RunDLL( HWND hwnd, LPCVOID code, LPCSTR cmd, DWORD arg4 )
-{
-    FIXME("(0x%08x, %p, %s, 0x%08lx): stub\n", hwnd, code,
-          debugstr_a(cmd), arg4);
-}
 
 /*************************************************************************
@@ -130 +117 @@
         psfi->szTypeName[0] = '\0';
         psfi->iIcon = 0;
+
+        if (flags & SHGFI_EXETYPE) {
+          BOOL status = FALSE;
+          HANDLE hfile;
+          DWORD BinaryType;
+          IMAGE_DOS_HEADER mz_header;
+          IMAGE_NT_HEADERS nt;
+          DWORD len;
+          char magic[4];
+
+          if (flags != SHGFI_EXETYPE) return 0;
+
+          status = GetBinaryTypeA (path, &BinaryType);
+          if (!status) return 0;
+          if ((BinaryType == SCS_DOS_BINARY)
+                || (BinaryType == SCS_PIF_BINARY)) return 0x4d5a;
+
+          hfile = CreateFileA( path, GENERIC_READ, FILE_SHARE_READ,
+                NULL, OPEN_EXISTING, 0, 0 );
+          if ( hfile == INVALID_HANDLE_VALUE ) return 0;
+
+        /* The next section is adapted from MODULE_GetBinaryType, as we need
+         * to examine the image header to get OS and version information. We
+         * know from calling GetBinaryTypeA that the image is valid and either
+         * an NE or PE, so much error handling can be omitted.
+         * Seek to the start of the file and read the header information.
+         */
+
+          SetFilePointer( hfile, 0, NULL, SEEK_SET );  
+          ReadFile( hfile, &mz_header, sizeof(mz_header), &len, NULL );
+
+         SetFilePointer( hfile, mz_header.e_lfanew, NULL, SEEK_SET );
+         ReadFile( hfile, magic, sizeof(magic), &len, NULL );
+         if ( *(DWORD*)magic      == IMAGE_NT_SIGNATURE )
+         {
+             SetFilePointer( hfile, mz_header.e_lfanew, NULL, SEEK_SET ); 
+             ReadFile( hfile, &nt, sizeof(nt), &len, NULL );
+              CloseHandle( hfile );
+              if (nt.OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI) {
+                 return IMAGE_NT_SIGNATURE
+                        | (nt.OptionalHeader.MajorSubsystemVersion << 24)
+                        | (nt.OptionalHeader.MinorSubsystemVersion << 16);
+              }
+              return IMAGE_NT_SIGNATURE;
+          }
+         else if ( *(WORD*)magic == IMAGE_OS2_SIGNATURE )
+         {
+             IMAGE_OS2_HEADER ne;
+             SetFilePointer( hfile, mz_header.e_lfanew, NULL, SEEK_SET ); 
+             ReadFile( hfile, &ne, sizeof(ne), &len, NULL );
+              CloseHandle( hfile );
+             if (ne.ne_exetyp == 2) return IMAGE_OS2_SIGNATURE
+                        | (ne.ne_expver << 16);
+              return 0;
+          }
+          CloseHandle( hfile );
+          return 0;
+      }
+
         
         /* translate the path into a pidl only when SHGFI_USEFILEATTRIBUTES in not specified 
@@ -259 +305 @@
         /* icon handle */
         if (SUCCEEDED(hr) && (flags & SHGFI_ICON))
-          psfi->hIcon = pImageList_GetIcon((flags & SHGFI_LARGEICON) ? ShellBigIconList:ShellSmallIconList, psfi->iIcon, ILD_NORMAL);
-
-
-        if (flags & SHGFI_EXETYPE)
-          FIXME("type of executable, stub\n");
+          psfi->hIcon = ImageList_GetIcon((flags & SHGFI_LARGEICON) ? ShellBigIconList:ShellSmallIconList, psfi->iIcon, ILD_NORMAL);
 
         if (flags & (SHGFI_UNKNOWN1 | SHGFI_UNKNOWN2 | SHGFI_UNKNOWN3))
@@ -280 +322 @@
 #endif
         return ret;
-}
-
+} 
 /*************************************************************************
  * SHGetFileInfoW                       [SHELL32.@]
@@ -289 +330 @@
                               SHFILEINFOW *psfi, UINT sizeofpsfi,
                               UINT flags )
-{       FIXME("(%s,0x%lx,%p,0x%x,0x%x)\n",
-              debugstr_w(path),dwFileAttributes,psfi,sizeofpsfi,flags);
-        return 0;
+{
+        INT len;
+        LPSTR temppath;
+        DWORD ret;
+        SHFILEINFOA temppsfi;
+
+        len = WideCharToMultiByte(CP_ACP, 0, path, -1, NULL, 0, NULL, NULL);
+        temppath = HeapAlloc(GetProcessHeap(), 0, len);
+        WideCharToMultiByte(CP_ACP, 0, path, -1, temppath, len, NULL, NULL);
+
+        WideCharToMultiByte(CP_ACP, 0, psfi->szDisplayName, -1, temppsfi.szDisplayName,
+                            sizeof(temppsfi.szDisplayName), NULL, NULL);
+        WideCharToMultiByte(CP_ACP, 0, psfi->szTypeName, -1, temppsfi.szTypeName,
+                            sizeof(temppsfi.szTypeName), NULL, NULL);
+
+        ret = SHGetFileInfoA(temppath, dwFileAttributes, &temppsfi, sizeof(temppsfi), flags);
+
+        HeapFree(GetProcessHeap(), 0, temppath);
+        
+        return ret;
 }
 
@@ -808 +866 @@
  *
  */
-void    (* WINAPI  pDLLInitComctl)(LPVOID);
-INT     (* WINAPI  pImageList_AddIcon) (HIMAGELIST himl, HICON hIcon);
-INT     (* WINAPI  pImageList_ReplaceIcon) (HIMAGELIST, INT, HICON);
-HIMAGELIST (* WINAPI  pImageList_Create) (INT,INT,UINT,INT,INT);
-BOOL    (* WINAPI  pImageList_Draw) (HIMAGELIST himl, int i, HDC hdcDest, int x, int y, UINT fStyle);
-HICON   (* WINAPI  pImageList_GetIcon) (HIMAGELIST, INT, UINT);
-INT     (* WINAPI  pImageList_GetImageCount)(HIMAGELIST);
-COLORREF (* WINAPI pImageList_SetBkColor)(HIMAGELIST, COLORREF);
+void    (* WINAPI pDLLInitComctl)(LPVOID);
 
 LPVOID  (* WINAPI  pCOMCTL32_Alloc) (INT);  
 BOOL    (* WINAPI  pCOMCTL32_Free) (LPVOID);  
 
-HDPA    (* WINAPI  pDPA_Create) (INT);  
-INT     (* WINAPI  pDPA_InsertPtr) (const HDPA, INT, LPVOID); 
-BOOL    (* WINAPI  pDPA_Sort) (const HDPA, PFNDPACOMPARE, LPARAM); 
-LPVOID  (* WINAPI  pDPA_GetPtr) (const HDPA, INT);   
-BOOL    (* WINAPI  pDPA_Destroy) (const HDPA); 
-INT     (* WINAPI pDPA_Search) (const HDPA, LPVOID, INT, PFNDPACOMPARE, LPARAM, UINT);
-LPVOID  (* WINAPI pDPA_DeletePtr) (const HDPA hdpa, INT i);
-
-/* user32 */
-HICON (* WINAPI pLookupIconIdFromDirectoryEx)(LPBYTE dir, BOOL bIcon, INT width, INT height, UINT cFlag);
-HICON (* WINAPI pCreateIconFromResourceEx)(LPBYTE bits,UINT cbSize, BOOL bIcon, DWORD dwVersion, INT width, INT height,UINT cFlag);
-
 static HINSTANCE        hComctl32;
 static INT              shell32_RefCount = 0;
@@ -837 +876 @@
 LONG            shell32_ObjCount = 0;
 HINSTANCE       shell32_hInstance = 0; 
-HMODULE         huser32 = 0;
 HIMAGELIST      ShellSmallIconList = 0;
 HIMAGELIST      ShellBigIconList = 0;
@@ -861 +899 @@
             shell32_hInstance = hinstDLL;
             hComctl32 = GetModuleHandleA("COMCTL32.DLL");       
-            if(!huser32) huser32 = GetModuleHandleA("USER32.DLL");
             DisableThreadLibraryCalls(shell32_hInstance);
 
-            if (!hComctl32 || !huser32)
+            if (!hComctl32)
             {
               ERR("P A N I C SHELL32 loading failed\n");
@@ -871 +908 @@
 
             /* comctl32 */
-            pDLLInitComctl=(void*)GetProcAddress(hComctl32,"InitCommonControlsEx");
-            pImageList_Create=(void*)GetProcAddress(hComctl32,"ImageList_Create");
-            pImageList_AddIcon=(void*)GetProcAddress(hComctl32,"ImageList_AddIcon");
-            pImageList_ReplaceIcon=(void*)GetProcAddress(hComctl32,"ImageList_ReplaceIcon");
-            pImageList_GetIcon=(void*)GetProcAddress(hComctl32,"ImageList_GetIcon");
-            pImageList_GetImageCount=(void*)GetProcAddress(hComctl32,"ImageList_GetImageCount");
-            pImageList_Draw=(void*)GetProcAddress(hComctl32,"ImageList_Draw");
-            pImageList_SetBkColor=(void*)GetProcAddress(hComctl32,"ImageList_SetBkColor");
             pCOMCTL32_Alloc=(void*)GetProcAddress(hComctl32, (LPCSTR)71L);
             pCOMCTL32_Free=(void*)GetProcAddress(hComctl32, (LPCSTR)73L);
-            pDPA_Create=(void*)GetProcAddress(hComctl32, (LPCSTR)328L);
-            pDPA_Destroy=(void*)GetProcAddress(hComctl32, (LPCSTR)329L);
-            pDPA_GetPtr=(void*)GetProcAddress(hComctl32, (LPCSTR)332L);
-            pDPA_InsertPtr=(void*)GetProcAddress(hComctl32, (LPCSTR)334L);
-            pDPA_DeletePtr=(void*)GetProcAddress(hComctl32, (LPCSTR)336L);
-            pDPA_Sort=(void*)GetProcAddress(hComctl32, (LPCSTR)338L);
-            pDPA_Search=(void*)GetProcAddress(hComctl32, (LPCSTR)339L);
-            /* user32 */
-            pLookupIconIdFromDirectoryEx=(void*)GetProcAddress(huser32,"LookupIconIdFromDirectoryEx");
-            pCreateIconFromResourceEx=(void*)GetProcAddress(huser32,"CreateIconFromResourceEx");
 
             /* initialize the common controls */
-            if (pDLLInitComctl)
-            {
-              pDLLInitComctl(NULL);
-            }
+            InitCommonControlsEx(NULL);
 
             SIC_Initialize();

trunk/src/shell32/shell32_main.h

@@ -1 @@
-/* $Id: shell32_main.h,v 1.8 2001-04-23 10:47:23 sandervl Exp $ */
+/* $Id: shell32_main.h,v 1.9 2001-04-28 13:33:45 sandervl Exp $ */
 /*
  *      internal Shell32 Library definitions
@@ -17 +17 @@
 #include "wine/obj_shelllink.h"
 #include "wine/obj_extracticon.h"
+#include "wine/obj_oleview.h"
 #ifdef __WIN32OS2__
 #include <heapstring.h>
@@ -35 +36 @@
 * pointer to functions dynamically loaded
 */
-extern void     (* WINAPI pDLLInitComctl)(LPVOID);
-extern INT      (* WINAPI pImageList_AddIcon) (HIMAGELIST himl, HICON hIcon);
-extern INT      (* WINAPI pImageList_ReplaceIcon) (HIMAGELIST, INT, HICON);
-extern HIMAGELIST (* WINAPI pImageList_Create) (INT,INT,UINT,INT,INT);
-extern BOOL     (* WINAPI pImageList_Draw) (HIMAGELIST himl, int i, HDC hdcDest, int x, int y, UINT fStyle);
-extern HICON    (* WINAPI pImageList_GetIcon) (HIMAGELIST, INT, UINT);
-extern INT      (* WINAPI pImageList_GetImageCount)(HIMAGELIST);
-extern COLORREF (* WINAPI pImageList_SetBkColor)(HIMAGELIST, COLORREF);
-
 extern LPVOID   (* WINAPI pCOMCTL32_Alloc) (INT);  
 extern BOOL     (* WINAPI pCOMCTL32_Free) (LPVOID);  
 
-extern HDPA     (* WINAPI pDPA_Create) (INT);  
-extern INT      (* WINAPI pDPA_InsertPtr) (const HDPA, INT, LPVOID); 
-extern BOOL     (* WINAPI pDPA_Sort) (const HDPA, PFNDPACOMPARE, LPARAM); 
-extern LPVOID   (* WINAPI pDPA_GetPtr) (const HDPA, INT);   
-extern BOOL     (* WINAPI pDPA_Destroy) (const HDPA); 
-extern INT      (* WINAPI pDPA_Search) (const HDPA, LPVOID, INT, PFNDPACOMPARE, LPARAM, UINT);
-extern LPVOID   (* WINAPI pDPA_DeletePtr) (const HDPA hdpa, INT i);
+#define pDPA_Create     DPA_Create
+#define pDPA_InsertPtr  DPA_InsertPtr
+#define pDPA_Sort       DPA_Sort
+#define pDPA_GetPtr     DPA_GetPtr
+#define pDPA_Destroy    DPA_Destroy
+#define pDPA_Search     DPA_Search
+#define pDPA_DeletePtr  DPA_DeletePtr
+
 #define pDPA_GetPtrCount(hdpa)  (*(INT*)(hdpa))   
 
-extern HICON (* WINAPI pLookupIconIdFromDirectoryEx)(LPBYTE dir, BOOL bIcon, INT width, INT height, UINT cFlag);
-extern HICON (* WINAPI pCreateIconFromResourceEx)(LPBYTE bits,UINT cbSize, BOOL bIcon, DWORD dwVersion, INT width, INT height,UINT cFlag);
+#define pLookupIconIdFromDirectoryEx LookupIconIdFromDirectoryEx
+#define pCreateIconFromResourceEx    CreateIconFromResourceEx
 
 /* ole2 */
@@ -68 +61 @@
 */
 BOOL WINAPI Shell_GetImageList(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList);
-
-HRESULT WINAPI StrRetToStrNA (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl);
-HRESULT WINAPI StrRetToStrNW (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl);
-HRESULT WINAPI StrRetToStrN (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl);
 
 /* Iconcache */

trunk/src/shell32/shellfolder.h

@@ -1 @@
-/* $Id: shellfolder.h,v 1.2 2000-08-30 13:50:58 sandervl Exp $ */
 /*
  * defines helperfunctions to manipulate the contents of a IShellFolder
@@ -9 +8 @@
 
 #include "winbase.h"
-#include "shell.h"
 
 #include "wine/obj_base.h"

trunk/src/shell32/shellguid.c

@@ -1 @@
-/* $Id: shellguid.c,v 1.1 2000-08-30 13:52:55 sandervl Exp $ */
+/* $Id: shellguid.c,v 1.2 2001-04-28 13:33:46 sandervl Exp $ */
 /*
  *  Shell UID
@@ -22 +22 @@
 #include "shlobj.h"
 #include "docobj.h"
+#include "shellfolder.h"

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;
 }

trunk/src/shell32/shellole.c

@@ -1 @@
-/* $Id: shellole.c,v 1.1 2000-08-30 13:52:56 sandervl Exp $ */
 /*
  *      handling of SHELL32.DLL OLE-Objects
@@ -7 +6 @@
  *
  */
-#ifdef __WIN32OS2__
-#define ICOM_CINTERFACE 1
-#include <odin.h>
-#include <winnls.h>
-#endif
 
 #include <stdlib.h>
 #include <string.h>
 
-#include "wine/obj_base.h"
-#include "wine/obj_shelllink.h"
-#include "wine/obj_shellfolder.h"
-#include "wine/obj_shellbrowser.h"
-#include "wine/obj_contextmenu.h"
-#include "wine/obj_shellextinit.h"
-#include "wine/obj_extracticon.h"
-
+#include "shlobj.h"
+#include "shellapi.h"
 #include "shlguid.h"
 #include "winreg.h"
+#include "wine/unicode.h"
 #include "winerror.h"
 #include "debugtools.h"
@@ -159 +148 @@
 {
         TRACE("(%p)\n", lpmal);
-        return CoGetMalloc(0,lpmal);
+        return CoGetMalloc(MEMCTX_TASK, lpmal);
 }
 
@@ -359 +348 @@
 typedef HRESULT (* CALLBACK LPFNCREATEINSTANCE)(IUnknown* pUnkOuter, REFIID riid, LPVOID* ppvObject);
 #else
-typedef HRESULT (CALLBACK * LPFNCREATEINSTANCE)(IUnknown* pUnkOuter, REFIID riid, LPVOID* ppvObject);
+typedef HRESULT CALLBACK (*LPFNCREATEINSTANCE)(IUnknown* pUnkOuter, REFIID riid, LPVOID* ppvObject);
 #endif
 
@@ -504 +493 @@
         REFIID  riid,                           
         LPVOID* ppv,    
-        LPFNCREATEINSTANCE lpfnCI,      /* create instance callback entry */
-        PLONG   pcRefDll,               /* ref count of the dll */
-        REFIID  riidInst)               /* optional interface to the instance */
+        LPFNCREATEINSTANCE lpfnCI,      /* [in] create instance callback entry */
+        PLONG   pcRefDll,               /* [in/out] ref count of the dll */
+        REFIID  riidInst)               /* [in] optional interface to the instance */
 {
         TRACE("\n\tIID:\t%s %p %p %p \n\tIIDIns:\t%s\n",
@@ -554 +543 @@
 BOOL WINAPI DragQueryPoint(HDROP hDrop, POINT *p)
 {
-        LPDROPFILESTRUCT lpDropFileStruct;  
+        DROPFILES *lpDropFileStruct;
         BOOL bRet;
 
         TRACE("\n");
 
-        lpDropFileStruct = (LPDROPFILESTRUCT) GlobalLock(hDrop);
-  
-        memcpy(p,&lpDropFileStruct->ptMousePos,sizeof(POINT));
-        bRet = lpDropFileStruct->fInNonClientArea;
+        lpDropFileStruct = (DROPFILES *) GlobalLock(hDrop);
+
+        *p = lpDropFileStruct->pt;
+        bRet = lpDropFileStruct->fNC;
   
         GlobalUnlock(hDrop);
@@ -579 +568 @@
         LPSTR lpDrop;
         UINT i = 0;
-        LPDROPFILESTRUCT lpDropFileStruct = (LPDROPFILESTRUCT) GlobalLock(hDrop); 
+        DROPFILES *lpDropFileStruct = (DROPFILES *) GlobalLock(hDrop);
     
         TRACE("(%08x, %x, %p, %u)\n",   hDrop,lFile,lpszFile,lLength);
@@ -585 +574 @@
         if(!lpDropFileStruct) goto end;
 
-        lpDrop = (LPSTR) lpDropFileStruct + lpDropFileStruct->lSize;
+        lpDrop = (LPSTR) lpDropFileStruct + lpDropFileStruct->pFiles;
 
         while (i++ < lFile)
@@ -618 +607 @@
         LPWSTR lpwDrop;
         UINT i = 0;
-        LPDROPFILESTRUCT lpDropFileStruct = (LPDROPFILESTRUCT) GlobalLock(hDrop); 
+        DROPFILES *lpDropFileStruct = (DROPFILES *) GlobalLock(hDrop);
     
         TRACE("(%08x, %x, %p, %u)\n", hDrop,lFile,lpszwFile,lLength);
@@ -624 +613 @@
         if(!lpDropFileStruct) goto end;
 
-        lpwDrop = (LPWSTR) lpDropFileStruct + lpDropFileStruct->lSize;
+        lpwDrop = (LPWSTR) lpDropFileStruct + lpDropFileStruct->pFiles;
 
         i = 0;
@@ -637 +626 @@
         }
     
-        i = lstrlenW(lpwDrop);
+        i = strlenW(lpwDrop);
         i++;
         if ( !lpszwFile) goto end;   /* needed buffer size */

trunk/src/shell32/shellord.c

@@ -1 @@
-/* $Id: shellord.c,v 1.2 2000-11-06 10:20:56 sandervl Exp $ */
 /*
  * The parameters of many functions changes between different OS versions
@@ -7 +6 @@
  *           1998 Jürgen Schmied
  */
-#ifdef __WIN32OS2__
-#define ICOM_CINTERFACE 1
-#include <odin.h>
-#endif
 #include <string.h>
 #include <stdio.h>
@@ -122 +117 @@
  *  the registry path are for win98 (tested)
  *  and possibly are the same in nt40
- */
-void WINAPI SHGetSettings(LPSHELLFLAGSTATE lpsfs, DWORD dwMask, DWORD dwx)
+ *
+ */
+VOID WINAPI SHGetSettings(LPSHELLFLAGSTATE lpsfs, DWORD dwMask)
 {
         HKEY    hKey;
@@ -129 +125 @@
         DWORD   dwDataSize = sizeof (DWORD);
 
-        TRACE("(%p 0x%08lx 0x%08lx)\n",lpsfs,dwMask, dwx);
+        TRACE("(%p 0x%08lx)\n",lpsfs,dwMask);
         
         if (RegCreateKeyExA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced",
@@ -232 +228 @@
         ...)
 {
-        WCHAR   szText[100],szTitle[100],szTemp[256];
-        LPCWSTR   pszText = szText, pszTitle = szTitle;
+        WCHAR   szText[100],szTitle[100];
+        LPCWSTR pszText = szText, pszTitle = szTitle, pszTemp;
         va_list args;
+        int     ret;
+
         va_start(args, uType);
         /* wvsprintfA(buf,fmt, args); */
@@ -242 +240 @@
 
         if (!HIWORD(lpCaption))
-          LoadStringW(hInstance, (DWORD)lpCaption, szTitle, 100);
+          LoadStringW(hInstance, (DWORD)lpCaption, szTitle, sizeof(szTitle)/sizeof(szTitle[0]));
         else
           pszTitle = lpCaption;
 
         if (!HIWORD(lpText))
-          LoadStringW(hInstance, (DWORD)lpText, szText, 100);
+          LoadStringW(hInstance, (DWORD)lpText, szText, sizeof(szText)/sizeof(szText[0]));
         else
           pszText = lpText;
 
-        FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY,
-                       szText, 0, 0, szTemp, 256, (LPDWORD) args);
+        FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, 
+                       pszText, 0, 0, (LPWSTR)&pszTemp, 0, &args);
 
         va_end(args);
 
-        return MessageBoxW(hWnd,szTemp,szTitle,uType);
+        ret = MessageBoxW(hWnd,pszTemp,pszTitle,uType);
+        LocalFree((HLOCAL)pszTemp);
+        return ret;
 }
 
@@ -270 +270 @@
         ...)
 {
-        char    szText[100],szTitle[100],szTemp[256];
-        LPCSTR   pszText = szText, pszTitle = szTitle;
+        char    szText[100],szTitle[100];
+        LPCSTR  pszText = szText, pszTitle = szTitle, pszTemp;
         va_list args;
+        int     ret;
+
         va_start(args, uType);
         /* wvsprintfA(buf,fmt, args); */
@@ -280 +282 @@
 
         if (!HIWORD(lpCaption))
-          LoadStringA(hInstance, (DWORD)lpCaption, szTitle, 100);
+          LoadStringA(hInstance, (DWORD)lpCaption, szTitle, sizeof(szTitle));
         else
           pszTitle = lpCaption;
 
         if (!HIWORD(lpText))
-          LoadStringA(hInstance, (DWORD)lpText, szText, 100);
+          LoadStringA(hInstance, (DWORD)lpText, szText, sizeof(szText));
         else
           pszText = lpText;
 
-        FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY,
-                       szText, 0, 0, szTemp, 256, (LPDWORD) args);
+        FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, 
+                       pszText, 0, 0, (LPSTR)&pszTemp, 0, &args);
 
         va_end(args);
 
-        return MessageBoxA(hWnd,szTemp,szTitle,uType);
+        ret = MessageBoxA(hWnd,pszTemp,pszTitle,uType);
+        LocalFree((HLOCAL)pszTemp);
+        return ret;
 }
 
@@ -456 +460 @@
  */
 HRESULT WINAPI SHCreateShellFolderViewEx(
-        LPCSHELLFOLDERVIEWINFO psvcbi, /*[in ] shelltemplate struct*/
-        LPSHELLVIEW* ppv)              /*[out] IShellView pointer*/
+        LPCSHELLFOLDERVIEWINFO psvcbi, /* [in] shelltemplate struct */
+        LPSHELLVIEW* ppv)              /* [out] IShellView pointer */
 {
         IShellView * psf;
@@ -878 +882 @@
         return 0;
 }
-/*************************************************************************
- * Control_FillCache_RunDLL                     [SHELL32.8]
- *
- */
-HRESULT WINAPI Control_FillCache_RunDLL(HWND hWnd, HANDLE hModule, DWORD w, DWORD x)
-{       FIXME("0x%04x 0x%04x 0x%04lx 0x%04lx stub\n",hWnd, hModule,w,x);
-        return 0;
-}
-/*************************************************************************
- * RunDLL_CallEntry16                           [SHELL32.122]
- * the name is propably wrong
- */
-HRESULT WINAPI RunDLL_CallEntry16(DWORD v, DWORD w, DWORD x, DWORD y, DWORD z)
-{       FIXME("0x%04lx 0x%04lx 0x%04lx 0x%04lx 0x%04lx stub\n",v,w,x,y,z);
-        return 0;
-}
 
 /************************************************************************
@@ -980 +968 @@
         return 0;
 }
+
+/*************************************************************************
+ *      SHAddFromPropSheetExtArray      [SHELL32]
+ */
+DWORD WINAPI SHAddFromPropSheetExtArray(DWORD a, DWORD b, DWORD c)
+{
+        FIXME("(%08lx,%08lx,%08lx)stub\n", a, b, c);
+        return 0;
+}
+
+/*************************************************************************
+ *      SHCreatePropSheetExtArray       [SHELL32]
+ */
+DWORD WINAPI SHCreatePropSheetExtArray(DWORD a, LPCSTR b, DWORD c)
+{
+        FIXME("(%08lx,%s,%08lx)stub\n", a, debugstr_a(b), c);
+        return 0;
+}
+
+/*************************************************************************
+ *      SHReplaceFromPropSheetExtArray  [SHELL]
+ */
+DWORD WINAPI SHReplaceFromPropSheetExtArray(DWORD a, DWORD b, DWORD c, DWORD d)
+{
+        FIXME("(%08lx,%08lx,%08lx,%08lx)stub\n", a, b, c, d);
+        return 0;
+}
+
+/*************************************************************************
+ *      SHDestroyPropSheetExtArray      [SHELL32]
+ */
+DWORD WINAPI SHDestroyPropSheetExtArray(DWORD a)
+{
+        FIXME("(%08lx)stub\n", a);
+        return 0;
+}

trunk/src/shell32/shellpath.c

@@ -1 @@
-/* $Id: shellpath.c,v 1.4 2001-04-03 18:42:42 sandervl Exp $ */
 /*
  * Path Functions
@@ -6 +5 @@
  *
  */
-#ifdef __WIN32OS2__
-#define ICOM_CINTERFACE 1
-#include <odin.h>
-#endif
-
 #include <string.h>
 #include <ctype.h>
 #include "debugtools.h"
+#include "windef.h"
 #include "winnls.h"
 #include "winreg.h"
@@ -19 +14 @@
 #include "shlobj.h"
 #include "shell32_main.h"
-#include "windef.h"
-#include "options.h"
-#include "wine/winestring.h"
 #include "wine/undocshell.h"
 #include "wine/unicode.h"
@@ -28 +20 @@
 DEFAULT_DEBUG_CHANNEL(shell);
 
-#define isSlash(x) ((x)=='\\' || (x)=='/')
 /*
         ########## Combining and Constructing paths ##########
@@ -347 +338 @@
 
         for(i=0; lpszExtensions[i]; i++)
+#ifdef __WIN32OS2__
           if (!lstrcmpiW(lpszExtension,lpszExtensions[i])) return TRUE;
-          
+#else
+          if (!strcmpiW(lpszExtension,lpszExtensions[i])) return TRUE;
+#endif    
         return FALSE;
 }
@@ -485 +479 @@
 
 #ifdef __WIN32OS2__
-/*************************************************************************
- * PathYetAnotherMakeUniqueNameA [SHELL32.75]
- * 
- * NOTES
- *     exported by ordinal
- */
+
 BOOL WINAPI PathYetAnotherMakeUniqueNameW(
         LPWSTR lpszBuffer,
@@ -497 +486 @@
         LPCWSTR lpszLongName)
 {
-    FIXME("(%p,%p, %p ,%p):stub.\n",
+    FIXME("PathYetAnotherMakeUniqueNameW (%p,%p, %p ,%p):stub.\n",
      lpszBuffer, lpszPathName, lpszShortName, lpszLongName);
     return TRUE;
@@ -514 +503 @@
 #endif
 
+
 /*
         ########## cleaning and resolving paths ##########
@@ -531 +521 @@
  * PathCleanupSpecAW    [SHELL32]
  */
-DWORD WINAPI PathCleanupSpecAW (LPVOID x, LPVOID y)
+DWORD WINAPI PathCleanupSpecAW (LPCVOID x, LPVOID y)
 {
     FIXME("(%p, %p) stub\n",x,y);
@@ -668 +658 @@
  */
  
-static char * szSHFolders = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders";
-static char * szSHUserFolders = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders";
+static const char * const szSHFolders = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders";
+static const char * const szSHUserFolders = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders";
+static const char * const szSetup = "Software\\Microsoft\\Windows\\CurrentVersion\\Setup";
+static const char * const szCurrentVersion = "Software\\Microsoft\\Windows\\CurrentVersion";
 #if 0
-static char * szEnvUserProfile = "%USERPROFILE%";
-static char * szEnvSystemRoot = "%SYSTEMROOT%";
+static const char * const szEnvUserProfile = "%USERPROFILE%";
+static const char * const szEnvSystemRoot = "%SYSTEMROOT%";
 #endif
+
+typedef struct
+{
+    DWORD dwFlags;
+    HKEY hRootKey;
+    LPCSTR szValueName;
+    LPCSTR szDefaultPath; /* fallback string; sub dir of windows directory */
+} CSIDL_DATA;
+
+#define CSIDL_MYFLAG_SHFOLDER   1
+#define CSIDL_MYFLAG_SETUP      2
+#define CSIDL_MYFLAG_CURRVER    4
+#define CSIDL_MYFLAG_RELATIVE   8
+
+#define HKLM HKEY_LOCAL_MACHINE
+#define HKCU HKEY_CURRENT_USER
+static const CSIDL_DATA CSIDL_Data[] =
+{
+    { /* CSIDL_DESKTOP */
+        9, HKCU,
+        "Desktop",
+        "Desktop"
+    },
+    { /* CSIDL_INTERNET (??) */
+        0, 1, /* FIXME */
+        NULL,
+        NULL,
+    },
+    { /* CSIDL_PROGRAMS */
+        9, HKCU,
+        "Programs",
+        "Start Menu\\Programs"
+    },
+    { /* CSIDL_CONTROLS (.CPL files) */
+        10, HKLM,
+        "SysDir",
+        "SYSTEM"
+    },
+    { /* CSIDL_PRINTERS */
+        10, HKLM,
+        "SysDir",
+        "SYSTEM"
+    },
+    { /* CSIDL_PERSONAL */
+        1, HKCU,
+        "Personal",
+        "My Documents"
+    },
+    { /* CSIDL_FAVORITES */
+        9, HKCU,
+        "Favorites",
+        "Favorites"
+    },
+    { /* CSIDL_STARTUP */
+        9, HKCU,
+        "StartUp",
+        "Start Menu\\Programs\\StartUp"
+    },
+    { /* CSIDL_RECENT */
+        9, HKCU,
+        "Recent",
+        "Recent"
+    },
+    { /* CSIDL_SENDTO */
+        9, HKCU,
+        "SendTo",
+        "SendTo"
+    },
+    { /* CSIDL_BITBUCKET (is this c:\recycled ?) */
+        0, 1, /* FIXME */
+        NULL,
+        "recycled"
+    },
+    { /* CSIDL_STARTMENU */
+        9, HKCU,
+        "Start Menu",
+        "Start Menu"
+    },
+    { /* not known */
+        0, 0,
+        NULL,
+        NULL,
+    },
+    { /* not known */
+        0, 0,
+        NULL,
+        NULL,
+    },
+    { /* not known */
+        0, 0,
+        NULL,
+        NULL,
+    },
+    { /* not known */
+        0, 0,
+        NULL,
+        NULL,
+    },
+    { /* CSIDL_DESKTOPDIRECTORY */
+        9, HKCU,
+        "Desktop",
+        "Desktop"
+    },
+    { /* CSIDL_DRIVES */
+        0, 1, /* FIXME */
+        NULL,
+        "My Computer"
+    },
+    { /* CSIDL_NETWORK */
+        0, 1, /* FIXME */
+        NULL,
+        "Network Neighborhood"
+    },
+    { /* CSIDL_NETHOOD */
+        9, HKCU,
+        "NetHood",
+        "NetHood"
+    },
+    { /* CSIDL_FONTS */
+        9, HKCU,
+        "Fonts",
+        "Fonts"
+    },
+    { /* CSIDL_TEMPLATES */
+        9, HKCU,
+        "Templates",
+        "ShellNew"
+    },
+    { /* CSIDL_COMMON_STARTMENU */
+        9, HKLM,
+        "Common Start Menu",
+        "Start Menu"
+    },
+    { /* CSIDL_COMMON_PROGRAMS */
+        9, HKLM,
+        "Common Programs",
+        ""
+    },
+    { /* CSIDL_COMMON_STARTUP */
+        9, HKLM,
+        "Common StartUp",
+        "All Users\\Start Menu\\Programs\\StartUp"
+    },
+    { /* CSIDL_COMMON_DESKTOPDIRECTORY */
+        9, HKLM,
+        "Common Desktop",
+        "Desktop"
+    },
+    { /* CSIDL_APPDATA */
+        9, HKCU,
+        "AppData",
+        "Application Data"
+    },
+    { /* CSIDL_PRINTHOOD */
+        9, HKCU,
+        "PrintHood",
+        "PrintHood"
+    },
+    { /* not known */
+        0, 0,
+        NULL,
+        NULL,
+    },
+    { /* CSIDL_ALTSTARTUP */
+        0, 1, /* FIXME */
+        NULL,
+        NULL
+    },
+    { /* CSIDL_COMMON_ALTSTARTUP */
+        0, 1, /* FIXME */
+        NULL,
+        NULL
+    },
+    { /* CSIDL_COMMON_FAVORITES */
+        9, HKCU,
+        "Favorites",
+        "Favorites"
+    },
+    { /* CSIDL_INTERNET_CACHE */
+        9, HKCU,
+        "Cache",
+        "Temporary Internet Files"
+    },
+    { /* CSIDL_COOKIES */
+        9, HKCU,
+        "Cookies",
+        "Cookies"
+    },
+    { /* CSIDL_HISTORY */
+        9, HKCU,
+        "History",
+        "History"
+    },
+    { /* CSIDL_COMMON_APPDATA */
+        9, HKLM,
+        "Common AppData",
+        "All Users\\Application Data"
+    },
+    { /* CSIDL_WINDOWS */
+        2, HKLM,
+        "WinDir",
+        "Windows"
+    },
+    { /* CSIDL_SYSTEM */
+        10, HKLM,
+        "SysDir",
+        "SYSTEM"
+    },
+    { /* CSIDL_PROGRAM_FILES */
+        4, HKLM,
+        "ProgramFilesDir",
+        "Program Files"
+    },
+    { /* CSIDL_MYPICTURES */
+        1, HKCU,
+        "My Pictures",
+        "My Documents\\My Pictures"
+    },
+    { /* CSIDL_PROFILE */
+        10, HKLM,
+        "WinDir", /* correct ? */
+        ""
+    },
+    { /* CSIDL_SYSTEMX86 */
+        10, HKLM,
+        "SysDir",
+        "SYSTEM"
+    },
+    { /* CSIDL_PROGRAM_FILESX86 */
+        4, HKLM,
+        "ProgramFilesDir",
+        "Program Files"
+    },
+    { /* CSIDL_PROGRAM_FILES_COMMON */
+        4, HKLM,
+        "CommonFilesDir", 
+        "Program Files\\Common Files" /* ? */
+    },
+    { /* CSIDL_PROGRAM_FILES_COMMONX86 */
+        4, HKLM,
+        "CommonFilesDir",
+        "Program Files\\Common Files" /* ? */
+    },
+    { /* CSIDL_COMMON_TEMPLATES */
+        0, 1, /* FIXME */
+        NULL,
+        NULL
+    },
+    { /* CSIDL_COMMON_DOCUMENTS */
+        0, 1, /* FIXME */
+        NULL,
+        NULL
+    },
+    { /* CSIDL_COMMON_ADMINTOOLS */
+        0, 1, /* FIXME */
+        NULL,
+        NULL
+    },
+    { /* CSIDL_ADMINTOOLS */
+        9, HKCU,
+        "Administrative Tools",
+        "Start Menu\\Programs\\Administrative Tools"
+    },
+    { /* CSIDL_CONNECTIONS */
+        0, 1, /* FIXME */
+        NULL,
+        NULL
+    }
+};
+#undef HKCU
+#undef HKLM
+
+/**********************************************************************/
 
 BOOL WINAPI SHGetSpecialFolderPathA (
@@ -681 +946 @@
         BOOL bCreate)
 {
-        CHAR    szValueName[MAX_PATH], szDefaultPath[MAX_PATH];
+        CHAR    szValueName[MAX_PATH], szDefaultPath[MAX_PATH], szBuildPath[MAX_PATH];
         HKEY    hRootKey, hKey;
-        BOOL    bRelative = TRUE;
+        DWORD   dwFlags;
         DWORD   dwType, dwDisp, dwPathLen = MAX_PATH;
+        DWORD   folder = csidl & CSIDL_FOLDER_MASK;
+        CHAR    *p;
 
         TRACE("0x%04x,%p,csidl=%lu,0x%04x\n", hwndOwner,szPath,csidl,bCreate);
 
-        /* build default values */
-        switch(csidl)
+        if ((folder > CSIDL_CONNECTIONS) || (CSIDL_Data[folder].hRootKey == 0))
         {
-          case CSIDL_APPDATA:
-            hRootKey = HKEY_CURRENT_USER;
-            strcpy (szValueName, "AppData");
-            strcpy (szDefaultPath, "AppData");
-            break;
-
-          case CSIDL_COOKIES:
-            hRootKey = HKEY_CURRENT_USER;
-            strcpy (szValueName, "Cookies");
-            strcpy(szDefaultPath, "Cookies");
-            break;
-
-          case CSIDL_DESKTOPDIRECTORY:
-            hRootKey = HKEY_CURRENT_USER;
-            strcpy(szValueName, "Desktop");
-            strcpy(szDefaultPath, "Desktop");
-            break;
-
-          case CSIDL_COMMON_DESKTOPDIRECTORY:
-            hRootKey = HKEY_LOCAL_MACHINE;
-            strcpy(szValueName, "Common Desktop");
-            strcpy(szDefaultPath, "Desktop");
-            break;
-
-          case CSIDL_FAVORITES:
-            hRootKey = HKEY_CURRENT_USER;
-            strcpy(szValueName, "Favorites");
-            strcpy(szDefaultPath, "Favorites");
-            break;
-
-          case CSIDL_FONTS:
-            hRootKey = HKEY_CURRENT_USER;
-            strcpy(szValueName, "Fonts");
-            strcpy(szDefaultPath, "Fonts");
-            break;
-
-          case CSIDL_HISTORY:
-            hRootKey = HKEY_CURRENT_USER;
-            strcpy(szValueName, "History");
-            strcpy(szDefaultPath, "History");
-            break;
-
-          case CSIDL_NETHOOD:
-            hRootKey = HKEY_CURRENT_USER;
-            strcpy(szValueName, "NetHood");
-            strcpy(szDefaultPath, "NetHood");
-            break;
-
-          case CSIDL_INTERNET_CACHE:
-            hRootKey = HKEY_CURRENT_USER;
-            strcpy(szValueName, "Cache");
-            strcpy(szDefaultPath, "Temporary Internet Files");
-            break;
-
-          case CSIDL_PERSONAL:
-            hRootKey = HKEY_CURRENT_USER;
-            strcpy(szValueName, "Personal");
-            strcpy(szDefaultPath, "My Own Files");
-            bRelative = FALSE;
-            break;
-
-          case CSIDL_PRINTHOOD:
-            hRootKey = HKEY_CURRENT_USER;
-            strcpy(szValueName, "PrintHood");
-            strcpy(szDefaultPath, "PrintHood");
-            break;
-
-          case CSIDL_PROGRAMS:
-            hRootKey = HKEY_CURRENT_USER;
-            strcpy(szValueName, "Programs");
-            strcpy(szDefaultPath, "Start Menu\\Programs");
-            break;
-
-          case CSIDL_COMMON_PROGRAMS:
-            hRootKey = HKEY_LOCAL_MACHINE;
-            strcpy(szValueName, "Common Programs");
-            strcpy(szDefaultPath, "");
-            break;
-
-          case CSIDL_RECENT:
-            hRootKey = HKEY_CURRENT_USER;
-            strcpy(szValueName, "Recent");
-            strcpy(szDefaultPath, "Recent");
-            break;
-
-          case CSIDL_SENDTO:
-            hRootKey = HKEY_CURRENT_USER;
-            strcpy(szValueName, "SendTo");
-            strcpy(szDefaultPath, "SendTo");
-            break;
-
-          case CSIDL_STARTMENU:
-            hRootKey = HKEY_CURRENT_USER;
-            strcpy(szValueName, "Start Menu");
-            strcpy(szDefaultPath, "Start Menu");
-            break;
-
-          case CSIDL_COMMON_STARTMENU:
-            hRootKey = HKEY_LOCAL_MACHINE;
-            strcpy(szValueName, "Common Start Menu");
-            strcpy(szDefaultPath, "Start Menu");
-            break;
-
-          case CSIDL_STARTUP:
-            hRootKey = HKEY_CURRENT_USER;
-            strcpy(szValueName, "StartUp");
-            strcpy(szDefaultPath, "Start Menu\\Programs\\StartUp");
-            break;
-
-          case CSIDL_COMMON_STARTUP:
-            hRootKey = HKEY_LOCAL_MACHINE;
-            strcpy(szValueName, "Common StartUp");
-            strcpy(szDefaultPath, "Start Menu\\Programs\\StartUp");
-            break;
-
-          case CSIDL_TEMPLATES:
-            hRootKey = HKEY_CURRENT_USER;
-            strcpy(szValueName, "Templates");
-            strcpy(szDefaultPath, "ShellNew");
-            break;
-
-          default:
             ERR("folder unknown or not allowed\n");
             return FALSE;
         }
-
-        /* user shell folders */
-        if (RegCreateKeyExA(hRootKey,szSHUserFolders,0,NULL,0,KEY_ALL_ACCESS,NULL,&hKey,&dwDisp)) return FALSE;
-
-        if (RegQueryValueExA(hKey,szValueName,NULL,&dwType,(LPBYTE)szPath,&dwPathLen))
+        if (CSIDL_Data[folder].hRootKey == 1)
         {
+            FIXME("folder unknown, please add.\n");
+            return FALSE;
+        }
+
+        dwFlags = CSIDL_Data[folder].dwFlags;
+        hRootKey = CSIDL_Data[folder].hRootKey;
+        strcpy(szValueName, CSIDL_Data[folder].szValueName);
+        strcpy(szDefaultPath, CSIDL_Data[folder].szDefaultPath);
+
+        if (dwFlags & CSIDL_MYFLAG_SHFOLDER)
+        {
+          /*   user shell folders */
+          if   (RegCreateKeyExA(hRootKey,szSHUserFolders,0,NULL,0,KEY_ALL_ACCESS,NULL,&hKey,&dwDisp)) return FALSE;
+
+          if   (RegQueryValueExA(hKey,szValueName,NULL,&dwType,(LPBYTE)szPath,&dwPathLen))
+          {
+            RegCloseKey(hKey);
+
+            /* shell folders */
+            if (RegCreateKeyExA(hRootKey,szSHFolders,0,NULL,0,KEY_ALL_ACCESS,NULL,&hKey,&dwDisp)) return FALSE;
+
+            if (RegQueryValueExA(hKey,szValueName,NULL,&dwType,(LPBYTE)szPath,&dwPathLen))
+            {
+
+              /* value not existing */
+              if (dwFlags & CSIDL_MYFLAG_RELATIVE)
+              {
+                GetWindowsDirectoryA(szPath, MAX_PATH);
+                PathAddBackslashA(szPath);
+                strcat(szPath, szDefaultPath);
+              }
+              else
+              {
+                strcpy(szPath, "C:\\"); /* FIXME ??? */
+                strcat(szPath, szDefaultPath);
+              }
+              RegSetValueExA(hKey,szValueName,0,REG_SZ,(LPBYTE)szPath,strlen(szPath)+1);
+            }
+          }
           RegCloseKey(hKey);
-
-          /* shell folders */
-          if (RegCreateKeyExA(hRootKey,szSHFolders,0,NULL,0,KEY_ALL_ACCESS,NULL,&hKey,&dwDisp)) return FALSE;
-
-          if (RegQueryValueExA(hKey,szValueName,NULL,&dwType,(LPBYTE)szPath,&dwPathLen))
+        }
+        else
+        {
+          LPCSTR pRegPath;
+
+          if (dwFlags & CSIDL_MYFLAG_SETUP)
+            pRegPath = szSetup;
+          else
+          if (dwFlags & CSIDL_MYFLAG_CURRVER)
+            pRegPath = szCurrentVersion;
+          else
           {
-
+            ERR("folder settings broken, please correct !\n");
+            return FALSE;
+          }
+
+          if   (RegCreateKeyExA(hRootKey,pRegPath,0,NULL,0,KEY_ALL_ACCESS,NULL,&hKey,&dwDisp)) return FALSE;
+
+          if   (RegQueryValueExA(hKey,szValueName,NULL,&dwType,(LPBYTE)szPath,&dwPathLen))
+          {
             /* value not existing */
-            if (bRelative)
+            if (dwFlags & CSIDL_MYFLAG_RELATIVE)
             {
               GetWindowsDirectoryA(szPath, MAX_PATH);
@@ -839 +1031 @@
             else
             {
-              strcpy(szPath, "C:\\");   /* fixme ??? */
+              strcpy(szPath, "C:\\");   /* FIXME ??? */
               strcat(szPath, szDefaultPath);
             }
             RegSetValueExA(hKey,szValueName,0,REG_SZ,(LPBYTE)szPath,strlen(szPath)+1);
           }
+          RegCloseKey(hKey);
         }
-        RegCloseKey(hKey);
 
         /* expand paths like %USERPROFILE% */
@@ -854 +1046 @@
         }
 
-        /* if we don't care about existing directorys we are ready */
+        /* if we don't care about existing directories we are ready */
         if(csidl & CSIDL_FLAG_DONT_VERIFY) return TRUE;
 
         if (PathFileExistsA(szPath)) return TRUE;
 
-        /* not existing but we not allowed to create it */
+        /* not existing but we are not allowed to create it */
         if (!bCreate) return FALSE;
-        
-        if (!CreateDirectoryA(szPath,NULL))
+
+        /* create directory/directories */
+        strcpy(szBuildPath, szPath);
+        p = strchr(szBuildPath, '\\');
+        while (p)
         {
-          ERR("Failed to create directory '%s'.\n", szPath);
-          return FALSE;
+            *p = 0;
+            if (!PathFileExistsA(szBuildPath))
+            {
+                if (!CreateDirectoryA(szBuildPath,NULL))
+                {
+                    ERR("Failed to create directory '%s'.\n", szPath);
+                    return FALSE;
+                }
+            }
+            *p = '\\';
+            p = strchr(p+1, '\\');
         }
 
@@ -885 +1089 @@
         if (SHGetSpecialFolderPathA(hwndOwner, szTemp, csidl, bCreate))
         {
-          lstrcpynAtoW(szPath, szTemp, MAX_PATH);
-        }
+            if (!MultiByteToWideChar( CP_ACP, 0, szTemp, -1, szPath, MAX_PATH ))
+                szPath[MAX_PATH-1] = 0;
+        }
 
         TRACE("0x%04x,%p,csidl=%lu,0x%04x\n", hwndOwner,szPath,csidl,bCreate);
@@ -914 +1119 @@
         HWND hwndOwner,
         int nFolder,
-        HANDLE hToken,  /* FIXME: get paths for specific user */
-        DWORD dwFlags,  /* FIXME: SHGFP_TYPE_CURRENT|SHGFP_TYPE_DEFAULT */
+        HANDLE hToken,  /* [in] FIXME: get paths for specific user */
+        DWORD dwFlags,  /* [in] FIXME: SHGFP_TYPE_CURRENT|SHGFP_TYPE_DEFAULT */
         LPSTR pszPath)
 {

trunk/src/shell32/shellreg.c

@@ -1 @@
-/* $Id: shellreg.c,v 1.1 2000-08-30 13:52:56 sandervl Exp $ */
 /*
         Shell Registry Access
 */
-#ifdef __WIN32OS2__
-#define ICOM_CINTERFACE 1
-#include <odin.h>
-#endif
 #include <string.h>
 #include <stdio.h>
@@ -13 +8 @@
 #include "debugtools.h"
 #include "winnls.h"
-#include "heap.h"
 
 #include "shellapi.h"
@@ -101 +95 @@
 }
 
-#ifndef __WIN32OS2__
 /*************************************************************************
  * SHRegDeleteKeyA   [SHELL32]
@@ -110 +103 @@
 {
         FIXME("hkey=0x%08x, %s\n", hkey, debugstr_a(pszSubKey));
+#ifdef __WIN32OS2__
+        return RegDeleteKeyA(hkey,pszSubKey);
+#else
         return 0;
-}
 #endif
+}
 
 /*************************************************************************
@@ -122 +118 @@
 {
         FIXME("hkey=0x%08x, %s\n", hkey, debugstr_w(pszSubKey));
+#ifdef __WIN32OS2__
+        return RegDeleteKeyW(hkey,pszSubKey);
+#else
         return 0;
+#endif
 }
 
@@ -134 +134 @@
         return RegCloseKey( hkey );
 }
+
+#ifndef __WIN32OS2__
+
+/* 16-bit functions */
+
+/* 0 and 1 are valid rootkeys in win16 shell.dll and are used by
+ * some programs. Do not remove those cases. -MM
+ */
+static inline void fix_win16_hkey( HKEY *hkey )
+{
+    if (*hkey == 0 || *hkey == 1) *hkey = HKEY_CLASSES_ROOT;
+}
+
+/******************************************************************************
+ *           RegOpenKey16   [SHELL.1]
+ */
+DWORD WINAPI RegOpenKey16( HKEY hkey, LPCSTR name, LPHKEY retkey )
+{
+    fix_win16_hkey( &hkey );
+    return RegOpenKeyA( hkey, name, retkey );
+}
+
+/******************************************************************************
+ *           RegCreateKey16   [SHELL.2]
+ */
+DWORD WINAPI RegCreateKey16( HKEY hkey, LPCSTR name, LPHKEY retkey )
+{
+    fix_win16_hkey( &hkey );
+    return RegCreateKeyA( hkey, name, retkey );
+}
+
+/******************************************************************************
+ *           RegCloseKey16   [SHELL.3]
+ */
+DWORD WINAPI RegCloseKey16( HKEY hkey )
+{
+    fix_win16_hkey( &hkey );
+    return RegCloseKey( hkey );
+}
+
+/******************************************************************************
+ *           RegDeleteKey16   [SHELL.4]
+ */
+DWORD WINAPI RegDeleteKey16( HKEY hkey, LPCSTR name )
+{
+    fix_win16_hkey( &hkey );
+    return RegDeleteKeyA( hkey, name );
+}
+
+/******************************************************************************
+ *           RegSetValue16   [SHELL.5]
+ */
+DWORD WINAPI RegSetValue16( HKEY hkey, LPCSTR name, DWORD type, LPCSTR data, DWORD count )
+{
+    fix_win16_hkey( &hkey );
+    return RegSetValueA( hkey, name, type, data, count );
+}
+
+/******************************************************************************
+ *           RegQueryValue16   [SHELL.6]
+ *
+ * NOTES
+ *    Is this HACK still applicable?
+ *
+ * HACK
+ *    The 16bit RegQueryValue doesn't handle selectorblocks anyway, so we just
+ *    mask out the high 16 bit.  This (not so much incidently) hopefully fixes
+ *    Aldus FH4)
+ */
+DWORD WINAPI RegQueryValue16( HKEY hkey, LPCSTR name, LPSTR data, LPDWORD count )
+{
+    fix_win16_hkey( &hkey );
+    if (count) *count &= 0xffff;
+    return RegQueryValueA( hkey, name, data, count );
+}
+
+/******************************************************************************
+ *           RegEnumKey16   [SHELL.7]
+ */
+DWORD WINAPI RegEnumKey16( HKEY hkey, DWORD index, LPSTR name, DWORD name_len )
+{
+    fix_win16_hkey( &hkey );
+    return RegEnumKeyA( hkey, index, name, name_len );
+}
+#endif //__WIN32OS2__

trunk/src/shell32/shellstring.c

@@ -1 @@
-/* $Id: shellstring.c,v 1.1 2000-08-30 13:52:56 sandervl Exp $ */
-#ifdef __WIN32OS2__
-#define ICOM_CINTERFACE 1
-#include <odin.h>
-#endif
 #include <string.h>
 #include <stdio.h>
@@ -14 +9 @@
 #include "heap.h"
 
+#include "shlobj.h"
+#include "shlwapi.h"
 #include "shellapi.h"
 #include "shell32_main.h"
@@ -31 +28 @@
  *  the pidl is for STRRET OFFSET
  */
-HRESULT WINAPI StrRetToStrNA (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl)
+HRESULT WINAPI StrRetToStrNA (LPVOID dest, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl)
 {
         return StrRetToBufA( src, pidl, dest, len );
 }
 
-HRESULT WINAPI StrRetToStrNW (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl)
+HRESULT WINAPI StrRetToStrNW (LPVOID dest, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl)
 {
         return StrRetToBufW( src, pidl, dest, len );
 }
 
-HRESULT WINAPI StrRetToStrNAW (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl)
+HRESULT WINAPI StrRetToStrNAW (LPVOID dest, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl)
 {
         if(SHELL_OsIsUnicode())

trunk/src/shell32/shellstub.cpp

@@ -1 @@
-/* $Id: shellstub.cpp,v 1.2 2001-04-19 08:32:18 sandervl Exp $ */
+/* $Id: shellstub.cpp,v 1.3 2001-04-28 13:33:47 sandervl Exp $ */
 
 /*
@@ -100 +100 @@
 }
 
-ODINFUNCTION2(DWORD, ILSaveToStream, DWORD, x1, DWORD, x2)
-{
-  dprintf(("STUB!"));
-  return 0;
-}
-
 ODINFUNCTION1(DWORD, InvalidateDriveType, DWORD, x1)
 {

trunk/src/shell32/shlfolder.c

@@ -1 @@
-/* $Id: shlfolder.c,v 1.1 2000-08-30 13:52:57 sandervl Exp $ */
 /*
  *      Shell Folder stuff
@@ -10 +9 @@
  */
 #ifdef __WIN32OS2__
-#define ICOM_CINTERFACE 1
-#include <odin.h>
+#define WINE_LARGE_INTEGER
+#define snprintf(a,b,c,d)       sprintf(a,c,d)
 #endif
-
 #include <stdlib.h>
 #include <string.h>
@@ -20 +18 @@
 #include "debugtools.h"
 #include "winerror.h"
+#include "winbase.h"
 
 #include "oleidl.h"
@@ -32 +31 @@
 #include "shresdef.h"
 #include "shlwapi.h"
-
-#define INITGUID
-#include "initguid.h"
 #include "shellfolder.h"
 
-
-DEFAULT_DEBUG_CHANNEL(shell)
+DEFAULT_DEBUG_CHANNEL(shell);
 
 
@@ -347 +342 @@
 
 /**************************************************************************
-*       we need a seperate IUnknown to handle aggregation
+*       we need a separate IUnknown to handle aggregation
 *       (inner IUnknown)
 */
@@ -616 +611 @@
 *
 * NOTES
-*  every folder trys to parse only it's own (the leftmost) pidl and creates a 
+*  every folder tries to parse only its own (the leftmost) pidl and creates a 
 *  subfolder to evaluate the remaining parts
 *  now we can parse into namespaces implemented by shell extensions
@@ -658 +653 @@
 
           /* build the full pathname to the element */
-          lstrcpynWtoA(szTempA, szElement, lstrlenW(szElement) + 1);
+          WideCharToMultiByte( CP_ACP, 0, szElement, -1, szTempA, MAX_PATH, NULL, NULL );
           strcpy(szPath, This->sMyPath);
           PathAddBackslashA(szPath);
@@ -691 +686 @@
         }
 
-        *ppidl = pidlTemp;
+        if (!hr)
+          *ppidl = pidlTemp;
+        else
+          *ppidl = NULL;
 
         TRACE("(%p)->(-- pidl=%p ret=0x%08lx)\n", This, ppidl? *ppidl:0, hr);
@@ -1188 +1186 @@
         PathAddBackslashA(szDest);
         len = strlen (szDest);
-        lstrcpynWtoA(szDest+len, lpName, MAX_PATH-len);
-        
+        WideCharToMultiByte( CP_ACP, 0, lpName, -1, szDest+len, MAX_PATH-len, NULL, NULL );
+        szDest[MAX_PATH-1] = 0;
         TRACE("src=%s dest=%s\n", szSrc, szDest);
         if ( MoveFileA(szSrc, szDest) )
@@ -1498 +1496 @@
         int i;
         char szPath[MAX_PATH];
+        BOOL bConfirm = TRUE;
 
         TRACE("(%p)(%u %p)\n", This, cidl, apidl);
         
+        /* deleting multiple items so give a slightly different warning */
+        if(cidl != 1)
+        {
+          char tmp[8]; 
+          snprintf(tmp, sizeof(tmp), "%d", cidl);
+          if(!SHELL_WarnItemDelete(ASK_DELETE_MULTIPLE_ITEM, tmp))
+            return E_FAIL;
+          bConfirm = FALSE;
+        }
+
         for(i=0; i< cidl; i++)
         {
@@ -1510 +1519 @@
           {
             LPITEMIDLIST pidl;
-
-            MESSAGE("delete %s\n", szPath);
-            if (! SHELL_DeleteDirectoryA(szPath, TRUE)) return E_FAIL;
+            TRACE("delete %s\n", szPath);
+            if (! SHELL_DeleteDirectoryA(szPath, bConfirm))
+            {
+              TRACE("delete %s failed, bConfirm=%d", szPath, bConfirm);
+              return E_FAIL;
+            }
             pidl = ILCombine(This->absPidl, apidl[i]);
             SHChangeNotifyA(SHCNE_RMDIR, SHCNF_IDLIST, pidl, NULL);
@@ -1521 +1533 @@
             LPITEMIDLIST pidl;
 
-            MESSAGE("delete %s\n", szPath);
-            if (! DeleteFileA(szPath)) return E_FAIL;
+            TRACE("delete %s\n", szPath);
+            if (! SHELL_DeleteFileA(szPath, bConfirm))
+            {
+              TRACE("delete %s failed, bConfirm=%d", szPath, bConfirm);
+              return E_FAIL;
+            }
             pidl = ILCombine(This->absPidl, apidl[i]);
             SHChangeNotifyA(SHCNE_DELETE, SHCNF_IDLIST, pidl, NULL);
@@ -2133 +2149 @@
         {
           szNext = GetNextElementW(lpszDisplayName, szElement, MAX_PATH);
-          lstrcpynWtoA(szTempA, szElement, lstrlenW(szElement) + 1);
+          WideCharToMultiByte( CP_ACP, 0, szElement, -1, szTempA, MAX_PATH, NULL, NULL );
           pidlTemp = _ILCreateDrive(szTempA);
 
@@ -2498 +2514 @@
                 _ILSimpleGetText(pidl, szPath, MAX_PATH);
                 GetDiskFreeSpaceExA(szPath, NULL, &ulBytes, NULL);
-#ifdef __WIN32OS2__
-                StrFormatByteSizeA(ulBytes.LowPart, psd->str.u.cStr, MAX_PATH);
-#else
                 StrFormatByteSizeA(ulBytes.s.LowPart, psd->str.u.cStr, MAX_PATH);
-#endif
               }
               break;
@@ -2510 +2522 @@
                 _ILSimpleGetText(pidl, szPath, MAX_PATH);
                 GetDiskFreeSpaceExA(szPath, &ulBytes, NULL, NULL);
-#ifdef __WIN32OS2__
-                StrFormatByteSizeA(ulBytes.LowPart, psd->str.u.cStr, MAX_PATH);
-#else
                 StrFormatByteSizeA(ulBytes.s.LowPart, psd->str.u.cStr, MAX_PATH);
-#endif
               }
               break;

trunk/src/shell32/shlmenu.c

@@ -1 @@
-/* $Id: shlmenu.c,v 1.1 2000-08-30 13:52:59 sandervl Exp $ */
 /*
  * see www.geocities.com/SiliconValley/4942/filemenu.html
  */
-#ifdef __WIN32OS2__
-#define ICOM_CINTERFACE 1
-#include <odin.h>
-#endif
 #include <string.h>
 
+#include "shlobj.h"
 #include "wine/obj_base.h"
 #include "wine/obj_enumidlist.h"
 #include "wine/obj_shellfolder.h"
 #include "wine/undocshell.h"
-
+#include "shlwapi.h"
 #include "heap.h"
 #include "debugtools.h"
@@ -52 +48 @@
 #define CCH_MAXITEMTEXT 256
 
-DEFAULT_DEBUG_CHANNEL(shell)
+DEFAULT_DEBUG_CHANNEL(shell);
 
 LPFMINFO FM_GetMenuInfo(HMENU hmenu)
@@ -359 +355 @@
 
 }
+
+/**********************************************************************/
+
 BOOL WINAPI FileMenu_AppendItemAW(
         HMENU hMenu,
@@ -603 +602 @@
         
         Shell_GetImageList(0, &hImageList);
-        pImageList_Draw(hImageList, pMyItem->iIconIndex, lpdis->hDC, xi, yi, ILD_NORMAL);
+        ImageList_Draw(hImageList, pMyItem->iIconIndex, lpdis->hDC, xi, yi, ILD_NORMAL);
 
         TRACE("-- 0x%04x 0x%04x 0x%04x 0x%04x\n", TextRect.left, TextRect.top, TextRect.right, TextRect.bottom);
@@ -691 +690 @@
 
         GetMenuItemInfoA(hMenu, uID, FALSE, &mii );
-        if ( mii.hSubMenu );
+        if ( mii.hSubMenu )
+        {
+          /* FIXME: Do what? */
+        }
 
         DeleteMenu(hMenu, MF_BYCOMMAND, uID);
@@ -711 +713 @@
 
         GetMenuItemInfoA(hMenu, uPos, TRUE, &mii );
-        if ( mii.hSubMenu );
+        if ( mii.hSubMenu )
+        {
+          /* FIXME: Do what? */
+        }
 
         DeleteMenu(hMenu, MF_BYPOSITION, uPos);
@@ -820 +825 @@
         return(FALSE);
 }
+
+/**********************************************************************/
 
 HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uIDAdjust, UINT uIDAdjustMax, ULONG uFlags)

trunk/src/shell32/shlview.c

@@ -1 @@
-/* $Id: shlview.c,v 1.1 2000-08-30 13:52:59 sandervl Exp $ */
 /*
  *      ShellView
@@ -23 +22 @@
  * Release() ??? 
  */
-#ifdef __WIN32OS2__
-#define ICOM_CINTERFACE 1
-#include <odin.h>
-#endif
 
 #include <stdlib.h>
 #include <string.h>
 
+#include "windef.h"
+#include "winerror.h"
+#include "winnls.h"
 #include "servprov.h"
 #include "shlguid.h"
-#include "wine/obj_base.h"
-#include "wine/obj_shellfolder.h"
-#include "wine/obj_shellview.h"
-#include "wine/obj_oleview.h"
-#include "wine/obj_commdlgbrowser.h"
-#include "wine/obj_shellbrowser.h"
-#include "wine/obj_dockingwindowframe.h"
-#include "wine/obj_extracticon.h"
-#include "wine/obj_dragdrop.h"
+#include "shlobj.h"
 #include "wine/undocshell.h"
 #include "shresdef.h"
 #include "debugtools.h"
-#include "winerror.h"
-#include "wine/winestring.h"
 
 #include "docobj.h"
 #include "pidl.h"
 #include "shell32_main.h"
+#include "shellfolder.h"
 
 DEFAULT_DEBUG_CHANNEL(shell);
@@ -118 +107 @@
 #define SHV_CHANGE_NOTIFY WM_USER + 0x1111
 
-#define TOOLBAR_ID   (L"SHELLDLL_DefView")
 /*windowsx.h */
 #define GET_WM_COMMAND_ID(wp, lp)               LOWORD(wp)
 #define GET_WM_COMMAND_HWND(wp, lp)             (HWND)(lp)
 #define GET_WM_COMMAND_CMD(wp, lp)              HIWORD(wp)
-/* winuser.h */
-#define WM_SETTINGCHANGE                WM_WININICHANGE
+
 extern void WINAPI _InsertMenuItem (HMENU hmenu, UINT indexMenu, BOOL fByPosition, 
                         UINT wID, UINT fType, LPSTR dwTypeData, UINT fState);
@@ -152 +139 @@
 typedef void (* CALLBACK PFNSHGETSETTINGSPROC)(LPSHELLFLAGSTATE lpsfs, DWORD dwMask);
 #else
-typedef void (CALLBACK *PFNSHGETSETTINGSPROC)(LPSHELLFLAGSTATE lpsfs, DWORD dwMask);
+typedef void CALLBACK (*PFNSHGETSETTINGSPROC)(LPSHELLFLAGSTATE lpsfs, DWORD dwMask);
 #endif
 
@@ -1259 +1246 @@
                 
                 pidl = (LPITEMIDLIST)lpdi->item.lParam;
-                lstrcpynAtoW(wszNewName, lpdi->item.pszText, MAX_PATH);
+                if (!MultiByteToWideChar( CP_ACP, 0, lpdi->item.pszText, -1, wszNewName, MAX_PATH ))
+                    wszNewName[MAX_PATH-1] = 0;
                 hr = IShellFolder_SetNameOf(This->pSFParent, 0, pidl, wszNewName, SHGDN_INFOLDER, &pidl);
                 
@@ -1285 +1273 @@
               
               LPNMLVKEYDOWN plvKeyDown = (LPNMLVKEYDOWN) lpnmh;
+
+              /* initiate a rename of the selected file or directory */
+              if(plvKeyDown->wVKey == VK_F2)
+              {
+                /* see how many files are selected */
+                int i = ListView_GetSelectedCount(This->hWndList);
+
+                /* get selected item */
+                if(i == 1)
+                {
+                  /* get selected item */
+                  i = ListView_GetNextItem(This->hWndList, -1,
+                        LVNI_SELECTED);
+ 
+                  ListView_EnsureVisible(This->hWndList, i, 0);
+                  ListView_EditLabelA(This->hWndList, i);
+                }
+              }
 #if 0
               TranslateAccelerator(This->hWnd, This->hAccel, &msg)
 #endif
-              FIXME("LVN_KEYDOWN key=0x%08x\n",plvKeyDown->wVKey);
+              else if(plvKeyDown->wVKey == VK_DELETE)
+              {
+                int i, item_index;
+                LVITEMA item;
+                LPITEMIDLIST* pItems;
+                ISFHelper *psfhlp;
+
+                IShellFolder_QueryInterface(This->pSFParent, &IID_ISFHelper,
+                        (LPVOID*)&psfhlp);
+
+                if(!(i = ListView_GetSelectedCount(This->hWndList)))
+                  break;
+        
+                /* allocate memory for the pidl array */
+                pItems = HeapAlloc(GetProcessHeap(), 0, 
+                        sizeof(LPITEMIDLIST) * i);
+ 
+                /* retrieve all selected items */
+                i = 0;
+                item_index = -1;
+                while(ListView_GetSelectedCount(This->hWndList) > i)
+                {
+                  /* get selected item */
+                  item_index = ListView_GetNextItem(This->hWndList, 
+                        item_index, LVNI_SELECTED);
+                  item.iItem = item_index;
+                  ListView_GetItemA(This->hWndList, &item);
+
+                  /* get item pidl */
+                  pItems[i] = (LPITEMIDLIST)item.lParam;
+                  
+                  i++;
+                }
+
+                /* perform the item deletion */
+                ISFHelper_DeleteItems(psfhlp, i, pItems);
+
+                /* free pidl array memory */
+                HeapFree(GetProcessHeap(), 0, pItems);
+              }
+              else
+                FIXME("LVN_KEYDOWN key=0x%08x\n",plvKeyDown->wVKey);
             }
             break;
+
           default:
             TRACE("-- %p WM_COMMAND %x unhandled\n", This, lpnmh->code);

trunk/src/shell32/shpolicy.c

@@ -1 @@
-/* $Id: shpolicy.c,v 1.1 2000-08-30 13:53:00 sandervl Exp $ */
 /*
  * shpolicy.c - Data for shell/system policies.
@@ -14 +13 @@
  * Up to date as of SHELL32 v4.72 (Win98, Win95 with MSIE 5)
  */
-#ifdef __WIN32OS2__
-#define ICOM_CINTERFACE 1
-#include <odin.h>
-#endif
 
 #include <stdlib.h>

trunk/src/shell32/shpolicy.h

@@ -1 @@
-/* $Id: shpolicy.h,v 1.3 2000-08-30 13:51:08 sandervl Exp $ */
-/*
+/* 
  *  shpolicy.h - contains defs of policy data for SHRestricted
- *
+ * 
  *  Created 1999 by Ian Schmidt, <ischmidt@cfl.rr.com>
  *  Up to date as of SHELL32 v4.72 (Win98, Win95 with MSIE 5)
- *
- * Corel WINE 20000324 level
  */
 

trunk/src/shell32/shres.orc

@@ -1 @@
-/* $Id: shres.orc,v 1.12 2001-04-23 10:47:23 sandervl Exp $ */
+/* $Id: shres.orc,v 1.13 2001-04-28 13:33:48 sandervl Exp $ */
 /*
  * Top level resource file for Common Dialogs
@@ -104 +104 @@
  DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Cancel", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP
- LTEXT "", IDD_TITLE, 4, 4, 18, 12
- LTEXT "", IDD_STATUS, 4, 25, 18, 12
+ LTEXT "", IDD_TITLE, 4, 4, 180, 12
+ LTEXT "", IDD_STATUS, 4, 25, 180, 12
  CONTROL "Tree1",IDD_TREEVIEW,"SysTreeView32",
         TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT |
-        WS_BORDER | WS_TABSTOP,
+        WS_BORDER | WS_TABSTOP, 
         4, 40, 180, 120
 }
+
 
 /*

trunk/src/shell32/shv_bg_cmenu.c

@@ -1 @@
-/* $Id: shv_bg_cmenu.c,v 1.1 2000-08-30 13:53:00 sandervl Exp $ */
 /*
  *      IContextMenu
@@ -6 +5 @@
  *      Copyright 1999  Juergen Schmied <juergen.schmied@metronet.de>
  */
-#ifdef __WIN32OS2__
-#define ICOM_CINTERFACE 1
-#include <odin.h>
-#endif
 #include <string.h>
 
@@ -22 +17 @@
 #include "shell32_main.h"
 #include "shellfolder.h"
-#include "shell.h" /* DROPFILESTRUCT */
 #include "wine/undocshell.h"
 
-DEFAULT_DEBUG_CHANNEL(shell)
+DEFAULT_DEBUG_CHANNEL(shell);
 
 /**************************************************************************
@@ -201 +195 @@
         TRACE("\n");
 
-        if(SUCCEEDED(pOleGetClipboard(&pda)));
+        if(SUCCEEDED(pOleGetClipboard(&pda)))
         {
           STGMEDIUM medium;
@@ -370 +364 @@
         TRACE("(%p)->(idcom=%x flags=%x %p name=%p len=%x)\n",This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen);
 
-        /* test the existance of the menu items, the file dialog enables 
+        /* test the existence of the menu items, the file dialog enables 
            the buttons according to this */
         if (uFlags == GCS_VALIDATEA)

trunk/src/shell32/shv_item_cmenu.c

@@ -1 @@
-/* $Id: shv_item_cmenu.c,v 1.1 2000-08-30 13:53:01 sandervl Exp $ */
 /*
  *      IContextMenu for items in the shellview
@@ -5 +4 @@
  *      1998, 2000      Juergen Schmied <juergen.schmied@debitel.net>
  */
-#ifdef __WIN32OS2__
-#define ICOM_CINTERFACE 1
-#include <odin.h>
-#endif
 #include <string.h>
 
@@ -24 +19 @@
 #include "shell32_main.h"
 #include "shellfolder.h"
-#include "shell.h" /* DROPFILESTRUCT */
-
-DEFAULT_DEBUG_CHANNEL(shell)
+
+DEFAULT_DEBUG_CHANNEL(shell);
 
 /**************************************************************************
@@ -491 +485 @@
             switch(idCommand)
             { case FCIDM_SHVIEW_RENAME:
-                lstrcpyAtoW((LPWSTR)lpszName, "rename");
+                MultiByteToWideChar( CP_ACP, 0, "rename", -1, (LPWSTR)lpszName, uMaxNameLen );
                 hr = NOERROR;
                 break;

trunk/src/shell32/systray.c

@@ -1 @@
-/* $Id: systray.c,v 1.1 2000-08-30 13:53:01 sandervl Exp $ */
 /*
  *      Systray
@@ -10 +9 @@
  *
  */
-#ifdef __WIN32OS2__
-#define ICOM_CINTERFACE 1
-#include <odin.h>
-#else
+
+#ifndef __WIN32OS2__
 #include <unistd.h>
 #endif
@@ -19 +16 @@
 #include <string.h>
 
-#ifndef __WIN32OS2__
-#include "heap.h"
-#endif
+#include "winnls.h"
+#include "shlobj.h"
 #include "shellapi.h"
 #include "shell32_main.h"
-#include "windows.h"
 #include "commctrl.h"
 #include "debugtools.h"
+#include "heap.h"
 #include "config.h"
 
-DEFAULT_DEBUG_CHANNEL(shell)
+DEFAULT_DEBUG_CHANNEL(shell);
 
 typedef struct SystrayItem {
@@ -186 +182 @@
   return FALSE;
 #else
+
   /* Initialize the window size. */
   rect.left   = 0;
@@ -215 +212 @@
   }
   return TRUE;
-#endif  //__WIN32OS2__
+#endif
 }
 
@@ -221 +218 @@
 static void SYSTRAY_ItemTerm(SystrayItem *ptrayItem)
 {
+  if(ptrayItem->notifyIcon.hIcon)
+     DestroyIcon(ptrayItem->notifyIcon.hIcon);   
   if(ptrayItem->hWndToolTip)
       DestroyWindow(ptrayItem->hWndToolTip);
@@ -237 +236 @@
 void SYSTRAY_ItemSetIcon(SystrayItem *ptrayItem, HICON hIcon)
 {
-  ptrayItem->notifyIcon.hIcon = hIcon; /* do we need a copy? */
+  ptrayItem->notifyIcon.hIcon = CopyIcon(hIcon);
   InvalidateRect(ptrayItem->hWnd, NULL, TRUE);
 }
@@ -346 +345 @@
 
 /*************************************************************************
- * Shell_NotifyIconA                    [SHELL32.297]
+ * Shell_NotifyIconA                    [SHELL32.297][SHELL32.296]
  */
 BOOL WINAPI Shell_NotifyIconA(DWORD dwMessage, PNOTIFYICONDATAA pnid )
@@ -368 +367 @@
 
 /*************************************************************************
- * Shell_NotifyIconW                    [SHELL32.297]
+ * Shell_NotifyIconW                    [SHELL32.298]
  */
 BOOL WINAPI Shell_NotifyIconW (DWORD dwMessage, PNOTIFYICONDATAW pnid )
@@ -376 +375 @@
         PNOTIFYICONDATAA p = HeapAlloc(GetProcessHeap(),0,sizeof(NOTIFYICONDATAA));
         memcpy(p, pnid, sizeof(NOTIFYICONDATAA));
-        if (*(pnid->szTip))
-          lstrcpynWtoA (p->szTip, pnid->szTip, 64 );
+        WideCharToMultiByte( CP_ACP, 0, pnid->szTip, -1, p->szTip, sizeof(p->szTip), NULL, NULL );
+        p->szTip[sizeof(p->szTip)-1] = 0;
 
         ret = Shell_NotifyIconA(dwMessage, p );
@@ -384 +383 @@
         return ret;
 }
-
-/*************************************************************************
- * Shell_NotifyIcon                     [SHELL32.296]
- */
-BOOL WINAPI Shell_NotifyIcon(DWORD dwMessage, PNOTIFYICONDATAA pnid)
-{
-  return Shell_NotifyIconA(dwMessage, pnid);
-}