system/wine
system/wine
1
0
Fork 0
mirror of https://github.com/wine-mirror/wine synced 2024-07-05 17:28:47 +00:00
Code Issues Projects Releases Wiki Activity

mlang: Change long to LONG in mlang.idl.

Browse Source
This commit is contained in:
Michael Stefaniuc 2009-03-11 00:31:43 +01:00 committed by Alexandre Julliard
parent a3269bdc40
commit d8b4dd7ab6
3 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
dlls/mlang/mlang.c
View File

@ -1907,15 +1907,15 @@ static HRESULT WINAPI fnIMLangFontLink_GetCharCodePages(
static HRESULT WINAPI fnIMLangFontLink_GetStrCodePages( static HRESULT WINAPI fnIMLangFontLink_GetStrCodePages(
IMLangFontLink* iface, IMLangFontLink* iface,
const WCHAR* pszSrc, const WCHAR* pszSrc,
long cchSrc, LONG cchSrc,
DWORD dwPriorityCodePages, DWORD dwPriorityCodePages,
DWORD* pdwCodePages, DWORD* pdwCodePages,
long* pcchCodePages) LONG* pcchCodePages)
{ {
long i; LONG i;
DWORD cps = 0; 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 (pdwCodePages) *pdwCodePages = 0;
if (pcchCodePages) *pcchCodePages = 0; if (pcchCodePages) *pcchCodePages = 0;
@ -3203,8 +3203,8 @@ static HRESULT WINAPI fnIMLangFontLink2_GetCharCodePages( IMLangFontLink2* This,
} }
static HRESULT WINAPI fnIMLangFontLink2_GetStrCodePages( IMLangFontLink2* This, static HRESULT WINAPI fnIMLangFontLink2_GetStrCodePages( IMLangFontLink2* This,
const WCHAR *pszSrc, long cchSrc, DWORD dwPriorityCodePages, const WCHAR *pszSrc, LONG cchSrc, DWORD dwPriorityCodePages,
DWORD *pdwCodePages, long *pcchCodePages) DWORD *pdwCodePages, LONG *pcchCodePages)
{ {
return fnIMLangFontLink_GetStrCodePages((IMLangFontLink *)This, return fnIMLangFontLink_GetStrCodePages((IMLangFontLink *)This,
pszSrc, cchSrc, dwPriorityCodePages, pdwCodePages, pcchCodePages); pszSrc, cchSrc, dwPriorityCodePages, pdwCodePages, pcchCodePages);
@ -3354,14 +3354,14 @@ static ULONG WINAPI fnIMLangLineBreakConsole_Release(
static HRESULT WINAPI fnIMLangLineBreakConsole_BreakLineML( static HRESULT WINAPI fnIMLangLineBreakConsole_BreakLineML(
IMLangLineBreakConsole* iface, IMLangLineBreakConsole* iface,
IMLangString* pSrcMLStr, IMLangString* pSrcMLStr,
long lSrcPos, LONG lSrcPos,
long lSrcLen, LONG lSrcLen,
long cMinColumns, LONG cMinColumns,
long cMaxColumns, LONG cMaxColumns,
long* plLineLen, LONG* plLineLen,
long* plSkipLen) 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; return E_NOTIMPL;
} }
@ -3369,12 +3369,12 @@ static HRESULT WINAPI fnIMLangLineBreakConsole_BreakLineW(
IMLangLineBreakConsole* iface, IMLangLineBreakConsole* iface,
LCID locale, LCID locale,
const WCHAR* pszSrc, const WCHAR* pszSrc,
long cchSrc, LONG cchSrc,
long cMaxColumns, LONG cMaxColumns,
long* pcchLine, LONG* pcchLine,
long* pcchSkip ) 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; *pcchLine = cchSrc;
*pcchSkip = 0; *pcchSkip = 0;
@ -3386,12 +3386,12 @@ static HRESULT WINAPI fnIMLangLineBreakConsole_BreakLineA(
LCID locale, LCID locale,
UINT uCodePage, UINT uCodePage,
const CHAR* pszSrc, const CHAR* pszSrc,
long cchSrc, LONG cchSrc,
long cMaxColumns, LONG cMaxColumns,
long* pcchLine, LONG* pcchLine,
long* pcchSkip) 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; *pcchLine = cchSrc;
*pcchSkip = 0; *pcchSkip = 0;

20
dlls/mlang/tests/mlang.c
View File

@ -650,7 +650,7 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL)
DWORD dwCmpCodePages; DWORD dwCmpCodePages;
UINT CodePage; UINT CodePage;
static const WCHAR str[3] = { 'd', 0x0436, 0xff90 }; static const WCHAR str[3] = { 'd', 0x0436, 0xff90 };
long processed; LONG processed;
HRESULT ret; HRESULT ret;
dwCodePages = ~0u; dwCodePages = ~0u;
@ -704,7 +704,7 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL)
ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[0], 1, 0, &dwCodePages, &processed); ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[0], 1, 0, &dwCodePages, &processed);
ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret); ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret);
ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); 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 */ /* Cyrillic */
dwCmpCodePages = FS_CYRILLIC | FS_JISJAPAN | FS_CHINESESIMP | FS_WANSUNG; 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); ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[1], 1, 0, &dwCodePages, &processed);
ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret); ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret);
ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); 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 */ /* Japanese */
dwCmpCodePages = FS_JISJAPAN; dwCmpCodePages = FS_JISJAPAN;
@ -730,7 +730,7 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL)
ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[2], 1, 0, &dwCodePages, &processed); ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[2], 1, 0, &dwCodePages, &processed);
ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret); ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret);
ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); 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; dwCmpCodePages = FS_CYRILLIC | FS_JISJAPAN | FS_CHINESESIMP | FS_WANSUNG;
dwCodePages = 0; dwCodePages = 0;
@ -738,7 +738,7 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL)
ret = IMLangFontLink_GetStrCodePages(iMLFL, str, 2, 0, &dwCodePages, &processed); ret = IMLangFontLink_GetStrCodePages(iMLFL, str, 2, 0, &dwCodePages, &processed);
ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret); ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret);
ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); 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; dwCmpCodePages = FS_JISJAPAN;
dwCodePages = 0; dwCodePages = 0;
@ -746,14 +746,14 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL)
ret = IMLangFontLink_GetStrCodePages(iMLFL, str, 3, 0, &dwCodePages, &processed); ret = IMLangFontLink_GetStrCodePages(iMLFL, str, 3, 0, &dwCodePages, &processed);
ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret); ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret);
ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); 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; dwCodePages = 0xffff;
processed = -1; processed = -1;
ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[2], 1, 0, &dwCodePages, &processed); ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[2], 1, 0, &dwCodePages, &processed);
ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret); ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret);
ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); 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); ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[2], 1, 0, NULL, NULL);
ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret); 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); ret = IMLangFontLink_GetStrCodePages(iMLFL, str, -1, 0, &dwCodePages, &processed);
ok(ret == E_INVALIDARG, "IMLangFontLink_GetStrCodePages should fail: %x\n", ret); ok(ret == E_INVALIDARG, "IMLangFontLink_GetStrCodePages should fail: %x\n", ret);
ok(dwCodePages == 0, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); 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; dwCodePages = 0xffff;
processed = -1; processed = -1;
ret = IMLangFontLink_GetStrCodePages(iMLFL, NULL, 1, 0, &dwCodePages, &processed); ret = IMLangFontLink_GetStrCodePages(iMLFL, NULL, 1, 0, &dwCodePages, &processed);
ok(ret == E_INVALIDARG, "IMLangFontLink_GetStrCodePages should fail: %x\n", ret); ok(ret == E_INVALIDARG, "IMLangFontLink_GetStrCodePages should fail: %x\n", ret);
ok(dwCodePages == 0, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); 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; dwCodePages = 0xffff;
processed = -1; processed = -1;
ret = IMLangFontLink_GetStrCodePages(iMLFL, str, 0, 0, &dwCodePages, &processed); ret = IMLangFontLink_GetStrCodePages(iMLFL, str, 0, 0, &dwCodePages, &processed);
ok(ret == E_INVALIDARG, "IMLangFontLink_GetStrCodePages should fail: %x\n", ret); ok(ret == E_INVALIDARG, "IMLangFontLink_GetStrCodePages should fail: %x\n", ret);
ok(dwCodePages == 0, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); 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 */ /* copied from libs/wine/string.c */

