wine-devel

wine-devel@winehq.org

2 participants
84469 discussions

Re: WM_GETTEXTLENGTH change in winproc.c
by Gerard Patel 18 Aug '01

18 Aug '01

At 01:19 PM 18/08/2001 -0700, you wrote: > >The idea is that 6 Unicode chars can yield more than 6 ASCII chars >with DBCS text. The MSDN doc states that WM_GETTEXTLENGTH can return >more than the actual size when mixing ASCII and Unicode. > >What does the app do exactly? Maybe there are cases where the >conversion can be avoided. WM_GETTEXTLENGTH, WM_GETTEXT, then DrawText with the length returned by WM_GETTEXTLENGTH. If the app had used the length returned by WM_GETTEXT, it would have worked all right of course - maybe that's the reason why the problem does not appear more often ? In the following trace Cancel is the text of a button in a dialog box. Gerard 080682e8:Call window proc 0x5f404ae6 (hwnd=000026dc,msg=WM_DRAWITEM,wp=00000002,lp=40586474) 080682e8:Call user32.GetPropA(000026dc,5f49c94c "AfxOldWndProc423") ret=5f404b09 080682e8:Ret user32.GetPropA() retval=40ac0259 ret=5f404b09 080682e8:Call user32.CallWindowProcA(40ac0259,000026dc,0000002b,00000002,40586474) ret=5f404b4b 080682e8:Call window proc 0x406a7980 (hwnd=000026dc,msg=WM_DRAWITEM,wp=00000002,lp=40586474) 080682e8:Call window proc 0x43d715 (hwnd=000026dc,msg=WM_DRAWITEM,wp=00000002,lp=40586474) 080682e8:Call user32.GetWindowLongA(000026dc,00000008) ret=0043d727 080682e8:Ret user32.GetWindowLongA() retval=40586914 ret=0043d727 080682e8:Call user32.GetWindowTextLengthA(00002e0c) ret=0043bb82 trace:message:SPY_EnterMessage (00002e0c) "Cancel" message [000e] WM_GETTEXTLENGTH sent from self wp=00000000 lp=00000000 080682e8:Call window proc 0x43d28b (hwnd=00002e0c,msg=WM_GETTEXTLENGTH,wp=00000000,lp=00000000) 080682e8:Call user32.CallWindowProcA(40ac00f1,00002e0c,0000000e,00000000,00000000) ret=0043d2b8 080682e8:Call window proc 0x40679e8c (hwnd=00002e0c,msg=WM_GETTEXTLENGTH,wp=00000000,lp=00000000) trace:message:SPY_EnterMessage (00002e0c) DefWindowProc32: WM_GETTEXTLENGTH [000e] wp=00000000 lp=00000000 trace:message:SPY_ExitMessage (00002e0c) DefWindowProc32: WM_GETTEXTLENGTH [000e] returned 00000006 080682e8:Ret window proc 0x40679e8c (hwnd=00002e0c,msg=WM_GETTEXTLENGTH,wp=00000000,lp=00000000) retval=00000006 080682e8:Ret user32.CallWindowProcA() retval=0000000c ret=0043d2b8 080682e8:Ret window proc 0x43d28b (hwnd=00002e0c,msg=WM_GETTEXTLENGTH,wp=00000000,lp=00000000) retval=0000000c trace:message:SPY_ExitMessage (00002e0c) "Cancel" message [000e] WM_GETTEXTLENGTH returned 0000000c 080682e8:Ret user32.GetWindowTextLengthA() retval=0000000c ret=0043bb82 080682e8:Call ntdll.RtlEnterCriticalSection(5f4d0088) ret=5f4020bd 080682e8:Ret ntdll.RtlEnterCriticalSection() retval=00000000 ret=5f4020bd 080682e8:Call ntdll.RtlLeaveCriticalSection(5f4d0088) ret=5f402103 080682e8:Ret ntdll.RtlLeaveCriticalSection() retval=00000000 ret=5f402103 080682e8:Call user32.GetWindowTextA(00002e0c,413904e0,0000000d) ret=0043bba9 trace:message:SPY_EnterMessage (00002e0c) "Cancel" message [000d] WM_GETTEXT sent from self wp=0000000d lp=413904e0 080682e8:Call window proc 0x43d28b (hwnd=00002e0c,msg=WM_GETTEXT,wp=0000000d,lp=413904e0) 080682e8:Call user32.CallWindowProcA(40ac00f1,00002e0c,0000000d,0000000d,413904e0) ret=0043d2b8 080682e8:Call window proc 0x40679e8c (hwnd=00002e0c,msg=WM_GETTEXT,wp=0000000d,lp=403a7328) trace:message:SPY_EnterMessage (00002e0c) DefWindowProc32: WM_GETTEXT [000d] wp=0000000d lp=403a7328 trace:message:SPY_ExitMessage (00002e0c) DefWindowProc32: WM_GETTEXT [000d] returned 00000006 080682e8:Ret window proc 0x40679e8c (hwnd=00002e0c,msg=WM_GETTEXT,wp=0000000d,lp=403a7328) retval=00000006 080682e8:Ret user32.CallWindowProcA() retval=00000006 ret=0043d2b8 080682e8:Ret window proc 0x43d28b (hwnd=00002e0c,msg=WM_GETTEXT,wp=0000000d,lp=413904e0) retval=00000006 trace:message:SPY_ExitMessage (00002e0c) "Cancel" message [000d] WM_GETTEXT returned 00000006 080682e8:Ret user32.GetWindowTextA() retval=00000006 ret=0043bba9 <snip unrelated painting instructions> 080682e8:Call gdi32.GetTextExtentPoint32A(00000088,413b00d0,00000006,40585f68) ret=0043c022 080682e8:Call x11drv.GetTextExtentPoint(4037c808,4039d238,00000006,40585f68) ret=40747c04 trace:text:X11DRV_GetTextExtentPoint L"Cancel"... 6 080682e8:Ret x11drv.GetTextExtentPoint() retval=00000001 ret=40747c04 080682e8:Ret gdi32.GetTextExtentPoint32A() retval=00000001 ret=0043c022 <snip a few text painting preparation> 080682e8:Call user32.DrawTextA(00000088,413904e0 "Cancel",0000000c,40585f28,00000100) ret=0043c13a trace:text:DrawTextExW L"Cancel", 12 , [(9,4),(51,20)]

