Eric Pouech : browseui: Enable compilation with long types.

Alexandre Julliard julliard at winehq.org
Wed Feb 9 16:03:47 CST 2022


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

Author: Eric Pouech <eric.pouech at gmail.com>
Date:   Wed Feb  9 09:25:01 2022 +0100

browseui: 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/browseui/Makefile.in     | 1 -
 dlls/browseui/aclmulti.c      | 2 +-
 dlls/browseui/aclsource.c     | 8 ++++----
 dlls/browseui/browseui_main.c | 2 +-
 dlls/browseui/progressdlg.c   | 6 +++---
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/dlls/browseui/Makefile.in b/dlls/browseui/Makefile.in
index 1f2521aa853..6c14ace37cf 100644
--- a/dlls/browseui/Makefile.in
+++ b/dlls/browseui/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = browseui.dll
 IMPORTS   = uuid ole32 comctl32 user32 advapi32
 
diff --git a/dlls/browseui/aclmulti.c b/dlls/browseui/aclmulti.c
index 820b246a403..a41cb810369 100644
--- a/dlls/browseui/aclmulti.c
+++ b/dlls/browseui/aclmulti.c
@@ -140,7 +140,7 @@ static HRESULT WINAPI ACLMulti_Next(IEnumString *iface, ULONG celt, LPOLESTR *rg
 {
     ACLMulti *This = impl_from_IEnumString(iface);
 
-    TRACE("(%p, %d, %p, %p)\n", iface, celt, rgelt, pceltFetched);
+    TRACE("(%p, %ld, %p, %p)\n", iface, celt, rgelt, pceltFetched);
     while (This->currObj < This->nObjs)
     {
         if (This->objs[This->currObj].pEnum)
diff --git a/dlls/browseui/aclsource.c b/dlls/browseui/aclsource.c
index 5ac7cb10761..4412ca38003 100644
--- a/dlls/browseui/aclsource.c
+++ b/dlls/browseui/aclsource.c
@@ -94,7 +94,7 @@ static ULONG WINAPI ACLShellSource_AddRef(IEnumString *iface)
 {
     ACLShellSource *This = impl_from_IEnumString(iface);
     ULONG ref = InterlockedIncrement(&This->refCount);
-    TRACE("(%p)->(%u)\n", This, ref);
+    TRACE("(%p)->(%lu)\n", This, ref);
     return ref;
 }
 
@@ -103,7 +103,7 @@ static ULONG WINAPI ACLShellSource_Release(IEnumString *iface)
     ACLShellSource *This = impl_from_IEnumString(iface);
     ULONG ref = InterlockedDecrement(&This->refCount);
 
-    TRACE("(%p)->(%u)\n", This, ref);
+    TRACE("(%p)->(%lu)\n", This, ref);
 
     if (ref == 0)
         ACLShellSource_Destructor(This);
@@ -114,14 +114,14 @@ static HRESULT WINAPI ACLShellSource_Next(IEnumString *iface, ULONG celt, LPOLES
     ULONG *fetched)
 {
     ACLShellSource *This = impl_from_IEnumString(iface);
-    FIXME("(%p)->(%u %p %p): stub\n", This, celt, rgelt, fetched);
+    FIXME("(%p)->(%lu %p %p): stub\n", This, celt, rgelt, fetched);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI ACLShellSource_Skip(IEnumString *iface, ULONG celt)
 {
     ACLShellSource *This = impl_from_IEnumString(iface);
-    FIXME("(%p)->(%u): stub\n", This, celt);
+    FIXME("(%p)->(%lu): stub\n", This, celt);
     return E_NOTIMPL;
 }
 
diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c
index d2c5ecf3622..b6962b30f26 100644
--- a/dlls/browseui/browseui_main.c
+++ b/dlls/browseui/browseui_main.c
@@ -162,7 +162,7 @@ static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut)
  */
 BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad)
 {
-    TRACE("%p 0x%x %p\n", hinst, fdwReason, fImpLoad);
+    TRACE("%p 0x%lx %p\n", hinst, fdwReason, fImpLoad);
     switch (fdwReason)
     {
         case DLL_PROCESS_ATTACH:
diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c
index 89e70e90201..dc0fe813f68 100644
--- a/dlls/browseui/progressdlg.c
+++ b/dlls/browseui/progressdlg.c
@@ -343,7 +343,7 @@ static HRESULT WINAPI ProgressDialog_StartProgressDialog(IProgressDialog *iface,
     struct create_params params;
     HANDLE hThread;
 
-    TRACE("(%p, %p, %x, %p)\n", iface, punkEnableModeless, dwFlags, reserved);
+    TRACE("(%p, %p, %lx, %p)\n", iface, punkEnableModeless, dwFlags, reserved);
     if (punkEnableModeless || reserved)
         FIXME("Reserved parameters not null (%p, %p)\n", punkEnableModeless, reserved);
     if (dwFlags & PROGDLG_NOTIME)
@@ -509,7 +509,7 @@ static HRESULT WINAPI ProgressDialog_SetLine(IProgressDialog *iface, DWORD dwLin
     ProgressDialog *This = impl_from_IProgressDialog(iface);
     HWND hwnd;
 
-    TRACE("(%p, %d, %s, %d)\n", This, dwLineNum, wine_dbgstr_w(pwzLine), bPath);
+    TRACE("(%p, %ld, %s, %d)\n", This, dwLineNum, wine_dbgstr_w(pwzLine), bPath);
 
     if (reserved)
         FIXME("reserved pointer not null (%p)\n", reserved);
@@ -556,7 +556,7 @@ static HRESULT WINAPI ProgressDialog_Timer(IProgressDialog *iface, DWORD dwTimer
 {
     ProgressDialog *This = impl_from_IProgressDialog(iface);
 
-    FIXME("(%p, %d, %p) - stub\n", This, dwTimerAction, reserved);
+    FIXME("(%p, %ld, %p) - stub\n", This, dwTimerAction, reserved);
 
     if (reserved)
         FIXME("Reserved field not NULL but %p\n", reserved);




More information about the wine-cvs mailing list