Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-18 22:26:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make state private to ceblank.c; all dict strings are utf8, so don't

Browse source 
ever convert using CP_ACP.  Fixes misdisplay of Spanish Ñ.
This commit is contained in:
ehouse 2009-10-23 08:54:54 +00:00
parent 8ec7b01595
commit 6aca59abe0
3 changed files with 36 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
xwords4/wince/ceblank.c
View file

@ -22,6 +22,17 @@
#include "cemain.h"
#include "ceutil.h"
#include "debhacks.h"
#include "cedebug.h"
typedef struct BlankDialogState {
CeDlgHdr dlgHdr;
const PickInfo* pi;
XP_U16 playerNum;
const XP_UCHAR** texts;
XP_U16 nTiles;
XP_S16 result;
XP_Bool canBackup;
} BlankDialogState;
static void
loadLettersList( BlankDialogState* bState )
@ -31,13 +42,12 @@ loadLettersList( BlankDialogState* bState )
HWND hDlg = bState->dlgHdr.hDlg;
CEAppGlobals* globals = bState->dlgHdr.globals;
const XP_UCHAR** texts = bState->texts;
UINT codePage = ceCurDictIsUTF8(globals)? CP_UTF8 : CP_ACP;
for ( ii = 0; ii < nTiles; ++ii ) {
XP_U16 len;
wchar_t widebuf[4];
len = MultiByteToWideChar( codePage, 0, texts[ii], strlen(texts[ii]),
len = MultiByteToWideChar( CP_UTF8, 0, texts[ii], strlen(texts[ii]),
widebuf, VSIZE(widebuf) );
widebuf[len] = 0;
@ -78,8 +88,7 @@ showCurTray( HWND hDlg, BlankDialogState* bState )
i==0?": ":", ", pi->curTiles[i] );
}
(void)MultiByteToWideChar( ceCurDictIsUTF8(globals)? CP_UTF8 : CP_ACP,
0, labelBuf, lenSoFar + 1, widebuf,
(void)MultiByteToWideChar( CP_UTF8, 0, labelBuf, lenSoFar + 1, widebuf,
VSIZE(widebuf) + sizeof(widebuf[0]) );
SetDlgItemText( hDlg,IDC_PICKMSG, widebuf );
@ -87,7 +96,7 @@ showCurTray( HWND hDlg, BlankDialogState* bState )
} /* showCurTray */
#endif
LRESULT CALLBACK
static LRESULT CALLBACK
BlankDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{
BlankDialogState* bState;
@ -154,3 +163,22 @@ BlankDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
exit:
return result;
} /* BlankDlg */
XP_Bool
WrapBlankDlg( CEAppGlobals* globals, const PickInfo* pi,
XP_U16 playerNum, const XP_UCHAR** texts, XP_U16 nTiles )
{
BlankDialogState state;
XP_MEMSET( &state, 0, sizeof(state) );
state.dlgHdr.globals = globals;
state.texts = texts;
state.nTiles = nTiles;
state.playerNum = playerNum;
state.pi = pi;
assertOnTop( globals->hWnd );
DialogBoxParam( globals->locInst, (LPCTSTR)IDD_ASKBLANK, globals->hWnd,
(DLGPROC)BlankDlg, (long)&state );
return state.result;
}

14
xwords4/wince/ceblank.h
View file

@ -24,16 +24,6 @@
#include "cemain.h"
#include "ceutil.h"
typedef struct BlankDialogState {
CeDlgHdr dlgHdr;
const PickInfo* pi;
XP_U16 playerNum;
const XP_UCHAR** texts;
XP_U16 nTiles;
XP_S16 result;
XP_Bool canBackup;
} BlankDialogState;
LRESULT CALLBACK BlankDlg(HWND, UINT, WPARAM, LPARAM);
XP_Bool WrapBlankDlg( CEAppGlobals* globals, const PickInfo* pi,
XP_U16 playerNum, const XP_UCHAR** texts, XP_U16 nTiles );
#endif

14
xwords4/wince/cemain.c
View file

@ -3292,20 +3292,8 @@ ce_util_userPickTile( XW_UtilCtxt* uc, const PickInfo* pi,
XP_U16 playerNum,
const XP_UCHAR** texts, XP_U16 nTiles )
{
BlankDialogState state;
CEAppGlobals* globals = (CEAppGlobals*)uc->closure;
XP_MEMSET( &state, 0, sizeof(state) );
state.dlgHdr.globals = globals;
state.texts = texts;
state.nTiles = nTiles;
state.playerNum = playerNum;
state.pi = pi;
assertOnTop( globals->hWnd );
DialogBoxParam( globals->locInst, (LPCTSTR)IDD_ASKBLANK, globals->hWnd,
(DLGPROC)BlankDlg, (long)&state );
return state.result;
return WrapBlankDlg( globals, pi, playerNum, texts, nTiles );
} /* ce_util_userPickTile */
static XP_Bool