fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-06-18 11:39 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* source/rtl/gtclip.c
     ! hb_gt_w32_setClipboard() fix to CF_UNICODETEXT 
       EOS char setting.
       [TOMERGE RC1]

   * source/rtl/gtwvt/gtwvt.c
     + Internal error string cleanup.
This commit is contained in:
Viktor Szakats
2008-06-18 09:41:03 +00:00
parent 09901b9505
commit c6bbd0eacb
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
harbour/ChangeLog
View File

@@ -8,6 +8,15 @@
2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2008-06-18 11:39 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* source/rtl/gtclip.c
! hb_gt_w32_setClipboard() fix to CF_UNICODETEXT
EOS char setting.
[TOMERGE RC1]
* source/rtl/gtwvt/gtwvt.c
+ Internal error string cleanup.
2008-06-18 10:06 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* source/rtl/gtwvt/gtwvt.c
+ Now showing the application's executable name

8
harbour/source/rtl/gtclip.c
View File

@@ -91,12 +91,12 @@ BOOL hb_gt_getClipboard( char ** pszClipData, ULONG *pulLen )
BOOL hb_gt_w32_setClipboard( UINT uFormat, char * szClipData, ULONG ulLen )
{
LPTSTR lptstrCopy;
HGLOBAL hglbCopy;
BOOL fResult = FALSE;
if( OpenClipboard( NULL ) )
{
HGLOBAL hglbCopy;
EmptyClipboard();
/* Allocate a global memory object for the text. */
@@ -104,13 +104,13 @@ BOOL hb_gt_w32_setClipboard( UINT uFormat, char * szClipData, ULONG ulLen )
if( hglbCopy )
{
/* Lock the handle and copy the text to the buffer. */
lptstrCopy = ( LPTSTR ) GlobalLock( hglbCopy );
LPTSTR lptstrCopy = ( LPTSTR ) GlobalLock( hglbCopy );
if( lptstrCopy )
{
if( uFormat == CF_UNICODETEXT )
{
hb_mbtowcset( ( LPWSTR ) lptstrCopy, szClipData, ulLen );
lptstrCopy[ ulLen * sizeof( wchar_t ) ] = L'\0';
* ( ( ( LPWSTR ) lptstrCopy ) + ulLen ) = L'\0';
}
else
{

9
harbour/source/rtl/gtwvt/gtwvt.c
View File

@@ -1603,24 +1603,23 @@ static void hb_gt_wvt_Init( PHB_GT pGT, FHANDLE hFilenoStdin, FHANDLE hFilenoStd
if( ! hb_winmainArgGet( &s_hInstance, &s_hPrevInstance, &s_iCmdShow ) )
{
hb_errInternal( 10001, "It's not a window GUI program.", NULL, NULL );
hb_errInternal( 10001, "It's not a Windows GUI program", NULL, NULL );
}
pWVT = hb_gt_wvt_New( pGT );
if( !pWVT )
{
hb_errInternal( 10001, "Cannot allocate new window", NULL, NULL );
hb_errInternal( 10001, "Maximum number of WVT windows reached, cannot create another one", NULL, NULL );
}
HB_GTLOCAL( pGT ) = ( void * ) pWVT;
pWVT->hWnd = hb_gt_wvt_CreateWindow( ( HINSTANCE ) s_hInstance,
( HINSTANCE ) s_hPrevInstance,
"", s_iCmdShow );
NULL, s_iCmdShow );
if( !pWVT->hWnd )
{
/* hb_errRT_TERM( EG_CREATE, 10001, "WINAPI CreateWindow() failed", "hb_gt_wvt_Init()", 0, 0 ); */
hb_errInternal( 10001, "WINAPI CreateWindow() failed", NULL, NULL );
hb_errInternal( 10001, "WVT window creation failed", NULL, NULL );
}
hb_gt_wvt_InitWindow( pWVT, WVT_DEFAULT_ROWS, WVT_DEFAULT_COLS );