Changeset 795 for trunk/src

Timestamp:

Sep 2, 1999, 7:25:19 PM (26 years ago)

Author:

phaller

Message:

.

Location:

trunk/src/shell32/new

Files:

• pidl.cpp (modified) (2 diffs)
• regstream.cpp (modified) (3 diffs)
• shelllink.cpp (modified) (6 diffs)
• shellole.cpp (modified) (7 diffs)
• shlfolder.cpp (modified) (8 diffs)
• shlmenu.cpp (modified) (3 diffs)
• shv_bg_cmenu.cpp (modified) (2 diffs)

trunk/src/shell32/new/pidl.cpp

@@ -142 +142 @@
 }
 
+
 /*************************************************************************
  * ILGetDisplayName                     [SHELL32.15]
@@ -293 +294 @@
         TRACE_(shell)("%s %p 0x%08lx\n",path,ppidl,attributes?*attributes:0);
 
-        LocalToWideChar(lpszDisplayName, path, MAX_PATH);
+        LocalToWideChar(lpszDisplayName, (LPSTR)path, MAX_PATH);
 
         if (SUCCEEDED (SHGetDesktopFolder(&sf)))

trunk/src/shell32/new/regstream.cpp

@@ -17 +17 @@
 #include "shell32_main.h"
 
+#include <heapstring.h>
 #include <misc.h>
 
@@ -32 +33 @@
 } ISHRegStream;
 
-static struct ICOM_VTABLE(IStream) rstvt;
-
-/**************************************************************************
-*   IStream_Constructor()
-*/
-IStream *IStream_Constructor(HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue, DWORD grfMode)
-{       ISHRegStream*   rstr;
-        DWORD           dwType;
-        
-        rstr = (ISHRegStream*)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(ISHRegStream));
-        rstr->lpvtbl=&rstvt;
-        rstr->ref = 1;
-
-        if ( ERROR_SUCCESS == RegOpenKeyExA (hKey, pszSubKey, 0, KEY_READ, &(rstr->hKey)))
-        { if ( ERROR_SUCCESS == RegQueryValueExA(rstr->hKey, (LPSTR)pszValue,0,0,0,&(rstr->dwLength)))
-          {
-            /* read the binary data into the buffer */
-            rstr->pbBuffer = HeapAlloc(GetProcessHeap(),0,rstr->dwLength);
-            if (rstr->pbBuffer)
-            { if ( ERROR_SUCCESS == RegQueryValueExA(rstr->hKey, (LPSTR)pszValue,0,&dwType,rstr->pbBuffer,&(rstr->dwLength)))
-              { if (dwType == REG_BINARY )
-                { rstr->pszSubKey = HEAP_strdupA (GetProcessHeap(),0, pszSubKey);
-                  rstr->pszValue = HEAP_strdupA (GetProcessHeap(),0, pszValue);         
-                  TRACE("(%p)->0x%08x,%s,%s,0x%08lx\n", rstr, hKey, pszSubKey, pszValue, grfMode);
-                  shell32_ObjCount++;
-                  return (IStream*)rstr;
-                }
-              }
-              HeapFree (GetProcessHeap(),0,rstr->pbBuffer);
-            }
-          }
-          RegCloseKey(rstr->hKey);
-
-        }
-        HeapFree (GetProcessHeap(),0,rstr);
-        return NULL;
-}
+//static struct ICOM_VTABLE(IStream) rstvt;
+
 
 /**************************************************************************
@@ -274 +240 @@
 };
 
+/**************************************************************************
+*   IStream_Constructor()
+*/
+IStream *IStream_Constructor(HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue, DWORD grfMode)
+{       ISHRegStream*   rstr;
+        DWORD           dwType;
+        
+        rstr = (ISHRegStream*)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(ISHRegStream));
+        rstr->lpvtbl=&rstvt;
+        rstr->ref = 1;
+
+        if ( ERROR_SUCCESS == RegOpenKeyExA (hKey, pszSubKey, 0, KEY_READ, &(rstr->hKey)))
+        { if ( ERROR_SUCCESS == RegQueryValueExA(rstr->hKey, (LPSTR)pszValue,0,0,0,&(rstr->dwLength)))
+          {
+            /* read the binary data into the buffer */
+            rstr->pbBuffer = (BYTE*)HeapAlloc(GetProcessHeap(),0,rstr->dwLength);
+            if (rstr->pbBuffer)
+            { if ( ERROR_SUCCESS == RegQueryValueExA(rstr->hKey, (LPSTR)pszValue,0,&dwType,rstr->pbBuffer,&(rstr->dwLength)))
+              { if (dwType == REG_BINARY )
+                { rstr->pszSubKey = HEAP_strdupA (GetProcessHeap(),0, pszSubKey);
+                  rstr->pszValue = HEAP_strdupA (GetProcessHeap(),0, pszValue);         
+                  TRACE("(%p)->0x%08x,%s,%s,0x%08lx\n", rstr, hKey, pszSubKey, pszValue, grfMode);
+                  shell32_ObjCount++;
+                  return (IStream*)rstr;
+                }
+              }
+              HeapFree (GetProcessHeap(),0,rstr->pbBuffer);
+            }
+          }
+          RegCloseKey(rstr->hKey);
+
+        }
+        HeapFree (GetProcessHeap(),0,rstr);
+        return NULL;
+}
+
+
 /*************************************************************************
  * OpenRegStream                                [SHELL32.85]

trunk/src/shell32/new/shelllink.cpp

@@ -26 +26 @@
 #include "shlguid.h"
 
+#include <heapstring.h>
 #include <misc.h>
 
@@ -67 +68 @@
 #include "poppack.h"
 
-static ICOM_VTABLE(IShellLink)          slvt;
-static ICOM_VTABLE(IShellLinkW)         slvtw;
-static ICOM_VTABLE(IPersistFile)        pfvt;
-static ICOM_VTABLE(IPersistStream)      psvt;
+//static ICOM_VTABLE(IShellLink)                slvt;
+//static ICOM_VTABLE(IShellLinkW)               slvtw;
+//static ICOM_VTABLE(IPersistFile)      pfvt;
+//static ICOM_VTABLE(IPersistStream)    psvt;
 
 /* IShellLink Implementation */
