Changeset 815 for trunk/src/shell32/new/shlview.cpp

Timestamp:

Sep 4, 1999, 12:03:10 PM (26 years ago)

Author:

achimha

Message:

shell32/new compilation fixes

File:

• trunk/src/shell32/new/shlview.cpp (modified) (7 diffs)

trunk/src/shell32/new/shlview.cpp

@@ -60 +60 @@
 } IShellViewImpl;
 
-//static struct ICOM_VTABLE(IShellView) svvt;
-//static struct ICOM_VTABLE(IOleCommandTarget) ctvt;
+extern struct ICOM_VTABLE(IShellView) svvt;
+extern struct ICOM_VTABLE(IOleCommandTarget) ctvt;
 #define _IOleCommandTarget_Offset ((int)(&(((IShellViewImpl*)0)->lpvtblOleCommandTarget)))
 #define _ICOM_THIS_From_IOleCommandTarget(myClass, name) myClass* This = (myClass*)(((char*)name)-_IOleCommandTarget_Offset);
 
-static struct ICOM_VTABLE(IDropTarget) dtvt;
+extern struct ICOM_VTABLE(IDropTarget) dtvt;
 #define _IDropTarget_Offset ((int)(&(((IShellViewImpl*)0)->lpvtblDropTarget)))
 #define _ICOM_THIS_From_IDropTarget(myClass, name) myClass* This = (myClass*)(((char*)name)-_IDropTarget_Offset);
 
-static struct ICOM_VTABLE(IDropSource) dsvt;
+extern struct ICOM_VTABLE(IDropSource) dsvt;
 #define _IDropSource_Offset ((int)(&(((IShellViewImpl*)0)->lpvtblDropSource)))
 #define _ICOM_THIS_From_IDropSource(myClass, name) myClass* This = (myClass*)(((char*)name)-_IDropSource_Offset);
 
-static struct ICOM_VTABLE(IViewObject) vovt;
+extern struct ICOM_VTABLE(IViewObject) vovt;
 #define _IViewObject_Offset ((int)(&(((IShellViewImpl*)0)->lpvtblViewObject)))
 #define _ICOM_THIS_From_IViewObject(myClass, name) myClass* This = (myClass*)(((char*)name)-_IViewObject_Offset);
@@ -1398 +1398 @@
 }
 
-static struct ICOM_VTABLE(IShellView) svvt =
+struct ICOM_VTABLE(IShellView) svvt =
 {       
         ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
@@ -1498 +1498 @@
 }
 
-static ICOM_VTABLE(IOleCommandTarget) ctvt =
+ICOM_VTABLE(IOleCommandTarget) ctvt =
 {
         ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
@@ -1598 +1598 @@
 }
 
-static struct ICOM_VTABLE(IDropTarget) dtvt =
+struct ICOM_VTABLE(IDropTarget) dtvt =
 {
         ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
@@ -1673 +1673 @@
 }
 
-static struct ICOM_VTABLE(IDropSource) dsvt =
+struct ICOM_VTABLE(IDropSource) dsvt =
 {
         ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
@@ -1747 +1747 @@
         DVTARGETDEVICE* ptd,
         HDC hicTargetDevice,
-        LOGPALETTE** ppColorSet)
+        tagLOGPALETTE** ppColorSet)
 {       
 
@@ -1809 +1809 @@
 
 
-static struct ICOM_VTABLE(IViewObject) vovt =
+struct ICOM_VTABLE(IViewObject) vovt =
 {
         ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE