March 2001 - Wine-Devel - list.winehq.org

Re: [PATCH] Version info for comctl32.dll

by lawson_whitney＠juno.com

On Sat, 17 Mar 2001 lawson_whitney(a)juno.com wrote: > > > With wine_common_ver.rc changed as attached, and > dlls/oleaut32/version.rc > > #define WINE_FILEVERSION 10,0,0,0 > #define WINE_FILEVERSION_STR "10.0" > #define WINE_PRODUCTVERSION 10,1,0,0 Oops, where did that ____________^ come from? > #define WINE_PRODUCTVERSION_STR "10.0" It also still works with this as version.rc: #define WINE_FILEVERSION 10,0,0,0 #define WINE_FILEVERSION_STR "10.0" #define WINE_PRODUCTVERSION 10,0,0,0 #define WINE_PRODUCTVERSION_STR "10.0" #define WINE_FILEDESCRIPTION_STR "Wine OLE dll" #define WINE_FILENAME_STR "oleaut32.dll" #include "wine/wine_common_ver.rc" Lawson ---cut here ________________________________________________________________ GET INTERNET ACCESS FROM JUNO! Juno offers FREE or PREMIUM Internet access for less! Join Juno today! For your FREE software, visit: http://dl.www.juno.com/get/tagj.

March 18, 2001

Re: Menu crash - was : Re: [PATCH] Version info for comctl32.dll

by lawson_whitney＠juno.com

On Sat, 17 Mar 2001, gerard patel wrote: > > First thanks for the bug report. > > The trace is not difficult to read, the menu item is a text item and > the text pointer is NULL. MENU_CalcItemSize is not handling this > case. What is strange is this problem appears only with my patch. Maybe Now hang on! I didn't say that. I said I had first provoked it after applying your patch. :-). I guess I should have reverted the patch so I would know for sure before I said anything, but I figured you had just worked in that area and might have a better idea about fixing it than I just jumping in and putting a test for null or a __try around it. I don't use GUI very much, and that crash could have been waiting for years to be provoked. I will revert presently and repeat the test in case that might help. > your app is really initializing the menu when receiving the WM_INITMENU > message, but *only* when there is need to display the menu. I can't see > how it could find out about it, though. > > Anyway, could you try the following patch ? It tries to remove the main > case I saw where the app can set a menu item to text type with a null text > pointer. It is a legitimate patch by itself, even if it does not fix your problem. > Maybe it could have nasty side effects. If it avoids the systematic crash, > try to find if the other is really gone for good too. Still crashes. The patch is in the source, the object file and libuser32.so are newer than menu.c, so I _think_ there must be another way to get a null text pointer with a text type. This time I spelled "info local" right. tee is a wonderful little program. > > I have found a strangeness in the HEAP_strdup macros - WARNING - > this is of interest to anyone dabbling with Wine code. > While HEAP_strdupW and HEAP_strdupAtoW appear very similar, the specs > are not the same; one returns a null pointer when called with a > null pointer, the other allocates 2 bytes of memory and returns a pointer > to it. Nice trap :-) > > Gerard Lawson

March 18, 2001

Re: [PATCH] Version info for comctl32.dll

by lawson_whitney＠juno.com

On Sat, 17 Mar 2001, Dmitry Timoshkov wrote: > > I'm sorry, I didn't focus you on the subject that FILEVERSION and PRODUCTVERSION > are distinctly different things? How about to experiment with different WINE_FILEVERSION > and PRODUCTVERSION (WINE_FILEVERSION_STR and WINE_PRODUCRVERSION_STR) numbers? > > Sorry, if it is not the same as you expected from me... > With wine_common_ver.rc changed as attached, and dlls/oleaut32/version.rc #define WINE_FILEVERSION 10,0,0,0 #define WINE_FILEVERSION_STR "10.0" #define WINE_PRODUCTVERSION 10,1,0,0 #define WINE_PRODUCTVERSION_STR "10.0" #define WINE_FILEDESCRIPTION_STR "Wine OLE dll" #define WINE_FILENAME_STR "oleaut32.dll" #include "wine/wine_common_ver.rc" Tha app still works, and I can't see that it matters to About.exe either. Is that what you meant? Regards, Lawson ---cut here