@@ -295 +296 @@
         IStream*         pLoadStream)
 {
-        PLINK_HEADER lpLinkHeader = HeapAlloc(GetProcessHeap(), 0, LINK_HEADER_SIZE);
+        PLINK_HEADER lpLinkHeader = (PLINK_HEADER)HeapAlloc(GetProcessHeap(), 0, LINK_HEADER_SIZE);
         ULONG   dwBytesRead;
         DWORD   ret = E_FAIL;
@@ -316 +317 @@
             if ((lpLinkHeader->MagicStr == 0x0000004CL) && IsEqualIID(&lpLinkHeader->MagicGuid, &CLSID_ShellLink))
             {
-              lpLinkHeader = HeapReAlloc(GetProcessHeap(), 0, lpLinkHeader, LINK_HEADER_SIZE+lpLinkHeader->PidlSize);
+              lpLinkHeader = (PLINK_HEADER)HeapReAlloc(GetProcessHeap(), 0, lpLinkHeader, LINK_HEADER_SIZE+lpLinkHeader->PidlSize);
               if (lpLinkHeader)
               {
@@ -404 +405 @@
 
 /**************************************************************************
- *        IShellLink_Constructor
- */
-IShellLink * IShellLink_Constructor(BOOL bUnicode)
-{       IShellLinkImpl * sl;
-
-        sl = (IShellLinkImpl *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IShellLinkImpl));
-        sl->ref = 1;
-        sl->lpvtbl = &slvt;
-        sl->lpvtblw = &slvtw;
-        sl->lpvtblPersistFile = &pfvt;
-        sl->lpvtblPersistStream = &psvt;
-        
-        TRACE("(%p)->()\n",sl);
-        shell32_ObjCount++;
-        return bUnicode ? (IShellLink *) &(sl->lpvtblw) : (IShellLink *)sl;
-}
-
-/**************************************************************************
  *  IShellLink_QueryInterface
  */
@@ -902 +885 @@
 };
 
+/**************************************************************************
+ *        IShellLink_Constructor
+ */
+IShellLink * IShellLink_Constructor(BOOL bUnicode)
+{       IShellLinkImpl * sl;
+
+        sl = (IShellLinkImpl *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IShellLinkImpl));
+        sl->ref = 1;
+        sl->lpvtbl = &slvt;
+        sl->lpvtblw = &slvtw;
+        sl->lpvtblPersistFile = &pfvt;
+        sl->lpvtblPersistStream = &psvt;
+        
+        TRACE("(%p)->()\n",sl);
+        shell32_ObjCount++;
+        return bUnicode ? (IShellLink *) &(sl->lpvtblw) : (IShellLink *)sl;
+}
+
+

