Changeset 21853 for branches/gcc-kmk/src

Timestamp:

Dec 6, 2011, 4:01:36 PM (14 years ago)

Author:

dmik

Message:

Port OLEAUT32 to GCC/kBuild.

Location:

branches/gcc-kmk/src/oleaut32

Files:

• Makefile.kmk (added)
• libgif/Makefile.kmk (added)
• libjpeg/Makefile.kmk (added)
• ole2disp.h (modified) (1 diff)
• oleaut32.def (modified) (2 diffs)
• oleaut32dbg.def (modified) (2 diffs)
• olefont.c (modified) (8 diffs)
• olepicture.c (modified) (14 diffs)
• safearray.c (modified) (1 diff)
• tmarshal.c (modified) (29 diffs)
• typelib.c (modified) (24 diffs)
• variant.c (modified) (47 diffs)

branches/gcc-kmk/src/oleaut32/ole2disp.h

@@ -27 +27 @@
 #define UnMapLS     _UnMapLS
 
-#define _MapSL(a)    (a)
+#define _MapSL(a)    (LPVOID)(a)
 #define _UnMapLS(a)
 

branches/gcc-kmk/src/oleaut32/oleaut32.def

@@ -5 +5 @@
 
 EXPORTS
-  DllGetClassObject = _OLEAUT32_DllGetClassObject@12  @1
-  SysAllocString = _SysAllocString@4  @2
-  SysReAllocString = _SysReAllocString@8  @3
-  SysAllocStringLen = _SysAllocStringLen@8  @4
-  SysReAllocStringLen = _SysReAllocStringLen@12  @5
-  SysFreeString = _SysFreeString@4  @6
-  SysStringLen = _SysStringLen@4  @7
-  VariantInit = _VariantInit@4  @8
-  VariantClear = _VariantClear@4  @9
-  VariantCopy = _VariantCopy@8  @10
-  VariantCopyInd = _VariantCopyInd@8  @11
-  VariantChangeType = _VariantChangeType@16  @12
-  VariantTimeToDosDateTime = _VariantTimeToDosDateTime@16  @13
-  DosDateTimeToVariantTime = _DosDateTimeToVariantTime@12  @14
-  SafeArrayCreate = _SafeArrayCreate@12  @15
-  SafeArrayDestroy = _SafeArrayDestroy@4  @16
-  SafeArrayGetDim = _SafeArrayGetDim@4  @17
-  SafeArrayGetElemsize = _SafeArrayGetElemsize@4  @18
-  SafeArrayGetUBound = _SafeArrayGetUBound@12  @19
-  SafeArrayGetLBound = _SafeArrayGetLBound@12  @20
-  SafeArrayLock = _SafeArrayLock@4  @21
-  SafeArrayUnlock = _SafeArrayUnlock@4  @22
-  SafeArrayAccessData = _SafeArrayAccessData@8  @23
-  SafeArrayUnaccessData = _SafeArrayUnaccessData@4  @24
-  SafeArrayGetElement = _SafeArrayGetElement@12  @25
-  SafeArrayPutElement = _SafeArrayPutElement@12  @26
-  SafeArrayCopy = _SafeArrayCopy@8  @27
-  DispGetParam = _DispGetParam@20  @28
-  DispGetIDsOfNames = _DispGetIDsOfNames@16  @29
-  DispInvoke = _DispInvoke@32  @30
-  CreateDispTypeInfo = _CreateDispTypeInfo@12  @31
-  CreateStdDispatch = _CreateStdDispatch@16  @32
-  RegisterActiveObject = _RegisterActiveObject@16  @33
-  RevokeActiveObject = _RevokeActiveObject@8  @34
-  GetActiveObject = _GetActiveObject@12  @35
-  SafeArrayAllocDescriptor = _SafeArrayAllocDescriptor@8  @36
-  SafeArrayAllocData = _SafeArrayAllocData@4  @37
-  SafeArrayDestroyDescriptor = _SafeArrayDestroyDescriptor@4  @38
-  SafeArrayDestroyData = _SafeArrayDestroyData@4  @39
-  SafeArrayRedim = _SafeArrayRedim@8  @40
-  OACreateTypeLib2 = _OACreateTypeLib2@0  @41
-  VarParseNumFromStr = _VarParseNumFromStr@20  @46
-  VarNumFromParseNum = _VarNumFromParseNum@16  @47
-  VarI2FromUI1 = _VarI2FromUI1@8  @48
-  VarI2FromI4 = _VarI2FromI4@8  @49
-  VarI2FromR4 = _VarI2FromR4@8  @50
-  VarI2FromR8 = _VarI2FromR8@12  @51
-  VarI2FromCy = _VarI2FromCy@12  @52
-  VarI2FromDate = _VarI2FromDate@12  @53
-  VarI2FromStr = _VarI2FromStr@16  @54
-  VarI2FromDisp = _VarI2FromDisp@12  @55
-  VarI2FromBool = _VarI2FromBool@8  @56
-  VarI4FromUI1 = _VarI4FromUI1@8  @58
-  VarI4FromI2 = _VarI4FromI2@8  @59
-  VarI4FromR4 = _VarI4FromR4@8  @60
-  VarI4FromR8 = _VarI4FromR8@12  @61
-  VarI4FromCy = _VarI4FromCy@12  @62
-  VarI4FromDate = _VarI4FromDate@12  @63
-  VarI4FromStr = _VarI4FromStr@16  @64
-  VarI4FromDisp = _VarI4FromDisp@12  @65
-  VarI4FromBool = _VarI4FromBool@8  @66
-  VarR4FromUI1 = _VarR4FromUI1@8  @68
-  VarR4FromI2 = _VarR4FromI2@8  @69
-
-  VarR4FromI4                 = _VarR4FromI4@8                  @70
-  VarR4FromR8                 = _VarR4FromR8@12                 @71
-  VarR4FromCy                 = _VarR4FromCy@12                 @72
-  VarR4FromDate               = _VarR4FromDate@12               @73
-  VarR4FromStr                = _VarR4FromStr@16                @74
-  VarR4FromDisp               = _VarR4FromDisp@12               @75
-  VarR4FromBool               = _VarR4FromBool@8                @76
-  SafeArrayGetVartype         = _SafeArrayGetVartype@8          @77
-  VarR8FromUI1                = _VarR8FromUI1@8                 @78
-  VarR8FromI2                 = _VarR8FromI2@8                  @79
-
-  VarR8FromI4                 = _VarR8FromI4@8                  @80
-  VarR8FromR4                 = _VarR8FromR4@8                  @81
-  VarR8FromCy                 = _VarR8FromCy@12                 @82
-  VarR8FromDate               = _VarR8FromDate@12               @83
-  VarR8FromStr                = _VarR8FromStr@16                @84
-  VarR8FromDisp               = _VarR8FromDisp@12               @85
-  VarR8FromBool               = _VarR8FromBool@8                @86
-  VarFormat                   = _VarFormat@24                   @87
-  VarDateFromUI1              = _VarDateFromUI1@8               @88
-  VarDateFromI2               = _VarDateFromI2@8                @89
-
-  VarDateFromI4               = _VarDateFromI4@8                @90
-  VarDateFromR4               = _VarDateFromR4@8                @91
-  VarDateFromR8               = _VarDateFromR8@12               @92
-  VarDateFromCy               = _VarDateFromCy@12               @93
-  VarDateFromStr              = _VarDateFromStr@16              @94
-  VarDateFromDisp             = _VarDateFromDisp@12             @95
-  VarDateFromBool             = _VarDateFromBool@8              @96
-  VarFormatDateTime           = _VarFormatDateTime@16           @97
-  VarCyFromUI1                = _VarCyFromUI1@8                 @98
-  VarCyFromI2                 = _VarCyFromI2@8                  @99
-
-  VarCyFromI4                 = _VarCyFromI4@8                  @100
-  VarCyFromR4                 = _VarCyFromR4@8                  @101
-  VarCyFromR8                 = _VarCyFromR8@12                 @102
-  VarCyFromDate               = _VarCyFromDate@12               @103
-  VarCyFromStr                = _VarCyFromStr@16                @104
-  VarCyFromDisp               = _VarCyFromDisp@12               @105
-  VarCyFromBool               = _VarCyFromBool@8                @106
+  DllGetClassObject = "_OLEAUT32_DllGetClassObject@12"  @1
+  SysAllocString = "_SysAllocString@4"  @2
+  SysReAllocString = "_SysReAllocString@8"  @3
+  SysAllocStringLen = "_SysAllocStringLen@8"  @4
+  SysReAllocStringLen = "_SysReAllocStringLen@12"  @5
+  SysFreeString = "_SysFreeString@4"  @6
+  SysStringLen = "_SysStringLen@4"  @7
+  VariantInit = "_VariantInit@4"  @8
+  VariantClear = "_VariantClear@4"  @9
+  VariantCopy = "_VariantCopy@8"  @10
+  VariantCopyInd = "_VariantCopyInd@8"  @11
+  VariantChangeType = "_VariantChangeType@16"  @12
+  VariantTimeToDosDateTime = "_VariantTimeToDosDateTime@16"  @13
+  DosDateTimeToVariantTime = "_DosDateTimeToVariantTime@12"  @14
+  SafeArrayCreate = "_SafeArrayCreate@12"  @15
+  SafeArrayDestroy = "_SafeArrayDestroy@4"  @16
+  SafeArrayGetDim = "_SafeArrayGetDim@4"  @17
+  SafeArrayGetElemsize = "_SafeArrayGetElemsize@4"  @18
+  SafeArrayGetUBound = "_SafeArrayGetUBound@12"  @19
+  SafeArrayGetLBound = "_SafeArrayGetLBound@12"  @20
+  SafeArrayLock = "_SafeArrayLock@4"  @21
+  SafeArrayUnlock = "_SafeArrayUnlock@4"  @22
+  SafeArrayAccessData = "_SafeArrayAccessData@8"  @23
+  SafeArrayUnaccessData = "_SafeArrayUnaccessData@4"  @24
+  SafeArrayGetElement = "_SafeArrayGetElement@12"  @25
+  SafeArrayPutElement = "_SafeArrayPutElement@12"  @26
+  SafeArrayCopy = "_SafeArrayCopy@8"  @27
+  DispGetParam = "_DispGetParam@20"  @28
+  DispGetIDsOfNames = "_DispGetIDsOfNames@16"  @29
+  DispInvoke = "_DispInvoke@32"  @30
+  CreateDispTypeInfo = "_CreateDispTypeInfo@12"  @31
+  CreateStdDispatch = "_CreateStdDispatch@16"  @32
+  RegisterActiveObject = "_RegisterActiveObject@16"  @33
+  RevokeActiveObject = "_RevokeActiveObject@8"  @34
+  GetActiveObject = "_GetActiveObject@12"  @35
+  SafeArrayAllocDescriptor = "_SafeArrayAllocDescriptor@8"  @36
+  SafeArrayAllocData = "_SafeArrayAllocData@4"  @37
+  SafeArrayDestroyDescriptor = "_SafeArrayDestroyDescriptor@4"  @38
+  SafeArrayDestroyData = "_SafeArrayDestroyData@4"  @39
+  SafeArrayRedim = "_SafeArrayRedim@8"  @40
+  OACreateTypeLib2 = "_OACreateTypeLib2@0"  @41
+  VarParseNumFromStr = "_VarParseNumFromStr@20"  @46
+  VarNumFromParseNum = "_VarNumFromParseNum@16"  @47
+  VarI2FromUI1 = "_VarI2FromUI1@8"  @48
+  VarI2FromI4 = "_VarI2FromI4@8"  @49
+  VarI2FromR4 = "_VarI2FromR4@8"  @50
+  VarI2FromR8 = "_VarI2FromR8@12"  @51
+  VarI2FromCy = "_VarI2FromCy@12"  @52
+  VarI2FromDate = "_VarI2FromDate@12"  @53
+  VarI2FromStr = "_VarI2FromStr@16"  @54
+  VarI2FromDisp = "_VarI2FromDisp@12"  @55
+  VarI2FromBool = "_VarI2FromBool@8"  @56
+  VarI4FromUI1 = "_VarI4FromUI1@8"  @58
+  VarI4FromI2 = "_VarI4FromI2@8"  @59
+  VarI4FromR4 = "_VarI4FromR4@8"  @60
+  VarI4FromR8 = "_VarI4FromR8@12"  @61
+  VarI4FromCy = "_VarI4FromCy@12"  @62
+  VarI4FromDate = "_VarI4FromDate@12"  @63
+  VarI4FromStr = "_VarI4FromStr@16"  @64
+  VarI4FromDisp = "_VarI4FromDisp@12"  @65
+  VarI4FromBool = "_VarI4FromBool@8"  @66
+  VarR4FromUI1 = "_VarR4FromUI1@8"  @68
+  VarR4FromI2 = "_VarR4FromI2@8"  @69
+
+  VarR4FromI4                 = "_VarR4FromI4@8"                @70
+  VarR4FromR8                 = "_VarR4FromR8@12"               @71
+  VarR4FromCy                 = "_VarR4FromCy@12"               @72
+  VarR4FromDate               = "_VarR4FromDate@12"             @73
+  VarR4FromStr                = "_VarR4FromStr@16"              @74
+  VarR4FromDisp               = "_VarR4FromDisp@12"             @75
+  VarR4FromBool               = "_VarR4FromBool@8"              @76
+  SafeArrayGetVartype         = "_SafeArrayGetVartype@8"        @77
+  VarR8FromUI1                = "_VarR8FromUI1@8"               @78
+  VarR8FromI2                 = "_VarR8FromI2@8"                @79
+
+  VarR8FromI4                 = "_VarR8FromI4@8"                @80
+  VarR8FromR4                 = "_VarR8FromR4@8"                @81
+  VarR8FromCy                 = "_VarR8FromCy@12"               @82
+  VarR8FromDate               = "_VarR8FromDate@12"             @83
+  VarR8FromStr                = "_VarR8FromStr@16"              @84
+  VarR8FromDisp               = "_VarR8FromDisp@12"             @85
+  VarR8FromBool               = "_VarR8FromBool@8"              @86
+  VarFormat                   = "_VarFormat@24"                 @87
+  VarDateFromUI1              = "_VarDateFromUI1@8"             @88
+  VarDateFromI2               = "_VarDateFromI2@8"              @89
+
+  VarDateFromI4               = "_VarDateFromI4@8"              @90
+  VarDateFromR4               = "_VarDateFromR4@8"              @91
+  VarDateFromR8               = "_VarDateFromR8@12"             @92
+  VarDateFromCy               = "_VarDateFromCy@12"             @93
+  VarDateFromStr              = "_VarDateFromStr@16"            @94
+  VarDateFromDisp             = "_VarDateFromDisp@12"           @95
+  VarDateFromBool             = "_VarDateFromBool@8"            @96
+  VarFormatDateTime           = "_VarFormatDateTime@16"         @97
+  VarCyFromUI1                = "_VarCyFromUI1@8"               @98
+  VarCyFromI2                 = "_VarCyFromI2@8"                @99
+
+  VarCyFromI4                 = "_VarCyFromI4@8"                @100
+  VarCyFromR4                 = "_VarCyFromR4@8"                @101
+  VarCyFromR8                 = "_VarCyFromR8@12"               @102
+  VarCyFromDate               = "_VarCyFromDate@12"             @103
+  VarCyFromStr                = "_VarCyFromStr@16"              @104
+  VarCyFromDisp               = "_VarCyFromDisp@12"             @105
+  VarCyFromBool               = "_VarCyFromBool@8"              @106
 ;;  VarFormatNumber             = _VarFormatNumber@28             @107
-  VarBstrFromUI1              = _VarBstrFromUI1@16              @108
-  VarBstrFromI2               = _VarBstrFromI2@16               @109
-
-  VarBstrFromI4               = _VarBstrFromI4@16               @110
-  VarBstrFromR4               = _VarBstrFromR4@16               @111
-  VarBstrFromR8               = _VarBstrFromR8@20               @112
-  VarBstrFromCy               = _VarBstrFromCy@20               @113
-  VarBstrFromDate             = _VarBstrFromDate@20             @114
-  VarBstrFromDisp             = _VarBstrFromDisp@16             @115
-  VarBstrFromBool             = _VarBstrFromBool@16             @116
+  VarBstrFromUI1              = "_VarBstrFromUI1@16"            @108
+  VarBstrFromI2               = "_VarBstrFromI2@16"             @109
+
+  VarBstrFromI4               = "_VarBstrFromI4@16"             @110
+  VarBstrFromR4               = "_VarBstrFromR4@16"             @111
+  VarBstrFromR8               = "_VarBstrFromR8@20"             @112
+  VarBstrFromCy               = "_VarBstrFromCy@20"             @113
+  VarBstrFromDate             = "_VarBstrFromDate@20"           @114
+  VarBstrFromDisp             = "_VarBstrFromDisp@16"           @115
+  VarBstrFromBool             = "_VarBstrFromBool@16"           @116
 ;;  VarFormatPercent            = _VarFormatPercent@28            @117
