diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 4fc8e1b817e..d627cfd96b3 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1907,15 +1907,15 @@ static HRESULT WINAPI fnIMLangFontLink_GetCharCodePages( static HRESULT WINAPI fnIMLangFontLink_GetStrCodePages( IMLangFontLink* iface, const WCHAR* pszSrc, - long cchSrc, + LONG cchSrc, DWORD dwPriorityCodePages, DWORD* pdwCodePages, - long* pcchCodePages) + LONG* pcchCodePages) { - long i; + LONG i; DWORD cps = 0; - TRACE("(%p)->%s %ld %x %p %p\n", iface, debugstr_wn(pszSrc,cchSrc),cchSrc,dwPriorityCodePages,pdwCodePages,pcchCodePages); + TRACE("(%p)->%s %d %x %p %p\n", iface, debugstr_wn(pszSrc, cchSrc), cchSrc, dwPriorityCodePages, pdwCodePages, pcchCodePages); if (pdwCodePages) *pdwCodePages = 0; if (pcchCodePages) *pcchCodePages = 0; @@ -3203,8 +3203,8 @@ static HRESULT WINAPI fnIMLangFontLink2_GetCharCodePages( IMLangFontLink2* This, } static HRESULT WINAPI fnIMLangFontLink2_GetStrCodePages( IMLangFontLink2* This, - const WCHAR *pszSrc, long cchSrc, DWORD dwPriorityCodePages, - DWORD *pdwCodePages, long *pcchCodePages) + const WCHAR *pszSrc, LONG cchSrc, DWORD dwPriorityCodePages, + DWORD *pdwCodePages, LONG *pcchCodePages) { return fnIMLangFontLink_GetStrCodePages((IMLangFontLink *)This, pszSrc, cchSrc, dwPriorityCodePages, pdwCodePages, pcchCodePages); @@ -3354,14 +3354,14 @@ static ULONG WINAPI fnIMLangLineBreakConsole_Release( static HRESULT WINAPI fnIMLangLineBreakConsole_BreakLineML( IMLangLineBreakConsole* iface, IMLangString* pSrcMLStr, - long lSrcPos, - long lSrcLen, - long cMinColumns, - long cMaxColumns, - long* plLineLen, - long* plSkipLen) + LONG lSrcPos, + LONG lSrcLen, + LONG cMinColumns, + LONG cMaxColumns, + LONG* plLineLen, + LONG* plSkipLen) { - FIXME("(%p)->%p %li %li %li %li %p %p\n", iface, pSrcMLStr, lSrcPos, lSrcLen, cMinColumns, cMaxColumns, plLineLen, plSkipLen); + FIXME("(%p)->%p %i %i %i %i %p %p\n", iface, pSrcMLStr, lSrcPos, lSrcLen, cMinColumns, cMaxColumns, plLineLen, plSkipLen); return E_NOTIMPL; } @@ -3369,12 +3369,12 @@ static HRESULT WINAPI fnIMLangLineBreakConsole_BreakLineW( IMLangLineBreakConsole* iface, LCID locale, const WCHAR* pszSrc, - long cchSrc, - long cMaxColumns, - long* pcchLine, - long* pcchSkip ) + LONG cchSrc, + LONG cMaxColumns, + LONG* pcchLine, + LONG* pcchSkip ) { - FIXME("(%p)->%i %s %li %li %p %p\n", iface, locale, debugstr_wn(pszSrc,cchSrc), cchSrc, cMaxColumns, pcchLine, pcchSkip); + FIXME("(%p)->%i %s %i %i %p %p\n", iface, locale, debugstr_wn(pszSrc,cchSrc), cchSrc, cMaxColumns, pcchLine, pcchSkip); *pcchLine = cchSrc; *pcchSkip = 0; @@ -3386,12 +3386,12 @@ static HRESULT WINAPI fnIMLangLineBreakConsole_BreakLineA( LCID locale, UINT uCodePage, const CHAR* pszSrc, - long cchSrc, - long cMaxColumns, - long* pcchLine, - long* pcchSkip) + LONG cchSrc, + LONG cMaxColumns, + LONG* pcchLine, + LONG* pcchSkip) { - FIXME("(%p)->%i %i %s %li %li %p %p\n", iface, locale, uCodePage, debugstr_an(pszSrc,cchSrc), cchSrc, cMaxColumns, pcchLine, pcchSkip); + FIXME("(%p)->%i %i %s %i %i %p %p\n", iface, locale, uCodePage, debugstr_an(pszSrc,cchSrc), cchSrc, cMaxColumns, pcchLine, pcchSkip); *pcchLine = cchSrc; *pcchSkip = 0; diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 13c27296bc6..0f51df0a4d6 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -650,7 +650,7 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL) DWORD dwCmpCodePages; UINT CodePage; static const WCHAR str[3] = { 'd', 0x0436, 0xff90 }; - long processed; + LONG processed; HRESULT ret; dwCodePages = ~0u; @@ -704,7 +704,7 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL) ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[0], 1, 0, &dwCodePages, &processed); ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret); ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); - ok(processed == 1, "expected 1, got %ld\n", processed); + ok(processed == 1, "expected 1, got %d\n", processed); /* Cyrillic */ dwCmpCodePages = FS_CYRILLIC | FS_JISJAPAN | FS_CHINESESIMP | FS_WANSUNG; @@ -717,7 +717,7 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL) ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[1], 1, 0, &dwCodePages, &processed); ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret); ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); - ok(processed == 1, "expected 1, got %ld\n", processed); + ok(processed == 1, "expected 1, got %d\n", processed); /* Japanese */ dwCmpCodePages = FS_JISJAPAN; @@ -730,7 +730,7 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL) ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[2], 1, 0, &dwCodePages, &processed); ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret); ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); - ok(processed == 1, "expected 1, got %ld\n", processed); + ok(processed == 1, "expected 1, got %d\n", processed); dwCmpCodePages = FS_CYRILLIC | FS_JISJAPAN | FS_CHINESESIMP | FS_WANSUNG; dwCodePages = 0; @@ -738,7 +738,7 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL) ret = IMLangFontLink_GetStrCodePages(iMLFL, str, 2, 0, &dwCodePages, &processed); ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret); ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); - ok(processed == 2, "expected 2, got %ld\n", processed); + ok(processed == 2, "expected 2, got %d\n", processed); dwCmpCodePages = FS_JISJAPAN; dwCodePages = 0; @@ -746,14 +746,14 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL) ret = IMLangFontLink_GetStrCodePages(iMLFL, str, 3, 0, &dwCodePages, &processed); ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret); ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); - ok(processed == 3, "expected 3, got %ld\n", processed); + ok(processed == 3, "expected 3, got %d\n", processed); dwCodePages = 0xffff; processed = -1; ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[2], 1, 0, &dwCodePages, &processed); ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret); ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); - ok(processed == 1, "expected 0, got %ld\n", processed); + ok(processed == 1, "expected 0, got %d\n", processed); ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[2], 1, 0, NULL, NULL); ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret); @@ -763,21 +763,21 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL) ret = IMLangFontLink_GetStrCodePages(iMLFL, str, -1, 0, &dwCodePages, &processed); ok(ret == E_INVALIDARG, "IMLangFontLink_GetStrCodePages should fail: %x\n", ret); ok(dwCodePages == 0, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); - ok(processed == 0, "expected 0, got %ld\n", processed); + ok(processed == 0, "expected 0, got %d\n", processed); dwCodePages = 0xffff; processed = -1; ret = IMLangFontLink_GetStrCodePages(iMLFL, NULL, 1, 0, &dwCodePages, &processed); ok(ret == E_INVALIDARG, "IMLangFontLink_GetStrCodePages should fail: %x\n", ret); ok(dwCodePages == 0, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); - ok(processed == 0, "expected 0, got %ld\n", processed); + ok(processed == 0, "expected 0, got %d\n", processed); dwCodePages = 0xffff; processed = -1; ret = IMLangFontLink_GetStrCodePages(iMLFL, str, 0, 0, &dwCodePages, &processed); ok(ret == E_INVALIDARG, "IMLangFontLink_GetStrCodePages should fail: %x\n", ret); ok(dwCodePages == 0, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); - ok(processed == 0, "expected 0, got %ld\n", processed); + ok(processed == 0, "expected 0, got %d\n", processed); } /* copied from libs/wine/string.c */ diff --git a/include/mlang.idl b/include/mlang.idl index ca89711acbb..a5b1b473f20 100644 --- a/include/mlang.idl +++ b/include/mlang.idl @@ -37,10 +37,10 @@ interface IMLangCodePages : IUnknown [out] DWORD *pdwCodePages); HRESULT GetStrCodePages( [in, size_is(cchSrc)] const WCHAR *pszSrc, - [in] long cchSrc, + [in] LONG cchSrc, [in] DWORD dwPriorityCodePages, [out] DWORD *pdwCodePages, - [out] long *pcchCodePages); + [out] LONG *pcchCodePages); HRESULT CodePageToCodePages( [in] UINT uCodePage, [out] DWORD *pdwCodePages); @@ -228,11 +228,11 @@ interface IMLangString : IUnknown { #ifdef NEWMLSTR HRESULT LockMLStr( - [in] long lPos, + [in] LONG lPos, [in] DWORD dwFlags, [out] DWORD* pdwCookie, - [out] long* plActualPos, - [out] long* plActualLen); + [out] LONG* plActualPos, + [out] LONG* plActualLen); HRESULT UnlockMLStr( [in] DWORD dwCookie); @@ -241,13 +241,13 @@ interface IMLangString : IUnknown [in] BOOL fNoAccess); #endif HRESULT GetLength( - [out, retval] long* plLen); + [out, retval] LONG* plLen); HRESULT SetMLStr( - [in] long lDestPos, - [in] long lDestLen, + [in] LONG lDestPos, + [in] LONG lDestLen, [in] IUnknown *pSrcMLStr, - [in] long lSrcPos, - [in] long lSrcLen); + [in] LONG lSrcPos, + [in] LONG lSrcLen); #ifdef NEWMLSTR HRESULT RegisterAttr( [in] IUnknown *pUnk, @@ -262,14 +262,14 @@ interface IMLangString : IUnknown [out] IUnknown **ppUnk); #else HRESULT GetMLStr( - [in] long lSrcPos, - [in] long lSrcLen, + [in] LONG lSrcPos, + [in] LONG lSrcLen, [in] IUnknown *pUnkOuter, [in] DWORD dwClsContext, [in] const IID* piid, [out] IUnknown** ppDestMLStr, - [out] long* plDestPos, - [out] long* plDestLen); + [out] LONG* plDestPos, + [out] LONG* plDestLen); #endif } @@ -282,29 +282,29 @@ interface IMLangLineBreakConsole : IUnknown { HRESULT BreakLineML( [in] IMLangString* pSrcMLStr, - [in] long lSrcPos, - [in] long lSrcLen, - [in] long cMinColumns, - [in] long cMaxColumns, - [out] long* plLineLen, - [out] long* plSkipLen); + [in] LONG lSrcPos, + [in] LONG lSrcLen, + [in] LONG cMinColumns, + [in] LONG cMaxColumns, + [out] LONG* plLineLen, + [out] LONG* plSkipLen); HRESULT BreakLineW( [in] LCID locale, [in, size_is(cchSrc)] const WCHAR* pszSrc, - [in] long cchSrc, - [in] long cMaxColumns, - [out] long* pcchLine, - [out] long* pcchSkip ); + [in] LONG cchSrc, + [in] LONG cMaxColumns, + [out] LONG* pcchLine, + [out] LONG* pcchSkip ); HRESULT BreakLineA( [in] LCID locale, [in] UINT uCodePage, [in, size_is(cchSrc)] const CHAR* pszSrc, - [in] long cchSrc, - [in] long cMaxColumns, - [out] long* pcchLine, - [out] long* pcchSkip); + [in] LONG cchSrc, + [in] LONG cMaxColumns, + [out] LONG* pcchLine, + [out] LONG* pcchSkip); } [