1 0

Re: WM_GETTEXTLENGTH change in winproc.c
by Alexandre Julliard 18 Aug '01

18 Aug '01

Gerard Patel <gerard.patel(a)nerim.net> writes: > WM_GETTEXTLENGTH, WM_GETTEXT, then DrawText with the > length returned by WM_GETTEXTLENGTH. > If the app had used the length returned by WM_GETTEXT, it would > have worked all right of course - maybe that's the reason why > the problem does not appear more often ? For standard controls like buttons it should never be a problem since there is both an ASCII and Unicode win proc, so in a pure ASCII app we should never do the conversion. I think the problem is that the dialog code does a CreateWindowW, so the button is Unicode even though the app does everything in ASCII. I guess we'll have to maintain both A and W win procs inside each window, not only inside the class. -- Alexandre Julliard julliard(a)winehq.com

1 0

WM_GETTEXTLENGTH change in winproc.c
by Gerard Patel 18 Aug '01

18 Aug '01

I don't understand it : case WM_GETTEXTLENGTH: 719 case CB_GETLBTEXTLEN: 720 case LB_GETTEXTLEN: 721 /* there may be one DBCS char for each Unicode char */ 722 return result * 2; This has a bad effect on one of my test apps - returns a length of 12 for a text of 6 characters, displays funny symbols after the text. The Unicode window proc returns 6, why the unicode/ascii conversion should make it 12 ? The Api returns number of chars, not bytes. Gerard

1 0

Re: WM_GETTEXTLENGTH change in winproc.c
by Alexandre Julliard 18 Aug '01

18 Aug '01

Gerard Patel <gerard.patel(a)nerim.net> writes: > I don't understand it : > > case WM_GETTEXTLENGTH: > 719 case CB_GETLBTEXTLEN: > 720 case LB_GETTEXTLEN: > 721 /* there may be one DBCS char for each Unicode char */ > 722 return result * 2; > > This has a bad effect on one of my test apps - returns a length of 12 > for a text of 6 characters, displays funny symbols after the text. > > The Unicode window proc returns 6, why the unicode/ascii conversion > should make it 12 ? The Api returns number of chars, not bytes. The idea is that 6 Unicode chars can yield more than 6 ASCII chars with DBCS text. The MSDN doc states that WM_GETTEXTLENGTH can return more than the actual size when mixing ASCII and Unicode. What does the app do exactly? Maybe there are cases where the conversion can be avoided. -- Alexandre Julliard julliard(a)winehq.com

1 0

not-yet-connected sockets?
by Daniel Walker 18 Aug '01

18 Aug '01

The problem is that poll returns POLLHUP when a socket isn't connected, then wine ignores the socket and it's events .. I realize this has been known for a some time(since linux 2.4), but why hasn't it been fix? Doesn't this effect a lot of non-blocking socket applications? Daniel Walker

3 13

Re: Toolbar background error
by Gerard Patel 18 Aug '01

18 Aug '01

At 06:54 PM 17/08/2001 -0700, you wrote: <snip> >But their solution is still not correct IMO. How about something like >this? All clear for me on this one, tested without problem for all of my test apps - at least the one surviving the Gdi lock slaughter :-) Gerard

1 0

Re:CryptoAPI
by Eric Pouech 18 Aug '01

18 Aug '01