trunk/src/shell32/new/shellole.cpp

@@ -66 +66 @@
         WINE_StringFromCLSID(refiid,xiid);
         if (unknownouter)
-                WINE_StringFromCLSID(unknownouter,xuout);
+                WINE_StringFromCLSID((const CLSID*)unknownouter,xuout);
         
         TRACE("(%p,\n\tCLSID:\t%s\n\tUOUT:\t%s\n\tIID:\t%s,%p)\n",
@@ -140 +140 @@
 {
         if (VERSION_OsIsUnicode())
-          return SHCLSIDFromStringW (clsid, id);
-        return SHCLSIDFromStringA (clsid, id);
+          return SHCLSIDFromStringW ((LPWSTR)clsid, id);
+        return SHCLSIDFromStringA ((LPSTR)clsid, id);
 }
 
@@ -178 +178 @@
           if(lpclf)
           {
-            hres = IClassFactory_CreateInstance(lpclf,NULL,(REFIID)&IID_IShellFolder, (void*)&pdesktopfolder);
+            hres = IClassFactory_CreateInstance(lpclf,NULL,(REFIID)&IID_IShellFolder, (LPVOID*)&pdesktopfolder);
             IClassFactory_Release(lpclf);
           }
@@ -206 +206 @@
 } IClassFactoryImpl;
 