-  VarBoolFromUI1              = _VarBoolFromUI1@8               @118
-  VarBoolFromI2               = _VarBoolFromI2@8                @119
-
-  VarBoolFromI4               = _VarBoolFromI4@8                @120
-  VarBoolFromR4               = _VarBoolFromR4@8                @121
-  VarBoolFromR8               = _VarBoolFromR8@12               @122
-  VarBoolFromDate             = _VarBoolFromDate@12             @123
-  VarBoolFromCy               = _VarBoolFromCy@12               @124
-  VarBoolFromStr              = _VarBoolFromStr@16              @125
-  VarBoolFromDisp             = _VarBoolFromDisp@12             @126
-  VarFormatCurrency           = _VarFormatCurrency@28           @127
-
-  VarUI1FromI2                = _VarUI1FromI2@8                 @130
-  VarUI1FromI4                = _VarUI1FromI4@8                 @131
-  VarUI1FromR4                = _VarUI1FromR4@8                 @132
-  VarUI1FromR8                = _VarUI1FromR8@12                @133
-  VarUI1FromCy                = _VarUI1FromCy@12                @134
-  VarUI1FromDate              = _VarUI1FromDate@12              @135
-  VarUI1FromStr               = _VarUI1FromStr@16               @136
-  VarUI1FromDisp              = _VarUI1FromDisp@12              @137
-  VarUI1FromBool              = _VarUI1FromBool@8               @138
-  VarFormatFromTokens         = _VarFormatFromTokens@24         @139
-
-  VarTokenizeFormatString     = _VarTokenizeFormatString@28     @140
-  VarAnd                      = _VarAnd@12                      @142
-
-  DispCallFunc                = _DispCallFunc@32                @146
-  VariantChangeTypeEx         = _VariantChangeTypeEx@20         @147
-  SafeArrayPtrOfIndex         = _SafeArrayPtrOfIndex@12         @148
-  SysStringByteLen            = _SysStringByteLen@4             @149
-
-  SysAllocStringByteLen       = _SysAllocStringByteLen@8        @150
-
-  CreateTypeLib               = _CreateTypeLib@12               @160
-  LoadTypeLib                 = _LoadTypeLib@8                  @161
-  LoadRegTypeLib              = _LoadRegTypeLib@20              @162
-  RegisterTypeLib             = _RegisterTypeLib@12             @163
-  QueryPathOfRegTypeLib       = _QueryPathOfRegTypeLib@20       @164
-  LHashValOfNameSys           = _LHashValOfNameSys@12           @165
-  LHashValOfNameSysA          = _LHashValOfNameSysA@12          @166
-
-  OaBuildVersion              = _OaBuildVersion@0               @170
-  ClearCustData               = _ClearCustData@4                @171
-  VarNot                      = _VarNot@8                       @174
-  VarCmp                      = _VarCmp@16                      @176
-
-  CreateTypeLib2              = _CreateTypeLib2@12              @180
-  LoadTypeLibEx               = _LoadTypeLibEx@12               @183
-  SystemTimeToVariantTime     = _SystemTimeToVariantTime@8      @184
-  VariantTimeToSystemTime     = _VariantTimeToSystemTime@12     @185
-  UnRegisterTypeLib           = _UnRegisterTypeLib@20           @186
-
-  VarDecFromUI1               = _VarDecFromUI1@8                @190
-  VarDecFromI2                = _VarDecFromI2@8                 @191
-  VarDecFromI4                = _VarDecFromI4@8                 @192
-  VarDecFromR4                = _VarDecFromR4@8                 @193
-  VarDecFromR8                = _VarDecFromR8@12                @194
-  VarDecFromDate              = _VarDecFromDate@12              @195
-  VarDecFromCy                = _VarDecFromCy@12                @196
-  VarDecFromStr               = _VarDecFromStr@16               @197
-  VarDecFromDisp              = _VarDecFromDisp@12              @198
-  VarDecFromBool              = _VarDecFromBool@8               @199
-
-  GetErrorInfo = _GetErrorInfo@8  @200
-  SetErrorInfo = _SetErrorInfo@8  @201
-  CreateErrorInfo = _CreateErrorInfo@4  @202
-  VarI2FromI1 = _VarI2FromI1@8  @205
-  VarI2FromUI2 = _VarI2FromUI2@8  @206
-  VarI2FromUI4 = _VarI2FromUI4@8  @207
-  VarI2FromDec = _VarI2FromDec@8  @208
-  VarI4FromI1 = _VarI4FromI1@8  @209
-  VarI4FromUI2 = _VarI4FromUI2@8  @210
-
-  VarI4FromUI4 = _VarI4FromUI4@8  @211
-  VarI4FromDec = _VarI4FromDec@8  @212
-  VarR4FromI1 = _VarR4FromI1@8  @213
-  VarR4FromUI2 = _VarR4FromUI2@8  @214
-  VarR4FromUI4 = _VarR4FromUI4@8  @215
-  VarR4FromDec = _VarR4FromDec@8  @216
-  VarR8FromI1 = _VarR8FromI1@8  @217
-  VarR8FromUI2 = _VarR8FromUI2@8  @218
-  VarR8FromUI4 = _VarR8FromUI4@8  @219
-
-  VarR8FromDec = _VarR8FromDec@8  @220
-  VarDateFromI1 = _VarDateFromI1@8  @221
-  VarDateFromUI2 = _VarDateFromUI2@8  @222
-  VarDateFromUI4 = _VarDateFromUI4@8  @223
-  VarDateFromDec = _VarDateFromDec@8  @224
-  VarCyFromI1 = _VarCyFromI1@8  @225
-  VarCyFromUI2 = _VarCyFromUI2@8  @226
-  VarCyFromUI4 = _VarCyFromUI4@8  @227
-  VarCyFromDec = _VarCyFromDec@8  @228
-  VarBstrFromI1 = _VarBstrFromI1@16  @229
-
-VarBstrFromUI2 = _VarBstrFromUI2@16  @230
-VarBstrFromUI4 = _VarBstrFromUI4@16  @231
-VarBstrFromDec = _VarBstrFromDec@16  @232
-VarBoolFromI1 = _VarBoolFromI1@8  @233
-VarBoolFromUI2 = _VarBoolFromUI2@8  @234
-VarBoolFromUI4 = _VarBoolFromUI4@8  @235
-VarBoolFromDec = _VarBoolFromDec@8  @236
-VarUI1FromI1 = _VarUI1FromI1@8  @237
-VarUI1FromUI2 = _VarUI1FromUI2@8  @238
-VarUI1FromUI4 = _VarUI1FromUI4@8  @239
-VarUI1FromDec = _VarUI1FromDec@8  @240
-VarDecFromI1 = _VarDecFromI1@8  @241
-VarDecFromUI2 = _VarDecFromUI2@8  @242
-VarDecFromUI4 = _VarDecFromUI4@8  @243
-VarI1FromUI1 = _VarI1FromUI1@8  @244
-VarI1FromI2 = _VarI1FromI2@8  @245
-VarI1FromI4 = _VarI1FromI4@8 @246
-VarI1FromR4 = _VarI1FromR4@8 @247
-VarI1FromR8 = _VarI1FromR8@12  @248
-VarI1FromDate = _VarI1FromDate@12  @249
-VarI1FromCy = _VarI1FromCy@12  @250
-VarI1FromStr = _VarI1FromStr@16  @251
-VarI1FromDisp = _VarI1FromDisp@12  @252
-VarI1FromBool = _VarI1FromBool@8  @253
-VarI1FromUI2 = _VarI1FromUI2@8  @254
-VarI1FromUI4 = _VarI1FromUI4@8  @255
-VarI1FromDec = _VarI1FromDec@8  @256
-VarUI2FromUI1 = _VarUI2FromUI1@8  @257
-VarUI2FromI2 = _VarUI2FromI2@8  @258
-VarUI2FromI4 = _VarUI2FromI4@8  @259
-VarUI2FromR4 = _VarUI2FromR4@8  @260
-VarUI2FromR8 = _VarUI2FromR8@12  @261
-VarUI2FromDate = _VarUI2FromDate@12  @262
-VarUI2FromCy = _VarUI2FromCy@12  @263
-VarUI2FromStr = _VarUI2FromStr@16  @264
-VarUI2FromDisp = _VarUI2FromDisp@12  @265
-VarUI2FromBool = _VarUI2FromBool@8  @266
-VarUI2FromI1 = _VarUI2FromI1@8  @267
-VarUI2FromUI4 = _VarUI2FromUI4@8  @268
-VarUI2FromDec = _VarUI2FromDec@8  @269
-VarUI4FromUI1 = _VarUI4FromUI1@8  @270
-VarUI4FromI2 = _VarUI4FromI2@8  @271
-VarUI4FromI4 = _VarUI4FromI4@8  @272
-VarUI4FromR4 = _VarUI4FromR4@8  @273
-VarUI4FromR8 = _VarUI4FromR8@12  @274
-VarUI4FromDate = _VarUI4FromDate@12  @275
-VarUI4FromCy = _VarUI4FromCy@12  @276
-VarUI4FromStr = _VarUI4FromStr@16  @277
-VarUI4FromDisp = _VarUI4FromDisp@12  @278
-VarUI4FromBool = _VarUI4FromBool@8  @279
-VarUI4FromI1 = _VarUI4FromI1@8  @280
-VarUI4FromUI2 = _VarUI4FromUI2@8  @281
-VarUI4FromDec = _VarUI4FromDec@8  @282
-BSTR_UserSize = _BSTR_UserSize@12  @283
-BSTR_UserMarshal = _BSTR_UserMarshal@12  @284
-BSTR_UserUnmarshal = _BSTR_UserUnmarshal@12  @285
-BSTR_UserFree = _BSTR_UserFree@8  @286
-VARIANT_UserSize = _VARIANT_UserSize@12  @287
-VARIANT_UserMarshal = _VARIANT_UserMarshal@12  @288
-VARIANT_UserUnmarshal = _VARIANT_UserUnmarshal@12  @289
-VARIANT_UserFree = _VARIANT_UserFree@8  @290
-LPSAFEARRAY_UserSize = _LPSAFEARRAY_UserSize@12  @291
-LPSAFEARRAY_UserMarshal = _LPSAFEARRAY_UserMarshal@12  @292
-LPSAFEARRAY_UserUnmarshal = _LPSAFEARRAY_UserUnmarshal@12  @293
-LPSAFEARRAY_UserFree = _LPSAFEARRAY_UserFree@8  @294
-LPSAFEARRAY_Size = _LPSAFEARRAY_Size@0  @295
-LPSAFEARRAY_Marshal = _LPSAFEARRAY_Marshal@0  @296
-LPSAFEARRAY_Unmarshal = _LPSAFEARRAY_Unmarshal@0  @297
-
-  VarCyMulI4               = _VarCyMulI4@16                    @304
-
-  VarBstrCat               = _VarBstrCat@12                    @313
-  VarBstrCmp               = _VarBstrCmp@16                    @314
-  VarCat                   = _VarCat@12                        @318
-
-DllRegisterServer = _OLEAUT32_DllRegisterServer@0  @320
-DllUnregisterServer = _OLEAUT32_DllUnregisterServer@0  @321
-
-VarDateFromUdate = _VarDateFromUdate@12  @330
-VarUdateFromDate = _VarUdateFromDate@16  @331
-GetAltMonthNames = _GetAltMonthNames@8  @332
-UserHWND_from_local = _UserHWND_from_local@0  @380
-UserHWND_to_local = _UserHWND_to_local@0  @381
-UserHWND_free_inst = _UserHWND_free_inst@0  @382
-UserHWND_free_local = _UserHWND_free_local@0  @383
-UserBSTR_from_local = _UserBSTR_from_local@0  @384
-UserBSTR_to_local = _UserBSTR_to_local@0  @385
-UserBSTR_free_inst = _UserBSTR_free_inst@0  @386
-UserBSTR_free_local = _UserBSTR_free_local@0  @387
-UserVARIANT_from_local = _UserVARIANT_from_local@0  @388
-UserVARIANT_to_local = _UserVARIANT_to_local@0  @389
-UserVARIANT_free_inst = _UserVARIANT_free_inst@0  @390
-UserVARIANT_free_local = _UserVARIANT_free_local@0  @391
-UserEXCEPINFO_from_local = _UserEXCEPINFO_from_local@0  @392
-UserEXCEPINFO_to_local = _UserEXCEPINFO_to_local@0  @393
-UserEXCEPINFO_free_inst = _UserEXCEPINFO_free_inst@0  @394
-UserEXCEPINFO_free_local = _UserEXCEPINFO_free_local@0  @395
-UserMSG_from_local = _UserMSG_from_local@0  @396
-UserMSG_to_local = _UserMSG_to_local@0  @397
-UserMSG_free_inst = _UserMSG_free_inst@0  @398
-UserMSG_free_local = _UserMSG_free_local@0  @399
-
-DllCanUnloadNow = _OLEAUT32_DllCanUnloadNow@0  @410
-SafeArrayCreateVector = _SafeArrayCreateVector@12  @411
-SafeArrayCopyData = _SafeArrayCopyData@8  @412
-VectorFromBstr = _VectorFromBstr@8  @413
-BstrFromVector = _BstrFromVector@8  @414
-OleIconToCursor = _OleIconToCursor@8  @415
-OleCreatePropertyFrameIndirect = _OleCreatePropertyFrameIndirect@4  @416
-OleCreatePropertyFrame = _OleCreatePropertyFrame@44  @417
-OleLoadPicture = _OleLoadPicture@20  @418
-OleCreatePictureIndirect = _OleCreatePictureIndirect@16  @419
-OleCreateFontIndirect = _OleCreateFontIndirect@12  @420
-OleTranslateColor = _OleTranslateColor@12    @421
-OleLoadPictureFile = _OleLoadPictureFile@20  @422
-OleSavePictureFile = _OleSavePictureFile@8   @423
-OleLoadPicturePath = _OleLoadPicturePath@24  @424
-OleLoadPictureEx   = _OleLoadPictureEx@32    @425
+  VarBoolFromUI1              = "_VarBoolFromUI1@8"             @118
+  VarBoolFromI2               = "_VarBoolFromI2@8"              @119
+
+  VarBoolFromI4               = "_VarBoolFromI4@8"              @120
+  VarBoolFromR4               = "_VarBoolFromR4@8"              @121
+  VarBoolFromR8               = "_VarBoolFromR8@12"             @122
+  VarBoolFromDate             = "_VarBoolFromDate@12"           @123
+  VarBoolFromCy               = "_VarBoolFromCy@12"             @124
+  VarBoolFromStr              = "_VarBoolFromStr@16"            @125
+  VarBoolFromDisp             = "_VarBoolFromDisp@12"           @126
+  VarFormatCurrency           = "_VarFormatCurrency@28"         @127
+
+  VarUI1FromI2                = "_VarUI1FromI2@8"               @130
+  VarUI1FromI4                = "_VarUI1FromI4@8"               @131
+  VarUI1FromR4                = "_VarUI1FromR4@8"               @132
+  VarUI1FromR8                = "_VarUI1FromR8@12"              @133
+  VarUI1FromCy                = "_VarUI1FromCy@12"              @134
+  VarUI1FromDate              = "_VarUI1FromDate@12"            @135
+  VarUI1FromStr               = "_VarUI1FromStr@16"             @136
+  VarUI1FromDisp              = "_VarUI1FromDisp@12"            @137
+  VarUI1FromBool              = "_VarUI1FromBool@8"             @138
+  VarFormatFromTokens         = "_VarFormatFromTokens@24"       @139
+
+  VarTokenizeFormatString     = "_VarTokenizeFormatString@28"   @140
+  VarAnd                      = "_VarAnd@12"                    @142
+
+  DispCallFunc                = "_DispCallFunc@32"              @146
+  VariantChangeTypeEx         = "_VariantChangeTypeEx@20"       @147
+  SafeArrayPtrOfIndex         = "_SafeArrayPtrOfIndex@12"       @148
+  SysStringByteLen            = "_SysStringByteLen@4"           @149
+
+  SysAllocStringByteLen       = "_SysAllocStringByteLen@8"      @150
+
+  CreateTypeLib               = "_CreateTypeLib@12"             @160
+  LoadTypeLib                 = "_LoadTypeLib@8"                @161
+  LoadRegTypeLib              = "_LoadRegTypeLib@20"            @162
+  RegisterTypeLib             = "_RegisterTypeLib@12"           @163
+  QueryPathOfRegTypeLib       = "_QueryPathOfRegTypeLib@20"     @164
+  LHashValOfNameSys           = "_LHashValOfNameSys@12"         @165
+  LHashValOfNameSysA          = "_LHashValOfNameSysA@12"        @166
+
+  OaBuildVersion              = "_OaBuildVersion@0"             @170
+  ClearCustData               = "_ClearCustData@4"              @171
+  VarNot                      = "_VarNot@8"                     @174
+  VarCmp                      = "_VarCmp@16"                    @176
+
+  CreateTypeLib2              = "_CreateTypeLib2@12"            @180
+  LoadTypeLibEx               = "_LoadTypeLibEx@12"             @183
+  SystemTimeToVariantTime     = "_SystemTimeToVariantTime@8"    @184
+  VariantTimeToSystemTime     = "_VariantTimeToSystemTime@12"   @185
+  UnRegisterTypeLib           = "_UnRegisterTypeLib@20"         @186
+
+  VarDecFromUI1               = "_VarDecFromUI1@8"              @190
+  VarDecFromI2                = "_VarDecFromI2@8"               @191
+  VarDecFromI4                = "_VarDecFromI4@8"               @192
+  VarDecFromR4                = "_VarDecFromR4@8"               @193
+  VarDecFromR8                = "_VarDecFromR8@12"              @194
+  VarDecFromDate              = "_VarDecFromDate@12"            @195
+  VarDecFromCy                = "_VarDecFromCy@12"              @196
+  VarDecFromStr               = "_VarDecFromStr@16"             @197
+  VarDecFromDisp              = "_VarDecFromDisp@12"            @198
+  VarDecFromBool              = "_VarDecFromBool@8"             @199
+
+  GetErrorInfo = "_GetErrorInfo@8"  @200
+  SetErrorInfo = "_SetErrorInfo@8"  @201
+  CreateErrorInfo = "_CreateErrorInfo@4"  @202
+  VarI2FromI1 = "_VarI2FromI1@8"  @205
+  VarI2FromUI2 = "_VarI2FromUI2@8"  @206
+  VarI2FromUI4 = "_VarI2FromUI4@8"  @207
+  VarI2FromDec = "_VarI2FromDec@8"  @208
+  VarI4FromI1 = "_VarI4FromI1@8"  @209
+  VarI4FromUI2 = "_VarI4FromUI2@8"  @210
+
+  VarI4FromUI4 = "_VarI4FromUI4@8"  @211
+  VarI4FromDec = "_VarI4FromDec@8"  @212
+  VarR4FromI1 = "_VarR4FromI1@8"  @213
+  VarR4FromUI2 = "_VarR4FromUI2@8"  @214
+  VarR4FromUI4 = "_VarR4FromUI4@8"  @215
+  VarR4FromDec = "_VarR4FromDec@8"  @216
+  VarR8FromI1 = "_VarR8FromI1@8"  @217
+  VarR8FromUI2 = "_VarR8FromUI2@8"  @218
+  VarR8FromUI4 = "_VarR8FromUI4@8"  @219
+
+  VarR8FromDec = "_VarR8FromDec@8"  @220
+  VarDateFromI1 = "_VarDateFromI1@8"  @221
+  VarDateFromUI2 = "_VarDateFromUI2@8"  @222
+  VarDateFromUI4 = "_VarDateFromUI4@8"  @223
+  VarDateFromDec = "_VarDateFromDec@8"  @224
+  VarCyFromI1 = "_VarCyFromI1@8"  @225
+  VarCyFromUI2 = "_VarCyFromUI2@8"  @226
+  VarCyFromUI4 = "_VarCyFromUI4@8"  @227
+  VarCyFromDec = "_VarCyFromDec@8"  @228
+  VarBstrFromI1 = "_VarBstrFromI1@16"  @229
+
+VarBstrFromUI2 = "_VarBstrFromUI2@16"  @230
+VarBstrFromUI4 = "_VarBstrFromUI4@16"  @231
+VarBstrFromDec = "_VarBstrFromDec@16"  @232
+VarBoolFromI1 = "_VarBoolFromI1@8"  @233
+VarBoolFromUI2 = "_VarBoolFromUI2@8"  @234
+VarBoolFromUI4 = "_VarBoolFromUI4@8"  @235
+VarBoolFromDec = "_VarBoolFromDec@8"  @236
+VarUI1FromI1 = "_VarUI1FromI1@8"  @237
+VarUI1FromUI2 = "_VarUI1FromUI2@8"  @238
+VarUI1FromUI4 = "_VarUI1FromUI4@8"  @239
+VarUI1FromDec = "_VarUI1FromDec@8"  @240
+VarDecFromI1 = "_VarDecFromI1@8"  @241
+VarDecFromUI2 = "_VarDecFromUI2@8"  @242
+VarDecFromUI4 = "_VarDecFromUI4@8"  @243
+VarI1FromUI1 = "_VarI1FromUI1@8"  @244
+VarI1FromI2 = "_VarI1FromI2@8"  @245
+VarI1FromI4 = "_VarI1FromI4@8" @246
+VarI1FromR4 = "_VarI1FromR4@8" @247
+VarI1FromR8 = "_VarI1FromR8@12"  @248
+VarI1FromDate = "_VarI1FromDate@12"  @249
+VarI1FromCy = "_VarI1FromCy@12"  @250
+VarI1FromStr = "_VarI1FromStr@16"  @251
+VarI1FromDisp = "_VarI1FromDisp@12"  @252
+VarI1FromBool = "_VarI1FromBool@8"  @253
+VarI1FromUI2 = "_VarI1FromUI2@8"  @254
+VarI1FromUI4 = "_VarI1FromUI4@8"  @255
+VarI1FromDec = "_VarI1FromDec@8"  @256
+VarUI2FromUI1 = "_VarUI2FromUI1@8"  @257
+VarUI2FromI2 = "_VarUI2FromI2@8"  @258
+VarUI2FromI4 = "_VarUI2FromI4@8"  @259
+VarUI2FromR4 = "_VarUI2FromR4@8"  @260
+VarUI2FromR8 = "_VarUI2FromR8@12"  @261
+VarUI2FromDate = "_VarUI2FromDate@12"  @262
+VarUI2FromCy = "_VarUI2FromCy@12"  @263
+VarUI2FromStr = "_VarUI2FromStr@16"  @264
+VarUI2FromDisp = "_VarUI2FromDisp@12"  @265
+VarUI2FromBool = "_VarUI2FromBool@8"  @266
+VarUI2FromI1 = "_VarUI2FromI1@8"  @267
+VarUI2FromUI4 = "_VarUI2FromUI4@8"  @268
+VarUI2FromDec = "_VarUI2FromDec@8"  @269
+VarUI4FromUI1 = "_VarUI4FromUI1@8"  @270
+VarUI4FromI2 = "_VarUI4FromI2@8"  @271
+VarUI4FromI4 = "_VarUI4FromI4@8"  @272
+VarUI4FromR4 = "_VarUI4FromR4@8"  @273
+VarUI4FromR8 = "_VarUI4FromR8@12"  @274
+VarUI4FromDate = "_VarUI4FromDate@12"  @275
+VarUI4FromCy = "_VarUI4FromCy@12"  @276
+VarUI4FromStr = "_VarUI4FromStr@16"  @277
+VarUI4FromDisp = "_VarUI4FromDisp@12"  @278
+VarUI4FromBool = "_VarUI4FromBool@8"  @279
+VarUI4FromI1 = "_VarUI4FromI1@8"  @280
+VarUI4FromUI2 = "_VarUI4FromUI2@8"  @281
+VarUI4FromDec = "_VarUI4FromDec@8"  @282
+BSTR_UserSize = "_BSTR_UserSize@12"  @283
+BSTR_UserMarshal = "_BSTR_UserMarshal@12"  @284
+BSTR_UserUnmarshal = "_BSTR_UserUnmarshal@12"  @285
+BSTR_UserFree = "_BSTR_UserFree@8"  @286
+VARIANT_UserSize = "_VARIANT_UserSize@12"  @287
+VARIANT_UserMarshal = "_VARIANT_UserMarshal@12"  @288
+VARIANT_UserUnmarshal = "_VARIANT_UserUnmarshal@12"  @289
+VARIANT_UserFree = "_VARIANT_UserFree@8"  @290
+LPSAFEARRAY_UserSize = "_LPSAFEARRAY_UserSize@12"  @291
+LPSAFEARRAY_UserMarshal = "_LPSAFEARRAY_UserMarshal@12"  @292
+LPSAFEARRAY_UserUnmarshal = "_LPSAFEARRAY_UserUnmarshal@12"  @293
+LPSAFEARRAY_UserFree = "_LPSAFEARRAY_UserFree@8"  @294
+LPSAFEARRAY_Size = "_LPSAFEARRAY_Size@0"  @295
+LPSAFEARRAY_Marshal = "_LPSAFEARRAY_Marshal@0"  @296
+LPSAFEARRAY_Unmarshal = "_LPSAFEARRAY_Unmarshal@0"  @297
+
+  VarCyMulI4               = "_VarCyMulI4@16"                  @304
+
+  VarBstrCat               = "_VarBstrCat@12"                  @313
+  VarBstrCmp               = "_VarBstrCmp@16"                  @314
+  VarCat                   = "_VarCat@12"                      @318
+
+DllRegisterServer = "_OLEAUT32_DllRegisterServer@0"  @320
+DllUnregisterServer = "_OLEAUT32_DllUnregisterServer@0"  @321
+
+VarDateFromUdate = "_VarDateFromUdate@12"  @330
+VarUdateFromDate = "_VarUdateFromDate@16"  @331
+GetAltMonthNames = "_GetAltMonthNames@8"  @332
+UserHWND_from_local = "_UserHWND_from_local@0"  @380
+UserHWND_to_local = "_UserHWND_to_local@0"  @381
+UserHWND_free_inst = "_UserHWND_free_inst@0"  @382
+UserHWND_free_local = "_UserHWND_free_local@0"  @383
+UserBSTR_from_local = "_UserBSTR_from_local@0"  @384
+UserBSTR_to_local = "_UserBSTR_to_local@0"  @385
+UserBSTR_free_inst = "_UserBSTR_free_inst@0"  @386
+UserBSTR_free_local = "_UserBSTR_free_local@0"  @387
+UserVARIANT_from_local = "_UserVARIANT_from_local@0"  @388
+UserVARIANT_to_local = "_UserVARIANT_to_local@0"  @389
+UserVARIANT_free_inst = "_UserVARIANT_free_inst@0"  @390
+UserVARIANT_free_local = "_UserVARIANT_free_local@0"  @391
+UserEXCEPINFO_from_local = "_UserEXCEPINFO_from_local@0"  @392
+UserEXCEPINFO_to_local = "_UserEXCEPINFO_to_local@0"  @393
+UserEXCEPINFO_free_inst = "_UserEXCEPINFO_free_inst@0"  @394
+UserEXCEPINFO_free_local = "_UserEXCEPINFO_free_local@0"  @395
+UserMSG_from_local = "_UserMSG_from_local@0"  @396
+UserMSG_to_local = "_UserMSG_to_local@0"  @397
+UserMSG_free_inst = "_UserMSG_free_inst@0"  @398
+UserMSG_free_local = "_UserMSG_free_local@0"  @399
+
+DllCanUnloadNow = "_OLEAUT32_DllCanUnloadNow@0"  @410
+SafeArrayCreateVector = "_SafeArrayCreateVector@12"  @411
+SafeArrayCopyData = "_SafeArrayCopyData@8"  @412
+VectorFromBstr = "_VectorFromBstr@8"  @413
+BstrFromVector = "_BstrFromVector@8"  @414
+OleIconToCursor = "_OleIconToCursor@8"  @415
+OleCreatePropertyFrameIndirect = "_OleCreatePropertyFrameIndirect@4"  @416
+OleCreatePropertyFrame = "_OleCreatePropertyFrame@44"  @417
+OleLoadPicture = "_OleLoadPicture@20"  @418
+OleCreatePictureIndirect = "_OleCreatePictureIndirect@16"  @419
+OleCreateFontIndirect = "_OleCreateFontIndirect@12"  @420
+OleTranslateColor = "_OleTranslateColor@12"  @421
+OleLoadPictureFile = "_OleLoadPictureFile@20"  @422
+OleSavePictureFile = "_OleSavePictureFile@8" @423
+OleLoadPicturePath = "_OleLoadPicturePath@24"  @424
+OleLoadPictureEx   = "_OleLoadPictureEx@32"  @425
 
 ;Win98 and higher (NT4.0sp4)
