[PATCH] ole32: Return IUnknown interface from GITCF_CreateInstance if requested

[Alex Henrie]

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com>
---
Without this patch, ArcMap.exe (part of ArcGIS Desktop 10.6) crashes
shortly after starting.
---
 dlls/ole32/git.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c
index f7a0460154..10a15e43d5 100644
--- a/dlls/ole32/git.c
+++ b/dlls/ole32/git.c
@@ -314,7 +314,8 @@ static HRESULT WINAPI
 GITCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pUnk,
                      REFIID riid, LPVOID *ppv)
 {
-  if (IsEqualIID(riid,&IID_IGlobalInterfaceTable)) {
+  if (IsEqualIID(riid, &IID_IUnknown) ||
+      IsEqualIID(riid, &IID_IGlobalInterfaceTable)) {
     IGlobalInterfaceTable *git = get_std_git();
     return IGlobalInterfaceTable_QueryInterface(git, riid, ppv);
   }
-- 
2.18.0

[Zebediah Figura]

On 07/07/18 00:40, Alex Henrie wrote:
> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com>
> ---
> Without this patch, ArcMap.exe (part of ArcGIS Desktop 10.6) crashes
> shortly after starting.
> ---
>  dlls/ole32/git.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c
> index f7a0460154..10a15e43d5 100644
> --- a/dlls/ole32/git.c
> +++ b/dlls/ole32/git.c
> @@ -314,7 +314,8 @@ static HRESULT WINAPI
>  GITCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pUnk,
>                       REFIID riid, LPVOID *ppv)
>  {
> -  if (IsEqualIID(riid,&IID_IGlobalInterfaceTable)) {
> +  if (IsEqualIID(riid, &IID_IUnknown) ||
> +      IsEqualIID(riid, &IID_IGlobalInterfaceTable)) {
>      IGlobalInterfaceTable *git = get_std_git();
>      return IGlobalInterfaceTable_QueryInterface(git, riid, ppv);
>    }

Shouldn't we just git rid of the check? I'd think interface checking
should be done inside of QueryInterface().