[Sphere-axis-commits] CVS: Utilities/CCWizard CCWizard.rc,1.2,1.3 CCWizardDlg.cpp,1.2,1.3 CCWizardDl
Brought to you by:
pesterle
From: Philip E. <pes...@us...> - 2003-10-03 21:18:05
|
Update of /cvsroot/sphere-axis/Utilities/CCWizard In directory sc8-pr-cvs1:/tmp/cvs-serv7311 Modified Files: CCWizard.rc CCWizardDlg.cpp CCWizardDlg.h Log Message: no message Index: CCWizard.rc =================================================================== RCS file: /cvsroot/sphere-axis/Utilities/CCWizard/CCWizard.rc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** CCWizard.rc 3 Oct 2003 17:38:27 -0000 1.2 --- CCWizard.rc 3 Oct 2003 21:17:53 -0000 1.3 *************** *** 101,105 **** CONTROL "C#",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,67,84,26,10 CONTROL "VB",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,105,84,24,10 ! PUSHBUTTON "Create Files",IDC_CREATEFILES,161,82,57,15 PUSHBUTTON "Finished",IDOK,263,7,50,16 LTEXT "Library Name",IDC_STATIC,12,43,44,8 --- 101,105 ---- CONTROL "C#",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,67,84,26,10 CONTROL "VB",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,105,84,24,10 ! DEFPUSHBUTTON "Create Files",IDC_CREATEFILES,161,82,57,15 PUSHBUTTON "Finished",IDOK,263,7,50,16 LTEXT "Library Name",IDC_STATIC,12,43,44,8 Index: CCWizardDlg.cpp =================================================================== RCS file: /cvsroot/sphere-axis/Utilities/CCWizard/CCWizardDlg.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** CCWizardDlg.cpp 3 Oct 2003 17:38:27 -0000 1.2 --- CCWizardDlg.cpp 3 Oct 2003 21:17:53 -0000 1.3 *************** *** 103,107 **** m_eLibraryName.SetWindowText(_T("CC_Custom")); m_eClassName.SetWindowText(_T("Commands")); ! return TRUE; } --- 103,107 ---- m_eLibraryName.SetWindowText(_T("CC_Custom")); m_eClassName.SetWindowText(_T("Commands")); ! return TRUE; } *************** *** 169,176 **** void CCCWizardDlg::OnBnClickedCreatefiles() { ! m_eStatus.Clear(); m_eOutput.GetWindowText(m_sPath); m_eClassName.GetWindowText(m_sClass); m_eLibraryName.GetWindowText(m_sLibrary); // Which language is selected? int idLanguage = GetCheckedRadioButton(IDC_RADIO1, IDC_RADIO3); --- 169,180 ---- void CCCWizardDlg::OnBnClickedCreatefiles() { ! m_eStatus.SetWindowText(_T("")); m_eOutput.GetWindowText(m_sPath); m_eClassName.GetWindowText(m_sClass); m_eLibraryName.GetWindowText(m_sLibrary); + m_sClassUpper = m_sClass; + m_sClassUpper.MakeUpper(); + m_sLibraryUpper = m_sLibrary; + m_sLibraryUpper.MakeUpper(); // Which language is selected? int idLanguage = GetCheckedRadioButton(IDC_RADIO1, IDC_RADIO3); *************** *** 241,245 **** int CCCWizardDlg::BuildFilesCPlusPlus() { - m_eStatus.Clear(); // Since there are a bunch of necessary files for the C++ projects, we'll break this up a bit. BuildCDllDataFiles(); --- 245,248 ---- *************** *** 253,257 **** int CCCWizardDlg::BuildFilesCSharp() { - m_eStatus.Clear(); CString sFile; CStdioFile f; --- 256,259 ---- *************** *** 331,336 **** FileWrite(f, _T("//\n")); FileWrite(f, _T("[assembly: AssemblyDelaySign(false)]\n")); ! FileWrite(f, _T("[assembly: AssemblyKeyFile("")]\n")); ! FileWrite(f, _T("[assembly: AssemblyKeyName("")]\n")); f.Close(); // ********************** --- 333,338 ---- FileWrite(f, _T("//\n")); FileWrite(f, _T("[assembly: AssemblyDelaySign(false)]\n")); ! FileWrite(f, _T("[assembly: AssemblyKeyFile(\"\")]\n")); ! FileWrite(f, _T("[assembly: AssemblyKeyName(\"\")]\n")); f.Close(); // ********************** *************** *** 513,519 **** FileWrite(f, _T(" }\n")); FileWrite(f, _T("\n")); - FileWrite(f, _T(" private uint m_iPrefix;\n")); - FileWrite(f, _T(" private string m_prefix;\n")); - FileWrite(f, _T(" \n")); FileWrite(f, _T(" /// <summary>\n")); FileWrite(f, _T(" /// </summary>\n")); --- 515,518 ---- *************** *** 600,604 **** FileWrite(f, _T(" {\n")); FileWrite(f, _T(" // There are no server defined commands for this module\n")); ! FileWrite(f, _T(" return "";\n")); FileWrite(f, _T(" }\n")); FileWrite(f, _T("\n")); --- 599,603 ---- FileWrite(f, _T(" {\n")); FileWrite(f, _T(" // There are no server defined commands for this module\n")); ! FileWrite(f, _T(" return \"\";\n")); FileWrite(f, _T(" }\n")); FileWrite(f, _T("\n")); *************** *** 741,744 **** --- 740,779 ---- FileWrite(f, _T("</VisualStudioProject>\n")); f.Close(); + // ********************** + // <Library>.sln + // ********************** + sFile.Format(_T("%s\\%s.sln"), m_sPath, m_sLibrary); + sLine.Format(_T("Creating file %s%c%c"), sFile, 0x0d, 0x0a); + status.Append(sLine); + m_eStatus.SetWindowText(status); + if ( !f.Open(sFile, CFile::modeCreate | CFile::modeWrite | CFile::typeText | CFile::shareDenyWrite) ) + { + sLine.Format(_T("Error creating file %s%c%c"), sFile, 0x0d, 0x0a); + status.Append(sLine); + m_eStatus.SetWindowText(status); + return -1; + } + FileWrite(f, _T("Microsoft Visual Studio Solution File, Format Version 7.00\n")); + FileWrite(f, _T("Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"CC_Custom\", \"CC_Custom.csproj\", \"{%s}\"\n"), m_sProjectGUID); + FileWrite(f, _T("EndProject\n")); + FileWrite(f, _T("Global\n")); + FileWrite(f, _T(" GlobalSection(SolutionConfiguration) = preSolution\n")); + FileWrite(f, _T(" ConfigName.0 = Debug\n")); + FileWrite(f, _T(" ConfigName.1 = Release\n")); + FileWrite(f, _T(" EndGlobalSection\n")); + FileWrite(f, _T(" GlobalSection(ProjectDependencies) = postSolution\n")); + FileWrite(f, _T(" EndGlobalSection\n")); + FileWrite(f, _T(" GlobalSection(ProjectConfiguration) = postSolution\n")); + FileWrite(f, _T(" {%s}.Debug.ActiveCfg = Debug|.NET\n"), m_sProjectGUID); + FileWrite(f, _T(" {%s}.Debug.Build.0 = Debug|.NET\n"), m_sProjectGUID); + FileWrite(f, _T(" {%s}.Release.ActiveCfg = Release|.NET\n"), m_sProjectGUID); + FileWrite(f, _T(" {%s}.Release.Build.0 = Release|.NET\n"), m_sProjectGUID); + FileWrite(f, _T(" EndGlobalSection\n")); + FileWrite(f, _T(" GlobalSection(ExtensibilityGlobals) = postSolution\n")); + FileWrite(f, _T(" EndGlobalSection\n")); + FileWrite(f, _T(" GlobalSection(ExtensibilityAddIns) = postSolution\n")); + FileWrite(f, _T(" EndGlobalSection\n")); + FileWrite(f, _T("EndGlobal\n")); + f.Close(); return 0; } *************** *** 780,784 **** FileWrite(f, _T("#define ENTRY_PREFIX Prx\n\n")); FileWrite(f, _T("#include \"dlldata.c\"\n")); ! FileWrite(f, _T("#include \"%s_p.c\"\n\n"), m_sClass); FileWrite(f, _T("#endif //_MERGE_PROXYSTUB\n")); f.Close(); --- 815,819 ---- FileWrite(f, _T("#define ENTRY_PREFIX Prx\n\n")); FileWrite(f, _T("#include \"dlldata.c\"\n")); ! FileWrite(f, _T("#include \"%s_p.c\"\n\n"), m_sLibrary); FileWrite(f, _T("#endif //_MERGE_PROXYSTUB\n")); f.Close(); *************** *** 891,895 **** FileWrite(f, _T("\tpublic CComCoClass<C%s, &CLSID_%s>,\n"), m_sClass, m_sClass); FileWrite(f, _T("\tpublic ISupportErrorInfo,\n")); ! FileWrite(f, _T("\tpublic IDispatchImpl<IClientCommands, &IID_I%s, &LIBID_%s, /*wMajor =*/ 1, /*wMinor =*/ 0>\n"), m_sLibrary, m_sLibrary); FileWrite(f, _T("{\n")); FileWrite(f, _T("public:\n")); --- 926,930 ---- FileWrite(f, _T("\tpublic CComCoClass<C%s, &CLSID_%s>,\n"), m_sClass, m_sClass); FileWrite(f, _T("\tpublic ISupportErrorInfo,\n")); ! FileWrite(f, _T("\tpublic IDispatchImpl<IClientCommands, &IID_IClientCommands, &LIBID_%sLib, /*wMajor =*/ 1, /*wMinor =*/ 0>\n"), m_sLibrary); FileWrite(f, _T("{\n")); FileWrite(f, _T("public:\n")); *************** *** 898,902 **** FileWrite(f, _T("\t}\n")); FileWrite(f, _T("\n")); ! FileWrite(f, _T("DECLARE_REGISTRY_RESOURCEID(IDR_%s)\n"), m_sClass); FileWrite(f, _T("\n")); FileWrite(f, _T("\n")); --- 933,937 ---- FileWrite(f, _T("\t}\n")); FileWrite(f, _T("\n")); ! FileWrite(f, _T("DECLARE_REGISTRY_RESOURCEID(IDR_%s)\n"), m_sClassUpper); FileWrite(f, _T("\n")); FileWrite(f, _T("\n")); *************** *** 939,943 **** // <class>.cpp // ********************** ! sFile.Format(_T("%s\\%s.h"), m_sPath, m_sClass); sLine.Format(_T("Creating file %s%c%c"), sFile, 0x0d, 0x0a); status.Append(sLine); --- 974,978 ---- // <class>.cpp // ********************** ! sFile.Format(_T("%s\\%s.cpp"), m_sPath, m_sClass); sLine.Format(_T("Creating file %s%c%c"), sFile, 0x0d, 0x0a); status.Append(sLine); *************** *** 950,1047 **** return; } ! FileWrite(f, _T("// %s.cpp : Implementation of C%s"), m_sClass, m_sClass); ! FileWrite(f, _T("")); ! FileWrite(f, _T("#include \"stdafx.h\"")); ! FileWrite(f, _T("#include \"%s.h\""), m_sClass); ! FileWrite(f, _T("")); ! FileWrite(f, _T("")); ! FileWrite(f, _T("// C%s"), m_sClass); ! FileWrite(f, _T("")); ! FileWrite(f, _T("STDMETHODIMP C%s::InterfaceSupportsErrorInfo(REFIID riid)"), m_sClass); ! FileWrite(f, _T("{")); ! FileWrite(f, _T("\tstatic const IID* arr[] = ")); ! FileWrite(f, _T("\t{")); ! FileWrite(f, _T("\t\t&IID_IClientCommands,")); ! FileWrite(f, _T("\t};")); ! FileWrite(f, _T("")); ! FileWrite(f, _T("\tfor (int i=0; i < sizeof(arr) / sizeof(arr[0]); i++)")); ! FileWrite(f, _T("\t{")); ! FileWrite(f, _T("\t\tif (InlineIsEqualGUID(*arr[i],riid))")); ! FileWrite(f, _T("\t\t\treturn S_OK;")); ! FileWrite(f, _T("\t}")); ! FileWrite(f, _T("\treturn S_FALSE;")); ! FileWrite(f, _T("}")); ! FileWrite(f, _T("")); ! FileWrite(f, _T("STDMETHODIMP C%s::Set(ULONG field, BSTR arg, VARIANT_BOOL target)"), m_sClass); ! FileWrite(f, _T("{")); ! FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());")); ! FileWrite(f, _T("")); ! FileWrite(f, _T("\t// TODO: Add your implementation code here")); ! FileWrite(f, _T("")); ! FileWrite(f, _T("\treturn S_OK;")); ! FileWrite(f, _T("}")); ! FileWrite(f, _T("")); ! FileWrite(f, _T("STDMETHODIMP C%s::SendCommand(ULONG cmd, BSTR arg1, BSTR arg2, VARIANT_BOOL target)"), m_sClass); ! FileWrite(f, _T("{")); ! FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());")); ! FileWrite(f, _T("")); ! FileWrite(f, _T("\t// TODO: Add your implementation code here")); ! FileWrite(f, _T("")); ! FileWrite(f, _T("\treturn S_OK;")); ! FileWrite(f, _T("}")); ! FileWrite(f, _T("")); ! FileWrite(f, _T("STDMETHODIMP C%s::Toggle(ULONG flag, VARIANT_BOOL target)"), m_sClass); ! FileWrite(f, _T("{")); ! FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());")); ! FileWrite(f, _T("")); ! FileWrite(f, _T("\t// TODO: Add your implementation code here")); ! FileWrite(f, _T("")); ! FileWrite(f, _T("\treturn S_OK;")); ! FileWrite(f, _T("}")); ! FileWrite(f, _T("")); ! FileWrite(f, _T("STDMETHODIMP C%s::SetSpawnInfo(BSTR id, ULONG type, ULONG amount, ULONG timelo, ULONG timehi, ULONG distance, ULONG rate)"), m_sClass); ! FileWrite(f, _T("{")); ! FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());")); ! FileWrite(f, _T("")); ! FileWrite(f, _T("\t// TODO: Add your implementation code here")); ! FileWrite(f, _T("")); ! FileWrite(f, _T("\treturn S_OK;")); ! FileWrite(f, _T("}")); ! FileWrite(f, _T("")); ! FileWrite(f, _T("STDMETHODIMP C%s::GetServerCommandCount(ULONG* count)"), m_sClass); ! FileWrite(f, _T("{")); ! FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());")); ! FileWrite(f, _T("")); ! FileWrite(f, _T("\t// TODO: Add your implementation code here")); ! FileWrite(f, _T("")); ! FileWrite(f, _T("\treturn S_OK;")); ! FileWrite(f, _T("}")); ! FileWrite(f, _T("")); ! FileWrite(f, _T("STDMETHODIMP C%s::GetServerCommandDescription(ULONG index, BSTR* description)"), m_sClass); ! FileWrite(f, _T("{")); ! FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());")); ! FileWrite(f, _T("")); ! FileWrite(f, _T("\t// TODO: Add your implementation code here")); ! FileWrite(f, _T("")); ! FileWrite(f, _T(" return S_OK;")); ! FileWrite(f, _T("}")); ! FileWrite(f, _T("")); ! FileWrite(f, _T("STDMETHODIMP C%s::InvokeServerCommand(ULONG index, BSTR arg)"), m_sClass); ! FileWrite(f, _T("{")); ! FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());")); ! FileWrite(f, _T("")); ! FileWrite(f, _T("\t// TODO: Add your implementation code here")); ! FileWrite(f, _T("")); ! FileWrite(f, _T("\treturn S_OK;")); ! FileWrite(f, _T("}")); ! FileWrite(f, _T("")); ! FileWrite(f, _T("STDMETHODIMP C%s::InvokeSettingEditor(void)"), m_sClass); ! FileWrite(f, _T("{")); ! FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());")); ! FileWrite(f, _T("")); ! FileWrite(f, _T("\t// TODO: Add your implementation code here")); ! FileWrite(f, _T("")); ! FileWrite(f, _T("\treturn S_OK;")); ! FileWrite(f, _T("}")); f.Close(); } --- 985,1082 ---- return; } ! FileWrite(f, _T("// %s.cpp : Implementation of C%s\n"), m_sClass, m_sClass); ! FileWrite(f, _T("\n")); ! FileWrite(f, _T("#include \"stdafx.h\"\n")); ! FileWrite(f, _T("#include \"%s.h\"\n"), m_sClass); ! FileWrite(f, _T("\n")); ! FileWrite(f, _T("\n")); ! FileWrite(f, _T("// C%s\n"), m_sClass); ! FileWrite(f, _T("\n")); ! FileWrite(f, _T("STDMETHODIMP C%s::InterfaceSupportsErrorInfo(REFIID riid)\n"), m_sClass); ! FileWrite(f, _T("{\n")); ! FileWrite(f, _T("\tstatic const IID* arr[] = \n")); ! FileWrite(f, _T("\t{\n")); ! FileWrite(f, _T("\t\t&IID_IClientCommands,\n")); ! FileWrite(f, _T("\t};\n")); ! FileWrite(f, _T("\n")); ! FileWrite(f, _T("\tfor (int i=0; i < sizeof(arr) / sizeof(arr[0]); i++)\n")); ! FileWrite(f, _T("\t{\n")); ! FileWrite(f, _T("\t\tif (InlineIsEqualGUID(*arr[i],riid))\n")); ! FileWrite(f, _T("\t\t\treturn S_OK;\n")); ! FileWrite(f, _T("\t}\n")); ! FileWrite(f, _T("\treturn S_FALSE;\n")); ! FileWrite(f, _T("}\n")); ! FileWrite(f, _T("\n")); ! FileWrite(f, _T("STDMETHODIMP C%s::Set(ULONG field, BSTR arg, VARIANT_BOOL target)\n"), m_sClass); ! FileWrite(f, _T("{\n")); ! FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());\n")); ! FileWrite(f, _T("\n")); ! FileWrite(f, _T("\t// TODO: Add your implementation code here\n")); ! FileWrite(f, _T("\n")); ! FileWrite(f, _T("\treturn S_OK;\n")); ! FileWrite(f, _T("}\n")); ! FileWrite(f, _T("\n")); ! FileWrite(f, _T("STDMETHODIMP C%s::SendCommand(ULONG cmd, BSTR arg1, BSTR arg2, VARIANT_BOOL target)\n"), m_sClass); ! FileWrite(f, _T("{\n")); ! FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());\n")); ! FileWrite(f, _T("\n")); ! FileWrite(f, _T("\t// TODO: Add your implementation code here\n")); ! FileWrite(f, _T("\n")); ! FileWrite(f, _T("\treturn S_OK;\n")); ! FileWrite(f, _T("}\n")); ! FileWrite(f, _T("\n")); ! FileWrite(f, _T("STDMETHODIMP C%s::Toggle(ULONG flag, VARIANT_BOOL target)\n"), m_sClass); ! FileWrite(f, _T("{\n")); ! FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());\n")); ! FileWrite(f, _T("\n")); ! FileWrite(f, _T("\t// TODO: Add your implementation code here\n")); ! FileWrite(f, _T("\n")); ! FileWrite(f, _T("\treturn S_OK;\n")); ! FileWrite(f, _T("}\n")); ! FileWrite(f, _T("\n")); ! FileWrite(f, _T("STDMETHODIMP C%s::SetSpawnInfo(BSTR id, ULONG type, ULONG amount, ULONG timelo, ULONG timehi, ULONG distance, ULONG rate)\n"), m_sClass); ! FileWrite(f, _T("{\n")); ! FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());\n")); ! FileWrite(f, _T("\n")); ! FileWrite(f, _T("\t// TODO: Add your implementation code here\n")); ! FileWrite(f, _T("\n")); ! FileWrite(f, _T("\treturn S_OK;\n")); ! FileWrite(f, _T("}\n")); ! FileWrite(f, _T("\n")); ! FileWrite(f, _T("STDMETHODIMP C%s::GetServerCommandCount(ULONG* count)\n"), m_sClass); ! FileWrite(f, _T("{\n")); ! FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());\n")); ! FileWrite(f, _T("\n")); ! FileWrite(f, _T("\t// TODO: Add your implementation code here\n")); ! FileWrite(f, _T("\n")); ! FileWrite(f, _T("\treturn S_OK;\n")); ! FileWrite(f, _T("}\n")); ! FileWrite(f, _T("\n")); ! FileWrite(f, _T("STDMETHODIMP C%s::GetServerCommandDescription(ULONG index, BSTR* description)\n"), m_sClass); ! FileWrite(f, _T("{\n")); ! FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());\n")); ! FileWrite(f, _T("\n")); ! FileWrite(f, _T("\t// TODO: Add your implementation code here\n")); ! FileWrite(f, _T("\n")); ! FileWrite(f, _T(" return S_OK;\n")); ! FileWrite(f, _T("}\n")); ! FileWrite(f, _T("\n")); ! FileWrite(f, _T("STDMETHODIMP C%s::InvokeServerCommand(ULONG index, BSTR arg)\n"), m_sClass); ! FileWrite(f, _T("{\n")); ! FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());\n")); ! FileWrite(f, _T("\n")); ! FileWrite(f, _T("\t// TODO: Add your implementation code here\n")); ! FileWrite(f, _T("\n")); ! FileWrite(f, _T("\treturn S_OK;\n")); ! FileWrite(f, _T("}\n")); ! FileWrite(f, _T("\n")); ! FileWrite(f, _T("STDMETHODIMP C%s::InvokeSettingEditor(void)\n"), m_sClass); ! FileWrite(f, _T("{\n")); ! FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());\n")); ! FileWrite(f, _T("\n")); ! FileWrite(f, _T("\t// TODO: Add your implementation code here\n")); ! FileWrite(f, _T("\n")); ! FileWrite(f, _T("\treturn S_OK;\n")); ! FileWrite(f, _T("}\n")); f.Close(); } *************** *** 1208,1212 **** // <tlb>.cpp // ********************** ! sFile.Format(_T("%s\\%s.tlb"), m_sPath, m_sLibrary); sLine.Format(_T("Creating file %s%c%c"), sFile, 0x0d, 0x0a); status.Append(sLine); --- 1243,1247 ---- // <tlb>.cpp // ********************** ! sFile.Format(_T("%s\\%s.cpp"), m_sPath, m_sLibrary); sLine.Format(_T("Creating file %s%c%c"), sFile, 0x0d, 0x0a); status.Append(sLine); *************** *** 1228,1232 **** FileWrite(f, _T("public :\n")); FileWrite(f, _T("\tDECLARE_LIBID(LIBID_%sLib)\n"), m_sLibrary); ! FileWrite(f, _T("\tDECLARE_REGISTRY_APPID_RESOURCEID(IDR_CLIENTCOMMANDS, \"{%s}\")\n"), m_sAppIDResourceGUID); FileWrite(f, _T("};\n")); FileWrite(f, _T("\n")); --- 1263,1267 ---- FileWrite(f, _T("public :\n")); FileWrite(f, _T("\tDECLARE_LIBID(LIBID_%sLib)\n"), m_sLibrary); ! FileWrite(f, _T("\tDECLARE_REGISTRY_APPID_RESOURCEID(IDR_%s, \"{%s}\")\n"), m_sClassUpper, m_sAppIDResourceGUID); FileWrite(f, _T("};\n")); FileWrite(f, _T("\n")); *************** *** 1365,1369 **** // <tlb>.vcproj // ********************** ! sFile.Format(_T("%s\\%s.sln"), m_sPath, m_sLibrary); sLine.Format(_T("Creating file %s%c%c"), sFile, 0x0d, 0x0a); status.Append(sLine); --- 1400,1404 ---- // <tlb>.vcproj // ********************** ! sFile.Format(_T("%s\\%s.vcproj"), m_sPath, m_sLibrary); sLine.Format(_T("Creating file %s%c%c"), sFile, 0x0d, 0x0a); status.Append(sLine); *************** *** 1671,1687 **** FileWrite(f, _T("1 TEXTINCLUDE \n")); FileWrite(f, _T("BEGIN\n")); ! FileWrite(f, _T(" \"resource.h\0\"\n")); FileWrite(f, _T("END\n")); FileWrite(f, _T("\n")); FileWrite(f, _T("2 TEXTINCLUDE \n")); FileWrite(f, _T("BEGIN\n")); ! FileWrite(f, _T(" \"#include \"\"afxres.h\"\"\r\n\"\n")); ! FileWrite(f, _T(" \"\0\"\n")); FileWrite(f, _T("END\n")); FileWrite(f, _T("\n")); FileWrite(f, _T("3 TEXTINCLUDE \n")); FileWrite(f, _T("BEGIN\n")); ! FileWrite(f, _T(" \"1 TYPELIB \"\"%s.tlb\"\"\r\n\"\n"), m_sLibrary); ! FileWrite(f, _T(" \"\0\"\n")); FileWrite(f, _T("END\n")); FileWrite(f, _T("\n")); --- 1706,1722 ---- FileWrite(f, _T("1 TEXTINCLUDE \n")); FileWrite(f, _T("BEGIN\n")); ! FileWrite(f, _T(" \"resource.h\\0\"\n")); FileWrite(f, _T("END\n")); FileWrite(f, _T("\n")); FileWrite(f, _T("2 TEXTINCLUDE \n")); FileWrite(f, _T("BEGIN\n")); ! FileWrite(f, _T(" \"#include \"\"afxres.h\"\"\\r\\n\"\n")); ! FileWrite(f, _T(" \"\\0\"\n")); FileWrite(f, _T("END\n")); FileWrite(f, _T("\n")); FileWrite(f, _T("3 TEXTINCLUDE \n")); FileWrite(f, _T("BEGIN\n")); ! FileWrite(f, _T(" \"1 TYPELIB \"\"%s.tlb\"\"\\r\\n\"\n"), m_sLibrary); ! FileWrite(f, _T(" \"\\0\"\n")); FileWrite(f, _T("END\n")); FileWrite(f, _T("\n")); *************** *** 1733,1738 **** FileWrite(f, _T("//\n")); FileWrite(f, _T("\n")); ! FileWrite(f, _T("IDR_%s REGISTRY \"%s.rgs\"\n"), m_sLibrary.MakeUpper(), m_sLibrary); ! FileWrite(f, _T("IDR_%s REGISTRY \"%s.rgs\"\n"), m_sClass.MakeUpper(), m_sClass); FileWrite(f, _T("\n")); FileWrite(f, _T("/////////////////////////////////////////////////////////////////////////////\n")); --- 1768,1773 ---- FileWrite(f, _T("//\n")); FileWrite(f, _T("\n")); ! FileWrite(f, _T("IDR_%s REGISTRY \"%s.rgs\"\n"), m_sLibraryUpper, m_sLibrary); ! FileWrite(f, _T("IDR_%s REGISTRY \"%s.rgs\"\n"), m_sClassUpper, m_sClass); FileWrite(f, _T("\n")); FileWrite(f, _T("/////////////////////////////////////////////////////////////////////////////\n")); *************** *** 1782,1787 **** FileWrite(f, _T("//\n")); FileWrite(f, _T("#define IDS_PROJNAME 100\n")); ! FileWrite(f, _T("#define IDR_%s 101\n"), m_sLibrary.MakeUpper()); ! FileWrite(f, _T("#define IDR_%s 103\n"), m_sClass.MakeUpper()); FileWrite(f, _T("\n")); FileWrite(f, _T("// Next default values for new objects\n")); --- 1817,1822 ---- FileWrite(f, _T("//\n")); FileWrite(f, _T("#define IDS_PROJNAME 100\n")); ! FileWrite(f, _T("#define IDR_%s 101\n"), m_sLibraryUpper); ! FileWrite(f, _T("#define IDR_%s 103\n"), m_sClassUpper); FileWrite(f, _T("\n")); FileWrite(f, _T("// Next default values for new objects\n")); Index: CCWizardDlg.h =================================================================== RCS file: /cvsroot/sphere-axis/Utilities/CCWizard/CCWizardDlg.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** CCWizardDlg.h 3 Oct 2003 17:38:27 -0000 1.2 --- CCWizardDlg.h 3 Oct 2003 21:17:53 -0000 1.3 *************** *** 46,49 **** --- 46,51 ---- CString m_sClass; CString m_sLibrary; + CString m_sClassUpper; + CString m_sLibraryUpper; // Functions to build C++ files |