[PATCH 1/4] oleaut32: Fix TypeLibCount for SLTG_OtherTypeInfo
Based on patch by Sebastian Lackner <sebastian(a)fds-team.de> From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>
On Thu, Jun 11, 2020 at 01:10:43PM +0200, Vijay Kiran Kamuju wrote:
Based on patch by Sebastian Lackner <sebastian(a)fds-team.de>
From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>
From f5c2552bae4d0a4c517ef54a8ac2159fdb3cf3ba Mon Sep 17 00:00:00 2001 Date: Thu, 11 Jun 2020 12:59:34 +0200 Subject: [PATCH 1/4] oleaut32: Fix TypeLibCount for SLTG_OtherTypeInfo
Based on patch by Sebastian Lackner <sebastian(a)fds-team.de>
From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/oleaut32/typelib.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index f8d7136834..1f2c6e182c 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4472,6 +4472,8 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) len += 0x40;
/* And now TypeInfoCount of SLTG_OtherTypeInfo */ + pTypeLibImpl->TypeInfoCount = *(WORD *)((char *)pLibBlk + len); + len += sizeof(WORD);
pOtherTypeInfoBlks = heap_alloc_zero(sizeof(*pOtherTypeInfoBlks) * pTypeLibImpl->TypeInfoCount);
It's more complicated than that. ->TypeInfoCount is set earlier on, should that be changed to a local variable or something? Also, there are still bits on [2/4] that aren't do to with help strings, e.g. the small_no and typekind change, and all the offset renumbering. Huw.
On Thu, Jun 11, 2020 at 2:00 PM Huw Davies <huw(a)codeweavers.com> wrote:
On Thu, Jun 11, 2020 at 01:10:43PM +0200, Vijay Kiran Kamuju wrote:
Based on patch by Sebastian Lackner <sebastian(a)fds-team.de>
From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>
From f5c2552bae4d0a4c517ef54a8ac2159fdb3cf3ba Mon Sep 17 00:00:00 2001 Date: Thu, 11 Jun 2020 12:59:34 +0200 Subject: [PATCH 1/4] oleaut32: Fix TypeLibCount for SLTG_OtherTypeInfo
Based on patch by Sebastian Lackner <sebastian(a)fds-team.de>
From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/oleaut32/typelib.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index f8d7136834..1f2c6e182c 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4472,6 +4472,8 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) len += 0x40;
/* And now TypeInfoCount of SLTG_OtherTypeInfo */ + pTypeLibImpl->TypeInfoCount = *(WORD *)((char *)pLibBlk + len); + len += sizeof(WORD);
pOtherTypeInfoBlks = heap_alloc_zero(sizeof(*pOtherTypeInfoBlks) * pTypeLibImpl->TypeInfoCount);
It's more complicated than that. ->TypeInfoCount is set earlier on, should that be changed to a local variable or something?
Yes, I think that this complicates complete constructor implementation. As the TypeInfoCount is used in a lot of places. I have to test by moving to a local variable, I believe this may lead to crashes.
Also, there are still bits on [2/4] that aren't do to with help strings, e.g. the small_no and typekind change, and all the offset renumbering.
Should I send the patch for small_no, typekind change first, which also affects the offset renumbering. I can send you the old NE tlbs which I got from DDKs, which I use for testing.
Huw.
Vijay.
On Thu, Jun 11, 2020 at 02:22:16PM +0200, Vijay Kiran Kamuju wrote:
On Thu, Jun 11, 2020 at 2:00 PM Huw Davies <huw(a)codeweavers.com> wrote:
It's more complicated than that. ->TypeInfoCount is set earlier on, should that be changed to a local variable or something? Yes, I think that this complicates complete constructor implementation. As the TypeInfoCount is used in a lot of places. I have to test by moving to a local variable, I believe this may lead to crashes.
The issue is that it would now be initialised in two places. Which one is correct?
Also, there are still bits on [2/4] that aren't do to with help strings, e.g. the small_no and typekind change, and all the offset renumbering. Should I send the patch for small_no, typekind change first, which also affects the offset renumbering.
Yes, though I rather suspect this is linked to the TypeInfoCount issue, so you'll need to understand that first. Huw.
On Thu, Jun 11, 2020 at 3:29 PM Huw Davies <huw(a)codeweavers.com> wrote:
On Thu, Jun 11, 2020 at 02:22:16PM +0200, Vijay Kiran Kamuju wrote:
On Thu, Jun 11, 2020 at 2:00 PM Huw Davies <huw(a)codeweavers.com> wrote:
It's more complicated than that. ->TypeInfoCount is set earlier on, should that be changed to a local variable or something? Yes, I think that this complicates complete constructor implementation. As the TypeInfoCount is used in a lot of places. I have to test by moving to a local variable, I believe this may lead to crashes.
The issue is that it would now be initialised in two places. Which one is correct?
Also, there are still bits on [2/4] that aren't do to with help strings, e.g. the small_no and typekind change, and all the offset renumbering. Should I send the patch for small_no, typekind change first, which also affects the offset renumbering.
Yes, though I rather suspect this is linked to the TypeInfoCount issue, so you'll need to understand that first.
I tried to split the patch for typeinfocount, smallno-typekind, and helpstring patches. The splitting is not working. I will try to check the values for typeinfocounts. Might need to check the hex structure of the ne typelib.
Huw.
participants (2)
-
Huw Davies -
Vijay Kiran Kamuju