diff --git a/ChangeLog.txt b/ChangeLog.txt index 495942ae44..43fb309111 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,17 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2014-10-06 21:10 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * src/rtl/gtxwc/gtxwc.c + ! fixed multiple input context initialization in HB_GTI_FONTSEL. + Thanks to Rolf for the information. + + * contrib/hbnetio/netiocli.c + * contrib/hbwin/wapi_winbase.c + * src/rtl/iousr.c + * src/vm/cmdarg.c + * pacified MSVC warnings + 2014-10-05 16:40 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * src/3rd/tiff/tiff.dif * src/3rd/tiff/tiffconf.h diff --git a/contrib/hbnetio/netiocli.c b/contrib/hbnetio/netiocli.c index daf141efe3..5260cf47cd 100644 --- a/contrib/hbnetio/netiocli.c +++ b/contrib/hbnetio/netiocli.c @@ -2460,7 +2460,7 @@ static HB_BOOL s_fileConfigure( PHB_FILE pFile, int iIndex, PHB_ITEM pValue ) hb_itemClear( pValue ); - if( s_fileSendMsg( pFile->conn, msgbuf, itmData, itmSize, HB_TRUE, HB_FALSE ) ) + if( s_fileSendMsg( pFile->conn, msgbuf, itmData, ( long ) itmSize, HB_TRUE, HB_FALSE ) ) { HB_ERRCODE errCode = ( HB_ERRCODE ) HB_GET_LE_UINT32( &msgbuf[ 12 ] ); HB_SIZE nResult = HB_GET_LE_UINT32( &msgbuf[ 4 ] ), nRecv = 0; diff --git a/contrib/hbwin/wapi_winbase.c b/contrib/hbwin/wapi_winbase.c index 3aedfda6d9..24e6b6c740 100644 --- a/contrib/hbwin/wapi_winbase.c +++ b/contrib/hbwin/wapi_winbase.c @@ -299,7 +299,7 @@ HB_FUNC( WAPI_FORMATMESSAGE ) } } else - dwFlags = ~FORMAT_MESSAGE_ALLOCATE_BUFFER; + dwFlags = ( DWORD ) ~FORMAT_MESSAGE_ALLOCATE_BUFFER; if( dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER ) lpBuffer = ( LPTSTR ) &lpAllocBuff; diff --git a/src/rtl/gtxwc/gtxwc.c b/src/rtl/gtxwc/gtxwc.c index 770c5b8674..a7f4fb493a 100644 --- a/src/rtl/gtxwc/gtxwc.c +++ b/src/rtl/gtxwc/gtxwc.c @@ -4743,21 +4743,24 @@ static void hb_gt_xwc_CreateWindow( PXWND_DEF wnd ) hb_gt_xwc_SetResizing( wnd ); #ifdef X_HAVE_UTF8_STRING - wnd->im = XOpenIM( wnd->dpy, NULL, NULL, NULL ); - if( wnd->im ) + if( ! wnd->im ) { - wnd->ic = XCreateIC( wnd->im, - XNInputStyle, XIMPreeditNothing | XIMStatusNothing, - XNClientWindow, wnd->window, - XNFocusWindow, wnd->window, - NULL ); - if( ! wnd->ic ) + wnd->im = XOpenIM( wnd->dpy, NULL, NULL, NULL ); + if( wnd->im ) { - XCloseIM( wnd->im ); - wnd->im = NULL; + wnd->ic = XCreateIC( wnd->im, + XNInputStyle, XIMPreeditNothing | XIMStatusNothing, + XNClientWindow, wnd->window, + XNFocusWindow, wnd->window, + NULL ); + if( ! wnd->ic ) + { + XCloseIM( wnd->im ); + wnd->im = NULL; + } + else + wnd->fUTF8key = HB_TRUE; } - else - wnd->fUTF8key = HB_TRUE; } #ifdef XWC_DEBUG printf( "\nXIC=%p, XIC=%p\n", wnd->im, wnd->ic ); fflush( stdout ); diff --git a/src/rtl/iousr.c b/src/rtl/iousr.c index bb5c6319cb..5a22789f34 100644 --- a/src/rtl/iousr.c +++ b/src/rtl/iousr.c @@ -144,7 +144,7 @@ static PHB_IOUSR s_iousrAddNew( const char * pszPrefix ) pIO = ( PHB_IOUSR ) hb_xgrab( sizeof( HB_IOUSR ) ); memset( pIO, 0, sizeof( HB_IOUSR ) ); pIO->prefix = hb_strdup( pszPrefix ); - pIO->prefix_len = strlen( pszPrefix ); + pIO->prefix_len = ( int ) strlen( pszPrefix ); s_ioUsrs[ s_iCount++ ] = pIO; } diff --git a/src/vm/cmdarg.c b/src/vm/cmdarg.c index 9ef57f3426..268c0ea9ae 100644 --- a/src/vm/cmdarg.c +++ b/src/vm/cmdarg.c @@ -207,7 +207,7 @@ void hb_winmainArgVBuild( void ) because in console apps the name may be truncated in some cases, and in GUI apps it's not filled at all. [vszakats] */ - if( GetModuleFileName( NULL, lpArgV[ 0 ], nModuleName ) != 0 ) + if( GetModuleFileName( NULL, lpArgV[ 0 ], ( DWORD ) nModuleName ) != 0 ) { /* Windows XP does not set trailing 0 if buffer is not large enough [druzus] */ lpArgV[ 0 ][ nModuleName - 1 ] = 0;