Changeset 5598 for trunk/include


Ignore:
Timestamp:
Apr 26, 2001, 9:23:49 PM (24 years ago)
Author:
sandervl
Message:

header updates

Location:
trunk/include/win
Files:
1 added
1 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/win/ole.h

    r4834 r5598  
    1 /* $Id: ole.h,v 1.5 2000-12-24 12:28:19 sandervl Exp $ */
     1/* $Id: ole.h,v 1.6 2001-04-26 19:23:31 sandervl Exp $ */
    22/*
    33 *      ole.h   -       Declarations for OLESVR and OLECLI
    … …  
    286286/* com functions */
    287287void WINAPI CoFreeUnusedLibraries(void);
    288 HINSTANCE WINAPI CoLoadLibrary(LPSTR lpszLibName, BOOL bAutoFree);
     288HINSTANCE WINAPI CoLoadLibrary(LPOLESTR lpszLibName, BOOL bAutoFree);
    289289void WINAPI CoFreeUnusedLibraries(void);
    290290void WINAPI CoFreeAllLibraries(void);

  • trunk/include/win/ole2.h

    r818 r5598  
    1818#include "oleauto.h"
    1919#endif
    20 struct tagMSG;
    2120
    2221#ifdef __cplusplus
    … …  
    9291HRESULT     WINAPI OleFlushClipboard(void);
    9392HRESULT     WINAPI SetConvertStg(LPSTORAGE pStg, BOOL fConvert);
    94 BOOL        WINAPI IsAccelerator(HACCEL hAccel, int cAccelEntries, struct tagMSG* lpMsg, WORD* lpwCmd);
     93BOOL        WINAPI IsAccelerator(HACCEL hAccel, int cAccelEntries, LPMSG lpMsg, WORD* lpwCmd);
    9594HRESULT     WINAPI OleCreateLinkToFile(LPCOLESTR lpszFileName, REFIID riid, DWORD renderopt, LPFORMATETC lpFormatEtc,
    9695                LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj);
    9796HRESULT     WINAPI OleDuplicateData(HANDLE hSrc, CLIPFORMAT cfFormat, UINT uiFlags);
    9897HRESULT     WINAPI WriteFmtUserTypeStg(LPSTORAGE pstg, CLIPFORMAT cf, LPOLESTR lpszUserType);
    99 HRESULT     WINAPI OleTranslateAccelerator (LPOLEINPLACEFRAME lpFrame, LPOLEINPLACEFRAMEINFO lpFrameInfo, struct tagMSG* lpmsg);
     98HRESULT     WINAPI OleTranslateAccelerator (LPOLEINPLACEFRAME lpFrame, LPOLEINPLACEFRAMEINFO lpFrameInfo, LPMSG lpmsg);
    10099HRESULT     WINAPI OleCreateFromData(LPDATAOBJECT pSrcDataObj, REFIID riid, DWORD renderopt, LPFORMATETC pFormatEtc,
    101100                LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj);

  • trunk/include/win/rpc.h

    r4491 r5598  
    1919#endif
    2020
    21 typedef void * I_RPC_HANDLE;
    22 typedef long RPC_STATUS;
    23 
    2421#define RPC_UNICODE_SUPPORTED
    2522#define __RPC_FAR
    26 #define __RPC_API  __stdcall
    27 #define __RPC_USER __stdcall
    28 #define __RPC_STUB __stdcall
     23#define __RPC_API 
     24#define __RPC_USER
     25#define __RPC_STUB
    2926#define RPC_ENTRY  __stdcall
    3027
    31 
    32 RPC_STATUS RPC_ENTRY RpcImpersonateClient(RPC_BINDING_HANDLE BindingHandle);
    33 RPC_STATUS RPC_ENTRY RpcRevertToSelfEx(RPC_BINDING_HANDLE BindingHandle);
    34 RPC_STATUS RPC_ENTRY RpcRevertToSelf();
    35 long       RPC_ENTRY I_RpcMapWin32Status(RPC_STATUS Status);
     28#include "rpcdce.h"
    3629
    3730#ifdef __cplusplus

  • trunk/include/win/rpcdce.h

    r3311 r5598  
    1111#define OPTIONAL
    1212
    13 #       define __RPC_FAR
    14 #       define __RPC_API
    15 #       define __RPC_USER
    16 #       define __RPC_STUB
    17 #       define  RPC_ENTRY       WIN32API
    18 
    1913#define DECLSPEC_IMPORT extern
    2014#define RPCRTAPI DECLSPEC_IMPORT
    2115#define RPCNSAPI DECLSPEC_IMPORT
    2216
    23 
     17#include <rpc.h>
    2418
    2519/*typedef char small;*/
    … …  
    11851179#endif /* RPC_UNICODE_SUPPORTED */
    11861180
     1181#ifndef __WINE_WTYPES_H
    11871182typedef void __RPC_FAR * RPC_AUTH_IDENTITY_HANDLE;
    11881183typedef void __RPC_FAR * RPC_AUTHZ_HANDLE;
     1184#endif
    11891185
    11901186#define RPC_C_AUTHN_LEVEL_DEFAULT       0
    … …  
    19661962#define RPC_X_INVALID_PIPE_OPERATION      RPC_X_WRONG_PIPE_ORDER
    19671963
     1964RPC_STATUS RPC_ENTRY RpcImpersonateClient(RPC_BINDING_HANDLE BindingHandle);
     1965RPC_STATUS RPC_ENTRY RpcRevertToSelfEx(RPC_BINDING_HANDLE BindingHandle);
     1966RPC_STATUS RPC_ENTRY RpcRevertToSelf();
     1967long       RPC_ENTRY I_RpcMapWin32Status(RPC_STATUS Status);
     1968
    19681969#ifdef __cplusplus
    19691970}

  • trunk/include/win/winbase.h

    r5590 r5598  
    10351035} LDT_ENTRY, *LPLDT_ENTRY;
    10361036
    1037 /* for WOWHandle{16,32} */
    1038 typedef enum _WOW_HANDLE_TYPE { /* WOW */
    1039     WOW_TYPE_HWND,
    1040     WOW_TYPE_HMENU,
    1041     WOW_TYPE_HDWP,
    1042     WOW_TYPE_HDROP,
    1043     WOW_TYPE_HDC,
    1044     WOW_TYPE_HFONT,
    1045     WOW_TYPE_HMETAFILE,
    1046     WOW_TYPE_HRGN,
    1047     WOW_TYPE_HBITMAP,
    1048     WOW_TYPE_HBRUSH,
    1049     WOW_TYPE_HPALETTE,
    1050     WOW_TYPE_HPEN,
    1051     WOW_TYPE_HACCEL,
    1052     WOW_TYPE_HTASK,
    1053     WOW_TYPE_FULLHWND
    1054 } WOW_HANDLE_TYPE;
    1055 
    1056 /* WOWCallback16Ex defines */
    1057 #define WCB16_MAX_CBARGS        16
    1058 /* ... dwFlags */
    1059 #define WCB16_PASCAL            0x0
    1060 #define WCB16_CDECL             0x1
    10611037
    10621038typedef enum _GET_FILEEX_INFO_LEVELS {
    … …  
    15991575BOOL      WINAPI GetSystemPowerStatus(LPSYSTEM_POWER_STATUS);
    16001576VOID        WINAPI GetSystemTime(LPSYSTEMTIME);
     1577VOID        WINAPI GetSystemTimeAsFileTime(LPFILETIME);
     1578DWORD       WINAPI GetTapeParameters(HANDLE,DWORD,LPDWORD,LPVOID);
     1579DWORD       WINAPI GetTapePosition(HANDLE,DWORD,LPDWORD,LPDWORD,LPDWORD);
     1580DWORD       WINAPI GetTapeStatus(HANDLE);
    16011581INT       WINAPI GetTimeFormatA(LCID,DWORD,CONST SYSTEMTIME *,LPCSTR,LPSTR,INT);
    16021582INT       WINAPI GetTimeFormatW(LCID,DWORD,CONST SYSTEMTIME *,LPCWSTR,LPWSTR,INT);
    … …  
    17781758DWORD       WINAPI WaitForSingleObject(HANDLE,DWORD);
    17791759DWORD       WINAPI WaitForSingleObjectEx(HANDLE,DWORD,BOOL);
    1780 SEGPTR      WINAPI WOWGlobalAllocLock16(DWORD,DWORD,HGLOBAL16*);
    1781 DWORD       WINAPI WOWCallback16(FARPROC16,DWORD);
    1782 BOOL      WINAPI WOWCallback16Ex(FARPROC16,DWORD,DWORD,LPVOID,LPDWORD);
    1783 HANDLE    WINAPI WOWHandle32(WORD,WOW_HANDLE_TYPE);
    17841760BOOL      WINAPI WriteConsoleA(HANDLE,LPCVOID,DWORD,LPDWORD,LPVOID);
    17851761BOOL      WINAPI WriteConsoleW(HANDLE,LPCVOID,DWORD,LPDWORD,LPVOID);

  • trunk/include/win/wine/obj_base.h

    r3450 r5598  
    1 /* $Id: obj_base.h,v 1.17 2000-04-27 11:09:38 achimha Exp $ */
     1/* $Id: obj_base.h,v 1.18 2001-04-26 19:23:33 sandervl Exp $ */
    22/*
    33 * This file defines the macros and types necessary to define COM interfaces,
    … …  
    841841HRESULT WINAPI CoCreateInstance(REFCLSID rclsid, LPUNKNOWN pUnkOuter, DWORD dwClsContext, REFIID iid, LPVOID *ppv);
    842842
    843 HRESULT WINAPI CoGetClassObject(REFCLSID rclsid, DWORD dwClsContext, LPVOID pvReserved, REFIID iid, LPVOID *ppv);
     843HRESULT WINAPI CoGetClassObject(REFCLSID rclsid, DWORD dwClsContext, COSERVERINFO *pServerInfo, REFIID iid, LPVOID *ppv);
    844844
    845845HRESULT WINAPI CoInitialize16(LPVOID lpReserved);
    … …  
    862862BOOL WINAPI CoIsOle1Class(REFCLSID rclsid);
    863863
    864 HINSTANCE WINAPI CoLoadLibrary(LPOLESTR16 lpszLibName, BOOL bAutoFree);
     864HINSTANCE WINAPI CoLoadLibrary(LPOLESTR lpszLibName, BOOL bAutoFree);
    865865
    866866HRESULT WINAPI CoLockObjectExternal16(LPUNKNOWN pUnk, BOOL16 fLock, BOOL16 fLastUnlockReleases);

  • trunk/include/win/winerror.h

    r4124 r5598  
    1 /* $Id: winerror.h,v 1.9 2000-08-30 13:56:38 sandervl Exp $ */
     1/* $Id: winerror.h,v 1.10 2001-04-26 19:23:33 sandervl Exp $ */
    22#ifndef __WINE_WINERROR_H
    33#define __WINE_WINERROR_H
    … …  
    817817
    818818/* registry errors */
    819 #define REGDB_E_READREGDB               0x80040150
    820 #define REGDB_E_CLASSNOTREG             0x80040154
     819#define REGDB_S_FIRST                                      0x00040150L
     820#define REGDB_S_LAST                                       0x0004015FL
     821
     822#define REGDB_E_FIRST                                      0x80040150L
     823#define REGDB_E_READREGDB                                  0x80040150L
     824#define REGDB_E_WRITEREGDB                                 0x80040151L
     825#define REGDB_E_KEYMISSING                                 0x80040152L
     826#define REGDB_E_INVALIDVALUE                               0x80040153L
     827#define REGDB_E_CLASSNOTREG                                0x80040154L
     828#define REGDB_E_IIDNOTREG                                  0x80040155L
     829#define REGDB_E_LAST                                       0x8004015FL
    821830
    822831#define INPLACE_E_NOTUNDOABLE           0x800401A0
Note: See TracChangeset for help on using the changeset viewer.