-static ICOM_VTABLE(IClassFactory) clfvt;
-
-/**************************************************************************
- *  IClassFactory_Constructor
- */
-
-LPCLASSFACTORY IClassFactory_Constructor(REFCLSID rclsid)
-{
-        IClassFactoryImpl* lpclf;
-
-        lpclf= (IClassFactoryImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(IClassFactoryImpl));
-        lpclf->ref = 1;
-        lpclf->lpvtbl = &clfvt;
-        lpclf->rclsid = (CLSID*)rclsid;
-
-        TRACE("(%p)->()\n",lpclf);
-        shell32_ObjCount++;
-        return (LPCLASSFACTORY)lpclf;
-}
+//static ICOM_VTABLE(IClassFactory) clfvt;
+
 /**************************************************************************
  *  IClassFactory_QueryInterface
@@ -348 +331 @@
 
 /**************************************************************************
+ *  IClassFactory_Constructor
+ */
+
+LPCLASSFACTORY IClassFactory_Constructor(REFCLSID rclsid)
+{
+        IClassFactoryImpl* lpclf;
+
+        lpclf= (IClassFactoryImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(IClassFactoryImpl));
+        lpclf->ref = 1;
+        lpclf->lpvtbl = &clfvt;
+        lpclf->rclsid = (CLSID*)rclsid;
+
+        TRACE("(%p)->()\n",lpclf);
+        shell32_ObjCount++;
+        return (LPCLASSFACTORY)lpclf;
+}
+
+
+/**************************************************************************
  * Default ClassFactory Implementation
  *
@@ -369 +371 @@
 } IDefClFImpl;
 
-static ICOM_VTABLE(IClassFactory) dclfvt;
-
-/**************************************************************************
- *  IDefClF_fnConstructor
- */
-
-IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, UINT * pcRefDll, REFIID riidInst)
-{
-        IDefClFImpl* lpclf;
-        char    xriidInst[50];
-
-        WINE_StringFromCLSID((LPCLSID)riidInst,xriidInst);
-
-        lpclf = (IDefClFImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(IDefClFImpl));
-        lpclf->ref = 1;
-        lpclf->lpvtbl = &dclfvt;
-        lpclf->lpfnCI = lpfnCI;
-        lpclf->pcRefDll = pcRefDll;
-
-        if (pcRefDll)
-          (*pcRefDll)++;
-
-        lpclf->riidInst = riidInst;
-
-        TRACE("(%p)\n\tIID:\t%s\n",lpclf, xriidInst);
-        shell32_ObjCount++;
-        return (LPCLASSFACTORY)lpclf;
-}
+//static ICOM_VTABLE(IClassFactory) dclfvt;
+
 /**************************************************************************
  *  IDefClF_fnQueryInterface
@@ -505 +481 @@
 };
 
+/**************************************************************************
+ *  IDefClF_fnConstructor
+ */
+
+IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, UINT * pcRefDll, REFIID riidInst)
+{
+        IDefClFImpl* lpclf;
+        char    xriidInst[50];
+
+        WINE_StringFromCLSID((LPCLSID)riidInst,xriidInst);
+
+        lpclf = (IDefClFImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(IDefClFImpl));
+        lpclf->ref = 1;
+        lpclf->lpvtbl = &dclfvt;
+        lpclf->lpfnCI = lpfnCI;
+        lpclf->pcRefDll = pcRefDll;
+
+        if (pcRefDll)
+          (*pcRefDll)++;
+
+        lpclf->riidInst = riidInst;
+
+        TRACE("(%p)\n\tIID:\t%s\n",lpclf, xriidInst);
+        shell32_ObjCount++;
+        return (LPCLASSFACTORY)lpclf;
+}
+
+
 /******************************************************************************
  * SHCreateDefClassObject                       [SHELL32.70]

trunk/src/shell32/new/shlfolder.cpp

@@ -29 +29 @@
 #include "shell32_main.h"
 
+#include <heapstring.h>
 #include <misc.h>
 
@@ -209 +210 @@
 } IGenericSFImpl;
 
-static struct ICOM_VTABLE(IShellFolder) sfvt;
-static struct ICOM_VTABLE(IPersistFolder) psfvt;
-static struct ICOM_VTABLE(IDropTarget) dtvt;
+//static struct ICOM_VTABLE(IShellFolder) sfvt;
+//static struct ICOM_VTABLE(IPersistFolder) psfvt;
+//static struct ICOM_VTABLE(IDropTarget) dtvt;
 
 static IShellFolder * ISF_MyComputer_Constructor(void);
@@ -218 +219 @@
 #define _ICOM_THIS_From_IPersistFolder(class, name) class* This = (class*)(((char*)name)-_IPersistFolder_Offset);
         
-static struct ICOM_VTABLE(IDropTarget) dtvt;
 #define _IDropTarget_Offset ((int)(&(((IGenericSFImpl*)0)->lpvtblDropTarget)))
 #define _ICOM_THIS_From_IDropTarget(class, name) class* This = (class*)(((char*)name)-_IDropTarget_Offset);
@@ -278 +278 @@
 
             dwSize += _ILSimpleGetText(pidl,NULL,0);            /* add the size of our name*/
-            sf->sMyPath = SHAlloc(dwSize + 2);                  /* '\0' and backslash */
+            sf->sMyPath = (char*)SHAlloc(dwSize + 2);                   /* '\0' and backslash */
 
             if(!sf->sMyPath) return NULL;
