mirror of
https://github.com/reactos/reactos.git
synced 2024-12-31 19:42:51 +00:00
enable dispatch.c and varformat.c
svn path=/trunk/; revision=8484
This commit is contained in:
Martin Fuchs
parent
4f35ba6289
commit
f685bba74e
4 changed files with 39 additions and 41 deletions
|
|
@ -17,19 +17,19 @@ C_SRCS = \
|
|||
oleaut.c \
|
||||
stubs.c \
|
||||
variant.c \
|
||||
vartype.c
|
||||
vartype.c \
|
||||
dispatch.c \
|
||||
varformat.c
|
||||
|
||||
# regsvr.c \
|
||||
# safearray.c \
|
||||
# olefont.c \
|
||||
# olepicture.c \
|
||||
# dispatch.c \
|
||||
# tmarshal.c \
|
||||
# usrmarshal.c \
|
||||
# oaidl_p.c \
|
||||
# typelib.c \
|
||||
# typelib2.c \
|
||||
# varformat.c \
|
||||
|
||||
C_SRCS16 = \
|
||||
ole2disp.c \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $Id: Makefile.ros-template,v 1.1 2004/02/07 18:53:58 mf Exp $
|
||||
# $Id: Makefile.ros-template,v 1.2 2004/02/29 14:48:12 mf Exp $
|
||||
|
||||
TARGET_NAME = oleaut32
|
||||
|
||||
|
|
@ -6,7 +6,7 @@ TARGET_OBJECTS = @C_SRCS@
|
|||
|
||||
TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__
|
||||
|
||||
TARGET_SDKLIBS = @IMPORTS@ winmm.a libwine.a wine_uuid.a ntdll.a
|
||||
TARGET_SDKLIBS = @IMPORTS@ winmm.a libwine.a wine_uuid.a libwine_unicode.a ntdll.a
|
||||
|
||||
TARGET_BASE = 0x76160000
|
||||
|
||||
|
|
|
|||
|
|
@ -25,14 +25,14 @@
|
|||
#25 stdcall SafeArrayGetElement(ptr ptr ptr)
|
||||
#26 stdcall SafeArrayPutElement(ptr ptr ptr)
|
||||
#27 stdcall SafeArrayCopy(ptr ptr)
|
||||
#28 stdcall DispGetParam(ptr long long ptr ptr)
|
||||
#29 stdcall DispGetIDsOfNames(ptr ptr long ptr)
|
||||
#30 stdcall DispInvoke(ptr ptr long long ptr ptr ptr ptr)
|
||||
#31 stdcall CreateDispTypeInfo(ptr long ptr)
|
||||
#32 stdcall CreateStdDispatch(ptr ptr ptr ptr)
|
||||
#33 stdcall RegisterActiveObject(ptr ptr long ptr)
|
||||
#34 stdcall RevokeActiveObject(long ptr)
|
||||
#35 stdcall GetActiveObject(ptr ptr ptr)
|
||||
28 stdcall DispGetParam(ptr long long ptr ptr)
|
||||
29 stdcall DispGetIDsOfNames(ptr ptr long ptr)
|
||||
30 stdcall DispInvoke(ptr ptr long long ptr ptr ptr ptr)
|
||||
31 stdcall CreateDispTypeInfo(ptr long ptr)
|
||||
32 stdcall CreateStdDispatch(ptr ptr ptr ptr)
|
||||
33 stdcall RegisterActiveObject(ptr ptr long ptr)
|
||||
34 stdcall RevokeActiveObject(long ptr)
|
||||
35 stdcall GetActiveObject(ptr ptr ptr)
|
||||
#36 stdcall SafeArrayAllocDescriptor(long ptr)
|
||||
#37 stdcall SafeArrayAllocData(ptr)
|
||||
#38 stdcall SafeArrayDestroyDescriptor(ptr)
|
||||
|
|
@ -43,8 +43,8 @@
|
|||
#43 stdcall SafeArrayCreateVectorEx(long long long ptr)
|
||||
#44 stdcall SafeArraySetRecordInfo(ptr ptr)
|
||||
#45 stdcall SafeArrayGetRecordInfo(ptr ptr)
|
||||
#46 stdcall VarParseNumFromStr(wstr long long ptr ptr)
|
||||
#47 stdcall VarNumFromParseNum(ptr ptr long ptr)
|
||||
46 stdcall VarParseNumFromStr(wstr long long ptr ptr)
|
||||
47 stdcall VarNumFromParseNum(ptr ptr long ptr)
|
||||
48 stdcall VarI2FromUI1(long ptr)
|
||||
49 stdcall VarI2FromI4(long ptr)
|
||||
50 stdcall VarI2FromR4(long ptr)
|
||||
|
|
@ -84,17 +84,17 @@
|
|||
84 stdcall VarR8FromStr(wstr long long ptr)
|
||||
85 stdcall VarR8FromDisp(ptr long ptr)
|
||||
86 stdcall VarR8FromBool(long ptr)
|
||||
#87 stdcall VarFormat(ptr ptr long long long ptr)
|
||||
87 stdcall VarFormat(ptr ptr long long long ptr)
|
||||
88 stdcall VarDateFromUI1(long ptr)
|
||||
89 stdcall VarDateFromI2(long ptr)
|
||||
90 stdcall VarDateFromI4(long ptr)
|
||||
91 stdcall VarDateFromR4(long ptr)
|
||||
92 stdcall VarDateFromR8(double ptr)
|
||||
93 stdcall VarDateFromCy(long long ptr)
|
||||
#94 stdcall VarDateFromStr(wstr long long ptr)
|
||||
94 stdcall VarDateFromStr(wstr long long ptr)
|
||||
95 stdcall VarDateFromDisp(ptr long ptr)
|
||||
96 stdcall VarDateFromBool(long ptr)
|
||||
#97 stdcall VarFormatDateTime(ptr long long ptr)
|
||||
97 stdcall VarFormatDateTime(ptr long long ptr)
|
||||
98 stdcall VarCyFromUI1(long ptr)
|
||||
99 stdcall VarCyFromI2(long ptr)
|
||||
100 stdcall VarCyFromI4(long ptr)
|
||||
|
|
@ -104,7 +104,7 @@
|
|||
104 stdcall VarCyFromStr(wstr long long ptr)
|
||||
105 stdcall VarCyFromDisp(ptr long ptr)
|
||||
106 stdcall VarCyFromBool(long ptr)
|
||||
#107 stdcall VarFormatNumber(ptr long long long long long ptr)
|
||||
107 stdcall VarFormatNumber(ptr long long long long long ptr)
|
||||
108 stdcall VarBstrFromUI1(long long long ptr)
|
||||
109 stdcall VarBstrFromI2(long long long ptr)
|
||||
110 stdcall VarBstrFromI4(long long long ptr)
|
||||
|
|
@ -114,7 +114,7 @@
|
|||
114 stdcall VarBstrFromDate(double long long ptr)
|
||||
115 stub VarBstrFromDisp
|
||||
116 stdcall VarBstrFromBool(long long long ptr)
|
||||
#117 stdcall VarFormatPercent(ptr long long long long long ptr)
|
||||
117 stdcall VarFormatPercent(ptr long long long long long ptr)
|
||||
118 stdcall VarBoolFromUI1(long ptr)
|
||||
119 stdcall VarBoolFromI2(long ptr)
|
||||
120 stdcall VarBoolFromI4(long ptr)
|
||||
|
|
@ -124,7 +124,7 @@
|
|||
124 stdcall VarBoolFromCy(long long ptr)
|
||||
125 stdcall VarBoolFromStr(wstr long long ptr)
|
||||
126 stdcall VarBoolFromDisp(ptr long ptr)
|
||||
#127 stdcall VarFormatCurrency(ptr long long long long 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)
|
||||
130 stdcall VarUI1FromI2(long ptr)
|
||||
|
|
@ -136,11 +136,11 @@
|
|||
136 stdcall VarUI1FromStr(wstr long 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)
|
||||
#141 stdcall VarAdd(ptr ptr ptr)
|
||||
#142 stdcall VarAnd(ptr ptr ptr)
|
||||
#143 stdcall VarDiv(ptr ptr ptr)
|
||||
139 stdcall VarFormatFromTokens (ptr ptr ptr long ptr long)
|
||||
140 stdcall VarTokenizeFormatString (ptr ptr long long long long ptr)
|
||||
141 stdcall VarAdd(ptr ptr ptr)
|
||||
142 stdcall VarAnd(ptr ptr ptr)
|
||||
143 stdcall VarDiv(ptr ptr ptr)
|
||||
144 stub OACreateTypeLib2
|
||||
#146 stdcall DispCallFunc(ptr long long long long ptr ptr ptr)
|
||||
147 stdcall VariantChangeTypeEx(ptr ptr long long long)
|
||||
|
|
@ -150,11 +150,11 @@
|
|||
152 stub VarEqv # stdcall (ptr ptr ptr)
|
||||
153 stub VarIdiv # stdcall (ptr ptr ptr)
|
||||
154 stub VarImp # stdcall (ptr ptr ptr)
|
||||
#155 stdcall VarMod(ptr ptr ptr)
|
||||
#156 stdcall VarMul(ptr ptr ptr)
|
||||
#157 stdcall VarOr(ptr ptr ptr)
|
||||
#158 stdcall VarPow(ptr ptr ptr)
|
||||
#159 stdcall VarSub(ptr ptr ptr)
|
||||
155 stdcall VarMod(ptr ptr ptr)
|
||||
156 stdcall VarMul(ptr ptr ptr)
|
||||
157 stdcall VarOr(ptr ptr ptr)
|
||||
158 stdcall VarPow(ptr ptr ptr)
|
||||
159 stdcall VarSub(ptr ptr ptr)
|
||||
#160 stdcall CreateTypeLib(long wstr ptr)
|
||||
#161 stdcall LoadTypeLib (wstr ptr)
|
||||
#162 stdcall LoadRegTypeLib (ptr long long long ptr)
|
||||
|
|
@ -163,15 +163,15 @@
|
|||
165 stdcall LHashValOfNameSys(long long wstr)
|
||||
166 stdcall LHashValOfNameSysA(long long str)
|
||||
167 stub VarXor # stdcall (ptr ptr ptr)
|
||||
#168 stdcall VarAbs(ptr ptr)
|
||||
#169 stdcall VarFix(ptr ptr)
|
||||
168 stdcall VarAbs(ptr ptr)
|
||||
169 stdcall VarFix(ptr ptr)
|
||||
170 stdcall OaBuildVersion()
|
||||
171 stub ClearCustData
|
||||
#172 stdcall VarInt(ptr ptr)
|
||||
#173 stdcall VarNeg(ptr ptr)
|
||||
#174 stdcall VarNot(ptr ptr)
|
||||
172 stdcall VarInt(ptr ptr)
|
||||
173 stdcall VarNeg(ptr ptr)
|
||||
174 stdcall VarNot(ptr ptr)
|
||||
175 stub VarRound # stdcall (ptr long ptr)
|
||||
#176 stdcall VarCmp(ptr ptr long long)
|
||||
176 stdcall VarCmp(ptr ptr long long)
|
||||
#177 stdcall VarDecAdd(ptr ptr ptr)
|
||||
178 stdcall VarDecDiv(ptr ptr ptr)
|
||||
#179 stdcall VarDecMul(ptr ptr ptr)
|
||||
|
|
@ -179,8 +179,8 @@
|
|||
#181 stdcall VarDecSub(ptr ptr ptr)
|
||||
182 stdcall VarDecAbs(ptr ptr)
|
||||
#183 stdcall LoadTypeLibEx (wstr long ptr)
|
||||
#184 stdcall SystemTimeToVariantTime(ptr ptr)
|
||||
#185 stdcall VariantTimeToSystemTime(double ptr)
|
||||
184 stdcall SystemTimeToVariantTime(ptr ptr)
|
||||
185 stdcall VariantTimeToSystemTime(double ptr)
|
||||
#186 stdcall UnRegisterTypeLib (ptr long long long long)
|
||||
187 stdcall VarDecFix(ptr ptr)
|
||||
188 stdcall VarDecInt(ptr ptr)
|
||||
|
|
|
|||
|
|
@ -6195,7 +6195,6 @@ VARIANT_MakeDate_OK:
|
|||
* the date is invalid in that format, in which the most compatible format
|
||||
* that produces a valid date will be used.
|
||||
*/
|
||||
#ifndef __REACTOS__ /*FIXME: no SystemTimeToVariantTime() yet */
|
||||
HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pdateOut)
|
||||
{
|
||||
static const USHORT ParseDateTokens[] =
|
||||
|
|
@ -6525,7 +6524,6 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pd
|
|||
SysFreeString(tokens[i]);
|
||||
return hRet;
|
||||
}
|
||||
#endif
|
||||
|
||||
/******************************************************************************
|
||||
* VarDateFromI1 (OLEAUT32.221)
|
||||
|
|
|
|||
Loading…
Reference in a new issue