[PATCH 21/24] programs/wordpad: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech

---
 programs/wordpad/Makefile.in   |    1 -
 programs/wordpad/olecallback.c |    8 ++++----
 programs/wordpad/wordpad.c     |    6 +++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/programs/wordpad/Makefile.in b/programs/wordpad/Makefile.in
index e8fc1e38df8..265003a736a 100644
--- a/programs/wordpad/Makefile.in
+++ b/programs/wordpad/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = wordpad.exe
 IMPORTS   = comdlg32 uuid ole32 shell32 user32 gdi32 advapi32 comctl32

diff --git a/programs/wordpad/olecallback.c b/programs/wordpad/olecallback.c
index dcfef5898e6..e3bee7f850b 100644
--- a/programs/wordpad/olecallback.c
+++ b/programs/wordpad/olecallback.c
@@ -107,7 +107,7 @@ static HRESULT STDMETHODCALLTYPE RichEditOleCallback_QueryInsertObject(
     LPSTORAGE lpstg,
     LONG cp)
 {
-    WINE_TRACE("(%p, %p, %p, %d)\n", This, lpclsid, lpstg, cp);
+    WINE_TRACE("(%p, %p, %p, %ld)\n", This, lpclsid, lpstg, cp);
     return S_OK;
 }

@@ -127,7 +127,7 @@ static HRESULT STDMETHODCALLTYPE RichEditOleCallback_QueryAcceptData(
     BOOL fReally,
     HGLOBAL hMetaPict)
 {
-    WINE_TRACE("(%p, %p, %p, %x, %d, %p)\n",
+    WINE_TRACE("(%p, %p, %p, %lx, %d, %p)\n",
                This, lpdataobj, lpcfFormat, reco, fReally, hMetaPict);
     return S_OK;
 }
@@ -146,7 +146,7 @@ static HRESULT STDMETHODCALLTYPE RichEditOleCallback_GetClipboardData(
     DWORD reco,
     LPDATAOBJECT *lplpdataobj)
 {
-    WINE_TRACE("(%p, %p, %x, %p)\n", This, lpchrg, reco, lplpdataobj);
+    WINE_TRACE("(%p, %p, %lx, %p)\n", This, lpchrg, reco, lplpdataobj);
     return E_NOTIMPL;
 }

@@ -156,7 +156,7 @@ static HRESULT STDMETHODCALLTYPE RichEditOleCallback_GetDragDropEffect(
     DWORD grfKeyState,
     LPDWORD pdwEffect)
 {
-    WINE_TRACE("(%p, %d, %x, %p)\n", This, fDrag, grfKeyState, pdwEffect);
+    WINE_TRACE("(%p, %d, %lx, %p)\n", This, fDrag, grfKeyState, pdwEffect);
     if (pdwEffect)
           *pdwEffect = DROPEFFECT_COPY;
     return S_OK;
diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c
index e87475ad06b..7f79eccc8bb 100644
--- a/programs/wordpad/wordpad.c
+++ b/programs/wordpad/wordpad.c
@@ -2023,7 +2023,7 @@ static LRESULT OnCreate( HWND hWnd )

if (!hEditorWnd)
     {
-        fprintf(stderr, "Error code %u\n", GetLastError());
+        fprintf(stderr, "Error code %lu\n", GetLastError());
         return -1;
     }
     assert(hEditorWnd);
@@ -2164,7 +2164,7 @@ static LRESULT OnNotify( HWND hWnd, LPARAM lParam)

update_font_list();

-            sprintf( buf,"selection = %d..%d, line count=%ld",
+            sprintf( buf,"selection = %ld..%ld, line count=%Id",
                      pSC->chrg.cpMin, pSC->chrg.cpMax,
                      SendMessageW(hwndEditor, EM_GETLINECOUNT, 0, 0));
             SetWindowTextA(GetDlgItem(hWnd, IDC_STATUSBAR), buf);
@@ -2451,7 +2451,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam)
         SendMessageW(hwndEditor, EM_EXGETSEL, 0, (LPARAM)&range);
         data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data) * (range.cpMax-range.cpMin+1));
         SendMessageW(hwndEditor, EM_GETSELTEXT, 0, (LPARAM)data);
-        sprintf(buf, "Start = %d, End = %d", range.cpMin, range.cpMax);
+        sprintf(buf, "Start = %ld, End = %ld", range.cpMin, range.cpMax);
         MessageBoxA(hWnd, buf, "Editor", MB_OK);
         MessageBoxW(hWnd, data, wszAppTitle, MB_OK);
         HeapFree( GetProcessHeap(), 0, data);