[PROPSYS]

[reactos.git] / reactos / dll / win32 / propsys / propvar.c

diff --git a/reactos/dll/win32/propsys/propvar.c b/reactos/dll/win32/propsys/propvar.c
index 117d7f5..0af26f3 100644 (file)
--- a/reactos/dll/win32/propsys/propvar.c
+++ b/reactos/dll/win32/propsys/propvar.c
@@ -18,28 +18,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include "propsys_private.h"
 
-//#include <stdarg.h>
 #include <stdio.h>
-
-#define NONAMELESSUNION
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
 #include <winreg.h>
-//#include "winuser.h"
-#include <shlobj.h>
+#include <oleauto.h>
 #include <propvarutil.h>
 
-#include <wine/debug.h>
-#include <wine/unicode.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(propsys);
-
 static HRESULT PROPVAR_ConvertFILETIME(PROPVARIANT *ppropvarDest,
                                        REFPROPVARIANT propvarSrc, VARTYPE vt)
 {
@@ -73,46 +58,46 @@ static HRESULT PROPVAR_ConvertFILETIME(PROPVARIANT *ppropvarDest,
 }
 
 static HRESULT PROPVAR_ConvertNumber(REFPROPVARIANT pv, int dest_bits,
-    int dest_signed, LONGLONG *res)
+                                     BOOL dest_signed, LONGLONG *res)
 {
-    int src_signed;
+    BOOL src_signed;
 
     switch (pv->vt)
     {
     case VT_I1:
-        src_signed = 1;
+        src_signed = TRUE;
         *res = pv->u.cVal;
         break;
     case VT_UI1:
-        src_signed = 0;
+        src_signed = FALSE;
         *res = pv->u.bVal;
         break;
     case VT_I2:
-        src_signed = 1;
+        src_signed = TRUE;
         *res = pv->u.iVal;
         break;
     case VT_UI2:
-        src_signed = 0;
+        src_signed = FALSE;
         *res = pv->u.uiVal;
         break;
     case VT_I4:
-        src_signed = 1;
+        src_signed = TRUE;
         *res = pv->u.lVal;
         break;
     case VT_UI4:
-        src_signed = 0;
+        src_signed = FALSE;
         *res = pv->u.ulVal;
         break;
     case VT_I8:
-        src_signed = 1;
+        src_signed = TRUE;
         *res = pv->u.hVal.QuadPart;
         break;
     case VT_UI8:
-        src_signed = 0;
+        src_signed = FALSE;
         *res = pv->u.uhVal.QuadPart;
         break;
     case VT_EMPTY:
-        src_signed = 0;
+        src_signed = FALSE;
         *res = 0;
         break;
     default:
@@ -148,7 +133,7 @@ HRESULT WINAPI PropVariantToInt16(REFPROPVARIANT propvarIn, SHORT *ret)
 
     TRACE("%p,%p\n", propvarIn, ret);
 
-    hr = PROPVAR_ConvertNumber(propvarIn, 16, 1, &res);
+    hr = PROPVAR_ConvertNumber(propvarIn, 16, TRUE, &res);
     if (SUCCEEDED(hr)) *ret = (SHORT)res;
     return hr;
 }
@@ -160,7 +145,7 @@ HRESULT WINAPI PropVariantToInt32(REFPROPVARIANT propvarIn, LONG *ret)
 
     TRACE("%p,%p\n", propvarIn, ret);
 
-    hr = PROPVAR_ConvertNumber(propvarIn, 32, 1, &res);
+    hr = PROPVAR_ConvertNumber(propvarIn, 32, TRUE, &res);
     if (SUCCEEDED(hr)) *ret = (LONG)res;
     return hr;
 }
@@ -172,7 +157,7 @@ HRESULT WINAPI PropVariantToInt64(REFPROPVARIANT propvarIn, LONGLONG *ret)
 
     TRACE("%p,%p\n", propvarIn, ret);
 
-    hr = PROPVAR_ConvertNumber(propvarIn, 64, 1, &res);
+    hr = PROPVAR_ConvertNumber(propvarIn, 64, TRUE, &res);
     if (SUCCEEDED(hr)) *ret = (LONGLONG)res;
     return hr;
 }
@@ -184,7 +169,7 @@ HRESULT WINAPI PropVariantToUInt16(REFPROPVARIANT propvarIn, USHORT *ret)
 
     TRACE("%p,%p\n", propvarIn, ret);
 
-    hr = PROPVAR_ConvertNumber(propvarIn, 16, 0, &res);
+    hr = PROPVAR_ConvertNumber(propvarIn, 16, FALSE, &res);
     if (SUCCEEDED(hr)) *ret = (USHORT)res;
     return hr;
 }
@@ -196,7 +181,7 @@ HRESULT WINAPI PropVariantToUInt32(REFPROPVARIANT propvarIn, ULONG *ret)
 
     TRACE("%p,%p\n", propvarIn, ret);
 
-    hr = PROPVAR_ConvertNumber(propvarIn, 32, 0, &res);
+    hr = PROPVAR_ConvertNumber(propvarIn, 32, FALSE, &res);
     if (SUCCEEDED(hr)) *ret = (ULONG)res;
     return hr;
 }
@@ -208,7 +193,7 @@ HRESULT WINAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret)
 
     TRACE("%p,%p\n", propvarIn, ret);
 
-    hr = PROPVAR_ConvertNumber(propvarIn, 64, 0, &res);
+    hr = PROPVAR_ConvertNumber(propvarIn, 64, FALSE, &res);
     if (SUCCEEDED(hr)) *ret = (ULONGLONG)res;
     return hr;
 }
@@ -501,10 +486,10 @@ HRESULT WINAPI VariantToGUID(const VARIANT *pvar, GUID *guid)
     }
 }
 
-static int isemptyornull(const PROPVARIANT *propvar)
+static BOOL isemptyornull(const PROPVARIANT *propvar)
 {
     if (propvar->vt == VT_EMPTY || propvar->vt == VT_NULL)
-        return 1;
+        return TRUE;
     if ((propvar->vt & VT_ARRAY) == VT_ARRAY)
     {
         int i;
@@ -516,7 +501,7 @@ static int isemptyornull(const PROPVARIANT *propvar)
         return i == propvar->u.parray->cDims;
     }
     /* FIXME: vectors, byrefs, errors? */
-    return 0;
+    return FALSE;
 }
 
 INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2,