Re: RICHED20: fix stylesheet reading and input callback
Krzysztof Foltman wrote:
ChangeLog: * Optional destinations in stylesheets are now skipped properly (and not treated as the "proper" styles as they were before) * EOF condition in the middle of the stylesheet is no longer putting the reader into infinite loop * Half-full input buffers don't trigger EOF anymore (although it could, in theory, break some apps, I find it unlikely - and the change makes Out from Boneville installer display license properly)
In case of the problems with the last change (which shouldn't happen, but we deal with Windows apps here ;-) ), uncomment the block starting at line 132 in reader.c
I can report a regression as of today. Running the Steam installer for Half Life 2 Demo got to the EULA in the morning. It is now not able to display the EULA. fixme:richedit:RichEditANSIWndProc WM_SETFONT: stub fixme:richedit:RichEditANSIWndProc WM_SETFONT: stub ReadStyleSheet: missing style number Last token read was "}" near line 3, position 22. wine-pthread: style.c:62: ME_ToCF2W: Assertion `from->cbSize >= sizeof(CHARFORMAT2W)' failed. wine: Unhandled exception (thread 0009), starting debugger... WineDbg starting on pid 0x8 Unhandled exception: assertion failed in 32-bit code (0x3b14b935). In 32 bit mode. Register dump: CS:0073 SS:007b DS:007b ES:007b FS:1007 GS:0033 EIP:3b14b935 ESP:7fca6ae4 EBP:7fca6af4 EFLAGS:00000202( - 00 - - I1) EAX:00000000 EBX:00007786 ECX:00007786 EDX:00000006 ESI:00000000 EDI:3b23dff4 Stack dump: 0x7fca6ae4: 00007786 3b23dff4 00000000 b7fc7a30 0x7fca6af4: 7fca6c18 3b14ce6b 00000006 3b23dff4 0x7fca6b04: 0000005e 0000005f 7fca6bcc 3b17cf28 0x7fca6b14: 7d16dbe0 0000005f 0000005e fbad8000 0x7fca6b24: 7d16dbe0 7d16dbe0 7d16dbe0 7d16dbe0 0x7fca6b34: 7d16dc3e 7d16dc44 7d16dbe0 7d16dc44 0200: sel=1007 base=7fffc000 limit=00001fff 32-bit rw- Backtrace: =>1 0x3b14b935 gsignal+0x45 in libc.so.6 (0x7fca6af4) 2 0x3b14ce6b abort+0xe7 in libc.so.6 (0x7fca6c18) 3 0x3b144fa6 __assert_fail+0xb6 in libc.so.6 (0x7fca6c38) 4 0x20511cb4 ME_CopyToCF2W+0x0(to=0x7fca6c78, from=0x7fca8fb4) [/home/phantom/src/wine/dlls/riched20/style.c:67] in riched20 (0x7fca6c5c) 5 0x20511fe7 ME_ApplyStyle+0x2b(sSrc=0x7f6c39a0, style=0x7fca8fb4) [/home/phantom/src/wine/dlls/riched20/style.c:154] in riched20 (0x7fca6cf8) 6 0x205057d5 ME_RTFReadHook+0xdd(info=0x7fca6e60) [/home/phantom/src/wine/dlls/riched20/editor.c:490] in riched20 (0x7fca6dd0) 7 0x2050d505 RTFGetToken+0x35(info=0x7fca6e60) [/home/phantom/src/wine/dlls/riched20/reader.c:464] in riched20 (0x7fca6de4) 8 0x2050d9cd RTFRead+0x25(info=0x7fca6e60) [/home/phantom/src/wine/dlls/riched20/reader.c:379] in riched20 (0x7fca6df8) 9 0x20509306 RichEditANSIWndProc+0x271a(hWnd=0x3004e, msg=0x449, wParam=0x2, lParam=0x7fcad194) [/home/phantom/src/wine/dlls/riched20/editor.c:591] in riched20 (0x7fcacffc) 10 0x20509eec RichEdit10ANSIWndProc+0x24(hWnd=0x3004e, msg=0x449, wParam=0x2, lParam=0x7fcad194) [/home/phantom/src/wine/dlls/riched20/editor.c:1951] in riched20 (0x7fcad020) 11 0x682ca26f WINPROC_wrapper+0x17 in user32 (0x7fcad044) 12 0x682cac86 WINPROC_CallWndProc+0x5a(wParam=0x2, lParam=0x7fcad194) [/home/phantom/src/wine/dlls/user/winproc.c:415] in user32 (0x7fcad078) 13 0x682cda89 CallWindowProcA+0x161(func=0x4fd69000, hwnd=0x3004e, msg=0x449, wParam=0x2, lParam=0x7fcad194) [/home/phantom/src/wine/dlls/user/winproc.c:3230] in user32 (0x7fcad0a4) 14 0x682a3dc5 call_window_proc+0xa1(lparam=0x7fcad194, unicode=0x0, same_thread=0x1) [/home/phantom/src/wine/dlls/user/message.c:1520] in user32 (0x7fcad0fc) 15 0x682a7136 SendMessageTimeoutA+0x1ba(hwnd=0x3004e, msg=0x449, wparam=0x2, lparam=0x7fcad194, flags=0x0, timeout=0x0, res_ptr=0x7fcad174) [/home/phantom/src/wine/dlls/user/message.c:2396] in user32 (0x7fcad150) 16 0x682a71b5 SendMessageA+0x31(hwnd=0x3004e, msg=0x449, wparam=0x2, lparam=0x7fcad194) [/home/phantom/src/wine/dlls/user/message.c:2440] in user32 (0x7fcad17c) 17 0x1000a637 in glc252.tmp (+0xa637) (0x7fcad1a0) 18 0x10009b89 _ListboxSubclassProc(a)16+0x568 in glc252.tmp (0x7fcad5f8) 19 0x10009a61 _ListboxSubclassProc(a)16+0x440 in glc252.tmp (0x7fcadeec) 20 0x682ca26f WINPROC_wrapper+0x17 in user32 (0x7fcadf10) 21 0x682cac86 WINPROC_CallWndProc+0x5a(wParam=0x0, lParam=0x0) [/home/phantom/src/wine/dlls/user/winproc.c:415] in user32 (0x7fcadf44) 22 0x682cd99e CallWindowProcA+0x76(func=0x6832a118, hwnd=0x30044, msg=0x110, wParam=0x0, lParam=0x0) [/home/phantom/src/wine/dlls/user/winproc.c:3245] in user32 (0x7fcadf70) 23 0x6827a0f8 DefDlgProcA+0x54(hwnd=0x30044, msg=0x110, wParam=0x0, lParam=0x0) [/home/phantom/src/wine/dlls/user/defdlg.c:453] in user32 (0x7fcadfa0) 24 0x682ca26f WINPROC_wrapper+0x17 in user32 (0x7fcadfc4) 25 0x682cac86 WINPROC_CallWndProc+0x5a(wParam=0x0, lParam=0x0) [/home/phantom/src/wine/dlls/user/winproc.c:415] in user32 (0x7fcadff8) 26 0x682cf3fb CallWindowProcW+0x117(func=0x68329e1a, hwnd=0x30044, msg=0x110, wParam=0x0, lParam=0x0) [/home/phantom/src/wine/dlls/user/winproc.c:3058] in user32 (0x7fcae498) 27 0x682a3e24 call_window_proc+0x100(lparam=0x0, unicode=0x1, same_thread=0x1) [/home/phantom/src/wine/dlls/user/message.c:1515] in user32 (0x7fcae4f0) 28 0x682a72f9 SendMessageTimeoutW+0x139(hwnd=0x30044, msg=0x110, wparam=0x0, lparam=0x0, flags=0x0, timeout=0x0, res_ptr=0x7fcae560) [/home/phantom/src/wine/dlls/user/message.c:2348] in user32 (0x7fcae53c) 29 0x682a733d SendMessageW+0x31(hwnd=0x30044, msg=0x110, wparam=0x0, lparam=0x0) [/home/phantom/src/wine/dlls/user/message.c:2429] in user32 (0x7fcae568) 30 0x6827eb3d DIALOG_CreateIndirect+0xd9d(dlgProc=0x10007c17, param=0x0, unicode=0x0, modal=0x0) [/home/phantom/src/wine/dlls/user/dialog.c:638] in user32 (0x7fcae6a8) 31 0x6827f451 CreateDialogIndirectParamAorW+0x29(hInst=0x10000000, dlgTemplate=0x7ff9cd14, owner=0x20042, dlgProc=0x10007c17, param=0x0, flags=0x2) [/home/phantom/src/wine/dlls/user/dialog.c:697] in user32 (0x7fcae6c8) 32 0x6827f502 CreateDialogIndirectParamA+0x26(hInst=0x10000000, dlgTemplate=0x7ff9cd14, owner=0x20042, dlgProc=0x10007c17, param=0x0) [/home/phantom/src/wine/dlls/user/dialog.c:706] in user32 (0x7fcae6ec) 33 0x10007b2e in glc252.tmp (+0x7b2e) (0x7fcae780) 34 0x100078ee in glc252.tmp (+0x78ee) (0x7fcae898) 35 0x100044cc in glc252.tmp (+0x44cc) (0x7fcaf5b0) 36 0x10001fa8 WiseMain+0xf99 in glc252.tmp (0x00000000) 0x3b14b935 gsignal+0x45 in libc.so.6: xchgl %edi,%ebx Modules: ...
participants (1)
-
Ivan Gyurdiev