Changeset 857 for trunk/src

Timestamp:

Sep 7, 1999, 8:45:12 PM (26 years ago)

Author:

phaller

Message:

.

Location:

trunk/src/shell32/new

Files:

• makefile (modified) (2 diffs)
• shell.cpp (modified) (1 diff)
• shell32_main.cpp (modified) (2 diffs)
• shell32_main.h (modified) (4 diffs)
• shlfolder.cpp (modified) (3 diffs)

trunk/src/shell32/new/makefile

@@ -1 @@
-# $Id: makefile,v 1.2 1999-09-04 10:03:10 achimha Exp $
+# $Id: makefile,v 1.3 1999-09-07 18:45:12 phaller Exp $
 
 #
@@ -36 +36 @@
               $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
               $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/advapi32.lib \
+              $(PDWIN32_LIB)/gdi32.lib $(PDWIN32_LIB)/ole32.lib  \
               $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
         $(CP) $@ $(PDWIN32_BIN)

trunk/src/shell32/new/shell.cpp

@@ -14 +14 @@
 #define ICOM_CINTERFACE 1
 #define CINTERFACE 1
+#define INITGUID
 
 //#include "wine/winuser16.h"

trunk/src/shell32/new/shell32_main.cpp

@@ -640 +640 @@
     info.szOtherStuff = szOtherStuff;
     info.hIcon        = hIcon;
-    if (!hIcon) info.hIcon = LoadIcon16( 0, MAKEINTRESOURCE16(OIC_WINEICON) );
+    if (!hIcon) info.hIcon = LoadIconA( 0, (LPCSTR)OIC_WINEICON );
     return DialogBoxIndirectParamA( GetWindowLongA( hWnd, GWL_HINSTANCE ),
                                     (DLGTEMPLATE*)dlgTemplate , hWnd, AboutDlgProc, (LPARAM)&info );
@@ -666 +666 @@
     info.szOtherStuff = HEAP_strdupWtoA( GetProcessHeap(), 0, szOtherStuff );
     info.hIcon        = hIcon;
-    if (!hIcon) info.hIcon = LoadIcon16( 0, MAKEINTRESOURCE16(OIC_WINEICON) );
+    if (!hIcon) info.hIcon = LoadIconA( 0, (LPCSTR)OIC_WINEICON );
     ret = DialogBoxIndirectParamA( GetWindowLongA( hWnd, GWL_HINSTANCE ),
                                    (DLGTEMPLATE*)dlgTemplate, hWnd, AboutDlgProc, (LPARAM)&info );

trunk/src/shell32/new/shell32_main.h

@@ -17 +17 @@
 #include "wine/obj_shelllink.h"
 #include "wine/obj_extracticon.h"
+
+#ifdef __cplusplus
+  extern "C" {
+#endif /* defined(__cplusplus) */
+
+
 
 /*******************************************
@@ -39 +45 @@
 extern COLORREF (WINAPI *pImageList_SetBkColor)(HIMAGELIST, COLORREF);
 
-extern LPVOID   (WINAPI* pCOMCTL32_Alloc) (INT);  
-extern BOOL     (WINAPI* pCOMCTL32_Free) (LPVOID);  
+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 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_GetPtrCount(hdpa)  (*(INT*)(hdpa))   
+#define pDPA_GetPtrCount(hdpa)  (*(INT*)(hdpa))
 
 extern HICON (WINAPI *pLookupIconIdFromDirectoryEx)(LPBYTE dir, BOOL bIcon, INT width, INT height, UINT cFlag);
@@ -71 +77 @@
 
 /* Classes Root */
-BOOL HCR_MapTypeToValue ( LPCSTR szExtension, LPSTR szFileType, DWORD len, BOOL bPrependDot);
-BOOL HCR_GetExecuteCommand ( LPCSTR szClass, LPCSTR szVerb, LPSTR szDest, DWORD len );
-BOOL HCR_GetDefaultIcon (LPCSTR szClass, LPSTR szDest, DWORD len, LPDWORD dwNr);
+BOOL HCR_MapTypeToValue ( LPCSTR szExtension, LPSTR szFileType, LONG len, BOOL bPrependDot);
+BOOL HCR_GetExecuteCommand ( LPCSTR szClass, LPCSTR szVerb, LPSTR szDest, LONG len );
+BOOL HCR_GetDefaultIcon (LPCSTR szClass, LPSTR szDest, LONG len, LPDWORD dwNr);
 BOOL HCR_GetClassName (REFIID riid, LPSTR szDest, DWORD len);
 BOOL HCR_GetFolderAttributes (REFIID riid, LPDWORD szDest);
@@ -136 +142 @@
         DROPEFFECT_MOVE)
 
+#ifdef __cplusplus
+  }
+#endif /* defined(__cplusplus) */
+
+
+
 #endif

trunk/src/shell32/new/shlfolder.cpp

@@ -212 +212 @@
 extern struct ICOM_VTABLE(IShellFolder) sfvt;
 extern struct ICOM_VTABLE(IPersistFolder) psfvt;
-extern struct ICOM_VTABLE(IDropTarget) dtvt;
+extern struct ICOM_VTABLE(IDropTarget) dt2vt;
 
 static IShellFolder * ISF_MyComputer_Constructor(void);
@@ -255 +255 @@
         sf->lpvtbl=&sfvt;
         sf->lpvtblPersistFolder=&psfvt;
-        sf->lpvtblDropTarget=&dtvt;
+        sf->lpvtblDropTarget=&dt2vt;
         sf->pclsid = (CLSID*)&CLSID_SFFile;
         sf->cfShellIDList=0;
@@ -1900 +1900 @@
 }
 
-struct ICOM_VTABLE(IDropTarget) dtvt =
+struct ICOM_VTABLE(IDropTarget) dt2vt =
 {
         ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE