getAccId: Still not tested, but it now compiles.

diff --git a/nvdaHelper/vbufBackends/adobeFlash/adobeFlash.cpp b/nvdaHelper/vbufBackends/adobeFlash/adobeFlash.cpp
index edd945b..971ea20 100644 (file)
--- a/nvdaHelper/vbufBackends/adobeFlash/adobeFlash.cpp
+++ b/nvdaHelper/vbufBackends/adobeFlash/adobeFlash.cpp
@@ -15,6 +15,7 @@ http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 #include <sstream>\r
 #include <map>\r
 #include <windows.h>\r
+#include <initguid.h>\r
 #include <oleacc.h>\r
 #include <common/log.h>\r
 #include <remote/nvdaHelperRemote.h>\r
@@ -157,7 +158,7 @@ int id=accChildID;
 }\r
 \r
 long AdobeFlashVBufBackend_t::getAccId(IAccessible* acc) {\r
-       IAccessibleIdentity* accId = NULL;\r
+       IAccIdentity* accId = NULL;\r
        if (acc->QueryInterface(IID_IAccIdentity, (void**)&accId) != S_OK || !accId)\r
                return -1;\r
        BYTE* idString=NULL;\r

diff --git a/nvdaHelper/vbufBackends/adobeFlash/adobeFlash.h b/nvdaHelper/vbufBackends/adobeFlash/adobeFlash.h
index f9d9f8c..54c9322 100644 (file)
--- a/nvdaHelper/vbufBackends/adobeFlash/adobeFlash.h
+++ b/nvdaHelper/vbufBackends/adobeFlash/adobeFlash.h
@@ -15,6 +15,7 @@ http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 #ifndef VIRTUALBUFFER_BACKENDS_ADOBEFLASH_H\r
 #define VIRTUALBUFFER_BACKENDS_ADOBEFLASH_H\r
 \r
+#include <oleacc.h>\r
 #include <set>\r
 #include <vbufBase/backend.h>\r
 \r

diff --git a/nvdaHelper/vbufBackends/adobeFlash/sconscript b/nvdaHelper/vbufBackends/adobeFlash/sconscript
index 1cfc544..88254cf 100644 (file)
--- a/nvdaHelper/vbufBackends/adobeFlash/sconscript
+++ b/nvdaHelper/vbufBackends/adobeFlash/sconscript
@@ -28,6 +28,7 @@ adobeFlashBackendLib=env.SharedLibrary(
                "kernel32",\r
                "oleacc",\r
                "oleaut32",\r
+               "ole32",\r
        ],\r
 )\r
 \r