March 17, 2001

Re: [PATCH] Version info for comctl32.dll

by lawson_whitney＠juno.com

On Sat, 17 Mar 2001, Dmitry Timoshkov wrote: > > Great! > > > #define WINE_FILEVERSION 10,0,0,0 > > #define WINE_FILEVERSION_STR "10.0" > > #define WINE_FILEDESCRIPTION_STR "Wine OLE dll" > > #define WINE_FILENAME_STR "oleaut32.dll" > > > > #include "wine/wine_common_ver.rc" > > > > If you get this letter, it works. > > I'm sorry, I didn't focus you on the subject that FILEVERSION and PRODUCTVERSION > are distinctly different things? How about to experiment with different WINE_FILEVERSION > and PRODUCTVERSION (WINE_FILEVERSION_STR and WINE_PRODUCRVERSION_STR) numbers? > > Sorry, if it is not the same as you expected from me... > I am sorry, I am not understanding some thing[s]. I changed only WINE_FILEVERSION and WINE_FILEVERSION_STRING. All else is as it was set in include/wine/wine_common_ver.rc. I can't see that this includes any provision to make PRUDUCTVERSION variable. Shoukd I make one, in the manner of FILEVERSION? I don't think the app cares about it, at least it is content with 1,0,0,0 and "1.0", if I am reading this right. I will experiment with it anyway, in case it might help, and also test Gerard's patch shortly. Lawson ---cut here ________________________________________________________________ GET INTERNET ACCESS FROM JUNO! Juno offers FREE or PREMIUM Internet access for less! Join Juno today! For your FREE software, visit: http://dl.www.juno.com/get/tagj.

March 17, 2001

Menu crash - was : Re: [PATCH] Version info for comctl32.dll

by gerard patel

At 10:26 PM 16/03/2001 -0500, you wrote: > >On a related note, I provoked that crash in menu.c again, this time by >hitting an accelerator key (?) for a button that was not enabled at the >time. First thanks for the bug report. The trace is not difficult to read, the menu item is a text item and the text pointer is NULL. MENU_CalcItemSize is not handling this case. What is strange is this problem appears only with my patch. Maybe your app is really initializing the menu when receiving the WM_INITMENU message, but *only* when there is need to display the menu. I can't see how it could find out about it, though. Anyway, could you try the following patch ? It tries to remove the main case I saw where the app can set a menu item to text type with a null text pointer. It is a legitimate patch by itself, even if it does not fix your problem. Maybe it could have nasty side effects. If it avoids the systematic crash, try to find if the other is really gone for good too. I have found a strangeness in the HEAP_strdup macros - WARNING - this is of interest to anyone dabbling with Wine code. While HEAP_strdupW and HEAP_strdupAtoW appear very similar, the specs are not the same; one returns a null pointer when called with a null pointer, the other allocates 2 bytes of memory and returns a pointer to it. Nice trap :-) Gerard --- menu.c.orig Wed Mar 14 20:19:46 2001 +++ menu.c Sat Mar 17 14:47:30 2001 @@ -4524,11 +4524,15 @@ menu->text = lpmii->dwTypeData; - if (IS_STRING_ITEM(menu->fType) && menu->text) { - if (unicode) - menu->text = HEAP_strdupW(GetProcessHeap(), 0, lpmii->dwTypeData); - else - menu->text = HEAP_strdupAtoW(GetProcessHeap(), 0, (LPSTR)lpmii->dwTypeData); + if (IS_STRING_ITEM(menu->fType)) { + if (menu->text) { + if (unicode) + menu->text = HEAP_strdupW(GetProcessHeap(), 0, lpmii->dwTypeData); + else + menu->text = HEAP_strdupAtoW(GetProcessHeap(), 0, (LPSTR)lpmii->dwTypeData); + } + else + menu->fType |= MF_SEPARATOR; } }

March 17, 2001

Re: [PATCH] Version info for comctl32.dll

by Dmitry Timoshkov