@@ -339 +339 @@
 ;428 stub OleLoadPictureFileEx
 
-SafeArrayAllocDescriptorEx = _SafeArrayAllocDescriptorEx@12 @429
-
-
+SafeArrayAllocDescriptorEx = "_SafeArrayAllocDescriptorEx@12" @429
+
+

branches/gcc-kmk/src/oleaut32/oleaut32dbg.def

@@ -5 +5 @@
 
 EXPORTS
-DllGetClassObject = _DbgOLEAUT32_DllGetClassObject@12  @1
-SysAllocString = _DbgSysAllocString@4  @2
-SysReAllocString = _DbgSysReAllocString@8  @3
-SysAllocStringLen = _DbgSysAllocStringLen@8  @4
-SysReAllocStringLen = _DbgSysReAllocStringLen@12  @5
-SysFreeString = _DbgSysFreeString@4  @6
-SysStringLen = _DbgSysStringLen@4  @7
-VariantInit = _DbgVariantInit@4  @8
-VariantClear = _DbgVariantClear@4  @9
-VariantCopy = _DbgVariantCopy@8  @10
-VariantCopyInd = _DbgVariantCopyInd@8  @11
-VariantChangeType = _DbgVariantChangeType@16  @12
-VariantTimeToDosDateTime = _DbgVariantTimeToDosDateTime@16  @13
-DosDateTimeToVariantTime = _DbgDosDateTimeToVariantTime@12  @14
-SafeArrayCreate = _DbgSafeArrayCreate@12  @15
-SafeArrayDestroy = _DbgSafeArrayDestroy@4  @16
-SafeArrayGetDim = _DbgSafeArrayGetDim@4  @17
-SafeArrayGetElemsize = _DbgSafeArrayGetElemsize@4  @18
-SafeArrayGetUBound = _DbgSafeArrayGetUBound@12  @19
-SafeArrayGetLBound = _DbgSafeArrayGetLBound@12  @20
-SafeArrayLock = _DbgSafeArrayLock@4  @21
-SafeArrayUnlock = _DbgSafeArrayUnlock@4  @22
-SafeArrayAccessData = _DbgSafeArrayAccessData@8  @23
-SafeArrayUnaccessData = _DbgSafeArrayUnaccessData@4  @24
-SafeArrayGetElement = _DbgSafeArrayGetElement@12  @25
-SafeArrayPutElement = _DbgSafeArrayPutElement@12  @26
-SafeArrayCopy = _DbgSafeArrayCopy@8  @27
-DispGetParam = _DbgDispGetParam@20  @28
-DispGetIDsOfNames = _DbgDispGetIDsOfNames@16  @29
-DispInvoke = _DbgDispInvoke@32  @30
-CreateDispTypeInfo = _DbgCreateDispTypeInfo@12  @31
-CreateStdDispatch = _DbgCreateStdDispatch@16  @32
-RegisterActiveObject = _DbgRegisterActiveObject@16  @33
-RevokeActiveObject = _DbgRevokeActiveObject@8  @34
-GetActiveObject = _DbgGetActiveObject@12  @35
-SafeArrayAllocDescriptor = _DbgSafeArrayAllocDescriptor@8  @36
-SafeArrayAllocData = _DbgSafeArrayAllocData@4  @37
-SafeArrayDestroyDescriptor = _DbgSafeArrayDestroyDescriptor@4  @38
-SafeArrayDestroyData = _DbgSafeArrayDestroyData@4  @39
-SafeArrayRedim = _DbgSafeArrayRedim@8  @40
-OACreateTypeLib2 = _DbgOACreateTypeLib2@0  @41
-VarParseNumFromStr = _DbgVarParseNumFromStr@20  @46
-VarNumFromParseNum = _DbgVarNumFromParseNum@16  @47
-VarI2FromUI1 = _DbgVarI2FromUI1@8  @48
-VarI2FromI4 = _DbgVarI2FromI4@8  @49
-VarI2FromR4 = _DbgVarI2FromR4@8  @50
-VarI2FromR8 = _DbgVarI2FromR8@12  @51
-VarI2FromCy = _DbgVarI2FromCy@12  @52
-VarI2FromDate = _DbgVarI2FromDate@12  @53
-VarI2FromStr = _DbgVarI2FromStr@16  @54
-VarI2FromDisp = _DbgVarI2FromDisp@12  @55
-VarI2FromBool = _DbgVarI2FromBool@8  @56
-VarI4FromUI1 = _DbgVarI4FromUI1@8  @58
-VarI4FromI2 = _DbgVarI4FromI2@8  @59
-VarI4FromR4 = _DbgVarI4FromR4@8  @60
-VarI4FromR8 = _DbgVarI4FromR8@12  @61
-VarI4FromCy = _DbgVarI4FromCy@12  @62
-VarI4FromDate = _DbgVarI4FromDate@12  @63
-VarI4FromStr = _DbgVarI4FromStr@16  @64
-VarI4FromDisp = _DbgVarI4FromDisp@12  @65
-VarI4FromBool = _DbgVarI4FromBool@8  @66
-VarR4FromUI1 = _DbgVarR4FromUI1@8  @68
-VarR4FromI2 = _DbgVarR4FromI2@8  @69
-
-  VarR4FromI4                 = _DbgVarR4FromI4@8                  @70
-  VarR4FromR8                 = _DbgVarR4FromR8@12                 @71
-  VarR4FromCy                 = _DbgVarR4FromCy@12                 @72
-  VarR4FromDate               = _DbgVarR4FromDate@12               @73
-  VarR4FromStr                = _DbgVarR4FromStr@16                @74
-  VarR4FromDisp               = _DbgVarR4FromDisp@12               @75
-  VarR4FromBool               = _DbgVarR4FromBool@8                @76
-  SafeArrayGetVartype         = _DbgSafeArrayGetVartype@8          @77
-  VarR8FromUI1                = _DbgVarR8FromUI1@8                 @78
-  VarR8FromI2                 = _DbgVarR8FromI2@8                  @79
-
-  VarR8FromI4                 = _DbgVarR8FromI4@8                  @80
-  VarR8FromR4                 = _DbgVarR8FromR4@8                  @81
-  VarR8FromCy                 = _DbgVarR8FromCy@12                 @82
-  VarR8FromDate               = _DbgVarR8FromDate@12               @83
-  VarR8FromStr                = _DbgVarR8FromStr@16                @84
-  VarR8FromDisp               = _DbgVarR8FromDisp@12               @85
-  VarR8FromBool               = _DbgVarR8FromBool@8                @86
-  VarFormat                   = _DbgVarFormat@24                   @87
-  VarDateFromUI1              = _DbgVarDateFromUI1@8               @88
-  VarDateFromI2               = _DbgVarDateFromI2@8                @89
-
-  VarDateFromI4               = _DbgVarDateFromI4@8                @90
-  VarDateFromR4               = _DbgVarDateFromR4@8                @91
-  VarDateFromR8               = _DbgVarDateFromR8@12               @92
-  VarDateFromCy               = _DbgVarDateFromCy@12               @93
-  VarDateFromStr              = _DbgVarDateFromStr@16              @94
-  VarDateFromDisp             = _DbgVarDateFromDisp@12             @95
-  VarDateFromBool             = _DbgVarDateFromBool@8              @96
-  VarFormatDateTime           = _DbgVarFormatDateTime@16           @97
-  VarCyFromUI1                = _DbgVarCyFromUI1@8                 @98
-  VarCyFromI2                 = _DbgVarCyFromI2@8                  @99
-
-  VarCyFromI4                 = _DbgVarCyFromI4@8                  @100
-  VarCyFromR4                 = _DbgVarCyFromR4@8                  @101
-  VarCyFromR8                 = _DbgVarCyFromR8@12                 @102
-  VarCyFromDate               = _DbgVarCyFromDate@12               @103
-  VarCyFromStr                = _DbgVarCyFromStr@16                @104
-  VarCyFromDisp               = _DbgVarCyFromDisp@12               @105
-  VarCyFromBool               = _DbgVarCyFromBool@8                @106
+DllGetClassObject = "_DbgOLEAUT32_DllGetClassObject@12"  @1
+SysAllocString = "_DbgSysAllocString@4"  @2
+SysReAllocString = "_DbgSysReAllocString@8"  @3
+SysAllocStringLen = "_DbgSysAllocStringLen@8"  @4
+SysReAllocStringLen = "_DbgSysReAllocStringLen@12"  @5
+SysFreeString = "_DbgSysFreeString@4"  @6
+SysStringLen = "_DbgSysStringLen@4"  @7
+VariantInit = "_DbgVariantInit@4"  @8
+VariantClear = "_DbgVariantClear@4"  @9
+VariantCopy = "_DbgVariantCopy@8"  @10
+VariantCopyInd = "_DbgVariantCopyInd@8"  @11
+VariantChangeType = "_DbgVariantChangeType@16"  @12
+VariantTimeToDosDateTime = "_DbgVariantTimeToDosDateTime@16"  @13
+DosDateTimeToVariantTime = "_DbgDosDateTimeToVariantTime@12"  @14
+SafeArrayCreate = "_DbgSafeArrayCreate@12"  @15
+SafeArrayDestroy = "_DbgSafeArrayDestroy@4"  @16
+SafeArrayGetDim = "_DbgSafeArrayGetDim@4"  @17
+SafeArrayGetElemsize = "_DbgSafeArrayGetElemsize@4"  @18
+SafeArrayGetUBound = "_DbgSafeArrayGetUBound@12"  @19
+SafeArrayGetLBound = "_DbgSafeArrayGetLBound@12"  @20
+SafeArrayLock = "_DbgSafeArrayLock@4"  @21
+SafeArrayUnlock = "_DbgSafeArrayUnlock@4"  @22
+SafeArrayAccessData = "_DbgSafeArrayAccessData@8"  @23
+SafeArrayUnaccessData = "_DbgSafeArrayUnaccessData@4"  @24
+SafeArrayGetElement = "_DbgSafeArrayGetElement@12"  @25
+SafeArrayPutElement = "_DbgSafeArrayPutElement@12"  @26
+SafeArrayCopy = "_DbgSafeArrayCopy@8"  @27
+DispGetParam = "_DbgDispGetParam@20"  @28
+DispGetIDsOfNames = "_DbgDispGetIDsOfNames@16"  @29
+DispInvoke = "_DbgDispInvoke@32"  @30
+CreateDispTypeInfo = "_DbgCreateDispTypeInfo@12"  @31
+CreateStdDispatch = "_DbgCreateStdDispatch@16"  @32
+RegisterActiveObject = "_DbgRegisterActiveObject@16"  @33
+RevokeActiveObject = "_DbgRevokeActiveObject@8"  @34
+GetActiveObject = "_DbgGetActiveObject@12"  @35
+SafeArrayAllocDescriptor = "_DbgSafeArrayAllocDescriptor@8"  @36
+SafeArrayAllocData = "_DbgSafeArrayAllocData@4"  @37
+SafeArrayDestroyDescriptor = "_DbgSafeArrayDestroyDescriptor@4"  @38
+SafeArrayDestroyData = "_DbgSafeArrayDestroyData@4"  @39
+SafeArrayRedim = "_DbgSafeArrayRedim@8"  @40
+OACreateTypeLib2 = "_DbgOACreateTypeLib2@0"  @41
+VarParseNumFromStr = "_DbgVarParseNumFromStr@20"  @46
+VarNumFromParseNum = "_DbgVarNumFromParseNum@16"  @47
+VarI2FromUI1 = "_DbgVarI2FromUI1@8"  @48
+VarI2FromI4 = "_DbgVarI2FromI4@8"  @49
+VarI2FromR4 = "_DbgVarI2FromR4@8"  @50
+VarI2FromR8 = "_DbgVarI2FromR8@12"  @51
+VarI2FromCy = "_DbgVarI2FromCy@12"  @52
+VarI2FromDate = "_DbgVarI2FromDate@12"  @53
+VarI2FromStr = "_DbgVarI2FromStr@16"  @54
+VarI2FromDisp = "_DbgVarI2FromDisp@12"  @55
+VarI2FromBool = "_DbgVarI2FromBool@8"  @56
+VarI4FromUI1 = "_DbgVarI4FromUI1@8"  @58
+VarI4FromI2 = "_DbgVarI4FromI2@8"  @59
+VarI4FromR4 = "_DbgVarI4FromR4@8"  @60
+VarI4FromR8 = "_DbgVarI4FromR8@12"  @61
+VarI4FromCy = "_DbgVarI4FromCy@12"  @62
+VarI4FromDate = "_DbgVarI4FromDate@12"  @63
+VarI4FromStr = "_DbgVarI4FromStr@16"  @64
+VarI4FromDisp = "_DbgVarI4FromDisp@12"  @65
+VarI4FromBool = "_DbgVarI4FromBool@8"  @66
+VarR4FromUI1 = "_DbgVarR4FromUI1@8"  @68
+VarR4FromI2 = "_DbgVarR4FromI2@8"  @69
+
+  VarR4FromI4                 = "_DbgVarR4FromI4@8"                @70
+  VarR4FromR8                 = "_DbgVarR4FromR8@12"               @71
+  VarR4FromCy                 = "_DbgVarR4FromCy@12"               @72
+  VarR4FromDate               = "_DbgVarR4FromDate@12"             @73
+  VarR4FromStr                = "_DbgVarR4FromStr@16"              @74
+  VarR4FromDisp               = "_DbgVarR4FromDisp@12"             @75
+  VarR4FromBool               = "_DbgVarR4FromBool@8"              @76
+  SafeArrayGetVartype         = "_DbgSafeArrayGetVartype@8"        @77
+  VarR8FromUI1                = "_DbgVarR8FromUI1@8"               @78
+  VarR8FromI2                 = "_DbgVarR8FromI2@8"                @79
+
+  VarR8FromI4                 = "_DbgVarR8FromI4@8"                @80
+  VarR8FromR4                 = "_DbgVarR8FromR4@8"                @81
+  VarR8FromCy                 = "_DbgVarR8FromCy@12"               @82
+  VarR8FromDate               = "_DbgVarR8FromDate@12"             @83
+  VarR8FromStr                = "_DbgVarR8FromStr@16"              @84
+  VarR8FromDisp               = "_DbgVarR8FromDisp@12"             @85
+  VarR8FromBool               = "_DbgVarR8FromBool@8"              @86
+  VarFormat                   = "_DbgVarFormat@24"                 @87
+  VarDateFromUI1              = "_DbgVarDateFromUI1@8"             @88
+  VarDateFromI2               = "_DbgVarDateFromI2@8"              @89
+
+  VarDateFromI4               = "_DbgVarDateFromI4@8"              @90
+  VarDateFromR4               = "_DbgVarDateFromR4@8"              @91
+  VarDateFromR8               = "_DbgVarDateFromR8@12"             @92
+  VarDateFromCy               = "_DbgVarDateFromCy@12"             @93
+  VarDateFromStr              = "_DbgVarDateFromStr@16"            @94
+  VarDateFromDisp             = "_DbgVarDateFromDisp@12"           @95
+  VarDateFromBool             = "_DbgVarDateFromBool@8"            @96
+  VarFormatDateTime           = "_DbgVarFormatDateTime@16"         @97
+  VarCyFromUI1                = "_DbgVarCyFromUI1@8"               @98
+  VarCyFromI2                 = "_DbgVarCyFromI2@8"                @99
+
+  VarCyFromI4                 = "_DbgVarCyFromI4@8"                @100
+  VarCyFromR4                 = "_DbgVarCyFromR4@8"                @101
+  VarCyFromR8                 = "_DbgVarCyFromR8@12"               @102
+  VarCyFromDate               = "_DbgVarCyFromDate@12"             @103
+  VarCyFromStr                = "_DbgVarCyFromStr@16"              @104
+  VarCyFromDisp               = "_DbgVarCyFromDisp@12"             @105
+  VarCyFromBool               = "_DbgVarCyFromBool@8"              @106
 ;;  VarFormatNumber             = _DbgVarFormatNumber@28             @107
