・ MBCS->Unicode対応

[seraphyscrtools/SeraphyScriptTools.git] / SeraphyScriptTools.cpp

diff --git a/SeraphyScriptTools.cpp b/SeraphyScriptTools.cpp
index dedb6e4..3d08a04 100644 (file)
--- a/SeraphyScriptTools.cpp
+++ b/SeraphyScriptTools.cpp
@@ -30,23 +30,23 @@
 CComModule _Module;
 
 BEGIN_OBJECT_MAP(ObjectMap)
-OBJECT_ENTRY(CLSID_SeraphyScriptTools_Instance, CInstance)
-OBJECT_ENTRY(CLSID_CommDialog, CCommDialog)
-OBJECT_ENTRY(CLSID_Canvas, CCanvas)
-OBJECT_ENTRY(CLSID_OverlappedWindow, COverlappedWindow)
-OBJECT_ENTRY(CLSID_ObjectMap, CObjectMap)
-OBJECT_ENTRY(CLSID_SeraphyScriptTools_Shell, CShell)
-OBJECT_ENTRY(CLSID_ObjectVector, CObjectVector)
-//OBJECT_ENTRY(CLSID_Control, CControl)
-//OBJECT_ENTRY(CLSID_Layer, CLayer)
-//OBJECT_ENTRY(CLSID_Form, CForm)
-//OBJECT_ENTRY(CLSID_Event, CEvent)
-//OBJECT_ENTRY(CLSID_EnumSelect, CEnumSelect)
-//OBJECT_ENTRY(CLSID_TreeItem, CTreeItem)
-//OBJECT_ENTRY(CLSID_ShellExecObj, CShellExecObj)
-//OBJECT_ENTRY(CLSID_ProfileSection, CProfileSection)
-OBJECT_ENTRY(CLSID_ParseName, CParseName)
-OBJECT_ENTRY(CLSID_PrivateProfile, CPrivateProfile)
+       OBJECT_ENTRY(CLSID_SeraphyScriptTools_Instance, CInstance)
+       OBJECT_ENTRY(CLSID_CommDialog, CCommDialog)
+       OBJECT_ENTRY(CLSID_Canvas, CCanvas)
+       OBJECT_ENTRY(CLSID_OverlappedWindow, COverlappedWindow)
+       OBJECT_ENTRY(CLSID_ObjectMap, CObjectMap)
+       OBJECT_ENTRY(CLSID_SeraphyScriptTools_Shell, CShell)
+       OBJECT_ENTRY(CLSID_ObjectVector, CObjectVector)
+       //OBJECT_ENTRY(CLSID_Control, CControl)
+       //OBJECT_ENTRY(CLSID_Layer, CLayer)
+       //OBJECT_ENTRY(CLSID_Form, CForm)
+       //OBJECT_ENTRY(CLSID_Event, CEvent)
+       //OBJECT_ENTRY(CLSID_EnumSelect, CEnumSelect)
+       //OBJECT_ENTRY(CLSID_TreeItem, CTreeItem)
+       //OBJECT_ENTRY(CLSID_ShellExecObj, CShellExecObj)
+       //OBJECT_ENTRY(CLSID_ProfileSection, CProfileSection)
+       OBJECT_ENTRY(CLSID_ParseName, CParseName)
+       OBJECT_ENTRY(CLSID_PrivateProfile, CPrivateProfile)
 END_OBJECT_MAP()
 
 /////////////////////////////////////////////////////////////////////////////
@@ -55,17 +55,16 @@ END_OBJECT_MAP()
 extern "C"
 BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/)
 {
-    if (dwReason == DLL_PROCESS_ATTACH)
-    {
+       if (dwReason == DLL_PROCESS_ATTACH) {
                // \83R\83\82\83\93\83R\83\93\83g\83\8d\81[\83\8b\82Ì\83N\83\89\83X\96¼\82ð\93o\98^\82·\82é
                InitCommonControls();
                //
-        _Module.Init(ObjectMap, hInstance, &LIBID_SERAPHYSCRIPTTOOLSLib);
-        DisableThreadLibraryCalls(hInstance);
-    }
-    else if (dwReason == DLL_PROCESS_DETACH)
-        _Module.Term();
-    return TRUE;    // ok
+               _Module.Init(ObjectMap, hInstance, &LIBID_SERAPHYSCRIPTTOOLSLib);
+               DisableThreadLibraryCalls(hInstance);
+       }
+       else if (dwReason == DLL_PROCESS_DETACH)
+               _Module.Term();
+       return TRUE;    // ok
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -73,7 +72,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/)
 
 STDAPI DllCanUnloadNow(void)
 {
-    return (_Module.GetLockCount()==0) ? S_OK : S_FALSE;
+       return (_Module.GetLockCount() == 0) ? S_OK : S_FALSE;
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -81,7 +80,7 @@ STDAPI DllCanUnloadNow(void)
 
 STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
 {
-    return _Module.GetClassObject(rclsid, riid, ppv);
+       return _Module.GetClassObject(rclsid, riid, ppv);
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -89,8 +88,8 @@ STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
 
 STDAPI DllRegisterServer(void)
 {
-    // \83I\83u\83W\83F\83N\83g\81A\83^\83C\83v\83\89\83C\83u\83\89\83\8a\82¨\82æ\82Ñ\83^\83C\83v\83\89\83C\83u\83\89\83\8a\93à\82Ì\91S\82Ä\82Ì\83C\83\93\83^\81[\83t\83F\83C\83X\82ð\93o\98^\82µ\82Ü\82·
-    return _Module.RegisterServer(TRUE);
+       // \83I\83u\83W\83F\83N\83g\81A\83^\83C\83v\83\89\83C\83u\83\89\83\8a\82¨\82æ\82Ñ\83^\83C\83v\83\89\83C\83u\83\89\83\8a\93à\82Ì\91S\82Ä\82Ì\83C\83\93\83^\81[\83t\83F\83C\83X\82ð\93o\98^\82µ\82Ü\82·
+       return _Module.RegisterServer(TRUE);
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -98,7 +97,7 @@ STDAPI DllRegisterServer(void)
 
 STDAPI DllUnregisterServer(void)
 {
-    return _Module.UnregisterServer(TRUE);
+       return _Module.UnregisterServer(TRUE);
 }