From a5ce9a9ab63cd0118bd434a64c6e89924f3550ed Mon Sep 17 00:00:00 2001 From: marco Date: Sat, 2 Mar 2019 18:22:01 +0000 Subject: [PATCH] * fix for #35111 EnumTimeFormatsEx. Prepared by 440bx git-svn-id: trunk@41559 - --- rtl/win/wininc/base.inc | 2 ++ rtl/win/wininc/defines.inc | 6 ++++++ rtl/win/wininc/func.inc | 1 + 3 files changed, 9 insertions(+) diff --git a/rtl/win/wininc/base.inc b/rtl/win/wininc/base.inc index e9c31a810c..81063687e4 100644 --- a/rtl/win/wininc/base.inc +++ b/rtl/win/wininc/base.inc @@ -748,6 +748,8 @@ PFNPROCESSPOLICIESA = function (_para1:HWND; _para2:LPCSTR; _para3:LPCSTR; _para4:LPCSTR; _para5:DWORD):WINBOOL;stdcall; PFNPROCESSPOLICIESW = function (_para1:HWND; _para2:LPCWSTR; _para3:LPCWSTR; _para4:LPCWSTR; _para5:DWORD):WINBOOL;stdcall; PFNPROCESSPOLICIES = function (_para1:HWND; _para2:LPCTSTR; _para3:LPCTSTR; _para4:LPCTSTR; _para5:DWORD):WINBOOL;stdcall; + TIMEFMT_ENUMPROCEX = function (TimeFormat : LPWSTR; AppData : LPARAM) : BOOL; stdcall; + (* Not convertable by H2PAS #define SECURITY_NULL_SID_AUTHORITY {0,0,0,0,0,0} #define SECURITY_WORLD_SID_AUTHORITY {0,0,0,0,0,1} diff --git a/rtl/win/wininc/defines.inc b/rtl/win/wininc/defines.inc index 01f26f46c0..a01a73b570 100644 --- a/rtl/win/wininc/defines.inc +++ b/rtl/win/wininc/defines.inc @@ -1258,6 +1258,12 @@ DMDFO_STRETCH = 1; DMDFO_CENTER = 2; + + LOCALE_NAME_USER_DEFAULT : pwidechar = nil; + LOCALE_NAME_INVARIANT : pwidechar = ''; + LOCALE_NAME_SYSTEM_DEFAULT : pwidechar = '!x-sys-default-locale'; + + // // Predefined Resource Types // diff --git a/rtl/win/wininc/func.inc b/rtl/win/wininc/func.inc index d0c94db918..e6e68b8247 100644 --- a/rtl/win/wininc/func.inc +++ b/rtl/win/wininc/func.inc @@ -1062,6 +1062,7 @@ function SHGetFileInfo(_para1:LPCTSTR; _para2:DWORD; var _para3:SHFILEINFO; _par function SHGetPathFromIDList(_para1:LPCITEMIDLIST; _para2:LPTSTR):WINBOOL; external 'shell32' name 'SHGetPathFromIDList'; function SHGetSpecialFolderLocation(_para1:HWND; _para2:longint; var _para3:LPITEMIDLIST):HRESULT; external 'shell32' name 'SHGetSpecialFolderLocation'; function FlashWindowEx(pfwi : PFLASHWINFO) : BOOL; stdcall; external 'user32' name 'FlashWindowEx'; +function EnumTimeFormatsEx(TimeFormatsExEnum : TIMEFMT_ENUMPROCEX; LocaleName : LPCWSTR;Flags : DWORD;AppData : LPARAM) : BOOL; external 'kernel32' name 'EnumTimeFormatsEx'; { was missing, bug report 1808 PM } {