-  VarBstrFromUI1              = _DbgVarBstrFromUI1@16              @108
-  VarBstrFromI2               = _DbgVarBstrFromI2@16               @109
-
-  VarBstrFromI4               = _DbgVarBstrFromI4@16               @110
-  VarBstrFromR4               = _DbgVarBstrFromR4@16               @111
-  VarBstrFromR8               = _DbgVarBstrFromR8@20               @112
-  VarBstrFromCy               = _DbgVarBstrFromCy@20               @113
-  VarBstrFromDate             = _DbgVarBstrFromDate@20             @114
-  VarBstrFromDisp             = _DbgVarBstrFromDisp@16             @115
-  VarBstrFromBool             = _DbgVarBstrFromBool@16             @116
+  VarBstrFromUI1              = "_DbgVarBstrFromUI1@16"            @108
+  VarBstrFromI2               = "_DbgVarBstrFromI2@16"             @109
+
+  VarBstrFromI4               = "_DbgVarBstrFromI4@16"             @110
+  VarBstrFromR4               = "_DbgVarBstrFromR4@16"             @111
+  VarBstrFromR8               = "_DbgVarBstrFromR8@20"             @112
+  VarBstrFromCy               = "_DbgVarBstrFromCy@20"             @113
+  VarBstrFromDate             = "_DbgVarBstrFromDate@20"           @114
+  VarBstrFromDisp             = "_DbgVarBstrFromDisp@16"           @115
+  VarBstrFromBool             = "_DbgVarBstrFromBool@16"           @116
 ;;  VarFormatPercent            = _DbgVarFormatPercent@28            @117
-  VarBoolFromUI1              = _DbgVarBoolFromUI1@8               @118
-  VarBoolFromI2               = _DbgVarBoolFromI2@8                @119
-
-  VarBoolFromI4               = _DbgVarBoolFromI4@8                @120
-  VarBoolFromR4               = _DbgVarBoolFromR4@8                @121
-  VarBoolFromR8               = _DbgVarBoolFromR8@12               @122
-  VarBoolFromDate             = _DbgVarBoolFromDate@12             @123
-  VarBoolFromCy               = _DbgVarBoolFromCy@12               @124
-  VarBoolFromStr              = _DbgVarBoolFromStr@16              @125
-  VarBoolFromDisp             = _DbgVarBoolFromDisp@12             @126
-  VarFormatCurrency           = _DbgVarFormatCurrency@28           @127
-
-  VarUI1FromI2                = _DbgVarUI1FromI2@8                 @130
-  VarUI1FromI4                = _DbgVarUI1FromI4@8                 @131
-  VarUI1FromR4                = _DbgVarUI1FromR4@8                 @132
-  VarUI1FromR8                = _DbgVarUI1FromR8@12                @133
-  VarUI1FromCy                = _DbgVarUI1FromCy@12                @134
-  VarUI1FromDate              = _DbgVarUI1FromDate@12              @135
-  VarUI1FromStr               = _DbgVarUI1FromStr@16               @136
-  VarUI1FromDisp              = _DbgVarUI1FromDisp@12              @137
-  VarUI1FromBool              = _DbgVarUI1FromBool@8               @138
-  VarFormatFromTokens         = _DbgVarFormatFromTokens@24         @139
-
-  VarTokenizeFormatString     = _DbgVarTokenizeFormatString@28     @140
-  VarAnd                      = _DbgVarAnd@12                      @142
-
-  DispCallFunc                = _DbgDispCallFunc@32                @146
-  VariantChangeTypeEx         = _DbgVariantChangeTypeEx@20         @147
-  SafeArrayPtrOfIndex         = _DbgSafeArrayPtrOfIndex@12         @148
-  SysStringByteLen            = _DbgSysStringByteLen@4             @149
-
-  SysAllocStringByteLen       = _DbgSysAllocStringByteLen@8        @150
-
-  CreateTypeLib               = _DbgCreateTypeLib@12               @160
-  LoadTypeLib                 = _DbgLoadTypeLib@8                  @161
-  LoadRegTypeLib              = _DbgLoadRegTypeLib@20              @162
-  RegisterTypeLib             = _DbgRegisterTypeLib@12             @163
-  QueryPathOfRegTypeLib       = _DbgQueryPathOfRegTypeLib@20       @164
-  LHashValOfNameSys           = _DbgLHashValOfNameSys@12           @165
-  LHashValOfNameSysA          = _DbgLHashValOfNameSysA@12          @166
-
-  OaBuildVersion              = _DbgOaBuildVersion@0               @170
-  ClearCustData               = _DbgClearCustData@4                @171
-  VarNot                      = _DbgVarNot@8                       @174
-  VarCmp                      = _DbgVarCmp@16                      @176
-
-  CreateTypeLib2              = _DbgCreateTypeLib2@12              @180
-  LoadTypeLibEx               = _DbgLoadTypeLibEx@12               @183
-  SystemTimeToVariantTime     = _DbgSystemTimeToVariantTime@8      @184
-  VariantTimeToSystemTime     = _DbgVariantTimeToSystemTime@12     @185
-  UnRegisterTypeLib           = _DbgUnRegisterTypeLib@20           @186
-
-  VarDecFromUI1               = _DbgVarDecFromUI1@8                @190
-  VarDecFromI2                = _DbgVarDecFromI2@8                 @191
-  VarDecFromI4                = _DbgVarDecFromI4@8                 @192
-  VarDecFromR4                = _DbgVarDecFromR4@8                 @193
-  VarDecFromR8                = _DbgVarDecFromR8@12                @194
-  VarDecFromDate              = _DbgVarDecFromDate@12              @195
-  VarDecFromCy                = _DbgVarDecFromCy@12                @196
-  VarDecFromStr               = _DbgVarDecFromStr@16               @197
-  VarDecFromDisp              = _DbgVarDecFromDisp@12              @198
-  VarDecFromBool              = _DbgVarDecFromBool@8               @199
-
-GetErrorInfo = _GetErrorInfo@8  @200
-SetErrorInfo = _SetErrorInfo@8  @201
-CreateErrorInfo = _CreateErrorInfo@4  @202
-VarI2FromI1 = _DbgVarI2FromI1@8  @205
-VarI2FromUI2 = _DbgVarI2FromUI2@8  @206
-VarI2FromUI4 = _DbgVarI2FromUI4@8  @207
-VarI2FromDec = _DbgVarI2FromDec@8  @208
-VarI4FromI1 = _DbgVarI4FromI1@8  @209
-VarI4FromUI2 = _DbgVarI4FromUI2@8  @210
-VarI4FromUI4 = _DbgVarI4FromUI4@8  @211
-VarI4FromDec = _DbgVarI4FromDec@8  @212
-VarR4FromI1 = _DbgVarR4FromI1@8  @213
-VarR4FromUI2 = _DbgVarR4FromUI2@8  @214
-VarR4FromUI4 = _DbgVarR4FromUI4@8  @215
-VarR4FromDec = _DbgVarR4FromDec@8  @216
-VarR8FromI1 = _DbgVarR8FromI1@8  @217
-VarR8FromUI2 = _DbgVarR8FromUI2@8  @218
-VarR8FromUI4 = _DbgVarR8FromUI4@8  @219
-VarR8FromDec = _DbgVarR8FromDec@8  @220
-VarDateFromI1 = _DbgVarDateFromI1@8  @221
-VarDateFromUI2 = _DbgVarDateFromUI2@8  @222
-VarDateFromUI4 = _DbgVarDateFromUI4@8  @223
-VarDateFromDec = _DbgVarDateFromDec@8  @224
-VarCyFromI1 = _DbgVarCyFromI1@8  @225
-VarCyFromUI2 = _DbgVarCyFromUI2@8  @226
-VarCyFromUI4 = _DbgVarCyFromUI4@8  @227
-VarCyFromDec = _DbgVarCyFromDec@8  @228
-VarBstrFromI1 = _DbgVarBstrFromI1@16  @229
-VarBstrFromUI2 = _DbgVarBstrFromUI2@16  @230
-VarBstrFromUI4 = _DbgVarBstrFromUI4@16  @231
-VarBstrFromDec = _DbgVarBstrFromDec@16  @232
-VarBoolFromI1 = _DbgVarBoolFromI1@8  @233
-VarBoolFromUI2 = _DbgVarBoolFromUI2@8  @234
-VarBoolFromUI4 = _DbgVarBoolFromUI4@8  @235
-VarBoolFromDec = _DbgVarBoolFromDec@8  @236
-VarUI1FromI1 = _DbgVarUI1FromI1@8  @237
-VarUI1FromUI2 = _DbgVarUI1FromUI2@8  @238
-VarUI1FromUI4 = _DbgVarUI1FromUI4@8  @239
-VarUI1FromDec = _DbgVarUI1FromDec@8  @240
-VarDecFromI1 = _DbgVarDecFromI1@8  @241
-VarDecFromUI2 = _DbgVarDecFromUI2@8  @242
-VarDecFromUI4 = _DbgVarDecFromUI4@8  @243
-VarI1FromUI1 = _DbgVarI1FromUI1@8  @244
-VarI1FromI2 = _DbgVarI1FromI2@8  @245
-VarI1FromI4 = _DbgVarI1FromI4@8 @246
-VarI1FromR4 = _DbgVarI1FromR4@8 @247
-VarI1FromR8 = _DbgVarI1FromR8@12  @248
-VarI1FromDate = _DbgVarI1FromDate@12  @249
-VarI1FromCy = _DbgVarI1FromCy@12  @250
-VarI1FromStr = _DbgVarI1FromStr@16  @251
-VarI1FromDisp = _DbgVarI1FromDisp@12  @252
-VarI1FromBool = _DbgVarI1FromBool@8  @253
-VarI1FromUI2 = _DbgVarI1FromUI2@8  @254
-VarI1FromUI4 = _DbgVarI1FromUI4@8  @255
-VarI1FromDec = _DbgVarI1FromDec@8  @256
-VarUI2FromUI1 = _DbgVarUI2FromUI1@8  @257
-VarUI2FromI2 = _DbgVarUI2FromI2@8  @258
-VarUI2FromI4 = _DbgVarUI2FromI4@8  @259
-VarUI2FromR4 = _DbgVarUI2FromR4@8  @260
-VarUI2FromR8 = _DbgVarUI2FromR8@12  @261
-VarUI2FromDate = _DbgVarUI2FromDate@12  @262
-VarUI2FromCy = _DbgVarUI2FromCy@12  @263
-VarUI2FromStr = _DbgVarUI2FromStr@16  @264
-VarUI2FromDisp = _DbgVarUI2FromDisp@12  @265
-VarUI2FromBool = _DbgVarUI2FromBool@8  @266
-VarUI2FromI1 = _DbgVarUI2FromI1@8  @267
-VarUI2FromUI4 = _DbgVarUI2FromUI4@8  @268
-VarUI2FromDec = _DbgVarUI2FromDec@8  @269
-VarUI4FromUI1 = _DbgVarUI4FromUI1@8  @270
-VarUI4FromI2 = _DbgVarUI4FromI2@8  @271
-VarUI4FromI4 = _DbgVarUI4FromI4@8  @272
-VarUI4FromR4 = _DbgVarUI4FromR4@8  @273
-VarUI4FromR8 = _DbgVarUI4FromR8@12  @274
-VarUI4FromDate = _DbgVarUI4FromDate@12  @275
-VarUI4FromCy = _DbgVarUI4FromCy@12  @276
-VarUI4FromStr = _DbgVarUI4FromStr@16  @277
-VarUI4FromDisp = _DbgVarUI4FromDisp@12  @278
-VarUI4FromBool = _DbgVarUI4FromBool@8  @279
-VarUI4FromI1 = _DbgVarUI4FromI1@8  @280
-VarUI4FromUI2 = _DbgVarUI4FromUI2@8  @281
-VarUI4FromDec = _DbgVarUI4FromDec@8  @282
-BSTR_UserSize = _DbgBSTR_UserSize@12  @283
-BSTR_UserMarshal = _DbgBSTR_UserMarshal@12  @284
-BSTR_UserUnmarshal = _DbgBSTR_UserUnmarshal@12  @285
-BSTR_UserFree = _DbgBSTR_UserFree@8  @286
-VARIANT_UserSize = _DbgVARIANT_UserSize@12  @287
-VARIANT_UserMarshal = _DbgVARIANT_UserMarshal@12  @288
-VARIANT_UserUnmarshal = _DbgVARIANT_UserUnmarshal@12  @289
-VARIANT_UserFree = _DbgVARIANT_UserFree@8  @290
-LPSAFEARRAY_UserSize = _DbgLPSAFEARRAY_UserSize@12  @291
-LPSAFEARRAY_UserMarshal = _DbgLPSAFEARRAY_UserMarshal@12  @292
-LPSAFEARRAY_UserUnmarshal = _DbgLPSAFEARRAY_UserUnmarshal@12  @293
-LPSAFEARRAY_UserFree = _DbgLPSAFEARRAY_UserFree@8  @294
-LPSAFEARRAY_Size = _DbgLPSAFEARRAY_Size@0  @295
-LPSAFEARRAY_Marshal = _DbgLPSAFEARRAY_Marshal@0  @296
-LPSAFEARRAY_Unmarshal = _DbgLPSAFEARRAY_Unmarshal@0  @297
-
-  VarCyMulI4               = _DbgVarCyMulI4@16                    @304
-
-  VarBstrCat               = _DbgVarBstrCat@12                    @313
-  VarBstrCmp               = _DbgVarBstrCmp@16                    @314
-  VarCat                   = _DbgVarCat@12                        @318
-
-DllRegisterServer = _DbgOLEAUT32_DllRegisterServer@0  @320
-DllUnregisterServer = _DbgOLEAUT32_DllUnregisterServer@0  @321
-VarDateFromUdate = _DbgVarDateFromUdate@12  @330
-VarUdateFromDate = _DbgVarUdateFromDate@16  @331
-GetAltMonthNames = _DbgGetAltMonthNames@8  @332
-UserHWND_from_local = _DbgUserHWND_from_local@0  @380
-UserHWND_to_local = _DbgUserHWND_to_local@0  @381
-UserHWND_free_inst = _DbgUserHWND_free_inst@0  @382
-UserHWND_free_local = _DbgUserHWND_free_local@0  @383
-UserBSTR_from_local = _DbgUserBSTR_from_local@0  @384
-UserBSTR_to_local = _DbgUserBSTR_to_local@0  @385
-UserBSTR_free_inst = _DbgUserBSTR_free_inst@0  @386
-UserBSTR_free_local = _DbgUserBSTR_free_local@0  @387
-UserVARIANT_from_local = _DbgUserVARIANT_from_local@0  @388
-UserVARIANT_to_local = _DbgUserVARIANT_to_local@0  @389
-UserVARIANT_free_inst = _DbgUserVARIANT_free_inst@0  @390
-UserVARIANT_free_local = _DbgUserVARIANT_free_local@0  @391
-UserEXCEPINFO_from_local = _DbgUserEXCEPINFO_from_local@0  @392
-UserEXCEPINFO_to_local = _DbgUserEXCEPINFO_to_local@0  @393
-UserEXCEPINFO_free_inst = _DbgUserEXCEPINFO_free_inst@0  @394
-UserEXCEPINFO_free_local = _DbgUserEXCEPINFO_free_local@0  @395
-UserMSG_from_local = _DbgUserMSG_from_local@0  @396
-UserMSG_to_local = _DbgUserMSG_to_local@0  @397
-UserMSG_free_inst = _DbgUserMSG_free_inst@0  @398
-UserMSG_free_local = _DbgUserMSG_free_local@0  @399
-DllCanUnloadNow = _DbgOLEAUT32_DllCanUnloadNow@0  @410
-SafeArrayCreateVector = _DbgSafeArrayCreateVector@12  @411
-SafeArrayCopyData = _DbgSafeArrayCopyData@8  @412
-VectorFromBstr = _DbgVectorFromBstr@8  @413
-BstrFromVector = _DbgBstrFromVector@8  @414
-OleIconToCursor = _DbgOleIconToCursor@8  @415
-OleCreatePropertyFrameIndirect = _DbgOleCreatePropertyFrameIndirect@4  @416
-OleCreatePropertyFrame = _DbgOleCreatePropertyFrame@44  @417
-OleLoadPicture = _DbgOleLoadPicture@20  @418
-OleCreatePictureIndirect = _DbgOleCreatePictureIndirect@16  @419
-OleCreateFontIndirect = _DbgOleCreateFontIndirect@12  @420
-OleTranslateColor = _DbgOleTranslateColor@12    @421
-OleLoadPictureFile = _DbgOleLoadPictureFile@20  @422
-OleSavePictureFile = _DbgOleSavePictureFile@8   @423
-OleLoadPicturePath = _DbgOleLoadPicturePath@24  @424
-OleLoadPictureEx   = _DbgOleLoadPictureEx@32    @425
+  VarBoolFromUI1              = "_DbgVarBoolFromUI1@8"             @118
+  VarBoolFromI2               = "_DbgVarBoolFromI2@8"              @119
+
+  VarBoolFromI4               = "_DbgVarBoolFromI4@8"              @120
+  VarBoolFromR4               = "_DbgVarBoolFromR4@8"              @121
+  VarBoolFromR8               = "_DbgVarBoolFromR8@12"             @122
+  VarBoolFromDate             = "_DbgVarBoolFromDate@12"           @123
+  VarBoolFromCy               = "_DbgVarBoolFromCy@12"             @124
+  VarBoolFromStr              = "_DbgVarBoolFromStr@16"            @125
+  VarBoolFromDisp             = "_DbgVarBoolFromDisp@12"           @126
+  VarFormatCurrency           = "_DbgVarFormatCurrency@28"         @127
+
+  VarUI1FromI2                = "_DbgVarUI1FromI2@8"               @130
+  VarUI1FromI4                = "_DbgVarUI1FromI4@8"               @131
+  VarUI1FromR4                = "_DbgVarUI1FromR4@8"               @132
+  VarUI1FromR8                = "_DbgVarUI1FromR8@12"              @133
+  VarUI1FromCy                = "_DbgVarUI1FromCy@12"              @134
+  VarUI1FromDate              = "_DbgVarUI1FromDate@12"            @135
+  VarUI1FromStr               = "_DbgVarUI1FromStr@16"             @136
+  VarUI1FromDisp              = "_DbgVarUI1FromDisp@12"            @137
+  VarUI1FromBool              = "_DbgVarUI1FromBool@8"             @138
+  VarFormatFromTokens         = "_DbgVarFormatFromTokens@24"       @139
+
+  VarTokenizeFormatString     = "_DbgVarTokenizeFormatString@28"   @140
+  VarAnd                      = "_DbgVarAnd@12"                    @142
+
+  DispCallFunc                = "_DbgDispCallFunc@32"              @146
+  VariantChangeTypeEx         = "_DbgVariantChangeTypeEx@20"       @147
+  SafeArrayPtrOfIndex         = "_DbgSafeArrayPtrOfIndex@12"       @148
+  SysStringByteLen            = "_DbgSysStringByteLen@4"           @149
+
+  SysAllocStringByteLen       = "_DbgSysAllocStringByteLen@8"      @150
+
+  CreateTypeLib               = "_DbgCreateTypeLib@12"             @160
+  LoadTypeLib                 = "_DbgLoadTypeLib@8"                @161
+  LoadRegTypeLib              = "_DbgLoadRegTypeLib@20"            @162
+  RegisterTypeLib             = "_DbgRegisterTypeLib@12"           @163
+  QueryPathOfRegTypeLib       = "_DbgQueryPathOfRegTypeLib@20"     @164
+  LHashValOfNameSys           = "_DbgLHashValOfNameSys@12"         @165
+  LHashValOfNameSysA          = "_DbgLHashValOfNameSysA@12"        @166
+
+  OaBuildVersion              = "_DbgOaBuildVersion@0"             @170
+  ClearCustData               = "_DbgClearCustData@4"              @171
+  VarNot                      = "_DbgVarNot@8"                     @174
+  VarCmp                      = "_DbgVarCmp@16"                    @176
+
+  CreateTypeLib2              = "_DbgCreateTypeLib2@12"            @180
+  LoadTypeLibEx               = "_DbgLoadTypeLibEx@12"             @183
+  SystemTimeToVariantTime     = "_DbgSystemTimeToVariantTime@8"    @184
+  VariantTimeToSystemTime     = "_DbgVariantTimeToSystemTime@12"   @185
+  UnRegisterTypeLib           = "_DbgUnRegisterTypeLib@20"         @186
+
+  VarDecFromUI1               = "_DbgVarDecFromUI1@8"              @190
+  VarDecFromI2                = "_DbgVarDecFromI2@8"               @191
+  VarDecFromI4                = "_DbgVarDecFromI4@8"               @192
+  VarDecFromR4                = "_DbgVarDecFromR4@8"               @193
+  VarDecFromR8                = "_DbgVarDecFromR8@12"              @194
+  VarDecFromDate              = "_DbgVarDecFromDate@12"            @195
+  VarDecFromCy                = "_DbgVarDecFromCy@12"              @196
+  VarDecFromStr               = "_DbgVarDecFromStr@16"             @197
+  VarDecFromDisp              = "_DbgVarDecFromDisp@12"            @198
+  VarDecFromBool              = "_DbgVarDecFromBool@8"             @199
+
+GetErrorInfo = "_GetErrorInfo@8"  @200
+SetErrorInfo = "_SetErrorInfo@8"  @201
+CreateErrorInfo = "_CreateErrorInfo@4"  @202
+VarI2FromI1 = "_DbgVarI2FromI1@8"  @205
+VarI2FromUI2 = "_DbgVarI2FromUI2@8"  @206
+VarI2FromUI4 = "_DbgVarI2FromUI4@8"  @207
+VarI2FromDec = "_DbgVarI2FromDec@8"  @208
+VarI4FromI1 = "_DbgVarI4FromI1@8"  @209
+VarI4FromUI2 = "_DbgVarI4FromUI2@8"  @210
+VarI4FromUI4 = "_DbgVarI4FromUI4@8"  @211
+VarI4FromDec = "_DbgVarI4FromDec@8"  @212
+VarR4FromI1 = "_DbgVarR4FromI1@8"  @213
+VarR4FromUI2 = "_DbgVarR4FromUI2@8"  @214
+VarR4FromUI4 = "_DbgVarR4FromUI4@8"  @215
+VarR4FromDec = "_DbgVarR4FromDec@8"  @216
+VarR8FromI1 = "_DbgVarR8FromI1@8"  @217
+VarR8FromUI2 = "_DbgVarR8FromUI2@8"  @218
+VarR8FromUI4 = "_DbgVarR8FromUI4@8"  @219
+VarR8FromDec = "_DbgVarR8FromDec@8"  @220
+VarDateFromI1 = "_DbgVarDateFromI1@8"  @221
+VarDateFromUI2 = "_DbgVarDateFromUI2@8"  @222
+VarDateFromUI4 = "_DbgVarDateFromUI4@8"  @223
+VarDateFromDec = "_DbgVarDateFromDec@8"  @224
+VarCyFromI1 = "_DbgVarCyFromI1@8"  @225
+VarCyFromUI2 = "_DbgVarCyFromUI2@8"  @226
+VarCyFromUI4 = "_DbgVarCyFromUI4@8"  @227
+VarCyFromDec = "_DbgVarCyFromDec@8"  @228
+VarBstrFromI1 = "_DbgVarBstrFromI1@16"  @229
+VarBstrFromUI2 = "_DbgVarBstrFromUI2@16"  @230
+VarBstrFromUI4 = "_DbgVarBstrFromUI4@16"  @231
+VarBstrFromDec = "_DbgVarBstrFromDec@16"  @232
+VarBoolFromI1 = "_DbgVarBoolFromI1@8"  @233
+VarBoolFromUI2 = "_DbgVarBoolFromUI2@8"  @234
+VarBoolFromUI4 = "_DbgVarBoolFromUI4@8"  @235
+VarBoolFromDec = "_DbgVarBoolFromDec@8"  @236
+VarUI1FromI1 = "_DbgVarUI1FromI1@8"  @237
+VarUI1FromUI2 = "_DbgVarUI1FromUI2@8"  @238
+VarUI1FromUI4 = "_DbgVarUI1FromUI4@8"  @239
+VarUI1FromDec = "_DbgVarUI1FromDec@8"  @240
+VarDecFromI1 = "_DbgVarDecFromI1@8"  @241
+VarDecFromUI2 = "_DbgVarDecFromUI2@8"  @242
+VarDecFromUI4 = "_DbgVarDecFromUI4@8"  @243
+VarI1FromUI1 = "_DbgVarI1FromUI1@8"  @244
+VarI1FromI2 = "_DbgVarI1FromI2@8"  @245
+VarI1FromI4 = "_DbgVarI1FromI4@8" @246
+VarI1FromR4 = "_DbgVarI1FromR4@8" @247
+VarI1FromR8 = "_DbgVarI1FromR8@12"  @248
+VarI1FromDate = "_DbgVarI1FromDate@12"  @249
+VarI1FromCy = "_DbgVarI1FromCy@12"  @250
+VarI1FromStr = "_DbgVarI1FromStr@16"  @251
+VarI1FromDisp = "_DbgVarI1FromDisp@12"  @252
+VarI1FromBool = "_DbgVarI1FromBool@8"  @253
+VarI1FromUI2 = "_DbgVarI1FromUI2@8"  @254
+VarI1FromUI4 = "_DbgVarI1FromUI4@8"  @255
+VarI1FromDec = "_DbgVarI1FromDec@8"  @256
+VarUI2FromUI1 = "_DbgVarUI2FromUI1@8"  @257
+VarUI2FromI2 = "_DbgVarUI2FromI2@8"  @258
+VarUI2FromI4 = "_DbgVarUI2FromI4@8"  @259
+VarUI2FromR4 = "_DbgVarUI2FromR4@8"  @260
+VarUI2FromR8 = "_DbgVarUI2FromR8@12"  @261
+VarUI2FromDate = "_DbgVarUI2FromDate@12"  @262
+VarUI2FromCy = "_DbgVarUI2FromCy@12"  @263
+VarUI2FromStr = "_DbgVarUI2FromStr@16"  @264
+VarUI2FromDisp = "_DbgVarUI2FromDisp@12"  @265
+VarUI2FromBool = "_DbgVarUI2FromBool@8"  @266
+VarUI2FromI1 = "_DbgVarUI2FromI1@8"  @267
+VarUI2FromUI4 = "_DbgVarUI2FromUI4@8"  @268
+VarUI2FromDec = "_DbgVarUI2FromDec@8"  @269
+VarUI4FromUI1 = "_DbgVarUI4FromUI1@8"  @270
+VarUI4FromI2 = "_DbgVarUI4FromI2@8"  @271
+VarUI4FromI4 = "_DbgVarUI4FromI4@8"  @272
+VarUI4FromR4 = "_DbgVarUI4FromR4@8"  @273
+VarUI4FromR8 = "_DbgVarUI4FromR8@12"  @274
+VarUI4FromDate = "_DbgVarUI4FromDate@12"  @275
+VarUI4FromCy = "_DbgVarUI4FromCy@12"  @276
+VarUI4FromStr = "_DbgVarUI4FromStr@16"  @277
+VarUI4FromDisp = "_DbgVarUI4FromDisp@12"  @278
+VarUI4FromBool = "_DbgVarUI4FromBool@8"  @279
+VarUI4FromI1 = "_DbgVarUI4FromI1@8"  @280
+VarUI4FromUI2 = "_DbgVarUI4FromUI2@8"  @281
+VarUI4FromDec = "_DbgVarUI4FromDec@8"  @282
+BSTR_UserSize = "_DbgBSTR_UserSize@12"  @283
+BSTR_UserMarshal = "_DbgBSTR_UserMarshal@12"  @284
+BSTR_UserUnmarshal = "_DbgBSTR_UserUnmarshal@12"  @285
+BSTR_UserFree = "_DbgBSTR_UserFree@8"  @286
+VARIANT_UserSize = "_DbgVARIANT_UserSize@12"  @287
+VARIANT_UserMarshal = "_DbgVARIANT_UserMarshal@12"  @288
+VARIANT_UserUnmarshal = "_DbgVARIANT_UserUnmarshal@12"  @289
+VARIANT_UserFree = "_DbgVARIANT_UserFree@8"  @290
+LPSAFEARRAY_UserSize = "_DbgLPSAFEARRAY_UserSize@12"  @291
+LPSAFEARRAY_UserMarshal = "_DbgLPSAFEARRAY_UserMarshal@12"  @292
+LPSAFEARRAY_UserUnmarshal = "_DbgLPSAFEARRAY_UserUnmarshal@12"  @293
+LPSAFEARRAY_UserFree = "_DbgLPSAFEARRAY_UserFree@8"  @294
+LPSAFEARRAY_Size = "_DbgLPSAFEARRAY_Size@0"  @295
+LPSAFEARRAY_Marshal = "_DbgLPSAFEARRAY_Marshal@0"  @296
+LPSAFEARRAY_Unmarshal = "_DbgLPSAFEARRAY_Unmarshal@0"  @297
+
+  VarCyMulI4               = "_DbgVarCyMulI4@16"                  @304
+
+  VarBstrCat               = "_DbgVarBstrCat@12"                  @313
+  VarBstrCmp               = "_DbgVarBstrCmp@16"                  @314
+  VarCat                   = "_DbgVarCat@12"                      @318
+
+DllRegisterServer = "_DbgOLEAUT32_DllRegisterServer@0"  @320
+DllUnregisterServer = "_DbgOLEAUT32_DllUnregisterServer@0"  @321
+VarDateFromUdate = "_DbgVarDateFromUdate@12"  @330
+VarUdateFromDate = "_DbgVarUdateFromDate@16"  @331
+GetAltMonthNames = "_DbgGetAltMonthNames@8"  @332
+UserHWND_from_local = "_DbgUserHWND_from_local@0"  @380
+UserHWND_to_local = "_DbgUserHWND_to_local@0"  @381
+UserHWND_free_inst = "_DbgUserHWND_free_inst@0"  @382
+UserHWND_free_local = "_DbgUserHWND_free_local@0"  @383
+UserBSTR_from_local = "_DbgUserBSTR_from_local@0"  @384
+UserBSTR_to_local = "_DbgUserBSTR_to_local@0"  @385
+UserBSTR_free_inst = "_DbgUserBSTR_free_inst@0"  @386
+UserBSTR_free_local = "_DbgUserBSTR_free_local@0"  @387
+UserVARIANT_from_local = "_DbgUserVARIANT_from_local@0"  @388
+UserVARIANT_to_local = "_DbgUserVARIANT_to_local@0"  @389
+UserVARIANT_free_inst = "_DbgUserVARIANT_free_inst@0"  @390
+UserVARIANT_free_local = "_DbgUserVARIANT_free_local@0"  @391
+UserEXCEPINFO_from_local = "_DbgUserEXCEPINFO_from_local@0"  @392
+UserEXCEPINFO_to_local = "_DbgUserEXCEPINFO_to_local@0"  @393
+UserEXCEPINFO_free_inst = "_DbgUserEXCEPINFO_free_inst@0"  @394
+UserEXCEPINFO_free_local = "_DbgUserEXCEPINFO_free_local@0"  @395
+UserMSG_from_local = "_DbgUserMSG_from_local@0"  @396
+UserMSG_to_local = "_DbgUserMSG_to_local@0"  @397
+UserMSG_free_inst = "_DbgUserMSG_free_inst@0"  @398
+UserMSG_free_local = "_DbgUserMSG_free_local@0"  @399
+DllCanUnloadNow = "_DbgOLEAUT32_DllCanUnloadNow@0"  @410
+SafeArrayCreateVector = "_DbgSafeArrayCreateVector@12"  @411
+SafeArrayCopyData = "_DbgSafeArrayCopyData@8"  @412
+VectorFromBstr = "_DbgVectorFromBstr@8"  @413
+BstrFromVector = "_DbgBstrFromVector@8"  @414
+OleIconToCursor = "_DbgOleIconToCursor@8"  @415
+OleCreatePropertyFrameIndirect = "_DbgOleCreatePropertyFrameIndirect@4"  @416
+OleCreatePropertyFrame = "_DbgOleCreatePropertyFrame@44"  @417
+OleLoadPicture = "_DbgOleLoadPicture@20"  @418
+OleCreatePictureIndirect = "_DbgOleCreatePictureIndirect@16"  @419
+OleCreateFontIndirect = "_DbgOleCreateFontIndirect@12"  @420
+OleTranslateColor = "_DbgOleTranslateColor@12"  @421
+OleLoadPictureFile = "_DbgOleLoadPictureFile@20"  @422
+OleSavePictureFile = "_DbgOleSavePictureFile@8" @423
+OleLoadPicturePath = "_DbgOleLoadPicturePath@24"  @424
+OleLoadPictureEx   = "_DbgOleLoadPictureEx@32"  @425
 
 ;Win98 and higher (NT4.0sp4)