@@ -562 +562 @@
         else
         {
-          IShellFolder_BindToObject(pShellFolder, ILGetNext(pidl), NULL, &IID_IShellFolder, (LPVOID)&pSubFolder);
+          IShellFolder_BindToObject(pShellFolder, ILGetNext(pidl), NULL, &IID_IShellFolder, (LPVOID*)&pSubFolder);
           IShellFolder_Release(pShellFolder);
           *ppvOut = pSubFolder;
@@ -664 +664 @@
             _ILSimpleGetText(pidl1, szTemp1, MAX_PATH);
             _ILSimpleGetText(pidl2, szTemp2, MAX_PATH);
-            nReturn = strcasecmp(szTemp1, szTemp2);
+            nReturn = strcmp(szTemp1, szTemp2);
         
             if (nReturn == 0)                           /* first pidl different ? */
@@ -1178 +1178 @@
         else                            /* go deeper */
         {
-          IShellFolder_BindToObject(pShellFolder, ILGetNext(pidl), NULL, riid, (LPVOID)&pSubFolder);
+          IShellFolder_BindToObject(pShellFolder, ILGetNext(pidl), NULL, riid, (LPVOID*)&pSubFolder);
           IShellFolder_Release(pShellFolder);
           *ppvOut = pSubFolder;
@@ -1490 +1490 @@
         else                            /* go deeper */
         {
-          IShellFolder_BindToObject(pShellFolder, ILGetNext(pidl), NULL, &IID_IShellFolder, (LPVOID)&pSubFolder);
+          IShellFolder_BindToObject(pShellFolder, ILGetNext(pidl), NULL, &IID_IShellFolder, (LPVOID*)&pSubFolder);
           IShellFolder_Release(pShellFolder);
           *ppvOut = pSubFolder;

trunk/src/shell32/new/shlmenu.cpp

@@ -21 +21 @@
 #include "pidl.h"
 
+#include <heapstring.h>
 #include <misc.h>
 
@@ -160 +161 @@
                 {
                   ILGetDisplayName( pidlTemp, sTemp);
-                  if (! (PidlToSicIndex(lpsf, pidlTemp, FALSE, &iIcon)))
+                  if (! (PidlToSicIndex(lpsf, pidlTemp, FALSE, (UINT*)&iIcon)))
                     iIcon = FM_BLANK_ICON;
                   if ( SFGAO_FOLDER & ulItemAttr)
@@ -340 +341 @@
 
         if (VERSION_OsIsUnicode() && (lpText!=FM_SEPARATOR))
-          lpszText = HEAP_strdupWtoA ( GetProcessHeap(),0, lpText);
-
-        ret = FileMenu_AppendItemA(hMenu, (lpszText) ? lpszText : lpText, uID, icon, hMenuPopup, nItemHeight);
+          lpszText = (LPSTR)HEAP_strdupWtoA ( GetProcessHeap(),0, (LPCWSTR)lpText);
+
+        ret = FileMenu_AppendItemA(hMenu, (lpszText) ? lpszText : (LPCSTR)lpText, uID, icon, hMenuPopup, nItemHeight);
 
         if (lpszText)

trunk/src/shell32/new/shv_bg_cmenu.cpp

@@ -35 +35 @@
 
 
-static struct ICOM_VTABLE(IContextMenu) cmvt;
-
-/**************************************************************************
-*   ISVBgCm_Constructor()
-*/
-IContextMenu *ISvBgCm_Constructor(void)
-{
-        BgCmImpl* cm;
-
-        cm = (BgCmImpl*)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(BgCmImpl));
-        cm->lpvtbl=&cmvt;
-        cm->ref = 1;
-
-        TRACE("(%p)->()\n",cm);
-        shell32_ObjCount++;
-        return (IContextMenu*)cm;
-}
+//static struct ICOM_VTABLE(IContextMenu) cmvt;
 
 /**************************************************************************
@@ -285 +269 @@
 };
 
+/**************************************************************************
+*   ISVBgCm_Constructor()
+*/
+IContextMenu *ISvBgCm_Constructor(void)
+{
+        BgCmImpl* cm;
+
+        cm = (BgCmImpl*)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(BgCmImpl));
+        cm->lpvtbl=&cmvt;
+        cm->ref = 1;
+
+        TRACE("(%p)->()\n",cm);
+        shell32_ObjCount++;
+        return (IContextMenu*)cm;
+}
+
+