Commit 00231aa0 authored by Alois SCHLOEGL's avatar Alois SCHLOEGL
Browse files

fix compiler warnings, fix Include-directory of FP_Mc700Tg-project

parent 7b9e9e88
......@@ -662,7 +662,7 @@ void OnBroadcast( HWND hWnd )
ASSERT(hWnd != NULL, "Window handle in OnBroadcast is NULL " );
if ( gnDebugMsg > 1 ) { sprintf( sMsg, "\tOnBroadcast post.'Broadcast' msg\t%08X \t\t\t\t\t\t-> wnd proc handles rest..(wait for ID msg..) \r", hWnd); XOPNotice( sMsg ); }
if ( gnDebugMsg > 1 ) { sprintf( sMsg, "\tOnBroadcast post.'Broadcast' msg\t%08p \t\t\t\t\t\t-> wnd proc handles rest..(wait for ID msg..) \r", hWnd); XOPNotice( sMsg ); }
if( !PostMessage( HWND_BROADCAST, nGBroadcastMessage, (WPARAM) hWnd, (LPARAM)0 ) )
{
ASSERT(FALSE, "++Warning: Failed to broadcast to telegraph servers! ");
......
......@@ -64,7 +64,7 @@
<Optimization>MaxSpeed</Optimization>
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>..\..\XOPSupport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\..\XOP Toolkit 6\IgorXOPs6\XOPSupport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;FP_Mc700Tg_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AssemblerListingLocation>
</AssemblerListingLocation>
......@@ -157,6 +157,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\..\XOP Toolkit 6\IgorXOPs6\XOPSupport\XOPStandardHeaders.h" />
<ClInclude Include="..\FP_MC700Tg.h" />
<ClInclude Include="..\MCTelegraphs.h" />
<ClInclude Include="..\XopMain.h" />
......
......@@ -27,6 +27,9 @@
<ClInclude Include="..\XopUtils.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\XOP Toolkit 6\IgorXOPs6\XOPSupport\XOPStandardHeaders.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\FP_Mc700Tg.c">
......
......@@ -148,11 +148,11 @@ XOPMain( IORecHandle ioRecHandle )
// gTheWindow = GetParent(IgorClientHWND()); // gWindow is a reasonable value in Igor637 but NULL in Igor8 (will crash)
gTheWindow = GetAncestor(IgorClientHWND(), GA_PARENT);//GA_PARENT, GA_ROOT and GA_ROOTOWNER: handles gTheWindow and IgorClientHWND() are same
if (gTheWindow == NULL) {
sprintf(sMsg, "*** FATAL ERROR *** while loading FP_Mc700Tg.xop (Axon MC7700 will not work) \r\tParent window handle is NULL IgorClientHWND:%08X -> gTheWindow:>%08X \r", IgorClientHWND(), gTheWindow); XOPNotice(sMsg);
sprintf(sMsg, "*** FATAL ERROR *** while loading FP_Mc700Tg.xop (Axon MC7700 will not work) \r\tParent window handle is NULL IgorClientHWND:%08p -> gTheWindow:>%08p \r", IgorClientHWND(), gTheWindow); XOPNotice(sMsg);
return EXIT_FAILURE;
}
// Initialisation message may be confusing to the user so it can be removed
sprintf(sMsg, "Loaded FP_Mc700Tg.xop (210421)\tWITHOUT XOP WINDOW (#ifdef MCTG_IGORMAINFRM) IgorClientHWND:%08X > %08X \r", IgorClientHWND(), gTheWindow); XOPNotice(sMsg);
sprintf(sMsg, "Loaded FP_Mc700Tg.xop (210421)\tWITHOUT XOP WINDOW (#ifdef MCTG_IGORMAINFRM) IgorClientHWND:%08p > %08p \r", IgorClientHWND(), gTheWindow); XOPNotice(sMsg);
// This hook is for the 'Registered' messages (Open, Close, Request, Broadcast, Reconnect, Id) and for WM_TIMER
gRegisteredMsgHook = SetWindowsHookEx( WH_GETMESSAGE, &GetMsgFirstProc,NULL,GetCurrentThreadId());
......
......@@ -5,7 +5,7 @@
// XOP-specific resources that IGOR looks for in an XOP module.
// Defines XOP-specific symbols.
#include "..\..\..\..\XOP Toolkit 6\IgorXOPs6\XOPSupport\XOPResources.h""
#include "..\..\..\..\XOP Toolkit 6\IgorXOPs6\XOPSupport\XOPResources.h"
#include "..\..\..\..\XOP Toolkit 6\IgorXOPs6\XOPSupport\IgorXOP.h" // NT_I16
// Custom error messages
......
......@@ -404,12 +404,12 @@ int xCfsGetChanData( void *ptr) {
short Channel = (short)p->Channel;
WORD DataSection = (WORD)p->DataSection;
long FirstElement= (long)p->FirstElement;
long NumElements = (long)p->NumElements;
WORD NumElements = (WORD)p->NumElements;
long AreaSize = (long)p->AreaSize;
int ErrMode = (int)p->ErrMode;
char errBuf[300];
void *Raw;
int pts;
long pts;
// DebugPrintWaveProperties( "xCfsGetChanData", p->wDataADS ); // 050128
......@@ -585,7 +585,7 @@ int xCfsSetVarVal( void *ptr) {
}
if ( VarType == RL4 ) // 4 bytes real
{
CVarFloat = atof( *CVarAsString );
CVarFloat = (float)atof( *CVarAsString );
SetVarVal( hnd, VarNo, VarKind, DataSection, &CVarFloat );
}
if ( VarType == RL8 ) // 8 bytes real
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment