imm32: Win64 printf format warning fixes.
Michael Stefaniuc
mstefani at redhat.de
Fri Oct 13 16:32:38 CDT 2006
---
dlls/imm32/Makefile.in | 1 -
dlls/imm32/imm.c | 70 ++++++++++++++++++++++++------------------------
2 files changed, 35 insertions(+), 36 deletions(-)
diff --git a/dlls/imm32/Makefile.in b/dlls/imm32/Makefile.in
index 5847316..934be43 100644
--- a/dlls/imm32/Makefile.in
+++ b/dlls/imm32/Makefile.in
@@ -5,7 +5,6 @@ VPATH = @srcdir@
MODULE = imm32.dll
IMPORTLIB = libimm32.$(IMPLIBEXT)
IMPORTS = user32 gdi32 kernel32
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = \
imm.c
diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index d6fce6c..f975b2c 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -133,7 +133,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL,
{
HMODULE x11drv;
- TRACE("%p, %lx, %p\n",hInstDLL,fdwReason,lpReserved);
+ TRACE("%p, %x, %p\n",hInstDLL,fdwReason,lpReserved);
switch (fdwReason)
{
case DLL_PROCESS_ATTACH:
@@ -259,7 +259,7 @@ HIMC WINAPI ImmAssociateContext(HWND hWn
*/
BOOL WINAPI ImmAssociateContextEx(HWND hWnd, HIMC hIMC, DWORD dwFlags)
{
- FIXME("(%p, %p, %ld): stub\n", hWnd, hIMC, dwFlags);
+ FIXME("(%p, %p, %d): stub\n", hWnd, hIMC, dwFlags);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@@ -270,7 +270,7 @@ BOOL WINAPI ImmAssociateContextEx(HWND h
BOOL WINAPI ImmConfigureIMEA(
HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData)
{
- FIXME("(%p, %p, %ld, %p): stub\n",
+ FIXME("(%p, %p, %d, %p): stub\n",
hKL, hWnd, dwMode, lpData
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -283,7 +283,7 @@ BOOL WINAPI ImmConfigureIMEA(
BOOL WINAPI ImmConfigureIMEW(
HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData)
{
- FIXME("(%p, %p, %ld, %p): stub\n",
+ FIXME("(%p, %p, %d, %p): stub\n",
hKL, hWnd, dwMode, lpData
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -339,7 +339,7 @@ BOOL WINAPI ImmDestroyContext(HIMC hIMC)
*/
BOOL WINAPI ImmDisableIME(DWORD idThread)
{
- FIXME("(%ld): stub\n", idThread);
+ FIXME("(%d): stub\n", idThread);
return TRUE;
}
@@ -351,7 +351,7 @@ UINT WINAPI ImmEnumRegisterWordA(
LPCSTR lpszReading, DWORD dwStyle,
LPCSTR lpszRegister, LPVOID lpData)
{
- FIXME("(%p, %p, %s, %ld, %s, %p): stub\n",
+ FIXME("(%p, %p, %s, %d, %s, %p): stub\n",
hKL, lpfnEnumProc,
debugstr_a(lpszReading), dwStyle,
debugstr_a(lpszRegister), lpData
@@ -368,7 +368,7 @@ UINT WINAPI ImmEnumRegisterWordW(
LPCWSTR lpszReading, DWORD dwStyle,
LPCWSTR lpszRegister, LPVOID lpData)
{
- FIXME("(%p, %p, %s, %ld, %s, %p): stub\n",
+ FIXME("(%p, %p, %s, %d, %s, %p): stub\n",
hKL, lpfnEnumProc,
debugstr_w(lpszReading), dwStyle,
debugstr_w(lpszRegister), lpData
@@ -412,7 +412,7 @@ DWORD WINAPI ImmGetCandidateListA(
HIMC hIMC, DWORD deIndex,
LPCANDIDATELIST lpCandList, DWORD dwBufLen)
{
- FIXME("(%p, %ld, %p, %ld): stub\n",
+ FIXME("(%p, %d, %p, %d): stub\n",
hIMC, deIndex,
lpCandList, dwBufLen
);
@@ -449,7 +449,7 @@ DWORD WINAPI ImmGetCandidateListW(
HIMC hIMC, DWORD deIndex,
LPCANDIDATELIST lpCandList, DWORD dwBufLen)
{
- FIXME("(%p, %ld, %p, %ld): stub\n",
+ FIXME("(%p, %d, %p, %d): stub\n",
hIMC, deIndex,
lpCandList, dwBufLen
);
@@ -463,7 +463,7 @@ DWORD WINAPI ImmGetCandidateListW(
BOOL WINAPI ImmGetCandidateWindow(
HIMC hIMC, DWORD dwBufLen, LPCANDIDATEFORM lpCandidate)
{
- FIXME("(%p, %ld, %p): stub\n", hIMC, dwBufLen, lpCandidate);
+ FIXME("(%p, %d, %p): stub\n", hIMC, dwBufLen, lpCandidate);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@@ -498,14 +498,14 @@ LONG WINAPI ImmGetCompositionStringA(
LONG rc = 0;
InputContextData *data = (InputContextData*)hIMC;
- TRACE("(%p, 0x%lx, %p, %ld)\n", hIMC, dwIndex, lpBuf, dwBufLen);
+ TRACE("(%p, 0x%x, %p, %d)\n", hIMC, dwIndex, lpBuf, dwBufLen);
if (!data)
return FALSE;
if (dwIndex == GCS_RESULTSTR)
{
- TRACE("GSC_RESULTSTR %p %li\n",data->ResultString,
+ TRACE("GSC_RESULTSTR %p %i\n",data->ResultString,
data->dwResultStringSize);
buf = HeapAlloc( GetProcessHeap(), 0, data->dwResultStringSize * 3 );
@@ -520,7 +520,7 @@ LONG WINAPI ImmGetCompositionStringA(
}
else if (dwIndex == GCS_COMPSTR)
{
- TRACE("GSC_COMPSTR %p %li\n",data->CompositionString,
+ TRACE("GSC_COMPSTR %p %i\n",data->CompositionString,
data->dwCompStringLength/ sizeof(WCHAR));
buf = HeapAlloc( GetProcessHeap(), 0, data->dwCompStringLength * 3 );
@@ -533,7 +533,7 @@ LONG WINAPI ImmGetCompositionStringA(
}
else if (dwIndex == GCS_COMPATTR)
{
- TRACE("GSC_COMPATTR %p %li\n",data->CompositionString,
+ TRACE("GSC_COMPATTR %p %i\n",data->CompositionString,
data->dwCompStringLength/ sizeof(WCHAR));
rc = WideCharToMultiByte(CP_ACP, 0, (LPWSTR)data->CompositionString,
@@ -549,7 +549,7 @@ LONG WINAPI ImmGetCompositionStringA(
}
else if (dwIndex == GCS_COMPCLAUSE)
{
- TRACE("GSC_COMPCLAUSE %p %li\n",data->CompositionString,
+ TRACE("GSC_COMPCLAUSE %p %i\n",data->CompositionString,
data->dwCompStringLength/ sizeof(WCHAR));
rc = WideCharToMultiByte(CP_ACP, 0, (LPWSTR)data->CompositionString,
@@ -565,7 +565,7 @@ LONG WINAPI ImmGetCompositionStringA(
}
else
{
- FIXME("Unhandled index 0x%lx\n",dwIndex);
+ FIXME("Unhandled index 0x%x\n",dwIndex);
}
return rc;
@@ -581,7 +581,7 @@ LONG WINAPI ImmGetCompositionStringW(
LONG rc = 0;
InputContextData *data = (InputContextData*)hIMC;
- TRACE("(%p, 0x%lx, %p, %ld)\n", hIMC, dwIndex, lpBuf, dwBufLen);
+ TRACE("(%p, 0x%x, %p, %d)\n", hIMC, dwIndex, lpBuf, dwBufLen);
if (!data)
return FALSE;
@@ -642,7 +642,7 @@ LONG WINAPI ImmGetCompositionStringW(
}
else
{
- FIXME("Unhandled index 0x%lx\n",dwIndex);
+ FIXME("Unhandled index 0x%x\n",dwIndex);
}
return rc;
@@ -687,7 +687,7 @@ DWORD WINAPI ImmGetConversionListA(
LPCSTR pSrc, LPCANDIDATELIST lpDst,
DWORD dwBufLen, UINT uFlag)
{
- FIXME("(%p, %p, %s, %p, %ld, %d): stub\n",
+ FIXME("(%p, %p, %s, %p, %d, %d): stub\n",
hKL, hIMC, debugstr_a(pSrc), lpDst, dwBufLen, uFlag
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -702,7 +702,7 @@ DWORD WINAPI ImmGetConversionListW(
LPCWSTR pSrc, LPCANDIDATELIST lpDst,
DWORD dwBufLen, UINT uFlag)
{
- FIXME("(%p, %p, %s, %p, %ld, %d): stub\n",
+ FIXME("(%p, %p, %s, %p, %d, %d): stub\n",
hKL, hIMC, debugstr_w(pSrc), lpDst, dwBufLen, uFlag
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -796,7 +796,7 @@ UINT WINAPI ImmGetDescriptionW(HKL hKL,
DWORD WINAPI ImmGetGuideLineA(
HIMC hIMC, DWORD dwIndex, LPSTR lpBuf, DWORD dwBufLen)
{
- FIXME("(%p, %ld, %s, %ld): stub\n",
+ FIXME("(%p, %d, %s, %d): stub\n",
hIMC, dwIndex, debugstr_a(lpBuf), dwBufLen
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -808,7 +808,7 @@ DWORD WINAPI ImmGetGuideLineA(
*/
DWORD WINAPI ImmGetGuideLineW(HIMC hIMC, DWORD dwIndex, LPWSTR lpBuf, DWORD dwBufLen)
{
- FIXME("(%p, %ld, %s, %ld): stub\n",
+ FIXME("(%p, %d, %s, %d): stub\n",
hIMC, dwIndex, debugstr_w(lpBuf), dwBufLen
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -857,7 +857,7 @@ BOOL WINAPI ImmGetOpenStatus(HIMC hIMC)
DWORD WINAPI ImmGetProperty(HKL hKL, DWORD fdwIndex)
{
DWORD rc = 0;
- TRACE("(%p, %ld)\n", hKL, fdwIndex);
+ TRACE("(%p, %d)\n", hKL, fdwIndex);
switch (fdwIndex)
{
@@ -942,7 +942,7 @@ UINT WINAPI ImmGetVirtualKey(HWND hWnd)
case VER_PLATFORM_WIN32_NT:
return 0;
default:
- FIXME("%ld not supported\n",version.dwPlatformId);
+ FIXME("%d not supported\n",version.dwPlatformId);
return VK_PROCESSKEY;
}
}
@@ -1046,7 +1046,7 @@ BOOL WINAPI ImmNotifyIME(
{
BOOL rc = FALSE;
- TRACE("(%p, %ld, %ld, %ld)\n",
+ TRACE("(%p, %d, %d, %d)\n",
hIMC, dwAction, dwIndex, dwValue);
if (!root_context)
@@ -1124,7 +1124,7 @@ BOOL WINAPI ImmNotifyIME(
FIXME("%s - %s\n","NI_COMPOSITIONSTR","CPS_REVERT");
break;
default:
- ERR("%s - %s (%li)\n","NI_COMPOSITIONSTR","UNKNOWN",dwIndex);
+ ERR("%s - %s (%i)\n","NI_COMPOSITIONSTR","UNKNOWN",dwIndex);
break;
}
break;
@@ -1156,7 +1156,7 @@ BOOL WINAPI ImmNotifyIME(
BOOL WINAPI ImmRegisterWordA(
HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszRegister)
{
- FIXME("(%p, %s, %ld, %s): stub\n",
+ FIXME("(%p, %s, %d, %s): stub\n",
hKL, debugstr_a(lpszReading), dwStyle, debugstr_a(lpszRegister)
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -1169,7 +1169,7 @@ BOOL WINAPI ImmRegisterWordA(
BOOL WINAPI ImmRegisterWordW(
HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszRegister)
{
- FIXME("(%p, %s, %ld, %s): stub\n",
+ FIXME("(%p, %s, %d, %s): stub\n",
hKL, debugstr_w(lpszReading), dwStyle, debugstr_w(lpszRegister)
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -1261,7 +1261,7 @@ BOOL WINAPI ImmSetCompositionStringA(
WCHAR *ReadBuffer = NULL;
BOOL rc;
- TRACE("(%p, %ld, %p, %ld, %p, %ld): stub\n",
+ TRACE("(%p, %d, %p, %d, %p, %d): stub\n",
hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen);
comp_len = MultiByteToWideChar(CP_ACP, 0, lpComp, dwCompLen, NULL, 0);
@@ -1298,7 +1298,7 @@ BOOL WINAPI ImmSetCompositionStringW(
DWORD flags = 0;
WCHAR wParam = 0;
- TRACE("(%p, %ld, %p, %ld, %p, %ld): stub\n",
+ TRACE("(%p, %d, %p, %d, %p, %d): stub\n",
hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen);
@@ -1361,7 +1361,7 @@ BOOL WINAPI ImmSetCompositionWindow(
InputContextData *data = (InputContextData*)hIMC;
TRACE("(%p, %p)\n", hIMC, lpCompForm);
- TRACE("\t%lx, (%li,%li), (%li,%li - %li,%li)\n",lpCompForm->dwStyle,
+ TRACE("\t%x, (%i,%i), (%i,%i - %i,%i)\n",lpCompForm->dwStyle,
lpCompForm->ptCurrentPos.x, lpCompForm->ptCurrentPos.y, lpCompForm->rcArea.top,
lpCompForm->rcArea.left, lpCompForm->rcArea.bottom, lpCompForm->rcArea.right);
@@ -1391,7 +1391,7 @@ BOOL WINAPI ImmSetCompositionWindow(
BOOL WINAPI ImmSetConversionStatus(
HIMC hIMC, DWORD fdwConversion, DWORD fdwSentence)
{
- FIXME("(%p, %ld, %ld): stub\n",
+ FIXME("(%p, %d, %d): stub\n",
hIMC, fdwConversion, fdwSentence
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -1461,7 +1461,7 @@ BOOL WINAPI ImmSetStatusWindowPos(HIMC h
*/
BOOL WINAPI ImmSimulateHotKey(HWND hWnd, DWORD dwHotKeyID)
{
- FIXME("(%p, %ld): stub\n", hWnd, dwHotKeyID);
+ FIXME("(%p, %d): stub\n", hWnd, dwHotKeyID);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@@ -1472,7 +1472,7 @@ BOOL WINAPI ImmSimulateHotKey(HWND hWnd,
BOOL WINAPI ImmUnregisterWordA(
HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszUnregister)
{
- FIXME("(%p, %s, %ld, %s): stub\n",
+ FIXME("(%p, %s, %d, %s): stub\n",
hKL, debugstr_a(lpszReading), dwStyle, debugstr_a(lpszUnregister)
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -1485,7 +1485,7 @@ BOOL WINAPI ImmUnregisterWordA(
BOOL WINAPI ImmUnregisterWordW(
HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszUnregister)
{
- FIXME("(%p, %s, %ld, %s): stub\n",
+ FIXME("(%p, %s, %d, %s): stub\n",
hKL, debugstr_w(lpszReading), dwStyle, debugstr_w(lpszUnregister)
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
--
1.4.2.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20061013/fdd67d53/attachment.pgp
More information about the wine-patches
mailing list