From 3dbe7152cdbc285e78e766725d3b814095adc8b3 Mon Sep 17 00:00:00 2001
From: Michael Stefaniuc <mstefani@redhat.de>
Date: Mon, 2 Oct 2006 23:20:26 +0200
Subject: [PATCH] winhelp: Win64 printf format warning fixes.

---
 programs/winhelp/Makefile.in |  1 -
 programs/winhelp/hlpfile.c   | 20 +++++++-------
 programs/winhelp/macro.c     | 52 ++++++++++++++++++------------------
 programs/winhelp/winhelp.c   |  6 ++---
 4 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/programs/winhelp/Makefile.in b/programs/winhelp/Makefile.in
index a2f7b7341a9..7bf03cea17b 100644
--- a/programs/winhelp/Makefile.in
+++ b/programs/winhelp/Makefile.in
@@ -5,7 +5,6 @@ VPATH     = @srcdir@
 MODULE    = winhelp.exe
 APPMODE   = -mwindows
 IMPORTS   = comdlg32 shell32 user32 gdi32 kernel32
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
 
 C_SRCS = \
 	callback.c \
diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c
index 53f1a10f120..4d3c458e646 100644
--- a/programs/winhelp/hlpfile.c
+++ b/programs/winhelp/hlpfile.c
@@ -134,7 +134,7 @@ HLPFILE_PAGE *HLPFILE_PageByOffset(HLPFILE* hlpfile, LONG offset)
 
     if (!hlpfile) return 0;
 
-    WINE_TRACE("<%s>[%lx]\n", hlpfile->lpszPath, offset);
+    WINE_TRACE("<%s>[%x]\n", hlpfile->lpszPath, offset);
 
     if (offset == 0xFFFFFFFF) return NULL;
     page = NULL;
@@ -145,7 +145,7 @@ HLPFILE_PAGE *HLPFILE_PageByOffset(HLPFILE* hlpfile, LONG offset)
             found = page;
     }
     if (!found)
-        WINE_ERR("Page of offset %lu not found in file %s\n",
+        WINE_ERR("Page of offset %u not found in file %s\n",
                  offset, hlpfile->lpszPath);
     return found;
 }
@@ -160,7 +160,7 @@ HLPFILE_PAGE *HLPFILE_PageByHash(HLPFILE* hlpfile, LONG lHash)
 
     if (!hlpfile) return 0;
 
-    WINE_TRACE("<%s>[%lx]\n", hlpfile->lpszPath, lHash);
+    WINE_TRACE("<%s>[%x]\n", hlpfile->lpszPath, lHash);
 
     for (i = 0; i < hlpfile->wContextLen; i++)
     {
@@ -168,7 +168,7 @@ HLPFILE_PAGE *HLPFILE_PageByHash(HLPFILE* hlpfile, LONG lHash)
             return HLPFILE_PageByOffset(hlpfile, hlpfile->Context[i].offset);
     }
 
-    WINE_ERR("Page of hash %lx not found in file %s\n", lHash, hlpfile->lpszPath);
+    WINE_ERR("Page of hash %x not found in file %s\n", lHash, hlpfile->lpszPath);
     return NULL;
 }
 
@@ -316,7 +316,7 @@ static BOOL HLPFILE_DoReadHlpFile(HLPFILE *hlpfile, LPCSTR lpszPath)
         index  = (ref - 0x0C) >> 14;
         offset = (ref - 0x0C) & 0x3fff;
 
-        WINE_TRACE("ref=%08lx => [%u/%u]\n", ref, index, offset);
+        WINE_TRACE("ref=%08x => [%u/%u]\n", ref, index, offset);
 
         if (index >= topic.wMapLen) {WINE_WARN("maplen\n"); break;}
         buf = topic.map[index] + offset;
