* include/winuser.h (GET_WHEEL_DELTA_WPARAM): Add macro.

	* lib/oleaut32.def: Regenerate.

3 files changed, 237 insertions, 16 deletions

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 7e1d10097..04c2bcbdc 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,6 +1,15 @@
+2001-08-08 Danny Smith <dannysmith@users.sourceforge.net>
+
+	* include/winuser.h (GET_WHEEL_DELTA_WPARAM): Add macro.
+	Thanks to: Harold Hunt <Harold@compasstechnologies.com>.
+
+2001-08-08 Danny Smith <dannysmith@users.sourceforge.net>
+
+	* lib/oleaut32.def: Regenerate.
+
 2001-08-04  Danny Smith <dannysmith@users.sourceforge.net>
 
-	* include/wtypes.h: (DECIMAL_SETZERO): Correct typo.
+	* include/wtypes.h (DECIMAL_SETZERO): Correct typo.
 
 2001-08-02  Danny Smith <dannysmith@users.sourceforge.net>
 
diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h
index 639a71126..ddcdae1d0 100644
--- a/winsup/w32api/include/winuser.h
+++ b/winsup/w32api/include/winuser.h
@@ -1253,7 +1253,10 @@ extern "C" {
 #define WM_MOUSELAST 522
 #define WM_MOUSEHOVER	0x2A1
 #define WM_MOUSELEAVE	0x2A3
+#if(_WIN32_WINNT >= 0x0400)
 #define WHEEL_DELTA 120
+#define GET_WHEEL_DELTA_WPARAM(wparam) ((short)HIWORD (wparam))
+#endif
 #define BM_CLICK 245
 #define BM_GETCHECK 240
 #define BM_GETIMAGE 246
diff --git a/winsup/w32api/lib/oleaut32.def b/winsup/w32api/lib/oleaut32.def
index b43c0fd92..fed406574 100644
--- a/winsup/w32api/lib/oleaut32.def
+++ b/winsup/w32api/lib/oleaut32.def
@@ -1,23 +1,51 @@
 LIBRARY OLEAUT32.DLL
 EXPORTS
+BSTR_UserFree@8
+BSTR_UserMarshal@12
+BSTR_UserSize@12
+BSTR_UserUnmarshal@12
+BstrFromVector@8
+ClearCustData@4
 CreateDispTypeInfo@12
 CreateErrorInfo@4
 CreateStdDispatch@16
 CreateTypeLib@12
+CreateTypeLib2@12
+DispCallFunc@32
 DispGetIDsOfNames@16
 DispGetParam@20
 DispInvoke@32
-DllCanUnloadNow@0
-DllGetClassObject@12
 DosDateTimeToVariantTime@12
 GetActiveObject@12
+GetAltMonthNames@8
 GetErrorInfo@8
+GetRecordInfoFromGuids@24
+GetRecordInfoFromTypeInfo@8
 LHashValOfNameSys@12
 LHashValOfNameSysA@12
 LoadRegTypeLib@20
 LoadTypeLib@8
 LoadTypeLibEx@12
+LPSAFEARRAY_Marshal@16
+LPSAFEARRAY_Size@16
+LPSAFEARRAY_Unmarshal@16
+LPSAFEARRAY_UserFree@8
+LPSAFEARRAY_UserMarshal@12
+LPSAFEARRAY_UserSize@12
+LPSAFEARRAY_UserUnmarshal@12
 OaBuildVersion@0
+OleCreateFontIndirect@12
+OleCreatePictureIndirect@16
+OleCreatePropertyFrame@44
+OleCreatePropertyFrameIndirect@4
+OleIconToCursor@8
+OleLoadPicture@20
+OleLoadPictureEx@32
+OleLoadPictureFile@20
+OleLoadPictureFileEx@32
+OleLoadPicturePath@24
+OleSavePictureFile@8
+OleTranslateColor@12
 QueryPathOfRegTypeLib@20
 RegisterActiveObject@16
 RegisterTypeLib@12
@@ -25,23 +53,32 @@ RevokeActiveObject@8
 SafeArrayAccessData@8
 SafeArrayAllocData@4
 SafeArrayAllocDescriptor@8
+SafeArrayAllocDescriptorEx@12
 SafeArrayCopy@8
+SafeArrayCopyData@8
 SafeArrayCreate@12
+SafeArrayCreateEx@16
+SafeArrayCreateVector@12
+SafeArrayCreateVectorEx@16
 SafeArrayDestroy@4
 SafeArrayDestroyData@4
 SafeArrayDestroyDescriptor@4
 SafeArrayGetDim@4
 SafeArrayGetElement@12
 SafeArrayGetElemsize@4
+SafeArrayGetIID@8
 SafeArrayGetLBound@12
+SafeArrayGetRecordInfo@8
 SafeArrayGetUBound@12
+SafeArrayGetVartype@8
 SafeArrayLock@4
 SafeArrayPtrOfIndex@12
 SafeArrayPutElement@12
 SafeArrayRedim@8
+SafeArraySetIID@8
+SafeArraySetRecordInfo@8
 SafeArrayUnaccessData@4
 SafeArrayUnlock@4
-SafeArrayCreateVector@12
 SetErrorInfo@8
 SysAllocString@4
 SysAllocStringByteLen@8
@@ -51,96 +88,268 @@ SysReAllocString@8
 SysReAllocStringLen@12
 SysStringByteLen@4
 SysStringLen@4
+SystemTimeToVariantTime@8
+UnRegisterTypeLib@20
+UserBSTR_free_inst@4
+UserBSTR_free_local@4
+UserBSTR_from_local@8
+UserBSTR_to_local@8
+UserEXCEPINFO_free_inst@4
+UserEXCEPINFO_free_local@4
+UserEXCEPINFO_from_local@8
+UserEXCEPINFO_to_local@8
+UserHWND_free_inst@4
+UserHWND_free_local@4
+UserHWND_from_local@8
+UserHWND_to_local@8
+UserMSG_free_inst@4
+UserMSG_free_local@4
+UserMSG_from_local@8
+UserMSG_to_local@8
+UserVARIANT_free_inst@4
+UserVARIANT_free_local@4
+UserVARIANT_from_local@8
+UserVARIANT_to_local@8
+VarAbs@8
+VarAdd@12
+VarAnd@12
 VarBoolFromCy@12
 VarBoolFromDate@12
+VarBoolFromDec@8
 VarBoolFromDisp@12
+VarBoolFromI1@8
 VarBoolFromI2@8
 VarBoolFromI4@8
 VarBoolFromR4@8
 VarBoolFromR8@12
 VarBoolFromStr@16
 VarBoolFromUI1@8
+VarBoolFromUI2@8
+VarBoolFromUI4@8
+VarBstrCat@12
+VarBstrCmp@16
 VarBstrFromBool@16
 VarBstrFromCy@20
 VarBstrFromDate@20
+VarBstrFromDec@16
 VarBstrFromDisp@16
+VarBstrFromI1@16
 VarBstrFromI2@16
 VarBstrFromI4@16
 VarBstrFromR4@16
 VarBstrFromR8@20
 VarBstrFromUI1@16
+VarBstrFromUI2@16
+VarBstrFromUI4@16
+VarCat@12
+VarCmp@16
+VarCyAbs@12
+VarCyAdd@20
+VarCyCmp@16
+VarCyCmpR8@16
+VarCyFix@12
 VarCyFromBool@8
 VarCyFromDate@12
+VarCyFromDec@8
 VarCyFromDisp@12
+VarCyFromI1@8
 VarCyFromI2@8
 VarCyFromI4@8
 VarCyFromR4@8
 VarCyFromR8@12
 VarCyFromStr@16
 VarCyFromUI1@8
+VarCyFromUI2@8
+VarCyFromUI4@8
+VarCyInt@12
+VarCyMul@20
+VarCyMulI4@16
+VarCyNeg@12
+VarCyRound@16
+VarCySub@20
 VarDateFromBool@8
 VarDateFromCy@12
+VarDateFromDec@8
 VarDateFromDisp@12
+VarDateFromI1@8
 VarDateFromI2@8
 VarDateFromI4@8
 VarDateFromR4@8
 VarDateFromR8@12
 VarDateFromStr@16
+VarDateFromUdate@12
+VarDateFromUdateEx@16
 VarDateFromUI1@8
+VarDateFromUI2@8
+VarDateFromUI4@8
+VarDecAbs@8
+VarDecAdd@12
+VarDecCmp@8
+VarDecCmpR8@12
+VarDecDiv@12
+VarDecFix@8
+VarDecFromBool@8
+VarDecFromCy@12
+VarDecFromDate@12
+VarDecFromDisp@12
+VarDecFromI1@8
+VarDecFromI2@8
+VarDecFromI4@8
+VarDecFromR4@8
+VarDecFromR8@12
+VarDecFromStr@16
+VarDecFromUI1@8
+VarDecFromUI2@8
+VarDecFromUI4@8
+VarDecInt@8
+VarDecMul@12
+VarDecNeg@8
+VarDecRound@12
+VarDecSub@12
+VarDiv@12
+VarEqv@12
+VarFix@8
+VarFormat@24
+VarFormatCurrency@28
+VarFormatDateTime@16
+VarFormatFromTokens@24
+VarFormatNumber@28
+VarFormatPercent@28
+VarI1FromBool@8
+VarI1FromCy@12
+VarI1FromDate@12
+VarI1FromDec@8
+VarI1FromDisp@12
+VarI1FromI2@8
+VarI1FromI4@8
+VarI1FromR4@8
+VarI1FromR8@12
+VarI1FromStr@16
+VarI1FromUI1@8
+VarI1FromUI2@8
+VarI1FromUI4@8
 VarI2FromBool@8
 VarI2FromCy@12
 VarI2FromDate@12
+VarI2FromDec@8
 VarI2FromDisp@12
+VarI2FromI1@8
 VarI2FromI4@8
 VarI2FromR4@8
 VarI2FromR8@12
 VarI2FromStr@16
 VarI2FromUI1@8
+VarI2FromUI2@8
+VarI2FromUI4@8
 VarI4FromBool@8
 VarI4FromCy@12
 VarI4FromDate@12
+VarI4FromDec@8
 VarI4FromDisp@12
+VarI4FromI1@8
 VarI4FromI2@8
 VarI4FromR4@8
 VarI4FromR8@12
 VarI4FromStr@16
 VarI4FromUI1@8
+VarI4FromUI2@8
+VarI4FromUI4@8
+VARIANT_UserFree@8
+VARIANT_UserMarshal@12
+VARIANT_UserSize@12
+VARIANT_UserUnmarshal@12
+VariantChangeType@16
+VariantChangeTypeEx@20
+VariantClear@4
+VariantCopy@8
+VariantCopyInd@8
+VariantInit@4
+VariantTimeToDosDateTime@16
+VariantTimeToSystemTime@12
+VarIdiv@12
+VarImp@12
+VarInt@8
+VarMod@12
+VarMonthName@16
+VarMul@12
+VarNeg@8
+VarNot@8
+VarNumFromParseNum@16
+VarOr@12
+VarParseNumFromStr@20
+VarPow@12
+VarR4CmpR8@12
 VarR4FromBool@8
 VarR4FromCy@12
 VarR4FromDate@12
+VarR4FromDec@8
 VarR4FromDisp@12
+VarR4FromI1@8
 VarR4FromI2@8
 VarR4FromI4@8
 VarR4FromR8@12
 VarR4FromStr@16
 VarR4FromUI1@8
+VarR4FromUI2@8
+VarR4FromUI4@8
 VarR8FromBool@8
 VarR8FromCy@12
 VarR8FromDate@12
+VarR8FromDec@8
 VarR8FromDisp@12
+VarR8FromI1@8
 VarR8FromI2@8
 VarR8FromI4@8
 VarR8FromR4@8
 VarR8FromStr@16
 VarR8FromUI1@8
+VarR8FromUI2@8
+VarR8FromUI4@8
+VarR8Pow@20
+VarR8Round@16
+VarRound@12
+VarSub@12
+VarTokenizeFormatString@28
+VarUdateFromDate@16
 VarUI1FromBool@8
 VarUI1FromCy@12
 VarUI1FromDate@12
+VarUI1FromDec@8
 VarUI1FromDisp@12
+VarUI1FromI1@8
 VarUI1FromI2@8
 VarUI1FromI4@8
 VarUI1FromR4@8
 VarUI1FromR8@12
 VarUI1FromStr@16
-VariantChangeType@16
-VariantChangeTypeEx@20
-VariantClear@4
-VariantCopy@8
-VariantCopyInd@8
-VariantInit@4
-VariantTimeToDosDateTime@16
-VariantTimeToSystemTime@12
-VarAdd@12
-VarSub@12
-VarMul@12
-VarDiv@12
+VarUI1FromUI2@8
+VarUI1FromUI4@8
+VarUI2FromBool@8
+VarUI2FromCy@12
+VarUI2FromDate@12
+VarUI2FromDec@8
+VarUI2FromDisp@12
+VarUI2FromI1@8
+VarUI2FromI2@8
+VarUI2FromI4@8
+VarUI2FromR4@8
+VarUI2FromR8@12
+VarUI2FromStr@16
+VarUI2FromUI1@8
+VarUI2FromUI4@8
+VarUI4FromBool@8
+VarUI4FromCy@12
+VarUI4FromDate@12
+VarUI4FromDec@8
+VarUI4FromDisp@12
+VarUI4FromI1@8
+VarUI4FromI2@8
+VarUI4FromI4@8
+VarUI4FromR4@8
+VarUI4FromR8@12
+VarUI4FromStr@16
+VarUI4FromUI1@8
+VarUI4FromUI2@8
+VarWeekdayName@20
+VarXor@12
+VectorFromBstr@8