Changeset 2257

Timestamp:

07/16/08 01:55:20 (6 months ago)

Author:

mdcurran

Message:

NVDAHelper: add some debugging messages that go to standard error when things go wrong. However, of course NVDA will only catch messages in its process, in its log file. Made IA2Support_initialize, installIA2Support and uninstallIA2Support return True or False depending on whether they succeeded. They check all ole function calls etc for success/failier. Added IA2Support_terminate() which calls uninstallIA2Support(). IA2Support_terminate() is called from NVDAHelper's terminate function. This means that IAccessible2 support will be properly cleaned up in NVDA's process as NVDAHelper is terminated.

Location:

trunk/source/NVDAHelper

Files:

• IA2Support.c (modified) (2 diffs)
• IA2Support.h (modified) (1 diff)
• hookManager.c (modified) (2 diffs)

trunk/source/NVDAHelper/IA2Support.c

@@ -29 +29 @@
 IUnknown* IA2DllPunk=NULL;
 
-void installIA2Support() {
+BOOL installIA2Support() {
         LPFNGETCLASSOBJECT IA2Dll_DllGetClassObject;
         int i;
-        if(isIA2Installed) return;
-        IA2DllHandle=CoLoadLibrary(IA2DllPath,TRUE);
-        if(IA2DllHandle==0) return;
-        IA2Dll_DllGetClassObject=(LPFNGETCLASSOBJECT)GetProcAddress(IA2DllHandle,"DllGetClassObject");
-        IA2Dll_DllGetClassObject(&IAccessible2ProxyIID,&IID_IUnknown,(LPVOID*)&IA2DllPunk);
-        CoRegisterClassObject(&IAccessible2ProxyIID,IA2DllPunk,CLSCTX_LOCAL_SERVER,REGCLS_MULTIPLEUSE,(LPDWORD)&IA2RegCooky);
+        int res;
+        if(isIA2Installed) return TRUE;
+        if((IA2DllHandle=CoLoadLibrary(IA2DllPath,TRUE))==NULL) {
+                fprintf(stderr,"Error loading IAccessible2 proxy dll\n");
+                return FALSE;
+        }
+        if((IA2Dll_DllGetClassObject=(LPFNGETCLASSOBJECT)GetProcAddress(IA2DllHandle,"DllGetClassObject"))==NULL) {
+                fprintf(stderr,"Error locating DllGetClassObject function in IAccessible2 proxy dll\n");
+                return FALSE;
+        }
+        if((res=IA2Dll_DllGetClassObject(&IAccessible2ProxyIID,&IID_IUnknown,(LPVOID*)&IA2DllPunk))!=S_OK) {
+                fprintf(stderr,"Error calling DllGetClassObject, code %d\n",res);
+                return FALSE;
+        }
+        if((res=CoRegisterClassObject(&IAccessible2ProxyIID,IA2DllPunk,CLSCTX_LOCAL_SERVER,REGCLS_MULTIPLEUSE,(LPDWORD)&IA2RegCooky))!=S_OK) {
+                fprintf(stderr,"Error registering class object, code %d\n",res);
+                return FALSE;
+        }
         for(i=0;i<ia2InterfaceCount;i++) {
                 CoGetPSClsid(&(ia2ClsidArray[i][0]),&(ia2ClsidArray[i][1]));
-                CoRegisterPSClsid(&(ia2ClsidArray[i][0]),&IAccessible2ProxyIID);
+                if((res=CoRegisterPSClsid(&(ia2ClsidArray[i][0]),&IAccessible2ProxyIID))!=S_OK) {
+                        fprintf(stderr,"Error registering PSClsid for interface %d, code %d\n",i,res);
+                        return FALSE;
+                }
         }
         isIA2Installed=TRUE;
+        return TRUE;
 }
 
-void uninstallIA2Support() {
+BOOL uninstallIA2Support() {
         int i;
+        int res;
         if(IA2DllHandle!=0) {
         for(i=0;i<ia2InterfaceCount;i++) {
-                        CoRegisterPSClsid(&(ia2ClsidArray[i][0]),&(ia2ClsidArray[i][1]));
+                        if((res=CoRegisterPSClsid(&(ia2ClsidArray[i][0]),&(ia2ClsidArray[i][1])))!=S_OK) {
+                                fprintf(stderr,"Error reregistering previous PSClsid for interface %d, code %d\n",i,res);
+                                return FALSE;
+                        }
                 }
-                CoRevokeClassObject(IA2RegCooky);
+                if((res=CoRevokeClassObject(IA2RegCooky))!=S_OK) {
+                        fprintf(stderr,"Error revoking class object, code %d\n",res);
+                        return FALSE;
+                }
                 CoFreeUnusedLibrariesEx(0,0);
                 IA2DllHandle=0;
                 isIA2Installed=FALSE;
         }
+        return TRUE;
 }
 
-void IA2Support_initialize() {
+BOOL IA2Support_initialize() {
         int count=0;
         GetFullPathName(L"lib/IAccessible2Proxy.dll",256,IA2DllPath,NULL);
@@ -75 +99 @@
         ia2ClsidArray[count++][0]=IID_IAccessibleValue;
         isIA2Initialized=TRUE;
-        installIA2Support();
+        if(!installIA2Support()) {
+                fprintf(stderr,"Error installing IA2 support\n");
+                return FALSE;
+        }
+        return TRUE;
 }
+
+BOOL IA2Support_terminate() {
+        if(!uninstallIA2Support()) {
+                fprintf(stderr,"Error uninstalling IA2 support\n");
+                return FALSE;
+        }
+        return TRUE;
+}

trunk/source/NVDAHelper/IA2Support.h

@@ -12 +12 @@
 
 //Private functions
-void IA2Support_initialize();
-void installIA2Support();
+BOOL IA2Support_initialize();
+BOOL installIA2Support();
+BOOL uninstallIA2Support();
+BOOL IA2Support_terminate();
 
 #endif

trunk/source/NVDAHelper/hookManager.c

@@ -71 +71 @@
         GetWindowThreadProcessId(GetDesktopWindow(),&desktopProcessID);
         GetWindowThreadProcessId(GetShellWindow(),&shellProcessID);
-        IA2Support_initialize();
+        if(!IA2Support_initialize()) {
+                fprintf(stderr,"Error initializing IA2 support\n");
+                return -1;
+        }
         if((getMessageHookID=SetWindowsHookEx(WH_GETMESSAGE,(HOOKPROC)getMessageHook,moduleHandle,0))==0) {
                 fprintf(stderr,"Error registering window message hook\n");
@@ -105 +108 @@
                 return -1;
         }
+        if(!IA2Support_terminate()) {
+                fprintf(stderr,"Error terminating IA2 support\n");
+                return -1;
+        }
         isManagerInitialized=FALSE;
         return 0;