56
include/mlang.idl
View File

@ -37,10 +37,10 @@ interface IMLangCodePages : IUnknown
[out] DWORD *pdwCodePages); [out] DWORD *pdwCodePages);
HRESULT GetStrCodePages( HRESULT GetStrCodePages(
[in, size_is(cchSrc)] const WCHAR *pszSrc, [in, size_is(cchSrc)] const WCHAR *pszSrc,
[in] long cchSrc, [in] LONG cchSrc,
[in] DWORD dwPriorityCodePages, [in] DWORD dwPriorityCodePages,
[out] DWORD *pdwCodePages, [out] DWORD *pdwCodePages,
[out] long *pcchCodePages); [out] LONG *pcchCodePages);
HRESULT CodePageToCodePages( HRESULT CodePageToCodePages(
[in] UINT uCodePage, [in] UINT uCodePage,
[out] DWORD *pdwCodePages); [out] DWORD *pdwCodePages);
@ -228,11 +228,11 @@ interface IMLangString : IUnknown
{ {
#ifdef NEWMLSTR #ifdef NEWMLSTR
HRESULT LockMLStr( HRESULT LockMLStr(
[in] long lPos, [in] LONG lPos,
[in] DWORD dwFlags, [in] DWORD dwFlags,
[out] DWORD* pdwCookie, [out] DWORD* pdwCookie,
[out] long* plActualPos, [out] LONG* plActualPos,
[out] long* plActualLen); [out] LONG* plActualLen);
HRESULT UnlockMLStr( HRESULT UnlockMLStr(
[in] DWORD dwCookie); [in] DWORD dwCookie);
@ -241,13 +241,13 @@ interface IMLangString : IUnknown
[in] BOOL fNoAccess); [in] BOOL fNoAccess);
#endif #endif
HRESULT GetLength( HRESULT GetLength(
[out, retval] long* plLen); [out, retval] LONG* plLen);
HRESULT SetMLStr( HRESULT SetMLStr(
[in] long lDestPos, [in] LONG lDestPos,
[in] long lDestLen, [in] LONG lDestLen,
[in] IUnknown *pSrcMLStr, [in] IUnknown *pSrcMLStr,
[in] long lSrcPos, [in] LONG lSrcPos,
[in] long lSrcLen); [in] LONG lSrcLen);
#ifdef NEWMLSTR #ifdef NEWMLSTR
HRESULT RegisterAttr( HRESULT RegisterAttr(
[in] IUnknown *pUnk, [in] IUnknown *pUnk,
@ -262,14 +262,14 @@ interface IMLangString : IUnknown
[out] IUnknown **ppUnk); [out] IUnknown **ppUnk);
#else #else
HRESULT GetMLStr( HRESULT GetMLStr(
[in] long lSrcPos, [in] LONG lSrcPos,
[in] long lSrcLen, [in] LONG lSrcLen,
[in] IUnknown *pUnkOuter, [in] IUnknown *pUnkOuter,
[in] DWORD dwClsContext, [in] DWORD dwClsContext,
[in] const IID* piid, [in] const IID* piid,
[out] IUnknown** ppDestMLStr, [out] IUnknown** ppDestMLStr,
[out] long* plDestPos, [out] LONG* plDestPos,
[out] long* plDestLen); [out] LONG* plDestLen);
#endif #endif
} }
@ -282,29 +282,29 @@ interface IMLangLineBreakConsole : IUnknown
{ {
HRESULT BreakLineML( HRESULT BreakLineML(
[in] IMLangString* pSrcMLStr, [in] IMLangString* pSrcMLStr,
[in] long lSrcPos, [in] LONG lSrcPos,
[in] long lSrcLen, [in] LONG lSrcLen,
[in] long cMinColumns, [in] LONG cMinColumns,
[in] long cMaxColumns, [in] LONG cMaxColumns,
[out] long* plLineLen, [out] LONG* plLineLen,
[out] long* plSkipLen); [out] LONG* plSkipLen);
HRESULT BreakLineW( HRESULT BreakLineW(
[in] LCID locale, [in] LCID locale,
[in, size_is(cchSrc)] const WCHAR* pszSrc, [in, size_is(cchSrc)] const WCHAR* pszSrc,
[in] long cchSrc, [in] LONG cchSrc,
[in] long cMaxColumns, [in] LONG cMaxColumns,
[out] long* pcchLine, [out] LONG* pcchLine,
[out] long* pcchSkip ); [out] LONG* pcchSkip );
HRESULT BreakLineA( HRESULT BreakLineA(
[in] LCID locale, [in] LCID locale,
[in] UINT uCodePage, [in] UINT uCodePage,
[in, size_is(cchSrc)] const CHAR* pszSrc, [in, size_is(cchSrc)] const CHAR* pszSrc,
[in] long cchSrc, [in] LONG cchSrc,
[in] long cMaxColumns, [in] LONG cMaxColumns,
[out] long* pcchLine, [out] LONG* pcchLine,
[out] long* pcchSkip); [out] LONG* pcchSkip);
} }
[ [