@@ -334 +334 @@
 ;428 stub OleLoadPictureFileEx
 
-SafeArrayAllocDescriptorEx = _DbgSafeArrayAllocDescriptorEx@12 @429
-
+SafeArrayAllocDescriptorEx = "_DbgSafeArrayAllocDescriptorEx@12" @429
+

branches/gcc-kmk/src/oleaut32/olefont.c

@@ -638 +638 @@
     return E_POINTER;
 
-  psize->s.Hi = 0;
-  psize->s.Lo = this->description.cySize.s.Lo;
+  psize->DUMMYSTRUCTNAME_DOT Hi = 0;
+  psize->DUMMYSTRUCTNAME_DOT Lo = this->description.cySize.DUMMYSTRUCTNAME_DOT Lo;
 
   return S_OK;
@@ -654 +654 @@
 {
   _ICOM_THIS(OLEFontImpl, iface);
-  TRACE("(%p)->(%ld)\n", this, size.s.Lo);
-  this->description.cySize.s.Hi = 0;
-  this->description.cySize.s.Lo = size.s.Lo;
+  TRACE("(%p)->(%ld)\n", this, size.DUMMYSTRUCTNAME_DOT Lo);
+  this->description.cySize.DUMMYSTRUCTNAME_DOT Hi = 0;
+  this->description.cySize.DUMMYSTRUCTNAME_DOT Lo = size.DUMMYSTRUCTNAME_DOT Lo;
   OLEFont_SendNotify(this, DISPID_FONT_SIZE);
 
@@ -936 +936 @@
     IFont_get_Size(iface, &cySize);
 
-    fontHeight = MulDiv(cySize.s.Lo, 2540L, 72L);
+    fontHeight = MulDiv(cySize.DUMMYSTRUCTNAME_DOT Lo, 2540L, 72L);
     fontHeight = MulDiv(fontHeight, this->cyLogical,this->cyHimetric);
 
@@ -1004 +1004 @@
   IFont_get_Size(iface, &cySize);
 
-  fontHeight = MulDiv(cySize.s.Lo, 2540L, 72L);
+  fontHeight = MulDiv(cySize.DUMMYSTRUCTNAME_DOT Lo, 2540L, 72L);
   fontHeight = MulDiv(fontHeight, this->cyLogical,this->cyHimetric);
 
@@ -1401 +1401 @@
    * Size
    */
-  IStream_Read(pLoadStream, &this->description.cySize.s.Lo, 4, &cbRead);
+  IStream_Read(pLoadStream, &this->description.cySize.DUMMYSTRUCTNAME_DOT Lo, 4, &cbRead);
 
   if (cbRead!=4)
     return E_FAIL;
 
-  this->description.cySize.s.Hi = 0;
+  this->description.cySize.DUMMYSTRUCTNAME_DOT Hi = 0;
 
   /*
@@ -1500 +1500 @@
    * Size
    */
-  IStream_Write(pOutStream, &this->description.cySize.s.Lo, 4, &cbWritten);
+  IStream_Write(pOutStream, &this->description.cySize.DUMMYSTRUCTNAME_DOT Lo, 4, &cbWritten);
 
   if (cbWritten!=4)
@@ -1550 +1550 @@
     return E_POINTER;
 
-  pcbSize->s.HighPart = 0;
-  pcbSize->s.LowPart = 0;
-
-  pcbSize->s.LowPart += sizeof(BYTE);  /* Version */
-  pcbSize->s.LowPart += sizeof(WORD);  /* Lang code */
-  pcbSize->s.LowPart += sizeof(BYTE);  /* Flags */
-  pcbSize->s.LowPart += sizeof(WORD);  /* Weight */
-  pcbSize->s.LowPart += sizeof(DWORD); /* Size */
-  pcbSize->s.LowPart += sizeof(BYTE);  /* StrLength */
+  pcbSize->DUMMYSTRUCTNAME_DOT HighPart = 0;
+  pcbSize->DUMMYSTRUCTNAME_DOT LowPart = 0;
+
+  pcbSize->DUMMYSTRUCTNAME_DOT LowPart += sizeof(BYTE);  /* Version */
+  pcbSize->DUMMYSTRUCTNAME_DOT LowPart += sizeof(WORD);  /* Lang code */
+  pcbSize->DUMMYSTRUCTNAME_DOT LowPart += sizeof(BYTE);  /* Flags */
+  pcbSize->DUMMYSTRUCTNAME_DOT LowPart += sizeof(WORD);  /* Weight */
+  pcbSize->DUMMYSTRUCTNAME_DOT LowPart += sizeof(DWORD); /* Size */
+  pcbSize->DUMMYSTRUCTNAME_DOT LowPart += sizeof(BYTE);  /* StrLength */
 
   if (this->description.lpstrName!=0)
-    pcbSize->s.LowPart += lstrlenW(this->description.lpstrName);
+    pcbSize->DUMMYSTRUCTNAME_DOT LowPart += lstrlenW(this->description.lpstrName);
 
   return S_OK;
@@ -1685 +1685 @@
         fd.cbSizeofstruct = sizeof(fd);
         fd.lpstrName      = fname;
-        fd.cySize.s.Lo    = 80000;
-        fd.cySize.s.Hi    = 0;
-        fd.sWeight            = 0;
+        fd.cySize.DUMMYSTRUCTNAME_DOT Lo    = 80000;
+        fd.cySize.DUMMYSTRUCTNAME_DOT Hi    = 0;
+        fd.sWeight        = 0;
         fd.sCharset       = 0;
-        fd.fItalic            = 0;
+        fd.fItalic        = 0;
         fd.fUnderline     = 0;
         fd.fStrikethrough = 0;

branches/gcc-kmk/src/oleaut32/olepicture.c

@@ -150 +150 @@
   HDC hdcRef;
 
-  TRACE("bitmap handle %p\n", This->desc.u.bmp.hbitmap);
-  if(GetObjectA(This->desc.u.bmp.hbitmap, sizeof(bm), &bm) != sizeof(bm)) {
+  TRACE("bitmap handle %p\n", This->desc.DUMMYUNIONNAME_DOT bmp.hbitmap);
+  if(GetObjectA(This->desc.DUMMYUNIONNAME_DOT bmp.hbitmap, sizeof(bm), &bm) != sizeof(bm)) {
     ERR("GetObject fails\n");
     return;
@@ -226 +226 @@
 
       case PICTYPE_METAFILE:
-        TRACE("metafile handle %p\n", pictDesc->u.wmf.hmeta);
-        newObject->himetricWidth = pictDesc->u.wmf.xExt;
-        newObject->himetricHeight = pictDesc->u.wmf.yExt;
+        TRACE("metafile handle %p\n", pictDesc->DUMMYUNIONNAME_DOT wmf.hmeta);
+        newObject->himetricWidth = pictDesc->DUMMYUNIONNAME_DOT wmf.xExt;
+        newObject->himetricHeight = pictDesc->DUMMYUNIONNAME_DOT wmf.yExt;
         break;
 
@@ -264 +264 @@
     switch(Obj->desc.picType) {
     case PICTYPE_BITMAP:
-      DeleteObject(Obj->desc.u.bmp.hbitmap);
+      DeleteObject(Obj->desc.DUMMYUNIONNAME_DOT bmp.hbitmap);
       break;
     case PICTYPE_METAFILE:
-      DeleteMetaFile(Obj->desc.u.wmf.hmeta);
+      DeleteMetaFile(Obj->desc.DUMMYUNIONNAME_DOT wmf.hmeta);
       break;
     case PICTYPE_ICON:
-      DestroyIcon(Obj->desc.u.icon.hicon);
+      DestroyIcon(Obj->desc.DUMMYUNIONNAME_DOT icon.hicon);
       break;
     case PICTYPE_ENHMETAFILE:
-      DeleteEnhMetaFile(Obj->desc.u.emf.hemf);
+      DeleteEnhMetaFile(Obj->desc.DUMMYUNIONNAME_DOT emf.hemf);
       break;
     default:
@@ -434 +434 @@
   switch(This->desc.picType) {
   case PICTYPE_BITMAP:
-    *phandle = (OLE_HANDLE)This->desc.u.bmp.hbitmap;
+    *phandle = (OLE_HANDLE)This->desc.DUMMYUNIONNAME_DOT bmp.hbitmap;
     break;
   case PICTYPE_METAFILE:
-    *phandle = (OLE_HANDLE)This->desc.u.wmf.hmeta;
+    *phandle = (OLE_HANDLE)This->desc.DUMMYUNIONNAME_DOT wmf.hmeta;
     break;
   case PICTYPE_ICON:
-    *phandle = (OLE_HANDLE)This->desc.u.icon.hicon;
+    *phandle = (OLE_HANDLE)This->desc.DUMMYUNIONNAME_DOT icon.hicon;
     break;
   case PICTYPE_ENHMETAFILE:
-    *phandle = (OLE_HANDLE)This->desc.u.emf.hemf;
+    *phandle = (OLE_HANDLE)This->desc.DUMMYUNIONNAME_DOT emf.hemf;
     break;
   default:
@@ -540 +540 @@
       SetViewportExtEx(hdcBmp, This->origWidth, -This->origHeight, NULL);
 
-      hbmpOld = SelectObject(hdcBmp, This->desc.u.bmp.hbitmap);
+      hbmpOld = SelectObject(hdcBmp, This->desc.DUMMYUNIONNAME_DOT bmp.hbitmap);
 
       StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCCOPY);
@@ -550 +550 @@
   case PICTYPE_ICON:
     FIXME("Not quite correct implementation of rendering icons...\n");
-    DrawIcon(hdc,x,y,This->desc.u.icon.hicon);
+    DrawIcon(hdc,x,y,This->desc.DUMMYUNIONNAME_DOT icon.hicon);
     break;
 
@@ -597 +597 @@
   TRACE("(%p)->(%p, %p, %p)\n", This, hdcIn, phdcOut, phbmpOut);
   if (This->desc.picType == PICTYPE_BITMAP) {
-      SelectObject(hdcIn,This->desc.u.bmp.hbitmap);
+      SelectObject(hdcIn,This->desc.DUMMYUNIONNAME_DOT bmp.hbitmap);
 
       if (phdcOut)
@@ -603 +603 @@
       This->hDCCur = hdcIn;
       if (phbmpOut)
-          *phbmpOut = (OLE_HANDLE)This->desc.u.bmp.hbitmap;
+          *phbmpOut = (OLE_HANDLE)This->desc.DUMMYUNIONNAME_DOT bmp.hbitmap;
       return S_OK;
   } else {
@@ -881 +881 @@
     // PF Can't understand problem here.. Using QuadPart causes all sorts of corruptions.
     // Anyway we use only LowPart currently.
-    xbuf = This->data = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,statstg.cbSize.s.LowPart);
+    xbuf = This->data = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,statstg.cbSize.DUMMYSTRUCTNAME_DOT LowPart);
 #else
     xbuf = This->data = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,statstg.cbSize.QuadPart);
@@ -887 +887 @@
     memcpy(xbuf,&header,8);
 #ifdef __WIN32OS2__
-    This->datalen = statstg.cbSize.s.LowPart;
+    This->datalen = statstg.cbSize.DUMMYSTRUCTNAME_DOT LowPart;
 #else
     This->datalen = statstg.cbSize.QuadPart;
@@ -978 +978 @@
 
     hdcref = GetDC(0);
-    This->desc.u.bmp.hbitmap=CreateDIBitmap(
+    This->desc.DUMMYUNIONNAME_DOT bmp.hbitmap=CreateDIBitmap(
             hdcref,
             &bmi->bmiHeader,
@@ -1078 +1078 @@
     jpeg_destroy_decompress(&jd);
     hdcref = GetDC(0);
-    This->desc.u.bmp.hbitmap=CreateDIBitmap(
+    This->desc.DUMMYUNIONNAME_DOT bmp.hbitmap=CreateDIBitmap(
             hdcref,
             &bmi,
@@ -1106 +1106 @@
      */
     hdcref = GetDC(0);
-    This->desc.u.bmp.hbitmap = CreateDIBitmap(
+    This->desc.DUMMYUNIONNAME_DOT bmp.hbitmap = CreateDIBitmap(
         hdcref,
         &(bi->bmiHeader),
@@ -1167 +1167 @@
     } else {
         This->desc.picType = PICTYPE_ICON;
-        This->desc.u.icon.hicon = hicon;
+        This->desc.DUMMYUNIONNAME_DOT icon.hicon = hicon;
         This->himetricWidth = cifd->idEntries[i].bWidth;
         This->himetricHeight = cifd->idEntries[i].bHeight;

branches/gcc-kmk/src/oleaut32/safearray.c

@@ -146 +146 @@
 {
   FIXME("%s: Not implemented! (returning E_NOTIMPL)", __FUNCTION__);
-  return E_NOTIMPL;
+  return NULL;
 }
 #else

branches/gcc-kmk/src/oleaut32/tmarshal.c

@@ -163 +163 @@
     }
     hres = IStream_Stat(pStm,&ststg,0);
-    tempbuf = HeapAlloc(GetProcessHeap(), 0, ststg.cbSize.s.LowPart);
+    tempbuf = HeapAlloc(GetProcessHeap(), 0, ststg.cbSize.DUMMYSTRUCTNAME_DOT LowPart);
     memset(&seekto,0,sizeof(seekto));
     hres = IStream_Seek(pStm,seekto,SEEK_SET,&newpos);
     if (hres) { FIXME("Failed Seek %lx\n",hres); goto fail;}
-    hres = IStream_Read(pStm,tempbuf,ststg.cbSize.s.LowPart,&res);
+    hres = IStream_Read(pStm,tempbuf,ststg.cbSize.DUMMYSTRUCTNAME_DOT LowPart,&res);
     if (hres) { FIXME("Failed Read %lx\n",hres); goto fail;}
     IStream_Release(pStm);
-    xsize = ststg.cbSize.s.LowPart;
+    xsize = ststg.cbSize.DUMMYSTRUCTNAME_DOT LowPart;
     xbuf_add(buf,(LPBYTE)&xsize,sizeof(xsize));
-    hres = xbuf_add(buf,tempbuf,ststg.cbSize.s.LowPart);
+    hres = xbuf_add(buf,tempbuf,ststg.cbSize.DUMMYSTRUCTNAME_DOT LowPart);
     HeapFree(GetProcessHeap(),0,tempbuf);
     return hres;
@@ -388 +388 @@
     case VT_CARRAY: {
         int i, arrsize = 1;
-        ARRAYDESC *adesc = td->u.lpadesc;
+        ARRAYDESC *adesc = td->DUMMYUNIONNAME_DOT lpadesc;
 
         for (i=0;i<adesc->cDims;i++)
@@ -489 +489 @@
             return S_OK;
         }
-        hres = serialize_param(tinfo,writeit,debugout,dealloc,tdesc->u.lptdesc,(DWORD*)*arg,buf);
+        hres = serialize_param(tinfo,writeit,debugout,dealloc,tdesc->DUMMYUNIONNAME_DOT lptdesc,(DWORD*)*arg,buf);
         if (dealloc) HeapFree(GetProcessHeap(),0,(LPVOID)arg);
         return hres;
@@ -510 +510 @@
         TYPEATTR        *tattr;
 
-        hres = ITypeInfo_GetRefTypeInfo(tinfo,tdesc->u.hreftype,&tinfo2);
+        hres = ITypeInfo_GetRefTypeInfo(tinfo,tdesc->DUMMYUNIONNAME_DOT hreftype,&tinfo2);
         if (hres) {
-            FIXME("Could not get typeinfo of hreftype %lx for VT_USERDEFINED.\n",tdesc->u.hreftype);
+            FIXME("Could not get typeinfo of hreftype %lx for VT_USERDEFINED.\n",tdesc->DUMMYUNIONNAME_DOT hreftype);
             return hres;
         }
@@ -552 +552 @@
                     dealloc,
                     tdesc2,
-                    (DWORD*)(((LPBYTE)arg)+vdesc->u.oInst),
+                    (DWORD*)(((LPBYTE)arg)+vdesc->DUMMYUNIONNAME_DOT oInst),
                     buf
                 );
@@ -574 +574 @@
     }
     case VT_CARRAY: {
-        ARRAYDESC *adesc = tdesc->u.lpadesc;
+        ARRAYDESC *adesc = tdesc->DUMMYUNIONNAME_DOT lpadesc;
         int i, arrsize = 1;
 
@@ -612 +612 @@
 
     if ((tdesc->vt != VT_PTR)                   ||
-        (tdesc->u.lptdesc->vt != VT_PTR)        ||
-        (tdesc->u.lptdesc->u.lptdesc->vt != VT_VOID)
+        (tdesc->DUMMYUNIONNAME_DOT lptdesc->vt != VT_PTR)       ||
+        (tdesc->DUMMYUNIONNAME_DOT lptdesc->DUMMYUNIONNAME_DOT lptdesc->vt != VT_VOID)
     ) {
         FIXME("ppvObject not expressed as VT_PTR -> VT_PTR -> VT_VOID?\n");
@@ -655 +655 @@
     int         i;
 
-    if ((tdesc->vt != VT_PTR) || (tdesc->u.lptdesc->vt != VT_USERDEFINED)) {
+    if ((tdesc->vt != VT_PTR) || (tdesc->DUMMYUNIONNAME_DOT lptdesc->vt != VT_USERDEFINED)) {
         FIXME("DISPPARAMS not expressed as VT_PTR -> VT_USERDEFINED?\n");
         return E_FAIL;
@@ -813 +813 @@
             BOOL        derefhere = 0;
 
-            derefhere = (tdesc->u.lptdesc->vt != VT_USERDEFINED);
+            derefhere = (tdesc->DUMMYUNIONNAME_DOT lptdesc->vt != VT_USERDEFINED);
 
             if (readit) {
@@ -830 +830 @@
             if (alloc) {
                 if (derefhere)
-                    *arg=(DWORD)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,_xsize(tdesc->u.lptdesc));
+                    *arg=(DWORD)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,_xsize(tdesc->DUMMYUNIONNAME_DOT lptdesc));
             }
             if (derefhere)
-                return deserialize_param(tinfo, readit, debugout, alloc, tdesc->u.lptdesc, (LPDWORD)*arg, buf);
+                return deserialize_param(tinfo, readit, debugout, alloc, tdesc->DUMMYUNIONNAME_DOT lptdesc, (LPDWORD)*arg, buf);
             else
-                return deserialize_param(tinfo, readit, debugout, alloc, tdesc->u.lptdesc, arg, buf);
+                return deserialize_param(tinfo, readit, debugout, alloc, tdesc->DUMMYUNIONNAME_DOT lptdesc, arg, buf);
         }
         case VT_UNKNOWN:
@@ -861 +861 @@
             TYPEATTR    *tattr;
 
-            hres = ITypeInfo_GetRefTypeInfo(tinfo,tdesc->u.hreftype,&tinfo2);
+            hres = ITypeInfo_GetRefTypeInfo(tinfo,tdesc->DUMMYUNIONNAME_DOT hreftype,&tinfo2);
             if (hres) {
-                FIXME("Could not get typeinfo of hreftype %lx for VT_USERDEFINED.\n",tdesc->u.hreftype);
+                FIXME("Could not get typeinfo of hreftype %lx for VT_USERDEFINED.\n",tdesc->DUMMYUNIONNAME_DOT hreftype);
                 return hres;
             }
@@ -895 +895 @@
                             alloc,
                             &vdesc->elemdescVar.tdesc,
-                            (DWORD*)(((LPBYTE)*arg)+vdesc->u.oInst),
+                            (DWORD*)(((LPBYTE)*arg)+vdesc->DUMMYUNIONNAME_DOT oInst),
                             buf
                         );
@@ -918 +918 @@
         case VT_CARRAY: {
             /* arg is pointing to the start of the array. */
-            ARRAYDESC *adesc = tdesc->u.lpadesc;
+            ARRAYDESC *adesc = tdesc->DUMMYUNIONNAME_DOT lpadesc;
             int         arrsize,i;
             arrsize = 1;
@@ -957 +957 @@
 
     if ((tdesc->vt != VT_PTR)                   ||
-        (tdesc->u.lptdesc->vt != VT_PTR)        ||
-        (tdesc->u.lptdesc->u.lptdesc->vt != VT_VOID)
+        (tdesc->DUMMYUNIONNAME_DOT lptdesc->vt != VT_PTR)       ||
+        (tdesc->DUMMYUNIONNAME_DOT lptdesc->DUMMYUNIONNAME_DOT lptdesc->vt != VT_VOID)
     ) {
         FIXME("ppvObject not expressed as VT_PTR -> VT_PTR -> VT_VOID?\n");
@@ -999 +999 @@
     int         i;
 
-    if ((tdesc->vt != VT_PTR) || (tdesc->u.lptdesc->vt != VT_USERDEFINED)) {
+    if ((tdesc->vt != VT_PTR) || (tdesc->DUMMYUNIONNAME_DOT lptdesc->vt != VT_USERDEFINED)) {
         FIXME("DISPPARAMS not expressed as VT_PTR -> VT_USERDEFINED?\n");
         return E_FAIL;
@@ -1177 +1177 @@
             }
             /* No need to marshal other data than FIN */
-            if (!(elem->u.paramdesc.wParamFlags & PARAMFLAG_FIN)) {
+            if (!(elem->DUMMYUNIONNAME_DOT paramdesc.wParamFlags & PARAMFLAG_FIN)) {
                 xargs+=_argsize(elem->tdesc.vt);
                 if (relaydeb) MESSAGE("[out]");
@@ -1192 +1192 @@
                     hres = serialize_DISPPARAM_ptr(
                         tpinfo->tinfo,
-                        elem->u.paramdesc.wParamFlags & PARAMFLAG_FIN,
+                        elem->DUMMYUNIONNAME_DOT paramdesc.wParamFlags & PARAMFLAG_FIN,
                         relaydeb,
                         FALSE,
@@ -1204 +1204 @@
                     hres = serialize_LPVOID_ptr(
                         tpinfo->tinfo,
-                        elem->u.paramdesc.wParamFlags & PARAMFLAG_FIN,
+                        elem->DUMMYUNIONNAME_DOT paramdesc.wParamFlags & PARAMFLAG_FIN,
                         relaydeb,
                         FALSE,
@@ -1218 +1218 @@
                 hres = serialize_param(
                     tpinfo->tinfo,
-                    elem->u.paramdesc.wParamFlags & PARAMFLAG_FIN,
+                    elem->DUMMYUNIONNAME_DOT paramdesc.wParamFlags & PARAMFLAG_FIN,
                     relaydeb,
                     FALSE,
@@ -1272 +1272 @@
             }
             /* No need to marshal other data than FOUT I think */
-            if (!(elem->u.paramdesc.wParamFlags & PARAMFLAG_FOUT)) {
+            if (!(elem->DUMMYUNIONNAME_DOT paramdesc.wParamFlags & PARAMFLAG_FOUT)) {
                 xargs += _argsize(elem->tdesc.vt);
                 if (relaydeb) MESSAGE("[in]");
@@ -1287 +1287 @@
                     hres = deserialize_DISPPARAM_ptr(
                         tpinfo->tinfo,
-                        elem->u.paramdesc.wParamFlags & PARAMFLAG_FOUT,
+                        elem->DUMMYUNIONNAME_DOT paramdesc.wParamFlags & PARAMFLAG_FOUT,
                         relaydeb,
                         FALSE,
@@ -1303 +1303 @@
                     hres = deserialize_LPVOID_ptr(
                         tpinfo->tinfo,
-                        elem->u.paramdesc.wParamFlags & PARAMFLAG_FOUT,
+                        elem->DUMMYUNIONNAME_DOT paramdesc.wParamFlags & PARAMFLAG_FOUT,
                         relaydeb,
                         FALSE,
@@ -1317 +1317 @@
                 hres = deserialize_param(
                     tpinfo->tinfo,
-                    elem->u.paramdesc.wParamFlags & PARAMFLAG_FOUT,
+                    elem->DUMMYUNIONNAME_DOT paramdesc.wParamFlags & PARAMFLAG_FOUT,
                     relaydeb,
                     FALSE,
@@ -1542 +1542 @@
                 hres = deserialize_DISPPARAM_ptr(
                     This->tinfo,
-                    elem->u.paramdesc.wParamFlags & PARAMFLAG_FIN,
+                    elem->DUMMYUNIONNAME_DOT paramdesc.wParamFlags & PARAMFLAG_FIN,
                     FALSE,
                     TRUE,
@@ -1558 +1558 @@
                 hres = deserialize_LPVOID_ptr(
                     This->tinfo,
-                    elem->u.paramdesc.wParamFlags & PARAMFLAG_FOUT,
+                    elem->DUMMYUNIONNAME_DOT paramdesc.wParamFlags & PARAMFLAG_FOUT,
                     FALSE,
                     TRUE,
@@ -1572 +1572 @@
             hres = deserialize_param(
                 This->tinfo,
-                elem->u.paramdesc.wParamFlags & PARAMFLAG_FIN,
+                elem->DUMMYUNIONNAME_DOT paramdesc.wParamFlags & PARAMFLAG_FIN,
                 FALSE,
                 TRUE,
@@ -1613 +1613 @@
                 hres = serialize_DISPPARAM_ptr(
                     This->tinfo,
-                    elem->u.paramdesc.wParamFlags & PARAMFLAG_FOUT,
+                    elem->DUMMYUNIONNAME_DOT paramdesc.wParamFlags & PARAMFLAG_FOUT,
                     FALSE,
                     TRUE,
@@ -1625 +1625 @@
                 hres = serialize_LPVOID_ptr(
                     This->tinfo,
-                    elem->u.paramdesc.wParamFlags & PARAMFLAG_FOUT,
+                    elem->DUMMYUNIONNAME_DOT paramdesc.wParamFlags & PARAMFLAG_FOUT,
                     FALSE,
                     TRUE,
@@ -1639 +1639 @@
             hres = serialize_param(
                This->tinfo,
-               elem->u.paramdesc.wParamFlags & PARAMFLAG_FOUT,
+               elem->DUMMYUNIONNAME_DOT paramdesc.wParamFlags & PARAMFLAG_FOUT,
                FALSE,
                TRUE,

branches/gcc-kmk/src/oleaut32/typelib.c

@@ -930 +930 @@
     case VT_VOID: sprintf(szVarType, "VT_VOID"); break;
     case VT_USERDEFINED: sprintf(szVarType, "VT_USERDEFINED ref = %lx",
-                                 pTD->u.hreftype); break;
+                                 pTD->DUMMYUNIONNAME_DOT hreftype); break;
     case VT_PTR: sprintf(szVarType, "ptr to ");
-      dump_TypeDesc(pTD->u.lptdesc, szVarType + 7);
+      dump_TypeDesc(pTD->DUMMYUNIONNAME_DOT lptdesc, szVarType + 7);
       break;
     case VT_SAFEARRAY: sprintf(szVarType, "safearray of ");
-      dump_TypeDesc(pTD->u.lptdesc, szVarType + 13);
+      dump_TypeDesc(pTD->DUMMYUNIONNAME_DOT lptdesc, szVarType + 13);
       break;
     case VT_CARRAY: sprintf(szVarType, "%d dim array of ",
-                            pTD->u.lpadesc->cDims); /* FIXME print out sizes */
-      dump_TypeDesc(&pTD->u.lpadesc->tdescElem, szVarType + strlen(szVarType));
+                            pTD->DUMMYUNIONNAME_DOT lpadesc->cDims); /* FIXME print out sizes */
+      dump_TypeDesc(&pTD->DUMMYUNIONNAME_DOT lpadesc->tdescElem, szVarType + strlen(szVarType));
       break;
 
@@ -950 +950 @@
   dump_TypeDesc(&edesc->tdesc,buf);
   MESSAGE("\t\ttdesc.vartype %d (%s)\n",edesc->tdesc.vt,buf);
-  MESSAGE("\t\tu.parmadesc.flags %x\n",edesc->u.paramdesc.wParamFlags);
-  MESSAGE("\t\tu.parmadesc.lpex %p\n",edesc->u.paramdesc.pparamdescex);
+  MESSAGE("\t\tu.parmadesc.flags %x\n",edesc->DUMMYUNIONNAME_DOT paramdesc.wParamFlags);
+  MESSAGE("\t\tu.parmadesc.lpex %p\n",edesc->DUMMYUNIONNAME_DOT paramdesc.pparamdescex);
 }
 void dump_FUNCDESC(FUNCDESC *funcdesc) {
@@ -1180 +1180 @@
 
         case VT_CY:
-            TRACE("%ld (hi), %lu (lo)\n", ((CY *)ref)->s.Hi, ((CY *)ref)->s.Lo);
+            TRACE("%ld (hi), %lu (lo)\n", ((CY *)ref)->DUMMYSTRUCTNAME_DOT Hi, ((CY *)ref)->DUMMYSTRUCTNAME_DOT Lo);
             break;
 
@@ -1221 +1221 @@
     MESSAGE("memid %ld\n",v->memid);
     MESSAGE("lpstrSchema %s\n",debugstr_w(v->lpstrSchema));
-    MESSAGE("oInst %ld\n",v->u.oInst);
+    MESSAGE("oInst %ld\n",v->DUMMYUNIONNAME_DOT oInst);
     dump_ELEMDESC(&(v->elemdescVar));
     MESSAGE("wVarFlags %x\n",v->wVarFlags);
@@ -1534 +1534 @@
 
     if(pTd->vt == VT_USERDEFINED)
-      MSFT_DoRefType(pcx, pTI, pTd->u.hreftype);
+      MSFT_DoRefType(pcx, pTI, pTd->DUMMYUNIONNAME_DOT hreftype);
 
     TRACE_(typelib)("vt type = %X\n", pTd->vt);
@@ -1679 +1679 @@
                               pTI);
 
-                (*pptfd)->funcdesc.lprgelemdescParam[j].u.paramdesc.wParamFlags = paraminfo.Flags;
+                (*pptfd)->funcdesc.lprgelemdescParam[j].DUMMYUNIONNAME_DOT paramdesc.wParamFlags = paraminfo.Flags;
 
                 (*pptfd)->pParamDesc[j].Name = (void *) paraminfo.oName;
@@ -1699 +1699 @@
                     {
                     case VT_PTR:
-                        lpArgTypeDesc = lpArgTypeDesc->u.lptdesc;
+                        lpArgTypeDesc = lpArgTypeDesc->DUMMYUNIONNAME_DOT lptdesc;
                         break;
 
                     case VT_CARRAY:
-                        lpArgTypeDesc = & (lpArgTypeDesc->u.lpadesc->tdescElem);
+                        lpArgTypeDesc = & (lpArgTypeDesc->DUMMYUNIONNAME_DOT lpadesc->tdescElem);
                         break;
 
                     case VT_USERDEFINED:
                         MSFT_DoRefType(pcx, pTI,
-                                       lpArgTypeDesc->u.hreftype);
+                                       lpArgTypeDesc->DUMMYUNIONNAME_DOT hreftype);
 
                         lpArgTypeDesc = NULL;
@@ -1735 +1735 @@
                     {
                     case VT_PTR:
-                        lpArgTypeDesc = lpArgTypeDesc->u.lptdesc;
+                        lpArgTypeDesc = lpArgTypeDesc->DUMMYUNIONNAME_DOT lptdesc;
                         break;
                     case VT_CARRAY:
                         lpArgTypeDesc =
-                        & (lpArgTypeDesc->u.lpadesc->tdescElem);
+                        & (lpArgTypeDesc->DUMMYUNIONNAME_DOT lpadesc->tdescElem);
 
                         break;
@@ -1746 +1746 @@
                         MSFT_DoRefType(pcx,
                                        pTI,
-                                       lpArgTypeDesc->u.hreftype);
+                                       lpArgTypeDesc->DUMMYUNIONNAME_DOT hreftype);
 
                         lpArgTypeDesc = NULL;
@@ -1766 +1766 @@
                 /* default value */
                 if ( (PARAMFLAG_FHASDEFAULT &
-                      (*pptfd)->funcdesc.lprgelemdescParam[j].u.paramdesc.wParamFlags) &&
+                      (*pptfd)->funcdesc.lprgelemdescParam[j].DUMMYUNIONNAME_DOT paramdesc.wParamFlags) &&
                      ((pFuncRec->FKCCIC) & 0x1000) )
                 {
@@ -1773 +1773 @@
                                    (pFuncRec->nrargs * 4 + 1) * sizeof(INT) );
 
-                    PARAMDESC* pParamDesc = & (*pptfd)->funcdesc.lprgelemdescParam[j].u.paramdesc;
+                    PARAMDESC* pParamDesc = & (*pptfd)->funcdesc.lprgelemdescParam[j].DUMMYUNIONNAME_DOT paramdesc;
 
                     pParamDesc->pparamdescex = TLB_Alloc(sizeof(PARAMDESCEX));
@@ -1841 +1841 @@
 /*   (*pptvd)->vardesc.lpstrSchema; is reserved (SDK) FIXME?? */
         if(pVarRec->VarKind == VAR_CONST ){
-            (*pptvd)->vardesc.u.lpvarValue=TLB_Alloc(sizeof(VARIANT));
-            MSFT_ReadValue((*pptvd)->vardesc.u.lpvarValue,
+            (*pptvd)->vardesc.DUMMYUNIONNAME_DOT lpvarValue=TLB_Alloc(sizeof(VARIANT));
+            MSFT_ReadValue((*pptvd)->vardesc.DUMMYUNIONNAME_DOT lpvarValue,
                 pVarRec->OffsValue, pcx);
         } else
-            (*pptvd)->vardesc.u.oInst=pVarRec->OffsValue;
+            (*pptvd)->vardesc.DUMMYUNIONNAME_DOT oInst=pVarRec->OffsValue;
         pptvd=&((*pptvd)->next);
         recoffset += reclength;
@@ -2264 +2264 @@
                 /* FIXME: check safearray */
                 if(td[3] < 0)
-                    pTypeLibImpl->pTypeDesc[i].u.lptdesc= & stndTypeDesc[td[2]];
+                    pTypeLibImpl->pTypeDesc[i].DUMMYUNIONNAME_DOT lptdesc= & stndTypeDesc[td[2]];
                 else
-                    pTypeLibImpl->pTypeDesc[i].u.lptdesc= & pTypeLibImpl->pTypeDesc[td[2]/8];
+                    pTypeLibImpl->pTypeDesc[i].DUMMYUNIONNAME_DOT lptdesc= & pTypeLibImpl->pTypeDesc[td[2]/8];
             }
             else if(td[0] == VT_CARRAY)
             {
                 /* array descr table here */
-                pTypeLibImpl->pTypeDesc[i].u.lpadesc = (void *)((int) td[2]);  /* temp store offset in*/
+                pTypeLibImpl->pTypeDesc[i].DUMMYUNIONNAME_DOT lpadesc = (void *)((int) td[2]);  /* temp store offset in*/
             }
             else if(td[0] == VT_USERDEFINED)
             {
-                pTypeLibImpl->pTypeDesc[i].u.hreftype = MAKELONG(td[2],td[3]);
+                pTypeLibImpl->pTypeDesc[i].DUMMYUNIONNAME_DOT hreftype = MAKELONG(td[2],td[3]);
             }
             if(++i<cTD) MSFT_ReadLEWords(td, sizeof(td), &cx, DO_NOT_SEEK);
@@ -2286 +2286 @@
             if(tlbSegDir.pArrayDescriptions.offset>0)
             {
-                MSFT_ReadLEWords(td, sizeof(td), &cx, tlbSegDir.pArrayDescriptions.offset + (int) pTypeLibImpl->pTypeDesc[i].u.lpadesc);
-                pTypeLibImpl->pTypeDesc[i].u.lpadesc = TLB_Alloc(sizeof(ARRAYDESC)+sizeof(SAFEARRAYBOUND)*(td[3]-1));
+                MSFT_ReadLEWords(td, sizeof(td), &cx, tlbSegDir.pArrayDescriptions.offset + (int) pTypeLibImpl->pTypeDesc[i].DUMMYUNIONNAME_DOT lpadesc);
+                pTypeLibImpl->pTypeDesc[i].DUMMYUNIONNAME_DOT lpadesc = TLB_Alloc(sizeof(ARRAYDESC)+sizeof(SAFEARRAYBOUND)*(td[3]-1));
 
                 if(td[1]<0)
-                    pTypeLibImpl->pTypeDesc[i].u.lpadesc->tdescElem.vt = td[0] & VT_TYPEMASK;
+                    pTypeLibImpl->pTypeDesc[i].DUMMYUNIONNAME_DOT lpadesc->tdescElem.vt = td[0] & VT_TYPEMASK;
                 else
-                    pTypeLibImpl->pTypeDesc[i].u.lpadesc->tdescElem = stndTypeDesc[td[0]/8];
-
-                pTypeLibImpl->pTypeDesc[i].u.lpadesc->cDims = td[2];
+                    pTypeLibImpl->pTypeDesc[i].DUMMYUNIONNAME_DOT lpadesc->tdescElem = stndTypeDesc[td[0]/8];
+
+                pTypeLibImpl->pTypeDesc[i].DUMMYUNIONNAME_DOT lpadesc->cDims = td[2];
 
                 for(j = 0; j<td[2]; j++)
                 {
-                    MSFT_ReadLEDWords(& pTypeLibImpl->pTypeDesc[i].u.lpadesc->rgbounds[j].cElements,
+                    MSFT_ReadLEDWords(& pTypeLibImpl->pTypeDesc[i].DUMMYUNIONNAME_DOT lpadesc->rgbounds[j].cElements,
                                       sizeof(INT), &cx, DO_NOT_SEEK);
-                    MSFT_ReadLEDWords(& pTypeLibImpl->pTypeDesc[i].u.lpadesc->rgbounds[j].lLbound,
+                    MSFT_ReadLEDWords(& pTypeLibImpl->pTypeDesc[i].DUMMYUNIONNAME_DOT lpadesc->rgbounds[j].lLbound,
                                       sizeof(INT), &cx, DO_NOT_SEEK);
                 }
@@ -2306 +2306 @@
             else
             {
-                pTypeLibImpl->pTypeDesc[i].u.lpadesc = NULL;
+                pTypeLibImpl->pTypeDesc[i].DUMMYUNIONNAME_DOT lpadesc = NULL;
                 ERR("didn't find array description data\n");
             }
@@ -2482 +2482 @@
     /* Handle [in/out] first */
     if((*pType & 0xc000) == 0xc000)
-        pElem->u.paramdesc.wParamFlags = PARAMFLAG_NONE;
+        pElem->DUMMYUNIONNAME_DOT paramdesc.wParamFlags = PARAMFLAG_NONE;
     else if(*pType & 0x8000)
-        pElem->u.paramdesc.wParamFlags = PARAMFLAG_FIN | PARAMFLAG_FOUT;
+        pElem->DUMMYUNIONNAME_DOT paramdesc.wParamFlags = PARAMFLAG_FIN | PARAMFLAG_FOUT;
     else if(*pType & 0x4000)
-        pElem->u.paramdesc.wParamFlags = PARAMFLAG_FOUT;
+        pElem->DUMMYUNIONNAME_DOT paramdesc.wParamFlags = PARAMFLAG_FOUT;
     else
-        pElem->u.paramdesc.wParamFlags = PARAMFLAG_FIN;
+        pElem->DUMMYUNIONNAME_DOT paramdesc.wParamFlags = PARAMFLAG_FIN;
 
     if(*pType & 0x2000)
-        pElem->u.paramdesc.wParamFlags |= PARAMFLAG_FLCID;
+        pElem->DUMMYUNIONNAME_DOT paramdesc.wParamFlags |= PARAMFLAG_FLCID;
 
     if(*pType & 0x80)
-        pElem->u.paramdesc.wParamFlags |= PARAMFLAG_FRETVAL;
+        pElem->DUMMYUNIONNAME_DOT paramdesc.wParamFlags |= PARAMFLAG_FRETVAL;
 
     while(!done) {
         if((*pType & 0xe00) == 0xe00) {
             pTD->vt = VT_PTR;
-            pTD->u.lptdesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
+            pTD->DUMMYUNIONNAME_DOT lptdesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
                                        sizeof(TYPEDESC));
-            pTD = pTD->u.lptdesc;
+            pTD = pTD->DUMMYUNIONNAME_DOT lptdesc;
         }
         switch(*pType & 0x7f) {
         case VT_PTR:
             pTD->vt = VT_PTR;
-            pTD->u.lptdesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
+            pTD->DUMMYUNIONNAME_DOT lptdesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
                                        sizeof(TYPEDESC));
-            pTD = pTD->u.lptdesc;
+            pTD = pTD->DUMMYUNIONNAME_DOT lptdesc;
             break;
 
         case VT_USERDEFINED:
             pTD->vt = VT_USERDEFINED;
-            pTD->u.hreftype = *(++pType) / 4;
+            pTD->DUMMYUNIONNAME_DOT hreftype = *(++pType) / 4;
             done = TRUE;
             break;
@@ -2525 +2525 @@
 
             pTD->vt = VT_CARRAY;
-            pTD->u.lpadesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
+            pTD->DUMMYUNIONNAME_DOT lpadesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
                                 sizeof(ARRAYDESC) +
                                 (pSA->cDims - 1) * sizeof(SAFEARRAYBOUND));
-            pTD->u.lpadesc->cDims = pSA->cDims;
-            memcpy(pTD->u.lpadesc->rgbounds, pSA->rgsabound,
+            pTD->DUMMYUNIONNAME_DOT lpadesc->cDims = pSA->cDims;
+            memcpy(pTD->DUMMYUNIONNAME_DOT lpadesc->rgbounds, pSA->rgsabound,
                    pSA->cDims * sizeof(SAFEARRAYBOUND));
 
-            pTD = &pTD->u.lpadesc->tdescElem;
+            pTD = &pTD->DUMMYUNIONNAME_DOT lpadesc->tdescElem;
             break;
           }
@@ -2543 +2543 @@
             pType++;
             pTD->vt = VT_SAFEARRAY;
-            pTD->u.lptdesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
+            pTD->DUMMYUNIONNAME_DOT lptdesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
                                        sizeof(TYPEDESC));
-            pTD = pTD->u.lptdesc;
+            pTD = pTD->DUMMYUNIONNAME_DOT lptdesc;
             break;
           }
@@ -2788 +2788 @@
             if((*ppFuncDesc)->funcdesc.cParams - param <=
                (*ppFuncDesc)->funcdesc.cParamsOpt)
-              (*ppFuncDesc)->funcdesc.lprgelemdescParam[param].u.paramdesc.wParamFlags |= PARAMFLAG_FOPT;
+              (*ppFuncDesc)->funcdesc.lprgelemdescParam[param].DUMMYUNIONNAME_DOT paramdesc.wParamFlags |= PARAMFLAG_FOPT;
 
             if(paramName) {
@@ -2829 +2829 @@
       (*ppVarDesc)->Name = TLB_MultiByteToBSTR(pItem->name + pNameTable);
       (*ppVarDesc)->vardesc.memid = pItem->memid;
-      (*ppVarDesc)->vardesc.u.oInst = pItem->byte_offs;
+      (*ppVarDesc)->vardesc.DUMMYUNIONNAME_DOT oInst = pItem->byte_offs;
       (*ppVarDesc)->vardesc.varkind = VAR_PERINSTANCE;
 
@@ -2878 +2878 @@
       (*ppVarDesc)->Name = TLB_MultiByteToBSTR(pItem->name + pNameTable);
       (*ppVarDesc)->vardesc.memid = pItem->memid;
-      (*ppVarDesc)->vardesc.u.lpvarValue = HeapAlloc(GetProcessHeap(), 0,
+      (*ppVarDesc)->vardesc.DUMMYUNIONNAME_DOT lpvarValue = HeapAlloc(GetProcessHeap(), 0,
                                                      sizeof(VARIANT));
-      V_VT((*ppVarDesc)->vardesc.u.lpvarValue) = VT_INT;
-      V_UNION((*ppVarDesc)->vardesc.u.lpvarValue, intVal) =
+      V_VT((*ppVarDesc)->vardesc.DUMMYUNIONNAME_DOT lpvarValue) = VT_INT;
+      V_UNION((*ppVarDesc)->vardesc.DUMMYUNIONNAME_DOT lpvarValue, intVal) =
         *(INT*)(pItem->value + pFirstItem);
       (*ppVarDesc)->vardesc.elemdescVar.tdesc.vt = VT_I4;
@@ -4398 +4398 @@
                     /* If pointer to variant, pass reference it. */
                     if ((tdesc->vt == VT_PTR) &&
-                        (tdesc->u.lptdesc->vt == VT_VARIANT) &&
+                        (tdesc->DUMMYUNIONNAME_DOT lptdesc->vt == VT_VARIANT) &&
                         pVarResult
                     )
@@ -4422 +4422 @@
                     TYPEDESC *tdesc = &(pFDesc->funcdesc.lprgelemdescParam[i+pDispParams->cArgs].tdesc);
                     /* If we are a pointer to a variant, we are done already */
-                    if ((tdesc->vt==VT_PTR)&&(tdesc->u.lptdesc->vt==VT_VARIANT))
+                    if ((tdesc->vt==VT_PTR)&&(tdesc->DUMMYUNIONNAME_DOT lptdesc->vt==VT_VARIANT))
                         continue;
 
@@ -4429 +4429 @@
 
                     if (tdesc->vt == VT_PTR)
-                        tdesc = tdesc->u.lptdesc;
+                        tdesc = tdesc->DUMMYUNIONNAME_DOT lptdesc;
                     V_VT(pVarResult) = tdesc->vt;
 

branches/gcc-kmk/src/oleaut32/variant.c

@@ -674 +674 @@
  * Round the double value to the nearest integer value.
  */
-static double round( double d )
+static double rnd( double d )
 {
    double decimals = 0.0, integerValue = 0.0, roundedValue = 0.0;
@@ -2254 +2254 @@
         /* Check range of value.
      */
-    fltIn = round( fltIn );
+    fltIn = rnd( fltIn );
         if( fltIn < UI1_MIN || fltIn > UI1_MAX )
         {
@@ -2274 +2274 @@
         /* Check range of value.
      */
-    dblIn = round( dblIn );
+    dblIn = rnd( dblIn );
         if( dblIn < UI1_MIN || dblIn > UI1_MAX )
         {
@@ -2294 +2294 @@
         /* Check range of value.
      */
-    dateIn = round( dateIn );
+    dateIn = rnd( dateIn );
         if( dateIn < UI1_MIN || dateIn > UI1_MAX )
         {
@@ -2397 +2397 @@
         /* Check range of value.
      */
-    dValue = round( dValue );
+    dValue = rnd( dValue );
         if( dValue < UI1_MIN || dValue > UI1_MAX )
         {
@@ -2413 +2413 @@
  */
 HRESULT WINAPI VarUI1FromCy(CY cyIn, BYTE* pbOut) {
-   double t = round((((double)cyIn.s.Hi * 4294967296.0) + (double)cyIn.s.Lo) / 10000);
+   double t = rnd((((double)cyIn.DUMMYSTRUCTNAME_DOT Hi * 4294967296.0) + (double)cyIn.DUMMYSTRUCTNAME_DOT Lo) / 10000);
 
    if (t > UI1_MAX || t < UI1_MIN) return DISP_E_OVERFLOW;
@@ -2461 +2461 @@
         /* Check range of value.
      */
-    fltIn = round( fltIn );
+    fltIn = rnd( fltIn );
         if( fltIn < I2_MIN || fltIn > I2_MAX )
         {
@@ -2481 +2481 @@
         /* Check range of value.
      */
-    dblIn = round( dblIn );
+    dblIn = rnd( dblIn );
         if( dblIn < I2_MIN || dblIn > I2_MAX )
         {
@@ -2501 +2501 @@
         /* Check range of value.
      */
-    dateIn = round( dateIn );
+    dateIn = rnd( dateIn );
         if( dateIn < I2_MIN || dateIn > I2_MAX )
         {
@@ -2603 +2603 @@
         /* Check range of value.
      */
-    dValue = round( dValue );
+    dValue = rnd( dValue );
         if( dValue < I2_MIN || dValue > I2_MAX )
         {
@@ -2619 +2619 @@
  */
 HRESULT WINAPI VarI2FromCy(CY cyIn, short* psOut) {
-   double t = round((((double)cyIn.s.Hi * 4294967296.0) + (double)cyIn.s.Lo) / 10000);
+   double t = rnd((((double)cyIn.DUMMYSTRUCTNAME_DOT Hi * 4294967296.0) + (double)cyIn.DUMMYSTRUCTNAME_DOT Lo) / 10000);
 
    if (t > I2_MAX || t < I2_MIN) return DISP_E_OVERFLOW;
@@ -2649 +2649 @@
         /* Check range of value.
      */
-    fltIn = round( fltIn );
+    fltIn = rnd( fltIn );
         if( fltIn < I4_MIN || fltIn > I4_MAX )
         {
@@ -2669 +2669 @@
         /* Check range of value.
      */
-    dblIn = round( dblIn );
+    dblIn = rnd( dblIn );
         if( dblIn < I4_MIN || dblIn > I4_MAX )
         {
@@ -2689 +2689 @@
         /* Check range of value.
      */
-    dateIn = round( dateIn );
+    dateIn = rnd( dateIn );
         if( dateIn < I4_MIN || dateIn > I4_MAX )
         {
@@ -2796 +2796 @@
         /* Check range of value.
      */
-    dValue = round( dValue );
+    dValue = rnd( dValue );
         if( dValue < I4_MIN || dValue > I4_MAX )
         {
@@ -2812 +2812 @@
  */
 HRESULT WINAPI VarI4FromCy(CY cyIn, LONG* plOut) {
-   double t = round((((double)cyIn.s.Hi * 4294967296.0) + (double)cyIn.s.Lo) / 10000);
+   double t = rnd((((double)cyIn.DUMMYSTRUCTNAME_DOT Hi * 4294967296.0) + (double)cyIn.DUMMYSTRUCTNAME_DOT Lo) / 10000);
 
    if (t > I4_MAX || t < I4_MIN) return DISP_E_OVERFLOW;
@@ -2986 +2986 @@
  */
 HRESULT WINAPI VarR4FromCy(CY cyIn, FLOAT* pfltOut) {
-   *pfltOut = (FLOAT)((((double)cyIn.s.Hi * 4294967296.0) + (double)cyIn.s.Lo) / 10000);
+   *pfltOut = (FLOAT)((((double)cyIn.DUMMYSTRUCTNAME_DOT Hi * 4294967296.0) + (double)cyIn.DUMMYSTRUCTNAME_DOT Lo) / 10000);
 
    return S_OK;
@@ -3136 +3136 @@
  */
 HRESULT WINAPI VarR8FromCy(CY cyIn, double* pdblOut) {
-   *pdblOut = (double)((((double)cyIn.s.Hi * 4294967296.0) + (double)cyIn.s.Lo) / 10000);
-   TRACE("%lu %ld -> %f\n", cyIn.s.Hi, cyIn.s.Lo, *pdblOut);
+   *pdblOut = (double)((((double)cyIn.DUMMYSTRUCTNAME_DOT Hi * 4294967296.0) + (double)cyIn.DUMMYSTRUCTNAME_DOT Lo) / 10000);
+   TRACE("%lu %ld -> %f\n", cyIn.DUMMYSTRUCTNAME_DOT Hi, cyIn.DUMMYSTRUCTNAME_DOT Lo, *pdblOut);
    return S_OK;
 }
@@ -3328 +3328 @@
  */
 HRESULT WINAPI VarDateFromCy(CY cyIn, DATE* pdateOut) {
-   *pdateOut = (DATE)((((double)cyIn.s.Hi * 4294967296.0) + (double)cyIn.s.Lo) / 10000);
+   *pdateOut = (DATE)((((double)cyIn.DUMMYSTRUCTNAME_DOT Hi * 4294967296.0) + (double)cyIn.DUMMYSTRUCTNAME_DOT Lo) / 10000);
 
    if (*pdateOut > DATE_MAX || *pdateOut < DATE_MIN) return DISP_E_TYPEMISMATCH;
@@ -3688 +3688 @@
  */
 HRESULT WINAPI VarBoolFromCy(CY cyIn, VARIANT_BOOL* pboolOut) {
-      if (cyIn.s.Hi || cyIn.s.Lo) *pboolOut = -1;
+      if (cyIn.DUMMYSTRUCTNAME_DOT Hi || cyIn.DUMMYSTRUCTNAME_DOT Lo) *pboolOut = -1;
       else *pboolOut = 0;
 
@@ -3754 +3754 @@
         TRACE("( %f, %p ), stub\n", fltIn, pcOut );
 
-    fltIn = round( fltIn );
+    fltIn = rnd( fltIn );
         if( fltIn < CHAR_MIN || fltIn > CHAR_MAX )
         {
@@ -3772 +3772 @@
         TRACE("( %f, %p ), stub\n", dblIn, pcOut );
 
-    dblIn = round( dblIn );
+    dblIn = rnd( dblIn );
     if( dblIn < CHAR_MIN || dblIn > CHAR_MAX )
         {
@@ -3790 +3790 @@
         TRACE("( %f, %p ), stub\n", dateIn, pcOut );
 
-    dateIn = round( dateIn );
+    dateIn = rnd( dateIn );
         if( dateIn < CHAR_MIN || dateIn > CHAR_MAX )
         {
@@ -3830 +3830 @@
         /* Check range of value.
      */
-    dValue = round( dValue );
+    dValue = rnd( dValue );
         if( dValue < CHAR_MIN || dValue > CHAR_MAX )
         {
@@ -3892 +3892 @@
  */
 HRESULT WINAPI VarI1FromCy(CY cyIn, CHAR* pcOut) {
-   double t = round((((double)cyIn.s.Hi * 4294967296.0) + (double)cyIn.s.Lo) / 10000);
+   double t = rnd((((double)cyIn.DUMMYSTRUCTNAME_DOT Hi * 4294967296.0) + (double)cyIn.DUMMYSTRUCTNAME_DOT Lo) / 10000);
 
    if (t > CHAR_MAX || t < CHAR_MIN) return DISP_E_OVERFLOW;
@@ -3953 +3953 @@
         TRACE("( %f, %p ), stub\n", fltIn, puiOut );
 
-    fltIn = round( fltIn );
+    fltIn = rnd( fltIn );
         if( fltIn < UI2_MIN || fltIn > UI2_MAX )
         {
@@ -3971 +3971 @@
         TRACE("( %f, %p ), stub\n", dblIn, puiOut );
 
-    dblIn = round( dblIn );
+    dblIn = rnd( dblIn );
     if( dblIn < UI2_MIN || dblIn > UI2_MAX )
         {
@@ -3989 +3989 @@
         TRACE("( %f, %p ), stub\n", dateIn, puiOut );
 
-    dateIn = round( dateIn );
+    dateIn = rnd( dateIn );
         if( dateIn < UI2_MIN || dateIn > UI2_MAX )
         {
@@ -4029 +4029 @@
         /* Check range of value.
      */
-    dValue = round( dValue );
+    dValue = rnd( dValue );
         if( dValue < UI2_MIN || dValue > UI2_MAX )
         {
@@ -4110 +4110 @@
         /* Check range of value.
      */
-    dValue = round( dValue );
+    dValue = rnd( dValue );
         if( dValue < UI4_MIN || dValue > UI4_MAX )
         {
@@ -4126 +4126 @@
  */
 HRESULT WINAPI VarUI2FromCy(CY cyIn, USHORT* pusOut) {
-   double t = round((((double)cyIn.s.Hi * 4294967296.0) + (double)cyIn.s.Lo) / 10000);
+   double t = rnd((((double)cyIn.DUMMYSTRUCTNAME_DOT Hi * 4294967296.0) + (double)cyIn.DUMMYSTRUCTNAME_DOT Lo) / 10000);
 
    if (t > UI2_MAX || t < UI2_MIN) return DISP_E_OVERFLOW;
@@ -4186 +4186 @@
 HRESULT WINAPI VarUI4FromR4(FLOAT fltIn, ULONG* pulOut)
 {
-    fltIn = round( fltIn );
+    fltIn = rnd( fltIn );
     if( fltIn < UI4_MIN || fltIn > UI4_MAX )
         {
@@ -4204 +4204 @@
         TRACE("( %f, %p ), stub\n", dblIn, pulOut );
 
-        dblIn = round( dblIn );
+        dblIn = rnd( dblIn );
         if( dblIn < UI4_MIN || dblIn > UI4_MAX )
         {
@@ -4222 +4222 @@
         TRACE("( %f, %p ), stub\n", dateIn, pulOut );
 
-        dateIn = round( dateIn );
+        dateIn = rnd( dateIn );
         if( dateIn < UI4_MIN || dateIn > UI4_MAX )
         {
@@ -4274 +4274 @@
  */
 HRESULT WINAPI VarUI4FromCy(CY cyIn, ULONG* pulOut) {
-   double t = round((((double)cyIn.s.Hi * 4294967296.0) + (double)cyIn.s.Lo) / 10000);
+   double t = rnd((((double)cyIn.DUMMYSTRUCTNAME_DOT Hi * 4294967296.0) + (double)cyIn.DUMMYSTRUCTNAME_DOT Lo) / 10000);
 
    if (t > UI4_MAX || t < UI4_MIN) return DISP_E_OVERFLOW;
@@ -4288 +4288 @@
  */
 HRESULT WINAPI VarCyFromUI1(BYTE bIn, CY* pcyOut) {
-    pcyOut->s.Hi = 0;
-    pcyOut->s.Lo = ((ULONG)bIn) * 10000;
+    pcyOut->DUMMYSTRUCTNAME_DOT Hi = 0;
+    pcyOut->DUMMYSTRUCTNAME_DOT Lo = ((ULONG)bIn) * 10000;
 
     return S_OK;
@@ -4299 +4299 @@
  */
 HRESULT WINAPI VarCyFromI2(short sIn, CY* pcyOut) {
-    if (sIn < 0) pcyOut->s.Hi = -1;
-    else pcyOut->s.Hi = 0;
-    pcyOut->s.Lo = ((ULONG)sIn) * 10000;
+    if (sIn < 0) pcyOut->DUMMYSTRUCTNAME_DOT Hi = -1;
+    else pcyOut->DUMMYSTRUCTNAME_DOT Hi = 0;
+    pcyOut->DUMMYSTRUCTNAME_DOT Lo = ((ULONG)sIn) * 10000;
 
     return S_OK;
@@ -4312 +4312 @@
 HRESULT WINAPI VarCyFromI4(LONG lIn, CY* pcyOut) {
       double t = (double)lIn * (double)10000;
-      pcyOut->s.Hi = (LONG)(t / (double)4294967296.0);
-      pcyOut->s.Lo = (ULONG)fmod(t, (double)4294967296.0);
-      if (lIn < 0) pcyOut->s.Hi--;
+      pcyOut->DUMMYSTRUCTNAME_DOT Hi = (LONG)(t / (double)4294967296.0);
+      pcyOut->DUMMYSTRUCTNAME_DOT Lo = (ULONG)fmod(t, (double)4294967296.0);
+      if (lIn < 0) pcyOut->DUMMYSTRUCTNAME_DOT Hi--;
 
       return S_OK;
@@ -4324 +4324 @@
  */
 HRESULT WINAPI VarCyFromR4(FLOAT fltIn, CY* pcyOut) {
-   double t = round((double)fltIn * (double)10000);
-   pcyOut->s.Hi = (LONG)(t / (double)4294967296.0);
-   pcyOut->s.Lo = (ULONG)fmod(t, (double)4294967296.0);
-   if (fltIn < 0) pcyOut->s.Hi--;
+   double t = rnd((double)fltIn * (double)10000);
+   pcyOut->DUMMYSTRUCTNAME_DOT Hi = (LONG)(t / (double)4294967296.0);
+   pcyOut->DUMMYSTRUCTNAME_DOT Lo = (ULONG)fmod(t, (double)4294967296.0);
+   if (fltIn < 0) pcyOut->DUMMYSTRUCTNAME_DOT Hi--;
 
    return S_OK;
@@ -4337 +4337 @@
  */
 HRESULT WINAPI VarCyFromR8(double dblIn, CY* pcyOut) {
-   double t = round(dblIn * (double)10000);
-   pcyOut->s.Hi = (LONG)(t / (double)4294967296.0);
-   pcyOut->s.Lo = (ULONG)fmod(t, (double)4294967296.0);
-   if (dblIn < 0) pcyOut->s.Hi--;
+   double t = rnd(dblIn * (double)10000);
+   pcyOut->DUMMYSTRUCTNAME_DOT Hi = (LONG)(t / (double)4294967296.0);
+   pcyOut->DUMMYSTRUCTNAME_DOT Lo = (ULONG)fmod(t, (double)4294967296.0);
+   if (dblIn < 0) pcyOut->DUMMYSTRUCTNAME_DOT Hi--;
 
    return S_OK;
@@ -4350 +4350 @@
  */
 HRESULT WINAPI VarCyFromDate(DATE dateIn, CY* pcyOut) {
-   double t = round((double)dateIn * (double)10000);
-   pcyOut->s.Hi = (LONG)(t / (double)4294967296.0);
-   pcyOut->s.Lo = (ULONG)fmod(t, (double)4294967296.0);
-   if (dateIn < 0) pcyOut->s.Hi--;
+   double t = rnd((double)dateIn * (double)10000);
+   pcyOut->DUMMYSTRUCTNAME_DOT Hi = (LONG)(t / (double)4294967296.0);
+   pcyOut->DUMMYSTRUCTNAME_DOT Lo = (ULONG)fmod(t, (double)4294967296.0);
+   if (dateIn < 0) pcyOut->DUMMYSTRUCTNAME_DOT Hi--;
 
    return S_OK;
@@ -4418 +4418 @@
  */
 HRESULT WINAPI VarCyFromBool(VARIANT_BOOL boolIn, CY* pcyOut) {
-   if (boolIn < 0) pcyOut->s.Hi = -1;
-   else pcyOut->s.Hi = 0;
-   pcyOut->s.Lo = (ULONG)boolIn * (ULONG)10000;
+   if (boolIn < 0) pcyOut->DUMMYSTRUCTNAME_DOT Hi = -1;
+   else pcyOut->DUMMYSTRUCTNAME_DOT Hi = 0;
+   pcyOut->DUMMYSTRUCTNAME_DOT Lo = (ULONG)boolIn * (ULONG)10000;
 
    return S_OK;
@@ -4430 +4430 @@
  */
 HRESULT WINAPI VarCyFromI1(signed char cIn, CY* pcyOut) {
-   if (cIn < 0) pcyOut->s.Hi = -1;
-   else pcyOut->s.Hi = 0;
-   pcyOut->s.Lo = (ULONG)cIn * (ULONG)10000;
+   if (cIn < 0) pcyOut->DUMMYSTRUCTNAME_DOT Hi = -1;
+   else pcyOut->DUMMYSTRUCTNAME_DOT Hi = 0;
+   pcyOut->DUMMYSTRUCTNAME_DOT Lo = (ULONG)cIn * (ULONG)10000;
 
    return S_OK;
@@ -4442 +4442 @@
  */
 HRESULT WINAPI VarCyFromUI2(USHORT usIn, CY* pcyOut) {
-   pcyOut->s.Hi = 0;
-   pcyOut->s.Lo = (ULONG)usIn * (ULONG)10000;
+   pcyOut->DUMMYSTRUCTNAME_DOT Hi = 0;
+   pcyOut->DUMMYSTRUCTNAME_DOT Lo = (ULONG)usIn * (ULONG)10000;
 
    return S_OK;
@@ -4454 +4454 @@
 HRESULT WINAPI VarCyFromUI4(ULONG ulIn, CY* pcyOut) {
    double t = (double)ulIn * (double)10000;
-   pcyOut->s.Hi = (LONG)(t / (double)4294967296.0);
-   pcyOut->s.Lo = (ULONG)fmod(t, (double)4294967296.0);
+   pcyOut->DUMMYSTRUCTNAME_DOT Hi = (LONG)(t / (double)4294967296.0);
+   pcyOut->DUMMYSTRUCTNAME_DOT Lo = (ULONG)fmod(t, (double)4294967296.0);
 
    return S_OK;
@@ -4570 +4570 @@
         TRACE("Calculated currency is xint=%ld\n", xint);
         VarCyFromInt( (int) xint, &V_UNION(pvar,cyVal) );
-        TRACE("Calculated cy is %ld,%lu\n", V_UNION(pvar,cyVal).s.Hi, V_UNION(pvar,cyVal).s.Lo);
+        TRACE("Calculated cy is %ld,%lu\n", V_UNION(pvar,cyVal).DUMMYSTRUCTNAME_DOT Hi, V_UNION(pvar,cyVal).DUMMYSTRUCTNAME_DOT Lo);
         return VarCyFromInt( (int) xint, &V_UNION(pvar,cyVal) );
     }
@@ -5570 +5570 @@
         rc = VarCyFromR8((cyVal * (double) mulBy), pcyOut);
         TRACE("Multiply %f by %ld = %f [%ld,%lu]\n", cyVal, mulBy, (cyVal * (double) mulBy),
-                    pcyOut->s.Hi, pcyOut->s.Lo);
+                    pcyOut->DUMMYSTRUCTNAME_DOT Hi, pcyOut->DUMMYSTRUCTNAME_DOT Lo);
     }
     return rc;