Changeset 1558 for trunk/src/shell32/shell32_main.cpp

Timestamp:

Nov 2, 1999, 9:38:48 PM (26 years ago)

Author:

phaller

Message:

Add: update to wine/shell32 1999/11/02 #4

File:

• trunk/src/shell32/shell32_main.cpp (modified) (8 diffs)

trunk/src/shell32/shell32_main.cpp

@@ -1 @@
-/* $Id: shell32_main.cpp,v 1.4 1999-10-19 14:32:14 phaller Exp $ */
+/* $Id: shell32_main.cpp,v 1.5 1999-11-02 20:38:47 phaller Exp $ */
 
 /*
@@ -46 +46 @@
 #include "shlguid.h"
 #include "wine/undocshell.h"
+#include "shpolicy.h"
 
 #include <heapstring.h>
@@ -159 +160 @@
    {
      pidl = (LPCITEMIDLIST) path;
+     if (!pidl )
+     {
+       dprintf(("pidl is null!\n"));
+       return FALSE;
+     }
    }
    else if (!(flags & SHGFI_USEFILEATTRIBUTES))
@@ -200 +206 @@
    if (SUCCEEDED(hr) && (flags & SHGFI_TYPENAME))
    {
-     if(_ILIsValue(pidlLast))
-     {
-       char sTemp[64];
-       if (_ILGetExtension (pidlLast, sTemp, 64))
-       {
-         if (!( HCR_MapTypeToValue(sTemp, sTemp, 64, TRUE)
-             && HCR_MapTypeToValue(sTemp, psfi->szTypeName, 80, FALSE )))
-         {
-           lstrcpynA (psfi->szTypeName, sTemp, 74);
-           strcat (psfi->szTypeName, "-file");
-         }
-       }
-     }
-     else
-     {
-       strcpy(psfi->szTypeName, "Folder");
-     }
+     _ILGetFileType(pidlLast, psfi->szTypeName, 80);
    }
 
@@ -569 +559 @@
  * AboutDlgProc32                           (internal)
  */
-
 BOOL WINAPI AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam,
                               LPARAM lParam )
@@ -925 +914 @@
        {
          dprintf(("shell32.dll instantiated twice in one address space!\n"));
+       }
+       else
+       {
+         /* we only want to call this the first time shell32 is instantiated */
+         SHInitRestricted(NULL, NULL);
        }
 
@@ -988 +982 @@
        shell32_RefCount--;
 
-       pOleUninitialize();
-       FreeLibrary(hOle32);
-       FreeLibrary(hComctl32);
-
        if ( !shell32_RefCount )
        {
@@ -1010 +1000 @@
          }
        }
+
+       FreeLibrary(hOle32);
+       FreeLibrary(hComctl32);
+
        dprintf(("refcount=%u objcount=%u \n", shell32_RefCount, shell32_ObjCount));
        break;