Re: setupapi: Implement installing catalog files

[Vincent Povirk]

The patch you sent doesn't match the subject line.

Vincent Povirk



On Wed, Oct 15, 2008 at 11:05 AM, Maarten Lankhorst
<maarten(a)codeweavers.com> wrote:
> ---
> The functions called here are stubs, but don't cause this code to bomb out.
>
> From 04917f75269b6f4f51924ba734c20dc05617d882 Mon Sep 17 00:00:00 2001
> From: Maarten Lankhorst <maarten(a)codeweavers.com>
> Date: Tue, 14 Oct 2008 20:16:14 +0200
> Subject: [PATCH] advapi32: Make CheckTokenMembership return FALSE for asking
> whether we are connected through the network
>
> ---
>  dlls/advapi32/security.c |   21 +++++++++++++++++----
>  1 files changed, 17 insertions(+), 4 deletions(-)
>
> diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
> index ca26217..5a2b3e4 100644
> --- a/dlls/advapi32/security.c
> +++ b/dlls/advapi32/security.c
> @@ -615,10 +615,23 @@ BOOL WINAPI
>  CheckTokenMembership( HANDLE TokenHandle, PSID SidToCheck,
>                       PBOOL IsMember )
>  {
> -  FIXME("(%p %p %p) stub!\n", TokenHandle, SidToCheck, IsMember);
> -
> -  *IsMember = TRUE;
> -  return(TRUE);
> +    WCHAR *sid = NULL;
> +    WCHAR network[] = { 'S','-','1','-','5','-','2',0};
> +    BOOL ret = TRUE;
> +    FIXME("(%p %p %p) stub!\n", TokenHandle, SidToCheck, IsMember);
> +
> +    ConvertSidToStringSidW(SidToCheck, &sid);
> +    FIXME("Sid: %s\n", debugstr_w(sid));
> +    /* We are not connected through the network in any way, but locally
> +     * Internet Explorer 7 installer checks for it and bombs out if
> +     * we return TRUE on asking whether we are
> +     */
> +    if (sid && !lstrcmpW(sid, network))
> +        ret = FALSE;
> +    LocalFree(sid);
> +
> +    *IsMember = ret;
> +    return TRUE;
>  }
>
> /******************************************************************************
> --
> 1.5.6.5

setupapi: Implement installing catalog files

[Maarten Lankhorst]

Hi Vincent,

Vincent Povirk schreef:
> The patch you sent doesn't match the subject line.

Thanks for catching that, I sent the wrong patch by accident. The 
attached patch was never meant to be sent in because I knew aj wasn't 
going to accept it. I'll resend the patch tomorrow.

Cheers,
Maarten.