/////////////////////////////////////////////////////////////////////////////
// CShell
-STDMETHODIMP CShell::InterfaceSupportsErrorInfo(REFIID riid)
-{
- static const IID* arr[] =
- {
- &IID_ISeraphyScriptTools_Shell
- };
- for (int i=0; i < sizeof(arr) / sizeof(arr[0]); i++)
- {
- if (IsEqualGUID(*arr[i],riid))
- return S_OK;
- }
- return S_FALSE;
-}
-
STDMETHODIMP CShell::ShellExecute(VARIANT path, VARIANT param, VARIANT initdir, VARIANT show, VARIANT *punkVal)
{
ATL::CString szPath;
int nShow = SW_SHOWNORMAL;
CComVariant varMode;
if (varMode.ChangeType(VT_I2, &show) == S_OK) {
- switch (varMode.iVal)
- {
- case 0:
+ switch (varMode.iVal) {
+ case 0:
nShow = SW_HIDE;
break;
- case 1:
- default:
+ case 1:
+ default:
nShow = SW_SHOWNORMAL;
break;
- case 2:
+ case 2:
nShow = SW_SHOWMAXIMIZED;
break;
- case 3:
+ case 3:
nShow = SW_SHOWMINIMIZED;
break;
- case 4:
+ case 4:
nShow = SW_SHOWMINNOACTIVE;
break;
}
//
SHELLEXECUTEINFO info = {0};
info.cbSize = sizeof(SHELLEXECUTEINFO);
- info.fMask = SEE_MASK_DOENVSUBST | SEE_MASK_NOCLOSEPROCESS;
- info.hwnd = GetMainWindow();
+ info.fMask = SEE_MASK_DOENVSUBST | SEE_MASK_NOCLOSEPROCESS;
+ info.hwnd = GetMainWindow();
info.lpVerb = _TEXT("OPEN");
info.lpFile = szPath;
info.lpParameters = szParam;
- info.lpDirectory = szInitDir;
- info.nShow = nShow;
+ info.lpDirectory = szInitDir;
+ info.nShow = nShow;
if (ShellExecuteEx(&info)) {
// ShellExecObj\82Ì\90¶\90¬
CComObject<CShellExecObj>* pExec = NULL;
pExec->m_hProcess = info.hProcess;
IUnknown* pUnk = NULL;
pExec->QueryInterface(IID_IUnknown, (void**)&pUnk);
- punkVal->vt = VT_UNKNOWN;
+ punkVal->vt = VT_UNKNOWN;
punkVal->punkVal = pUnk;
}
}
bExit = false;
}
}
- pVal->vt = VT_BOOL;
+ pVal->vt = VT_BOOL;
pVal->boolVal = bExit ? VB_TRUE : VB_FALSE;
return S_OK;
}
public:
SPECIALFOLDERPAIR(LPCTSTR arg_name, int arg_id) {
name = arg_name;
- id = arg_id;
+ id = arg_id;
}
LPCTSTR name;
int id;
lst.push_back(SPECIALFOLDERPAIR(_TEXT("TEMPLATES"), CSIDL_TEMPLATES));
lst.push_back(SPECIALFOLDERPAIR(_TEXT("WINDOWS"), CSIDL_WINDOWS));
}
- else{
+ else {
// Win9x
lst.push_back(SPECIALFOLDERPAIR(_TEXT("ADMINTOOLS"), CSIDL_ADMINTOOLS));
lst.push_back(SPECIALFOLDERPAIR(_TEXT("ALTSTARTUP"), CSIDL_ALTSTARTUP));
OSVERSIONINFO vinfo = {0};
vinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
GetVersionEx(&vinfo);
- *pVal = (vinfo.dwPlatformId == VER_PLATFORM_WIN32_NT);
+ *pVal = (vinfo.dwPlatformId == VER_PLATFORM_WIN32_NT);
return S_OK;
}
return S_OK;
}
-STDMETHODIMP CShell::GetDLLVersion(VARIANT text,VARIANT min, VARIANT *pVal)
+STDMETHODIMP CShell::GetDLLVersion(VARIANT text, VARIANT min, VARIANT *pVal)
{
ATL::CString lpszDllName;
CComVariant varText;
- if (varText.ChangeType(VT_BSTR,&text) == S_OK) {
+ if (varText.ChangeType(VT_BSTR, &text) == S_OK) {
lpszDllName = varText.bstrVal;
}
BOOL bMin = false;
CComVariant varMin;
- if(varMin.ChangeType(VT_I2,&min) == S_OK){
+ if (varMin.ChangeType(VT_I2, &min) == S_OK) {
bMin = varMin.iVal;
}
CComVariant ret;
- DWORD siz = GetFileVersionInfoSize(lpszDllName,0);
+ DWORD siz = GetFileVersionInfoSize(lpszDllName, 0);
if (siz) {
std::vector<BYTE> buf(siz + 1);
LPBYTE pBuf = &buf[0];
- if (GetFileVersionInfo(lpszDllName, 0, siz,pBuf)) {
+ if (GetFileVersionInfo(lpszDllName, 0, siz, pBuf)) {
// \83o\81[\83W\83\87\83\93\8fî\95ñ\82ð\8eæ\93¾\82·\82é
VS_FIXEDFILEINFO* pverInfo;
UINT sz = 0;
- if (VerQueryValue(pBuf,_TEXT("\\"), (void**) &pverInfo, &sz)) {
+ if (VerQueryValue(pBuf, _TEXT("\\"), (void**)&pverInfo, &sz)) {
// \83o\81[\83W\83\87\83\93\82ð\8am\94F\89Â\94\\82Å\82 \82é
TCHAR mes[256];
if (bMin) {
::VariantInit(pVal);
CComVariant varText;
- if (varText.ChangeType(VT_BSTR,&text) == S_OK) {
+ if (varText.ChangeType(VT_BSTR, &text) == S_OK) {
CComObject<CParseName>* pParse = NULL;
if (pParse->CreateInstance(&pParse) == S_OK) {
pParse->m_bstr_path = (LPCWSTR)varText.bstrVal;
IUnknown* pUnk = NULL;
- if (pParse->QueryInterface(IID_IUnknown,(void**)&pUnk) == S_OK) {
- pVal->vt = VT_UNKNOWN;
+ if (pParse->QueryInterface(IID_IUnknown, (void**)&pUnk) == S_OK) {
+ pVal->vt = VT_UNKNOWN;
pVal->punkVal = pUnk;
}
}
&IID_ISeraphyScriptTool_ParseName
};
- for (int i=0; i < sizeof(arr) / sizeof(arr[0]); i++) {
+ for (int i = 0; i < sizeof(arr) / sizeof(arr[0]); i++) {
if (IsEqualGUID(*arr[i], riid)) {
return S_OK;
}
WCHAR buf[MAX_PATH];
lstrcpyW(buf, m_bstr_path);
LPWSTR p = buf;
- while(*p)p++;
- while(p > buf){
- if(*p == '\\' || *p == '/'){
+ while (*p)p++;
+ while (p > buf) {
+ if (*p == '\\' || *p == '/') {
// \96\96\94ö\82©\82ç\8dÅ\8f\89\82É\94\8c©\82³\82ê\82½\83t\83H\83\8b\83_\83v\83\8c\81[\83X\82Å\8e~\82Ü\82é
p++;
break;
{
BOOL bFind = false;
LPWSTR p = m_bstr_path;
- while(*p)p++;
+ while (*p)p++;
while (p > (LPCWSTR)m_bstr_path) {
if (*p == '.') {
bFind = true;
STDMETHODIMP CParseName::put_Extention(BSTR newVal)
{
WCHAR buf[MAX_PATH];
- lstrcpyW(buf,m_bstr_path);
+ lstrcpyW(buf, m_bstr_path);
BOOL bFind = false;
LPWSTR p = buf;
while (*p) p++;
STDMETHODIMP CParseName::get_Name(BSTR *pVal)
{
WCHAR buf[MAX_PATH];
- lstrcpyW(buf,m_bstr_path);
+ lstrcpyW(buf, m_bstr_path);
LPWSTR p = buf;
- while(*p)p++;
- while(p > buf){
- if(*p == '\\' || *p == '/'){
+ while (*p)p++;
+ while (p > buf) {
+ if (*p == '\\' || *p == '/') {
p++;
break;
}
p--;
}
LPWSTR p2 = p;
- while(*p2){
- if(*p2 == '.'){
+ while (*p2) {
+ if (*p2 == '.') {
*p2 = 0;
break;
}
STDMETHODIMP CParseName::put_Name(BSTR newVal)
{
WCHAR buf[MAX_PATH];
- WCHAR ext[MAX_PATH] = { 0 };
- lstrcpyW(buf,m_bstr_path);
+ WCHAR ext[MAX_PATH] = {0};
+ lstrcpyW(buf, m_bstr_path);
LPWSTR p = buf;
- while(*p)p++;
- while(p > buf){
- if(*p == '\\' || *p == '/'){
+ while (*p)p++;
+ while (p > buf) {
+ if (*p == '\\' || *p == '/') {
p++;
break;
}
p--;
}
LPWSTR p2 = p;
- while(*p2){
- if(*p2 == '.'){
+ while (*p2) {
+ if (*p2 == '.') {
p2++;
- lstrcpyW(ext,p2);
+ lstrcpyW(ext, p2);
break;
}
p2++;
}
- lstrcpyW(p,newVal);
- while(*p)p++;
+ lstrcpyW(p, newVal);
+ while (*p)p++;
*p++ = '.';
- lstrcpyW(p,ext);
+ lstrcpyW(p, ext);
m_bstr_path = buf;
return S_OK;
}
STDMETHODIMP CParseName::get_Drive(BSTR *pVal)
{
WCHAR buf[MAX_PATH];
- lstrcpyW(buf,m_bstr_path);
+ lstrcpyW(buf, m_bstr_path);
LPWSTR p = buf;
- while(*p){
- if(*p == ':'){
+ while (*p) {
+ if (*p == ':') {
// \83h\83\89\83C\83u\8bæ\90Ø\82è\81A\82Ü\82½\82Í\83v\83\8d\83g\83R\83\8b\82ð\94\8c©\82µ\82½
- *(p+1) = 0;
+ *(p + 1) = 0;
p = buf;
break;
}
STDMETHODIMP CParseName::put_Drive(BSTR newVal)
{
WCHAR buf[MAX_PATH];
- lstrcpyW(buf,newVal);
+ lstrcpyW(buf, newVal);
LPWSTR p2 = buf;
- while(*p2)p2++;
+ while (*p2)p2++;
LPWSTR p = m_bstr_path;
BOOL bFind = false;
- while(*p){
- if(*p == ':'){
+ while (*p) {
+ if (*p == ':') {
// \83h\83\89\83C\83u\8bæ\90Ø\82è\81A\82Ü\82½\82Í\83v\83\8d\83g\83R\83\8b\82ð\94\8c©\82µ\82½
p++;
bFind = true;
}
p++;
}
- if(!bFind){
+ if (!bFind) {
p = m_bstr_path;
}
- lstrcpyW(p2,p);
+ lstrcpyW(p2, p);
m_bstr_path = buf;
return S_OK;
}
WCHAR buf[MAX_PATH];
LPWSTR p = m_bstr_path;
BOOL bFind = false;
- while(*p){
- if(*p == ':'){
+ while (*p) {
+ if (*p == ':') {
// \83h\83\89\83C\83u\8bæ\90Ø\82è\81A\82Ü\82½\82Í\83v\83\8d\83g\83R\83\8b\82ð\94\8c©\82µ\82½
p++;
bFind = true;
}
p++;
}
- if(!bFind){
+ if (!bFind) {
p = m_bstr_path;
}
- lstrcpyW(buf,p);
+ lstrcpyW(buf, p);
p = buf;
- while(*p)p++;
- while(p >= buf){
- if(*p == '\\' || *p== '/'){
+ while (*p)p++;
+ while (p >= buf) {
+ if (*p == '\\' || *p == '/') {
// \83t\83H\83\8b\83_\83v\83\8c\83C\83X\82ð\94\8c©\82µ\82½
- if(p-1 > buf && (*(p-1) == '\\' || *(p-1) == '/')){
+ if (p - 1 > buf && (*(p - 1) == '\\' || *(p - 1) == '/')) {
// \83l\83b\83g\83\8f\81[\83N\83p\83X\82É\93\9e\92B\82µ\82½\8fê\8d\87\82Í\96³\8e\8b\82·\82é
break;
}
STDMETHODIMP CShell::get_Confirm(BOOL *pVal)
{
- *pVal = (m_bConfirm)?VB_TRUE:VB_FALSE;
+ *pVal = (m_bConfirm) ? VB_TRUE : VB_FALSE;
return S_OK;
}
STDMETHODIMP CShell::get_Silent(BOOL *pVal)
{
- *pVal = (m_bSilent)?VB_TRUE:VB_FALSE;
+ *pVal = (m_bSilent) ? VB_TRUE : VB_FALSE;
return S_OK;
}
return FileOperationCore(FO_MOVE, 0, &from, &to, pVal);
}
-STDMETHODIMP CShell::Delete(VARIANT from,VARIANT *pVal)
+STDMETHODIMP CShell::Delete(VARIANT from, VARIANT *pVal)
{
return FileOperationCore(FO_DELETE, 0, &from, NULL, pVal);
}
ATL::CString szTo;
if (to) {
CComVariant varTo;
- if(to->vt != VT_NULL && to->vt != VT_ERROR || to->vt == VT_EMPTY
+ if (to->vt != VT_NULL && to->vt != VT_ERROR || to->vt == VT_EMPTY
|| varTo.ChangeType(VT_BSTR, to) != S_OK) {
return DISP_E_TYPEMISMATCH;
}
}
SHFILEOPSTRUCT info = {0};
- info.fFlags = flag | FOF_ALLOWUNDO | (m_bSilent?FOF_SILENT:0) | (m_bConfirm?0:(FOF_NOCONFIRMMKDIR|FOF_NOCONFIRMATION));
- info.hwnd = GetMainWindow();
- info.pFrom = &buf[0];
- info.pTo = pTo;
- info.wFunc = wFunc;
+ info.fFlags = flag | FOF_ALLOWUNDO | (m_bSilent ? FOF_SILENT : 0) | (m_bConfirm ? 0 : (FOF_NOCONFIRMMKDIR | FOF_NOCONFIRMATION));
+ info.hwnd = GetMainWindow();
+ info.pFrom = &buf[0];
+ info.pTo = pTo;
+ info.wFunc = wFunc;
int ret = SHFileOperation(&info);
result = (bool)(!ret && !info.fAnyOperationsAborted);
int bufsiz = tmp.GetLength() + 2; // \83_\83u\83\8b\83k\83\8b\8fI\92[\95ª
buf.resize(bufsiz, 0);
LPTSTR pBuf = &buf[0];
- StringCbCopy(pBuf, bufsiz, tmp);
+ StringCchCopy(pBuf, bufsiz, tmp);
return true;
}
// Unknown -> IObjectVector \82É\95Ï\8a·\89Â\94\\82©?
if (varFrom.ChangeType(VT_UNKNOWN, &from) == S_OK) {
IObjectVector* pVector = NULL;
- if (varFrom.punkVal->QueryInterface(IID_IObjectVector,(void**)&pVector) != S_OK) {
+ if (varFrom.punkVal->QueryInterface(IID_IObjectVector, (void**)&pVector) != S_OK) {
// IObjectVector\82Å\82Í\82È\82¢\82È\82ç\83G\83\89\81[
return false;
}
long cnt = 0;
// \94z\97ñ\91S\91Ì\82Ì\83T\83C\83Y\82ð\8b\81\82ß\82é
DWORD needsize = 0;
- for(cnt = 0 ; cnt < mx ; cnt++){
+ for (cnt = 0; cnt < mx; cnt++) {
CComVariant tmp;
CComVariant idx((long)cnt);
- pVector->get_Value(idx,&tmp);
- if(tmp.ChangeType(VT_BSTR) != S_OK){
+ pVector->get_Value(idx, &tmp);
+ if (tmp.ChangeType(VT_BSTR) != S_OK) {
// \95¶\8e\9a\97ñ\82É\95Ï\8a·\95s\89Â\94\
return false;
}
buf.resize(needsize, 0);
LPTSTR pBuf = &buf[0];
LPTSTR p = pBuf;
- for (cnt = 0 ; cnt < mx ; cnt++) {
+ for (cnt = 0; cnt < mx; cnt++) {
CComVariant tmp;
CComVariant idx((long)cnt);
if (SUCCEEDED(pVector->get_Value(idx, &tmp))) {
if (tmp.ChangeType(VT_BSTR) == S_OK) {
ATL::CString szTmp(tmp.bstrVal);
- StringCbCopy(p, needsize, szTmp);
+ StringCchCopy(p, needsize, szTmp);
int len = szTmp.GetLength() + 1;
p += len;
needsize -= len;
DWORD needsize = 0;
long dim[1];
// \83o\83b\83t\83@\82É\95K\97v\82È\83T\83C\83Y\82ð\8b\81\82ß\82é
- for (long cnt = 0 ; cnt <= ub ; cnt++) {
+ for (long cnt = 0; cnt <= ub; cnt++) {
CComVariant tmp;
dim[0] = cnt;
SafeArrayGetElement(pArray, dim, &tmp);
buf.resize(needsize);
LPTSTR pBuf = &buf[0];
LPTSTR p = pBuf;
- for (long cnt = 0 ; cnt <= ub ; cnt++) {
+ for (long cnt = 0; cnt <= ub; cnt++) {
CComVariant tmp;
dim[0] = cnt;
SafeArrayGetElement(pArray, dim, &tmp);
}
ATL::CString szTmp(tmp.bstrVal);
- StringCbCopy(p, needsize, szTmp);
+ StringCchCopy(p, needsize, szTmp);
int len = szTmp.GetLength() + 1;
p += len;
needsize -= len;
}
}
- SHEmptyRecycleBin(NULL, pTarget, (m_bConfirm?0:SHERB_NOCONFIRMATION) | (m_bSilent?(SHERB_NOPROGRESSUI|SHERB_NOSOUND) : 0));
+ SHEmptyRecycleBin(NULL, pTarget, (m_bConfirm ? 0 : SHERB_NOCONFIRMATION) | (m_bSilent ? (SHERB_NOPROGRESSUI | SHERB_NOSOUND) : 0));
return S_OK;
}
{
LPCTSTR pTarget = NULL;
- if(text.vt == VT_NULL || text.vt == VT_ERROR || text.vt == VT_EMPTY){
+ if (text.vt == VT_NULL || text.vt == VT_ERROR || text.vt == VT_EMPTY) {
// \97\9a\97ð\82ð\83N\83\8a\83A\82·\82é
pTarget = NULL;
}
else {
ATL::CString szPath;
CComVariant varText;
- if (varText.ChangeType(VT_BSTR, &text) == S_OK){
+ if (varText.ChangeType(VT_BSTR, &text) == S_OK) {
// \93Á\92è\82Ì\83t\83@\83C\83\8b\82ð\92Ç\89Á\82·\82é
- szPath = text.bstrVal;
+ szPath = varText.bstrVal;
if (!szPath.IsEmpty()) {
// \8bó\95¶\8e\9a\82Å\82È\82¯\82ê\82Î
pTarget = szPath;
}
}
- else{
+ else {
// \95Ï\8a·\95s\89Â
return DISP_E_TYPEMISMATCH;
}
STDMETHODIMP CShell::SetMainWindow(VARIANT varUnk)
{
// \8aù\91¶\82Ì\83C\83\93\83^\81[\83t\83F\83C\83X\82Ì\89ð\95ú
- if(m_pMainWindow){
+ if (m_pMainWindow) {
m_pMainWindow->Release();
m_pMainWindow = NULL;
}
CComVariant varRet;
CComVariant varName;
- if (varName.ChangeType(VT_BSTR, &name) != S_OK){
+ if (varName.ChangeType(VT_BSTR, &name) != S_OK) {
return DISP_E_TYPEMISMATCH;
}
ATL::CString szPath(varName.bstrVal);
DWORD attr = GetFileAttributes(szPath);
- if (attr != (DWORD) -1) {
+ if (attr != (DWORD)-1) {
if (attr & FILE_ATTRIBUTE_DIRECTORY) {
varRet = 2;
}
OSDN Git Service
