[PATCH 08/28] dlls/propsys: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech at gmail.com>

---
 dlls/propsys/Makefile.in    |    1 -
 dlls/propsys/propstore.c    |    8 ++++----
 dlls/propsys/propsys_main.c |    2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dlls/propsys/Makefile.in b/dlls/propsys/Makefile.in
index 71fd29a0dfe..166b7751d6e 100644
--- a/dlls/propsys/Makefile.in
+++ b/dlls/propsys/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = propsys.dll
 IMPORTLIB = propsys
 IMPORTS   = ole32 oleaut32 uuid
diff --git a/dlls/propsys/propstore.c b/dlls/propsys/propstore.c
index 6e0d49057d9..9906df83f6f 100644
--- a/dlls/propsys/propstore.c
+++ b/dlls/propsys/propstore.c
@@ -92,7 +92,7 @@ static ULONG WINAPI PropertyStore_AddRef(IPropertyStoreCache *iface)
     PropertyStore *This = impl_from_IPropertyStoreCache(iface);
     ULONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) refcount=%u\n", iface, ref);
+    TRACE("(%p) refcount=%lu\n", iface, ref);
 
     return ref;
 }
@@ -113,7 +113,7 @@ static ULONG WINAPI PropertyStore_Release(IPropertyStoreCache *iface)
     PropertyStore *This = impl_from_IPropertyStoreCache(iface);
     ULONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) refcount=%u\n", iface, ref);
+    TRACE("(%p) refcount=%lu\n", iface, ref);
 
     if (ref == 0)
     {
@@ -159,7 +159,7 @@ static HRESULT WINAPI PropertyStore_GetAt(IPropertyStoreCache *iface,
     propstore_value *value;
     HRESULT hr;
 
-    TRACE("%p,%d,%p\n", iface, iProp, pkey);
+    TRACE("%p,%ld,%p\n", iface, iProp, pkey);
 
     if (!pkey)
         return E_POINTER;
@@ -478,7 +478,7 @@ HRESULT WINAPI PSCreatePropertyStoreFromObject(IUnknown *obj, DWORD access, REFI
 {
     HRESULT hr;
 
-    TRACE("(%p, %d, %s, %p)\n", obj, access, debugstr_guid(riid), ret);
+    TRACE("(%p, %ld, %s, %p)\n", obj, access, debugstr_guid(riid), ret);
 
     if (!obj || !ret)
         return E_POINTER;
diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c
index 06150dfad12..6e87b3d3579 100644
--- a/dlls/propsys/propsys_main.c
+++ b/dlls/propsys/propsys_main.c
@@ -157,7 +157,7 @@ static HRESULT WINAPI propsys_FormatForDisplay(IPropertySystem *iface,
     REFPROPERTYKEY key, REFPROPVARIANT propvar, PROPDESC_FORMAT_FLAGS flags,
     LPWSTR dest, DWORD destlen)
 {
-    FIXME("%p %p %x %p %d: stub\n", key, propvar, flags, dest, destlen);
+    FIXME("%p %p %x %p %ld: stub\n", key, propvar, flags, dest, destlen);
     return E_NOTIMPL;
 }