2007-02-11 Daniel Atallah <datallah@users.sourceforge.net>

* include/winnt.h (LANG_SERBIAN_NEUTRAL, LANG_BOSNIAN,
LANG_BOSNIAN_NEUTRAL): Define.

2007-02-11  Daniel Schlyder  <thrug@users.sourceforge.net>

* include/winuser.h: Add guards around TITLEBARINFO and
GetTitleBarInfo().

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 71a9acb..eafd517 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,13 @@
+2007-02-11  Daniel Atallah  <datallah@users.sourceforge.net>
+
+       * include/winnt.h (LANG_SERBIAN_NEUTRAL, LANG_BOSNIAN,
+       LANG_BOSNIAN_NEUTRAL): Define.
+
+2007-02-11  Daniel Schlyder  <thrug@users.sourceforge.net>
+
+       * include/winuser.h: Add guards around TITLEBARINFO and
+       GetTitleBarInfo().
+
 2007-01-11  Gisle Vanem  <giva@users.sourceforge.net>
 
        * include/winbase.h (struct _OVERLAPPED): Change type of

diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h
index 64d5687..24ab200 100644 (file)
--- a/winsup/w32api/include/winnt.h
+++ b/winsup/w32api/include/winnt.h
@@ -541,6 +541,9 @@ typedef DWORD FLONG;
 #define LANG_RUSSIAN   0x19
 #define LANG_CROATIAN  0x1a
 #define LANG_SERBIAN   0x1a
+#define LANG_SERBIAN_NEUTRAL 0x7c1a
+#define LANG_BOSNIAN   0x1a
+#define LANG_BOSNIAN_NEUTRAL 0x781a
 #define LANG_SLOVAK    0x1b
 #define LANG_ALBANIAN  0x1c
 #define LANG_SWEDISH   0x1d

diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h
index 4692b5c..7a3885e 100644 (file)
--- a/winsup/w32api/include/winuser.h
+++ b/winsup/w32api/include/winuser.h
@@ -3103,12 +3103,14 @@ typedef struct tagSCROLLBARINFO {
        int   reserved;
        DWORD rgstate[CCHILDREN_SCROLLBAR+1];
 } SCROLLBARINFO,*PSCROLLBARINFO,*LPSCROLLBARINFO;
+#if (_WIN32_WINDOWS >= 0x0410)
 #define CCHILDREN_TITLEBAR 5
 typedef struct tagTITLEBARINFO {
        DWORD cbSize;
        RECT  rcTitleBar;
        DWORD rgstate[CCHILDREN_TITLEBAR+1];
 } TITLEBARINFO,*PTITLEBARINFO,*LPTITLEBARINFO;
+#endif
 typedef struct tagWINDOWINFO {
        DWORD cbSize;
        RECT  rcWindow;
@@ -3713,7 +3715,9 @@ WINUSERAPI BOOL WINAPI GetMenuInfo(HMENU,LPMENUINFO);
 WINUSERAPI BOOL WINAPI GetProcessDefaultLayout(DWORD*);
 #endif
 WINUSERAPI BOOL WINAPI GetScrollBarInfo(HWND,LONG,PSCROLLBARINFO);
+#if (_WIN32_WINDOWS >= 0x0410)
 WINUSERAPI BOOL WINAPI GetTitleBarInfo(HWND,PTITLEBARINFO);
+#endif
 WINUSERAPI BOOL WINAPI GetWindowInfo(HWND,PWINDOWINFO);
 WINUSERAPI BOOL WINAPI GetMonitorInfoA(HMONITOR,LPMONITORINFO);
 WINUSERAPI BOOL WINAPI GetMonitorInfoW(HMONITOR,LPMONITORINFO);