From: Christian Muck Date: Mon, 11 Apr 2011 21:06:42 +0000 (+0200) Subject: Removed winclientlib and wintestclient - unneeded files X-Git-Tag: v2.2.0~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0b265ad84e2b1dd245a8572f54c329aac877505b;p=profile%2Fivi%2Fdlt-daemon.git Removed winclientlib and wintestclient - unneeded files --- diff --git a/src/examples/wintestclient/ReadMe.txt b/src/examples/wintestclient/ReadMe.txt deleted file mode 100755 index 07566bd..0000000 --- a/src/examples/wintestclient/ReadMe.txt +++ /dev/null @@ -1,36 +0,0 @@ -======================================================================== - KONSOLENANWENDUNG: wintestclient-Projektübersicht -======================================================================== - -Diese wintestclient-Anwendung wurde vom Anwendungs-Assistenten -für Sie erstellt. - -Die Datei enthält eine Zusammenfassung des Inhalts der Dateien, -aus denen die wintestclient-Anwendung besteht. - - -wintestclient.vcproj - Dies ist die Hauptprojektdatei für VC++-Projekte, die mit dem Anwendungs- - Assistenten generiert werden. - Sie enthält Informationen zu der Version von Visual C++, mit der die Datei - generiert wurde, sowie Informationen zu Plattformen, Konfigurationen und - Projektfeatures, die mit dem dem Anwendungs-Assistenten generiert werden. - -wintestclient.cpp - Dies ist die Hauptquelldatei der Anwendung. - -///////////////////////////////////////////////////////////////////////////// -Andere Standarddateien: - -StdAfx.h, StdAfx.cpp - Mit diesen Dateien werden eine vorkompilierte Headerdatei (PCH) - mit dem Namen wintestclient.pch sowie eine vorkompilierte - Typendatei mit dem Namen StdAfx.obj erstellt. - -///////////////////////////////////////////////////////////////////////////// -Weitere Hinweise: - -Der Anwendungs-Assistent verwendet "TODO:"-Kommentare, um die Teile des -Quellcodes anzugeben, die hinzugefügt oder bearbeitet werden müssen. - -///////////////////////////////////////////////////////////////////////////// diff --git a/src/examples/wintestclient/stdafx.cpp b/src/examples/wintestclient/stdafx.cpp deleted file mode 100755 index 859a62f..0000000 --- a/src/examples/wintestclient/stdafx.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// stdafx.cpp : Quelldatei, die nur die Standard-Includes einbindet. -// wintestclient.pch ist der vorkompilierte Header. -// stdafx.obj enthält die vorkompilierten Typinformationen. - -#include "stdafx.h" - -// TODO: Auf zusätzliche Header verweisen, die in STDAFX.H -// und nicht in dieser Datei erforderlich sind. diff --git a/src/examples/wintestclient/stdafx.h b/src/examples/wintestclient/stdafx.h deleted file mode 100755 index c2580d9..0000000 --- a/src/examples/wintestclient/stdafx.h +++ /dev/null @@ -1,15 +0,0 @@ -// stdafx.h : Includedatei für Standardsystem-Includedateien -// oder häufig verwendete projektspezifische Includedateien, -// die nur in unregelmäßigen Abständen geändert werden. -// - -#pragma once - -#include "targetver.h" - -#include -#include - - - -// TODO: Hier auf zusätzliche Header, die das Programm erfordert, verweisen. diff --git a/src/examples/wintestclient/targetver.h b/src/examples/wintestclient/targetver.h deleted file mode 100755 index abf0fc6..0000000 --- a/src/examples/wintestclient/targetver.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// Die folgenden Makros definieren die mindestens erforderliche Plattform. Die mindestens erforderliche Plattform -// ist die früheste Windows-, Internet Explorer-Version usw., die über die erforderlichen Features zur Ausführung -// Ihrer Anwendung verfügt. Die Makros aktivieren alle Funktionen, die auf den Plattformversionen bis -// einschließlich der angegebenen Version verfügbar sind. - -// Ändern Sie folgende Definitionen für Plattformen, die älter als die unten angegebenen sind. -// Unter MSDN finden Sie die neuesten Informationen über die entsprechenden Werte für die unterschiedlichen Plattformen. -#ifndef _WIN32_WINNT // Gibt an, dass Windows Vista die mindestens erforderliche Plattform ist. -#define _WIN32_WINNT 0x0600 // Ändern Sie den entsprechenden Wert, um auf andere Versionen von Windows abzuzielen. -#endif - diff --git a/src/examples/wintestclient/wintestclient.cpp b/src/examples/wintestclient/wintestclient.cpp deleted file mode 100755 index 78225b2..0000000 --- a/src/examples/wintestclient/wintestclient.cpp +++ /dev/null @@ -1,65 +0,0 @@ -/******************************************************************************* -** ** -** SRC-MODULE: wintestclient.cpp ** -** ** -** TARGET : Windows ** -** ** -** PROJECT : DLT ** -** ** -** AUTHOR : Alexander Wenzel Alexander.AW.Wenzel@bmw.de ** -** Markus Klein ** -** ** -** PURPOSE : ** -** ** -** REMARKS : ** -** ** -** PLATFORM DEPENDANT [yes/no]: yes ** -** ** -** TO BE CHANGED BY USER [yes/no]: no ** -** ** -*******************************************************************************/ - -/******************************************************************************* -** Author Identity ** -******************************************************************************** -** ** -** Initials Name Company ** -** -------- ------------------------- ---------------------------------- ** -** aw Alexander Wenzel BMW ** -** mk Markus Klein Fraunhofer ESK ** -*******************************************************************************/ - -#include "stdafx.h" -#include "winclientlib.h" - -#include - -static int counter=0; - -int My_message_Callback(DltMessage *message, void *data) -{ - counter++; - - printf("Message received, %d\n", counter); - return 0; -} - -int _tmain(int argc, _TCHAR* argv[]) -{ - char text[] = "Hello from WinTestClient"; - - printf("WinTestClient\n"); - - Dlt_RegisterMessageCallback(My_message_Callback); - - Dlt_StartClient("192.168.56.101"); - - Dlt_InjectCall("LOG","TEST",0xFFF,(uint8_t*)text,strlen(text)+1); - - getchar(); - - Dlt_ExitClient(); - - return 0; -} - diff --git a/src/examples/wintestclient/wintestclient.sln b/src/examples/wintestclient/wintestclient.sln deleted file mode 100755 index a086994..0000000 --- a/src/examples/wintestclient/wintestclient.sln +++ /dev/null @@ -1,29 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual C++ Express 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wintestclient", "wintestclient.vcproj", "{C9C90C2B-DD7F-4EAD-B240-E35860756736}" - ProjectSection(ProjectDependencies) = postProject - {F3674DAE-F85A-428C-85FE-3529671DF6ED} = {F3674DAE-F85A-428C-85FE-3529671DF6ED} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winclientlib", "..\..\winclientlib\winclientlib.vcproj", "{F3674DAE-F85A-428C-85FE-3529671DF6ED}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C9C90C2B-DD7F-4EAD-B240-E35860756736}.Debug|Win32.ActiveCfg = Debug|Win32 - {C9C90C2B-DD7F-4EAD-B240-E35860756736}.Debug|Win32.Build.0 = Debug|Win32 - {C9C90C2B-DD7F-4EAD-B240-E35860756736}.Release|Win32.ActiveCfg = Release|Win32 - {C9C90C2B-DD7F-4EAD-B240-E35860756736}.Release|Win32.Build.0 = Release|Win32 - {F3674DAE-F85A-428C-85FE-3529671DF6ED}.Debug|Win32.ActiveCfg = Debug|Win32 - {F3674DAE-F85A-428C-85FE-3529671DF6ED}.Debug|Win32.Build.0 = Debug|Win32 - {F3674DAE-F85A-428C-85FE-3529671DF6ED}.Release|Win32.ActiveCfg = Release|Win32 - {F3674DAE-F85A-428C-85FE-3529671DF6ED}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/src/examples/wintestclient/wintestclient.vcproj b/src/examples/wintestclient/wintestclient.vcproj deleted file mode 100755 index c1f3f17..0000000 --- a/src/examples/wintestclient/wintestclient.vcproj +++ /dev/null @@ -1,213 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/winclientlib/stdafx.cpp b/src/winclientlib/stdafx.cpp deleted file mode 100755 index 62e53b6..0000000 --- a/src/winclientlib/stdafx.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// stdafx.cpp : source file that includes just the standard includes -// WwinClientLib.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#include "stdafx.h" - -// TODO: reference any additional headers you need in STDAFX.H -// and not in this file diff --git a/src/winclientlib/stdafx.h b/src/winclientlib/stdafx.h deleted file mode 100755 index a13982c..0000000 --- a/src/winclientlib/stdafx.h +++ /dev/null @@ -1,32 +0,0 @@ -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// - -#pragma once - -// Modify the following defines if you have to target a platform prior to the ones specified below. -// Refer to MSDN for the latest info on corresponding values for different platforms. -#ifndef WINVER // Allow use of features specific to Windows XP or later. -#define WINVER 0x0501 // Change this to the appropriate value to target other versions of Windows. -#endif - -#ifndef _WIN32_WINNT // Allow use of features specific to Windows XP or later. -#define _WIN32_WINNT 0x0501 // Change this to the appropriate value to target other versions of Windows. -#endif - -#ifndef _WIN32_WINDOWS // Allow use of features specific to Windows 98 or later. -#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later. -#endif - -#ifndef _WIN32_IE // Allow use of features specific to IE 6.0 or later. -#define _WIN32_IE 0x0600 // Change this to the appropriate value to target other versions of IE. -#endif - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers -// Windows Header Files: -#include - - - -// TODO: reference additional headers your program requires here diff --git a/src/winclientlib/winclientlib.cpp b/src/winclientlib/winclientlib.cpp deleted file mode 100755 index 7d67f14..0000000 --- a/src/winclientlib/winclientlib.cpp +++ /dev/null @@ -1,276 +0,0 @@ -/******************************************************************************* -** ** -** SRC-MODULE: winclientLib.cpp ** -** ** -** TARGET : Windows ** -** ** -** PROJECT : DLT ** -** ** -** AUTHOR : Alexander Wenzel Alexander.AW.Wenzel@bmw.de ** -** Markus Klein ** -** ** -** PURPOSE : ** -** ** -** REMARKS : ** -** ** -** PLATFORM DEPENDANT [yes/no]: yes ** -** ** -** TO BE CHANGED BY USER [yes/no]: no ** -** ** -*******************************************************************************/ - -/******************************************************************************* -** Author Identity ** -******************************************************************************** -** ** -** Initials Name Company ** -** -------- ------------------------- ---------------------------------- ** -** aw Alexander Wenzel BMW ** -** mk Markus Klein Fraunhofer ESK ** -*******************************************************************************/ - -/******************************************************************************* -** Revision Control History ** -*******************************************************************************/ - -/* - * $LastChangedRevision$ - * $LastChangedDate$ - * $LastChangedBy$ - */ - -// Need to link with Ws2_32.lib, Mswsock.lib, and Advapi32.lib - -// Disable C4995 and C4996 Warnings -#pragma warning(disable : 4995) -#pragma warning(disable : 4996) - -#include "stdafx.h" - -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "winclientlib.h" -#include "dlt_client.h" - -// Function prototypes -DWORD WINAPI MyThreadFunction( LPVOID lpParam ); -void ErrorHandler(LPTSTR lpszFunction); - -// Variables -static DWORD dwThreadId; -static HANDLE hThread; -static HANDLE hEvent; - -static DltClient windltclient; - -#ifdef _MANAGED -#pragma managed(push, off) -#endif - -BOOL APIENTRY DllMain( HMODULE hModule, - DWORD ul_reason_for_call, - LPVOID lpReserved - ) -{ - switch (ul_reason_for_call) - { - case DLL_PROCESS_ATTACH: - case DLL_THREAD_ATTACH: - case DLL_THREAD_DETACH: - case DLL_PROCESS_DETACH: - { - break; - } - } - return TRUE; -} - -#ifdef _MANAGED -#pragma managed(pop) -#endif - -using namespace std; - -/* -Some helper functions -*/ - -DWORD WINAPI MyThreadFunction( LPVOID lpParam ) -{ - // Enter Main Loop - dlt_client_main_loop(&windltclient, NULL, 0); - - // Send event about thread termination - SetEvent(hEvent); - - ExitThread(0); -} - -void ErrorHandler(LPTSTR lpszFunction) -{ - // Retrieve the system error message for the last-error code. - LPVOID lpMsgBuf; - LPVOID lpDisplayBuf; - - DWORD dw = GetLastError(); - - FormatMessage( - FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, - dw, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR) &lpMsgBuf, - 0, NULL ); - - // Display the error message. - lpDisplayBuf = (LPVOID)LocalAlloc(LMEM_ZEROINIT, - (lstrlen((LPCTSTR) lpMsgBuf) + lstrlen((LPCTSTR) lpszFunction) + 40) * sizeof(TCHAR)); - StringCchPrintf((LPTSTR)lpDisplayBuf, - LocalSize(lpDisplayBuf) / sizeof(TCHAR), - TEXT("%s failed with error %d: %s"), - lpszFunction, dw, lpMsgBuf); - - MessageBox(NULL, (LPCTSTR) lpDisplayBuf, TEXT("Error"), MB_OK); - - // Free error-handling buffer allocations. - LocalFree(lpMsgBuf); - LocalFree(lpDisplayBuf); -} - -/*** -The interface functions -****/ - -WWINCLIENTLIB_API void Dlt_RegisterMessageCallback(int (*registerd_callback) (DltMessage *message, void *data)) -{ - dlt_client_register_message_callback(registerd_callback); -} - -WWINCLIENTLIB_API int Dlt_StartClient(char* server_address) -{ - WSADATA wsaData; - int iResult; - - if ((server_address==0) || (server_address[0]=='\0')) - { - return 0; - } - - // Create event, used for thread termination - hEvent = CreateEvent(NULL,FALSE,FALSE,(LPCWSTR)"Test"); - - // Initialize Winsock - iResult = WSAStartup(MAKEWORD(2,2), &wsaData); - if (iResult) - { - printf("winclientlib: WSAStartup failed: %d\n", iResult); - return -1; - } - - /* Initialize DLT Client */ - if (dlt_client_init(&windltclient, 0)==-1) - { - ErrorHandler(TEXT("dlt_client_init()")); - - Dlt_ExitClient(); - - return -1; - } - - /* Setup parameters of DltClient */ - windltclient.sock = -1; - windltclient.serial_mode = 0; /* TCP connection: - In Windows (with Visual C++), - only TCP connection is allowed! */ - windltclient.servIP = server_address; /* IP address */ - - - /* Connect to TCP socket */ - if (dlt_client_connect(&windltclient, 0)==-1) - { - ErrorHandler(TEXT("dlt_client_connect()")); - - Dlt_ExitClient(); - - return -1; - } - - // Create the thread to begin execution on its own. - hThread = CreateThread( - NULL, // default security attributes - 0, // use default stack size - MyThreadFunction, // thread function name - 0,//(LPVOID)address, // argument to thread function - 0, // use default creation flags - &dwThreadId); // returns the thread identifier - - // Check the return value for success. - // If CreateThread fails, terminate execution. - // This will automatically clean up threads and memory. - if (hThread==0) - { - ErrorHandler(TEXT("CreateThread()")); - - // Cleanup WSA - WSACleanup(); - - return -1; - } - - return 0; -} - -WWINCLIENTLIB_API int Dlt_InjectCall( char appID[4], char contID[4], uint32_t serviceID, uint8_t *buf, uint32_t buf_len ) -{ - return dlt_client_send_inject_msg(&windltclient, appID, contID, serviceID, buf, buf_len); -} - -WWINCLIENTLIB_API int Dlt_ExitClient() -{ - printf("winclientlib: exiting ...\n"); - - // Terminate thread and close handles - if (windltclient.sock!=-1) - { - if (windltclient.serial_mode==1) - { - close(windltclient.sock); - } - else - { - closesocket(windltclient.sock); - } - windltclient.sock = -1; - - WaitForSingleObject(hEvent,INFINITE); - } - - CloseHandle(hEvent); - CloseHandle(hThread); - - // Dlt Client Cleanup - if (dlt_client_cleanup(&windltclient,0)==-1) - { - printf("winclientlib: closing error.\n"); - } - else - { - printf("winclientlib: closed.\n"); - } - - // Cleanup WSA - WSACleanup(); - - exit(0); -} diff --git a/src/winclientlib/winclientlib.h b/src/winclientlib/winclientlib.h deleted file mode 100755 index 15c69fb..0000000 --- a/src/winclientlib/winclientlib.h +++ /dev/null @@ -1,59 +0,0 @@ -/******************************************************************************* -** ** -** SRC-MODULE: winClientLib.h ** -** ** -** TARGET : Windows ** -** ** -** PROJECT : DLT ** -** ** -** AUTHOR : Alexander Wenzel Alexander.AW.Wenzel@bmw.de ** -** Markus Klein ** -** ** -** PURPOSE : ** -** ** -** REMARKS : ** -** ** -** PLATFORM DEPENDANT [yes/no]: yes ** -** ** -** TO BE CHANGED BY USER [yes/no]: no ** -** ** -*******************************************************************************/ - -/******************************************************************************* -** Author Identity ** -******************************************************************************** -** ** -** Initials Name Company ** -** -------- ------------------------- ---------------------------------- ** -** aw Alexander Wenzel BMW ** -** mk Markus Klein Fraunhofer ESK ** -*******************************************************************************/ - -/******************************************************************************* -** Revision Control History ** -*******************************************************************************/ - -/* - * $LastChangedRevision$ - * $LastChangedDate$ - * $LastChangedBy$ - */ - -#include "dlt_common.h" // for DltMessage - -// The following ifdef block is the standard way of creating macros which make exporting -// from a DLL simpler. All files within this DLL are compiled with the WWINCLIENTLIB_EXPORTS -// symbol defined on the command line. this symbol should not be defined on any project -// that uses this DLL. This way any other project whose source files include this file see -// WWINCLIENTLIB_API functions as being imported from a DLL, whereas this DLL sees symbols -// defined with this macro as being exported. -#ifdef WINCLIENTLIB_EXPORTS -#define WWINCLIENTLIB_API __declspec(dllexport) -#else -#define WWINCLIENTLIB_API __declspec(dllimport) -#endif - -WWINCLIENTLIB_API int Dlt_StartClient(char* server_address); -WWINCLIENTLIB_API int Dlt_ExitClient(); -WWINCLIENTLIB_API int Dlt_InjectCall( char appID[4], char contID[4], uint32_t serviceID, uint8_t *buf, uint32_t buf_len ); -WWINCLIENTLIB_API void Dlt_RegisterMessageCallback(int (*registerd_callback) (DltMessage *message, void *data)); diff --git a/src/winclientlib/winclientlib.sln b/src/winclientlib/winclientlib.sln deleted file mode 100755 index c5343d9..0000000 --- a/src/winclientlib/winclientlib.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual C++ Express 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winclientlib", "winclientlib.vcproj", "{F3674DAE-F85A-428C-85FE-3529671DF6ED}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F3674DAE-F85A-428C-85FE-3529671DF6ED}.Debug|Win32.ActiveCfg = Debug|Win32 - {F3674DAE-F85A-428C-85FE-3529671DF6ED}.Debug|Win32.Build.0 = Debug|Win32 - {F3674DAE-F85A-428C-85FE-3529671DF6ED}.Release|Win32.ActiveCfg = Release|Win32 - {F3674DAE-F85A-428C-85FE-3529671DF6ED}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/src/winclientlib/winclientlib.vcproj b/src/winclientlib/winclientlib.vcproj deleted file mode 100755 index 6729bb2..0000000 --- a/src/winclientlib/winclientlib.vcproj +++ /dev/null @@ -1,260 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -