diff options
| -rw-r--r-- | winsup/w32api/ChangeLog | 14 | ||||
| -rw-r--r-- | winsup/w32api/include/winbase.h | 4 | ||||
| -rw-r--r-- | winsup/w32api/include/winuser.h | 3 |
3 files changed, 19 insertions, 2 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 34952d759..20fa14a86 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,14 @@ +2002-07-20 Casper S. Hornstrup <chorns@users.sourceforge.net> + + * include/winbase.h (GetEnvironmentStringsA): Remove duplicate + definition. + (Interlocked*): Wrap in #ifndef __INTERLOCKED_DECLARED to + avoid compile error when already defined. + +2002-07-20 Steven Edwards <Steven_Ed4153@yahoo.com> + + * include/winuser.h (WM_MENURBUTTONUP): Add define. + 2002-07-17 Danny Smith <dannysmith@users.sourceforge.net> * include/commdlg.h: Define CDN_* notification message constants @@ -25,7 +36,8 @@ 2002-07-17 Danny Smith <dannysmith@users.sourceforge.net> - * include/wtypes.h: Remove duplicate #includes of rhc.h and + * include/wtypes.h: Remove duplicate #includes of rpc.h and + rpcndr.h. 2002-07-05 Luke Dunstan <infidel@users.sourceforge.net> diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h index 0d30ebd71..3ed41abb5 100644 --- a/winsup/w32api/include/winbase.h +++ b/winsup/w32api/include/winbase.h @@ -1305,6 +1305,8 @@ DWORD WINAPI SetCriticalSectionSpinCount(LPCRITICAL_SECTION,DWORD); #endif BOOL WINAPI InitializeSecurityDescriptor(PSECURITY_DESCRIPTOR,DWORD); BOOL WINAPI InitializeSid (PSID,PSID_IDENTIFIER_AUTHORITY,BYTE); +#ifndef __INTERLOCKED_DECLARED +#define __INTERLOCKED_DECLARED LONG WINAPI InterlockedCompareExchange(LPLONG,LONG,LONG); /* PVOID WINAPI InterlockedCompareExchangePointer(PVOID*,PVOID,PVOID); */ #define InterlockedCompareExchangePointer(d,e,c) \ @@ -1316,6 +1318,7 @@ LONG WINAPI InterlockedExchange(LPLONG,LONG); (PVOID)InterlockedExchange((LPLONG)(t),(LONG)(v)) LONG WINAPI InterlockedExchangeAdd(LPLONG,LONG); LONG WINAPI InterlockedIncrement(LPLONG); +#endif /* __INTERLOCKED_DECLARED */ BOOL WINAPI IsBadCodePtr(FARPROC); BOOL WINAPI IsBadHugeReadPtr(PCVOID,UINT); BOOL WINAPI IsBadHugeWritePtr(PVOID,UINT); @@ -1771,7 +1774,6 @@ typedef HW_PROFILE_INFOA HW_PROFILE_INFO,*LPHW_PROFILE_INFO; #define GetDiskFreeSpace GetDiskFreeSpaceA #define GetDiskFreeSpaceEx GetDiskFreeSpaceExA #define GetDriveType GetDriveTypeA -#define GetEnvironmentStringsA GetEnvironmentStrings #define GetEnvironmentVariable GetEnvironmentVariableA #define GetFileAttributes GetFileAttributesA #define GetFileSecurity GetFileSecurityA diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h index 62f565b09..1a9ddb975 100644 --- a/winsup/w32api/include/winuser.h +++ b/winsup/w32api/include/winuser.h @@ -1199,6 +1199,9 @@ extern "C" { #define WM_MDISETMENU 560 #define WM_MDITILE 550 #define WM_MEASUREITEM 44 +#if(WINVER >= 0x0500) +#define WM_MENURBUTTONUP 290 +#endif #define WM_MENUCHAR 288 #define WM_MENUSELECT 287 #define WM_NEXTMENU 531 |