Repository navigation
Ensure IAccessible2 remains available in Firefox after restarting NVDA on Windows 10 Creaters update, register ISimpleDOM proxy to allow math in Google Chrome without Firefox installed, and Allow the user to get back a virtualBuffer when restarting NVDA with a Firefox document in focus #7535
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| <?xml version="1.0" encoding="UTF-8" standalone="yes"?> | ||
| <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> | ||
| <assemblyIdentity type="win32" name="%proxyName%" version="1.0.0.0" /> | ||
| <file name="%proxyName%.dll"> | ||
| <comInterfaceProxyStub name="%proxyName%" proxyStubClsid32="%proxyClsid%" iid="%proxyClsid%" /> | ||
| </file> | ||
| </assembly> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,167 @@ | ||
| /* | ||
| This file is a part of the NVDA project. | ||
| URL: http://www.nvda-project.org/ | ||
| Copyright 2006-2010 NVDA contributers. | ||
|
Contributor
There was a problem hiding this comment. The years listed are wrong. This also doesn't match the format we have on the wiki: https://github.com/nvaccess/nvda/wiki/Copyright-headers |
||
| This program is free software: you can redistribute it and/or modify | ||
| it under the terms of the GNU General Public License version 2.0, as published by | ||
| the Free Software Foundation. | ||
| This program is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
| This license can be found at: | ||
| http://www.gnu.org/licenses/old-licenses/gpl-2.0.html | ||
| */ | ||
|
|
||
| #include <cstdio> | ||
| #include <cwchar> | ||
| #include <string> | ||
| #include <locale> | ||
| #include <codecvt> | ||
| #include <vector> | ||
| #define WIN32_LEAN_AND_MEAN | ||
| #define CINTERFACE | ||
| #include <windows.h> | ||
| #include <objbase.h> | ||
| #include <rpcproxy.h> | ||
| #include <common/log.h> | ||
| #include "dllmain.h" | ||
| #include "COMProxyRegistration.h" | ||
|
|
||
| using namespace std; | ||
|
|
||
| typedef void(RPC_ENTRY *LPFNGETPROXYDLLINFO)(ProxyFileInfo***, CLSID**); | ||
|
|
||
| const wchar_t* StringCLSID_StandardMarshaler=L"{00020424-0000-0000-C000-000000000046}"; | ||
|
Contributor
There was a problem hiding this comment. perhaps you could add a comment to this line? Is there a reference for this value? |
||
|
|
||
| COMProxyRegistration_t* registerCOMProxy(wchar_t* dllPath) { | ||
| LOG_DEBUG(L"Registering proxy "<<dllPath); | ||
| int res; | ||
| // Fetch the CLSID for the standard marshaler which will be used to unregister PS CLSIDs later | ||
| CLSID clsid_standardMarshaler; | ||
| if((res=IIDFromString(StringCLSID_StandardMarshaler,&clsid_standardMarshaler))!=S_OK) { | ||
|
Contributor
There was a problem hiding this comment. I would prefer to see these kind of checks split into two lines: |
||
| LOG_ERROR(L"Could not get clsid for standard marshaler"); | ||
| return nullptr; | ||
| } | ||
| // Generate a new unique CLSID to use for class object registration | ||
| CLSID regClsid={0}; | ||
| if((res=CoCreateGuid(®Clsid))!=S_OK) { | ||
| LOG_ERROR(L"Unable to generate registration CLSID"); | ||
| return nullptr; | ||
| } | ||
| // load the proxy dll | ||
| wchar_t absDllPath[MAX_PATH]={0}; | ||
| wsprintf(absDllPath,L"%s\\%s",dllDirectory,dllPath); | ||
| HMODULE dllHandle=LoadLibrary(absDllPath); | ||
| if(dllHandle==NULL) { | ||
|
|
||
| LOG_ERROR(L"LoadLibrary failed for "<<dllPath); | ||
| return nullptr; | ||
| } | ||
| // look up the GetProxyDllInfo function on the proxy dll | ||
| LPFNGETPROXYDLLINFO Dll_GetProxyDllInfo=(LPFNGETPROXYDLLINFO)GetProcAddress(dllHandle,"GetProxyDllInfo"); | ||
| if(Dll_GetProxyDllInfo==NULL) { | ||
|
Contributor
There was a problem hiding this comment. nullptr |
||
| LOG_ERROR(L"GetProxyDllInfo function not found in "<<dllPath); | ||
| FreeLibrary(dllHandle); | ||
| return nullptr; | ||
| } | ||
| // Fetch the proxy information from the dll (interface IIDs and the proxy stub CLSID) | ||
| CLSID* pProxyClsid=NULL; | ||
| ProxyFileInfo** pProxyInfo=NULL; | ||
| Dll_GetProxyDllInfo(&pProxyInfo,&pProxyClsid); | ||
| if(!pProxyClsid||!pProxyInfo) { | ||
| LOG_ERROR(L"Could not fetch proxy information from "<<dllPath); | ||
| FreeLibrary(dllHandle); | ||
| return nullptr; | ||
| } | ||
| // Create and activate an activation context using the manifest in the proxy dll | ||
| // to temporarily register the proxy dll's class object | ||
| ACTCTX actCtx={0}; | ||
| actCtx.cbSize=sizeof(actCtx); | ||
| actCtx.dwFlags=ACTCTX_FLAG_HMODULE_VALID|ACTCTX_FLAG_RESOURCE_NAME_VALID; | ||
| actCtx.lpResourceName=MAKEINTRESOURCE(2); | ||
|
|
||
| actCtx.hModule=dllHandle; | ||
| HANDLE hActCtx=CreateActCtx(&actCtx); | ||
| if(hActCtx==NULL) { | ||
| LOG_ERROR(L"Could not create activation context for "<<dllPath); | ||
| FreeLibrary(dllHandle); | ||
| return nullptr; | ||
| } | ||
| ULONG_PTR actCtxCookie; | ||
| if(!ActivateActCtx(hActCtx,&actCtxCookie)) { | ||
| LOG_ERROR(L"Error activating activation context for "<<dllPath); | ||
| ReleaseActCtx(hActCtx); | ||
| FreeLibrary(dllHandle); | ||
| return nullptr; | ||
| } | ||
| // Fetch the class object (which will come from the proxy dll) | ||
| IUnknown* ClassObjPunk=NULL; | ||
| res=CoGetClassObject(*pProxyClsid,CLSCTX_INPROC_SERVER,nullptr,IID_IUnknown,(void**)&ClassObjPunk); | ||
| // From here we no longer need the activation context | ||
| DeactivateActCtx(0,actCtxCookie); | ||
| ReleaseActCtx(hActCtx); | ||
| if(res!=S_OK) { | ||
| LOG_ERROR(L"Error fetching class object for "<<dllPath<<L", code "<<res); | ||
| FreeLibrary(dllHandle); | ||
| return nullptr; | ||
| } | ||
| // Re-register the class object with COM now that the activation context is gone. | ||
| // Keeping the class object available to COM, with COM also handling the life time of the proxy dll now | ||
| DWORD dwCookie; | ||
| res=CoRegisterClassObject(regClsid,ClassObjPunk,CLSCTX_INPROC_SERVER,REGCLS_MULTIPLEUSE,&dwCookie); | ||
| ClassObjPunk->lpVtbl->Release(ClassObjPunk); | ||
| if(res!=S_OK) { | ||
| LOG_ERROR(L"Error registering class object for "<<dllPath<<L", code "<<res); | ||
| FreeLibrary(dllHandle); | ||
| return nullptr; | ||
| } | ||
| COMProxyRegistration_t* reg= new COMProxyRegistration_t(); | ||
| reg->dllPath=dllPath; | ||
| reg->classObjectRegistrationCookie=dwCookie; | ||
| // For all interfaces the proxy dll supports, register its CLSID as their proxy stub CLSID | ||
| ProxyFileInfo** tempInfoPtr=pProxyInfo; | ||
| while(*tempInfoPtr) { | ||
| ProxyFileInfo& fileInfo=**tempInfoPtr; | ||
| for(unsigned short idx=0;idx<fileInfo.TableSize;++idx) { | ||
| IID iid=*(fileInfo.pStubVtblList[idx]->header.piid); | ||
| CLSID clsidBackup={0}; | ||
| wstring_convert<codecvt_utf8_utf16<wchar_t>> converter; | ||
| wstring name=converter.from_bytes(fileInfo.pNamesArray[idx]); | ||
| // Fetch the old CLSID for this interface if one is set, so we can replace it on deregistration. | ||
| // If not set, then we'll use the standard marshaler clsid on deregistration. | ||
| if((res=CoGetPSClsid(iid,&clsidBackup))!=S_OK) { | ||
| clsidBackup=clsid_standardMarshaler; | ||
| } else { | ||
| LOG_DEBUG(L"Backed up existing clsid for interface "<<name); | ||
| } | ||
| if((res=CoRegisterPSClsid(iid,regClsid))!=S_OK) { | ||
| LOG_ERROR(L"Unable to register interface "<<name<<L" with proxy stub "<<dllPath<<L", code "<<res); | ||
| continue; | ||
| } | ||
| reg->psClsidBackups.push_back({name,iid,clsidBackup}); | ||
| LOG_DEBUG(L"Registered interface "<<name); | ||
| } | ||
| ++tempInfoPtr; | ||
|
Contributor
There was a problem hiding this comment. Is there some docs you can point to on ProxyFileInfo? I'm a little nervous about this code. So |
||
| } | ||
| // We can now safely free the proxy dll. COM will keep it loaded or re-load it if needed | ||
| FreeLibrary(dllHandle); | ||
| LOG_DEBUG(L"Done registering proxy "<<dllPath); | ||
| return reg; | ||
| } | ||
|
|
||
| bool unregisterCOMProxy(COMProxyRegistration_t* reg) { | ||
| if(!reg) return false; | ||
| HRESULT res; | ||
| LOG_DEBUG(L"Unregistering proxy "<<(reg->dllPath)); | ||
| for(auto& backup: reg->psClsidBackups) { | ||
| if((res=CoRegisterPSClsid(backup.iid,backup.clsid))!=S_OK) { | ||
| LOG_ERROR(L"Error registering backup PSClsid for interface "<<(backup.name)<<L" from "<<(reg->dllPath)<<L", code "<<res); | ||
| } | ||
| LOG_DEBUG(L"Unregistered interface "<<(backup.name)); | ||
| } | ||
| if((res=CoRevokeClassObject((DWORD)(reg->classObjectRegistrationCookie)))!=S_OK) { | ||
| LOG_ERROR(L"Error unregistering class object from "<<(reg->dllPath)<<L", code "<<res); | ||
|
Contributor
There was a problem hiding this comment. For this (and the other error case on line 156) should the function exit early, why is it ok to continue to |
||
| } | ||
| LOG_DEBUG(L"Done unregistering proxy "<<(reg->dllPath)); | ||
| delete reg; | ||
| return true; | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /* | ||
| This file is a part of the NVDA project. | ||
| URL: http://www.nvda-project.org/ | ||
| Copyright 2006-2010 NVDA contributers. | ||
|
Contributor
There was a problem hiding this comment. See copyright headers https://github.com/nvaccess/nvda/wiki/Copyright-headers |
||
| This program is free software: you can redistribute it and/or modify | ||
| it under the terms of the GNU General Public License version 2.0, as published by | ||
| the Free Software Foundation. | ||
| This program is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
| This license can be found at: | ||
| http://www.gnu.org/licenses/old-licenses/gpl-2.0.html | ||
| */ | ||
|
|
||
| #ifndef NVDAHELPER_COMPROXYREGISTRATION | ||
| #define NVDAHELPER_COMPROXYREGISTRATION | ||
|
|
||
| #include <string> | ||
| #include <locale> | ||
| #include <codecvt> | ||
| #include <vector> | ||
| #define WIN32_LEAN_AND_MEAN | ||
| #include <windows.h> | ||
| #include <objbase.h> | ||
|
|
||
| // Tracks information about a COM interface registered in-process | ||
| typedef struct { | ||
| // The name of the interface (for debugging) | ||
| std::wstring name; | ||
| // The unique identifier of the interface | ||
| IID iid; | ||
| // The CLSID of the original class object that handled creating / proxying of this interface. | ||
| // Used when unregistering, so we can put things back the way they were | ||
| CLSID clsid; | ||
| } PSClsidBackup_t; | ||
|
|
||
| // Represents the registration of a COM proxy dll and its interfaces. | ||
| // this can be used for later unregistration of the COM proxy dll | ||
| typedef struct { | ||
| // The path to the dll (for debugging) | ||
| std::wstring dllPath; | ||
| // The cookie returned by CoRegisterClassObject, for later unregistration via CoRevokeClassObject | ||
| ULONG_PTR classObjectRegistrationCookie; | ||
| // Information for all the interfaces registered for this proxy dll via CoRegisterPSClsid | ||
| std::vector<PSClsidBackup_t> psClsidBackups; | ||
| } COMProxyRegistration_t; | ||
|
|
||
| /* Registers a COM proxy dll and all its interfaces for this process so that they can be marshalled to/from other processes | ||
| @param dllPath the relative path to the proxy dll (relative from this dll) | ||
| @return registration data which can be later passed to UnregisterCOMProxy. | ||
| */ | ||
| COMProxyRegistration_t* registerCOMProxy(wchar_t* dllPath); | ||
|
|
||
| /* Unregisters a COM proxy dll originally registered with registerCOMProxy | ||
| @param reg the registration data returned by registerCOMProxy. | ||
| @return true if successful, false otherwise | ||
| */ | ||
| bool unregisterCOMProxy(COMProxyRegistration_t* reg); | ||
|
|
||
| #endif | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If I understand this code right, I think the last part of this example result should be:
{0xab, 0xcd, 0xab, 0xcd, 0xef, 0x12, 0x34, 0x56}