from a pure technical point of view, the crypto API is in a pure WOSA style : - a set of high level API (in advapi) - an extendable set of low level service providers (here for example the crypto algos - RSA....) - the high level maps the fonctional request of the user onto on of the available SP. so, my advice here would be to implement this type of scheme. This would allow to: - use native DLLs if they exist (and go beyond what's supported by Linux) - still allow to use Linux lib (just build a wrapper DLL to that lib) and you should be all set from a copyright point of view: - Wine use a X11 like licence, so make sure all the external libs you use are not GPL (LGPL is fine). If they are GPL, you won't be able to ship the result with Wine. - Use of native DLL is granted as long as you have a Windows licence on the target machine (native DLLs shall not be shipped with Wine, Wine should be configured to use the local resources) from an exportation point of view: - some countries (US as an example) puts lots of contraints on the type of crypto algo to be used outside of the US. So those shouldn't be shipped with Wine's, but be provided as an external resource) > Hi, > > I was going to start implementing the Cypto API (in advapi32.dll) over the > next few weeks. As of yet these functions are no more than stubs. However, > I am finding increased use of this API as more applications becomed > networkable and relying more heavily on internet connections. > > I was hoping to implement these functions by using the OpenSSL library > (if/when available). This library seems to have similar capabilities. > > One of my concerns is about legal issues. What special concerns should I > note about cryptographic software? Are there any special copyright issues I > should be aware of? > > Another question is about design. M$ seems to split the cryptographic > software into different dlls (rsabase.dll, rsasig.dll, dssbase.dll, etc.). > Should I do this as well so that, applications can use the native dlls if > necessary or should I simply implement it entirely though advapi32.dll which > and avoid the need to create several new (and very small) dlls under wine? > Because most of the code is already in another library (OpenSSL) creating > extra dlls seems abit unnecessary. > > - Travis > > _________________________________________________________ > Do You Yahoo!? > Get your free @yahoo.com address at http://mail.yahoo.com > > > > --------------- Eric Pouech (http://perso.wanadoo.fr/eric.pouech/) The future will be better tomorrow, Vice President Dan Quayle __________________________________________________________ Faites un vu et puis Voila ! www.voila.fr Pendant tout l'été, gagnez une Ford Ka sur Voila Gratter ! http://cybergrattage.voila.fr/voila

2 1

Re: Toolbar background error
by Alexandre Julliard 18 Aug '01

18 Aug '01

Marcus Meissner <marcus(a)jet.franken.de> writes: > I suggest reading the Corel CVS for this part of the code. > > They rewrote this part like _5_ times. But their solution is still not correct IMO. How about something like this? Index: windows/defwnd.c =================================================================== RCS file: /opt/cvs-commit/wine/windows/defwnd.c,v retrieving revision 1.59 diff -u -r1.59 defwnd.c --- windows/defwnd.c 2001/08/10 22:51:43 1.59 +++ windows/defwnd.c 2001/08/18 00:21:43 @@ -461,10 +461,13 @@ HBRUSH hbr = GetClassLongW( wndPtr->hwndSelf, GCL_HBRBACKGROUND ); if (!hbr) return 0; - /* GetClientRect used to be GetClipBox, but it is not what - * Windows does, and it breaks badly with CS_PARENTDC */ - GetClientRect( wndPtr->hwndSelf, &rect ); - DPtoLP( hdc, (LPPOINT)&rect, 2 ); + if (GetClassLongW( wndPtr->hwndSelf, GCL_STYLE ) & CS_PARENTDC) + { + /* can't use GetClipBox with a parent DC or we fill the whole parent */ + GetClientRect( wndPtr->hwndSelf, &rect ); + DPtoLP( hdc, (LPPOINT)&rect, 2 ); + } + else GetClipBox( hdc, &rect ); FillRect( hdc, &rect, hbr ); return 1; } -- Alexandre Julliard julliard(a)winehq.com

1 0

dsound ??
by Bobby Bingham 17 Aug '01

17 Aug '01

Hello all, I completely rebuilt my computer a while back, and updated wine, so I'm not sure which is causing it, but not dsound doesn't seem to work where it did before. Starcraft doesn't play any music, sound, etc, but it's installer still plays it's sound (without dsound). Before this I hadn't updated WINE for a while, so I'm not sure when it broke. Bobby Bingham

1 0

Re: Toolbar background error
by Gerard Patel 17 Aug '01

17 Aug '01

At 11:08 AM 17/08/2001 -0700, you wrote: >That's not what Windows does. If you pass a window DC to WM_ERASEBKGND >it only erases an area equivalent to the client area (shifted to be >relative to the whole window), so GetClientRect is correct IMO. The >non-client area should be painted upon WM_NCPAINT, not WM_ERASEBKGND. How do you test this under Windows ? In my test app, I have a white brush as class brush. So my window is white. If I add after the BeginPaint : GetClientRect(hwnd, &r); r.top += 200; FillRect(ps.hdc, &r, (HBRUSH) COLOR_WINDOW) the lower part of my window is painted with the beautiful window color (brown) Now if I add immediately after : hdc = GetWindowDC(hwnd); SendMessage(hwnd, WM_ERASEBKGND, (WPARAM) hdc, 0); ReleaseDC(hwnd, hdc); I get a window that is completely white; maybe I am missing something but I should see a small brown strip at the lower part of the window, corresponding to the caption + menu height, no ? Gerard

