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
This commit is contained in:
Przemysław Czerpak
2014-10-06 21:10:54 +02:00
parent b2b672222e
commit f0cacca706
6 changed files with 30 additions and 16 deletions

View File

@@ -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

View File

@@ -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;

View File

@@ -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;

View File

@@ -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 );

View File

@@ -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;
}

View File

@@ -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;