Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-02 07:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove FIXMEs using corrected W32API headers

Browse source 
svn path=/trunk/; revision=8470
This commit is contained in:
Martin Fuchs 2004-02-29 12:05:33 +00:00
parent e38d6f00f7
commit 655457493c
6 changed files with 10 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/lib/oleaut32/oleaut.c
View file

@ -102,7 +102,7 @@ HMODULE OLEAUT32_hModule = NULL;
* calculated by lstrlenW(), since it returns the length that was used to
* allocate the string by SysAllocStringLen().
*/
unsigned/*FIXME: wrong return type of SysStringLen() in MinGW header */
unsigned/*FIXME: wrong return type of SysStringLen() in WINE header */
int WINAPI SysStringLen(BSTR str)
{
DWORD* bufferPointer;
@ -133,7 +133,7 @@ int WINAPI SysStringLen(BSTR str)
* NOTES
* See SysStringLen(), BSTR().
*/
unsigned/*FIXME: wrong return type of SysStringLen() in MinGW header */
unsigned/*FIXME: wrong return type of SysStringLen() in WINE header */
int WINAPI SysStringByteLen(BSTR str)
{
DWORD* bufferPointer;

16
reactos/lib/oleaut32/oleaut32.spec
View file

@ -52,7 +52,7 @@
52 stdcall VarI2FromCy(long long ptr)
53 stdcall VarI2FromDate(double ptr)
54 stdcall VarI2FromStr(wstr long long ptr)
#55 stdcall VarI2FromDisp(ptr long ptr)
55 stdcall VarI2FromDisp(ptr long ptr)
56 stdcall VarI2FromBool(long ptr)
#57 stdcall SafeArraySetIID(ptr ptr)
58 stdcall VarI4FromUI1(long ptr)
@ -62,7 +62,7 @@
62 stdcall VarI4FromCy(long long ptr)
63 stdcall VarI4FromDate(double ptr)
64 stdcall VarI4FromStr(wstr long long ptr)
#65 stdcall VarI4FromDisp(ptr long ptr)
65 stdcall VarI4FromDisp(ptr long ptr)
66 stdcall VarI4FromBool(long ptr)
#67 stdcall SafeArrayGetIID(ptr ptr)
68 stdcall VarR4FromUI1(long ptr)
@ -72,7 +72,7 @@
72 stdcall VarR4FromCy(long long ptr)
73 stdcall VarR4FromDate(double ptr)
74 stdcall VarR4FromStr(wstr long long ptr)
#75 stdcall VarR4FromDisp(ptr long ptr)
75 stdcall VarR4FromDisp(ptr long ptr)
76 stdcall VarR4FromBool(long ptr)
#77 stdcall SafeArrayGetVartype(ptr ptr)
78 stdcall VarR8FromUI1(long ptr)
@ -82,7 +82,7 @@
82 stdcall VarR8FromCy(long long ptr)
83 stdcall VarR8FromDate(double ptr)
84 stdcall VarR8FromStr(wstr long long ptr)
#85 stdcall VarR8FromDisp(ptr long ptr)
85 stdcall VarR8FromDisp(ptr long ptr)
86 stdcall VarR8FromBool(long ptr)
#87 stdcall VarFormat(ptr ptr long long long ptr)
88 stdcall VarDateFromUI1(long ptr)
@ -92,7 +92,7 @@
92 stdcall VarDateFromR8(double ptr)
93 stdcall VarDateFromCy(long long ptr)
#94 stdcall VarDateFromStr(wstr long long ptr)
#95 stdcall VarDateFromDisp(ptr long ptr)
95 stdcall VarDateFromDisp(ptr long ptr)
96 stdcall VarDateFromBool(long ptr)
#97 stdcall VarFormatDateTime(ptr long long ptr)
98 stdcall VarCyFromUI1(long ptr)
@ -102,7 +102,7 @@
102 stdcall VarCyFromR8(double ptr)
103 stdcall VarCyFromDate(double ptr)
104 stdcall VarCyFromStr(wstr long long ptr)
#105 stdcall VarCyFromDisp(ptr long ptr)
105 stdcall VarCyFromDisp(ptr long ptr)
106 stdcall VarCyFromBool(long ptr)
#107 stdcall VarFormatNumber(ptr long long long long long ptr)
108 stdcall VarBstrFromUI1(long long long ptr)
@ -123,7 +123,7 @@
123 stdcall VarBoolFromDate(double ptr)
124 stdcall VarBoolFromCy(long long ptr)
125 stdcall VarBoolFromStr(wstr long long ptr)
#126 stdcall VarBoolFromDisp(ptr long ptr)
126 stdcall VarBoolFromDisp(ptr long ptr)
#127 stdcall VarFormatCurrency(ptr long long long long long ptr)
128 stub VarWeekdayName # stdcall (long long long long ptr)
129 stub VarMonthName # stdcall (long long long ptr)
@ -134,7 +134,7 @@
134 stdcall VarUI1FromCy(long long ptr)
135 stdcall VarUI1FromDate(double ptr)
136 stdcall VarUI1FromStr(wstr long long ptr)
#137 stdcall VarUI1FromDisp(ptr long ptr)
137 stdcall VarUI1FromDisp(ptr long ptr)
138 stdcall VarUI1FromBool(long ptr)
#139 stdcall VarFormatFromTokens (ptr ptr ptr long ptr long)
#140 stdcall VarTokenizeFormatString (ptr ptr long long long long ptr)

4
reactos/lib/oleaut32/ros-mingw-fixes.h
View file

@ -38,10 +38,6 @@ HRESULT WINAPI VarDecNeg(const DECIMAL*,DECIMAL*);
#define VAR_CALENDAR_THAI ((DWORD)0x00000080)
#define VAR_CALENDAR_GREGORIAN ((DWORD)0x00000100)
#define V_UI2(X) V_UNION(X, uiVal)
#define V_UI4(X) V_UNION(X, ulVal)
#define V_UI8(X) V_UNION(X, ullVal)
#endif

2
reactos/lib/oleaut32/safearray.c
View file

@ -123,10 +123,8 @@ static DWORD SAFEARRAY_GetVTSize(VARTYPE vt)
case VT_UI8: return sizeof(LONG64);
case VT_INT:
case VT_UINT: return sizeof(INT);
#ifndef __REACTOS__ /*FIXME: wrong definition of VT_INT_PTR in MinGW headers */
case VT_INT_PTR:
case VT_UINT_PTR: return sizeof(UINT_PTR);
#endif
case VT_CY: return sizeof(CY);
case VT_DATE: return sizeof(DATE);
case VT_BSTR: return sizeof(BSTR);

18
reactos/lib/oleaut32/variant.c
View file

@ -198,9 +198,7 @@ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags,
#ifndef __REACTOS__ /*FIXME: problems with MinGW and DEC_LO32 */
case VT_DECIMAL: return VarI2FromDec(&V_DECIMAL(ps), &V_I2(pd));
#endif
#ifndef __REACTOS__ /*FIXME: wrong declaration of VarI2FromDisp() in MinGW header */
case VT_DISPATCH: return VarI2FromDisp(V_DISPATCH(ps), lcid, &V_I2(pd));
#endif
case VT_BSTR: return VarI2FromStr(V_BSTR(ps), lcid, dwFlags, &V_I2(pd));
}
break;
@ -226,9 +224,7 @@ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags,
#ifndef __REACTOS__ /*FIXME: problems with MinGW and DEC_LO32 */
case VT_DECIMAL: return VarI4FromDec(&V_DECIMAL(ps), &V_I4(pd));
#endif
#ifndef __REACTOS__ /*FIXME: wrong declaration of VarI4FromDisp() in MinGW header */
case VT_DISPATCH: return VarI4FromDisp(V_DISPATCH(ps), lcid, &V_I4(pd));
#endif
case VT_BSTR: return VarI4FromStr(V_BSTR(ps), lcid, dwFlags, &V_I4(pd));
}
break;
@ -254,9 +250,7 @@ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags,
#ifndef __REACTOS__ /*FIXME: problems with MinGW and DEC_LO32 */
case VT_DECIMAL: return VarUI1FromDec(&V_DECIMAL(ps), &V_UI1(pd));
#endif
#ifndef __REACTOS__ /*FIXME: wrong declaration of VarUI1FromDisp() in MinGW header */
case VT_DISPATCH: return VarUI1FromDisp(V_DISPATCH(ps), lcid, &V_UI1(pd));
#endif
case VT_BSTR: return VarUI1FromStr(V_BSTR(ps), lcid, dwFlags, &V_UI1(pd));
}
break;
@ -357,9 +351,7 @@ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags,
#ifndef __REACTOS__ /*FIXME: problems with MinGW and DEC_LO32 */
case VT_DECIMAL: return VarI8FromDec(&V_DECIMAL(ps), &V_I8(pd));
#endif
#ifndef __REACTOS__ /*FIXME: wrong declaration of VarI8FromDisp() in MinGW header */
case VT_DISPATCH: return VarI8FromDisp(V_DISPATCH(ps), lcid, &V_I8(pd));
#endif
case VT_BSTR: return VarI8FromStr(V_BSTR(ps), lcid, dwFlags, &V_I8(pd));
}
break;
@ -386,9 +378,7 @@ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags,
#ifndef __REACTOS__ /*FIXME: problems with MinGW and DEC_LO32 */
case VT_DECIMAL: return VarR4FromDec(&V_DECIMAL(ps), &V_R4(pd));
#endif
#ifndef __REACTOS__ /*FIXME: wrong declaration of VarR4FromDisp() in MinGW header */
case VT_DISPATCH: return VarR4FromDisp(V_DISPATCH(ps), lcid, &V_R4(pd));
#endif
case VT_BSTR: return VarR4FromStr(V_BSTR(ps), lcid, dwFlags, &V_R4(pd));
}
break;
@ -414,9 +404,7 @@ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags,
#ifndef __REACTOS__ /*FIXME: problems with MinGW and DEC_LO32 */
case VT_DECIMAL: return VarR8FromDec(&V_DECIMAL(ps), &V_R8(pd));
#endif
#ifndef __REACTOS__ /*FIXME: wrong declaration of VarR8FromDisp() in MinGW header */
case VT_DISPATCH: return VarR8FromDisp(V_DISPATCH(ps), lcid, &V_R8(pd));
#endif
case VT_BSTR: return VarR8FromStr(V_BSTR(ps), lcid, dwFlags, &V_R8(pd));
}
break;
@ -442,9 +430,7 @@ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags,
#ifndef __REACTOS__ /*FIXME: problems with MinGW and DEC_LO32 */
case VT_DECIMAL: return VarDateFromDec(&V_DECIMAL(ps), &V_DATE(pd));
#endif
#ifndef __REACTOS__ /*FIXME: wrong declaration of VarDateFromDisp() in MinGW header */
case VT_DISPATCH: return VarDateFromDisp(V_DISPATCH(ps), lcid, &V_DATE(pd));
#endif
#ifndef __REACTOS__ /*FIXME: no date funtions yet */
case VT_BSTR: return VarDateFromStr(V_BSTR(ps), lcid, dwFlags, &V_DATE(pd));
#endif
@ -472,9 +458,7 @@ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags,
#ifndef __REACTOS__ /*FIXME: problems with MinGW and DEC_LO32 */
case VT_DECIMAL: return VarBoolFromDec(&V_DECIMAL(ps), &V_BOOL(pd));
#endif
#ifndef __REACTOS__ /*FIXME: wrong declaration of VarBoolFromDisp() in MinGW header */
case VT_DISPATCH: return VarBoolFromDisp(V_DISPATCH(ps), lcid, &V_BOOL(pd));
#endif
case VT_BSTR: return VarBoolFromStr(V_BSTR(ps), lcid, dwFlags, &V_BOOL(pd));
}
break;
@ -532,9 +516,7 @@ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags,
case VT_DECIMAL: return VarCyFromDec(&V_DECIMAL(ps), &V_CY(pd));
#endif
#ifndef __REACTOS__ /*FIXME: wrong declaration of VarCyFromDisp() in MinGW header */
case VT_DISPATCH: return VarCyFromDisp(V_DISPATCH(ps), lcid, &V_CY(pd));
#endif
case VT_BSTR: return VarCyFromStr(V_BSTR(ps), lcid, dwFlags, &V_CY(pd));
}
break;

