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

fix a couple of compile warnings

Browse source
This commit is contained in:
ehouse 2006-05-28 14:53:02 +00:00
parent e252d51669
commit 35f8004d43
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
wince/cedict.c
View file

@ -440,7 +440,6 @@ openMappedFile( MPFORMAL const wchar_t* name, HANDLE* mappedFileP,
HANDLE hFile; HANDLE hFile;
#if defined _WIN32_WCE #if defined _WIN32_WCE
HANDLE mappedFile = NULL;
hFile = CreateFileForMapping( name, hFile = CreateFileForMapping( name,
GENERIC_READ, GENERIC_READ,
FILE_SHARE_READ, /* (was 0: no sharing) */ FILE_SHARE_READ, /* (was 0: no sharing) */

21
wince/cemain.c
View file

@ -149,7 +149,9 @@ static XP_Bool ceDoNewGame( CEAppGlobals* globals, XP_Bool silent );
static XP_Bool ceSaveCurGame( CEAppGlobals* globals, XP_Bool autoSave ); static XP_Bool ceSaveCurGame( CEAppGlobals* globals, XP_Bool autoSave );
static void updateForColors( CEAppGlobals* globals ); static void updateForColors( CEAppGlobals* globals );
static XWStreamCtxt* make_generic_stream( CEAppGlobals* globals ); static XWStreamCtxt* make_generic_stream( CEAppGlobals* globals );
#ifdef BEYOND_IR
static void ce_send_on_close( XWStreamCtxt* stream, void* closure ); static void ce_send_on_close( XWStreamCtxt* stream, void* closure );
#endif
static XP_Bool ceSetDictName( const wchar_t* wPath, XP_U16 index, void* ctxt ); static XP_Bool ceSetDictName( const wchar_t* wPath, XP_U16 index, void* ctxt );
static void messageBoxStream( CEAppGlobals* globals, XWStreamCtxt* stream, static void messageBoxStream( CEAppGlobals* globals, XWStreamCtxt* stream,
wchar_t* title ); wchar_t* title );
@ -312,7 +314,6 @@ MyRegisterClass(HINSTANCE hInstance, LPTSTR szWindowClass)
} }
#ifdef _WIN32_WCE #ifdef _WIN32_WCE
#define N_TOOLBAR_BUTTONS 4
static void static void
addButtonsToCmdBar( CEAppGlobals* globals ) addButtonsToCmdBar( CEAppGlobals* globals )
{ {
@ -324,20 +325,18 @@ addButtonsToCmdBar( CEAppGlobals* globals )
int resIDs[] = { IDB_FLIPBUTTON, IDB_VALUESBUTTON, int resIDs[] = { IDB_FLIPBUTTON, IDB_VALUESBUTTON,
IDB_HINTBUTTON, IDB_JUGGLEBUTTON }; IDB_HINTBUTTON, IDB_JUGGLEBUTTON };
TBBUTTON buttData = {
0, /*iBitmap; */
0, //FLIP_BUTTON_ID,
TBSTATE_ENABLED, /* state */
TBSTYLE_BUTTON,
0,
-1
};
for ( i = 0; i < sizeof(cmds)/sizeof(cmds[0]); ++i ) { for ( i = 0; i < sizeof(cmds)/sizeof(cmds[0]); ++i ) {
TBBUTTON buttData;
index = CommandBar_AddBitmap(globals->hwndCB, globals->hInst, index = CommandBar_AddBitmap(globals->hwndCB, globals->hInst,
resIDs[i], 1, 16, 16 ); resIDs[i], 1, 16, 16 );
XP_MEMSET( &buttData, 0, sizeof(buttData) );
buttData.fsState = TBSTATE_ENABLED;
buttData.fsStyle = TBSTYLE_BUTTON;
buttData.iBitmap = index; buttData.iBitmap = index;
buttData.idCommand = cmds[i]; buttData.idCommand = cmds[i];
success = CommandBar_InsertButton( globals->hwndCB, -1, success = CommandBar_InsertButton( globals->hwndCB, -1,
(LPARAM)&buttData ); (LPARAM)&buttData );
} }
@ -1500,7 +1499,9 @@ static void
ceWriteToFile( XWStreamCtxt* stream, void* closure ) ceWriteToFile( XWStreamCtxt* stream, void* closure )
{ {
FileWriteState* fwState = (FileWriteState*)closure; FileWriteState* fwState = (FileWriteState*)closure;
#ifdef MEM_DEBUG
CEAppGlobals* globals = fwState->globals; CEAppGlobals* globals = fwState->globals;
#endif
XP_UCHAR* path = fwState->path; XP_UCHAR* path = fwState->path;
wchar_t widebuf[257]; wchar_t widebuf[257];
XP_U16 len = (XP_U16)XP_STRLEN( path ); XP_U16 len = (XP_U16)XP_STRLEN( path );