Changeset 8450 for trunk/src/oleaut32/variant.c

Timestamp:

May 17, 2002, 12:18:06 PM (23 years ago)

Author:

sandervl

Message:

Wine resync

File:

• trunk/src/oleaut32/variant.c (modified) (5 diffs)

trunk/src/oleaut32/variant.c

@@ -3 +3 @@
  *
  * Copyright 1998 Jean-Claude Cote
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * NOTES
@@ -20 +34 @@
  *   - The parsing does not accept as many formats as the Windows implementation.
  */
-#ifdef __WIN32OS2__
-#define HAVE_FLOAT_H
-#define WINE_LARGE_INTEGER
-#include "oleaut32.h"
-
-#endif
 
 #include "config.h"
@@ -42 +50 @@
 #include "oleauto.h"
 #include "heap.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winerror.h"
 #include "parsedt.h"
 
-DEFAULT_DEBUG_CHANNEL(ole);
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 #define SYSDUPSTRING(str) SysAllocStringLen((str), SysStringLen(str))
@@ -1646 +1654 @@
                         ( vt & VT_TYPEMASK ) > VT_MAXVALIDTYPE )
                 {
-                        res = E_INVALIDARG;
+                        res = DISP_E_BADVARTYPE;
                 }
                         
@@ -1968 +1976 @@
           }
         }
-        
-        V_VT(pvargDest) = V_VT(pvargSrc) & VT_TYPEMASK;
+
+        if (res == S_OK) V_VT(pvargDest) = V_VT(pvargSrc) & VT_TYPEMASK;
       }
     }