1 0

Re: Toolbar background error
by Gerard Patel 17 Aug '01

17 Aug '01

At 02:33 PM 17/08/2001 GMT, you wrote: <snip> >So how does an application modify the location of the client rectangle >after it has been created? By changing rgrc[0] when responding to WM_NCCALCSIZE. It seems that it is only possible to erase properly the 'custom' nonclient area by using GetWindowDC... So : --- defwnd.c.orig Sat Aug 11 10:23:18 2001 +++ defwnd.c Fri Aug 17 19:47:17 2001 @@ -462,8 +462,12 @@ if (!hbr) return 0; /* GetClientRect used to be GetClipBox, but it is not what - * Windows does, and it breaks badly with CS_PARENTDC */ - GetClientRect( wndPtr->hwndSelf, &rect ); + * Windows does, and it breaks badly with CS_PARENTDC + * GetClientRect breaks too when we are called with a window + * DC (!!) - what next ? */ + rect.left = rect.top = 0; + rect.right = wndPtr->rectWindow.right - wndPtr->rectWindow.left; + rect.bottom = wndPtr->rectWindow.bottom - wndPtr->rectWindow.top; DPtoLP( hdc, (LPPOINT)&rect, 2 ); FillRect( hdc, &rect, hbr ); return 1; What do you think ? Gerard

2 1

Re: Toolbar background error
by Alexandre Julliard 17 Aug '01

17 Aug '01

Gerard Patel <gerard.patel(a)nerim.net> writes: > Now if I add immediately after : > > hdc = GetWindowDC(hwnd); > SendMessage(hwnd, WM_ERASEBKGND, (WPARAM) hdc, 0); > ReleaseDC(hwnd, hdc); > > I get a window that is completely white; maybe I am missing something but > I should see a small brown strip at the lower part of the window, corresponding > to the caption + menu height, no ? Yes; actually I realize now that my test app uses the CS_PARENTDC style, which is why I see that. The behavior that you observe is what happens without CS_PARENTDC; so it's actually more complex that I thought, we'll need to explicitly test the CS_PARENTDC flag. Sigh... -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: Problems building with extern inline functions in winebase.h
by Alexandre Julliard 17 Aug '01

17 Aug '01

