diff --git a/wince/cecondlg.c b/wince/cecondlg.c index e53a13f35..2dcdc7542 100755 --- a/wince/cecondlg.c +++ b/wince/cecondlg.c @@ -113,7 +113,7 @@ WrapConnsDlg( HWND hDlg, CEAppGlobals* globals, const CommsAddrRec* addrRec, XP_MEMCPY( &state->addrRec, addrRec, sizeof(state->addrRec) ); - DH(DialogBoxParam)( globals->hInst, (LPCTSTR)IDD_CONNSSDLG, hDlg, + DialogBoxParam( globals->hInst, (LPCTSTR)IDD_CONNSSDLG, hDlg, (DLGPROC)ConnsDlg, (long)state ); result = !state->userCancelled; diff --git a/wince/cedict.c b/wince/cedict.c index a74a594bf..fa39c0abd 100755 --- a/wince/cedict.c +++ b/wince/cedict.c @@ -609,18 +609,18 @@ checkIfDictAndLegal( MPFORMAL wchar_t* path, XP_U16 pathLen, static XP_Bool locateOneDir( MPFORMAL wchar_t* path, XP_U16* which ) { - DH(WIN32_FIND_DATA) data; + WIN32_FIND_DATA data; HANDLE fileH; XP_Bool result = XP_FALSE; XP_U16 startLen; #if defined TARGET_OS_WINCE - DH(lstrcat)( path, L"\\" ); + lstrcat( path, L"\\" ); #elif defined TARGET_OS_WIN32 - DH(lstrcat)( path, L".\\" ); + lstrcat( path, L".\\" ); #endif startLen = wcslen(path); /* record where we were so can back up */ - DH(lstrcat)( path, L"*" ); + lstrcat( path, L"*" ); XP_MEMSET( &data, 0, sizeof(data) ); @@ -636,7 +636,7 @@ locateOneDir( MPFORMAL wchar_t* path, XP_U16* which ) if ((data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0){ #if defined TARGET_OS_WINCE /* We don't do recursive search on Win32!!! */ - DH(lstrcpy)( path+startLen, data.cFileName ); + lstrcpy( path+startLen, data.cFileName ); result = locateOneDir( MPPARM(mpool) path, which ); if ( result ) { break; @@ -647,7 +647,7 @@ locateOneDir( MPFORMAL wchar_t* path, XP_U16* which ) data.cFileName ) && (*which-- == 0)) { /* we're done! */ - DH(lstrcpy)( path+startLen, data.cFileName ); + lstrcpy( path+startLen, data.cFileName ); result = XP_TRUE; break; } diff --git a/wince/cedraw.c b/wince/cedraw.c index d0b0b7f0b..1a57d04fd 100755 --- a/wince/cedraw.c +++ b/wince/cedraw.c @@ -309,11 +309,13 @@ drawDrawTileGuts( DrawCtx* p_dctx, const XP_Rect* xprect, HDC hdc = globals->hdc; wchar_t widebuf[4]; RECT rt; + XP_U16 index; ceClearToBkground( dctx, xprect ); SetBkColor( hdc, dctx->globals->appPrefs.colors[TILEBACK_COLOR] ); - SetTextColor( hdc, dctx->globals->appPrefs.colors[getPlayerColor(dctx->trayOwner)] ); + index = getPlayerColor(dctx->trayOwner); + SetTextColor( hdc, dctx->globals->appPrefs.colors[index] ); XPRtoRECT( &rt, xprect ); @@ -490,7 +492,7 @@ formatRemText( HDC hdc, wchar_t* buf, XP_S16 nTilesLeft, SIZE* size ) size->cx = size->cy = 0; } else { swprintf( buf, format, nTilesLeft ); - DH(GetTextExtentPoint32)( hdc, buf, wcslen(buf), size ); + GetTextExtentPoint32( hdc, buf, wcslen(buf), size ); } } /* formatRemText */ @@ -553,7 +555,7 @@ ceWidthAndText( HDC hdc, wchar_t* buf, const DrawScoreInfo* dsi, len = MultiByteToWideChar( CP_ACP, MB_PRECOMPOSED, tbuf, -1, buf, 10 ); - DH(GetTextExtentPoint32)( hdc, buf, len, &size ); + GetTextExtentPoint32( hdc, buf, len, &size ); *widthP = (XP_U16)size.cx; *heightP = (XP_U16)size.cy; } /* ceWidthAndText */ @@ -740,7 +742,7 @@ ce_draw_measureMiniWText( DrawCtx* p_dctx, const XP_UCHAR* str, MultiByteToWideChar( CP_ACP, MB_PRECOMPOSED, str, len, widebuf, sizeof(widebuf)/sizeof(widebuf[0]) ); widebuf[len] = 0; - DH(GetTextExtentPoint32)( hdc, widebuf, wcslen(widebuf), &size ); + GetTextExtentPoint32( hdc, widebuf, wcslen(widebuf), &size ); maxWidth = (XP_U16)XP_MAX( maxWidth, size.cx ); height += size.cy + CE_INTERLINE_SPACE; diff --git a/wince/ceprefs.c b/wince/ceprefs.c index c5e07cc9a..7b12d0cde 100755 --- a/wince/ceprefs.c +++ b/wince/ceprefs.c @@ -333,8 +333,8 @@ WrapPrefsDialog( HWND hDlg, CEAppGlobals* globals, CePrefsDlgState* state, state->isNewGame = isNewGame; XP_MEMCPY( &state->prefsPrefs, prefsPrefs, sizeof( state->prefsPrefs ) ); - DH(DialogBoxParam)( globals->hInst, (LPCTSTR)IDD_OPTIONSDLG, hDlg, - (DLGPROC)PrefsDlg, (long)state ); + DialogBoxParam( globals->hInst, (LPCTSTR)IDD_OPTIONSDLG, hDlg, + (DLGPROC)PrefsDlg, (long)state ); result = !state->userCancelled; diff --git a/wince/debhacks.h b/wince/debhacks.h index 8caa82d62..e3debb373 100644 --- a/wince/debhacks.h +++ b/wince/debhacks.h @@ -40,11 +40,6 @@ typedef struct DH(WIN32_FIND_DATA) { WCHAR cFileName[MAX_PATH]; } DH(WIN32_FIND_DATA); -wchar_t* DH(lstrcat)(wchar_t *s1, const wchar_t* s2); -wchar_t* DH(lstrcpy)(wchar_t* dest, const wchar_t* src); -int DH(DialogBoxParam)( HINSTANCE hinst, LPCWSTR str, HWND hwnd, - DLGPROC proc, LPARAM lparam ); -BOOL DH(GetTextExtentPoint32)( HDC,LPCWSTR,int,LPSIZE); DWORD DH(GetCurrentThreadId)(void); BOOL DH(SetEvent)(HANDLE); BOOL DH(ResetEvent)(HANDLE);