@@ -415,7 +415,7 @@ static BOOL HLPFILE_AddPage(HLPFILE *hlpfile, BYTE *buf, BYTE *end, unsigned off
     page->browse_bwd = GET_UINT(buf, 0x19);
     page->browse_fwd = GET_UINT(buf, 0x1D);
 
-    WINE_TRACE("Added page[%d]: title='%s' %08lx << %08x >> %08lx\n",
+    WINE_TRACE("Added page[%d]: title='%s' %08x << %08x >> %08x\n",
                page->wNumber, page->lpszTitle, 
                page->browse_bwd, page->offset, page->browse_fwd);
 
@@ -597,7 +597,7 @@ static BOOL HLPFILE_LoadBitmap(BYTE* beg, BYTE type, BYTE pack,
     if (bi->bmiHeader.biBitCount > 32) WINE_FIXME("Unknown bit count %u\n", bi->bmiHeader.biBitCount);
     if (bi->bmiHeader.biPlanes != 1) WINE_FIXME("Unsupported planes %u\n", bi->bmiHeader.biPlanes);
     bi->bmiHeader.biSizeImage = (((bi->bmiHeader.biWidth * bi->bmiHeader.biBitCount + 31) & ~31) / 8) * bi->bmiHeader.biHeight;
-    WINE_TRACE("planes=%d bc=%d size=(%ld,%ld)\n",
+    WINE_TRACE("planes=%d bc=%d size=(%d,%d)\n",
                bi->bmiHeader.biPlanes, bi->bmiHeader.biBitCount, 
                bi->bmiHeader.biWidth, bi->bmiHeader.biHeight);
 
@@ -673,7 +673,7 @@ static BOOL     HLPFILE_LoadMetaFile(BYTE* beg, BYTE pack, HLPFILE_PARAGRAPH* pa
     hsoff = GET_UINT(ptr, 4);
     ptr += 8;
 
-    WINE_TRACE("sz=%lu csz=%lu (%ld,%ld) offs=%lu/%u,%lu\n", 
+    WINE_TRACE("sz=%lu csz=%lu (%d,%d) offs=%lu/%u,%lu\n",
                size, csize, mfp.xExt, mfp.yExt, off, ptr - beg, hsoff);
 
     bits = HLPFILE_DecompressGfx(beg + off, csize, size, pack);
@@ -815,7 +815,7 @@ static HLPFILE_LINK*       HLPFILE_AllocLink(int cookie, const char* str, LONG h
     link->window     = wnd;
     link->wRefCount   = 1;
 
-    WINE_TRACE("Link[%d] to %s@%08lx:%d\n",
+    WINE_TRACE("Link[%d] to %s@%08x:%d\n",
                link->cookie, link->lpszString, 
                link->lHash, link->window);
     return link;
@@ -1431,7 +1431,7 @@ static BOOL HLPFILE_SystemCommands(HLPFILE* hlpfile)
                 wi->style = (flags & 0x0080) ? GET_USHORT(ptr, 84) : SW_SHOW;
                 wi->sr_color = (flags & 0x0100) ? GET_UINT(ptr, 86) : 0xFFFFFF;
                 wi->nsr_color = (flags & 0x0200) ? GET_UINT(ptr, 90) : 0xFFFFFF;
-                WINE_TRACE("System-Window: flags=%c%c%c%c%c%c%c%c type=%s name=%s caption=%s (%ld,%ld)x(%ld,%ld)\n",
+                WINE_TRACE("System-Window: flags=%c%c%c%c%c%c%c%c type=%s name=%s caption=%s (%d,%d)x(%d,%d)\n",
                            flags & 0x0001 ? 'T' : 't',
                            flags & 0x0002 ? 'N' : 'n',
                            flags & 0x0004 ? 'C' : 'c',
diff --git a/programs/winhelp/macro.c b/programs/winhelp/macro.c
index 35b6ea6a347..663a24c93d3 100644
--- a/programs/winhelp/macro.c
+++ b/programs/winhelp/macro.c
@@ -196,12 +196,12 @@ void CALLBACK MACRO_About(void)
 
 void CALLBACK MACRO_AddAccelerator(LONG u1, LONG u2, LPCSTR str)
 {
-    WINE_FIXME("(%lu, %lu, \"%s\")\n", u1, u2, str);
+    WINE_FIXME("(%u, %u, \"%s\")\n", u1, u2, str);
 }
 
 void CALLBACK MACRO_ALink(LPCSTR str1, LONG u, LPCSTR str2)
 {
-    WINE_FIXME("(\"%s\", %lu, \"%s\")\n", str1, u, str2);
+    WINE_FIXME("(\"%s\", %u, \"%s\")\n", str1, u, str2);
 }
 
 void CALLBACK MACRO_Annotate(void)
@@ -359,7 +359,7 @@ void CALLBACK MACRO_Contents(void)
 
 void CALLBACK MACRO_ControlPanel(LPCSTR str1, LPCSTR str2, LONG u)
 {
-    WINE_FIXME("(\"%s\", \"%s\", %lu)\n", str1, str2, u);
+    WINE_FIXME("(\"%s\", \"%s\", %u)\n", str1, str2, u);
 }
 
 void CALLBACK MACRO_CopyDialog(void)
@@ -466,12 +466,12 @@ void CALLBACK MACRO_EndMPrint(void)
 
 void CALLBACK MACRO_ExecFile(LPCSTR str1, LPCSTR str2, LONG u, LPCSTR str3)
 {
-    WINE_FIXME("(\"%s\", \"%s\", %lu, \"%s\")\n", str1, str2, u, str3);
+    WINE_FIXME("(\"%s\", \"%s\", %u, \"%s\")\n", str1, str2, u, str3);
 }
 
 void CALLBACK MACRO_ExecProgram(LPCSTR str, LONG u)
 {
-    WINE_FIXME("(\"%s\", %lu)\n", str, u);
+    WINE_FIXME("(\"%s\", %u)\n", str, u);
 }
 
 void CALLBACK MACRO_Exit(void)
@@ -484,17 +484,17 @@ void CALLBACK MACRO_Exit(void)
 
 void CALLBACK MACRO_ExtAbleItem(LPCSTR str, LONG u)
 {
-    WINE_FIXME("(\"%s\", %lu)\n", str, u);
+    WINE_FIXME("(\"%s\", %u)\n", str, u);
 }
 
 void CALLBACK MACRO_ExtInsertItem(LPCSTR str1, LPCSTR str2, LPCSTR str3, LPCSTR str4, LONG u1, LONG u2)
 {
-    WINE_FIXME("(\"%s\", \"%s\", \"%s\", \"%s\", %lu, %lu)\n", str1, str2, str3, str4, u1, u2);
+    WINE_FIXME("(\"%s\", \"%s\", \"%s\", \"%s\", %u, %u)\n", str1, str2, str3, str4, u1, u2);
 }
 
 void CALLBACK MACRO_ExtInsertMenu(LPCSTR str1, LPCSTR str2, LPCSTR str3, LONG u1, LONG u2)
 {
-    WINE_FIXME("(\"%s\", \"%s\", \"%s\", %lu, %lu)\n", str1, str2, str3, u1, u2);
+    WINE_FIXME("(\"%s\", \"%s\", \"%s\", %u, %u)\n", str1, str2, str3, u1, u2);
 }
 
 BOOL CALLBACK MACRO_FileExist(LPCSTR str)
@@ -592,7 +592,7 @@ void CALLBACK MACRO_FocusWindow(LPCSTR lpszWindow)
 
 void CALLBACK MACRO_Generate(LPCSTR str, LONG w, LONG l)
 {
-    WINE_FIXME("(\"%s\", %lx, %lx)\n", str, w, l);
+    WINE_FIXME("(\"%s\", %x, %x)\n", str, w, l);
 }
 
 void CALLBACK MACRO_GotoMark(LPCSTR str)
@@ -641,12 +641,12 @@ BOOL CALLBACK MACRO_InitMPrint(void)
 
 void CALLBACK MACRO_InsertItem(LPCSTR str1, LPCSTR str2, LPCSTR str3, LPCSTR str4, LONG u)
 {
-    WINE_FIXME("(\"%s\", \"%s\", \"%s\", \"%s\", %lu)\n", str1, str2, str3, str4, u);
+    WINE_FIXME("(\"%s\", \"%s\", \"%s\", \"%s\", %u)\n", str1, str2, str3, str4, u);
 }
 
 void CALLBACK MACRO_InsertMenu(LPCSTR str1, LPCSTR str2, LONG u)
 {
-    WINE_FIXME("(\"%s\", \"%s\", %lu)\n", str1, str2, u);
+    WINE_FIXME("(\"%s\", \"%s\", %u)\n", str1, str2, u);
 }
 
 BOOL CALLBACK MACRO_IsBook(void)
@@ -680,7 +680,7 @@ void CALLBACK MACRO_JumpContents(LPCSTR lpszPath, LPCSTR lpszWindow)
 
 void CALLBACK MACRO_JumpContext(LPCSTR lpszPath, LPCSTR lpszWindow, LONG context)
 {
-    WINE_FIXME("(\"%s\", \"%s\", %ld)semi-stub\n", lpszPath, lpszWindow, context);
+    WINE_FIXME("(\"%s\", \"%s\", %d)semi-stub\n", lpszPath, lpszWindow, context);
     return MACRO_JumpContents(lpszPath, lpszWindow);
 }
 
@@ -688,7 +688,7 @@ void CALLBACK MACRO_JumpHash(LPCSTR lpszPath, LPCSTR lpszWindow, LONG lHash)
 {
     HLPFILE*    hlpfile;
 
-    WINE_TRACE("(\"%s\", \"%s\", %lu)\n", lpszPath, lpszWindow, lHash);
+    WINE_TRACE("(\"%s\", \"%s\", %u)\n", lpszPath, lpszWindow, lHash);
     hlpfile = WINHELP_LookupHelpFile(lpszPath);
     WINHELP_CreateHelpWindowByHash(hlpfile, lHash,
                                    WINHELP_GetWindowInfo(hlpfile, lpszWindow),
@@ -716,7 +716,7 @@ void CALLBACK MACRO_JumpKeyword(LPCSTR lpszPath, LPCSTR lpszWindow, LPCSTR keywo
 
 void CALLBACK MACRO_KLink(LPCSTR str1, LONG u, LPCSTR str2, LPCSTR str3)
 {
-    WINE_FIXME("(\"%s\", %lu, \"%s\", \"%s\")\n", str1, u, str2, str3);
+    WINE_FIXME("(\"%s\", %u, \"%s\", \"%s\")\n", str1, u, str2, str3);
 }
 
 void CALLBACK MACRO_Menu(void)
@@ -726,7 +726,7 @@ void CALLBACK MACRO_Menu(void)
 
 void CALLBACK MACRO_MPrintHash(LONG u)
 {
-    WINE_FIXME("(%lu)\n", u);
+    WINE_FIXME("(%u)\n", u);
 }
 
 void CALLBACK MACRO_MPrintID(LPCSTR str)
@@ -755,12 +755,12 @@ void CALLBACK MACRO_NoShow(void)
 
 void CALLBACK MACRO_PopupContext(LPCSTR str, LONG u)
 {
-    WINE_FIXME("(\"%s\", %lu)\n", str, u);
+    WINE_FIXME("(\"%s\", %u)\n", str, u);
 }
 
 void CALLBACK MACRO_PopupHash(LPCSTR str, LONG u)
 {
-    WINE_FIXME("(\"%s\", %lu)\n", str, u);
+    WINE_FIXME("(\"%s\", %u)\n", str, u);
 }
 
 void CALLBACK MACRO_PopupId(LPCSTR str1, LPCSTR str2)
@@ -770,7 +770,7 @@ void CALLBACK MACRO_PopupId(LPCSTR str1, LPCSTR str2)
 
 void CALLBACK MACRO_PositionWindow(LONG i1, LONG i2, LONG u1, LONG u2, LONG u3, LPCSTR str)
 {
-    WINE_FIXME("(%li, %li, %lu, %lu, %lu, \"%s\")\n", i1, i2, u1, u2, u3, str);
+    WINE_FIXME("(%i, %i, %u, %u, %u, \"%s\")\n", i1, i2, u1, u2, u3, str);
 }
 
 void CALLBACK MACRO_Prev(void)
@@ -862,7 +862,7 @@ void CALLBACK MACRO_RegisterRoutine(LPCSTR dll_name, LPCSTR proc, LPCSTR args)
             Globals.dlls = dll;
             dll->handler = (WINHELP_LDLLHandler)GetProcAddress(dll->hLib, "LDLLHandler");
             dll->class = dll->handler ? (dll->handler)(DW_WHATMSG, 0, 0) : DC_NOMSG;
-            WINE_TRACE("Got class %lx for DLL %s\n", dll->class, dll_name);
+            WINE_TRACE("Got class %x for DLL %s\n", dll->class, dll_name);
             if (dll->class & DC_INITTERM) dll->handler(DW_INIT, 0, 0);
             if (dll->class & DC_CALLBACKS) dll->handler(DW_CALLBACKS, (DWORD)Callbacks, 0);
         }
@@ -887,7 +887,7 @@ void CALLBACK MACRO_RegisterRoutine(LPCSTR dll_name, LPCSTR proc, LPCSTR args)
 
 void CALLBACK MACRO_RemoveAccelerator(LONG u1, LONG u2)
 {
-    WINE_FIXME("(%lu, %lu)\n", u1, u2);
+    WINE_FIXME("(%u, %u)\n", u1, u2);
 }
 
 void CALLBACK MACRO_ResetMenu(void)
@@ -907,7 +907,7 @@ void CALLBACK MACRO_Search(void)
 
 void CALLBACK MACRO_SetContents(LPCSTR str, LONG u)
 {
-    WINE_FIXME("(\"%s\", %lu)\n", str, u);
+    WINE_FIXME("(\"%s\", %u)\n", str, u);
 }
 
 void CALLBACK MACRO_SetHelpOnFile(LPCSTR str)
@@ -917,27 +917,27 @@ void CALLBACK MACRO_SetHelpOnFile(LPCSTR str)
 
 void CALLBACK MACRO_SetPopupColor(LONG u1, LONG u2, LONG u3)
 {
-    WINE_FIXME("(%lu, %lu, %lu)\n", u1, u2, u3);
+    WINE_FIXME("(%u, %u, %u)\n", u1, u2, u3);
 }
 
 void CALLBACK MACRO_ShellExecute(LPCSTR str1, LPCSTR str2, LONG u1, LONG u2, LPCSTR str3, LPCSTR str4)
 {
-    WINE_FIXME("(\"%s\", \"%s\", %lu, %lu, \"%s\", \"%s\")\n", str1, str2, u1, u2, str3, str4);
+    WINE_FIXME("(\"%s\", \"%s\", %u, %u, \"%s\", \"%s\")\n", str1, str2, u1, u2, str3, str4);
 }
 
 void CALLBACK MACRO_ShortCut(LPCSTR str1, LPCSTR str2, LONG w, LONG l, LPCSTR str)
 {
-    WINE_FIXME("(\"%s\", \"%s\", %lx, %lx, \"%s\")\n", str1, str2, w, l, str);
+    WINE_FIXME("(\"%s\", \"%s\", %x, %x, \"%s\")\n", str1, str2, w, l, str);
 }
 
 void CALLBACK MACRO_TCard(LONG u)
 {
-    WINE_FIXME("(%lu)\n", u);
+    WINE_FIXME("(%u)\n", u);
 }
 
 void CALLBACK MACRO_Test(LONG u)
 {
-    WINE_FIXME("(%lu)\n", u);
+    WINE_FIXME("(%u)\n", u);
 }
 
 BOOL CALLBACK MACRO_TestALink(LPCSTR str)
diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c
index bec8a627d7d..a2fa88dfb1b 100644
--- a/programs/winhelp/winhelp.c
+++ b/programs/winhelp/winhelp.c
@@ -322,7 +322,7 @@ static LRESULT  WINHELP_HandleCommand(HWND hSrcWnd, LPARAM lParam)
     {
         char*   ptr = (wh->ofsFilename) ? (LPSTR)wh + wh->ofsFilename : NULL;
 
-        WINE_TRACE("Got[%u]: cmd=%u data=%08lx fn=%s\n", 
+        WINE_TRACE("Got[%u]: cmd=%u data=%08x fn=%s\n",
                    wh->size, wh->command, wh->data, ptr);
         switch (wh->command)
         {
@@ -1313,7 +1313,7 @@ static BOOL WINHELP_AppendText(WINHELP_LINE ***linep, WINHELP_LINE_PART ***partp
     part->u.text.color      = color;
     part->u.text.wUnderline = underline;
 
-    WINE_TRACE("Appended text '%*.*s'[%d] @ (%ld,%ld-%ld,%ld)\n",
+    WINE_TRACE("Appended text '%*.*s'[%d] @ (%d,%d-%d,%d)\n",
                part->u.text.wTextLen,
                part->u.text.wTextLen,
                part->u.text.lpsText,
@@ -1380,7 +1380,7 @@ static WINHELP_LINE_PART* WINHELP_AppendGfxObject(WINHELP_LINE ***linep, WINHELP
     part->rect.bottom     = part->rect.top + gfxSize->cy;
     line->rect.bottom     = max(line->rect.bottom, part->rect.bottom);
 
-    WINE_TRACE("Appended gfx @ (%ld,%ld-%ld,%ld)\n",
+    WINE_TRACE("Appended gfx @ (%d,%d-%d,%d)\n",
                part->rect.left, part->rect.top, part->rect.right, part->rect.bottom);
 
     part->link = link;