Changeset 428 for trunk/src

Timestamp:

Aug 5, 1999, 11:03:35 PM (26 years ago)

Author:

phaller

Message:

Fix: small shell32 fix

Location:

trunk/src/shell32

Files:

• sh.cpp (modified) (7 diffs)
• shell32.h (modified) (3 diffs)

trunk/src/shell32/sh.cpp

@@ -1 @@
-/* $Id: sh.cpp,v 1.6 1999-07-05 13:49:23 phaller Exp $ */
+/* $Id: sh.cpp,v 1.7 1999-08-05 21:03:34 phaller Exp $ */
 
 /*
@@ -15 +15 @@
 #include <shellapi.h>
 #include <winreg.h>
-//#include <shlobj.h> @@@PH shlobj is yet to be ported
 #include "shell32.h"
 
@@ -36 +35 @@
 #define LPUNKNOWN        LPVOID
 #define IDSTRUCT         VOID
-#define LPSHELLFLAGSTATE LPVOID
 #define IDropTarget      VOID
 
@@ -131 +129 @@
     return;
 
-//@@@PH: todo
-#if 0
    if ( (SSF_SHOWEXTENSIONS & dwMask) && !RegQueryValueExA(hKey, "HideFileExt", 0, 0, (LPBYTE)&dwData, &dwDataSize))
      lpsfs->fShowExtensions  = ((dwData == 0) ?  0 : 1);
@@ -165 +161 @@
      }
    }
-#endif
 
   RegCloseKey (hKey);
@@ -500 +495 @@
                                  LPCSTR                path)
 {
-  dprintf(("SHELL32: SHCreateDirectory(%08xh, %08xh) not implemented.\n",
+  dprintf(("SHELL32: SHCreateDirectory(%08xh, %08xh)\n",
            sec,
            path));
@@ -611 +606 @@
            x));
 
-  if (!HIWORD(x))
-  {
-    *(LPDWORD)0xdeaf0000 = 0;
-  }
+// @@@PH what's that crap?
+//  if (!HIWORD(x))
+//  {
+//    *(LPDWORD)0xdeaf0000 = 0;
+//  }
 
   return HeapFree(GetProcessHeap(),0,x);

trunk/src/shell32/shell32.h

@@ -1 @@
-/* $Id: shell32.h,v 1.4 1999-06-24 19:27:49 phaller Exp $ */
+/* $Id: shell32.h,v 1.5 1999-08-05 21:03:35 phaller Exp $ */
 
 #ifndef __shell32_H__
@@ -69 +69 @@
 
 typedef void *LPSHELLFOLDER;
+
+
 
 
@@ -93 +95 @@
   }u;
 } STRRET,*LPSTRRET;
+
+
+/**********************************************************************
+ * SHGetSettings ()
+ */
+typedef struct
+{  BOOL fShowAllObjects : 1;
+   BOOL fShowExtensions : 1;
+   BOOL fNoConfirmRecycle : 1;
+   BOOL fShowSysFiles : 1;
+
+   BOOL fShowCompColor : 1;
+   BOOL fDoubleClickInWebView : 1;
+   BOOL fDesktopHTML : 1;
+   BOOL fWin95Classic : 1;
+
+   BOOL fDontPrettyPath : 1;
+   BOOL fShowAttribCol : 1;
+   BOOL fMapNetDrvBtn : 1;
+   BOOL fShowInfoTip : 1;
+
+   BOOL fHideIcons : 1;
+   UINT fRestFlags : 3;
+} SHELLFLAGSTATE, * LPSHELLFLAGSTATE;
+
+void WIN32API SHGetSettings(LPSHELLFLAGSTATE lpsfs, DWORD dwMask, DWORD dwx);
+
+#define SSF_SHOWALLOBJECTS                  0x0001
+#define SSF_SHOWEXTENSIONS                  0x0002
+#define SSF_SHOWCOMPCOLOR                   0x0008
+#define SSF_SHOWSYSFILES                    0x0020
+#define SSF_DOUBLECLICKINWEBVIEW            0x0080
+#define SSF_SHOWATTRIBCOL                   0x0100
+#define SSF_DESKTOPHTML                     0x0200
+#define SSF_WIN95CLASSIC                    0x0400
+#define SSF_DONTPRETTYPATH                  0x0800
+#define SSF_SHOWINFOTIP                     0x2000
+#define SSF_MAPNETDRVBUTTON                 0x1000
+#define SSF_NOCONFIRMRECYCLE                0x8000
+#define SSF_HIDEICONS                       0x4000