From f68ca213a829064bc3a5866f64cddc822e71b5c8 Mon Sep 17 00:00:00 2001 From: Chris Glavan Date: Tue, 20 Jun 2023 11:50:35 -0400 Subject: [PATCH] Updated references for development environment --- PROMS/DSOFramer/Source2005/Lib/dsoframerlib.c | 15 +- PROMS/DSOFramer/Source2005/Lib/dsoframerlib.h | 956 +++--------------- PROMS/DSOFramer/Source2005/dsoframer.vcxproj | 5 +- PROMS/LBWordLibrary/LBWordLibrary.csproj | 2 +- PROMS/RoAccessToSql/RoAccessToSql.csproj | 2 +- .../Properties/AssemblyInfo.cs | 6 +- .../VEPROMS User Interface/VEPROMS_UI.csproj | 12 +- .../VEPROMS.CSLA.Library.csproj | 4 +- PROMS/VEPROMS/VEPROMS.sln | 65 +- PROMS/VG/VG.csproj | 2 +- .../Volian.Base.Library.csproj | 4 +- .../Volian.Controls.Library.csproj | 4 +- .../Volian.Print.Library.csproj | 12 +- .../Volian.Svg.Library.csproj | 8 +- .../Volian.Utils.Library.csproj | 2 +- .../W2PGrid.csproj.AssemblyReference.cache | Bin 6178 -> 7842 bytes PROMS/XYPlots/XYPlots.csproj | 2 +- 17 files changed, 209 insertions(+), 892 deletions(-) diff --git a/PROMS/DSOFramer/Source2005/Lib/dsoframerlib.c b/PROMS/DSOFramer/Source2005/Lib/dsoframerlib.c index 396729e9..20e9c1e1 100644 --- a/PROMS/DSOFramer/Source2005/Lib/dsoframerlib.c +++ b/PROMS/DSOFramer/Source2005/Lib/dsoframerlib.c @@ -5,20 +5,19 @@ /* link this file in with the server and any clients */ - /* File created by MIDL compiler version 6.00.0366 */ -/* at Tue Jul 02 06:50:17 2013 + /* File created by MIDL compiler version 8.01.0622 */ +/* at Mon Jan 18 22:14:07 2038 */ -/* Compiler settings for .\Lib\dsoframer.idl: - Oicf, W1, Zp8, env=Win32 (32b run) +/* Compiler settings for Lib\dsoframer.idl: + Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.01.0622 protocol : dce , ms_ext, c_ext, robust error checks: allocation ref bounds_check enum stub_data VC __declspec() decoration level: __declspec(uuid()), __declspec(selectany), __declspec(novtable) DECLSPEC_UUID(), MIDL_INTERFACE() */ -//@@MIDL_FILE_HEADING( ) +/* @@MIDL_FILE_HEADING( ) */ -#pragma warning( disable: 4049 ) /* more than 64k source lines */ #ifdef __cplusplus @@ -63,9 +62,9 @@ typedef IID CLSID; #endif // CLSID_DEFINED #define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \ - const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}} + EXTERN_C __declspec(selectany) const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}} -#endif !_MIDL_USE_GUIDDEF_ +#endif // !_MIDL_USE_GUIDDEF_ MIDL_DEFINE_GUID(IID, LIBID_DSOFramer,0x00460180,0x9E5E,0x11d5,0xB7,0xC8,0xB8,0x26,0x90,0x41,0xDD,0x57); diff --git a/PROMS/DSOFramer/Source2005/Lib/dsoframerlib.h b/PROMS/DSOFramer/Source2005/Lib/dsoframerlib.h index d76a6110..e7ba4ea1 100644 --- a/PROMS/DSOFramer/Source2005/Lib/dsoframerlib.h +++ b/PROMS/DSOFramer/Source2005/Lib/dsoframerlib.h @@ -3,25 +3,24 @@ /* this ALWAYS GENERATED file contains the definitions for the interfaces */ - /* File created by MIDL compiler version 6.00.0366 */ -/* at Tue Jul 02 06:50:17 2013 + /* File created by MIDL compiler version 8.01.0622 */ +/* at Mon Jan 18 22:14:07 2038 */ -/* Compiler settings for .\Lib\dsoframer.idl: - Oicf, W1, Zp8, env=Win32 (32b run) +/* Compiler settings for Lib\dsoframer.idl: + Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.01.0622 protocol : dce , ms_ext, c_ext, robust error checks: allocation ref bounds_check enum stub_data VC __declspec() decoration level: __declspec(uuid()), __declspec(selectany), __declspec(novtable) DECLSPEC_UUID(), MIDL_INTERFACE() */ -//@@MIDL_FILE_HEADING( ) +/* @@MIDL_FILE_HEADING( ) */ -#pragma warning( disable: 4049 ) /* more than 64k source lines */ /* verify that the version is high enough to compile this file*/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ -#define __REQUIRED_RPCNDR_H_VERSION__ 475 +#define __REQUIRED_RPCNDR_H_VERSION__ 500 #endif #include "rpc.h" @@ -29,7 +28,7 @@ #ifndef __RPCNDR_H_VERSION__ #error this stub requires an updated version of -#endif // __RPCNDR_H_VERSION__ +#endif /* __RPCNDR_H_VERSION__ */ #ifndef __dsoframerlib_h__ @@ -44,12 +43,14 @@ #ifndef ___FramerControl_FWD_DEFINED__ #define ___FramerControl_FWD_DEFINED__ typedef interface _FramerControl _FramerControl; + #endif /* ___FramerControl_FWD_DEFINED__ */ #ifndef ___DFramerCtlEvents_FWD_DEFINED__ #define ___DFramerCtlEvents_FWD_DEFINED__ typedef interface _DFramerCtlEvents _DFramerCtlEvents; + #endif /* ___DFramerCtlEvents_FWD_DEFINED__ */ @@ -69,8 +70,16 @@ typedef struct FramerControl FramerControl; extern "C"{ #endif -void * __RPC_USER MIDL_user_allocate(size_t); -void __RPC_USER MIDL_user_free( void * ); + +/* interface __MIDL_itf_dsoframer_0000_0000 */ +/* [local] */ + +#pragma external_header(push) +#pragma external_header(pop) + + +extern RPC_IF_HANDLE __MIDL_itf_dsoframer_0000_0000_v0_0_c_ifspec; +extern RPC_IF_HANDLE __MIDL_itf_dsoframer_0000_0000_v0_0_s_ifspec; #ifndef __DSOFramer_LIBRARY_DEFINED__ @@ -81,54 +90,59 @@ void __RPC_USER MIDL_user_free( void * ); typedef enum dsoBorderStyle - { dsoBorderNone = 0, - dsoBorderFlat = dsoBorderNone + 1, - dsoBorder3D = dsoBorderFlat + 1, - dsoBorder3DThin = dsoBorder3D + 1 + { + dsoBorderNone = 0, + dsoBorderFlat = ( dsoBorderNone + 1 ) , + dsoBorder3D = ( dsoBorderFlat + 1 ) , + dsoBorder3DThin = ( dsoBorder3D + 1 ) } dsoBorderStyle; typedef enum dsoShowDialogType - { dsoDialogNew = 0, - dsoDialogOpen = dsoDialogNew + 1, - dsoDialogSave = dsoDialogOpen + 1, - dsoDialogSaveCopy = dsoDialogSave + 1, - dsoDialogPrint = dsoDialogSaveCopy + 1, - dsoDialogPageSetup = dsoDialogPrint + 1, - dsoDialogProperties = dsoDialogPageSetup + 1 + { + dsoDialogNew = 0, + dsoDialogOpen = ( dsoDialogNew + 1 ) , + dsoDialogSave = ( dsoDialogOpen + 1 ) , + dsoDialogSaveCopy = ( dsoDialogSave + 1 ) , + dsoDialogPrint = ( dsoDialogSaveCopy + 1 ) , + dsoDialogPageSetup = ( dsoDialogPrint + 1 ) , + dsoDialogProperties = ( dsoDialogPageSetup + 1 ) } dsoShowDialogType; typedef enum dsoFileCommandType - { dsoFileNew = 0, - dsoFileOpen = dsoFileNew + 1, - dsoFileClose = dsoFileOpen + 1, - dsoFileSave = dsoFileClose + 1, - dsoFileSaveAs = dsoFileSave + 1, - dsoFilePrint = dsoFileSaveAs + 1, - dsoFilePageSetup = dsoFilePrint + 1, - dsoFileProperties = dsoFilePageSetup + 1, - dsoFilePrintPreview = dsoFileProperties + 1 + { + dsoFileNew = 0, + dsoFileOpen = ( dsoFileNew + 1 ) , + dsoFileClose = ( dsoFileOpen + 1 ) , + dsoFileSave = ( dsoFileClose + 1 ) , + dsoFileSaveAs = ( dsoFileSave + 1 ) , + dsoFilePrint = ( dsoFileSaveAs + 1 ) , + dsoFilePageSetup = ( dsoFilePrint + 1 ) , + dsoFileProperties = ( dsoFilePageSetup + 1 ) , + dsoFilePrintPreview = ( dsoFileProperties + 1 ) } dsoFileCommandType; typedef enum dsoFrameHookPolicy - { dsoNormalBehavior = 0, - dsoSetOnFirstOpen = dsoNormalBehavior + 1, - dsoResetNow = dsoSetOnFirstOpen + 1, - dsoDisableHook = 0xffffffff + { + dsoNormalBehavior = 0, + dsoSetOnFirstOpen = ( dsoNormalBehavior + 1 ) , + dsoResetNow = ( dsoSetOnFirstOpen + 1 ) , + dsoDisableHook = 0xffffffff } dsoFrameHookPolicy; typedef enum dsoActivationPolicy - { dsoDefaultBehavior = 0, - dsoKeepUIActiveOnAppDeactive = 0x1, - dsoCompDeactivateOnLostFocus = 0x2, - dsoIPDeactivateOnCompDeactive = 0x4 + { + dsoDefaultBehavior = 0, + dsoKeepUIActiveOnAppDeactive = 0x1, + dsoCompDeactivateOnLostFocus = 0x2, + dsoIPDeactivateOnCompDeactive = 0x4 } dsoActivationPolicy; -DEFINE_GUID(LIBID_DSOFramer,0x00460180,0x9E5E,0x11d5,0xB7,0xC8,0xB8,0x26,0x90,0x41,0xDD,0x57); +EXTERN_C const IID LIBID_DSOFramer; #ifndef ___FramerControl_INTERFACE_DEFINED__ #define ___FramerControl_INTERFACE_DEFINED__ @@ -137,7 +151,7 @@ DEFINE_GUID(LIBID_DSOFramer,0x00460180,0x9E5E,0x11d5,0xB7,0xC8,0xB8,0x26,0x90,0x /* [object][oleautomation][dual][version][hidden][uuid] */ -DEFINE_GUID(IID__FramerControl,0x00460181,0x9E5E,0x11d5,0xB7,0xC8,0xB8,0x26,0x90,0x41,0xDD,0x57); +EXTERN_C const IID IID__FramerControl; #if defined(__cplusplus) && !defined(CINTERFACE) @@ -324,6 +338,7 @@ DEFINE_GUID(IID__FramerControl,0x00460181,0x9E5E,0x11d5,0xB7,0xC8,0xB8,0x26,0x90 }; + #else /* C style interface */ typedef struct _FramerControlVtbl @@ -333,7 +348,8 @@ DEFINE_GUID(IID__FramerControl,0x00460181,0x9E5E,0x11d5,0xB7,0xC8,0xB8,0x26,0x90 HRESULT ( STDMETHODCALLTYPE *QueryInterface )( _FramerControl * This, /* [in] */ REFIID riid, - /* [iid_is][out] */ void **ppvObject); + /* [annotation][iid_is][out] */ + _COM_Outptr_ void **ppvObject); ULONG ( STDMETHODCALLTYPE *AddRef )( _FramerControl * This); @@ -355,20 +371,28 @@ DEFINE_GUID(IID__FramerControl,0x00460181,0x9E5E,0x11d5,0xB7,0xC8,0xB8,0x26,0x90 _FramerControl * This, /* [in] */ REFIID riid, /* [size_is][in] */ LPOLESTR *rgszNames, - /* [in] */ UINT cNames, + /* [range][in] */ UINT cNames, /* [in] */ LCID lcid, /* [size_is][out] */ DISPID *rgDispId); /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( _FramerControl * This, - /* [in] */ DISPID dispIdMember, - /* [in] */ REFIID riid, - /* [in] */ LCID lcid, - /* [in] */ WORD wFlags, - /* [out][in] */ DISPPARAMS *pDispParams, - /* [out] */ VARIANT *pVarResult, - /* [out] */ EXCEPINFO *pExcepInfo, - /* [out] */ UINT *puArgErr); + /* [annotation][in] */ + _In_ DISPID dispIdMember, + /* [annotation][in] */ + _In_ REFIID riid, + /* [annotation][in] */ + _In_ LCID lcid, + /* [annotation][in] */ + _In_ WORD wFlags, + /* [annotation][out][in] */ + _In_ DISPPARAMS *pDispParams, + /* [annotation][out] */ + _Out_opt_ VARIANT *pVarResult, + /* [annotation][out] */ + _Out_opt_ EXCEPINFO *pExcepInfo, + /* [annotation][out] */ + _Out_opt_ UINT *puArgErr); /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *Activate )( _FramerControl * This); @@ -615,189 +639,189 @@ DEFINE_GUID(IID__FramerControl,0x00460181,0x9E5E,0x11d5,0xB7,0xC8,0xB8,0x26,0x90 #define _FramerControl_QueryInterface(This,riid,ppvObject) \ - (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define _FramerControl_AddRef(This) \ - (This)->lpVtbl -> AddRef(This) + ( (This)->lpVtbl -> AddRef(This) ) #define _FramerControl_Release(This) \ - (This)->lpVtbl -> Release(This) + ( (This)->lpVtbl -> Release(This) ) #define _FramerControl_GetTypeInfoCount(This,pctinfo) \ - (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo) + ( (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo) ) #define _FramerControl_GetTypeInfo(This,iTInfo,lcid,ppTInfo) \ - (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo) + ( (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo) ) #define _FramerControl_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) \ - (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) + ( (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) ) #define _FramerControl_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) \ - (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) + ( (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) ) #define _FramerControl_Activate(This) \ - (This)->lpVtbl -> Activate(This) + ( (This)->lpVtbl -> Activate(This) ) #define _FramerControl_get_ActiveDocument(This,ppdisp) \ - (This)->lpVtbl -> get_ActiveDocument(This,ppdisp) + ( (This)->lpVtbl -> get_ActiveDocument(This,ppdisp) ) #define _FramerControl_CreateNew(This,ProgIdOrTemplate) \ - (This)->lpVtbl -> CreateNew(This,ProgIdOrTemplate) + ( (This)->lpVtbl -> CreateNew(This,ProgIdOrTemplate) ) #define _FramerControl_Open(This,Document,ReadOnly,ProgId,WebUsername,WebPassword) \ - (This)->lpVtbl -> Open(This,Document,ReadOnly,ProgId,WebUsername,WebPassword) + ( (This)->lpVtbl -> Open(This,Document,ReadOnly,ProgId,WebUsername,WebPassword) ) #define _FramerControl_Save(This,SaveAsDocument,OverwriteExisting,WebUsername,WebPassword) \ - (This)->lpVtbl -> Save(This,SaveAsDocument,OverwriteExisting,WebUsername,WebPassword) + ( (This)->lpVtbl -> Save(This,SaveAsDocument,OverwriteExisting,WebUsername,WebPassword) ) #define _FramerControl__PrintOutOld(This,PromptToSelectPrinter) \ - (This)->lpVtbl -> _PrintOutOld(This,PromptToSelectPrinter) + ( (This)->lpVtbl -> _PrintOutOld(This,PromptToSelectPrinter) ) #define _FramerControl_Close(This) \ - (This)->lpVtbl -> Close(This) + ( (This)->lpVtbl -> Close(This) ) #define _FramerControl_put_Caption(This,bstr) \ - (This)->lpVtbl -> put_Caption(This,bstr) + ( (This)->lpVtbl -> put_Caption(This,bstr) ) #define _FramerControl_get_Caption(This,pbstr) \ - (This)->lpVtbl -> get_Caption(This,pbstr) + ( (This)->lpVtbl -> get_Caption(This,pbstr) ) #define _FramerControl_put_Titlebar(This,vbool) \ - (This)->lpVtbl -> put_Titlebar(This,vbool) + ( (This)->lpVtbl -> put_Titlebar(This,vbool) ) #define _FramerControl_get_Titlebar(This,pbool) \ - (This)->lpVtbl -> get_Titlebar(This,pbool) + ( (This)->lpVtbl -> get_Titlebar(This,pbool) ) #define _FramerControl_put_Toolbars(This,vbool) \ - (This)->lpVtbl -> put_Toolbars(This,vbool) + ( (This)->lpVtbl -> put_Toolbars(This,vbool) ) #define _FramerControl_get_Toolbars(This,pbool) \ - (This)->lpVtbl -> get_Toolbars(This,pbool) + ( (This)->lpVtbl -> get_Toolbars(This,pbool) ) #define _FramerControl_put_ModalState(This,vbool) \ - (This)->lpVtbl -> put_ModalState(This,vbool) + ( (This)->lpVtbl -> put_ModalState(This,vbool) ) #define _FramerControl_get_ModalState(This,pbool) \ - (This)->lpVtbl -> get_ModalState(This,pbool) + ( (This)->lpVtbl -> get_ModalState(This,pbool) ) #define _FramerControl_ShowDialog(This,DlgType) \ - (This)->lpVtbl -> ShowDialog(This,DlgType) + ( (This)->lpVtbl -> ShowDialog(This,DlgType) ) #define _FramerControl_put_EnableFileCommand(This,Item,vbool) \ - (This)->lpVtbl -> put_EnableFileCommand(This,Item,vbool) + ( (This)->lpVtbl -> put_EnableFileCommand(This,Item,vbool) ) #define _FramerControl_get_EnableFileCommand(This,Item,pbool) \ - (This)->lpVtbl -> get_EnableFileCommand(This,Item,pbool) + ( (This)->lpVtbl -> get_EnableFileCommand(This,Item,pbool) ) #define _FramerControl_put_BorderStyle(This,style) \ - (This)->lpVtbl -> put_BorderStyle(This,style) + ( (This)->lpVtbl -> put_BorderStyle(This,style) ) #define _FramerControl_get_BorderStyle(This,pstyle) \ - (This)->lpVtbl -> get_BorderStyle(This,pstyle) + ( (This)->lpVtbl -> get_BorderStyle(This,pstyle) ) #define _FramerControl_put_BorderColor(This,clr) \ - (This)->lpVtbl -> put_BorderColor(This,clr) + ( (This)->lpVtbl -> put_BorderColor(This,clr) ) #define _FramerControl_get_BorderColor(This,pclr) \ - (This)->lpVtbl -> get_BorderColor(This,pclr) + ( (This)->lpVtbl -> get_BorderColor(This,pclr) ) #define _FramerControl_put_BackColor(This,clr) \ - (This)->lpVtbl -> put_BackColor(This,clr) + ( (This)->lpVtbl -> put_BackColor(This,clr) ) #define _FramerControl_get_BackColor(This,pclr) \ - (This)->lpVtbl -> get_BackColor(This,pclr) + ( (This)->lpVtbl -> get_BackColor(This,pclr) ) #define _FramerControl_put_ForeColor(This,clr) \ - (This)->lpVtbl -> put_ForeColor(This,clr) + ( (This)->lpVtbl -> put_ForeColor(This,clr) ) #define _FramerControl_get_ForeColor(This,pclr) \ - (This)->lpVtbl -> get_ForeColor(This,pclr) + ( (This)->lpVtbl -> get_ForeColor(This,pclr) ) #define _FramerControl_put_TitlebarColor(This,clr) \ - (This)->lpVtbl -> put_TitlebarColor(This,clr) + ( (This)->lpVtbl -> put_TitlebarColor(This,clr) ) #define _FramerControl_get_TitlebarColor(This,pclr) \ - (This)->lpVtbl -> get_TitlebarColor(This,pclr) + ( (This)->lpVtbl -> get_TitlebarColor(This,pclr) ) #define _FramerControl_put_TitlebarTextColor(This,clr) \ - (This)->lpVtbl -> put_TitlebarTextColor(This,clr) + ( (This)->lpVtbl -> put_TitlebarTextColor(This,clr) ) #define _FramerControl_get_TitlebarTextColor(This,pclr) \ - (This)->lpVtbl -> get_TitlebarTextColor(This,pclr) + ( (This)->lpVtbl -> get_TitlebarTextColor(This,pclr) ) #define _FramerControl_ExecOleCommand(This,OLECMDID,Options,vInParam,vInOutParam) \ - (This)->lpVtbl -> ExecOleCommand(This,OLECMDID,Options,vInParam,vInOutParam) + ( (This)->lpVtbl -> ExecOleCommand(This,OLECMDID,Options,vInParam,vInOutParam) ) #define _FramerControl_put_Menubar(This,vbool) \ - (This)->lpVtbl -> put_Menubar(This,vbool) + ( (This)->lpVtbl -> put_Menubar(This,vbool) ) #define _FramerControl_get_Menubar(This,pbool) \ - (This)->lpVtbl -> get_Menubar(This,pbool) + ( (This)->lpVtbl -> get_Menubar(This,pbool) ) #define _FramerControl_put_HostName(This,bstr) \ - (This)->lpVtbl -> put_HostName(This,bstr) + ( (This)->lpVtbl -> put_HostName(This,bstr) ) #define _FramerControl_get_HostName(This,pbstr) \ - (This)->lpVtbl -> get_HostName(This,pbstr) + ( (This)->lpVtbl -> get_HostName(This,pbstr) ) #define _FramerControl_get_DocumentFullName(This,pbstr) \ - (This)->lpVtbl -> get_DocumentFullName(This,pbstr) + ( (This)->lpVtbl -> get_DocumentFullName(This,pbstr) ) #define _FramerControl_PrintOut(This,PromptUser,PrinterName,Copies,FromPage,ToPage,OutputFile) \ - (This)->lpVtbl -> PrintOut(This,PromptUser,PrinterName,Copies,FromPage,ToPage,OutputFile) + ( (This)->lpVtbl -> PrintOut(This,PromptUser,PrinterName,Copies,FromPage,ToPage,OutputFile) ) #define _FramerControl_PrintPreview(This) \ - (This)->lpVtbl -> PrintPreview(This) + ( (This)->lpVtbl -> PrintPreview(This) ) #define _FramerControl_PrintPreviewExit(This) \ - (This)->lpVtbl -> PrintPreviewExit(This) + ( (This)->lpVtbl -> PrintPreviewExit(This) ) #define _FramerControl_get_IsReadOnly(This,pbool) \ - (This)->lpVtbl -> get_IsReadOnly(This,pbool) + ( (This)->lpVtbl -> get_IsReadOnly(This,pbool) ) #define _FramerControl_get_IsDirty(This,pbool) \ - (This)->lpVtbl -> get_IsDirty(This,pbool) + ( (This)->lpVtbl -> get_IsDirty(This,pbool) ) #define _FramerControl_put_LockServer(This,vbool) \ - (This)->lpVtbl -> put_LockServer(This,vbool) + ( (This)->lpVtbl -> put_LockServer(This,vbool) ) #define _FramerControl_get_LockServer(This,pvbool) \ - (This)->lpVtbl -> get_LockServer(This,pvbool) + ( (This)->lpVtbl -> get_LockServer(This,pvbool) ) #define _FramerControl_GetDataObjectContent(This,ClipFormatNameOrNumber,pvResults) \ - (This)->lpVtbl -> GetDataObjectContent(This,ClipFormatNameOrNumber,pvResults) + ( (This)->lpVtbl -> GetDataObjectContent(This,ClipFormatNameOrNumber,pvResults) ) #define _FramerControl_SetDataObjectContent(This,ClipFormatNameOrNumber,DataByteArray) \ - (This)->lpVtbl -> SetDataObjectContent(This,ClipFormatNameOrNumber,DataByteArray) + ( (This)->lpVtbl -> SetDataObjectContent(This,ClipFormatNameOrNumber,DataByteArray) ) #define _FramerControl_put_ActivationPolicy(This,lPolicy) \ - (This)->lpVtbl -> put_ActivationPolicy(This,lPolicy) + ( (This)->lpVtbl -> put_ActivationPolicy(This,lPolicy) ) #define _FramerControl_get_ActivationPolicy(This,plPolicy) \ - (This)->lpVtbl -> get_ActivationPolicy(This,plPolicy) + ( (This)->lpVtbl -> get_ActivationPolicy(This,plPolicy) ) #define _FramerControl_put_FrameHookPolicy(This,lPolicy) \ - (This)->lpVtbl -> put_FrameHookPolicy(This,lPolicy) + ( (This)->lpVtbl -> put_FrameHookPolicy(This,lPolicy) ) #define _FramerControl_get_FrameHookPolicy(This,plPolicy) \ - (This)->lpVtbl -> get_FrameHookPolicy(This,plPolicy) + ( (This)->lpVtbl -> get_FrameHookPolicy(This,plPolicy) ) #define _FramerControl_put_MenuAccelerators(This,vbool) \ - (This)->lpVtbl -> put_MenuAccelerators(This,vbool) + ( (This)->lpVtbl -> put_MenuAccelerators(This,vbool) ) #define _FramerControl_get_MenuAccelerators(This,pvbool) \ - (This)->lpVtbl -> get_MenuAccelerators(This,pvbool) + ( (This)->lpVtbl -> get_MenuAccelerators(This,pvbool) ) #define _FramerControl_put_EventsEnabled(This,vbool) \ - (This)->lpVtbl -> put_EventsEnabled(This,vbool) + ( (This)->lpVtbl -> put_EventsEnabled(This,vbool) ) #define _FramerControl_get_EventsEnabled(This,pvbool) \ - (This)->lpVtbl -> get_EventsEnabled(This,pvbool) + ( (This)->lpVtbl -> get_EventsEnabled(This,pvbool) ) #define _FramerControl_get_DocumentName(This,pbstr) \ - (This)->lpVtbl -> get_DocumentName(This,pbstr) + ( (This)->lpVtbl -> get_DocumentName(This,pbstr) ) #endif /* COBJMACROS */ @@ -806,669 +830,6 @@ DEFINE_GUID(IID__FramerControl,0x00460181,0x9E5E,0x11d5,0xB7,0xC8,0xB8,0x26,0x90 -/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE _FramerControl_Activate_Proxy( - _FramerControl * This); - - -void __RPC_STUB _FramerControl_Activate_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][id][propget] */ HRESULT STDMETHODCALLTYPE _FramerControl_get_ActiveDocument_Proxy( - _FramerControl * This, - /* [retval][out] */ IDispatch **ppdisp); - - -void __RPC_STUB _FramerControl_get_ActiveDocument_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE _FramerControl_CreateNew_Proxy( - _FramerControl * This, - /* [in] */ BSTR ProgIdOrTemplate); - - -void __RPC_STUB _FramerControl_CreateNew_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE _FramerControl_Open_Proxy( - _FramerControl * This, - /* [in] */ VARIANT Document, - /* [optional][in] */ VARIANT ReadOnly, - /* [optional][in] */ VARIANT ProgId, - /* [optional][in] */ VARIANT WebUsername, - /* [optional][in] */ VARIANT WebPassword); - - -void __RPC_STUB _FramerControl_Open_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE _FramerControl_Save_Proxy( - _FramerControl * This, - /* [optional][in] */ VARIANT SaveAsDocument, - /* [optional][in] */ VARIANT OverwriteExisting, - /* [optional][in] */ VARIANT WebUsername, - /* [optional][in] */ VARIANT WebPassword); - - -void __RPC_STUB _FramerControl_Save_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [hidden][id] */ HRESULT STDMETHODCALLTYPE _FramerControl__PrintOutOld_Proxy( - _FramerControl * This, - /* [optional][in] */ VARIANT PromptToSelectPrinter); - - -void __RPC_STUB _FramerControl__PrintOutOld_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE _FramerControl_Close_Proxy( - _FramerControl * This); - - -void __RPC_STUB _FramerControl_Close_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][id][propput] */ HRESULT STDMETHODCALLTYPE _FramerControl_put_Caption_Proxy( - _FramerControl * This, - /* [in] */ BSTR bstr); - - -void __RPC_STUB _FramerControl_put_Caption_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [id][propget] */ HRESULT STDMETHODCALLTYPE _FramerControl_get_Caption_Proxy( - _FramerControl * This, - /* [retval][out] */ BSTR *pbstr); - - -void __RPC_STUB _FramerControl_get_Caption_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][id][propput] */ HRESULT STDMETHODCALLTYPE _FramerControl_put_Titlebar_Proxy( - _FramerControl * This, - /* [in] */ VARIANT_BOOL vbool); - - -void __RPC_STUB _FramerControl_put_Titlebar_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [id][propget] */ HRESULT STDMETHODCALLTYPE _FramerControl_get_Titlebar_Proxy( - _FramerControl * This, - /* [retval][out] */ VARIANT_BOOL *pbool); - - -void __RPC_STUB _FramerControl_get_Titlebar_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][id][propput] */ HRESULT STDMETHODCALLTYPE _FramerControl_put_Toolbars_Proxy( - _FramerControl * This, - /* [in] */ VARIANT_BOOL vbool); - - -void __RPC_STUB _FramerControl_put_Toolbars_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [id][propget] */ HRESULT STDMETHODCALLTYPE _FramerControl_get_Toolbars_Proxy( - _FramerControl * This, - /* [retval][out] */ VARIANT_BOOL *pbool); - - -void __RPC_STUB _FramerControl_get_Toolbars_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][id][nonbrowsable][propput] */ HRESULT STDMETHODCALLTYPE _FramerControl_put_ModalState_Proxy( - _FramerControl * This, - /* [in] */ VARIANT_BOOL vbool); - - -void __RPC_STUB _FramerControl_put_ModalState_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [id][nonbrowsable][propget] */ HRESULT STDMETHODCALLTYPE _FramerControl_get_ModalState_Proxy( - _FramerControl * This, - /* [retval][out] */ VARIANT_BOOL *pbool); - - -void __RPC_STUB _FramerControl_get_ModalState_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE _FramerControl_ShowDialog_Proxy( - _FramerControl * This, - /* [in] */ dsoShowDialogType DlgType); - - -void __RPC_STUB _FramerControl_ShowDialog_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][id][propput] */ HRESULT STDMETHODCALLTYPE _FramerControl_put_EnableFileCommand_Proxy( - _FramerControl * This, - /* [in] */ dsoFileCommandType Item, - /* [in] */ VARIANT_BOOL vbool); - - -void __RPC_STUB _FramerControl_put_EnableFileCommand_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [id][propget] */ HRESULT STDMETHODCALLTYPE _FramerControl_get_EnableFileCommand_Proxy( - _FramerControl * This, - /* [in] */ dsoFileCommandType Item, - /* [retval][out] */ VARIANT_BOOL *pbool); - - -void __RPC_STUB _FramerControl_get_EnableFileCommand_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][id][propput] */ HRESULT STDMETHODCALLTYPE _FramerControl_put_BorderStyle_Proxy( - _FramerControl * This, - /* [in] */ dsoBorderStyle style); - - -void __RPC_STUB _FramerControl_put_BorderStyle_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [id][propget] */ HRESULT STDMETHODCALLTYPE _FramerControl_get_BorderStyle_Proxy( - _FramerControl * This, - /* [retval][out] */ dsoBorderStyle *pstyle); - - -void __RPC_STUB _FramerControl_get_BorderStyle_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][id][propput] */ HRESULT STDMETHODCALLTYPE _FramerControl_put_BorderColor_Proxy( - _FramerControl * This, - /* [in] */ /* external definition not present */ OLE_COLOR clr); - - -void __RPC_STUB _FramerControl_put_BorderColor_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [id][propget] */ HRESULT STDMETHODCALLTYPE _FramerControl_get_BorderColor_Proxy( - _FramerControl * This, - /* [retval][out] */ /* external definition not present */ OLE_COLOR *pclr); - - -void __RPC_STUB _FramerControl_get_BorderColor_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][id][propput] */ HRESULT STDMETHODCALLTYPE _FramerControl_put_BackColor_Proxy( - _FramerControl * This, - /* [in] */ /* external definition not present */ OLE_COLOR clr); - - -void __RPC_STUB _FramerControl_put_BackColor_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [id][propget] */ HRESULT STDMETHODCALLTYPE _FramerControl_get_BackColor_Proxy( - _FramerControl * This, - /* [retval][out] */ /* external definition not present */ OLE_COLOR *pclr); - - -void __RPC_STUB _FramerControl_get_BackColor_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][id][propput] */ HRESULT STDMETHODCALLTYPE _FramerControl_put_ForeColor_Proxy( - _FramerControl * This, - /* [in] */ /* external definition not present */ OLE_COLOR clr); - - -void __RPC_STUB _FramerControl_put_ForeColor_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [id][propget] */ HRESULT STDMETHODCALLTYPE _FramerControl_get_ForeColor_Proxy( - _FramerControl * This, - /* [retval][out] */ /* external definition not present */ OLE_COLOR *pclr); - - -void __RPC_STUB _FramerControl_get_ForeColor_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][id][propput] */ HRESULT STDMETHODCALLTYPE _FramerControl_put_TitlebarColor_Proxy( - _FramerControl * This, - /* [in] */ /* external definition not present */ OLE_COLOR clr); - - -void __RPC_STUB _FramerControl_put_TitlebarColor_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [id][propget] */ HRESULT STDMETHODCALLTYPE _FramerControl_get_TitlebarColor_Proxy( - _FramerControl * This, - /* [retval][out] */ /* external definition not present */ OLE_COLOR *pclr); - - -void __RPC_STUB _FramerControl_get_TitlebarColor_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][id][propput] */ HRESULT STDMETHODCALLTYPE _FramerControl_put_TitlebarTextColor_Proxy( - _FramerControl * This, - /* [in] */ /* external definition not present */ OLE_COLOR clr); - - -void __RPC_STUB _FramerControl_put_TitlebarTextColor_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [id][propget] */ HRESULT STDMETHODCALLTYPE _FramerControl_get_TitlebarTextColor_Proxy( - _FramerControl * This, - /* [retval][out] */ /* external definition not present */ OLE_COLOR *pclr); - - -void __RPC_STUB _FramerControl_get_TitlebarTextColor_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE _FramerControl_ExecOleCommand_Proxy( - _FramerControl * This, - /* [in] */ LONG OLECMDID, - /* [optional][in] */ VARIANT Options, - /* [optional][in] */ VARIANT *vInParam, - /* [optional][out][in] */ VARIANT *vInOutParam); - - -void __RPC_STUB _FramerControl_ExecOleCommand_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][id][propput] */ HRESULT STDMETHODCALLTYPE _FramerControl_put_Menubar_Proxy( - _FramerControl * This, - /* [in] */ VARIANT_BOOL vbool); - - -void __RPC_STUB _FramerControl_put_Menubar_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [id][propget] */ HRESULT STDMETHODCALLTYPE _FramerControl_get_Menubar_Proxy( - _FramerControl * This, - /* [retval][out] */ VARIANT_BOOL *pbool); - - -void __RPC_STUB _FramerControl_get_Menubar_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][id][propput] */ HRESULT STDMETHODCALLTYPE _FramerControl_put_HostName_Proxy( - _FramerControl * This, - /* [in] */ BSTR bstr); - - -void __RPC_STUB _FramerControl_put_HostName_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [id][propget] */ HRESULT STDMETHODCALLTYPE _FramerControl_get_HostName_Proxy( - _FramerControl * This, - /* [retval][out] */ BSTR *pbstr); - - -void __RPC_STUB _FramerControl_get_HostName_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][id][propget] */ HRESULT STDMETHODCALLTYPE _FramerControl_get_DocumentFullName_Proxy( - _FramerControl * This, - /* [retval][out] */ BSTR *pbstr); - - -void __RPC_STUB _FramerControl_get_DocumentFullName_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE _FramerControl_PrintOut_Proxy( - _FramerControl * This, - /* [optional][in] */ VARIANT PromptUser, - /* [optional][in] */ VARIANT PrinterName, - /* [optional][in] */ VARIANT Copies, - /* [optional][in] */ VARIANT FromPage, - /* [optional][in] */ VARIANT ToPage, - /* [optional][in] */ VARIANT OutputFile); - - -void __RPC_STUB _FramerControl_PrintOut_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE _FramerControl_PrintPreview_Proxy( - _FramerControl * This); - - -void __RPC_STUB _FramerControl_PrintPreview_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][id] */ HRESULT STDMETHODCALLTYPE _FramerControl_PrintPreviewExit_Proxy( - _FramerControl * This); - - -void __RPC_STUB _FramerControl_PrintPreviewExit_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][id][propget] */ HRESULT STDMETHODCALLTYPE _FramerControl_get_IsReadOnly_Proxy( - _FramerControl * This, - /* [retval][out] */ VARIANT_BOOL *pbool); - - -void __RPC_STUB _FramerControl_get_IsReadOnly_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][id][propget] */ HRESULT STDMETHODCALLTYPE _FramerControl_get_IsDirty_Proxy( - _FramerControl * This, - /* [retval][out] */ VARIANT_BOOL *pbool); - - -void __RPC_STUB _FramerControl_get_IsDirty_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][id][propput] */ HRESULT STDMETHODCALLTYPE _FramerControl_put_LockServer_Proxy( - _FramerControl * This, - /* [in] */ VARIANT_BOOL vbool); - - -void __RPC_STUB _FramerControl_put_LockServer_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [id][propget] */ HRESULT STDMETHODCALLTYPE _FramerControl_get_LockServer_Proxy( - _FramerControl * This, - /* [retval][out] */ VARIANT_BOOL *pvbool); - - -void __RPC_STUB _FramerControl_get_LockServer_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][nonbrowsable][id] */ HRESULT STDMETHODCALLTYPE _FramerControl_GetDataObjectContent_Proxy( - _FramerControl * This, - /* [in] */ VARIANT ClipFormatNameOrNumber, - /* [retval][out] */ VARIANT *pvResults); - - -void __RPC_STUB _FramerControl_GetDataObjectContent_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][nonbrowsable][id] */ HRESULT STDMETHODCALLTYPE _FramerControl_SetDataObjectContent_Proxy( - _FramerControl * This, - /* [in] */ VARIANT ClipFormatNameOrNumber, - /* [in] */ VARIANT DataByteArray); - - -void __RPC_STUB _FramerControl_SetDataObjectContent_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][id][propput] */ HRESULT STDMETHODCALLTYPE _FramerControl_put_ActivationPolicy_Proxy( - _FramerControl * This, - /* [in] */ enum dsoActivationPolicy lPolicy); - - -void __RPC_STUB _FramerControl_put_ActivationPolicy_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [id][propget] */ HRESULT STDMETHODCALLTYPE _FramerControl_get_ActivationPolicy_Proxy( - _FramerControl * This, - /* [retval][out] */ enum dsoActivationPolicy *plPolicy); - - -void __RPC_STUB _FramerControl_get_ActivationPolicy_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][id][propput] */ HRESULT STDMETHODCALLTYPE _FramerControl_put_FrameHookPolicy_Proxy( - _FramerControl * This, - /* [in] */ enum dsoFrameHookPolicy lPolicy); - - -void __RPC_STUB _FramerControl_put_FrameHookPolicy_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [id][propget] */ HRESULT STDMETHODCALLTYPE _FramerControl_get_FrameHookPolicy_Proxy( - _FramerControl * This, - /* [retval][out] */ enum dsoFrameHookPolicy *plPolicy); - - -void __RPC_STUB _FramerControl_get_FrameHookPolicy_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][id][propput] */ HRESULT STDMETHODCALLTYPE _FramerControl_put_MenuAccelerators_Proxy( - _FramerControl * This, - /* [in] */ VARIANT_BOOL vbool); - - -void __RPC_STUB _FramerControl_put_MenuAccelerators_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [id][propget] */ HRESULT STDMETHODCALLTYPE _FramerControl_get_MenuAccelerators_Proxy( - _FramerControl * This, - /* [retval][out] */ VARIANT_BOOL *pvbool); - - -void __RPC_STUB _FramerControl_get_MenuAccelerators_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][id][nonbrowsable][propput] */ HRESULT STDMETHODCALLTYPE _FramerControl_put_EventsEnabled_Proxy( - _FramerControl * This, - /* [in] */ VARIANT_BOOL vbool); - - -void __RPC_STUB _FramerControl_put_EventsEnabled_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [id][nonbrowsable][propget] */ HRESULT STDMETHODCALLTYPE _FramerControl_get_EventsEnabled_Proxy( - _FramerControl * This, - /* [retval][out] */ VARIANT_BOOL *pvbool); - - -void __RPC_STUB _FramerControl_get_EventsEnabled_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - -/* [helpstring][id][propget] */ HRESULT STDMETHODCALLTYPE _FramerControl_get_DocumentName_Proxy( - _FramerControl * This, - /* [retval][out] */ BSTR *pbstr); - - -void __RPC_STUB _FramerControl_get_DocumentName_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - #endif /* ___FramerControl_INTERFACE_DEFINED__ */ @@ -1480,7 +841,7 @@ void __RPC_STUB _FramerControl_get_DocumentName_Stub( /* [hidden][uuid] */ -DEFINE_GUID(DIID__DFramerCtlEvents,0x00460185,0x9E5E,0x11d5,0xB7,0xC8,0xB8,0x26,0x90,0x41,0xDD,0x57); +EXTERN_C const IID DIID__DFramerCtlEvents; #if defined(__cplusplus) && !defined(CINTERFACE) @@ -1498,7 +859,8 @@ DEFINE_GUID(DIID__DFramerCtlEvents,0x00460185,0x9E5E,0x11d5,0xB7,0xC8,0xB8,0x26, HRESULT ( STDMETHODCALLTYPE *QueryInterface )( _DFramerCtlEvents * This, /* [in] */ REFIID riid, - /* [iid_is][out] */ void **ppvObject); + /* [annotation][iid_is][out] */ + _COM_Outptr_ void **ppvObject); ULONG ( STDMETHODCALLTYPE *AddRef )( _DFramerCtlEvents * This); @@ -1520,20 +882,28 @@ DEFINE_GUID(DIID__DFramerCtlEvents,0x00460185,0x9E5E,0x11d5,0xB7,0xC8,0xB8,0x26, _DFramerCtlEvents * This, /* [in] */ REFIID riid, /* [size_is][in] */ LPOLESTR *rgszNames, - /* [in] */ UINT cNames, + /* [range][in] */ UINT cNames, /* [in] */ LCID lcid, /* [size_is][out] */ DISPID *rgDispId); /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( _DFramerCtlEvents * This, - /* [in] */ DISPID dispIdMember, - /* [in] */ REFIID riid, - /* [in] */ LCID lcid, - /* [in] */ WORD wFlags, - /* [out][in] */ DISPPARAMS *pDispParams, - /* [out] */ VARIANT *pVarResult, - /* [out] */ EXCEPINFO *pExcepInfo, - /* [out] */ UINT *puArgErr); + /* [annotation][in] */ + _In_ DISPID dispIdMember, + /* [annotation][in] */ + _In_ REFIID riid, + /* [annotation][in] */ + _In_ LCID lcid, + /* [annotation][in] */ + _In_ WORD wFlags, + /* [annotation][out][in] */ + _In_ DISPPARAMS *pDispParams, + /* [annotation][out] */ + _Out_opt_ VARIANT *pVarResult, + /* [annotation][out] */ + _Out_opt_ EXCEPINFO *pExcepInfo, + /* [annotation][out] */ + _Out_opt_ UINT *puArgErr); END_INTERFACE } _DFramerCtlEventsVtbl; @@ -1549,26 +919,26 @@ DEFINE_GUID(DIID__DFramerCtlEvents,0x00460185,0x9E5E,0x11d5,0xB7,0xC8,0xB8,0x26, #define _DFramerCtlEvents_QueryInterface(This,riid,ppvObject) \ - (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define _DFramerCtlEvents_AddRef(This) \ - (This)->lpVtbl -> AddRef(This) + ( (This)->lpVtbl -> AddRef(This) ) #define _DFramerCtlEvents_Release(This) \ - (This)->lpVtbl -> Release(This) + ( (This)->lpVtbl -> Release(This) ) #define _DFramerCtlEvents_GetTypeInfoCount(This,pctinfo) \ - (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo) + ( (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo) ) #define _DFramerCtlEvents_GetTypeInfo(This,iTInfo,lcid,ppTInfo) \ - (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo) + ( (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo) ) #define _DFramerCtlEvents_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) \ - (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) + ( (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) ) #define _DFramerCtlEvents_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) \ - (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) + ( (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) ) #endif /* COBJMACROS */ @@ -1579,7 +949,7 @@ DEFINE_GUID(DIID__DFramerCtlEvents,0x00460185,0x9E5E,0x11d5,0xB7,0xC8,0xB8,0x26, #endif /* ___DFramerCtlEvents_DISPINTERFACE_DEFINED__ */ -DEFINE_GUID(CLSID_FramerControl,0x00460182,0x9E5E,0x11d5,0xB7,0xC8,0xB8,0x26,0x90,0x41,0xDD,0x57); +EXTERN_C const CLSID CLSID_FramerControl; #ifdef __cplusplus diff --git a/PROMS/DSOFramer/Source2005/dsoframer.vcxproj b/PROMS/DSOFramer/Source2005/dsoframer.vcxproj index c3b2b999..93db35ac 100644 --- a/PROMS/DSOFramer/Source2005/dsoframer.vcxproj +++ b/PROMS/DSOFramer/Source2005/dsoframer.vcxproj @@ -12,16 +12,17 @@ {005801E1-A867-4CBB-995F-BA2EF4360BDF} + 10.0.19041.0 DynamicLibrary - v120 + v142 false DynamicLibrary - v120 + v142 false diff --git a/PROMS/LBWordLibrary/LBWordLibrary.csproj b/PROMS/LBWordLibrary/LBWordLibrary.csproj index 201f3d8f..c1a6cb46 100644 --- a/PROMS/LBWordLibrary/LBWordLibrary.csproj +++ b/PROMS/LBWordLibrary/LBWordLibrary.csproj @@ -66,7 +66,7 @@ False - ..\DataLoader\bin\Debug\log4net.dll + ..\..\..\..\..\..\..\Development\Log4Net\log4net-1.2.10\bin\net\2.0\debug\log4net.dll diff --git a/PROMS/RoAccessToSql/RoAccessToSql.csproj b/PROMS/RoAccessToSql/RoAccessToSql.csproj index 8c219731..be47fe59 100644 --- a/PROMS/RoAccessToSql/RoAccessToSql.csproj +++ b/PROMS/RoAccessToSql/RoAccessToSql.csproj @@ -42,7 +42,7 @@ ..\..\..\Program Files (x86)\DotNetBar for Windows Forms\DevComponents.DotNetBar2.dll - ..\DataLoader\bin\Debug\log4net.dll + ..\..\..\..\..\..\..\Development\Log4Net\log4net-1.2.10\bin\net\2.0\debug\log4net.dll diff --git a/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs b/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs index 5abbe2ad..7de00d32 100644 --- a/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs +++ b/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs @@ -44,8 +44,10 @@ using System.Runtime.InteropServices; // Revision DHH (day - no leading zero, two digit hour - military time // // ********* REMEMBER TO CHECK THE AssemblyConfiguration SETTING (ABOVE) ******** -[assembly: AssemblyVersion("2.0.2306.1408")] -[assembly: AssemblyFileVersion("2.0.2306.1408")] +[assembly: AssemblyVersion("2.0.2306.2011")] +[assembly: AssemblyFileVersion("2.0.2306.2011")] + + diff --git a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj index 47bef1a7..67441553 100644 --- a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj +++ b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj @@ -96,7 +96,7 @@ - ..\..\Proms3rdPartyLibraries\DSOFramer\AxInterop.DSOFramer.dll + ..\..\..\..\..\..\..\Development\Proms3rdPartyLibraries\DSOFramer\AxInterop.DSOFramer.dll False @@ -106,27 +106,27 @@ False - ..\csla20cs-2.1.4-070223\csla20cs\csla20cs\Csla\bin\Debug\Csla.dll + ..\..\..\..\..\..\..\Development\Proms\csla20cs-2.1.4-070223\csla20cs\csla20cs\Csla\bin\Debug\Csla.dll False ..\..\..\Program Files (x86)\DotNetBar for Windows Forms\DevComponents.DotNetBar2.dll - ..\..\Proms3rdPartyLibraries\DSOFramer\Interop.DSOFramer.dll + ..\..\..\..\..\..\..\Development\Proms3rdPartyLibraries\DSOFramer\Interop.DSOFramer.dll True False - ..\..\Proms3rdPartyLibraries\Ionic\Ionic.Zip.dll + ..\..\..\..\..\..\..\Development\Proms3rdPartyLibraries\Ionic\Ionic.Zip.dll False - ..\..\Proms3rdPartyLibraries\RtfConverter\bin\Debug\Itenso.Rtf.Interpreter.dll + ..\..\..\..\..\..\..\Development\Proms3rdPartyLibraries\RtfConverter\bin\Debug\Itenso.Rtf.Interpreter.dll False - ..\..\Proms3rdPartyLibraries\RtfConverter\bin\Debug\Itenso.Rtf.Parser.dll + ..\..\..\..\..\..\..\Development\Proms3rdPartyLibraries\RtfConverter\bin\Debug\Itenso.Rtf.Parser.dll ..\..\Log4Net\log4net-1.2.10\bin\net\2.0\debug\log4net.dll diff --git a/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj b/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj index b0ea026e..cd94f6ac 100644 --- a/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj +++ b/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj @@ -81,7 +81,7 @@ False - ..\csla20cs-2.1.4-070223\csla20cs\csla20cs\Csla\bin\Debug\Csla.dll + ..\..\..\..\..\..\..\Development\Proms\csla20cs-2.1.4-070223\csla20cs\csla20cs\Csla\bin\Debug\Csla.dll False @@ -89,7 +89,7 @@ False - ..\DataLoader\bin\Debug\log4net.dll + ..\..\..\..\..\..\..\Development\Log4Net\log4net-1.2.10\bin\net\2.0\debug\log4net.dll diff --git a/PROMS/VEPROMS/VEPROMS.sln b/PROMS/VEPROMS/VEPROMS.sln index d9215681..9b2208e0 100644 --- a/PROMS/VEPROMS/VEPROMS.sln +++ b/PROMS/VEPROMS/VEPROMS.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.21005.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.32901.82 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volian.Controls.Library", "..\Volian.Controls.Library\Volian.Controls.Library.csproj", "{8556527C-6615-487F-8AF7-22EBC3EF0268}" EndProject @@ -42,64 +42,6 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RoAccessToSql", "..\RoAccessToSql\RoAccessToSql.csproj", "{1EC96BDA-01E7-4153-A95D-6A4A36FA278E}" EndProject Global - GlobalSection(SourceCodeControl) = preSolution - SccNumberOfProjects = 19 - SccLocalPath0 = . - SccProjectUniqueName1 = ..\\Volian.Controls.Library\\Volian.Controls.Library.csproj - SccProjectName1 = \u0022$/PROMS/Volian.Controls.Library\u0022,\u0020TVBAAAAA - SccLocalPath1 = ..\\Volian.Controls.Library - SccProjectUniqueName2 = ..\\VEPROMS.CSLA.Library\\VEPROMS.CSLA.Library.csproj - SccProjectName2 = \u0022$/PROMS/VEPROMS.CSLA.Library\u0022,\u0020TPBAAAAA - SccLocalPath2 = ..\\VEPROMS.CSLA.Library - SccProjectUniqueName3 = ..\\DropDownPanel\\DropDownPanel.csproj - SccProjectName3 = \u0022$/PROMS/DropDownPanel\u0022,\u0020DODAAAAA - SccLocalPath3 = ..\\DropDownPanel - SccProjectUniqueName4 = ..\\VG\\VG.csproj - SccProjectName4 = \u0022$/PROMS/VG\u0022,\u0020BQDAAAAA - SccLocalPath4 = ..\\VG - SccProjectUniqueName5 = ..\\XYPlots\\XYPlots.csproj - SccProjectName5 = \u0022$/PROMS/XYPlots\u0022,\u0020BRDAAAAA - SccLocalPath5 = ..\\XYPlots - SccProjectUniqueName6 = ..\\VEPROMS\u0020User\u0020Interface\\VEPROMS_UI.csproj - SccProjectName6 = \u0022$/PROMS/VEPROMS\u0020User\u0020Interface\u0022,\u0020YLBAAAAA - SccLocalPath6 = ..\\VEPROMS\u0020User\u0020Interface - SccProjectUniqueName7 = ..\\LBWordLibrary\\LBWordLibrary.csproj - SccProjectName7 = \u0022$/PROMS/LBWordLibrary\u0022,\u0020QUDAAAAA - SccLocalPath7 = ..\\LBWordLibrary - SccProjectUniqueName8 = ..\\Volian.Print.Library\\Volian.Print.Library.csproj - SccProjectName8 = \u0022$/PROMS/Volian.Print.Library\u0022,\u0020NGEAAAAA - SccLocalPath8 = ..\\Volian.Print.Library - SccProjectUniqueName9 = ..\\Volian.Svg.Library\\Volian.Svg.Library.csproj - SccProjectName9 = \u0022$/PROMS/Volian.Svg.Library\u0022,\u0020WCEAAAAA - SccLocalPath9 = ..\\Volian.Svg.Library - SccProjectUniqueName10 = ..\\Volian.Base.Library\\Volian.Base.Library.csproj - SccProjectName10 = \u0022$/PROMS/Volian.Base.Library\u0022,\u0020QJEAAAAA - SccLocalPath10 = ..\\Volian.Base.Library - SccProjectUniqueName11 = ..\\TablePicker\\TablePicker.csproj - SccProjectName11 = \u0022$/PROMS/TablePicker\u0022,\u0020MPBAAAAA - SccLocalPath11 = ..\\TablePicker - SccProjectUniqueName12 = ..\\AdjustBuildRevision\\AdjustBuildRevision.csproj - SccProjectName12 = \u0022$/PROMS/AdjustBuildRevision\u0022,\u0020KQEAAAAA - SccLocalPath12 = ..\\AdjustBuildRevision - SccProjectUniqueName13 = ..\\Volian.Utils.Library\\Volian.Utils.Library.csproj - SccProjectName13 = \u0022$/PROMS/Volian.Utils.Library\u0022,\u0020DICAAAAA - SccLocalPath13 = ..\\Volian.Utils.Library - SccProjectUniqueName14 = ..\\Formats\\Formats.csproj - SccProjectName14 = \u0022$/PROMS/Formats\u0022,\u0020ZWFAAAAA - SccLocalPath14 = ..\\Formats - SccProjectUniqueName15 = ..\\FlexableMessageBox\\FlexableMessageBox.csproj - SccProjectName15 = \u0022$/PROMS/FlexableMessageBox\u0022,\u0020ZPGAAAAA - SccLocalPath15 = ..\\FlexableMessageBox - SccProjectUniqueName16 = ..\\volian.Pipe.Library\\Volian.Pipe.Library.csproj - SccProjectName16 = \u0022$/PROMS/Volian.Pipe.Library\u0022,\u0020RQGAAAAA - SccLocalPath16 = ..\\volian.Pipe.Library - SccProjectUniqueName17 = ..\\Baseline\\Baseline.csproj - SccProjectName17 = \u0022$/PROMS/Baseline\u0022,\u0020IWGAAAAA - SccLocalPath17 = ..\\Baseline - SccProjectUniqueName18 = ..\\RoAccessToSql\\RoAccessToSql.csproj - SccProjectName18 = \u0022$/PROMS/RoAccessToSql\u0022,\u0020OAHAAAAA - SccLocalPath18 = ..\\RoAccessToSql - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|Mixed Platforms = Debug|Mixed Platforms @@ -634,4 +576,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {392A18D0-8395-4CC5-AC5C-461614E7FC42} + EndGlobalSection EndGlobal diff --git a/PROMS/VG/VG.csproj b/PROMS/VG/VG.csproj index ac307488..085112bb 100644 --- a/PROMS/VG/VG.csproj +++ b/PROMS/VG/VG.csproj @@ -130,7 +130,7 @@ False - ..\..\..\Production\Proms3rdPartyLibraries\iTechSharp\itextsharp.dll + ..\..\..\..\..\..\..\Development\Proms3rdPartyLibraries\iTechSharp\itextsharp.dll System diff --git a/PROMS/Volian.Base.Library/Volian.Base.Library.csproj b/PROMS/Volian.Base.Library/Volian.Base.Library.csproj index 93c6cc5f..ed8d30da 100644 --- a/PROMS/Volian.Base.Library/Volian.Base.Library.csproj +++ b/PROMS/Volian.Base.Library/Volian.Base.Library.csproj @@ -67,11 +67,11 @@ - ..\VEPROMS.CSLA.Library\bin\Release\itextsharp.dll + ..\..\..\..\..\..\..\Development\Proms3rdPartyLibraries\iTechSharp\itextsharp.dll False - ..\DataLoader\bin\Debug\log4net.dll + ..\..\..\..\..\..\..\Development\Log4Net\log4net-1.2.10\bin\net\2.0\debug\log4net.dll diff --git a/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj b/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj index f47535f9..5c8f74ca 100644 --- a/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj +++ b/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj @@ -87,7 +87,7 @@ False - ..\csla20cs-2.1.4-070223\csla20cs\csla20cs\Csla\bin\Debug\Csla.dll + ..\..\..\..\..\..\..\Development\Proms\csla20cs-2.1.4-070223\csla20cs\csla20cs\Csla\bin\Debug\Csla.dll False @@ -100,7 +100,7 @@ False - ..\DataLoader\bin\Debug\log4net.dll + ..\..\..\..\..\..\..\Development\Log4Net\log4net-1.2.10\bin\net\2.0\debug\log4net.dll diff --git a/PROMS/Volian.Print.Library/Volian.Print.Library.csproj b/PROMS/Volian.Print.Library/Volian.Print.Library.csproj index e411ea1d..76903536 100644 --- a/PROMS/Volian.Print.Library/Volian.Print.Library.csproj +++ b/PROMS/Volian.Print.Library/Volian.Print.Library.csproj @@ -67,22 +67,22 @@ False - ..\Volian.Controls.Library\bin\Debug\Csla.dll + ..\..\..\..\..\..\..\Development\Proms\csla20cs-2.1.4-070223\csla20cs\csla20cs\Csla\bin\Debug\Csla.dll ..\FlexableMessageBox\bin\Debug\FlexableMessageBox.dll False - ..\..\Proms3rdPartyLibraries\RtfConverter\bin\Debug\Itenso.Rtf.Interpreter.dll + ..\..\..\..\..\..\..\Development\Proms3rdPartyLibraries\RtfConverter\bin\Debug\Itenso.Rtf.Interpreter.dll False - ..\..\Proms3rdPartyLibraries\RtfConverter\bin\Debug\Itenso.Rtf.Parser.dll + ..\..\..\..\..\..\..\Development\Proms3rdPartyLibraries\RtfConverter\bin\Debug\Itenso.Rtf.Parser.dll False - ..\..\Proms3rdPartyLibraries\iTechSharp\itextsharp.dll + ..\..\..\..\..\..\..\Development\Proms3rdPartyLibraries\iTechSharp\itextsharp.dll False @@ -90,7 +90,7 @@ False - ..\DataLoader\bin\Debug\log4net.dll + ..\..\..\..\..\..\..\Development\Log4Net\log4net-1.2.10\bin\net\2.0\debug\log4net.dll @@ -101,7 +101,7 @@ - ..\ReferencedObjects\LibSource\VlnStatus\bin\Debug\VlnStatus.dll + ..\..\..\..\..\..\..\Development\Proms\ReferencedObjects\LibSource\VlnStatus\bin\Debug\VlnStatus.dll diff --git a/PROMS/Volian.Svg.Library/Volian.Svg.Library.csproj b/PROMS/Volian.Svg.Library/Volian.Svg.Library.csproj index 3048f9fa..9efacb67 100644 --- a/PROMS/Volian.Svg.Library/Volian.Svg.Library.csproj +++ b/PROMS/Volian.Svg.Library/Volian.Svg.Library.csproj @@ -62,17 +62,17 @@ - ..\..\Proms3rdPartyLibraries\RtfConverter\bin\Debug\Itenso.Rtf.Interpreter.dll + ..\..\..\..\..\..\..\Development\Proms3rdPartyLibraries\RtfConverter\bin\Debug\Itenso.Rtf.Interpreter.dll - ..\..\Proms3rdPartyLibraries\RtfConverter\bin\Debug\Itenso.Rtf.Parser.dll + ..\..\..\..\..\..\..\Development\Proms3rdPartyLibraries\RtfConverter\bin\Debug\Itenso.Rtf.Parser.dll - ..\..\Proms3rdPartyLibraries\iTechSharp\itextsharp.dll + ..\..\..\..\..\..\..\Development\Proms3rdPartyLibraries\iTechSharp\itextsharp.dll False - ..\DataLoader\bin\Debug\log4net.dll + ..\..\..\..\..\..\..\Development\Log4Net\log4net-1.2.10\bin\net\2.0\debug\log4net.dll diff --git a/PROMS/Volian.Utils.Library/Volian.Utils.Library.csproj b/PROMS/Volian.Utils.Library/Volian.Utils.Library.csproj index fa145d09..e5faef40 100644 --- a/PROMS/Volian.Utils.Library/Volian.Utils.Library.csproj +++ b/PROMS/Volian.Utils.Library/Volian.Utils.Library.csproj @@ -55,7 +55,7 @@ - ..\..\Log4Net\log4net-1.2.10\bin\net\2.0\debug\log4net.dll + ..\..\..\..\..\..\..\Development\Log4Net\log4net-1.2.10\bin\net\2.0\debug\log4net.dll diff --git a/PROMS/Word Add-Ins for PROMS Import/W2PGrid/W2PGrid/obj/Debug/W2PGrid.csproj.AssemblyReference.cache b/PROMS/Word Add-Ins for PROMS Import/W2PGrid/W2PGrid/obj/Debug/W2PGrid.csproj.AssemblyReference.cache index 9ed59e9218ec22ea576f955788ff758add59c881..45134d463d004644fd7b29608b692159250cc49d 100644 GIT binary patch delta 439 zcmZ2vu*jCf*C{C2nURrqBZrg(52IpIW?qa-YEo%>%w$JK;mJCToa{e?ri#ufygk{5 z(LTS0F)cGE)kSl>CLD6?2UIKQ+gIaNO>wICnHan4Uk)ei{r_YKw$ z&o4?*a7;hSLboI~(eSXXfcS8@lDBR=5{U4q#*% M3}LbP4r3cL0NaO=FaQ7m delta 17 YcmZ2vyU2jU*C{C2nURruBZrg(04+WQDF6Tf diff --git a/PROMS/XYPlots/XYPlots.csproj b/PROMS/XYPlots/XYPlots.csproj index a202f2f5..f10ec2a7 100644 --- a/PROMS/XYPlots/XYPlots.csproj +++ b/PROMS/XYPlots/XYPlots.csproj @@ -127,7 +127,7 @@ - ..\VEPROMS.CSLA.Library\bin\Release\log4net.dll + ..\..\..\..\..\..\..\Development\Log4Net\log4net-1.2.10\bin\net\2.0\debug\log4net.dll System