18
reactos/lib/oleaut32/vartype.c
View file

@ -69,9 +69,7 @@ static inline void VARIANT_CopyData(const VARIANT *srcVar, VARTYPE vt, void *pOu
case VT_UI8: memcpy(pOut, &V_UI8(srcVar), sizeof (LONG64));
#endif
break;
#ifndef __REACTOS__ /*FIXME: wrong definition of VT_INT_PTR in MinGW headers */
case VT_INT_PTR: memcpy(pOut, &V_INT_PTR(srcVar), sizeof (INT_PTR)); break;
#endif
case VT_DECIMAL: memcpy(pOut, &V_DECIMAL(srcVar), sizeof (DECIMAL)); break;
default:
FIXME("VT_ type %d unhandled, please report!\n", vt);
@ -600,7 +598,6 @@ HRESULT WINAPI VarUI1FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, BYTE* pbO
return _VarUI1FromStr(strIn, lcid, dwFlags, pbOut);
}
#ifndef __REACTOS__ /*FIXME: wrong declaration of VarUI1FromDisp() in MinGW header */
/************************************************************************
* VarUI1FromDisp (OLEAUT32.137)
*
@ -621,7 +618,6 @@ HRESULT WINAPI VarUI1FromDisp(IDispatch* pdispIn, LCID lcid, BYTE* pbOut)
{
return _VarUI1FromDisp(pdispIn, lcid, pbOut);
}
#endif
/************************************************************************
* VarUI1FromBool (OLEAUT32.138)
@ -905,7 +901,6 @@ HRESULT WINAPI VarI2FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, SHORT* psO
return _VarI2FromStr(strIn, lcid, dwFlags, psOut);
}
#ifndef __REACTOS__ /*FIXME: wrong declaration of VarI2FromDisp() in MinGW header */
/************************************************************************
* VarI2FromDisp (OLEAUT32.55)
*
@ -926,7 +921,6 @@ HRESULT WINAPI VarI2FromDisp(IDispatch* pdispIn, LCID lcid, SHORT* psOut)
{
return _VarI2FromDisp(pdispIn, lcid, psOut);
}
#endif
/************************************************************************
* VarI2FromBool (OLEAUT32.56)
@ -1501,7 +1495,6 @@ HRESULT WINAPI VarI4FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, LONG *piOu
return _VarI4FromStr(strIn, lcid, dwFlags, piOut);
}
#ifndef __REACTOS__ /*FIXME: wrong declaration of VarI4FromDisp() in MinGW header */
/************************************************************************
* VarI4FromDisp (OLEAUT32.65)
*
@ -1522,7 +1515,6 @@ HRESULT WINAPI VarI4FromDisp(IDispatch* pdispIn, LCID lcid, LONG *piOut)
{
return _VarI4FromDisp(pdispIn, lcid, piOut);
}
#endif
/************************************************************************
* VarI4FromBool (OLEAUT32.66)
@ -2744,12 +2736,10 @@ HRESULT WINAPI VarR4FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, float *pFl
* DISP_E_OVERFLOW, if the value will not fit in the destination
* DISP_E_TYPEMISMATCH, if the type cannot be converted
*/
#ifndef __REACTOS__ /*FIXME: wrong declaration of VarR4FromDisp() in MinGW header */
HRESULT WINAPI VarR4FromDisp(IDispatch* pdispIn, LCID lcid, float *pFltOut)
{
return _VarR4FromDisp(pdispIn, lcid, pFltOut);
}
#endif
/************************************************************************
* VarR4FromBool (OLEAUT32.76)
@ -3069,12 +3059,10 @@ HRESULT WINAPI VarR8FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, double *pD
* DISP_E_OVERFLOW, if the value will not fit in the destination
* DISP_E_TYPEMISMATCH, if the type cannot be converted
*/
#ifndef __REACTOS__ /*FIXME: wrong declaration of VarUI1FromDisp() in MinGW header */
HRESULT WINAPI VarR8FromDisp(IDispatch* pdispIn, LCID lcid, double *pDblOut)
{
return _VarR8FromDisp(pdispIn, lcid, pDblOut);
}
#endif
/************************************************************************
* VarR8FromBool (OLEAUT32.86)
@ -3494,12 +3482,10 @@ HRESULT WINAPI VarCyFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, CY* pCyOut
* DISP_E_OVERFLOW, if the value will not fit in the destination
* DISP_E_TYPEMISMATCH, if the type cannot be converted
*/
#ifndef __REACTOS__ /*FIXME: wrong declaration of VarCyFromDisp() in MinGW header */
HRESULT WINAPI VarCyFromDisp(IDispatch* pdispIn, LCID lcid, CY* pCyOut)
{
return _VarCyFromDisp(pdispIn, lcid, pCyOut);
}
#endif
/************************************************************************
@ -5080,12 +5066,10 @@ VarBoolFromStr_CheckLocalised:
* DISP_E_OVERFLOW, if the value will not fit in the destination
* DISP_E_TYPEMISMATCH, if the type cannot be converted
*/
#ifndef __REACTOS__ /*FIXME: wrong declaration of VarBoolFromDisp() in MinGW header */
HRESULT WINAPI VarBoolFromDisp(IDispatch* pdispIn, LCID lcid, VARIANT_BOOL *pBoolOut)
{
return _VarBoolFromDisp(pdispIn, lcid, pBoolOut);
}
#endif
/************************************************************************
* VarBoolFromI1 (OLEAUT32.233)
@ -5931,12 +5915,10 @@ HRESULT WINAPI VarDateFromR8(double dblIn, DATE* pdateOut)
* DISP_E_OVERFLOW, if the value will not fit in the destination
* DISP_E_TYPEMISMATCH, if the type cannot be converted
*/
#ifndef __REACTOS__ /*FIXME: wrong declaration of VarDateFromDisp() in MinGW header */
HRESULT WINAPI VarDateFromDisp(IDispatch* pdispIn, LCID lcid, DATE* pdateOut)
{
return _VarDateFromDisp(pdispIn, lcid, pdateOut);
}
#endif
/******************************************************************************
* VarDateFromBool (OLEAUT32.96)