[PATCH 10/24] programs/winebrowser: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech

---
 programs/winebrowser/Makefile.in |    1 -
 programs/winebrowser/main.c      |    6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/programs/winebrowser/Makefile.in b/programs/winebrowser/Makefile.in
index fe4371b6bf2..161be7e08de 100644
--- a/programs/winebrowser/Makefile.in
+++ b/programs/winebrowser/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = winebrowser.exe
 IMPORTS   = urlmon oleaut32 shell32 user32 advapi32

diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c
index 913c0a8d672..369ecb98002 100644
--- a/programs/winebrowser/main.c
+++ b/programs/winebrowser/main.c
@@ -197,7 +197,7 @@ static HDDEDATA CALLBACK ddeCb(UINT uType, UINT uFmt, HCONV hConv,
 {
     DWORD size = 0, ret = 0;

-    WINE_TRACE("dde_cb: %04x, %04x, %p, %p, %p, %p, %08lx, %08lx\n",
+    WINE_TRACE("dde_cb: %04x, %04x, %p, %p, %p, %p, %08Ix, %08Ix\n",
                uType, uFmt, hConv, hsz1, hsz2, hData, dwData1, dwData2);

switch (uType)
@@ -213,7 +213,7 @@ static HDDEDATA CALLBACK ddeCb(UINT uType, UINT uFmt, HCONV hConv,
             else if (!(ddeString = malloc(size)))
                 WINE_ERR("Out of memory\n");
             else if (DdeGetData(hData, (LPBYTE)ddeString, size, 0) != size)
-                WINE_WARN("DdeGetData did not return %d bytes\n", size);
+                WINE_WARN("DdeGetData did not return %ld bytes\n", size);
             DdeFreeDataHandle(hData);
             return (HDDEDATA)DDE_FACK;

@@ -224,7 +224,7 @@ static HDDEDATA CALLBACK ddeCb(UINT uType, UINT uFmt, HCONV hConv,
             else if (!(ddeString = malloc( (size + 1) * sizeof(WCHAR))))
                 WINE_ERR("Out of memory\n");
             else if (DdeQueryStringW(ddeInst, hsz2, ddeString, size + 1, CP_WINUNICODE) != size)
-                WINE_WARN("DdeQueryString did not return %d characters\n", size);
+                WINE_WARN("DdeQueryString did not return %ld characters\n", size);
             else
                 ret = -2; /* acknowledgment */
             return DdeCreateDataHandle(ddeInst, (LPBYTE)&ret, sizeof(ret), 0,