Mike Bond <mbond(a)cox.rr.com> writes: > A couple days ago a number of inline functions were put into winebase.h. > Since then I have been unable to build, using gcc 2.96-81 (RedHat). Apparently > this version of gcc thinks that because there is an extern prefixing the > inline, even though the function does in fact have a body, that the > function really is external. Removing the extern, just having inline as > one would do in C++, does not appear to work correctly either, and causes > the function to appear as a exported symbol in all the object files that > header gets included with, thus resulting in multiple definitions. This patch should fix the build failure, though it doesn't explain why gcc doesn't inline such a simple function. Index: dlls/kernel/kernel32.spec =================================================================== RCS file: /opt/cvs-commit/wine/dlls/kernel/kernel32.spec,v retrieving revision 1.39 diff -u -r1.39 kernel32.spec --- dlls/kernel/kernel32.spec 2001/08/06 17:50:42 1.39 +++ dlls/kernel/kernel32.spec 2001/08/16 16:30:03 @@ -922,7 +922,9 @@ @ stub GetProcessPriorityBoost @ stdcall GetThreadPriorityBoost(long ptr) GetThreadPriorityBoost @ stdcall InterlockedCompareExchange (ptr long long) InterlockedCompareExchange +@ stdcall InterlockedCompareExchangePointer(ptr ptr ptr) InterlockedCompareExchangePointer @ stdcall InterlockedExchangeAdd (ptr long ) InterlockedExchangeAdd +@ stdcall InterlockedExchangePointer(ptr ptr) InterlockedExchangePointer @ stdcall IsProcessorFeaturePresent(long) IsProcessorFeaturePresent @ stdcall OpenWaitableTimerA(long long str) OpenWaitableTimerA @ stdcall OpenWaitableTimerW(long long wstr) OpenWaitableTimerW Index: scheduler/critsection.c =================================================================== RCS file: /opt/cvs-commit/wine/scheduler/critsection.c,v retrieving revision 1.30 diff -u -r1.30 critsection.c --- scheduler/critsection.c 2001/08/09 21:21:13 1.30 +++ scheduler/critsection.c 2001/08/16 16:30:11 @@ -86,7 +86,7 @@ /*********************************************************************** * InterlockedCompareExchange (KERNEL32.@) */ -/* PVOID WINAPI InterlockedCompareExchange( PVOID *dest, PVOID xchg, PVOID compare ); */ +/* LONG WINAPI InterlockedCompareExchange( PLONG dest, LONG xchg, LONG compare ); */ __ASM_GLOBAL_FUNC(InterlockedCompareExchange, "movl 12(%esp),%eax\n\t" "movl 8(%esp),%ecx\n\t" @@ -95,10 +95,31 @@ "ret $12"); /*********************************************************************** + * InterlockedCompareExchangePointer (KERNEL32.@) + */ +/* PVOID WINAPI InterlockedCompareExchangePointer( PVOID *dest, PVOID xchg, PVOID compare ); */ +__ASM_GLOBAL_FUNC(InterlockedCompareExchangePointer, + "movl 12(%esp),%eax\n\t" + "movl 8(%esp),%ecx\n\t" + "movl 4(%esp),%edx\n\t" + "lock; cmpxchgl %ecx,(%edx)\n\t" + "ret $12"); + +/*********************************************************************** * InterlockedExchange (KERNEL32.@) */ /* LONG WINAPI InterlockedExchange( PLONG dest, LONG val ); */ __ASM_GLOBAL_FUNC(InterlockedExchange, + "movl 8(%esp),%eax\n\t" + "movl 4(%esp),%edx\n\t" + "lock; xchgl %eax,(%edx)\n\t" + "ret $8"); + +/*********************************************************************** + * InterlockedExchangePointer (KERNEL32.@) + */ +/* PVOID WINAPI InterlockedExchangePointer( PVOID *dest, PVOID val ); */ +__ASM_GLOBAL_FUNC(InterlockedExchangePointer, "movl 8(%esp),%eax\n\t" "movl 4(%esp),%edx\n\t" "lock; xchgl %eax,(%edx)\n\t" -- Alexandre Julliard julliard(a)winehq.com

4 5

Re: Toolbar background error
by Alexandre Julliard 17 Aug '01

17 Aug '01

Gerard Patel <gerard.patel(a)nerim.net> writes: > By changing rgrc[0] when responding to WM_NCCALCSIZE. > It seems that it is only possible to erase properly the 'custom' nonclient > area by using GetWindowDC... So : > > --- defwnd.c.orig Sat Aug 11 10:23:18 2001 > +++ defwnd.c Fri Aug 17 19:47:17 2001 > @@ -462,8 +462,12 @@ > if (!hbr) return 0; > > /* GetClientRect used to be GetClipBox, but it is not what > - * Windows does, and it breaks badly with CS_PARENTDC */ > - GetClientRect( wndPtr->hwndSelf, &rect ); > + * Windows does, and it breaks badly with CS_PARENTDC > + * GetClientRect breaks too when we are called with a window > + * DC (!!) - what next ? */ > + rect.left = rect.top = 0; > + rect.right = wndPtr->rectWindow.right - wndPtr->rectWindow.left; > + rect.bottom = wndPtr->rectWindow.bottom - wndPtr->rectWindow.top; > DPtoLP( hdc, (LPPOINT)&rect, 2 ); > FillRect( hdc, &rect, hbr ); > return 1; > > What do you think ? That's not what Windows does. If you pass a window DC to WM_ERASEBKGND it only erases an area equivalent to the client area (shifted to be relative to the whole window), so GetClientRect is correct IMO. The non-client area should be painted upon WM_NCPAINT, not WM_ERASEBKGND. -- Alexandre Julliard julliard(a)winehq.com

1 0

err:module:map_image Could not map section .data, file probably truncated
by mdew 17 Aug '01

17 Aug '01

a number of apps that wouldve worked normally ..are now failing to load due to this error.. err:module:map_image Could not map section .data, file probably truncated /usr/local/bin/wine: can't exec './xxx.exe': error=21 -- id: 9DF3262C key fingerprint: B556 04DA CFD9 78DD 9215 A970 8196 FB6D 9DF3 262C

3 3

Re: Does Wine's winhlp work?
by Gerard Patel 17 Aug '01

17 Aug '01

At 02:43 PM 17/08/2001 +0200, you wrote: >I was about to ask the same question. My impression was that: >i) 'winhelp' is completely non-functional <snip> I think so - I have never found one help file that it can read. Gerard

1 0

Re: Toolbar background error
by Gerard Patel 17 Aug '01

17 Aug '01

At 05:10 PM 16/08/2001 GMT, you wrote: >It's the client rectangle in the toolbar (I believe). I've handed the >issue back to Guy. I think that's a general issue, not specific to toolbars. We are seeing it for toolbars because it's a trick that is used mainly for toolbars. What happens I think is that some apps are not satisfied with the standard toolbar look. They want to have a bigger border around the buttons. That is not provided by the standard control, at least when these apps were written (maybe it is now, I am not following these matters closely). What these apps are doing is playing with WM_NCCALCSIZE to restrict the client rectangle to something smaller than what remains when the system clips the true nonclient area. In the case of one of my test apps, this is done by subclassing (the Wine code is never called). Since GetWindowRect returns only the width and the height of the client area, and is setting the origin to 0 - 0, the custom client area appears higher that it is to WM_ERASEBKGND and the lower part of the window is not painted (toolbar in the case of the app I see) Now, I don't know yet how should be done the erasing of this custom nonclient area :-/ Gerard

