Eric Pouech : pstorec: Enable compilation with long types.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5e4fb4b5e6bcc75706efc481b951a5bc1ffd710e
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=5e4fb4b5e6bcc75706efc481b951a5bc1ffd710e

Author: Eric Pouech <eric.pouech at gmail.com>
Date:   Thu Feb 17 07:11:13 2022 +0100

pstorec: Enable compilation with long types.

Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/pstorec/Makefile.in |  1 -
 dlls/pstorec/pstorec.c   | 20 ++++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/dlls/pstorec/Makefile.in b/dlls/pstorec/Makefile.in
index bc92381f7bf..62d06a759b4 100644
--- a/dlls/pstorec/Makefile.in
+++ b/dlls/pstorec/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = pstorec.dll
 IMPORTS   = uuid
 
diff --git a/dlls/pstorec/pstorec.c b/dlls/pstorec/pstorec.c
index 8d0293d7e44..44b417db9d2 100644
--- a/dlls/pstorec/pstorec.c
+++ b/dlls/pstorec/pstorec.c
@@ -78,7 +78,7 @@ static ULONG WINAPI PStore_fnAddRef(IPStore* iface)
 {
     PStore_impl *This = impl_from_IPStore(iface);
 
-    TRACE("%p %u\n", This, This->ref);
+    TRACE("%p %lu\n", This, This->ref);
 
     return InterlockedIncrement( &This->ref );
 }
@@ -91,7 +91,7 @@ static ULONG WINAPI PStore_fnRelease(IPStore* iface)
     PStore_impl *This = impl_from_IPStore(iface);
     LONG ref;
 
-    TRACE("%p %u\n", This, This->ref);
+    TRACE("%p %lu\n", This, This->ref);
 
     ref = InterlockedDecrement( &This->ref );
     if( !ref )
@@ -135,7 +135,7 @@ static HRESULT WINAPI PStore_fnSetProvParam( IPStore* This,
 static HRESULT WINAPI PStore_fnCreateType( IPStore* This,
     PST_KEY Key, const GUID* pType, PPST_TYPEINFO pInfo, DWORD dwFlags)
 {
-    FIXME("%p %08x %s %p(%d,%s) %08x\n", This, Key, debugstr_guid(pType),
+    FIXME("%p %08lx %s %p(%ld,%s) %08lx\n", This, Key, debugstr_guid(pType),
           pInfo, pInfo->cbSize, debugstr_w(pInfo->szDisplayName), dwFlags);
 
     return E_NOTIMPL;
@@ -157,7 +157,7 @@ static HRESULT WINAPI PStore_fnGetTypeInfo( IPStore* This,
 static HRESULT WINAPI PStore_fnDeleteType( IPStore* This,
     PST_KEY Key, const GUID* pType, DWORD dwFlags)
 {
-    FIXME("%p %d %s %08x\n", This, Key, debugstr_guid(pType), dwFlags);
+    FIXME("%p %ld %s %08lx\n", This, Key, debugstr_guid(pType), dwFlags);
     return E_NOTIMPL;
 }
 
@@ -168,7 +168,7 @@ static HRESULT WINAPI PStore_fnCreateSubtype( IPStore* This,
     PST_KEY Key, const GUID* pType, const GUID* pSubtype,
     PPST_TYPEINFO pInfo, PPST_ACCESSRULESET pRules, DWORD dwFlags)
 {
-    FIXME("%p %08x %s %s %p %p %08x\n", This, Key, debugstr_guid(pType),
+    FIXME("%p %08lx %s %s %p %p %08lx\n", This, Key, debugstr_guid(pType),
            debugstr_guid(pSubtype), pInfo, pRules, dwFlags);
     return E_NOTIMPL;
 }
@@ -190,7 +190,7 @@ static HRESULT WINAPI PStore_fnGetSubtypeInfo( IPStore* This,
 static HRESULT WINAPI PStore_fnDeleteSubtype( IPStore* This,
     PST_KEY Key, const GUID* pType, const GUID* pSubtype, DWORD dwFlags)
 {
-    FIXME("%p %u %s %s %08x\n", This, Key,
+    FIXME("%p %lu %s %s %08lx\n", This, Key,
           debugstr_guid(pType), debugstr_guid(pSubtype), dwFlags);
     return E_NOTIMPL;
 }
@@ -255,7 +255,7 @@ static HRESULT WINAPI PStore_fnReadItem( IPStore* This, PST_KEY Key,
     const GUID* pItemType, const GUID* pItemSubtype, LPCWSTR szItemName,
     DWORD *cbData, BYTE** pbData, PPST_PROMPTINFO pPromptInfo, DWORD dwFlags)
 {
-    FIXME("%p %08x %s %s %s %p %p %p %08x\n", This, Key,
+    FIXME("%p %08lx %s %s %s %p %p %p %08lx\n", This, Key,
           debugstr_guid(pItemType), debugstr_guid(pItemSubtype),
           debugstr_w(szItemName), cbData, pbData, pPromptInfo, dwFlags);
     return E_NOTIMPL;
@@ -269,7 +269,7 @@ static HRESULT WINAPI PStore_fnWriteItem( IPStore* This, PST_KEY Key,
     DWORD cbData, BYTE* ppbData, PPST_PROMPTINFO pPromptInfo,
     DWORD dwDefaultConfirmationStyle, DWORD dwFlags)
 {
-    FIXME("%p %08x %s %s %s %d %p %p %08x\n", This, Key,
+    FIXME("%p %08lx %s %s %s %ld %p %p %08lx\n", This, Key,
           debugstr_guid(pItemType), debugstr_guid(pItemSubtype),
           debugstr_w(szItemName), cbData, ppbData, pPromptInfo, dwFlags);
     return E_NOTIMPL;
@@ -282,7 +282,7 @@ static HRESULT WINAPI PStore_fnOpenItem( IPStore* This, PST_KEY Key,
     const GUID* pItemType, const GUID* pItemSubtype, LPCWSTR szItemName,
     PST_ACCESSMODE ModeFlags, PPST_PROMPTINFO pPromptInfo, DWORD dwFlags )
 {
-    FIXME("(%p,%08x,%s,%s,%s,%08x,%p,%08x) stub\n", This, Key, debugstr_guid(pItemType),
+    FIXME("(%p,%08lx,%s,%s,%s,%08lx,%p,%08lx) stub\n", This, Key, debugstr_guid(pItemType),
            debugstr_guid(pItemSubtype), debugstr_w(szItemName), ModeFlags, pPromptInfo, dwFlags);
     return E_NOTIMPL;
 }
@@ -341,7 +341,7 @@ HRESULT WINAPI PStoreCreateInstance( IPStore** ppProvider,
 {
     PStore_impl *ips;
 
-    TRACE("%p %s %p %08x\n", ppProvider, debugstr_guid(pProviderID), pReserved, dwFlags);
+    TRACE("%p %s %p %08lx\n", ppProvider, debugstr_guid(pProviderID), pReserved, dwFlags);
 
     ips = HeapAlloc( GetProcessHeap(), 0, sizeof (PStore_impl) );
     if( !ips )