From c4a20afb509c80ffb35af98e97e10797d5c11942 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 15 Sep 2010 21:01:50 +0000 Subject: [PATCH] 2010-09-15 23:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbwin/hbwin.hbp + contrib/hbwin/win_rpc.c + contrib/hbwin/tests/testrpc.prg + Added WIN_UUIDCREATESTRING() function to generate UUIDs via Windows API. Requires W2K or upper as per MSDN. If not supported, it returns empty string. --- harbour/ChangeLog | 8 ++ harbour/contrib/hbwin/hbwin.hbp | 1 + harbour/contrib/hbwin/tests/testrpc.prg | 19 ++++ harbour/contrib/hbwin/win_rpc.c | 117 ++++++++++++++++++++++++ 4 files changed, 145 insertions(+) create mode 100644 harbour/contrib/hbwin/tests/testrpc.prg create mode 100644 harbour/contrib/hbwin/win_rpc.c diff --git a/harbour/ChangeLog b/harbour/ChangeLog index e05099277f..ab18cc8894 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,14 @@ The license applies to all entries newer than 2009-04-28. */ +2010-09-15 23:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbwin/hbwin.hbp + + contrib/hbwin/win_rpc.c + + contrib/hbwin/tests/testrpc.prg + + Added WIN_UUIDCREATESTRING() function to generate UUIDs + via Windows API. Requires W2K or upper as per MSDN. + If not supported, it returns empty string. + 2010-09-15 20:01 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + contrib/hbqt/qtgui/hbqtgui.ch * contrib/hbqt/qtgui/hbqtgui.hbc diff --git a/harbour/contrib/hbwin/hbwin.hbp b/harbour/contrib/hbwin/hbwin.hbp index 251fb348e9..e26ffbfc85 100644 --- a/harbour/contrib/hbwin/hbwin.hbp +++ b/harbour/contrib/hbwin/hbwin.hbp @@ -58,6 +58,7 @@ win_prn1.c win_prn2.c win_prn3.c win_regc.c +win_rpc.c win_shell.c win_svc.c diff --git a/harbour/contrib/hbwin/tests/testrpc.prg b/harbour/contrib/hbwin/tests/testrpc.prg new file mode 100644 index 0000000000..13d58bc555 --- /dev/null +++ b/harbour/contrib/hbwin/tests/testrpc.prg @@ -0,0 +1,19 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * + * Copyright 2010 Viktor Szakats (harbour.01 syenar.hu) + * www - http://harbour-project.org + * + */ + +#include "simpleio.ch" + +PROCEDURE Main() + + ? win_UuidCreateString() + + RETURN diff --git a/harbour/contrib/hbwin/win_rpc.c b/harbour/contrib/hbwin/win_rpc.c new file mode 100644 index 0000000000..bfb4b04be9 --- /dev/null +++ b/harbour/contrib/hbwin/win_rpc.c @@ -0,0 +1,117 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * Windows API functions (rpc.h) + * + * Copyright 2010 Viktor Szakats (harbour.01 syenar.hu) + * www - http://harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ + +#include "hbapi.h" +#include "hbwinuni.h" + +#if ! defined( HB_OS_WIN_CE ) +# include +#endif + +HB_FUNC( WIN_UUIDCREATESTRING ) +{ +#if ! defined( HB_OS_WIN_CE ) + typedef RPC_STATUS ( RPC_ENTRY * _HB_UUIDCREATE )( UUID * ); + typedef RPC_STATUS ( RPC_ENTRY * _HB_UUIDTOSTRING )( UUID *, unsigned char ** ); + typedef RPC_STATUS ( RPC_ENTRY * _HB_RPCSTRINGFREE )( unsigned char ** ); + + static _HB_UUIDCREATE s_pUuidCreate = NULL; + static _HB_UUIDTOSTRING s_pUuidToString = NULL; + static _HB_RPCSTRINGFREE s_pRpcStringFree = NULL; + + if( ! s_pUuidCreate ) + { + HMODULE hRpcrt4 = GetModuleHandle( TEXT( "rpcrt4.dll" ) ); + + s_pUuidCreate = ( _HB_UUIDCREATE ) GetProcAddress( hRpcrt4, "UuidCreate" ); + + s_pUuidToString = ( _HB_UUIDTOSTRING ) GetProcAddress( hRpcrt4, +#if defined( UNICODE ) + "UuidToStringW" ); +#else + "UuidToStringA" ); +#endif + + s_pRpcStringFree = ( _HB_RPCSTRINGFREE ) GetProcAddress( hRpcrt4, +#if defined( UNICODE ) + "RpcStringFreeW" ); +#else + "RpcStringFreeA" ); +#endif + } + + if( s_pUuidCreate && + s_pUuidToString && + s_pRpcStringFree ) + { + TCHAR * tszUuid = NULL; + UUID uuid; + + memset( &uuid, 0, sizeof( UUID ) ); + + s_pUuidCreate( &uuid ); + + s_pUuidToString( &uuid, ( unsigned char ** ) &tszUuid ); + + if( tszUuid != NULL ) + { + HB_RETSTR( tszUuid ); + + s_pRpcStringFree( ( unsigned char ** ) &tszUuid ); + } + else + hb_retc_null(); + } + else +#endif + hb_retc_null(); +}