Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-05 20:45:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

add __attribute__ format and fix resulting compile warnings; add a few

Browse source 
new WM_ strings for debugging.
This commit is contained in:
ehouse 2008-03-15 14:14:39 +00:00
parent 4beb818de3
commit 439dd4d84a
4 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
xwords4/wince/ceclrsel.c
View file

@ -161,7 +161,7 @@ EditColorsDlg( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam )
} }
wchar_t buf[64]; wchar_t buf[64];
swprintf( buf, L"Edit color for %s", label ); swprintf( buf, L"Edit color for %s", label );
SendMessage( hDlg, WM_SETTEXT, 0, buf ); SendMessage( hDlg, WM_SETTEXT, 0, (LPARAM)buf );
return TRUE; return TRUE;
} else { } else {
@ -314,9 +314,9 @@ static void
wrapChooseColor( ColorsDlgState* cState, HWND parent, XP_U16 button ) wrapChooseColor( ColorsDlgState* cState, HWND parent, XP_U16 button )
{ {
XP_U16 index = button-FIRST_BUTTON; XP_U16 index = button-FIRST_BUTTON;
XP_U16 labelID = button + CLRSEL_LABEL_OFFSET;
#ifdef MY_COLOR_SEL #ifdef MY_COLOR_SEL
XP_U16 labelID = button + CLRSEL_LABEL_OFFSET;
COLORREF clrref = cState->colors[index]; COLORREF clrref = cState->colors[index];
if ( myChooseColor( cState->globals, parent, labelID, &clrref ) ) { if ( myChooseColor( cState->globals, parent, labelID, &clrref ) ) {

9
xwords4/wince/cedebug.c
View file

@ -62,6 +62,15 @@ messageToStr( UINT message )
CASE_STR( WM_WINDOWPOSCHANGING ); CASE_STR( WM_WINDOWPOSCHANGING );
CASE_STR( WM_SETFOCUS ); CASE_STR( WM_SETFOCUS );
CASE_STR( WM_NCPAINT ); CASE_STR( WM_NCPAINT );
CASE_STR( WM_NCCALCSIZE );
CASE_STR( WM_SETTEXT );
CASE_STR( WM_CTLCOLORDLG );
CASE_STR( WM_MOUSEACTIVATE );
CASE_STR( WM_SETCURSOR );
CASE_STR( WM_CTLCOLORLISTBOX );
CASE_STR( WM_CTLCOLOREDIT );
CASE_STR( WM_NCDESTROY );
CASE_STR( WM_NOTIFY );
default: default:
str = "<unknown>"; str = "<unknown>";
} }

8
xwords4/wince/cedict.c
View file

@ -117,7 +117,7 @@ ce_dictionary_make( CEAppGlobals* globals, XP_UCHAR* dictName )
ctxt->super.destructor = ce_dict_destroy; ctxt->super.destructor = ce_dict_destroy;
ctxt->super.func_dict_getShortName = ce_dict_getShortName; ctxt->super.func_dict_getShortName = ce_dict_getShortName;
XP_DEBUGF( "ptr starting at 0x%lx", ptr ); XP_DEBUGF( "ptr starting at 0x%p", ptr );
numFaces = (XP_U16)(*ptr++); numFaces = (XP_U16)(*ptr++);
ctxt->super.nFaces = (XP_U8)numFaces; ctxt->super.nFaces = (XP_U8)numFaces;
@ -142,12 +142,12 @@ ce_dictionary_make( CEAppGlobals* globals, XP_UCHAR* dictName )
(XP_U8*)XP_MALLOC(globals->mpool, numFaces*2); (XP_U8*)XP_MALLOC(globals->mpool, numFaces*2);
ptr += 2; /* skip xloc header */ ptr += 2; /* skip xloc header */
XP_DEBUGF( "pre values: ptr now 0x%lx", ptr ); XP_DEBUGF( "pre values: ptr now 0x%p", ptr );
for ( i = 0; i < numFaces*2; i += 2 ) { for ( i = 0; i < numFaces*2; i += 2 ) {
ctxt->super.countsAndValues[i] = *ptr++; ctxt->super.countsAndValues[i] = *ptr++;
ctxt->super.countsAndValues[i+1] = *ptr++; ctxt->super.countsAndValues[i+1] = *ptr++;
} }
XP_DEBUGF( "post values: ptr now 0x%lx", ptr ); XP_DEBUGF( "post values: ptr now 0x%p", ptr );
ceLoadSpecialData( ctxt, &ptr ); ceLoadSpecialData( ctxt, &ptr );
@ -487,7 +487,7 @@ openMappedFile( MPFORMAL const wchar_t* name, HANDLE* mappedFileP,
if ( hFile != INVALID_HANDLE_VALUE ) { if ( hFile != INVALID_HANDLE_VALUE ) {
DWORD size = GetFileSize( hFile, NULL ); DWORD size = GetFileSize( hFile, NULL );
XP_LOGF( "file size: %d", size ); XP_LOGF( "file size: %ld", size );
ptr = XP_MALLOC( mpool, size ); ptr = XP_MALLOC( mpool, size );
if ( ptr != NULL ) { if ( ptr != NULL ) {

3
xwords4/wince/xptypes.h
View file

@ -107,7 +107,8 @@ extern "C" {
#endif #endif
void wince_assert(XP_UCHAR* s, int line, char* fileName ); void wince_assert(XP_UCHAR* s, int line, char* fileName );
void wince_debugf(XP_UCHAR*, ...); void wince_debugf(const XP_UCHAR*, ...)
__attribute__ ((format (printf, 1, 2)));
void p_ignore(XP_UCHAR*, ...); void p_ignore(XP_UCHAR*, ...);
XP_U16 wince_snprintf( XP_UCHAR* buf, XP_U16 len, XP_U16 wince_snprintf( XP_UCHAR* buf, XP_U16 len,
const XP_UCHAR* format, ... ); const XP_UCHAR* format, ... );