Changeset 22080 for branches/swt/include


Ignore:
Timestamp:
Aug 22, 2014, 6:24:49 PM (11 years ago)
Author:
rousseau
Message:

Added missing structures and callback types

structures:
o ACTCTX
o BUTTON_IMAGELIST (from ReactOS)
o CERT_CONTEXT
o CERT_INFO
o CERT_NAME_BLOB
o CERT_PUBLIC_KEY_INFO
o CRYPT_ALGORITHM_IDENTIFIER
o CRYPT_ALGORITHM_IDENTIFIER
o CRYPT_BIT_BLOB
o CRYPT_INTEGER_BLOB
o CRYPT_OBJID_BLOB
o LITEM
o LVINSERTMARK
o MENUBARINFO
o NMLINK
o LPOSVERSIONINFOA
o LPOSVERSIONINFOW

callbacks:
o LANGUAGEGROUP_ENUMPROCA
o LANGUAGEGROUP_ENUMPROCW

Location:
branches/swt/include/win
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/swt/include/win/commctrl.h

    r21389 r22080  
    469469struct _IMAGELIST;
    470470typedef struct _IMAGELIST *HIMAGELIST;
     471
     472///-------------------------------------------------------------------[swt-os2]
     473/// From ReactOS::include/psdk/commctrl.h
     474typedef struct {
     475    HIMAGELIST himl;
     476    RECT margin;
     477    UINT uAlign;
     478} BUTTON_IMAGELIST,*PBUTTON_IMAGELIST;
     479///----------------------------------------------------------------------------
     480
     481///-------------------------------------------------------------------[swt-os2]
     482typedef struct LVINSERTMARK
     483{
     484        UINT cbSize;
     485        DWORD dwFlags;
     486        int iItem;
     487        DWORD dwReserved;
     488} LVINSERTMARK, *PLVINSERTMARK;
     489
     490/* SysLink misc. */
     491
     492#define INVALID_LINK_INDEX  (-1)
     493#define MAX_LINKID_TEXT     48
     494#define L_MAX_URL_LENGTH    2084
     495
     496/* SysLink structures */
     497
     498typedef struct tagLITEM
     499{
     500  UINT mask;
     501  int iLink;
     502  UINT state;
     503  UINT stateMask;
     504  WCHAR szID[MAX_LINKID_TEXT];
     505  WCHAR szUrl[L_MAX_URL_LENGTH];
     506} LITEM, *PLITEM;
     507
     508typedef struct tagNMLINK
     509{
     510  NMHDR hdr;
     511  LITEM item;
     512} NMLINK, *PNMLINK;
     513///----------------------------------------------------------------------------
    471514
    472515#define CLR_NONE         0xFFFFFFFF

  • branches/swt/include/win/winbase.h

    r22024 r22080  
    1010extern "C" {
    1111#endif
     12
     13///-------------------------------------------------------------------[swt-os2]
     14typedef struct tagACTCTXA {
     15    ULONG   cbSize;
     16    DWORD   dwFlags;
     17    LPCSTR  lpSource;
     18    USHORT  wProcessorArchitecture;
     19    LANGID  wLangId;
     20    LPCSTR  lpAssemblyDirectory;
     21    LPCSTR  lpResourceName;
     22    LPCSTR  lpApplicationName;
     23    HMODULE hModule;
     24} ACTCTXA, *PACTCTXA;
     25
     26typedef struct tagACTCTXW {
     27    ULONG   cbSize;
     28    DWORD   dwFlags;
     29    LPCWSTR lpSource;
     30    USHORT  wProcessorArchitecture;
     31    LANGID  wLangId;
     32    LPCWSTR lpAssemblyDirectory;
     33    LPCWSTR lpResourceName;
     34    LPCWSTR lpApplicationName;
     35    HMODULE hModule;
     36} ACTCTXW, *PACTCTXW;
     37
     38DECL_WINELIB_TYPE_AW(ACTCTX)
     39DECL_WINELIB_TYPE_AW(PACTCTX)
     40
     41typedef const ACTCTXA *PCACTCTXA;
     42typedef const ACTCTXW *PCACTCTXW;
     43DECL_WINELIB_TYPE_AW(PCACTCTX)
     44///----------------------------------------------------------------------------
    1245
    1346typedef struct tagCOORD {
    … …  
    12381271        DWORD dwPlatformId;
    12391272        CHAR szCSDVersion[128];
    1240 } OSVERSIONINFOA;
     1273//~ } OSVERSIONINFOA;
     1274///-------------------------------------------------------------------[swt-os2]
     1275/// From Wine::include/winnt.h
     1276} OSVERSIONINFOA, *POSVERSIONINFOA, *LPOSVERSIONINFOA;
     1277///----------------------------------------------------------------------------
    12411278
    12421279typedef struct {
    … …  
    12471284        DWORD dwPlatformId;
    12481285        WCHAR szCSDVersion[128];
    1249 } OSVERSIONINFOW;
     1286//~ } OSVERSIONINFOW;
     1287///-------------------------------------------------------------------[swt-os2]
     1288/// From Wine::include/winnt.h
     1289} OSVERSIONINFOW, *POSVERSIONINFOW, *LPOSVERSIONINFOW, RTL_OSVERSIONINFOW, *PRTL_OSVERSIONINFOW;
     1290///----------------------------------------------------------------------------
    12501291
    12511292DECL_WINELIB_TYPE_AW(OSVERSIONINFO)
     1293///-------------------------------------------------------------------[swt-os2]
     1294/// From Wine::include/winnt.h
     1295DECL_WINELIB_TYPE_AW(POSVERSIONINFO)
     1296DECL_WINELIB_TYPE_AW(LPOSVERSIONINFO)
     1297///----------------------------------------------------------------------------
    12521298
    12531299typedef struct _OSVERSIONINFOEXA {

  • branches/swt/include/win/windows.h

    r21493 r22080  
    3636#include <imm.h>
    3737
     38///-------------------------------------------------------------------[swt-os2]
     39#include <wincrypt.h>
     40///----------------------------------------------------------------------------
     41
    3842#ifdef __cplusplus
    3943}

  • branches/swt/include/win/winnls.h

    r21975 r22080  
    437437typedef DWORD CALTYPE;
    438438typedef DWORD CALID;
     439///-------------------------------------------------------------------[swt-os2]
     440typedef DWORD LCTYPE;
     441typedef DWORD LGRPID;
     442///----------------------------------------------------------------------------
    439443
    440444#if !(defined(OS2_INCLUDED) && !defined(OS2_WRAP_INCLUDED))
    … …  
    453457typedef BOOL    (* CALLBACK DATEFMT_ENUMPROCEXA)(LPSTR,CALID);
    454458typedef BOOL    (* CALLBACK DATEFMT_ENUMPROCEXW)(LPWSTR,CALID);
     459///-------------------------------------------------------------------[swt-os2]
     460/// Changed from (CALLBACK *... to (* CALLBACK ...
     461typedef BOOL    (* CALLBACK LANGGROUPLOCALE_ENUMPROCA)(LGRPID,LCID,LPSTR,LONG_PTR);
     462typedef BOOL    (* CALLBACK LANGGROUPLOCALE_ENUMPROCW)(LGRPID,LCID,LPWSTR,LONG_PTR);
     463typedef BOOL    (* CALLBACK LANGUAGEGROUP_ENUMPROCA)(LGRPID,LPSTR,LPSTR,DWORD,LONG_PTR);
     464typedef BOOL    (* CALLBACK LANGUAGEGROUP_ENUMPROCW)(LGRPID,LPWSTR,LPWSTR,DWORD,LONG_PTR);
     465///----------------------------------------------------------------------------
    455466typedef BOOL    (* CALLBACK LOCALE_ENUMPROCA)(LPSTR);
    456467typedef BOOL    (* CALLBACK LOCALE_ENUMPROCW)(LPWSTR);
    457468typedef BOOL    (* CALLBACK TIMEFMT_ENUMPROCA)(LPSTR);
    458469typedef BOOL    (* CALLBACK TIMEFMT_ENUMPROCW)(LPWSTR);
     470///-------------------------------------------------------------------[swt-os2]
     471/// Changed from (CALLBACK *... to (* CALLBACK ...
     472typedef BOOL    (* CALLBACK UILANGUAGE_ENUMPROCA)(LPSTR,LONG_PTR);
     473typedef BOOL    (* CALLBACK UILANGUAGE_ENUMPROCW)(LPWSTR,LONG_PTR);
     474///----------------------------------------------------------------------------
    459475#else
    460476typedef FARPROC CALINFO_ENUMPROCA;
    … …  
    468484typedef FARPROC DATEFMT_ENUMPROCEXA;
    469485typedef FARPROC DATEFMT_ENUMPROCEXW;
     486///-------------------------------------------------------------------[swt-os2]
     487typedef FARPROC LANGGROUPLOCALE_ENUMPROCA;
     488typedef FARPROC LANGGROUPLOCALE_ENUMPROCW;
     489typedef FARPROC LANGUAGEGROUP_ENUMPROCA;
     490typedef FARPROC LANGUAGEGROUP_ENUMPROCW;
     491///----------------------------------------------------------------------------
    470492typedef FARPROC LOCALE_ENUMPROCA;
    471493typedef FARPROC LOCALE_ENUMPROCW;
    472494typedef FARPROC TIMEFMT_ENUMPROCA;
    473495typedef FARPROC TIMEFMT_ENUMPROCW;
     496///-------------------------------------------------------------------[swt-os2]
     497typedef FARPROC UILANGUAGE_ENUMPROCA;
     498typedef FARPROC UILANGUAGE_ENUMPROCW;
     499///----------------------------------------------------------------------------
    474500#endif /* STRICT || __WINE__ */
    475501
    … …  
    479505DECL_WINELIB_TYPE_AW(DATEFMT_ENUMPROC)
    480506DECL_WINELIB_TYPE_AW(DATEFMT_ENUMPROCEX)
     507///-------------------------------------------------------------------[swt-os2]
     508DECL_WINELIB_TYPE_AW(LANGGROUPLOCALE_ENUMPROC)
     509DECL_WINELIB_TYPE_AW(LANGUAGEGROUP_ENUMPROC)
     510///----------------------------------------------------------------------------
    481511DECL_WINELIB_TYPE_AW(LOCALE_ENUMPROC)
    482512DECL_WINELIB_TYPE_AW(TIMEFMT_ENUMPROC)
    483 
     513///-------------------------------------------------------------------[swt-os2]
     514DECL_WINELIB_TYPE_AW(UILANGUAGE_ENUMPROC)
     515///----------------------------------------------------------------------------
    484516
    485517typedef struct

  • branches/swt/include/win/winuser.h

    r21949 r22080  
    2222#define HCF_INDICATOR       0x00000020
    2323#define HCF_HOTKEYAVAILABLE 0x00000040
     24
     25///-------------------------------------------------------------------[swt-os2]
     26typedef struct tagMENUBARINFO {
     27  DWORD cbSize;
     28  RECT  rcBar;
     29  HMENU hMenu;
     30  HWND  hwndMenu;
     31  BOOL  fBarFocused:1;
     32  BOOL  fFocused:1;
     33} MENUBARINFO, *PMENUBARINFO, *LPMENUBARINFO;
     34///----------------------------------------------------------------------------
    2435
    2536typedef struct tagHIGHCONTRASTA
Note: See TracChangeset for help on using the changeset viewer.