Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-30 10:26:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove trailing <cr> to sometimes eliminate scrollbar

Browse source
This commit is contained in:
ehouse 2006-05-23 02:01:26 +00:00
parent 65540759b5
commit 340214d87d
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
xwords4/wince/cestrbx.c
View file

@ -25,21 +25,27 @@ static void
stuffTextInField( HWND hDlg, StrBoxInit* init ) stuffTextInField( HWND hDlg, StrBoxInit* init )
{ {
XP_U16 nBytes = stream_getSize(init->stream); XP_U16 nBytes = stream_getSize(init->stream);
XP_U16 len; XP_U16 len, crlen;
XP_UCHAR* sbuf; XP_UCHAR* sbuf;
wchar_t* wbuf; wchar_t* wbuf;
CEAppGlobals* globals = init->globals; CEAppGlobals* globals = init->globals;
sbuf = XP_MALLOC( globals->mpool, nBytes ); sbuf = XP_MALLOC( globals->mpool, nBytes + 1 );
stream_getBytes( init->stream, sbuf, nBytes ); stream_getBytes( init->stream, sbuf, nBytes );
crlen = strlen(XP_CR);
if ( 0 == strncmp( XP_CR, &sbuf[nBytes-crlen], crlen ) ) {
nBytes -= crlen;
}
sbuf[nBytes] = '\0';
len = MultiByteToWideChar( CP_ACP, MB_PRECOMPOSED, sbuf, nBytes, len = MultiByteToWideChar( CP_ACP, MB_PRECOMPOSED, sbuf, nBytes,
NULL, 0 ); NULL, 0 );
wbuf = XP_MALLOC( globals->mpool, (len+1) * sizeof(*wbuf) ); wbuf = XP_MALLOC( globals->mpool, (len+1) * sizeof(*wbuf) );
XP_MEMSET( wbuf, 0, (len+1) * sizeof(*wbuf) );
MultiByteToWideChar( CP_ACP, MB_PRECOMPOSED, sbuf, nBytes, MultiByteToWideChar( CP_ACP, MB_PRECOMPOSED, sbuf, nBytes,
wbuf, len ); wbuf, len );
XP_FREE( globals->mpool, sbuf ); XP_FREE( globals->mpool, sbuf );
wbuf[len] = 0;
SetDlgItemText( hDlg, ID_EDITTEXT, wbuf ); SetDlgItemText( hDlg, ID_EDITTEXT, wbuf );
XP_FREE( globals->mpool, wbuf ); XP_FREE( globals->mpool, wbuf );