Re: ntdll: Add stub for LdrResolveDelayLoadedAPI and reference it in kernel32

[Dmitry Timoshkov]

André Hentschel <nerv(a)dawncrow.de> wrote:
> diff --git a/include/delayloadhandler.h b/include/delayloadhandler.h
> new file mode 100644
> index 0000000..e48e415
> --- /dev/null
> +++ b/include/delayloadhandler.h

I don't see such file in PSDK 7.1, where does it come from?
> diff --git a/include/winnt.h b/include/winnt.h
> index 171141e..393f5a7 100644
> --- a/include/winnt.h
> +++ b/include/winnt.h
> @@ -3052,6 +3052,28 @@ typedef struct _IMAGE_RELOCATION
>
> #define IMAGE_SIZEOF_RELOCATION 10
>
> +typedef struct _IMAGE_DELAYLOAD_DESCRIPTOR
> +{
> +    union
> +    {
> +        DWORD AllAttributes;
> +        struct
> +        {
> +            DWORD RvaBased:1;
> +            DWORD ReservedAttributes:31;
> +        };
> +    } Attributes;
> +
> +    DWORD DllNameRVA;
> +    DWORD ModuleHandleRVA;
> +    DWORD ImportAddressTableRVA;
> +    DWORD ImportNameTableRVA;
> +    DWORD BoundImportAddressTableRVA;
> +    DWORD UnloadInformationTableRVA;
> +    DWORD TimeDateStamp;
> +} IMAGE_DELAYLOAD_DESCRIPTOR, *PIMAGE_DELAYLOAD_DESCRIPTOR;
> +typedef const IMAGE_DELAYLOAD_DESCRIPTOR *PCIMAGE_DELAYLOAD_DESCRIPTOR;

Same question here about IMAGE_DELAYLOAD_DESCRIPTOR. Besides, the structure
contains namesless structure which is not compatible with some compilers and
needs to be fixed.

-- 
Dmitry.

ntdll: Add stub for LdrResolveDelayLoadedAPI and reference it in kernel32

[Austin English]

On Wed, Jun 5, 2013 at 7:10 PM, Dmitry Timoshkov <dmitry(a)baikal.ru> wrote:
> André Hentschel <nerv(a)dawncrow.de> wrote:
> > diff --git a/include/delayloadhandler.h b/include/delayloadhandler.h
> > new file mode 100644
> > index 0000000..e48e415
> > --- /dev/null
> > +++ b/include/delayloadhandler.h
>
> I don't see such file in PSDK 7.1, where does it come from?
> > diff --git a/include/winnt.h b/include/winnt.h
> > index 171141e..393f5a7 100644
> > --- a/include/winnt.h
> > +++ b/include/winnt.h
> > @@ -3052,6 +3052,28 @@ typedef struct _IMAGE_RELOCATION
> >
> > #define IMAGE_SIZEOF_RELOCATION 10
> >
> > +typedef struct _IMAGE_DELAYLOAD_DESCRIPTOR
> > +{
> > +    union
> > +    {
> > +        DWORD AllAttributes;
> > +        struct
> > +        {
> > +            DWORD RvaBased:1;
> > +            DWORD ReservedAttributes:31;
> > +        };
> > +    } Attributes;
> > +
> > +    DWORD DllNameRVA;
> > +    DWORD ModuleHandleRVA;
> > +    DWORD ImportAddressTableRVA;
> > +    DWORD ImportNameTableRVA;
> > +    DWORD BoundImportAddressTableRVA;
> > +    DWORD UnloadInformationTableRVA;
> > +    DWORD TimeDateStamp;
> > +} IMAGE_DELAYLOAD_DESCRIPTOR, *PIMAGE_DELAYLOAD_DESCRIPTOR;
> > +typedef const IMAGE_DELAYLOAD_DESCRIPTOR *PCIMAGE_DELAYLOAD_DESCRIPTOR;
>
> Same question here about IMAGE_DELAYLOAD_DESCRIPTOR. Besides, the structure
> contains namesless structure which is not compatible with some compilers and
> needs to be fixed.
>
> --
> Dmitry

Widl handles nameless structs fine:
http://source.winehq.org/git/wine.git/commitdiff/76693d52c7b2d199df9d1f0e605...

--
-Austin

ntdll: Add stub for LdrResolveDelayLoadedAPI and reference it in kernel32

[André Hentschel]

On 06.06.2013 04:10, Dmitry Timoshkov wrote:
> André Hentschel <nerv(a)dawncrow.de> wrote:
> > diff --git a/include/delayloadhandler.h b/include/delayloadhandler.h
> > new file mode 100644
> > index 0000000..e48e415
> > --- /dev/null
> > +++ b/include/delayloadhandler.h
>
> I don't see such file in PSDK 7.1, where does it come from?
> > diff --git a/include/winnt.h b/include/winnt.h
> > index 171141e..393f5a7 100644
> > --- a/include/winnt.h
> > +++ b/include/winnt.h
> > @@ -3052,6 +3052,28 @@ typedef struct _IMAGE_RELOCATION
> >
> > #define IMAGE_SIZEOF_RELOCATION 10
> >
> > +typedef struct _IMAGE_DELAYLOAD_DESCRIPTOR
> > +{
> > +    union
> > +    {
> > +        DWORD AllAttributes;
> > +        struct
> > +        {
> > +            DWORD RvaBased:1;
> > +            DWORD ReservedAttributes:31;
> > +        };
> > +    } Attributes;
> > +
> > +    DWORD DllNameRVA;
> > +    DWORD ModuleHandleRVA;
> > +    DWORD ImportAddressTableRVA;
> > +    DWORD ImportNameTableRVA;
> > +    DWORD BoundImportAddressTableRVA;
> > +    DWORD UnloadInformationTableRVA;
> > +    DWORD TimeDateStamp;
> > +} IMAGE_DELAYLOAD_DESCRIPTOR, *PIMAGE_DELAYLOAD_DESCRIPTOR;
> > +typedef const IMAGE_DELAYLOAD_DESCRIPTOR *PCIMAGE_DELAYLOAD_DESCRIPTOR;
>
> Same question here about IMAGE_DELAYLOAD_DESCRIPTOR. Besides, the structure
> contains namesless structure which is not compatible with some compilers and
> needs to be fixed.

That's all from the win8 psdk, i'll clean it up and try it again before rc2.
Not sure about stubs in code freeze, though.