<lawson_whitney(a)juno.com> wrote: > > I just don't like an idea to hunt down all that cases when some application will want > > that strange version numbers. Will 10.0 work for you? > > > Yes. I can't promise it will work for other apps, and maybe in time we > will have to go to "255.0" or something, but for now, 10.0 works for me. Great! > #define WINE_FILEVERSION 10,0,0,0 > #define WINE_FILEVERSION_STR "10.0" > #define WINE_FILEDESCRIPTION_STR "Wine OLE dll" > #define WINE_FILENAME_STR "oleaut32.dll" > > #include "wine/wine_common_ver.rc" > > If you get this letter, it works. I'm sorry, I didn't focus you on the subject that FILEVERSION and PRODUCTVERSION are distinctly different things? How about to experiment with different WINE_FILEVERSION and PRODUCTVERSION (WINE_FILEVERSION_STR and WINE_PRODUCRVERSION_STR) numbers? Sorry, if it is not the same as you expected from me...

March 17, 2001

Re: [PATCH] Version info for comctl32.dll

by lawson_whitney＠juno.com

On Sat, 17 Mar 2001, Dmitry Timoshkov wrote: > I just don't like an idea to hunt down all that cases when some application will want > that strange version numbers. Will 10.0 work for you? > Yes. I can't promise it will work for other apps, and maybe in time we will have to go to "255.0" or something, but for now, 10.0 works for me. #define WINE_FILEVERSION 10,0,0,0 #define WINE_FILEVERSION_STR "10.0" #define WINE_FILEDESCRIPTION_STR "Wine OLE dll" #define WINE_FILENAME_STR "oleaut32.dll" #include "wine/wine_common_ver.rc" If you get this letter, it works. Lawson ---cut here ________________________________________________________________ GET INTERNET ACCESS FROM JUNO! Juno offers FREE or PREMIUM Internet access for less! Join Juno today! For your FREE software, visit: http://dl.www.juno.com/get/tagj.

March 17, 2001

Re: [PATCH] Version info for comctl32.dll

by Dmitry Timoshkov

<lawson_whitney(a)juno.com> wrote: > > Could you please experiment some more and try to replace 2,20,4054,1 and > > "2.20.4054" to the something more simple: 2,0,0,0 and "2.0". If with that > > numbers juno will not work 2,1,0,0 and "2.1", then 2,2,0,0 and "2.2" and > > so forth? > > Okay. 2.20.4054 is the minimum, it seems, but I'll try 2.21 and so on > shortly. Perhaps we should use some bogus version value (say 10.0) for all wine built-in dlls? I just don't like an idea to hunt down all that cases when some application will want that strange version numbers. Will 10.0 work for you?

March 17, 2001

Re: [PATCH] Version info for comctl32.dll

by Dmitry Timoshkov

<lawson_whitney(a)juno.com> wrote: > > Could you please experiment some more and try to replace 2,20,4054,1 and > > "2.20.4054" to the something more simple: 2,0,0,0 and "2.0". If with that > > numbers juno will not work 2,1,0,0 and "2.1", then 2,2,0,0 and "2.2" and > > so forth? > > Okay. 2.20.4054 is the minimum, it seems, but I'll try 2.21 and so on > shortly. Perhaps we should use some bogus version value (say 10.0) for all wine built-in dlls? I just don't like an idea to hunt down all that cases when some application will want that strange version numbers. Will 10.0 work for you?

March 17, 2001

Re: [PATCH] Version info for comctl32.dll

by Dmitry Timoshkov

<lawson_whitney(a)juno.com> wrote: > > Could you please experiment some more and try to replace 2,20,4054,1 and > > "2.20.4054" to the something more simple: 2,0,0,0 and "2.0". If with that > > numbers juno will not work 2,1,0,0 and "2.1", then 2,2,0,0 and "2.2" and > > so forth? > > Okay. 2.20.4054 is the minimum, it seems, but I'll try 2.21 and so on > shortly. Perhaps we should use some bogus version value (say 10.0) for all wine built-in dlls? I just don't like an idea to hunt down all that cases when some application will want that strange version numbers. Will 10.0 work for you?

March 17, 2001