Sync with trunk (r48545)

[reactos.git] / include / psdk / winuser.h

diff --git a/include/psdk/winuser.h b/include/psdk/winuser.h
index fbae731..6008e75 100644 (file)
--- a/include/psdk/winuser.h
+++ b/include/psdk/winuser.h
@@ -4163,8 +4163,8 @@ HBRUSH WINAPI GetSysColorBrush(int);
 #define GetSysModalWindow() (NULL)
 HMENU WINAPI GetSystemMenu(HWND,BOOL);
 int WINAPI GetSystemMetrics(int);
-DWORD WINAPI GetTabbedTextExtentA(HDC,LPCSTR,int,int,CONST LPINT);
-DWORD WINAPI GetTabbedTextExtentW(HDC,LPCWSTR,int,int,CONST LPINT);
+DWORD WINAPI GetTabbedTextExtentA(HDC,LPCSTR,int,int,CONST INT*);
+DWORD WINAPI GetTabbedTextExtentW(HDC,LPCWSTR,int,int,CONST INT*);
 LONG WINAPI GetWindowLongA(HWND,int);
 LONG WINAPI GetWindowLongW(HWND,int);
 #ifdef _WIN64
@@ -4346,6 +4346,8 @@ BOOL WINAPI PrintWindow(HWND,HDC,UINT);
 #endif
 UINT WINAPI PrivateExtractIconsA(LPCSTR,int,int,int,HICON*,UINT*,UINT,UINT);
 UINT WINAPI PrivateExtractIconsW(LPCWSTR,int,int,int,HICON*,UINT*,UINT,UINT);
+UINT WINAPI WINAPI PrivateExtractIconExA(LPCSTR,int,HICON*,HICON*,UINT);
+UINT WINAPI WINAPI PrivateExtractIconExW(LPCWSTR,int,HICON*,HICON*,UINT);
 BOOL WINAPI PtInRect(LPCRECT,POINT);
 HWND WINAPI RealChildWindowFromPoint(HWND,POINT);
 UINT WINAPI RealGetWindowClassA(HWND,LPSTR,UINT);
@@ -4489,13 +4491,13 @@ VOID WINAPI SwitchToThisWindow(HWND,BOOL);
 #endif /* (_WIN32_WINNT >= 0x0500) */
 BOOL WINAPI SystemParametersInfoA(UINT,UINT,PVOID,UINT);
 BOOL WINAPI SystemParametersInfoW(UINT,UINT,PVOID,UINT);
-LONG WINAPI TabbedTextOutA(HDC,int,int,LPCSTR,int,int,CONST LPINT,int);
-LONG WINAPI TabbedTextOutW(HDC,int,int,LPCWSTR,int,int,CONST LPINT,int);
+LONG WINAPI TabbedTextOutA(HDC,int,int,LPCSTR,int,int,CONST INT*,int);
+LONG WINAPI TabbedTextOutW(HDC,int,int,LPCWSTR,int,int,CONST INT*,int);
 WORD WINAPI TileWindows(HWND,UINT,LPCRECT,UINT,const HWND *);
-int WINAPI ToAscii(UINT,UINT,CONST PBYTE,LPWORD,UINT);
-int WINAPI ToAsciiEx(UINT,UINT,CONST PBYTE,LPWORD,UINT,HKL);
-int WINAPI ToUnicode(UINT,UINT,CONST PBYTE,LPWSTR,int,UINT);
-int WINAPI ToUnicodeEx(UINT,UINT,CONST PBYTE,LPWSTR,int,UINT,HKL);
+int WINAPI ToAscii(UINT,UINT,CONST BYTE*,LPWORD,UINT);
+int WINAPI ToAsciiEx(UINT,UINT,CONST BYTE*,LPWORD,UINT,HKL);
+int WINAPI ToUnicode(UINT,UINT,CONST BYTE*,LPWSTR,int,UINT);
+int WINAPI ToUnicodeEx(UINT,UINT,CONST BYTE*,LPWSTR,int,UINT,HKL);
 BOOL WINAPI TrackMouseEvent(LPTRACKMOUSEEVENT);
 BOOL WINAPI TrackPopupMenu(HMENU,UINT,int,int,int,HWND,LPCRECT);
 BOOL WINAPI TrackPopupMenuEx(HMENU,UINT,int,int,HWND,LPTPMPARAMS);