2 1

Re: Does Wine's winhlp work?
by Waldek Hebisch 17 Aug '01

17 Aug '01

David D. Hagood wrote: >Is Wine's WinHelp program supposed to work? By that I mean, if I invoke >that program with a Windows help file, is it supposed to be able to >display the contents of the help file as Window's winhelp.exe would? I was about to ask the same question. My impression was that: i) 'winhelp' is completely non-functional ii) part reading help files only handles very old help files I implemented code to read somewhat newer help files, to degree that 'hlp2sgml' program is able to get some output, but since data structures used by graphical part are largly NOT filled, 'winhelp' itself has more reasons not to work (I have not sent patch to 'hlpfile.c' in case 'winhelp' actually can read some files). -- Waldek Hebisch hebisch(a)math.uni.wroc.pl or hebisch(a)hera.math.uni.wroc.pl

1 0

Does Wine's winhlp work?
by David D. Hagood 17 Aug '01

17 Aug '01

Is Wine's WinHelp program supposed to work? By that I mean, if I invoke that program with a Windows help file, is it supposed to be able to display the contents of the help file as Window's winhelp.exe would? I ask because 1) I have a program (DeLorme's AAA MapNGo) that uses WinHelp format documents for some of its normal operation, and 2) I have a WinHelp format file I'd dearly like to be able to access directly from Wine. When I try to launch Wine's Winhelp, it brings up a window, but the window is empty. If I go to File->Open and try to open a WinHelp file, I get the same result. Is there some setup I'm missing?

3 2

Refcounting in SelectObject
by Uwe Bonnes 17 Aug '01

17 Aug '01

Hallo, we discussed this January 2001 with no final outcome. Some application (gcprevue version 9) does 080673a0:Call gdi32.SelectObject(000011d4,000011d8) ret=5f485bb1 080673a0:Ret gdi32.SelectObject() retval=00000044 ret=5f485bb1 080673a0:Call gdi32.DeleteObject(000011d8) ret=5f487813 080673a0:Ret gdi32.DeleteObject() retval=00000001 ret=5f487813 080673a0:Call gdi32.BitBlt(000011d4,00000000,00000000,0000008c,000001a7,000009d0,00000000,00000000,00cc0020) ret=0048d1e6 and gets an XErrorEvent and fails to Debugbreak. Starting theapplication with winedbg still gets this error, but DebugBreak isn't executed and the application proceeds. The Windows Api explicitly tells for DeleteObject: Return Value: ... If the specified handle is not valid or is currently selected into a device context, the return value is FALSE. Windows Internals tells about some elements in GDIOBJHDR in debugbuild of windows and has pseudo code for incrementing some refrence counters in SelectObject. Appended patch tries to implement this scheme. The original discussion dissolved into nothing after Andi saw the need for such refcounting, but also mentioned possible resource leakage. Appended code tries to clean up better by: - Remembering an unsuccessfull DeleteObject by adding 0x8000 to the Refcount - Call DeleteObject in SelectObject when the RefCount of the released handle is 0x8000 - Decrementing the RefCount when a hBitmap is still selected into a DC when DeleteDC is called for that DC - Call DeleteObject in DeleteDC when RefCount is 0x8000 For some applications I tested, I always saw the delayed DeleteObject done after the refused DeleteObject in the first place. Is this approach better? Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Free Software: If you contribute nothing, expect nothing -- Index: wine/include/gdi.h =================================================================== RCS file: /home/wine/wine/include/gdi.h,v retrieving revision 1.50 diff -u -r1.50 gdi.h --- wine/include/gdi.h 2001/08/15 23:33:20 1.50 +++ wine/include/gdi.h 2001/08/16 23:23:12 @@ -45,6 +45,9 @@ HANDLE16 hNext; WORD wMagic; DWORD dwCount; + WORD wMetaList; + WORD wSelCount;/* only in debug builds of windows */ + WORD wObjTask;/* only in debug builds of windows */ } GDIOBJHDR; Index: wine/objects/gdiobj.c =================================================================== RCS file: /home/wine/wine/objects/gdiobj.c,v retrieving revision 1.54 diff -u -r1.54 gdiobj.c --- wine/objects/gdiobj.c 2001/08/16 19:13:52 1.54 +++ wine/objects/gdiobj.c 2001/08/16 23:23:13 @@ -374,6 +374,7 @@ obj->hNext = 0; obj->wMagic = magic|OBJECT_NOSYSTEM; obj->dwCount = ++count; + obj->wSelCount = 0; TRACE_SEC( *handle, "enter" ); return obj; @@ -545,6 +546,15 @@ GDI_ReleaseObj( obj ); return TRUE; } + + if(header->wSelCount) + { + TRACE("delayed for %04x because object in use, count %d\n", + obj,header->wSelCount); + header->wSelCount+=0x8000; /* mark for delete */ + GDI_ReleaseObj( obj ); + return FALSE; + } TRACE("%04x\n", obj ); @@ -814,12 +824,32 @@ HGDIOBJ WINAPI SelectObject( HDC hdc, HGDIOBJ handle ) { HGDIOBJ ret = 0; + GDIOBJHDR *header; + DC * dc = DC_GetDCUpdate( hdc ); if (!dc) return 0; TRACE("hdc=%04x %04x\n", hdc, handle ); if (dc->funcs->pSelectObject) ret = dc->funcs->pSelectObject( dc, handle ); GDI_ReleaseObj( hdc ); + if (ret) + { + if (!(header = GDI_GetObjPtr( handle, MAGIC_DONTCARE ))) return 0; + header->wSelCount++; + GDI_ReleaseObj(handle); + if (!(header = GDI_GetObjPtr( ret, MAGIC_DONTCARE ))) return 0; + if(header->wSelCount) + header->wSelCount--; + if(header->wSelCount == 0x8000) /* handle delayed DeleteObject*/ + { + header->wSelCount = 0; + GDI_ReleaseObj(ret); + TRACE("executing delayed DeleteObject for %04x\n",ret); + DeleteObject(ret); + } + else + GDI_ReleaseObj(ret); + } return ret; } Index: wine/objects/dc.c =================================================================== RCS file: /home/wine/wine/objects/dc.c,v retrieving revision 1.62 diff -u -r1.62 dc.c --- wine/objects/dc.c 2001/08/16 19:01:23 1.62 +++ wine/objects/dc.c 2001/08/16 23:23:14 @@ -766,6 +766,25 @@ if (dc->hGCClipRgn) DeleteObject( dc->hGCClipRgn ); if (dc->pAbortProc) THUNK_Free( (FARPROC)dc->pAbortProc ); if (dc->hookThunk) THUNK_Free( (FARPROC)dc->hookThunk ); + if (dc->hBitmap) + { + GDIOBJHDR * header; + if ((header = GDI_GetObjPtr( dc->hBitmap, MAGIC_DONTCARE ))) + { + if(header->wSelCount ) + header->wSelCount--; + if(header->wSelCount == 0x8000) + { + header->wSelCount = 0; + GDI_ReleaseObj(dc->hBitmap); + TRACE("executing delayed DeleteObject for %04x\n",dc->hBitmap); + DeleteObject(dc->hBitmap); + } + else + GDI_ReleaseObj(dc->hBitmap); + + } + } PATH_DestroyGdiPath(&dc->path); GDI_FreeObject( hdc, dc );

1 0

Re: DC lock in CreateDIBitmap
by Alexandre Julliard 16 Aug '01

16 Aug '01

Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> writes: > CreateDIBitmap is called with the HDC lock hold, and when the (fColor) clause > is true, CreateDCA() checks that the lock is not hold. A laymans approach to > release hdc before CreateDCA() and reopen it afterwards resulted in this > report asr startup, with no visual output: I don't think we should be using CreateDC at all in CreateDIBitmap. Could you try this? Index: objects/dib.c =================================================================== RCS file: /opt/cvs-commit/wine/objects/dib.c,v retrieving revision 1.59 diff -u -r1.59 dib.c --- objects/dib.c 2001/08/15 23:33:20 1.59 +++ objects/dib.c 2001/08/16 21:08:12 @@ -875,12 +875,7 @@ /* Now create the bitmap */ - if (fColor) - { - HDC tmpdc = CreateDCA( "DISPLAY", NULL, NULL, NULL ); - handle = CreateCompatibleBitmap( tmpdc, width, height ); - DeleteDC( tmpdc ); - } + if (fColor) handle = CreateCompatibleBitmap( hdc, width, height ); else handle = CreateBitmap( width, height, 1, 1, NULL ); if (!handle) return 0; -- Alexandre Julliard julliard(a)winehq.com

2 1

Problems building with extern inline functions in winebase.h
by Mike Bond 16 Aug '01

16 Aug '01

A couple days ago a number of inline functions were put into winebase.h. Since then I have been unable to build, using gcc 2.96-81 (RedHat). Apparently this version of gcc thinks that because there is an extern prefixing the inline, even though the function does in fact have a body, that the function really is external. Removing the extern, just having inline as one would do in C++, does not appear to work correctly either, and causes the function to appear as a exported symbol in all the object files that header gets included with, thus resulting in multiple definitions. I'm not sure what the correct solution would be, other than using the older function call method for this version of gcc. Perhaps I'm just missing some variant on the use of inline? -- TTFN MikeB

5 5

Re: patch.py?id=997918367324549717828631
by Alexandre Julliard 16 Aug '01

16 Aug '01

lawson_whitney(a)juno.com writes: > I can't remember that I've ever seen the fixme that was here before, > but I'll check again when I send this. No, the CheckNotSysLevel calls were not done before. I added a few of them in GDI to find potential locking bugs; seems pretty successful so far ;-) I think this should fix your problem: Index: objects/dc.c =================================================================== RCS file: /opt/cvs-commit/wine/objects/dc.c,v retrieving revision 1.61 diff -u -r1.61 dc.c --- objects/dc.c 2001/08/15 23:33:20 1.61 +++ objects/dc.c 2001/08/16 17:34:45 @@ -524,7 +524,9 @@ success=FALSE; } GDI_ReleaseObj( hdcs ); + GDI_ReleaseObj( hdc ); DeleteDC( hdcs ); + if (!(dc = DC_GetDCPtr( hdc ))) return FALSE; } GDI_ReleaseObj( hdc ); return success; -- Alexandre Julliard julliard(a)winehq.com

2 1

Re: [resend] Don't crash when CUPS is installed
by mm＠caldera.de 16 Aug '01

16 Aug '01

In article <997995321.1690.4.camel@bugg> you wrote: > Hi all, > Having CUPS installed and a printer in CUPS configured would crash an > application I'm looking at. The reason was that the printer would be > added with a NULL name. > - if (!AddPrinterA(NULL,2,(LPBYTE)&pinfo2a)) { > + if (!AddPrinterA(printers[i],2,(LPBYTE)&pinfo2a)) { This will just make the printer not added AT ALL, since there is the following code in AddPrinterW: if(pName != NULL) { ERR("pName = %s - unsupported\n", debugstr_w(pName)); SetLastError(ERROR_INVALID_PARAMETER); return 0; } Please do not apply. Ciao, Marcus

1 0

DC lock in CreateDIBitmap
by Uwe Bonnes 16 Aug '01

16 Aug '01

Hallo, with the new GDI_CheckNotLock() stuff, some application (gcprevue 9) fails with > err:win32:_CheckNotSysLevel Holding lock 0x4079b9e8 level 3 Backtrace is: Backtrace: =>0 0x400e21d1 (_CheckNotSysLevel+0x51(lock=0x4079b9e8) [syslevel.c:152] in libntdll.so) (ebp=405c6090) 1 0x4078261c (GDI_CheckNotLock+0x1c [gdiobj.c:510] in libgdi32.so) (ebp=405c60a0) 2 0x4077823d (CreateDCA+0x1d(driver=0x407909d3, device=0x0, output=0x0, initData=0x0, s=0x0, s=0x0, s=0x407909d3) [dc.c:558] in libgdi32.so) (ebp=405c61e8) 3 0x4077bbc6 (CreateDIBitmap+0x166(hdc=0xdec, header=0x41eadb50, init=0x0, bits=0x0, data=0x41eadb50, coloruse=0x0) [dib.c:881] in libgdi32.so) (ebp=405c6218) 4 0x409f9479 (X11DRV_DIB_CreateDIBSection+0x359(dc=0x404225f4, bmi=0x41eadb50, usage=0x0, bits=0x411000d8, section=0x0, offset=0x0, ovr_pitch=0x0) [dib.c:3914] in libx11drv.so) (ebp=405c62a0) 5 0x4077bd75 (DIB_CreateDIBSection+0x65(hdc=0xdec, bmi=0x41eadb50, usage=0x0, bits=0x411000d8, section=0x0, offset=0x0, ovr_pitch=0x0) [dib.c:944] in libgdi32.so) (ebp=405c62d4) 6 0x4077bdd1 (CreateDIBSection+0x31(hdc=0xdec, bmi=0x41eadb50, usage=0x0, bits=0x411000d8, section=0x0, offset=0x0) [dib.c:961] in libgdi32.so) (ebp=405c6304) 7 0x00401fba (gcprevue.exe..text+0xfba in D:\cae\gcp9.0.0.8\gcprevue.exe) (ebp=ffffffff) CreateDIBitmap is called with the HDC lock hold, and when the (fColor) clause is true, CreateDCA() checks that the lock is not hold. A laymans approach to release hdc before CreateDCA() and reopen it afterwards resulted in this report asr startup, with no visual output: fixme:win32:PE_CreateModule Security directory ignored err:win32:_LeaveSysLevel (0x4079ba08, level 3): Invalid state: count 0 mutex (nil). err:ntdll:RtlpWaitForCriticalSection section 0x4010fb88 "rtl.c: peb_lock" wait timed out, retrying (60 sec) fs=030f err:ntdll:RtlpWaitForCriticalSection section 0x4010fb88 "rtl.c: peb_lock" wait timed out, retrying (60 sec) fs=031f err:ntdll:RtlpWaitForCriticalSection section 0x4079ba08 "gdiobj.c: GDI_level" wait timed out, retrying (60 sec) fs=008f How to cure this problem? Bye Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Free Software: If you contribute nothing, expect nothing --

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel