Changeset 22080 for branches/swt/include/win/winnls.h

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

File:

• branches/swt/include/win/winnls.h (modified) (4 diffs)

branches/swt/include/win/winnls.h

@@ -437 +437 @@
 typedef DWORD CALTYPE;
 typedef DWORD CALID;
+///-------------------------------------------------------------------[swt-os2]
+typedef DWORD LCTYPE;
+typedef DWORD LGRPID;
+///----------------------------------------------------------------------------
 
 #if !(defined(OS2_INCLUDED) && !defined(OS2_WRAP_INCLUDED))
@@ -453 +457 @@
 typedef BOOL    (* CALLBACK DATEFMT_ENUMPROCEXA)(LPSTR,CALID);
 typedef BOOL    (* CALLBACK DATEFMT_ENUMPROCEXW)(LPWSTR,CALID);
+///-------------------------------------------------------------------[swt-os2]
+/// Changed from (CALLBACK *... to (* CALLBACK ...
+typedef BOOL    (* CALLBACK LANGGROUPLOCALE_ENUMPROCA)(LGRPID,LCID,LPSTR,LONG_PTR);
+typedef BOOL    (* CALLBACK LANGGROUPLOCALE_ENUMPROCW)(LGRPID,LCID,LPWSTR,LONG_PTR);
+typedef BOOL    (* CALLBACK LANGUAGEGROUP_ENUMPROCA)(LGRPID,LPSTR,LPSTR,DWORD,LONG_PTR);
+typedef BOOL    (* CALLBACK LANGUAGEGROUP_ENUMPROCW)(LGRPID,LPWSTR,LPWSTR,DWORD,LONG_PTR);
+///----------------------------------------------------------------------------
 typedef BOOL    (* CALLBACK LOCALE_ENUMPROCA)(LPSTR);
 typedef BOOL    (* CALLBACK LOCALE_ENUMPROCW)(LPWSTR);
 typedef BOOL    (* CALLBACK TIMEFMT_ENUMPROCA)(LPSTR);
 typedef BOOL    (* CALLBACK TIMEFMT_ENUMPROCW)(LPWSTR);
+///-------------------------------------------------------------------[swt-os2]
+/// Changed from (CALLBACK *... to (* CALLBACK ...
+typedef BOOL    (* CALLBACK UILANGUAGE_ENUMPROCA)(LPSTR,LONG_PTR);
+typedef BOOL    (* CALLBACK UILANGUAGE_ENUMPROCW)(LPWSTR,LONG_PTR);
+///----------------------------------------------------------------------------
 #else
 typedef FARPROC CALINFO_ENUMPROCA;
@@ -468 +484 @@
 typedef FARPROC DATEFMT_ENUMPROCEXA;
 typedef FARPROC DATEFMT_ENUMPROCEXW;
+///-------------------------------------------------------------------[swt-os2]
+typedef FARPROC LANGGROUPLOCALE_ENUMPROCA;
+typedef FARPROC LANGGROUPLOCALE_ENUMPROCW;
+typedef FARPROC LANGUAGEGROUP_ENUMPROCA;
+typedef FARPROC LANGUAGEGROUP_ENUMPROCW;
+///----------------------------------------------------------------------------
 typedef FARPROC LOCALE_ENUMPROCA;
 typedef FARPROC LOCALE_ENUMPROCW;
 typedef FARPROC TIMEFMT_ENUMPROCA;
 typedef FARPROC TIMEFMT_ENUMPROCW;
+///-------------------------------------------------------------------[swt-os2]
+typedef FARPROC UILANGUAGE_ENUMPROCA;
+typedef FARPROC UILANGUAGE_ENUMPROCW;
+///----------------------------------------------------------------------------
 #endif /* STRICT || __WINE__ */
 
@@ -479 +505 @@
 DECL_WINELIB_TYPE_AW(DATEFMT_ENUMPROC)
 DECL_WINELIB_TYPE_AW(DATEFMT_ENUMPROCEX)
+///-------------------------------------------------------------------[swt-os2]
+DECL_WINELIB_TYPE_AW(LANGGROUPLOCALE_ENUMPROC)
+DECL_WINELIB_TYPE_AW(LANGUAGEGROUP_ENUMPROC)
+///----------------------------------------------------------------------------
 DECL_WINELIB_TYPE_AW(LOCALE_ENUMPROC)
 DECL_WINELIB_TYPE_AW(TIMEFMT_ENUMPROC)
-
+///-------------------------------------------------------------------[swt-os2]
+DECL_WINELIB_TYPE_AW(UILANGUAGE_ENUMPROC)
+///----------------------------------------------------------------------------
 
 typedef struct