Changeset 815 for trunk/src


Ignore:
Timestamp:
Sep 4, 1999, 12:03:10 PM (26 years ago)
Author:
achimha
Message:

shell32/new compilation fixes

Location:
trunk/src/shell32/new
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/shell32/new/iconcache.cpp

    r793 r815  
    6969
    7070
    71 static HDPA             sic_hdpa = 0;
     71HDPA            sic_hdpa = 0;
    7272static CRITICAL_SECTION SHELL32_SicCS;
    7373
    … …  
    576576        if (NULL != pDPA_GetPtr (sic_hdpa, 0))
    577577        {
    578           index = pDPA_Search (sic_hdpa, &sice, -1L, SIC_CompareEntrys, 0, 0);
     578          index = pDPA_Search (sic_hdpa, &sice, -1L, (PFNDPACOMPARE)SIC_CompareEntrys, 0, 0);
    579579        }
    580580
    … …  
    682682          for (i=0; i < pDPA_GetPtrCount(sic_hdpa); ++i)
    683683          {
    684             lpsice = pDPA_GetPtr(sic_hdpa, i);
     684            lpsice = (LPSIC_ENTRY)pDPA_GetPtr(sic_hdpa, i);
    685685            SHFree(lpsice);
    686686          }

  • trunk/src/shell32/new/makefile

    r791 r815  
    1 # $Id: makefile,v 1.1 1999-09-02 11:59:12 phaller Exp $
     1# $Id: makefile,v 1.2 1999-09-04 10:03:10 achimha Exp $
    22
    33#
    … …  
    2424        brsfolder.obj classes.obj contmenu.obj dataobject.obj \
    2525        enumidlist.obj folders.obj iconcache.obj memorystream.obj \
    26         pidl.obj regstream.obj shell32_main.obj shell.obj \
     26        pidl.obj regstream.obj shell32_main.obj \
    2727        shellguid.obj shelllink.obj shlmenu.obj shellole.obj \
    28         shellord.obj shellpath.obj shlfolder.obj shlview.obj \
    29         shv_bg_cmenu.obj
     28        shellord.obj shellpath.obj shv_bg_cmenu.obj \
     29        shlfolder.obj shlview.obj shell.obj
    3030
    3131all: $(TARGET).dll $(TARGET).lib

  • trunk/src/shell32/new/shell.cpp

    r797 r815  
    77#include <stdlib.h>
    88#include <string.h>
    9 #include <unistd.h>
     9//#include <unistd.h>
    1010#include <ctype.h>
    1111
    … …  
    1515#define CINTERFACE 1
    1616
    17 #include "wine/winuser16.h"
    18 #include "wine/winbase16.h"
    19 #include "wine/shell16.h"
     17//#include "wine/winuser16.h"
     18//#include "wine/winbase16.h"
     19//#include "wine/shell16.h"
    2020#include "winerror.h"
    2121#include "file.h"

  • trunk/src/shell32/new/shlfolder.cpp

    r795 r815  
    210210} IGenericSFImpl;
    211211
    212 //static struct ICOM_VTABLE(IShellFolder) sfvt;
    213 //static struct ICOM_VTABLE(IPersistFolder) psfvt;
    214 //static struct ICOM_VTABLE(IDropTarget) dtvt;
     212extern struct ICOM_VTABLE(IShellFolder) sfvt;
     213extern struct ICOM_VTABLE(IPersistFolder) psfvt;
     214extern struct ICOM_VTABLE(IDropTarget) dtvt;
    215215
    216216static IShellFolder * ISF_MyComputer_Constructor(void);
    … …  
    982982}
    983983
    984 static ICOM_VTABLE(IShellFolder) sfvt =
     984ICOM_VTABLE(IShellFolder) sfvt =
    985985{       
    986986        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
    … …  
    10041004*       [Desktopfolder] IShellFolder implementation
    10051005*/
    1006 static struct ICOM_VTABLE(IShellFolder) sfdvt;
     1006extern struct ICOM_VTABLE(IShellFolder) sfdvt;
    10071007
    10081008/**************************************************************************
    … …  
    13311331}
    13321332
    1333 static ICOM_VTABLE(IShellFolder) sfdvt =
     1333ICOM_VTABLE(IShellFolder) sfdvt =
    13341334{       
    13351335        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
    … …  
    13551355*/
    13561356
    1357 static struct ICOM_VTABLE(IShellFolder) sfmcvt;
     1357extern struct ICOM_VTABLE(IShellFolder) sfmcvt;
    13581358
    13591359/**************************************************************************
    … …  
    16641664}
    16651665
    1666 static ICOM_VTABLE(IShellFolder) sfmcvt =
     1666ICOM_VTABLE(IShellFolder) sfmcvt =
    16671667{       
    16681668        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
    … …  
    17681768}
    17691769
    1770 static ICOM_VTABLE(IPersistFolder) psfvt =
     1770ICOM_VTABLE(IPersistFolder) psfvt =
    17711771{
    17721772        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
    … …  
    19001900}
    19011901
    1902 static struct ICOM_VTABLE(IDropTarget) dtvt =
     1902struct ICOM_VTABLE(IDropTarget) dtvt =
    19031903{
    19041904        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE

  • trunk/src/shell32/new/shlview.cpp

    r802 r815  
    6060} IShellViewImpl;
    6161
    62 //static struct ICOM_VTABLE(IShellView) svvt;
    63 //static struct ICOM_VTABLE(IOleCommandTarget) ctvt;
     62extern struct ICOM_VTABLE(IShellView) svvt;
     63extern struct ICOM_VTABLE(IOleCommandTarget) ctvt;
    6464#define _IOleCommandTarget_Offset ((int)(&(((IShellViewImpl*)0)->lpvtblOleCommandTarget)))
    6565#define _ICOM_THIS_From_IOleCommandTarget(myClass, name) myClass* This = (myClass*)(((char*)name)-_IOleCommandTarget_Offset);
    6666
    67 static struct ICOM_VTABLE(IDropTarget) dtvt;
     67extern struct ICOM_VTABLE(IDropTarget) dtvt;
    6868#define _IDropTarget_Offset ((int)(&(((IShellViewImpl*)0)->lpvtblDropTarget)))
    6969#define _ICOM_THIS_From_IDropTarget(myClass, name) myClass* This = (myClass*)(((char*)name)-_IDropTarget_Offset);
    7070
    71 static struct ICOM_VTABLE(IDropSource) dsvt;
     71extern struct ICOM_VTABLE(IDropSource) dsvt;
    7272#define _IDropSource_Offset ((int)(&(((IShellViewImpl*)0)->lpvtblDropSource)))
    7373#define _ICOM_THIS_From_IDropSource(myClass, name) myClass* This = (myClass*)(((char*)name)-_IDropSource_Offset);
    7474
    75 static struct ICOM_VTABLE(IViewObject) vovt;
     75extern struct ICOM_VTABLE(IViewObject) vovt;
    7676#define _IViewObject_Offset ((int)(&(((IShellViewImpl*)0)->lpvtblViewObject)))
    7777#define _ICOM_THIS_From_IViewObject(myClass, name) myClass* This = (myClass*)(((char*)name)-_IViewObject_Offset);
    … …  
    13981398}
    13991399
    1400 static struct ICOM_VTABLE(IShellView) svvt =
     1400struct ICOM_VTABLE(IShellView) svvt =
    14011401{       
    14021402        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
    … …  
    14981498}
    14991499
    1500 static ICOM_VTABLE(IOleCommandTarget) ctvt =
     1500ICOM_VTABLE(IOleCommandTarget) ctvt =
    15011501{
    15021502        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
    … …  
    15981598}
    15991599
    1600 static struct ICOM_VTABLE(IDropTarget) dtvt =
     1600struct ICOM_VTABLE(IDropTarget) dtvt =
    16011601{
    16021602        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
    … …  
    16731673}
    16741674
    1675 static struct ICOM_VTABLE(IDropSource) dsvt =
     1675struct ICOM_VTABLE(IDropSource) dsvt =
    16761676{
    16771677        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
    … …  
    17471747        DVTARGETDEVICE* ptd,
    17481748        HDC hicTargetDevice,
    1749         LOGPALETTE** ppColorSet)
     1749        tagLOGPALETTE** ppColorSet)
    17501750{       
    17511751
    … …  
    18091809
    18101810
    1811 static struct ICOM_VTABLE(IViewObject) vovt =
     1811struct ICOM_VTABLE(IViewObject) vovt =
    18121812{
    18131813        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
Note: See TracChangeset for help on using the changeset viewer.