VirtualBox

Ignore:
Timestamp:
Sep 3, 2017 3:49:33 PM (7 years ago)
Author:
vboxsync
Message:

os2/VBoxSF: Make it compile with watcom.

Location:
trunk/src/VBox/Additions/os2/VBoxSF
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/os2/VBoxSF/Makefile.kmk

    r41477 r68612  
    77include $(KBUILD_PATH)/subheader.kmk
    88
     9VBOXSF_USE_WATCOM=1
     10TEMPLATE_VBoxGuestR0Watcom = xxx
     11TEMPLATE_VBoxGuestR0Watcom_EXTENDS = VBOXGUESTR0
     12TEMPLATE_VBoxGuestR0Watcom_TOOL    = OPENWATCOM
     13TEMPLATE_VBoxGuestR0Watcom_CTOOL   = OPENWATCOM
     14TEMPLATE_VBoxGuestR0Watcom_CXXTOOL = OPENWATCOM
     15TEMPLATE_VBoxGuestR0Watcom_LDTOOL  = OPENWATCOM-WL
     16TEMPLATE_VBoxGuestR0Watcom_CINCS   = \
     17        $(PATH_TOOL_OPENWATCOM)/h \
     18        $(PATH_TOOL_OPENWATCOM)/h/os2 \
     19       $(PATH_ROOT)/include \
     20        /libc/svn/trunk/libc/include # for os2ddk
     21TEMPLATE_VBoxGuestR0Watcom_CXXINCS = $(TEMPLATE_VBoxGuestR0Watcom_CINCS)
     22TEMPLATE_VBoxGuestR0Watcom_CFLAGS  = -s  -ze -w4 -d2 -hc -nt=TEXT32 -nc=CODE -4
     23TEMPLATE_VBoxGuestR0Watcom_CXXFLAGS = $(TEMPLATE_VBoxGuestR0Watcom_CFLAGS)
     24
     25TEMPLATE_VBoxGuestR0Watcom_LDFLAGS = \
     26        form os2 lx physdevice \
     27        option NODefaultlibs \
     28        debug codeview all \
     29        option symfile
     30TEMPLATE_VBoxGuestR0Watcom_LIBS = $(NO_SUCH_VARIABLE)
     31
     32
    933#?DLLS += VBoxSF
    1034SYSMODS += VBoxSF
     35ifdef VBOXSF_USE_WATCOM
     36VBoxSF_TEMPLATE      = VBoxGuestR0Watcom
     37else
    1138VBoxSF_TEMPLATE      = VBOXGUESTR0
     39endif
    1240VBoxSF_SYSSUFF       = .ifs
    1341VBoxSF_DLLSUFF       = .ifs
    … …  
    1644        . \
    1745        $(PATH_ROOT)/src/VBox/Runtime/include
     46ifdef VBOXSF_USE_WATCOM
     47VBoxSF_LDFLAGS      := \
     48        OPTION MODNAME='VBoxSF' \
     49        SEG TYPE CODE PRELOAD DYNAMIC SHARED NONPERMANENT, \
     50            TYPE DATA PRELOAD DYNAMIC
     51#       OPTION DESCRIPTION "'VirtualBox Guest Additions Shared Folder FSD for OS/2.'" - quoting issues
     52# Data exports:
     53VBoxSF_LDFLAGS += \
     54        EXPORT 'FS_ATTRIBUTE' \
     55        EXPORT 'FS_NAME' \
     56        EXPORT 'FS_MPSAFEFLAGS2' \
     57        EXPORT 'FS32_ATTRIBUTE'
     58# 16-bit entry points.
     59VBoxSF_LDFLAGS += \
     60        EXPORT 'FS_ALLOCATEPAGESPACE' \
     61        EXPORT 'FS_ATTACH' \
     62        EXPORT 'FS_CANCELLOCKREQUEST' \
     63        EXPORT 'FS_CANCELLOCKREQUESTL' \
     64        EXPORT 'FS_CHDIR' \
     65        EXPORT 'FS_CHGFILEPTR' \
     66        EXPORT 'FS_CLOSE' \
     67        EXPORT 'FS_COMMIT' \
     68        EXPORT 'FS_COPY' \
     69        EXPORT 'FS_DELETE' \
     70        EXPORT 'FS_DOPAGEIO' \
     71        EXPORT 'FS_EXIT' \
     72        EXPORT 'FS_FILEATTRIBUTE' \
     73        EXPORT 'FS_FILEINFO' \
     74        EXPORT 'FS_FILEIO' \
     75        EXPORT 'FS_FILELOCKS' \
     76        EXPORT 'FS_FILELOCKSL' \
     77        EXPORT 'FS_FINDCLOSE' \
     78        EXPORT 'FS_FINDFIRST' \
     79        EXPORT 'FS_FINDFROMNAME' \
     80        EXPORT 'FS_FINDNEXT' \
     81        EXPORT 'FS_FINDNOTIFYCLOSE' \
     82        EXPORT 'FS_FINDNOTIFYFIRST' \
     83        EXPORT 'FS_FINDNOTIFYNEXT' \
     84        EXPORT 'FS_FLUSHBUF' \
     85        EXPORT 'FS_FSCTL' \
     86        EXPORT 'FS_FSINFO' \
     87        EXPORT 'FS_INIT' \
     88        EXPORT 'FS_IOCTL' \
     89        EXPORT 'FS_MKDIR' \
     90        EXPORT 'FS_MOUNT' \
     91        EXPORT 'FS_MOVE' \
     92        EXPORT 'FS_NEWSIZE' \
     93        EXPORT 'FS_NEWSIZEL' \
     94        EXPORT 'FS_NMPIPE' \
     95        EXPORT 'FS_OPENCREATE' \
     96        EXPORT 'FS_OPENPAGEFILE' \
     97        EXPORT 'FS_PATHINFO' \
     98        EXPORT 'FS_PROCESSNAME' \
     99        EXPORT 'FS_READ' \
     100        EXPORT 'FS_RMDIR' \
     101        EXPORT 'FS_SETSWAP' \
     102        EXPORT 'FS_SHUTDOWN' \
     103        EXPORT 'FS_WRITE'
     104# 32-bit entry points.
     105VBoxSF_LDFLAGS += \
     106        EXPORT 'FS32_CHGFILEPTR' \
     107        EXPORT 'FS32_CHGFILEPTRL' \
     108        EXPORT 'FS32_READ' \
     109        EXPORT 'FS32_READFILEATCACHE' \
     110        EXPORT 'FS32_RETURNFILECACHE' \
     111        EXPORT 'FS32_WRITE'
     112else
    18113VBoxSF_LDFLAGS      := $(addprefix -Zlinker , \
    19114        SEG TYPE CODE PRELOAD DYNAMIC SHARED NONPERMANENT, \
    20115            TYPE DATA PRELOAD DYNAMIC)
    21116#VBoxSF_LDFLAGS      += -s -t -v
     117endif
     118
    22119VBoxSF_SOURCES       = \
    23120        VBoxSFA.asm \
    … …  
    25122        VBoxSFFile.cpp \
    26123        VBoxSFFind.cpp \
    27         VBoxSFInit.cpp \
     124        VBoxSFInit.cpp
     125ifndef VBOXSF_USE_WATCOM
     126 VBoxSF_SOURCES     += \
    28127        VBoxSF.def
     128endif
    29129VBoxSF_LIBS          = \
    30130        $(VBOX_LIB_VBGL_R0) \
    31         $(VBOX_LIB_IPRT_GUEST_R0) \
    32         $(VBOX_GCC_LIBGCC) \
    33         end
     131        $(VBOX_LIB_IPRT_GUEST_R0)
     132ifdef VBOXSF_USE_WATCOM
     133 VBoxSF_LIBS        += $(PATH_IGCC)/lib/libend.lib
     134else
     135 VBoxSF_LIBS        += end
     136endif
    34137
    35138include $(FILE_KBUILD_SUB_FOOTER)

  • trunk/src/VBox/Additions/os2/VBoxSF/VBoxSF.cpp

    r57358 r68612  
    4444FS32_EXIT(ULONG uid, ULONG pid, ULONG pdb)
    4545{
     46    NOREF(uid); NOREF(pid); NOREF(pdb);
    4647}
    4748
    … …  
    5051FS32_SHUTDOWN(ULONG type, ULONG reserved)
    5152{
     53    NOREF(type); NOREF(reserved);
    5254    return NO_ERROR;
    5355}
    … …  
    5557
    5658DECLASM(int)
    57 FS32_ATTACH(ULONG flag, PCSZ pszDev, PVBOXSFVP pvpfsd, PVBOXSFCD pcdfsd, PBYTE pszParm, PUSHORT pcbParm)
     59FS32_ATTACH(ULONG fFlags, PCSZ pszDev, PVBOXSFVP pvpfsd, PVBOXSFCD pcdfsd, PBYTE pszParm, PUSHORT pcbParm)
    5860{
     61    NOREF(fFlags); NOREF(pszDev); NOREF(pvpfsd); NOREF(pcdfsd); NOREF(pszParm); NOREF(pcbParm);
    5962    return ERROR_NOT_SUPPORTED;
    6063}
    … …  
    6265
    6366DECLASM(int)
    64 FS32_FLUSHBUF(USHORT hVPB, ULONG flag)
     67FS32_FLUSHBUF(USHORT hVPB, ULONG fFlags)
    6568{
     69    NOREF(hVPB); NOREF(fFlags);
    6670    return NO_ERROR;
    6771}
    … …  
    6973
    7074DECLASM(int)
    71 FS32_FSINFO(ULONG flag, USHORT hVPB, PBYTE pbData, USHORT cbData, ULONG level)
     75FS32_FSINFO(ULONG fFlags, USHORT hVPB, PBYTE pbData, USHORT cbData, ULONG uLevel)
    7276{
     77    NOREF(fFlags); NOREF(hVPB); NOREF(pbData); NOREF(cbData); NOREF(uLevel);
    7378    return ERROR_NOT_SUPPORTED;
    7479}
    … …  
    7681
    7782DECLASM(int)
    78 FS32_FSCTL(union argdat *pArgdat, ULONG iArgType, ULONG func,
    79            PVOID pParm, USHORT lenParm, PUSHORT plenParmIO,
    80            PVOID pData, USHORT lenData, PUSHORT plenDataIO)
     83FS32_FSCTL(union argdat *pArgdat, ULONG iArgType, ULONG uFunction,
     84           PVOID pvParm, USHORT cbParm, PUSHORT pcbParmIO,
     85           PVOID pvData, USHORT cbData, PUSHORT pcbDataIO)
    8186{
     87    NOREF(pArgdat); NOREF(iArgType); NOREF(uFunction); NOREF(pvParm); NOREF(cbParm); NOREF(pcbParmIO);
     88    NOREF(pvData); NOREF(cbData); NOREF(pcbDataIO);
    8289    return ERROR_NOT_SUPPORTED;
    8390}
    … …  
    8794FS32_PROCESSNAME(PSZ pszName)
    8895{
     96    NOREF(pszName);
    8997    return NO_ERROR;
    9098}
    … …  
    92100
    93101DECLASM(int)
    94 FS32_CHDIR(ULONG flag, PCDFSI pcdfsi, PVBOXSFCD pcdfsd, PCSZ pszDir, USHORT iCurDirEnd)
     102FS32_CHDIR(ULONG fFlags, PCDFSI pcdfsi, PVBOXSFCD pcdfsd, PCSZ pszDir, USHORT iCurDirEnd)
    95103{
     104    NOREF(fFlags); NOREF(pcdfsi); NOREF(pcdfsd); NOREF(pszDir); NOREF(iCurDirEnd);
    96105    return ERROR_NOT_SUPPORTED;
    97106}
    … …  
    99108
    100109DECLASM(int)
    101 FS32_MKDIR(PCDFSI pcdfsi, PVBOXSFCD pcdfsd, PCSZ pszName, USHORT iCurDirEnd,
    102            PBYTE pEABuf, ULONG flag)
     110FS32_MKDIR(PCDFSI pcdfsi, PVBOXSFCD pcdfsd, PCSZ pszDir, USHORT iCurDirEnd,
     111           PBYTE pbEABuf, ULONG fFlags)
    103112{
     113    NOREF(pcdfsi); NOREF(pcdfsd); NOREF(pszDir); NOREF(iCurDirEnd); NOREF(pbEABuf); NOREF(fFlags);
    104114    return ERROR_NOT_SUPPORTED;
    105115}
    … …  
    107117
    108118DECLASM(int)
    109 FS32_RMDIR(PCDFSI pcdfsi, PVBOXSFCD pcdfsd, PCSZ pszName, USHORT iCurDirEnd)
     119FS32_RMDIR(PCDFSI pcdfsi, PVBOXSFCD pcdfsd, PCSZ pszDir, USHORT iCurDirEnd)
    110120{
     121    NOREF(pcdfsi); NOREF(pcdfsd); NOREF(pszDir); NOREF(iCurDirEnd);
    111122    return ERROR_NOT_SUPPORTED;
    112123}
    … …  
    114125
    115126DECLASM(int)
    116 FS32_COPY(USHORT flag, PCDFSI pcdfsi, PVBOXSFCD pcdfsd, PCSZ pszSrc, USHORT iSrcCurDirEnd,
    117           PCSZ pszDst, USHORT iDstCurDirEnd, USHORT nameType)
     127FS32_COPY(USHORT fFlags, PCDFSI pcdfsi, PVBOXSFCD pcdfsd, PCSZ pszSrc, USHORT iSrcCurDirEnd,
     128          PCSZ pszDst, USHORT iDstCurDirEnd, USHORT uNameType)
    118129{
     130    NOREF(fFlags); NOREF(pcdfsi); NOREF(pcdfsd); NOREF(pszSrc); NOREF(iSrcCurDirEnd);
     131    NOREF(pszDst); NOREF(iDstCurDirEnd); NOREF(uNameType);
    119132    return ERROR_NOT_SUPPORTED;
    120133}
    … …  
    123136DECLASM(int)
    124137FS32_MOVE(PCDFSI pcdfsi, PVBOXSFCD pcdfsd, PCSZ pszSrc, USHORT iSrcCurDirEnd,
    125           PCSZ pszDst, USHORT iDstCurDirEnd, USHORT type)
     138          PCSZ pszDst, USHORT iDstCurDirEnd, USHORT uNameType)
    126139{
     140    NOREF(pcdfsi); NOREF(pcdfsd); NOREF(pszSrc); NOREF(iSrcCurDirEnd); NOREF(pszDst); NOREF(iDstCurDirEnd); NOREF(uNameType);
    127141    return ERROR_NOT_SUPPORTED;
    128142}
    … …  
    132146FS32_DELETE(PCDFSI pcdfsi, PVBOXSFCD pcdfsd, PCSZ pszFile, USHORT iCurDirEnd)
    133147{
     148    NOREF(pcdfsi); NOREF(pcdfsd); NOREF(pszFile); NOREF(iCurDirEnd);
    134149    return ERROR_NOT_SUPPORTED;
    135150}
    … …  
    137152
    138153DECLASM(int)
    139 FS32_FILEATTRIBUTE(ULONG flag, PCDFSI pcdfsi, PVBOXSFCD pcdfsd, PCSZ pszName, USHORT iCurDirEnd, PUSHORT pAttr)
     154FS32_FILEATTRIBUTE(ULONG fFlags, PCDFSI pcdfsi, PVBOXSFCD pcdfsd, PCSZ pszName, USHORT iCurDirEnd, PUSHORT pfAttr)
    140155{
     156    NOREF(fFlags); NOREF(pcdfsi); NOREF(pcdfsd); NOREF(pszName); NOREF(iCurDirEnd); NOREF(pfAttr);
    141157    return ERROR_NOT_SUPPORTED;
    142158}
    … …  
    144160
    145161DECLASM(int)
    146 FS32_PATHINFO(USHORT flag, PCDFSI pcdfsi, PVBOXSFCD pcdfsd, PCSZ pszName, USHORT iCurDirEnt,
    147               USHORT level, PBYTE pData, USHORT cbData)
     162FS32_PATHINFO(USHORT fFlags, PCDFSI pcdfsi, PVBOXSFCD pcdfsd, PCSZ pszName, USHORT iCurDirEnd,
     163              USHORT uLevel, PBYTE pbData, USHORT cbData)
    148164{
     165    NOREF(fFlags); NOREF(pcdfsi); NOREF(pcdfsd); NOREF(pszName); NOREF(iCurDirEnd); NOREF(uLevel); NOREF(pbData); NOREF(cbData);
    149166    return ERROR_NOT_SUPPORTED;
    150167}
    … …  
    152169
    153170DECLASM(int)
    154 FS32_MOUNT(USHORT flag, PVPFSI pvpfsi, PVBOXSFVP pvpfsd, USHORT hVPB, PCSZ pszBoot)
     171FS32_MOUNT(USHORT fFlags, PVPFSI pvpfsi, PVBOXSFVP pvpfsd, USHORT hVPB, PCSZ pszBoot)
    155172{
     173    NOREF(fFlags); NOREF(pvpfsi); NOREF(pvpfsd); NOREF(hVPB); NOREF(pszBoot);
    156174    return ERROR_NOT_SUPPORTED;
    157175}

  • trunk/src/VBox/Additions/os2/VBoxSF/VBoxSFFile.cpp

    r57358 r68612  
    4343DECLASM(int)
    4444FS32_OPENCREATE(PCDFSI pcdfsi, PVBOXSFCD pcdfsd, PCSZ pszName, USHORT iCurDirEnd,
    45                 PSFFSI psffsi, PVBOXSFFSD psffsd, ULONG ulOpenMode, USHORT usOpenFlag,
    46                 PUSHORT pusAction, USHORT usAttr, PBYTE pcEABuf, PUSHORT pfgenflag)
    47 {
    48     return ERROR_NOT_SUPPORTED;
    49 }
    50 
    51 
    52 DECLASM(int)
    53 FS32_CLOSE(ULONG type, ULONG IOflag, PSFFSI psffsi, PVBOXSFFSD psffsd)
    54 {
    55     return ERROR_NOT_SUPPORTED;
    56 }
    57 
    58 
    59 DECLASM(int)
    60 FS32_COMMIT(ULONG type, ULONG IOflag, PSFFSI psffsi, PVBOXSFFSD psffsd)
    61 {
    62     return ERROR_NOT_SUPPORTED;
    63 }
    64 
    65 
    66 extern "C" APIRET APIENTRY
    67 FS32_CHGFILEPTRL(PSFFSI psffsi, PVBOXSFFSD psffsd, LONGLONG off, ULONG ulMethod, ULONG IOflag)
    68 {
     45                PSFFSI psffsi, PVBOXSFFSD psffsd, ULONG uOpenMode, USHORT fOpenFlag,
     46                PUSHORT puAction, USHORT fAttr, PBYTE pbEABuf, PUSHORT pfGenFlag)
     47{
     48    NOREF(pcdfsi); NOREF(pcdfsd); NOREF(pszName); NOREF(iCurDirEnd); NOREF(psffsi); NOREF(psffsd); NOREF(uOpenMode);
     49    NOREF(fOpenFlag); NOREF(puAction); NOREF(fAttr); NOREF(pbEABuf); NOREF(pfGenFlag);
     50    return ERROR_NOT_SUPPORTED;
     51}
     52
     53
     54DECLASM(int)
     55FS32_CLOSE(ULONG uType, ULONG fIoFlags, PSFFSI psffsi, PVBOXSFFSD psffsd)
     56{
     57    NOREF(uType); NOREF(fIoFlags); NOREF(psffsi); NOREF(psffsd);
     58    return ERROR_NOT_SUPPORTED;
     59}
     60
     61
     62DECLASM(int)
     63FS32_COMMIT(ULONG uType, ULONG fIoFlags, PSFFSI psffsi, PVBOXSFFSD psffsd)
     64{
     65    NOREF(uType); NOREF(fIoFlags); NOREF(psffsi); NOREF(psffsd);
     66    return ERROR_NOT_SUPPORTED;
     67}
     68
     69
     70extern "C" APIRET APIENTRY
     71FS32_CHGFILEPTRL(PSFFSI psffsi, PVBOXSFFSD psffsd, LONGLONG off, ULONG uMethod, ULONG fIoFlags)
     72{
     73    NOREF(psffsi); NOREF(psffsd); NOREF(off); NOREF(uMethod); NOREF(fIoFlags);
    6974    return ERROR_NOT_SUPPORTED;
    7075}
    … …  
    7378/** Forwards the call to FS32_CHGFILEPTRL. */
    7479extern "C" APIRET APIENTRY
    75 FS32_CHGFILEPTR(PSFFSI psffsi, PVBOXSFFSD psffsd, LONG off, ULONG ulMethod, ULONG IOflag)
    76 {
    77     return FS32_CHGFILEPTRL(psffsi, psffsd, off, ulMethod, IOflag);
    78 }
    79 
    80 DECLASM(int)
    81 FS32_FILEINFO(ULONG flag, PSFFSI psffsi, PVBOXSFFSD psffsd, ULONG level,
    82               PBYTE pData, ULONG cbData, ULONG IOflag)
    83 {
    84     return ERROR_NOT_SUPPORTED;
    85 }
    86 
    87 DECLASM(int)
    88 FS32_NEWSIZEL(PSFFSI psffsi, PVBOXSFFSD psffsd, LONGLONG cbFile, ULONG IOflag)
    89 {
    90     return ERROR_NOT_SUPPORTED;
    91 }
    92 
    93 
    94 extern "C" APIRET APIENTRY
    95 FS32_READ(PSFFSI psffsi, PVBOXSFFSD psffsd, PVOID pvData, PULONG pcb, ULONG IOflag)
    96 {
    97     return ERROR_NOT_SUPPORTED;
    98 }
    99 
    100 
    101 extern "C" APIRET APIENTRY
    102 FS32_WRITE(PSFFSI psffsi, PVBOXSFFSD psffsd, PVOID pvData, PULONG pcb, ULONG IOflag)
    103 {
    104     return ERROR_NOT_SUPPORTED;
    105 }
    106 
    107 
    108 extern "C" APIRET APIENTRY
    109 FS32_READFILEATCACHE(PSFFSI psffsi, PVBOXSFFSD psffsd, ULONG IOflag, LONGLONG off, ULONG pcb, KernCacheList_t **ppCacheList)
    110 {
     80FS32_CHGFILEPTR(PSFFSI psffsi, PVBOXSFFSD psffsd, LONG off, ULONG uMethod, ULONG fIoFlags)
     81{
     82    return FS32_CHGFILEPTRL(psffsi, psffsd, off, uMethod, fIoFlags);
     83}
     84
     85DECLASM(int)
     86FS32_FILEINFO(ULONG fFlag, PSFFSI psffsi, PVBOXSFFSD psffsd, ULONG uLevel,
     87              PBYTE pbData, ULONG cbData, ULONG fIoFlags)
     88{
     89    NOREF(fFlag); NOREF(psffsi); NOREF(psffsd); NOREF(uLevel); NOREF(pbData); NOREF(cbData); NOREF(fIoFlags);
     90    return ERROR_NOT_SUPPORTED;
     91}
     92
     93DECLASM(int)
     94FS32_NEWSIZEL(PSFFSI psffsi, PVBOXSFFSD psffsd, LONGLONG cbFile, ULONG fIoFlags)
     95{
     96    NOREF(psffsi); NOREF(psffsd); NOREF(cbFile); NOREF(fIoFlags);
     97    return ERROR_NOT_SUPPORTED;
     98}
     99
     100
     101extern "C" APIRET APIENTRY
     102FS32_READ(PSFFSI psffsi, PVBOXSFFSD psffsd, PVOID pvData, PULONG pcb, ULONG fIoFlags)
     103{
     104    NOREF(psffsi); NOREF(psffsd); NOREF(pvData); NOREF(pcb); NOREF(fIoFlags);
     105    return ERROR_NOT_SUPPORTED;
     106}
     107
     108
     109extern "C" APIRET APIENTRY
     110FS32_WRITE(PSFFSI psffsi, PVBOXSFFSD psffsd, PVOID pvData, PULONG pcb, ULONG fIoFlags)
     111{
     112    NOREF(psffsi); NOREF(psffsd); NOREF(pvData); NOREF(pcb); NOREF(fIoFlags);
     113    return ERROR_NOT_SUPPORTED;
     114}
     115
     116
     117extern "C" APIRET APIENTRY
     118FS32_READFILEATCACHE(PSFFSI psffsi, PVBOXSFFSD psffsd, ULONG fIoFlags, LONGLONG off, ULONG pcb, KernCacheList_t **ppCacheList)
     119{
     120    NOREF(psffsi); NOREF(psffsd); NOREF(fIoFlags); NOREF(off); NOREF(pcb); NOREF(ppCacheList);
    111121    return ERROR_NOT_SUPPORTED;
    112122}
    … …  
    116126FS32_RETURNFILECACHE(KernCacheList_t *pCacheList)
    117127{
     128    NOREF(pCacheList);
    118129    return ERROR_NOT_SUPPORTED;
    119130}
    … …  
    125136FS32_CANCELLOCKREQUESTL(PSFFSI psffsi, PVBOXSFFSD psffsd, struct filelockl *pLockRange)
    126137{
     138    NOREF(psffsi); NOREF(psffsd); NOREF(pLockRange);
    127139    return ERROR_NOT_SUPPORTED;
    128140}
    … …  
    132144FS32_CANCELLOCKREQUEST(PSFFSI psffsi, PVBOXSFFSD psffsd, struct filelock *pLockRange)
    133145{
     146    NOREF(psffsi); NOREF(psffsd); NOREF(pLockRange);
    134147    return ERROR_NOT_SUPPORTED;
    135148}
    … …  
    138151DECLASM(int)
    139152FS32_FILELOCKSL(PSFFSI psffsi, PVBOXSFFSD psffsd, struct filelockl *pUnLockRange,
    140                 struct filelockl *pLockRange, ULONG timeout, ULONG flags)
    141 {
     153                struct filelockl *pLockRange, ULONG cMsTimeout, ULONG fFlags)
     154{
     155    NOREF(psffsi); NOREF(psffsd); NOREF(pUnLockRange); NOREF(pLockRange); NOREF(cMsTimeout); NOREF(fFlags);
    142156    return ERROR_NOT_SUPPORTED;
    143157}
    … …  
    146160DECLASM(int)
    147161FS32_FILELOCKS(PSFFSI psffsi, PVBOXSFFSD psffsd, struct filelock *pUnLockRange,
    148                struct filelock *pLockRange, ULONG timeout, ULONG flags)
    149 {
    150     return ERROR_NOT_SUPPORTED;
    151 }
    152 
    153 
    154 DECLASM(int)
    155 FS32_IOCTL(PSFFSI psffsi, PVBOXSFFSD psffsd, USHORT cat, USHORT func,
    156            PVOID pParm, USHORT lenParm, PUSHORT plenParmIO,
    157            PVOID pData, USHORT lenData, PUSHORT plenDataIO)
    158 {
    159     return ERROR_NOT_SUPPORTED;
    160 }
    161 
    162 
    163 DECLASM(int)
    164 FS32_FILEIO(PSFFSI psffsi, PVBOXSFFSD psffsd, PBYTE pCmdList, USHORT cbCmdList,
    165             PUSHORT poError, USHORT IOflag)
    166 {
    167     return ERROR_NOT_SUPPORTED;
    168 }
    169 
    170 
    171 DECLASM(int)
    172 FS32_NMPIPE(PSFFSI psffsi, PVBOXSFFSD psffsd, USHORT OpType, union npoper *pOpRec,
    173             PBYTE pData, PCSZ pszName)
    174 {
    175     return ERROR_NOT_SUPPORTED;
    176 }
    177 
    178 
    179 DECLASM(int)
    180 FS32_OPENPAGEFILE(PULONG pFlag, PULONG pcMaxReq, PCSZ pszName, PSFFSI psffsi, PVBOXSFFSD psffsd,
    181                   USHORT ulOpenMode, USHORT usOpenFlag, USHORT usAttr, ULONG Reserved)
    182 {
     162               struct filelock *pLockRange, ULONG cMsTimeout, ULONG fFlags)
     163{
     164    NOREF(psffsi); NOREF(psffsd); NOREF(pUnLockRange); NOREF(pLockRange); NOREF(cMsTimeout); NOREF(fFlags);
     165    return ERROR_NOT_SUPPORTED;
     166}
     167
     168
     169DECLASM(int)
     170FS32_IOCTL(PSFFSI psffsi, PVBOXSFFSD psffsd, USHORT uCategory, USHORT uFunction,
     171           PVOID pvParm, USHORT cbParm, PUSHORT pcbParmIO,
     172           PVOID pvData, USHORT cbData, PUSHORT pcbDataIO)
     173{
     174    NOREF(psffsi); NOREF(psffsd); NOREF(uCategory); NOREF(uFunction); NOREF(pvParm); NOREF(cbParm); NOREF(pcbParmIO);
     175    NOREF(pvData); NOREF(cbData); NOREF(pcbDataIO);
     176    return ERROR_NOT_SUPPORTED;
     177}
     178
     179
     180DECLASM(int)
     181FS32_FILEIO(PSFFSI psffsi, PVBOXSFFSD psffsd, PBYTE pbCmdList, USHORT cbCmdList,
     182            PUSHORT poffError, USHORT fIoFlag)
     183{
     184    NOREF(psffsi); NOREF(psffsd); NOREF(pbCmdList); NOREF(cbCmdList); NOREF(poffError); NOREF(fIoFlag);
     185    return ERROR_NOT_SUPPORTED;
     186}
     187
     188
     189DECLASM(int)
     190FS32_NMPIPE(PSFFSI psffsi, PVBOXSFFSD psffsd, USHORT uOpType, union npoper *pOpRec,
     191            PBYTE pbData, PCSZ pszName)
     192{
     193    NOREF(psffsi); NOREF(psffsd); NOREF(uOpType); NOREF(pOpRec); NOREF(pbData); NOREF(pszName);
     194    return ERROR_NOT_SUPPORTED;
     195}
     196
     197
     198DECLASM(int)
     199FS32_OPENPAGEFILE(PULONG pfFlags, PULONG pcMaxReq, PCSZ pszName, PSFFSI psffsi, PVBOXSFFSD psffsd,
     200                  USHORT uOpenMode, USHORT fOpenFlags, USHORT fAttr, ULONG uReserved)
     201{
     202    NOREF(pfFlags); NOREF(pcMaxReq); NOREF(pszName); NOREF(psffsi); NOREF(psffsd); NOREF(uOpenMode); NOREF(fOpenFlags);
     203    NOREF(fAttr); NOREF(uReserved);
    183204    return ERROR_NOT_SUPPORTED;
    184205}
    … …  
    188209FS32_SETSWAP(PSFFSI psffsi, PVBOXSFFSD psffsd)
    189210{
     211    NOREF(psffsi); NOREF(psffsd);
    190212    return ERROR_NOT_SUPPORTED;
    191213}
    … …  
    195217FS32_ALLOCATEPAGESPACE(PSFFSI psffsi, PVBOXSFFSD psffsd, ULONG cb, USHORT cbWantContig)
    196218{
     219    NOREF(psffsi); NOREF(psffsd); NOREF(cb); NOREF(cbWantContig);
    197220    return ERROR_NOT_SUPPORTED;
    198221}
    … …  
    202225FS32_DOPAGEIO(PSFFSI psffsi, PVBOXSFFSD psffsd, struct PageCmdHeader *pList)
    203226{
    204     return ERROR_NOT_SUPPORTED;
    205 }
    206 
     227    NOREF(psffsi); NOREF(psffsd); NOREF(pList);
     228    return ERROR_NOT_SUPPORTED;
     229}
     230

  • trunk/src/VBox/Additions/os2/VBoxSF/VBoxSFFind.cpp

    r57358 r68612  
    4141
    4242DECLASM(int)
    43 FS32_FINDFIRST(PCDFSI pcdfsi, PVBOXSFCD pcdfsd, PCSZ pszName, USHORT iCurDirEnd, USHORT attr,
     43FS32_FINDFIRST(PCDFSI pcdfsi, PVBOXSFCD pcdfsd, PCSZ pszName, USHORT iCurDirEnd, USHORT fAttr,
    4444               PFSFSI pfsfsi, PVBOXSFFS pfsfsd, PBYTE pbData, USHORT cbData, PUSHORT pcMatch,
    45                USHORT level, USHORT flags)
     45               USHORT uLevel, USHORT fFlags)
    4646{
     47    NOREF(pcdfsi); NOREF(pcdfsd); NOREF(pszName); NOREF(iCurDirEnd); NOREF(fAttr); NOREF(pfsfsi); NOREF(pfsfsd); NOREF(pbData);
     48    NOREF(cbData); NOREF(pcMatch); NOREF(uLevel); NOREF(fFlags);
    4749    return ERROR_NOT_SUPPORTED;
    4850}
    … …  
    5153DECLASM(int)
    5254FS32_FINDFROMNAME(PFSFSI pfsfsi, PVBOXSFFS pfsfsd, PBYTE pbData, USHORT cbData, PUSHORT pcMatch,
    53                   USHORT level, ULONG position, PCSZ pszName, USHORT flag)
     55                  USHORT uLevel, ULONG position, PCSZ pszName, USHORT fFlags)
    5456{
     57    NOREF(pfsfsi); NOREF(pfsfsd); NOREF(pbData); NOREF(cbData); NOREF(pcMatch); NOREF(uLevel); NOREF(position); NOREF(pszName);
     58    NOREF(fFlags);
    5559    return ERROR_NOT_SUPPORTED;
    5660}
    … …  
    5963DECLASM(int)
    6064FS32_FINDNEXT(PFSFSI pfsfsi, PVBOXSFFS pfsfsd, PBYTE pbData, USHORT cbData, PUSHORT pcMatch,
    61               USHORT level, USHORT flag)
     65              USHORT uLevel, USHORT fFlags)
    6266{
     67    NOREF(pfsfsi); NOREF(pfsfsd); NOREF(pbData); NOREF(cbData); NOREF(pcMatch); NOREF(uLevel); NOREF(fFlags);
    6368    return ERROR_NOT_SUPPORTED;
    6469}
    … …  
    6873FS32_FINDCLOSE(PFSFSI pfsfsi, PVBOXSFFS pfsfsd)
    6974{
     75    NOREF(pfsfsi); NOREF(pfsfsd);
    7076    return ERROR_NOT_SUPPORTED;
    7177}
    … …  
    7682
    7783DECLASM(int)
    78 FS32_FINDNOTIFYFIRST(PCDFSI pcdfsi, PVBOXSFCD pcdfsd, PCSZ pszName, USHORT iCurDirEnd, USHORT attr,
    79                      PUSHORT pHandle, PBYTE pbData, USHORT cbData, PUSHORT pcMatch,
    80                      USHORT level, USHORT flags)
     84FS32_FINDNOTIFYFIRST(PCDFSI pcdfsi, PVBOXSFCD pcdfsd, PCSZ pszName, USHORT iCurDirEnd, USHORT fAtt,
     85                     PUSHORT phHandle, PBYTE pbData, USHORT cbData, PUSHORT pcMatch,
     86                     USHORT uLevel, USHORT fFlags)
    8187{
     88    NOREF(pcdfsi); NOREF(pcdfsd); NOREF(pszName); NOREF(iCurDirEnd); NOREF(fAtt); NOREF(phHandle); NOREF(pbData); NOREF(cbData);
     89    NOREF(pcMatch); NOREF(uLevel); NOREF(fFlags);
    8290    return ERROR_NOT_SUPPORTED;
    8391}
    … …  
    8593
    8694DECLASM(int)
    87 FS32_FINDNOTIFYNEXT(USHORT handle, PBYTE pbData, USHORT cbData, PUSHORT pcMatch,
    88                     USHORT level, ULONG timeout)
     95FS32_FINDNOTIFYNEXT(USHORT hHandle, PBYTE pbData, USHORT cbData, PUSHORT pcMatch,
     96                    USHORT uLevel, ULONG cMsTimeout)
    8997{
     98    NOREF(hHandle); NOREF(pbData); NOREF(cbData); NOREF(pcMatch); NOREF(uLevel); NOREF(cMsTimeout);
    9099    return ERROR_NOT_SUPPORTED;
    91100}
    … …  
    93102
    94103DECLASM(int)
    95 FS32_FINDNOTIFYCLOSE(USHORT handle)
     104FS32_FINDNOTIFYCLOSE(USHORT hHandle)
    96105{
     106    NOREF(hHandle);
    97107    return ERROR_NOT_SUPPORTED;
    98108}

  • trunk/src/VBox/Additions/os2/VBoxSF/VBoxSFInternal.h

    r3655 r68612  
    3535#define INCL_BASE
    3636#define INCL_ERROR
     37#define INCL_LONGLONG
    3738#include <os2.h>
    3839#include <os2ddk/bsekee.h>
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette