OSDN Git Service

(root) / seraphyscrtools / SeraphyScriptTools.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
・ MBCS->Unicode対応
[seraphyscrtools/SeraphyScriptTools.git] / Instance.cpp
diff --git a/Instance.cpp b/Instance.cpp
index 1148d71..aeb2c10 100644 (file)
--- a/Instance.cpp
+++ b/Instance.cpp
@@ -12,19 +12,19 @@ CInstance::CInstance()
 {
        // \83\81\83C\83\93\83E\83B\83\93\83h\83E\82Ì\90\90¬
        m_pMainWindow = NULL;
-       if(m_pMainWindow->CreateInstance(&m_pMainWindow) == S_OK){
+       if (m_pMainWindow->CreateInstance(&m_pMainWindow) == S_OK) {
                m_pMainWindow->AddRef();
                // \83I\81[\83o\81[\83\89\83b\83v\83E\83B\83\93\83h\83E\83\8a\83X\83g\82É\92Ç\89Á
                m_lstOverlappedWnd.push_back(m_pMainWindow);
        }
        // \83R\83\82\83\93\83_\83C\83A\83\8d\83O\83C\83\93\83^\81[\83t\83F\83C\83X\82Ì\90\90¬
        m_pCommDlg = NULL;
-       if(m_pCommDlg->CreateInstance(&m_pCommDlg) == S_OK){
+       if (m_pCommDlg->CreateInstance(&m_pCommDlg) == S_OK) {
                m_pCommDlg->AddRef();
                // \83\81\83C\83\93\83E\83B\83\93\83h\83E\82ð\83R\83\82\83\93\83_\83C\83A\83\8d\83O\83C\83\93\83^\81[\83t\83F\83C\83X\82É\90Ú\91±\82·\82é
-               if(m_pMainWindow){
+               if (m_pMainWindow) {
                        IUnknown* pUnk = NULL;
-                       if(m_pMainWindow->QueryInterface(IID_IUnknown,(void**)&pUnk) == S_OK){
+                       if (m_pMainWindow->QueryInterface(IID_IUnknown, (void**)&pUnk) == S_OK) {
                                CComVariant varUnk(pUnk);
                                m_pCommDlg->SetMainWindow(varUnk);
                        }
@@ -38,18 +38,18 @@ void CInstance::FinalRelease()
 {
        ATLTRACE("CInstance::FinalRelease\r\n");
        // \83\81\83C\83\93\83E\83B\83\93\83h\83E\82Ì\89ð\95ú
-       if(m_pMainWindow){
+       if (m_pMainWindow) {
                m_pMainWindow->Release();
                m_pMainWindow = NULL;
        }
        // \83R\83\82\83\93\83_\83C\83A\83\8d\83O\83C\83\93\83^\81[\83t\83F\83C\83X\82Ì\89ð\95ú
-       if(m_pCommDlg){
+       if (m_pCommDlg) {
                m_pCommDlg->Release();
                m_pCommDlg = NULL;
        }
        // \83|\83b\83v\83A\83b\83v\83E\83B\83\93\83h\83E\82Ì\89ð\95ú
        list<CComObject<COverlappedWindow>*>::iterator p = m_lstOverlappedWnd.begin();
-       while(p != m_lstOverlappedWnd.end()){
+       while (p != m_lstOverlappedWnd.end()) {
                (*p)->Close();
                (*p)->Release();
                p = m_lstOverlappedWnd.erase(p);
@@ -60,10 +60,10 @@ STDMETHODIMP CInstance::get_Dialog(VARIANT *pVal)
 {
        // \83R\83\82\83\93\83_\83C\83A\83\8d\83O\83C\83\93\83^\81[\83t\83F\83C\83X\82ð\95Ô\82·
        ::VariantInit(pVal);
-       if(m_pCommDlg){
+       if (m_pCommDlg) {
                IUnknown *pUnk = NULL;
-               if(m_pCommDlg->QueryInterface(IID_IUnknown,(void**)&pUnk) == S_OK){
-                       pVal->vt      = VT_UNKNOWN;
+               if (m_pCommDlg->QueryInterface(IID_IUnknown, (void**)&pUnk) == S_OK) {
+                       pVal->vt = VT_UNKNOWN;
                        pVal->punkVal = pUnk;
                }
        }
@@ -75,12 +75,12 @@ STDMETHODIMP CInstance::CreateFrame(VARIANT *pvarUnk)
        ::VariantInit(pvarUnk);
        // \8eQ\8fÆ\83J\83E\83\93\83g\82ª1\82Â\82µ\82©\82È\82¢\83E\83B\83\93\83h\83E\82Ì\94j\8aü\82ð\8ds\82¤
        list<CComObject<COverlappedWindow>*>::iterator p = m_lstOverlappedWnd.begin();
-       while(p != m_lstOverlappedWnd.end()){
-               if((*p)->m_dwRef == 1){
+       while (p != m_lstOverlappedWnd.end()) {
+               if ((*p)->m_dwRef == 1) {
                        // \8eQ\8fÆ\83J\83E\83\93\83g\82ª1\82µ\82©\82È\82¢ = \82±\82Ì\83N\83\89\83X\82µ\82©\8eg\82Á\82Ä\82¢\82È\82¢ = \95s\97v
                        BOOL bVisible = false;
                        (*p)->get_Visible(&bVisible);
-                       if(!bVisible){
+                       if (!bVisible) {
                                // \95\\8e¦\82³\82ê\82Ä\82¢\82È\82¯\82ê\82Î\8fÁ\82µ\82Ä\82æ\82µ\81B
                                (*p)->Release();
                                p = m_lstOverlappedWnd.erase(p);
@@ -91,14 +91,14 @@ STDMETHODIMP CInstance::CreateFrame(VARIANT *pvarUnk)
        }
        // \83E\83B\83\93\83h\83E\82Ì\90\90¬
        CComObject<COverlappedWindow>* pNewWnd = NULL;
-       if(pNewWnd->CreateInstance(&pNewWnd) == S_OK){
+       if (pNewWnd->CreateInstance(&pNewWnd) == S_OK) {
                pNewWnd->AddRef();
                pNewWnd->put_WaitCursor(m_dWaitCursor);
                m_lstOverlappedWnd.push_back(pNewWnd);
                // \83C\83\93\83^\81[\83t\83F\83C\83X\82Ì\8eæ\93¾
                IUnknown* pUnk = NULL;
-               if(pNewWnd->QueryInterface(IID_IUnknown,(void**)&pUnk) == S_OK){
-                       pvarUnk->vt      = VT_UNKNOWN;
+               if (pNewWnd->QueryInterface(IID_IUnknown, (void**)&pUnk) == S_OK) {
+                       pvarUnk->vt = VT_UNKNOWN;
                        pvarUnk->punkVal = pUnk;
                }
        }
@@ -111,36 +111,36 @@ STDMETHODIMP CInstance::WaitEvent(VARIANT varTim, VARIANT *pvarUnk)
        // \91Ò\8b@\8e\9e\8aÔ\82Ì\8eæ\93¾
        DWORD sleeptim = 1000;
        CComVariant tim;
-       if(tim.ChangeType(VT_I4,&varTim) == S_OK){
+       if (tim.ChangeType(VT_I4, &varTim) == S_OK) {
                sleeptim = (DWORD)tim.lVal;
        }
-       if(sleeptim == 0){
+       if (sleeptim == 0) {
                sleeptim = INFINITE;
        }
        // \82·\82×\82Ä\82Ì\83|\83b\83v\83A\83b\83v\83E\83B\83\93\83h\83E\82Ì\83C\83x\83\93\83g\83n\83\93\83h\83\8b\82ð\8eæ\93¾\82·\82é
-       HANDLE hEvent[MAXIMUM_WAIT_OBJECTS] = { NULL };
-       HWND   hWnd  [MAXIMUM_WAIT_OBJECTS] = { NULL };
-       CComObject<COverlappedWindow>* pOverlapped[MAXIMUM_WAIT_OBJECTS] = { NULL };
+       HANDLE hEvent[MAXIMUM_WAIT_OBJECTS] = {NULL};
+       HWND   hWnd[MAXIMUM_WAIT_OBJECTS] = {NULL};
+       CComObject<COverlappedWindow>* pOverlapped[MAXIMUM_WAIT_OBJECTS] = {NULL};
        int count = 0;
        int n = 0;
        list<CComObject<COverlappedWindow>*>::iterator p = m_lstOverlappedWnd.begin();
-       while(p != m_lstOverlappedWnd.end()){
+       while (p != m_lstOverlappedWnd.end()) {
                n = count;
-               (*p)->SetWaitParam(&count,hWnd,hEvent);
-               for(;n<count;n++){
+               (*p)->SetWaitParam(&count, hWnd, hEvent);
+               for (; n < count; n++) {
                        pOverlapped[n] = *p;
                }
                p++;
        }
        // \83\81\83b\83Z\81[\83W\83\8b\81[\83v
-       if(count > 0){
-               DWORD ret = pOverlapped[0]->MessageLoop(sleeptim,count,hWnd,hEvent);
-               if(ret > 0 && ret <= (DWORD)count){
-                       if(pOverlapped[ret-1]){
+       if (count > 0) {
+               DWORD ret = pOverlapped[0]->MessageLoop(sleeptim, count, hWnd, hEvent);
+               if (ret > 0 && ret <= (DWORD)count) {
+                       if (pOverlapped[ret - 1]) {
                                // OVERLAPPEDWINDOW\83I\83u\83W\83F\83N\83g\82Ö\82Ì\83C\83\93\83^\81[\83t\83F\83C\83X\82ð\95Ô\82·
                                IUnknown* pUnk = NULL;
-                               if(pOverlapped[ret - 1]->QueryInterface(IID_IUnknown,(void**)&pUnk) == S_OK){
-                                       pvarUnk->vt      = VT_UNKNOWN;
+                               if (pOverlapped[ret - 1]->QueryInterface(IID_IUnknown, (void**)&pUnk) == S_OK) {
+                                       pvarUnk->vt = VT_UNKNOWN;
                                        pvarUnk->punkVal = pUnk;
                                }
                        }
@@ -152,10 +152,10 @@ STDMETHODIMP CInstance::WaitEvent(VARIANT varTim, VARIANT *pvarUnk)
 STDMETHODIMP CInstance::get_MainFrame(VARIANT *pVal)
 {
        ::VariantInit(pVal);
-       if(m_pMainWindow){
+       if (m_pMainWindow) {
                IUnknown* pUnk = NULL;
-               if(m_pMainWindow->QueryInterface(IID_IUnknown,(void**)&pUnk) == S_OK){
-                       pVal->vt      = VT_UNKNOWN;
+               if (m_pMainWindow->QueryInterface(IID_IUnknown, (void**)&pUnk) == S_OK) {
+                       pVal->vt = VT_UNKNOWN;
                        pVal->punkVal = pUnk;
                }
        }
@@ -173,7 +173,7 @@ STDMETHODIMP CInstance::put_WaitCursor(short newVal)
        m_dWaitCursor = newVal;
        // \82·\82×\82Ä\82Ì\83|\83b\83v\83A\83b\83v\83E\83B\83\93\83h\83E\82É\83E\83F\83C\83g\83J\81[\83\\83\8b\92l\82ð\90Ý\92è\82·\82é
        list<CComObject<COverlappedWindow>*>::iterator p = m_lstOverlappedWnd.begin();
-       while(p != m_lstOverlappedWnd.end()){
+       while (p != m_lstOverlappedWnd.end()) {
                (*p)->put_WaitCursor(newVal);
                p++;
        }
@@ -183,31 +183,31 @@ STDMETHODIMP CInstance::put_WaitCursor(short newVal)
 STDMETHODIMP CInstance::get_Keyboard(VARIANT vk, BOOL *pVal)
 {
        CComVariant varVk;
-       if(varVk.ChangeType(VT_I2,&vk) != S_OK){
+       if (varVk.ChangeType(VT_I2, &vk) != S_OK) {
                return DISP_E_TYPEMISMATCH;
        }
-       *pVal = (GetAsyncKeyState(varVk.iVal) & 0x8000)?VB_TRUE:VB_FALSE;
+       *pVal = (GetAsyncKeyState(varVk.iVal) & 0x8000) ? VB_TRUE : VB_FALSE;
        return S_OK;
 }
 
-STDMETHODIMP CInstance::get_MousePosX(short *pVal)
+STDMETHODIMP CInstance::get_MousePosX(long *pVal)
 {
        POINT pt;
        ::GetCursorPos(&pt);
-       *pVal = (short)pt.x; //UNDONE: \90¸\93x\82ª\97\8e\82¿\82Ä\82¢\82é\81B
+       *pVal = pt.x;
        return S_OK;
 }
 
-STDMETHODIMP CInstance::get_MousePosY(short *pVal)
+STDMETHODIMP CInstance::get_MousePosY(long *pVal)
 {
        POINT pt;
        ::GetCursorPos(&pt);
-       *pVal = (short)pt.y; //UNDONE: \90¸\93x\82ª\97\8e\82¿\82Ä\82¢\82é\81B
+       *pVal = pt.y;
        return S_OK;
 }
 
 STDMETHODIMP CInstance::get_Version(double *pVal)
 {
-       *pVal = 0.91;
+       *pVal = 0.92;
        return S_OK;
 }
SeraphyScriptTools v1.1以降のソースコード管理
About OSDN
Find Software
Develop Software
Help