cvs: php4 /ext/iisfunc iisfunc.cpp

phanto Thu Aug 16 09:21:46 2001 EDT Modified files: /php4/ext/iisfunc iisfunc.cpp Log: removed atl linkage Index: php4/ext/iisfunc/iisfunc.cpp diff -u php4/ext/iisfunc/iisfunc.cpp:1.4 php4/ext/iisfunc/iisfunc.cpp:1.5 --- php4/ext/iisfunc/iisfunc.cpp:1.4 Wed Aug 15 08:38:33 2001 +++ php4/ext/iisfunc/iisfunc.cpp Thu Aug 16 09:21:46 2001 @@ -15,7 +15,7 @@ | Authors: Frank M. Kromann <fmk@swwwing.com> | +----------------------------------------------------------------------+ */ -/* $Id: iisfunc.cpp,v 1.4 2001/08/15 12:38:33 phanto Exp $ */ +/* $Id: iisfunc.cpp,v 1.5 2001/08/16 13:21:46 phanto Exp $ */ /* iisfunc.cpp : Defines the entry point for the DLL application. */ @@ -25,14 +25,8 @@ #define UNICODE #define INITGUID -#include <windows.h> - -#define _ATL_DLL_IMPL - #include <iostream.h> #include <math.h> -#include <ks.h> -#include <atlbase.h> // ATL support #include <iadmw.h> // COM Interface header #include <iiscnfg.h> // MD_ & IIS_MD_ #defines @@ -63,14 +57,10 @@ WCHAR SubKeyName[METADATA_MAX_NAME_LEN]; WCHAR KeyName[METADATA_MAX_NAME_LEN]; WCHAR TestKey[METADATA_MAX_NAME_LEN]; - CComPtr <IMSAdminBase> pIMeta; + IMSAdminBase *pIMeta; DWORD indx = 0; - ((IMSAdminBase *) IISG(pIMeta))->AddRef(); /* Attach doesn't call AddRef() */ - pIMeta.Attach((IMSAdminBase *) IISG(pIMeta)); - - if (FAILED(hRes)) - return hRes; + pIMeta = (IMSAdminBase *) IISG(pIMeta); hRes = pIMeta->OpenKey(METADATA_MASTER_ROOT_HANDLE, L"/LM/W3SVC", METADATA_PERMISSION_READ, 20, &MyHandle); while (SUCCEEDED(hRes)){ @@ -111,14 +101,10 @@ WCHAR SubKeyName[METADATA_MAX_NAME_LEN]; WCHAR KeyName[METADATA_MAX_NAME_LEN]; WCHAR TestKey[METADATA_MAX_NAME_LEN]; - CComPtr <IMSAdminBase> pIMeta; + IMSAdminBase *pIMeta; DWORD indx = 0; - ((IMSAdminBase *) IISG(pIMeta))->AddRef(); /* Attach doesn't call AddRef() */ - pIMeta.Attach((IMSAdminBase *) IISG(pIMeta)); - - if (FAILED(hRes)) - return hRes; + pIMeta = (IMSAdminBase *) IISG(pIMeta); hRes = pIMeta->OpenKey(METADATA_MASTER_ROOT_HANDLE, L"/LM/W3SVC", METADATA_PERMISSION_READ, 20, &MyHandle); while (SUCCEEDED(hRes)){ @@ -159,14 +145,10 @@ WCHAR KeyName[METADATA_MAX_NAME_LEN]; WCHAR TestKey[METADATA_MAX_NAME_LEN]; DWORD ServerInstance; - CComPtr <IMSAdminBase> pIMeta; + IMSAdminBase *pIMeta; DWORD indx = 0; - ((IMSAdminBase *) IISG(pIMeta))->AddRef(); /* Attach doesn't call AddRef() */ - pIMeta.Attach((IMSAdminBase *) IISG(pIMeta)); - - if (FAILED(hRes)) - return hRes; + pIMeta = (IMSAdminBase *) IISG(pIMeta); swprintf(TestKey, L"1"); hRes = pIMeta->OpenKey(METADATA_MASTER_ROOT_HANDLE, L"/LM/W3SVC", METADATA_PERMISSION_READ, 20, &MyHandle); @@ -275,13 +257,9 @@ METADATA_HANDLE MyHandle; PBYTE pbBuffer = new BYTE[dwBuffer]; WCHAR SubKeyName[METADATA_MAX_NAME_LEN]; - CComPtr <IMSAdminBase> pIMeta; - - ((IMSAdminBase *) IISG(pIMeta))->AddRef(); /* Attach doesn't call AddRef() */ - pIMeta.Attach((IMSAdminBase *) IISG(pIMeta)); + IMSAdminBase *pIMeta; - if (FAILED(hRes)) - return hRes; + pIMeta = (IMSAdminBase *) IISG(pIMeta); hRes = pIMeta->OpenKey(METADATA_MASTER_ROOT_HANDLE, L"/LM/W3SVC", METADATA_PERMISSION_WRITE, 20, &MyHandle); if (SUCCEEDED(hRes)) { @@ -314,13 +292,9 @@ METADATA_HANDLE MyHandle; METADATA_RECORD MyRecord; WCHAR SubKeyName[METADATA_MAX_NAME_LEN]; - CComPtr <IMSAdminBase> pIMeta; - - ((IMSAdminBase *) IISG(pIMeta))->AddRef(); /* Attach doesn't call AddRef() */ - pIMeta.Attach((IMSAdminBase *) IISG(pIMeta)); + IMSAdminBase *pIMeta; - if (FAILED(hRes)) - return hRes; + pIMeta = (IMSAdminBase *) IISG(pIMeta); hRes = pIMeta->OpenKey(METADATA_MASTER_ROOT_HANDLE, L"/LM/W3SVC", METADATA_PERMISSION_WRITE, 20, &MyHandle); if (SUCCEEDED(hRes)) { @@ -351,13 +325,9 @@ METADATA_HANDLE MyHandle; METADATA_RECORD MyRecord; WCHAR SubKeyName[METADATA_MAX_NAME_LEN]; - CComPtr <IMSAdminBase> pIMeta; + IMSAdminBase *pIMeta; - ((IMSAdminBase *) IISG(pIMeta))->AddRef(); /* Attach doesn't call AddRef() */ - pIMeta.Attach((IMSAdminBase *) IISG(pIMeta)); - - if (FAILED(hRes)) - return hRes; + pIMeta = (IMSAdminBase *) IISG(pIMeta); hRes = pIMeta->OpenKey(METADATA_MASTER_ROOT_HANDLE, L"/LM/W3SVC", METADATA_PERMISSION_READ, 20, &MyHandle); if (SUCCEEDED(hRes)) { @@ -387,13 +357,9 @@ METADATA_HANDLE MyHandle; METADATA_RECORD MyRecord; WCHAR SubKeyName[METADATA_MAX_NAME_LEN]; - CComPtr <IMSAdminBase> pIMeta; - - ((IMSAdminBase *) IISG(pIMeta))->AddRef(); /* Attach doesn't call AddRef() */ - pIMeta.Attach((IMSAdminBase *) IISG(pIMeta)); + IMSAdminBase *pIMeta; - if (FAILED(hRes)) - return hRes; + pIMeta = (IMSAdminBase *) IISG(pIMeta); hRes = pIMeta->OpenKey(METADATA_MASTER_ROOT_HANDLE, L"/LM/W3SVC", METADATA_PERMISSION_WRITE, 20, &MyHandle); if (SUCCEEDED(hRes)) { @@ -424,13 +390,9 @@ METADATA_HANDLE MyHandle; METADATA_RECORD MyRecord; WCHAR SubKeyName[METADATA_MAX_NAME_LEN]; - CComPtr <IMSAdminBase> pIMeta; - - ((IMSAdminBase *) IISG(pIMeta))->AddRef(); /* Attach doesn't call AddRef() */ - pIMeta.Attach((IMSAdminBase *) IISG(pIMeta)); + IMSAdminBase *pIMeta; - if (FAILED(hRes)) - return hRes; + pIMeta = (IMSAdminBase *) IISG(pIMeta); hRes = pIMeta->OpenKey(METADATA_MASTER_ROOT_HANDLE, L"/LM/W3SVC", METADATA_PERMISSION_READ, 20, &MyHandle); if (SUCCEEDED(hRes)) { @@ -459,13 +421,9 @@ METADATA_HANDLE MyHandle; METADATA_RECORD MyRecord; WCHAR SubKeyName[METADATA_MAX_NAME_LEN]; - CComPtr <IMSAdminBase> pIMeta; + IMSAdminBase *pIMeta; - ((IMSAdminBase *) IISG(pIMeta))->AddRef(); /* Attach doesn't call AddRef() */ - pIMeta.Attach((IMSAdminBase *) IISG(pIMeta)); - - if (FAILED(hRes)) - return hRes; + pIMeta = (IMSAdminBase *) IISG(pIMeta); hRes = pIMeta->OpenKey(METADATA_MASTER_ROOT_HANDLE, L"/LM/W3SVC", METADATA_PERMISSION_WRITE, 20, &MyHandle); if (SUCCEEDED(hRes)) { @@ -497,14 +455,10 @@ METADATA_RECORD MyRecord; PBYTE pbBuffer = new BYTE[dwBuffer]; WCHAR SubKeyName[METADATA_MAX_NAME_LEN]; - CComPtr <IMSAdminBase> pIMeta; WCHAR NewData[65535]; + IMSAdminBase *pIMeta; - ((IMSAdminBase *) IISG(pIMeta))->AddRef(); /* Attach doesn't call AddRef() */ - pIMeta.Attach((IMSAdminBase *) IISG(pIMeta)); - - if (FAILED(hRes)) - return hRes; + pIMeta = (IMSAdminBase *) IISG(pIMeta); hRes = pIMeta->OpenKey(METADATA_MASTER_ROOT_HANDLE, L"/LM/W3SVC", METADATA_PERMISSION_READ, 20, &MyHandle); if (SUCCEEDED(hRes)) { @@ -551,15 +505,11 @@ METADATA_RECORD MyRecord; PBYTE pbBuffer = new BYTE[dwBuffer]; WCHAR SubKeyName[METADATA_MAX_NAME_LEN]; - CComPtr <IMSAdminBase> pIMeta; PBYTE temp; char extBuffer[256]; + IMSAdminBase *pIMeta; - ((IMSAdminBase *) IISG(pIMeta))->AddRef(); /* Attach doesn't call AddRef() */ - pIMeta.Attach((IMSAdminBase *) IISG(pIMeta)); - - if (FAILED(hRes)) - return hRes; + pIMeta = (IMSAdminBase *) IISG(pIMeta); hRes = pIMeta->OpenKey(METADATA_MASTER_ROOT_HANDLE, L"/LM/W3SVC", METADATA_PERMISSION_READ, 20, &MyHandle); if (SUCCEEDED(hRes)) { @@ -594,14 +544,11 @@ METADATA_RECORD MyRecord; WCHAR SubKeyName[METADATA_MAX_NAME_LEN]; WCHAR TestKey[METADATA_MAX_NAME_LEN]; - CComPtr <IMSAdminBase> pIMeta; DWORD isolated = 0; + IMSAdminBase *pIMeta; - ((IMSAdminBase *) IISG(pIMeta))->AddRef(); /* Attach doesn't call AddRef() */ - pIMeta.Attach((IMSAdminBase *) IISG(pIMeta)); + pIMeta = (IMSAdminBase *) IISG(pIMeta); - if (FAILED(hRes)) - return hRes; hRes = pIMeta->OpenKey(METADATA_MASTER_ROOT_HANDLE, L"/LM/W3SVC", METADATA_PERMISSION_WRITE, 20, &MyHandle); if (SUCCEEDED(hRes)) { memset(SubKeyName , 0, sizeof(SubKeyName));