Changeset 536


Ignore:
Timestamp:
Jul 11, 2008, 1:24:57 AM (16 years ago)
Author:
イグトランス (egtra)
Message:

細かい修正。
Str$にStringを受け取る多重定義を追加した。
複数libを作るバッチで、コンパイルエラーが発生したら以後のビルドを行わないようにした。
Threadクラスの_beginthreadexをCreateThreadへ変更した。
ole2.abを全体が使える古い版へ戻した。
SendMessageCallback/SendMessageTimeoutを追加した。
GCHandleで登録が解除されない状態が起こる問題を直した。

Location:
trunk/ab5.0/ablib
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/ab5.0/ablib/build_batch/build_basic_static_libaray_full.bat

    r515 r536  
    11call ".\build_basic_static_library(32bit - debug).bat"
     2if errorlevel 1 goto exit
    23call ".\build_basic_static_library(32bit - release).bat"
     4if errorlevel 1 goto exit
    35call ".\build_basic_static_library(64bit - debug).bat"
     6if errorlevel 1 goto exit
    47call ".\build_basic_static_library(64bit - release).bat"
     8:exit
    59pause

  • trunk/ab5.0/ablib/build_batch/build_basic_static_libaray_x86_only.bat

    r515 r536  
     1@echo off
    12call ".\build_basic_static_library(32bit - debug).bat"
    2 call ".\build_basic_static_library(32bit - release).bat"
     3if not errorlevel 1 call ".\build_basic_static_library(32bit - release).bat"
    34pause

  • trunk/ab5.0/ablib/src/Classes/System/Runtime/InteropServices/GCHandle.ab

    r388 r536  
    88Public
    99    Function Target() As Object
    10         Dim pobj = VarPtr(handle) As *Object
    11         Return pobj[0]
     10        Target = _System_PtrObj(handle)
    1211    End Function
    1312
    1413    Sub Target(obj As Object)
     14        If handle <> 0 Then
     15            Dim i = allocated.IndexOf(Target())
     16            'assert(i <> -1)
     17            allocated[i] = obj
     18        End If
    1519        allocated.Add(obj)
    1620        handle = ObjPtr(obj)

  • trunk/ab5.0/ablib/src/Classes/System/Threading/Thread.ab

    r532 r536  
    1919
    2020Enum ThreadState
    21     'スレッド状態に AbortRequested が含まれ、そのスレッドは停止していますが、状態はまだ Stopped に変わっていません。 
     21    'スレッド状態に AbortRequested が含まれ、そのスレッドは停止していますが、状態はまだ Stopped に変わっていません。
    2222    Aborted
    23     'スレッド上で Thread.Abort メソッドを呼び出しますが、そのスレッドの終了を試みる保留中の System.Threading.ThreadAbortException をスレッドが受け取っていません。 
     23    'スレッド上で Thread.Abort メソッドを呼び出しますが、そのスレッドの終了を試みる保留中の System.Threading.ThreadAbortException をスレッドが受け取っていません。
    2424    AbortRequested
    25     'スレッドは、フォアグラウンド スレッドではなく、バックグランド スレッドとして実行します。この状態は、Thread.IsBackground プロパティを設定して制御されます。 
     25    'スレッドは、フォアグラウンド スレッドではなく、バックグランド スレッドとして実行します。この状態は、Thread.IsBackground プロパティを設定して制御されます。
    2626    Background
    27     'スレッドをブロックせずに起動します。保留中の ThreadAbortException もありません。 
     27    'スレッドをブロックせずに起動します。保留中の ThreadAbortException もありません。
    2828    Running
    29     'スレッドを停止します。 
     29    'スレッドを停止します。
    3030    Stopped
    31     'スレッドの停止を要求します。これは、内部でだけ使用します。 
     31    'スレッドの停止を要求します。これは、内部でだけ使用します。
    3232    StopRequested
    33     'スレッドを中断します。 
     33    'スレッドを中断します。
    3434    Suspended
    35     'スレッドの中断を要求します。 
     35    'スレッドの中断を要求します。
    3636    SuspendRequested
    37     'スレッド上に Thread.Start メソッドを呼び出しません。 
     37    'スレッド上に Thread.Start メソッドを呼び出しません。
    3838    Unstarted
    39     'スレッドがブロックされています。これは、Thread.Sleep または Thread.Join の呼び出し、ロックの要求 (たとえば、Monitor.Enter や Monitor.Wait の呼び出しによる)、または ManualResetEvent などのスレッド同期オブジェクトの待機の結果である可能性があります。   
     39    'スレッドがブロックされています。これは、Thread.Sleep または Thread.Join の呼び出し、ロックの要求 (たとえば、Monitor.Enter や Monitor.Wait の呼び出しによる)、または ManualResetEvent などのスレッド同期オブジェクトの待機の結果である可能性があります。
    4040    WaitSleepJoin
    4141End Enum
    … …  
    144144        End If
    145145    End Function
    146    
     146
    147147    'Priority Property
    148148    Sub Priority(value As ThreadPriority)
    … …  
    177177
    178178    Sub Start()
    179         Dim ThreadId As DWord
    180         m_hThread=_beginthreadex(NULL,0,AddressOf(_run),VarPtr(This),CREATE_SUSPENDED,m_dwThreadId)
     179        Dim pfn = AddressOf(_run) As LONG_PTR
     180        m_hThread=CreateThread(NULL,0,pfn As LPTHREAD_START_ROUTINE,VarPtr(This),CREATE_SUSPENDED,m_dwThreadId)
    181181        SetThreadPriority(m_hThread,m_Priority)
    182182        This.Resume()
    … …  
    216216    /*------------------------ クラス内部用 --------------------------*/
    217217Private
    218     Function Cdecl _run() As Long
     218    Function _run() As Long
    219219        '------------
    220220        ' 前処理

  • trunk/ab5.0/ablib/src/api_window.sbp

    r521 r536  
    6060Const _FuncName_SendDlgItemMessage = "SendDlgItemMessageW"
    6161Const _FuncName_SendMessage = "SendMessageW"
     62Const _FuncName_SendMessageCallback = "SendMessageCallbackW"
     63Const _FuncName_SendMessageTimeout = "SendMessageTimeoutW"
    6264Const _FuncName_SendNotifyMessage = "SendNotifyMessageW"
    6365Const _FuncName_SetDlgItemText = "SetDlgItemTextW"
    … …  
    137139Const _FuncName_SendDlgItemMessage = "SendDlgItemMessageA"
    138140Const _FuncName_SendMessage = "SendMessageA"
     141Const _FuncName_SendMessageCallback = "SendMessageCallbackA"
     142Const _FuncName_SendMessageTimeout = "SendMessageTimeoutA"
    139143Const _FuncName_SendNotifyMessage = "SendNotifyMessageA"
    140144Const _FuncName_SetDlgItemText = "SetDlgItemTextA"
    … …  
    11941198Const MB_YESNO =                  &H00000004
    11951199Const MB_RETRYCANCEL =            &H00000005
     1200Const MB_CANCELTRYCONTINUE =      &H00000006
    11961201Const MB_ICONHAND =               &H00000010
    11971202Const MB_ICONQUESTION =           &H00000020
    … …  
    12181223Const MB_RTLREADING =             &H00100000
    12191224Const MB_SERVICE_NOTIFICATION =   &H00200000
     1225
     1226Const MB_TYPEMASK = &h0000000F
     1227Const MB_ICONMASK = &h000000F0
     1228Const MB_DEFMASK  = &h00000F00
     1229Const MB_MODEMASK = &h00003000
     1230Const MB_MISCMASK = &h0000C000
    12201231#ifdef UNICODE
    12211232Declare Function MessageBox Lib "user32" Alias "MessageBoxW" (hwnd As HWND, pText As PCWSTR, pCaption As PCWSTR, uType As DWord) As Long
    … …  
    12901301Declare Function SendDlgItemMessage Lib "user32" Alias _FuncName_SendDlgItemMessage (hDlg As HWND, nIDDlgItem As Long, Msg As DWord, wParam As WPARAM, lParam As LPARAM) As LRESULT
    12911302Declare Function SendMessage Lib "user32" Alias _FuncName_SendMessage (hWnd As HWND, wMsg As DWord, wParam As WPARAM, lParam As LPARAM) As LRESULT
     1303
     1304TypeDef SENDASYNCPROC = *Sub(hwnd As HWND, uMsg As DWord, dwData As ULONG_PTR, lResult As LRESULT)
     1305Declare Function SendMessageCallback Lib "user32" Alias _FuncName_SendMessageCallback (hWnd As HWND, Msg As DWord, wParam As WPARAM, lParam As LPARAM, lpResultCallBack As SENDASYNCPROC, dwData As ULONG_PTR) As BOOL
     1306Const SMTO_NORMAL = &h0000
     1307Const SMTO_BLOCK = &h0001
     1308Const SMTO_ABORTIFHUNG = &h0002
     1309'#if WINVER >= &h0500
     1310'Const SMTO_NOTIMEOUTIFNOTHUNG = &h0008
     1311'#endif
     1312'#if WINVER >= &h0600
     1313'Const SMTO_ERRORONEXIT = &h0020
     1314'#endif
     1315Declare Function SendMessageTimeout Lib "user32" Alias _FuncName_SendMessageTimeout (hWnd As HWND, Msg As DWord, wParam As WPARAM, lParam As LPARAM, fuFlags As DWord, uTimeout As DWord, ByRef dwResult As ULONG_PTR) As LRESULT
    12921316Declare Function SendNotifyMessage Lib "user32" Alias _FuncName_SendNotifyMessage (hWnd As HWND, wMsg As DWord, wParam As WPARAM, lParam As LPARAM) As LRESULT
    12931317Declare Function SetActiveWindow Lib "user32" (hWnd As HWND) As HWND
    … …  
    18251849#endif
    18261850
    1827 /*#ifdef(WINVER >= 0x0500)
     1851/*#ifdef(WINVER >= &h0500)
    18281852Declare Function EnumDisplaySettingsExA Lib "user32" (ByVal lpszDeviceName As LPCSTR, ByVal iModeNum As DWord, ByVal lpDevMode As *DEVMODEA, ByVal dwFlags As DWord) As BOOL
    18291853Declare Function EnumDisplaySettingsExW Lib "user32" (ByVal lpszDeviceName As LPCWSTR, ByVal iModeNum As DWord, ByVal lpDevMode As *DEVMODEW, ByVal dwFlags As DWord) As BOOL
    … …  
    18431867Declare Function EnumDisplayDevices Lib "user32" Alias _FuncName_EnumDisplayDevices (ByVal lpDevice As LPCSTR, ByVal iDevNum As DWord, ByVal lpDisplayDevice As *DISPLAY_DEVICEA, ByVal dwFlags As DWord) As BOOL
    18441868#endif
    1845 #endif */ /* WINVER >= 0x0500 */
     1869#endif */ /* WINVER >= &h0500 */
    18461870#endif ' _INC_GDI
    18471871

  • trunk/ab5.0/ablib/src/basic/function.sbp

    r514 r536  
    588588        Return "False"
    589589    End If
     590End Function
     591
     592Function Str$(s As String) As String
     593    Str$ = s
    590594End Function
    591595

  • trunk/ab5.0/ablib/src/ole2.ab

    r497 r536  
    55#require <objbase.sbp>
    66#require <oleauto.ab>
    7 #ifdef __UNDEFINED '#165が解決するまでの暫定
     7
    88' View OBJECT Error Codes
    99
    … …  
    5353
    5454/* helper functions */
    55 Declare Function ReadClassStg Lib "ole32.dll" (/*IN*/ ByVal stg As IStorage, /*OUT*/ ByRef clsid As CLSID) As HRESULT
    56 Declare Function WriteClassStg Lib "ole32.dll" (/*IN*/ ByVal stg As IStorage, /*IN*/ ByRef clsid As CLSID) As HRESULT
    57 Declare Function ReadClassStm Lib "ole32.dll" (/*IN*/ ByVal stm As IStream, /*OUT*/ ByRef clsid As CLSID) As HRESULT
    58 Declare Function WriteClassStm Lib "ole32.dll" (/*IN*/ ByVal stm As IStream, /*IN*/ ByRef clsid As CLSID) As HRESULT
    59 Declare Function WriteFmtUserTypeStg Lib "ole32.dll" (/*IN*/ ByVal stg As IStorage, /*IN*/ ByVal cf As CLIPFORMAT, /*IN*/ ByVal pszUserType As *OLECHAR) As HRESULT
    60 Declare Function ReadFmtUserTypeStg Lib "ole32.dll" (/*IN*/ ByVal stg As IStorage, /*OUT*/ ByRef cf As CLIPFORMAT, /*OUT*/ ByRef rpszUserType As *OLECHAR) As HRESULT
     55Declare Function ReadClassStg Lib "ole32.dll" (/*IN*/ ByVal pStg As *IStorage, /*OUT*/ ByRef clsid As CLSID) As HRESULT
     56Declare Function WriteClassStg Lib "ole32.dll" (/*IN*/ ByVal pStg As *IStorage, /*IN*/ ByRef clsid As CLSID) As HRESULT
     57Declare Function ReadClassStm Lib "ole32.dll" (/*IN*/ ByVal pStm As *IStream, /*OUT*/ ByRef clsid As CLSID) As HRESULT
     58Declare Function WriteClassStm Lib "ole32.dll" (/*IN*/ ByVal pStm As *IStream, /*IN*/ ByRef clsid As CLSID) As HRESULT
     59Declare Function WriteFmtUserTypeStg Lib "ole32.dll" (/*IN*/ ByVal pstg As *IStorage, /*IN*/ ByVal cf As CLIPFORMAT, /*IN*/ ByVal pszUserType As *OLECHAR) As HRESULT
     60Declare Function ReadFmtUserTypeStg Lib "ole32.dll" (/*IN*/ ByVal pstg As *IStorage, /*OUT*/ ByRef cf As CLIPFORMAT, /*OUT*/ ByRef rpszUserType As *OLECHAR) As HRESULT
    6161
    6262
    … …  
    7070   the data object */
    7171
    72 Declare Function OleQueryLinkFromData Lib "ole32" (/*IN*/ ByVal srcDataObject As IDataObject) As HRESULT
    73 Declare Function OleQueryCreateFromData Lib "ole32.dll" (/*IN*/ ByVal srcDataObject As IDataObject) As HRESULT
     72Declare Function OleQueryLinkFromData Lib "ole32" (/*IN*/ ByVal pSrcDataObject As *IDataObject) As HRESULT
     73Declare Function OleQueryCreateFromData Lib "ole32.dll" (/*IN*/ ByVal pSrcDataObject As *IDataObject) As HRESULT
    7474
    7575
    7676/* Object creation APIs */
    7777
    78 Declare Function OleCreate Lib "ole32.dll" (/*IN*/ ByRef rclsid As CLSID, /*IN*/ ByRef riid As IID, /*IN*/ ByVal renderopt As DWord,
    79     /*IN*/ ByVal pFormatEtc As *FORMATETC, /*IN*/ ByVal clientSite As IOleClientSite,
    80     /*IN*/ ByVal stg As IStorage, /*OUT*/ ByRef ppvObj As Any) As HRESULT
     78Declare Function OleCreate Lib "ole32.dll" (/*IN*/ ByRef rclsid As CLSID, /*IN*/ ByRef riid As IID, /*IN*/ ByVal renderopt As DWord, _
     79                /*IN*/ ByVal pFormatEtc As *FORMATETC, /*IN*/ ByVal pClientSite As *IOleClientSite, _
     80                /*IN*/ ByVal pStg As *IStorage, /*OUT*/ ByRef ppvObj As Any) As HRESULT
    8181
    8282Declare Function OleCreateEx Lib "ole32.dll" (/*IN*/ ByRef rclsid As CLSID, /*IN*/ ByRef riid As IID, /*IN*/ ByVal dwFlags As DWord,
    83     /*IN*/ ByVal renderopt As DWord, /*IN*/ ByVal cFormats As DWord, /*IN*/ ByVal rgAdvf As *DWord,
    84     /*IN*/ ByVal rgFormatEtc As *FORMATETC, /*IN*/ ByVal adviseSink As IAdviseSink,
    85     /*OUT*/ ByVal rgdwConnection As *DWord, /*IN*/ ByVal clientSite As IOleClientSite,
    86     /*IN*/ ByVal stg As IStorage, /*OUT*/ ByRef ppvObj As Any) As HRESULT
    87 
    88 Declare Function OleCreateFromData Lib "ole32.dll" (/*IN*/ ByVal srcDataObj As IDataObject, /*IN*/ ByRef riid As IID,
    89     /*IN*/ ByVal renderopt As DWord, /*IN*/ ByVal pFormatEtc As *FORMATETC,
    90     /*IN*/ ByVal clientSite As IOleClientSite, /*IN*/ ByVal stg As IStorage,
    91     /*OUT*/ ByRef ppvObj As Any) As HRESULT
    92 
    93 Declare Function OleCreateFromDataEx Lib "ole32.dll" (/*IN*/ ByVal srcDataObj As IDataObject, /*IN*/ ByRef riid As IID,
    94     /*IN*/ ByVal dwFlags As DWord, /*IN*/ ByVal renderopt As DWord, /*IN*/ ByVal cFormats As DWord, /*IN*/ ByVal rgAdvf As *DWord,
    95     /*IN*/ ByVal rgFormatEtc As *FORMATETC, /*IN*/ ByVal adviseSink As IAdviseSink,
    96     /*OUT*/ ByVal rgdwConnection As *DWord, /*IN*/ ByVal clientSite As IOleClientSite,
    97     /*IN*/ ByVal stg As IStorage, /*OUT*/ ByRef ppvObj As Any) As HRESULT
    98 
    99 Declare Function OleCreateLinkFromData Lib "ole32.dll" (/*IN*/ ByVal srcDataObj As IDataObject, /*IN*/ ByRef riid As IID,
    100     /*IN*/ ByVal renderopt As DWord, /*IN*/ ByVal pFormatEtc As *FORMATETC,
    101     /*IN*/ ByVal clientSite As IOleClientSite, /*IN*/ ByVal stg As IStorage,
    102     /*OUT*/ ByRef ppvObj As Any) As HRESULT
    103 
    104 Declare Function OleCreateLinkFromDataEx Lib "ole32.dll" (/*IN*/ ByVal srcDataObj As IDataObject, /*IN*/ ByRef riid As IID,
    105     /*IN*/ ByVal dwFlags As DWord, /*IN*/ ByVal renderopt As DWord, /*IN*/ ByVal cFormats As DWord, /*IN*/ ByVal rgAdvf As *DWord,
    106     /*IN*/ ByVal rgFormatEtc As *FORMATETC, /*IN*/ ByVal adviseSink As IAdviseSink,
    107     /*OUT IN*/ ByVal rgdwConnection As *DWord, /*IN*/ ByVal clientSite As IOleClientSite,
    108     /*IN*/ ByVal stg As IStorage, /*OUT*/ ByRef ppvObj As Any) As HRESULT
    109 
    110 Declare Function OleCreateStaticFromData Lib "ole32.dll" (/*IN*/ ByVal srcDataObj As IDataObject, /*IN*/ ByRef riid As IID,
    111     /*IN*/ ByVal renderopt As DWord, /*IN*/ ByVal pFormatEtc As *FORMATETC,
    112     /*IN*/ ByVal clientSite As IOleClientSite, /*IN*/ ByVal stg As IStorage,
    113     /*OUT*/ ByRef ppvObj As Any) As HRESULT
    114 
    115 
    116 Declare Function OleCreateLink Lib "ole32.dll" (/*IN*/ ByVal mkLinkSrc As IMoniker, /*IN*/ ByRef riid As IID,
    117     /*IN*/ ByVal renderopt As DWord, /*IN*/ ByVal pFormatEtc As *FORMATETC,
    118     /*IN*/ ByVal clientSite As IOleClientSite, /*IN*/ ByVal dataObj As IDataObject, /*OUT*/ ByRef ppvObj As Any) As HRESULT
    119 
    120 Declare Function OleCreateLinkEx Lib "ole32.dll" (/*IN*/ ByVal mkLinkSrc As IMoniker, /*IN*/ ByRef riid As IID,
    121     /*IN*/ ByVal dwFlags As DWord, /*IN*/ ByVal renderopt As DWord, /*IN*/ ByVal cFormats As DWord, /*IN*/ ByVal rgAdvf As *DWord,
    122     /*IN*/ ByVal rgFormatEtc As *FORMATETC, /*IN*/ ByVal adviseSink As IAdviseSink,
    123     /*OUT*/ ByVal rgdwConnection As *DWord, /*IN*/ ByVal clientSite As IOleClientSite,
    124     /*IN*/ ByVal dataObj As IDataObject, /*OUT*/ ByRef ppvObj As Any) As HRESULT
     83                /*IN*/ ByVal renderopt As DWord, /*IN*/ ByVal cFormats As DWord, /*IN*/ ByVal rgAdvf As *DWord,
     84                /*IN*/ ByVal rgFormatEtc As *FORMATETC, /*IN*/ ByVal pAdviseSink As *IAdviseSink,
     85                /*OUT*/ ByVal rgdwConnection As *DWord, /*IN*/ ByVal pClientSite As *IOleClientSite,
     86                /*IN*/ ByVal pStg As *IStorage, /*OUT*/ ByRef ppvObj As Any) As HRESULT
     87
     88Declare Function OleCreateFromData Lib "ole32.dll" (/*IN*/ ByVal pSrcDataObj As *IDataObject, /*IN*/ ByRef riid As IID,
     89                /*IN*/ ByVal renderopt As DWord, /*IN*/ ByVal pFormatEtc As *FORMATETC,
     90                /*IN*/ ByVal pClientSite As *IOleClientSite, /*IN*/ ByVal pStg As *IStorage,
     91                /*OUT*/ ByRef ppvObj As Any) As HRESULT
     92
     93Declare Function OleCreateFromDataEx Lib "ole32.dll" (/*IN*/ ByVal pSrcDataObj As *IDataObject, /*IN*/ ByRef riid As IID,
     94                /*IN*/ ByVal dwFlags As DWord, /*IN*/ ByVal renderopt As DWord, /*IN*/ ByVal cFormats As DWord, /*IN*/ ByVal rgAdvf As *DWord,
     95                /*IN*/ ByVal rgFormatEtc As *FORMATETC, /*IN*/ ByVal pAdviseSink As *IAdviseSink,
     96                /*OUT*/ ByVal rgdwConnection As *DWord, /*IN*/ ByVal pClientSite As *IOleClientSite,
     97                /*IN*/ ByVal pStg As *IStorage, /*OUT*/ ByRef ppvObj As Any) As HRESULT
     98
     99Declare Function OleCreateLinkFromData Lib "ole32.dll" (/*IN*/ ByVal pSrcDataObj As *IDataObject, /*IN*/ ByRef riid As IID,
     100                /*IN*/ ByVal renderopt As DWord, /*IN*/ ByVal pFormatEtc As *FORMATETC,
     101                /*IN*/ ByVal pClientSite As *IOleClientSite, /*IN*/ ByVal pStg As *IStorage,
     102                /*OUT*/ ByRef ppvObj As Any) As HRESULT
     103
     104Declare Function OleCreateLinkFromDataEx Lib "ole32.dll" (/*IN*/ ByVal pSrcDataObj As *IDataObject, /*IN*/ ByRef riid As IID,
     105                /*IN*/ ByVal dwFlags As DWord, /*IN*/ ByVal renderopt As DWord, /*IN*/ ByVal cFormats As DWord, /*IN*/ ByVal rgAdvf As *DWord,
     106                /*IN*/ ByVal rgFormatEtc As *FORMATETC, /*IN*/ ByVal pAdviseSink As *IAdviseSink,
     107                /*OUT IN*/ ByVal rgdwConnection As *DWord, /*IN*/ ByVal pClientSite As *IOleClientSite,
     108                /*IN*/ ByVal pStg As *IStorage, /*OUT*/ ByRef ppvObj As Any) As HRESULT
     109
     110Declare Function OleCreateStaticFromData Lib "ole32.dll" (/*IN*/ ByVal pSrcDataObj As *IDataObject, /*IN*/ ByRef riid As IID,
     111                /*IN*/ ByVal renderopt As DWord, /*IN*/ ByVal pFormatEtc As *FORMATETC,
     112                /*IN*/ ByVal pClientSite As *IOleClientSite, /*IN*/ ByVal pStg As *IStorage,
     113                /*OUT*/ ByRef ppvObj As Any) As HRESULT
     114
     115
     116Declare Function OleCreateLink Lib "ole32.dll" (/*IN*/ ByVal pmkLinkSrc As *IMoniker, /*IN*/ ByRef riid As IID,
     117            /*IN*/ ByVal renderopt As DWord, /*IN*/ ByVal pFormatEtc As *FORMATETC,
     118            /*IN*/ ByVal pClientSite As *IOleClientSite, /*IN*/ ByVal pDataObj As *IDataObject, /*OUT*/ ByRef ppvObj As Any) As HRESULT
     119
     120Declare Function OleCreateLinkEx Lib "ole32.dll" (/*IN*/ ByVal pmkLinkSrc As *IMoniker, /*IN*/ ByRef riid As IID,
     121            /*IN*/ ByVal dwFlags As DWord, /*IN*/ ByVal renderopt As DWord, /*IN*/ ByVal cFormats As DWord, /*IN*/ ByVal rgAdvf As *DWord,
     122            /*IN*/ ByVal rgFormatEtc As *FORMATETC, /*IN*/ ByVal pAdviseSink As *IAdviseSink,
     123            /*OUT*/ ByVal rgdwConnection As *DWord, /*IN*/ ByVal pClientSite As *IOleClientSite,
     124            /*IN*/ ByVal pDataObj As *IDataObject, /*OUT*/ ByRef ppvObj As Any) As HRESULT
    125125
    126126Declare Function OleCreateLinkToFile Lib "ole32.dll" (/*IN*/ ByVal lpszFileName As LPCOLESTR, /*IN*/ ByRef riid As IID,
    127     /*IN*/ ByVal renderopt As DWord, /*IN*/ ByVal pFormatEtc As *FORMATETC,
    128     /*IN*/ ByVal clientSite As IOleClientSite, /*IN*/ ByValdataObj As IDataObject, /*OUT*/ ByRef ppvObj As Any) As HRESULT
     127            /*IN*/ ByVal renderopt As DWord, /*IN*/ ByVal pFormatEtc As *FORMATETC,
     128            /*IN*/ ByVal pClientSite As *IOleClientSite, /*IN*/ ByVal pDataObj As *IDataObject, /*OUT*/ ByRef ppvObj As Any) As HRESULT
    129129
    130130Declare Function OleCreateLinkToFileEx Lib "ole32.dll" (/*IN*/ ByVal lpszFileName As LPCOLESTR, /*IN*/ ByRef riid As IID,
    131     /*IN*/ ByVal dwFlags As DWord, /*IN*/ ByVal renderopt As DWord, /*IN*/ ByVal cFormats As DWord, /*IN*/ ByVal rgAdvf As *DWord,
    132     /*IN*/ ByVal rgFormatEtc As *FORMATETC, /*IN*/ ByVal adviseSink As IAdviseSink,
    133     /*OUT*/ ByVal rgdwConnection As *DWord, /*IN*/ ByVal clientSite As IOleClientSite,
    134     /*IN*/ ByVal dataObj As IDataObject, /*OUT*/ ByRef ppvObj As Any) As HRESULT
     131            /*IN*/ ByVal dwFlags As DWord, /*IN*/ ByVal renderopt As DWord, /*IN*/ ByVal cFormats As DWord, /*IN*/ ByVal rgAdvf As *DWord,
     132            /*IN*/ ByVal rgFormatEtc As *FORMATETC, /*IN*/ ByVal pAdviseSink As *IAdviseSink,
     133            /*OUT*/ ByVal rgdwConnection As *DWord, /*IN*/ ByVal pClientSite As *IOleClientSite,
     134            /*IN*/ ByVal pDataObj As *IDataObject, /*OUT*/ ByRef ppvObj As Any) As HRESULT
    135135
    136136Declare Function OleCreateFromFile Lib "ole32.dll" (/*IN*/ ByRef rclsid As CLSID, /*IN*/ ByVal lpszFileName As LPOLESTR, /*IN*/ ByRef riid As IID,
    137     /*IN*/ ByVal renderopt As DWord, /*IN*/ ByVal pFormatEtc As *FORMATETC,
    138     /*IN*/ ByVal clientSite As IOleClientSite, /*IN*/ ByVal dataObj As IDataObject, /*OUT*/ ByRef ppvObj As Any) As HRESULT
     137            /*IN*/ ByVal renderopt As DWord, /*IN*/ ByVal pFormatEtc As *FORMATETC,
     138            /*IN*/ ByVal pClientSite As *IOleClientSite, /*IN*/ ByVal pDataObj As *IDataObject, /*OUT*/ ByRef ppvObj As Any) As HRESULT
    139139
    140140Declare Function OleCreateFromFileEx Lib "ole32.dll" (/*IN*/ ByRef rclsid As CLSID, /*IN*/ ByVal lpszFileName As LPOLESTR, /*IN*/ ByRef riid As IID,
    141     /*IN*/ ByVal dwFlags As DWord, /*IN*/ ByVal renderopt As DWord, /*IN*/ ByVal cFormats As DWord, /*IN*/ ByVal rgAdvf As *DWord,
    142     /*IN*/ ByVal rgFormatEtc As *FORMATETC, /*IN*/ ByVal adviseSink As IAdviseSink,
    143     /*OUT*/ ByVal rgdwConnection As *DWord, /*IN*/ ByVal clientSite As IOleClientSite,
    144     /*IN*/ ByVal dataObj As IDataObject, /*OUT*/ ByRef ppvObj As Any) As HRESULT
    145 
    146 Declare Function OleLoad Lib "ole32.dll" (/*IN*/ ByVal stg As IStorage, /*IN*/ ByRef riid As IID, /*IN*/ ByVal clientSite As IOleClientSite,
    147     /*OUT*/ ByRef ppvObj As Any) As HRESULT
    148 
    149 Declare Function OleSave Lib "ole32.dll" (/*IN*/ ByVal ps As IPersistStorage, /*IN*/ ByVal stg As IStorage, /*IN*/ fSameAsLoad As BOOL) As HRESULT
    150 
    151 Declare Function OleLoadFromStream Lib "ole32.dll" ( /*IN*/ ByVal stm As IStream, /*IN*/ ByRef iidInterface As IID, /*OUT*/ ByRef ppvObj As Any) As HRESULT
    152 Declare Function OleSaveToStream Lib "ole32.dll" ( /*IN*/ ByVal pstm As IPersistStream, /*IN*/ ByVal stm As IStream) As HRESULT
    153 
    154 
    155 Declare Function OleSetContainedObject Lib "ole32.dll" (/*IN*/ ByVal unknown As IUnknown, /*IN*/ ByVal fContained As BOOL) As HRESULT
    156 Declare Function OleNoteObjectVisible Lib "ole32.dll" (/*IN*/ ByVal unknown As IUnknown, /*IN*/ ByVal fContained As BOOL) As HRESULT
     141            /*IN*/ ByVal dwFlags As DWord, /*IN*/ ByVal renderopt As DWord, /*IN*/ ByVal cFormats As DWord, /*IN*/ ByVal rgAdvf As *DWord,
     142            /*IN*/ ByVal rgFormatEtc As *FORMATETC, /*IN*/ ByVal pAdviseSink As *IAdviseSink,
     143            /*OUT*/ ByVal rgdwConnection As *DWord, /*IN*/ ByVal pClientSite As *IOleClientSite,
     144            /*IN*/ ByVal pDataObj As *IDataObject, /*OUT*/ ByRef ppvObj As Any) As HRESULT
     145
     146Declare Function OleLoad Lib "ole32.dll" (/*IN*/ ByVal pStg As *IStorage, /*IN*/ ByRef riid As IID, /*IN*/ ByVal pClientSite As *IOleClientSite,
     147            /*OUT*/ ByRef ppvObj As Any) As HRESULT
     148
     149Declare Function OleSave Lib "ole32.dll" (/*IN*/ ByVal pPS As *IPersistStorage, /*IN*/ ByVal pStg As *IStorage, /*IN*/ fSameAsLoad As BOOL) As HRESULT
     150
     151Declare Function OleLoadFromStream Lib "ole32.dll" ( /*IN*/ ByVal pStm As *IStream, /*IN*/ ByRef iidInterface As IID, /*OUT*/ ByRef ppvObj As Any) As HRESULT
     152Declare Function OleSaveToStream Lib "ole32.dll" ( /*IN*/ ByVal pPStm As *IPersistStream, /*IN*/ ByVal pStm As *IStream) As HRESULT
     153
     154
     155Declare Function OleSetContainedObject Lib "ole32.dll" (/*IN*/ ByVal pUnknown As *IUnknown, /*IN*/ ByVal fContained As BOOL) As HRESULT
     156Declare Function OleNoteObjectVisible Lib "ole32.dll" (/*IN*/ ByVal pUnknown As *IUnknown, /*IN*/ ByVal fContained As BOOL) As HRESULT
    157157
    158158
    159159/* Drag/Drop APIs */
    160160
    161 Declare Function RegisterDragDrop Lib "ole32.dll" (/*IN*/ ByVal hwnd As HWND, /*IN*/ ByVal dropTarget As IDropTarget) As HRESULT
     161Declare Function RegisterDragDrop Lib "ole32.dll" (/*IN*/ ByVal hwnd As HWND, /*IN*/ ByVal pDropTarget As *IDropTarget) As HRESULT
    162162Declare Function RevokeDragDrop Lib "ole32.dll" (/*IN*/ ByVal hwnd As HWND) As HRESULT
    163 Declare Function DoDragDrop Lib "ole32.dll" (/*IN*/ ByVal dataObj As IDataObject, /*IN*/ ByVal dropSource As IDropSource,
    164     /*IN*/ ByVal dwOKEffects As DWord, /*OUT*/ ByRef dwEffect As DWord) As HRESULT
     163Declare Function DoDragDrop Lib "ole32.dll" (/*IN*/ ByVal pDataObj As *IDataObject, /*IN*/ ByVal pDropSource As *IDropSource,
     164            /*IN*/ ByVal dwOKEffects As DWord, /*OUT*/ ByRef dwEffect As DWord) As HRESULT
    165165
    166166/* Clipboard APIs */
    167167
    168 Declare Function OleSetClipboard Lib "ole32.dll" (/*IN*/ ByVal dataObj As IDataObject) As HRESULT
    169 Declare Function OleGetClipboard Lib "ole32.dll" (/*OUT*/ ByRef dataObj As IDataObject) As HRESULT
     168Declare Function OleSetClipboard Lib "ole32.dll" (/*IN*/ ByVal pDataObj As *IDataObject) As HRESULT
     169Declare Function OleGetClipboard Lib "ole32.dll" (/*OUT*/ ByRef pDataObj As *IDataObject) As HRESULT
    170170Declare Function OleFlushClipboard Lib "ole32.dll" () As HRESULT
    171 Declare Function OleIsCurrentClipboard Lib "ole32.dll" (/*IN*/ ByVal dataObj As IDataObject) As HRESULT
     171Declare Function OleIsCurrentClipboard Lib "ole32.dll" (/*IN*/ ByVal pDataObj As *IDataObject) As HRESULT
    172172
    173173
    … …  
    186186End Type
    187187Declare Function OleCreateMenuDescriptor Lib "ole32.dll" (/*IN*/ ByVal hmenuCombined As HMENU,
    188     /*IN*/ ByRef MenuWidths As OLEMENUGROUPWIDTHS) As HOLEMENU
     188                                /*IN*/ ByRef MenuWidths As OLEMENUGROUPWIDTHS) As HOLEMENU
    189189Declare Function OleSetMenuDescriptor Lib "ole32.dll" (/*IN*/ ByVal holemenu As HOLEMENU, /*IN*/ ByVal hwndFrame As HWND,
    190     /*IN*/ ByVal hwndActiveObject As HWND,
    191     /*IN*/ ByVal frame As IOleInPlaceFrame,
    192     /*IN*/ ByVal activeObj As IOleInPlaceActiveObject) As HRESULT
     190                                /*IN*/ ByVal hwndActiveObject As HWND,
     191                                /*IN*/ ByVal pFrame As *IOleInPlaceFrame,
     192                                /*IN*/ ByVal pActiveObj As *IOleInPlaceActiveObject) As HRESULT
    193193Declare Function OleDestroyMenuDescriptor Lib "ole32.dll" (/*IN*/ ByVal holemenu As HOLEMENU) As HRESULT
    194194
    195 Declare Function OleTranslateAccelerator Lib "ole32.dll" (/*IN*/ ByVal frame As IOleInPlaceFrame,
    196     /*IN*/ ByRef FrameInfo As OLEINPLACEFRAMEINFO, /*IN*/ ByRef msg As MSG) As HRESULT
     195Declare Function OleTranslateAccelerator Lib "ole32.dll" (/*IN*/ ByVal pFrame As *IOleInPlaceFrame,
     196                            /*IN*/ ByRef FrameInfo As OLEINPLACEFRAMEINFO, /*IN*/ ByRef msg As MSG) As HRESULT
    197197
    198198
    199199/* Helper APIs */
    200200Declare Function OleDuplicateData Lib "ole32.dll" (/*IN*/ ByVal hSrc As HANDLE, /*IN*/ ByVal cfFormat As CLIPFORMAT,
    201     /*IN*/ ByVal uiFlags As DWord) As HANDLE
    202 
    203 Declare Function OleDraw Lib "ole32.dll" (/*IN*/ ByVal unknown As IUnknown, /*IN*/ ByVal dwAspect As DWord, /*IN*/ ByVal hdcDraw As HDC,
    204     /*IN*/ ByRef rcBounds As RECT) As HRESULT
    205 
    206 Declare Function OleRun Lib "ole32.dll" (/*IN*/ ByVal unknown As IUnknown) As HRESULT
    207 Declare Function OleIsRunning Lib "ole32.dll" (/*IN*/ ByVal object As IOleObject) As BOOL
    208 Declare Function OleLockRunning Lib "ole32.dll" (/*IN*/ ByVal unknown As IUnknown, /*IN*/ ByVal fLock As BOOL, /*IN*/ ByVal fLastUnlockCloses As BOOL) As HRESULT
     201                        /*IN*/ ByVal uiFlags As DWord) As HANDLE
     202
     203Declare Function OleDraw Lib "ole32.dll" (/*IN*/ ByVal pUnknown As *IUnknown, /*IN*/ ByVal dwAspect As DWord, /*IN*/ ByVal hdcDraw As HDC,
     204                    /*IN*/ ByRef rcBounds As RECT) As HRESULT
     205
     206Declare Function OleRun Lib "ole32.dll" (/*IN*/ ByVal pUnknown As *IUnknown) As HRESULT
     207Declare Function OleIsRunning Lib "ole32.dll" (/*IN*/ ByVal pObject As *IOleObject) As BOOL
     208Declare Function OleLockRunning Lib "ole32.dll" (/*IN*/ ByVal pUnknown As *IUnknown, /*IN*/ ByVal fLock As BOOL, /*IN*/ ByVal fLastUnlockCloses As BOOL) As HRESULT
    209209Declare Sub      ReleaseStgMedium Lib "ole32.dll" (/*IN*/ ByRef medium As STGMEDIUM)
    210 Declare Function CreateOleAdviseHolder Lib "ole32.dll" (/*OUT*/ ByRef oaHolder As IOleAdviseHolder) As HRESULT
    211 
    212 Declare Function OleCreateDefaultHandler Lib "ole32.dll" (/*IN*/ ByRef clsid As CLSID, /*IN*/ ByVal unkOuter As IUnknown,
    213     /*IN*/ ByRef riid As IID, /*OUT*/ ByRef pObj As Any) As HRESULT
    214 
    215 Declare Function OleCreateEmbeddingHelper Lib "ole32.dll" (/*IN*/ ByRef clsid As CLSID, /*IN*/ ByVal ukOuter As IUnknown,
    216     /*IN*/ ByVal flags As DWord, /*IN*/ ByVal cf As IClassFactory,
    217     /*IN*/ ByRef riid As IID, /*OUT*/ ByRef pObj As Any) As HRESULT
     210Declare Function CreateOleAdviseHolder Lib "ole32.dll" (/*OUT*/ ByRef pOAHolder As *IOleAdviseHolder) As HRESULT
     211
     212Declare Function OleCreateDefaultHandler Lib "ole32.dll" (/*IN*/ ByRef clsid As CLSID, /*IN*/ ByVal pUnkOuter As *IUnknown,
     213                    /*IN*/ ByRef riid As IID, /*OUT*/ ByRef pObj As Any) As HRESULT
     214
     215Declare Function OleCreateEmbeddingHelper Lib "ole32.dll" (/*IN*/ ByRef clsid As CLSID, /*IN*/ ByVal pUnkOuter As *IUnknown,
     216                    /*IN*/ ByVal flags As DWord, /*IN*/ ByVal pCF As *IClassFactory,
     217                    /*IN*/ ByRef riid As IID, /*OUT*/ ByRef pObj As Any) As HRESULT
    218218
    219219Declare Function IsAccelerator Lib "ole32.dll" (/*IN*/ ByVal hAccel As HACCEL, /*IN*/ ByVal cAccelEntries As Long, /*IN*/ ByRef msg As MSG,
    220     /*OUT*/ ByVal pwCmd As *Word) As BOOL
     220                                        /*OUT*/ ByVal pwCmd As *Word) As BOOL
    221221/* Icon extraction Helper APIs */
    222222
    … …  
    224224
    225225Declare Function OleGetIconOfClass Lib "ole32.dll" (/*IN*/ ByRef rclsid As CLSID, /*IN*/ ByVal lpszLabel As LPOLESTR,
    226     /*IN*/ ByVal fUseTypeAsLabel As BOOL) As HGLOBAL
     226                                        /*IN*/ ByVal fUseTypeAsLabel As BOOL) As HGLOBAL
    227227
    228228Declare Function OleMetafilePictFromIconAndLabel Lib "ole32.dll" (/*IN*/ ByVal hIcon As HICON, /*IN*/ ByVal lpszLabel As LPOLESTR,
    229     /*IN*/ ByVal lpszSourceFile As LPOLESTR, /*IN*/ ByVal iIconIndex As DWord) As HGLOBAL
     229                                        /*IN*/ ByVal lpszSourceFile As LPOLESTR, /*IN*/ ByVal iIconIndex As DWord) As HGLOBAL
    230230
    231231
    … …  
    234234
    235235Declare Function OleRegGetUserType Lib "ole32.dll" (/*IN*/ ByRef rclsid As CLSID, /*IN*/ ByVal dwFormOfType As DWord,
    236     /*OUT*/ ByVal pszUserType As LPOLESTR) As HRESULT
     236                                        /*OUT*/ ByVal pszUserType As LPOLESTR) As HRESULT
    237237
    238238Declare Function OleRegGetMiscStatus Lib "ole32.dll" (/*IN*/ ByRef rclsid As CLSID, /*IN*/ ByVal dwAspect As DWord,
    239     /*OUT*/ ByRef dwStatus As DWord) As HRESULT
     239                                        /*OUT*/ ByRef dwStatus As DWord) As HRESULT
    240240
    241241Declare Function OleRegEnumFormatEtc Lib "ole32.dll" (/*IN*/ ByRef rclsid As CLSID, /*IN*/ ByVal dwDirection As DWord,
    242     /*OUT*/ ByRef penum As *IEnumFORMATETC) As HRESULT
     242                                        /*OUT*/ ByRef penum As *IEnumFORMATETC) As HRESULT
    243243
    244244Declare Function OleRegEnumVerbs Lib "ole32.dll" (/*IN*/ ByRef rclsid As CLSID, /*OUT*/ ByRef penum As *IEnumOLEVERB) As HRESULT
    … …  
    256256
    257257
    258 Declare Function OleConvertOLESTREAMToIStorage Lib "ole32.dll" (
    259     /*IN*/ ByVal lpolestream As LPOLESTREAM,
    260     /*OUT*/ ByVal stg As IStorage,
    261     /*IN*/ ByRef td As DVTARGETDEVICE) As HRESULT
    262 
    263 Declare Function OleConvertIStorageToOLESTREAM Lib "ole32.dll" (
    264     /*IN*/ ByVal stg As IStorage,
    265     /*OUT*/ ByVal lpolestream As LPOLESTREAM) As HRESULT
     258Declare Function OleConvertOLESTREAMToIStorage Lib "ole32.dll" ( _
     259    /*IN*/ ByVal lpolestream As LPOLESTREAM,
     260    /*OUT*/ ByVal pstg As *IStorage,
     261    /*IN*/ ByRef td As DVTARGETDEVICE) As HRESULT
     262
     263Declare Function OleConvertIStorageToOLESTREAM Lib "ole32.dll" ( _
     264    /*IN*/ ByVal pstg As *IStorage,
     265    /*OUT*/ ByVal lpolestream As LPOLESTREAM) As HRESULT
    266266
    267267
    … …  
    269269Declare Function GetHGlobalFromILockBytes Lib "ole32.dll" (/*IN*/ ByVal plkbyt As *ILockBytes, /*OUT*/ ByRef hglobal As HGLOBAL) As HRESULT
    270270Declare Function CreateILockBytesOnHGlobal Lib "ole32.dll" (/*IN*/ ByVal hGlobal As HGLOBAL, /*IN*/ ByVal fDeleteOnRelease As BOOL,
    271     /*OUT*/ ByRef lkbyt As ILockBytes) As HRESULT
     271                                    /*OUT*/ ByRef pplkbyt As *ILockBytes) As HRESULT
    272272
    273273Declare Function GetHGlobalFromStream Lib "ole32.dll" (/*IN*/ ByVal pstm As *IStream, /*OUT*/ ByRef hglobal As HGLOBAL) As HRESULT
    274274Declare Function CreateStreamOnHGlobal Lib "ole32.dll" (/*IN*/ ByVal hGlobal As HGLOBAL, /*IN*/ ByVal fDeleteOnRelease As BOOL,
    275     /*OUT*/ ByRef stm As IStream) As HRESULT
     275                                /*OUT*/ ByRef pstm As *IStream) As HRESULT
    276276
    277277
    278278/* ConvertTo APIS */
    279279
    280 Declare Function OleDoAutoConvert Lib "ole32.dll" (/*IN*/ ByRef stg As IStorage, /*OUT*/ ByRef ClsidNew As CLSID) As HRESULT
     280Declare Function OleDoAutoConvert Lib "ole32.dll" (/*IN*/ ByRef pStg As *IStorage, /*OUT*/ ByRef ClsidNew As CLSID) As HRESULT
    281281Declare Function OleGetAutoConvert Lib "ole32.dll" (/*IN*/ ByRef clsidOld As CLSID, /*OUT*/ ByRef ClsidNew As CLSID) As HRESULT
    282282Declare Function OleSetAutoConvert Lib "ole32.dll" (/*IN*/ ByRef clsidOld As CLSID, /*IN*/ ByRef ClsidNew As CLSID) As HRESULT
    283 Declare Function GetConvertStg Lib "ole32.dll" (/*IN*/ ByVal stg As IStorage) As HRESULT
    284 Declare Function SetConvertStg Lib "ole32.dll" (/*IN*/ ByVal stg As IStorage, /*IN*/ fConvert As BOOL) As HRESULT
     283Declare Function GetConvertStg Lib "ole32.dll" (/*IN*/ ByVal pStg As *IStorage) As HRESULT
     284Declare Function SetConvertStg Lib "ole32.dll" (/*IN*/ ByVal pStg As *IStorage, /*IN*/ fConvert As BOOL) As HRESULT
    285285
    286286
    287287Declare Function OleConvertIStorageToOLESTREAMEx Lib "ole32.dll" ( _
    288     /*IN*/ ByVal stg As IStorage,       ' Presentation data to OLESTREAM
    289     /*IN*/ ByVal cfFormat As CLIPFORMAT,  '       format
    290     /*IN*/ ByVal lWidth As Long,          '       width
    291     /*IN*/ ByVal lHeight As Long,         '       height
    292     /*IN*/ ByVal dwSize As DWORD,         '       size in bytes
    293     /*IN*/ ByRef medium As STGMEDIUM,     '       bits
    294     /*OUT*/ ByVal polestm As LPOLESTREAM) As HRESULT
     288    /*IN*/ ByVal pstg As *IStorage,       ' Presentation data to OLESTREAM
     289    /*IN*/ ByVal cfFormat As CLIPFORMAT,  '       format
     290    /*IN*/ ByVal lWidth As Long,          '       width
     291    /*IN*/ ByVal lHeight As Long,         '       height
     292    /*IN*/ ByVal dwSize As DWORD,         '       size in bytes
     293    /*IN*/ ByRef medium As STGMEDIUM,     '       bits
     294    /*OUT*/ ByVal polestm As LPOLESTREAM) As HRESULT
    295295
    296296Declare Function OleConvertOLESTREAMToIStorageEx Lib "ole32.dll" ( _
    297     /*IN*/ ByVal polestm As LPOLESTREAM,
    298     /*OUT*/ ByVal pstg As *IStorage,' Presentation data from OLESTREAM
    299     /*OUT*/ ByRef pcfFormat As CLIPFORMAT, '       format
    300     /*OUT*/ ByRef plwWidth As Long,        '       width
    301     /*OUT*/ ByRef plHeight As Long,        '       height
    302     /*OUT*/ ByRef pdwSize As DWord,        '       size in bytes
    303     /*OUT*/ ByRef medium As STGMEDIUM) As HRESULT   '      bits
     297    /*IN*/ ByVal polestm As LPOLESTREAM,
     298    /*OUT*/ ByVal pstg As *IStorage,' Presentation data from OLESTREAM
     299    /*OUT*/ ByRef pcfFormat As CLIPFORMAT, '       format
     300    /*OUT*/ ByRef plwWidth As Long,        '       width
     301    /*OUT*/ ByRef plHeight As Long,        '       height
     302    /*OUT*/ ByRef pdwSize As DWord,        '       size in bytes
     303    /*OUT*/ ByRef medium As STGMEDIUM) As HRESULT   '      bits
    304304
    305305' olectl.h
    306 Declare Function OleLoadPicture Lib "olepro32" (stream As IStream, lSize As Long, fRunmode As BOOL, ByRef riid As IID, ppvObj As VoidPtr) As HRESULT
    307 #endif '__UNDEFINED
     306Declare Function OleLoadPicture Lib "olepro32" (pStream As *IStream, lSize As Long, fRunmode As BOOL, ByRef riid As IID, ppvObj As VoidPtr) As HRESULT
Note: See TracChangeset for help on using the changeset viewer.