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

The status of the wintab dll
by Robert North Dec. 24, 2007

Dec. 24, 2007

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 I think after the 10 or more patches to the Wintab dll that I submitted last month, I should say something about it's status... And of course thank Alexandre for applying those patches. P.S. I won't be available from the 15th for about a week or so. So, if you have any questions, I'm afraid you might have to be patient. Hope this is of interest to someone -Rob. ******Applications: Current status*********** ***In Painter 5 *Cursor pressure works. (Therefore is usable by most) *Cursor orientation is a little odd: The orientation maths needs to be re-done. *No eraser. Haven't yet cracked what enables the eraser. *Doesn't work in desktop mode: Need to map to desktop coordinates. *Repeats windows bugs where cursor looses pressure/orientation info almost bug for bug (Is this a feature? ;-) *Cannot detect pressure/orientation int the "Brush Tracking" window: The tablet context is attached to the main window, so no events get to the popup, even if they overlap. This is not how windows wintab functions. ***In Photoshop 6. *Can only get tablet data in desktop mode: This is because the tablet context is attached to the desktop. Which generates/receives no wine events outside desktop mode. * Eraser and pen pressure working. *But* to get them working, you must have 3 XInput devices listed in your XF86Config file, They need to be the last entries in the "ServerLayout" section and the following order: eraser, tablet mouse. This is a far from ideal way of specifying the devices Wintab should use :-/ I'll document this if someone can point me to a good place to put the docs. *******To Do************* 1. Look at X11 errors. There appear to be some errors that deny some users the ability to access Wintab enabled apps. (I think I know how to fix this) 2. Improve orientation data. Orientation comes in as X-Y coords (Implicit Z), and has to leave as spherical coords. This calculation needs to be re-done. 3. When tablet context is on top, let it read XInput events from all the app's top-level windows. (This simulates the fact that the context is usually designed to cover the whole screen) 4. When tablet context is attached to desktop, read XInput events from all the app's top-level windows. 5. Tests ~ --My current philosophy on tests is... ~ Use Photoshop & Painter, any formal tests ~ can be written if anyone else gets involved in patching Wintab, to avoid regressions, and conflict. **********Long term to do (Anyone interested?):********* There's a lot of work that could be done here, but what gets done and who does it probably depends upon whether anyone finds an app that needs these features. I'd love to implement these, but realistically, I don't foresee doing this unless someone hires me to do so ;) 1. Improve configuration of wintab. Wintab could probably do with some information entered into the config file, to avoid the user having to hack their Xfree86cfg file. 2. Handle Z-Order of context properly. This entails *sharing Z-Order between apps. *Working out exactly what role windows have in determining tablet context z-orders. *Allow tablet contexts that don't cover the whole screen/tablet. *Handle inter-application clipping of tablet contexts *Allow all application's windows to receive tablet events when tablet context is on top 3. Implement non-system tablet contexts (Where system cursor not moved by pen or mouse) 4. Unicodify 5. Implement various wintab extensions. 6. Implement wintab manager functions. 7. Tests. *********Unknowns********* 1. How are wintab contexts are raised lowered? Contexts have their own z-order independent of windows, and their own viewport concept, based upon the tablet's coordinate system, not that of the OS. It appears that entering, or clicking on the window the tablet context is attached to will raise/lower the context. But I haven't done much testing on this. In particular, what happens if more than one app request their tablet context is attached to the desktop? 2. How Painter detects the eraser. Have 3 possibilities i. Windows can detect an eraser, and sends specific messages. (I'm sure I've seen this, but can't work out where!) ii. Only works if tablet and cursors are named correctly. (Probably linked to wacom tablets only). iii. I've missed something 3. Requirements of other applications -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.2-rc1-SuSE (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFCC8zI2vfwxdLxwWYRAsisAJ4q2gAYTgRc6f9wDI+Ruv943eDxOQCfcl3s /ZKMUGwQOuw/SIIbOkIUbd0= =R4M7 -----END PGP SIGNATURE-----

2 1

ownerdraw paint recursion in listbox
by Alexander Yaworsky Aug. 4, 2005

Aug. 4, 2005

Hello, recently i tried to install some application and it hung when i tried to select options. It uses listbox with ownerdraw items with checkboxes. When listbox is initially painted everything is ok. But when i try to select other item, an extra WM_PAINT is sent to listbox when application draws item. This causes infinite recursion. I've been implemented a simple workaround adding boolean to listbox structure but i have doubts. I briefly looked at some other controls and had not noticed similar countermeasures. Have somebody ever seen such behaviour? It would be interesting to test other controls sending WM_PAINT from ownerdraw handler but i'm short of time to do it soon. Should this workaround implemented in this way or something is wrong deeper with WM_PAINT handling? Thanks.

2 7

Re: Add new "nrelay" debug channel - useful for debugging GPFs in target applications
by Alexandre Julliard July 14, 2005

July 14, 2005

Troy Rollo <wine(a)troy.rollo.name> writes: > Activate by setting WINEDEBUG=relay,nrelay > > Alternatives considered but rejected: > > - Having a config file option. When the config file options are read it is > already too late to prevent calls by and between kernel32.dll and > ntdll.dll from being logged. This option clearly belongs with the similar ones in the config file, probably even as a special case of RelayFromExclude. The fact that it doesn't work properly on startup is not a reason to invent a new mechanism, the other config options don't work on startup either, and this needs to be fixed. -- Alexandre Julliard julliard(a)winehq.org

3 2

rpcrt4.dll NdrGetUserMarshalInfo() problem
by J. Grant July 2, 2005

July 2, 2005

Hello, I am getting the attached error when running an install of Overnet v0.52. Basically it cannot find NdrGetUserMarshalInfo(), despite it being in the dll at entry point: 77d43452h, order 199. Any ideas what this problem could be? I'm expecting this to be the symptom of some wider problem. Any help appreciated. Kind regards JG p.s. Is there any way to get these mangled function names to be displayed un-mangled please? c:\opt\overnet_0_52>overnet c:\opt\overnet_0_52>err:module:import_dll No implementation for MSVCRT.dll.??_U(a)YAPAXI@Z imported from L"C:\\opt\\overnet_0_52\\MSVCIRT.dll", setting to 0xdeadbeef err:module:import_dll No implementation for MSVCRT.dll.??_V(a)YAXPAX@Z imported from L"C:\\opt\\overnet_0_52\\MSVCIRT.dll", setting to 0xdeadbeef -- Homepage: http://jguk.org/ Blog: http://jguk.org/index.html#blog Radio: http://jguk.org/index.html#radio

3 3

lotus notes regression
by Paul R Streitman June 25, 2005

June 25, 2005

Patch 14725, applied 2004/12/07 11:31:53, breaks lotus notes. The symptom is a hang with the CPU at 100%, and it happens immediately if you try to click on a notes 'bookmark', or shortly after you try to do much of anything else if you try to avoid the 'bookmarks'. Sorry that it took me so long to report this, when I decided that it wasn't just a temporary instability I eventually had to iteratively compile (many) CVS snapshots to narrow down when the problem was introduced because I found it impossible to untangle the various patches that went in around that time frame. I also ran afoul of the jack problems near the end. I do not know how to narrow the problem down further. I tried running winedbg (at CVS level a couple of days ago), and that seems to be broken too -- it wanted to run things from the wine build tree? There are no unusual console messages or anything when the problem happens. Thanks, Paul z/OS core components development Internet: prs(a)us.ibm.com

7 8

GetExitCodeProcess always returns 1
by Igor Sysoev May 5, 2005

May 5, 2005

2 years ago I reported that on FreeBSD Wine-20030508's GetExitCodeProcess() always returns 1: http://www.winehq.org/hypermail/wine-devel/2003/06/0100.html It was fixed by patch: http://www.winehq.org/hypermail/wine-devel/2003/06/0381.html and I used the patched Wine-20030508 all the time to run MSVC, OpenWatcom C, and Borland C in a command line. However, when I try to run dmc.exe, sc.exe, or make.exe from Digital Mars C/C++ Compiler, I always see the message: wine: Unhandled exception (thread 0009), starting debugger... I build Wine-20050310, but it has the same two problems: 1) GetExitCodeProcess() always returns 1 on FreeBSD 5.3, 2) and wine could not run Digital Mars C/C++ Compiler. Digital Mars C/C++ Compiler is could be downloaded here: http://www.digitalmars.com/download/freecompiler.html Igor Sysoev http://sysoev.ru/en/

2 1

Re: Status and (nearby) future of wined3d
by Oliver Stieber April 20, 2005

April 20, 2005

--- Paul Vriens <Paul.Vriens(a)xs4all.nl> wrote: > Hi, > > what will happen to the wined3d stuff, now Oliver > has some 'problems' > staying on-line? > Thanks to everyone I should be ok for a while, now. > > If the sole reason for that is that it couldn't be > merged/applied to CVS > I could give it a try. But that's about the only > thing I can do > regarding wined3d stuff. > I've just merged with wine head and am about to resend the patches, and another couple for stateblocks and sampler states. After that there's vertex declarations and resource tracking, pointsprites , non-power2 textures, memory management, D3DPOOL_DEFAULT texture operations and a few more tidyups. Then I should have all the stable work synced with winehead. After that stateblocks need to be refactored to get offscreen textures, swapchains and multiple devices/threads working properly which may take a while to stabalise. A software vertex pipeline also needs writing to fill in the gaps in the hardware support which is faily easy, and d3d8 interfaces need to wrap up wined3d. Shaders needs moving across from d3d8 which is faily simple and shader 2.0 support needs writing which is a little tricker. > Cheers, > > Paul. > > > Send instant messages to your online friends http://uk.messenger.yahoo.com

3 2

Re: Broken cross-build, again.
by Paul Vriens April 16, 2005

April 16, 2005

On Wed, 2005-02-09 at 16:59, Paul Millar wrote: > I haven't worked on any of winetest's innards, so this is largely > guess work... > > On Wednesday 09 February 2005 13:22, you wrote: > > If I run winetest-200502091000-paul-mingw manually on my win98 box > > I get several messages "Can't parse subtests output of" for the > > following tests [...] > > just before the tests actually start. > > My guess is that winetest is attempting to run these tests, but that > they are dying straight away, with some error message. This error > message is not the expected output, hence the error messsage. > > [...] > > Does this mean that we have a deeper lying problem? > > Yes, obviously! The tests are failing and we have no mechanism for > detecting this. This, in itself, is a bug. > > > Or just that > > more tests are somehow not correct (in combination with mingw)? > > I've bundled the individual tests in: > http://www.astro.gla.ac.uk/users/paulm/WRT/winetest-bin-20050209.zip > (its some 2.6MiB in size, though) > > I image you should be able to run the shlwapi test individually, which > should help narrow down the cause. > > HTH, > > Paul. Hi Paul, I've included wine-devel again as this must touch others as well. I wasn't able to run the shlwapi tests on my win98 box, by itself. Running this gives an error box: The SHLWAPI_.EXE file is linked to missing export SHLWAPI.DLL:PathIsValidCharA and just for completeness sake: dsound: ... linked to missing export DSOUND.DLL:DirectSoundCreate8 mlang: ... linked to missing export NTDLL.DLL:atoi msvcrtd: A required .DLL, MSVCRTD.DLL, was not found ole32: ... linked to missing export NTDLL.DLL:atoi Cheers, Paul Vriens.

7 10

Re: [MSVCRT] implement _mbsbtype
by Juan Lang April 5, 2005

April 5, 2005

Raphael wrote: > + if (!*str) { /** TODO: check *str validity */ > + return -1; /** _MBC_ILLEGAL */ > + } > + if (start == str && MSVCRT_isleadbyte(*str)) { > + return 1; /** _MBC_LEAD */ > + } > + if (start == str && MSVCRT_isleadbyte(str[-1])) { > + return 2; /**_MBC_TRAIL */ > + } > + > + return 0; /** _MBC_SINGLE */ Cool. How about patching mbctype.h with these constants too? --Juan __________________________________ Do you Yahoo!? Yahoo! Small Business - Try our new resources site! http://smallbusiness.yahoo.com/resources/

3 4

redirecting text to standard out
by Raphael Clifford April 5, 2005

April 5, 2005

Hi, I am running a windows app under wine that prints text to the screen. This can be copied and pasted into wine's notepad. Is there any way to get wine to simply output all text written by the app to standard out? This would save me a lot of hassle :) I don't mind if it outputs far too much (text from buttons etc) as I am planning on filtering the information in any case. It has been suggested to me to edit TextOut (or ExtTextOut) in dlls/gdi somewhere and simply add a printf. I had a look but this is the first time I have ever looked at wine source and I am completely baffled. Any help is very much appreciated. Cheers, Raphael

4 5

Re: KERNEL: Implement undocumented SetCPGlobal API call
by Dmitry Timoshkov April 4, 2005

April 4, 2005

"Troy Rollo" <wine(a)troy.rollo.name> wrote: > SetCPGlobal is the undocumented partner of GetACP - it is used to set the > current ANSI code page. > > ChangeLog: > Implement SetCPGlobal (an undocumented Win32 API) What app does depend on it? -- Dmitry.

3 5

Re: Wine device drivers proposal
by Damjan Jovanovic April 4, 2005

April 4, 2005

--- Mike McCormack <mike(a)codeweavers.com> wrote: > > Damjan Jovanovic wrote: > > > I've been trying to add STI (still image) support > to > > Wine, and I've made some progress. However, I see > a > > deep and unsurmountable need to add (at least > > user-space) device drivers to Wine, and I would > like > > some feedback on these ideas. > > Drivers belong in the kernel. If there's no Linux > driver for a device, > then Wine cannot support it. In that case, the > first step is to write a > Linux device driver for it, which has the added > advantage that other > native linux applications can use the hardware. > > The interface from user space to kernel space should > be done via > standard Linux mechanisms, such as ioctl. The > Video4Linux API already > offers such an interface. > > You can't load a Windows driver that accesses > hardware in Wine, as Wine > is a user-space application with no I/O privileges. I am not trying to _load_ a Windows driver (that either requires kernel support for the Windows DDK, like ndiswrapper has, or emulation of an entire x86, like bochs does). What I am trying to do is _replace_ a Windows driver with equivalent libusb functionality, getting, in effect, something like this: Application (eg. the Gimp) | v special SANE backend | v SANE to TWAIN converter | v Windows user-space TWAIN driver (by manufacturer) | v STI | v Wine (with "drivers") | v Wine (user-space) driver | v libusb | v kernel > Mike Damjan __________________________________ Do you Yahoo!? Yahoo! Small Business - Try our new resources site! http://smallbusiness.yahoo.com/resources/

5 6

[riched20/list.c] Exception in ME_DumpDocument
by Paul Vriens April 4, 2005

April 4, 2005

Hi, After I found that one of the files still contained a debugchannel for riched20 (instead of richedit), I added both to see a trace (just for the fun of it). This however raised an exception in ME_DumpDocument: trace:riched20:ME_DumpDocument Start Paragraph(ofs=0) - StartRow - A-LOT-OF-TEXT Paragraph(ofs=266) - StartRow - A-LOT-OF-TEXT Paragraph(ofs=316) - StartRow - Run("L"\00b6"", 0) wine_dbg_vprintf: debugstr buffer overflow (contents: 'A-LOT-OF-TEXT') First chance exception: assertion failed in 32-bit code (0x001117a2). backtrace: Wine-dbg>bt Backtrace: =>1 0x001117a2 (0x00809b30) 2 0x0027d882 (0x00809c5c) 3 0x00157023 NTDLL_dbg_vprintf(format=0x112f5c48, args=0x809cd8) [/data/install/linux/wine-src/wine/dlls/ntdll/debugtools.c:267] in ntdll (0x00809c84) 4 0x001570c8 NTDLL_dbg_vlog+0x44(cls=0x3, channel=0x112ff48c, function=0x112f5c38, format=0x112f5c48, args=0x809cd8) [/data/install/linux/wine-src/wine/dlls/ntdll/debugtools.c:303] in ntdll (0x00809ca0) 5 0x0023f880 wine_dbg_log+0x28(cls=0x3, channel=0x112ff48c, func=0x112f5c38, format=0x112f5c48) [/data/install/linux/wine-src/wine/libs/wine/debug.c:234] in libwine.so.1 (0x00809cc0) 6 0x112ebca6 ME_DumpDocument(buffer=0x7f370510) [list.c:174] in riched20 (0x00809ce8) Questions: - Could the exception be because of the length of the TRACE string? - Is there a particular reason for the 'different' debugchannel? - Is ME_DumpDocument used just for debugging? The first line says: /* FIXME this is useless, */ Cheers, Paul.

2 2

WineConf Agenda
by Brian Vincent April 4, 2005

April 4, 2005

I'm going to start this off with a huge apology - there's a very real chance I've asked someone to do a presentation and it's not on this list. If so, you need to email me to remind me. If you were definitely planning on presenting something because I emailed you, let me know - there's lots of space available. I know this only affects 2 or 3 people, but I tossed around a few ideas and didn't want to leave any loose ends. (Any of those items would make nice topics.) This is the initial agenda for WineConf. I hope to add a few more items, but Jeremy suggested I pull the trigger and announce it. I agree - there's enough here to fill two days and leave a lot of time for people to get together in small groups. Only the first two items are in any formal order: Alexandre - Keynote (He said he's reusing last year's slides.) Dimi - to do list / status update Steven Edwards and the ReactOS crew Charles W Stevenson - Winelib / Winelib porting / and a commercial perspective Andrew Barlett / Samba team? - Samba 4, authentication, lots of intelligent ideas Juan Lang - Wine's RPC + Samba or something like that :) Jeremy White - CXTest Jason Edmeades - DirectX 9 / wined3d / eye candy I think a full agenda would be about 11 items. If you would like to present something let me know - there's definitely space available. If you've been wondering, "There's a neat project I'd like to do if I could only get a few more people interested", well, this is the perfect time to bring it up. If there's something strategic to Wine development, this is a great time to discuss it. For example, we've had mixed feelings regarding revision control and its been suggested to bring it up as a topic. Would anyone find it useful to discuss subversion vs. arch vs. cvs? We could probably get Mike Hearn to show off how he manages patches with SVK and then let him arm wrestle Alexandre about whether arch is better. Friday night we will have an informal dinner after meeting up at the hotel. The conference will kick off Saturday morning on campus around 8am. Lunch will be provided on Saturday and Sunday as well as dinner on Saturday. There will definitely be a lot of time for informal discussion. For the Samba guys - I think there's a great opportunity to share some knowledge to prevent anyone from reinventing the wheel. If there's any topic you'd find interesting, let me know. If you'd just like to hear a specific topic from the Wine folks, we can arrange that. For travel arrangements, please join wineconf(a)winehq.org ( http://www.winehq.org/mailman/listinfo/wineconf ) For instance, I'm actually flying into Frankfurt on April 23rd and it'd be cool to hang out with anyone arriving early. If you haven't made reservations at a hotel, don't worry too much. There's still rooms available as Mr. Schmid described here: http://www.winehq.com/hypermail/wine-devel/2005/03/1119.html If you haven't signed up on the RSVP list, please do so. It can be found on the WineConf page: http://www.winehq.com/site/wineconf Lastly, if you have any questions / comments / criticisms let me know. -Brian PS. Dimi owes me a beer from last year, so we're all obligated to go out Friday night. I'm looking forward to seeing everyone in Stuttgart!

8 15

Wine device drivers proposal
by Damjan Jovanovic April 4, 2005

April 4, 2005

Hi I've been trying to add STI (still image) support to Wine, and I've made some progress. However, I see a deep and unsurmountable need to add (at least user-space) device drivers to Wine, and I would like some feedback on these ideas. Basically, many Windows device drivers are really trivial, but required for many apps. A scanner driver typically just accepts commands from a user-space app, does minimal processing, and forwards that to Windows. I've already hacked up Wine to get the same functionality, and it works - partially. I propose adding a driver loading system to Wine that works as follows: -CreateFile() gets a device filename, like (in my case) \\.\MiiScan0 -Currently, Wine's behaviour for such a filename is to try load a VXD. -In the case of VXD loading failure, a search is performed in (Wine's) C:\Windows\System32\Drivers (or somewhere else?) for a matching driver. The driver is then loaded and used for (at least): ReadFile() WriteFile() DeviceIoControl() CloseHandle() The problem is, how is a handle mapped to the appropriate driver? I've thought about it, and come up with 3 solutions. The first 3 don't require changes to the wineserver but aren't pretty. 1. Make the driver a true Linux kernel mode driver, and the handle its device file handle. Since ReadFile() and WriteFile() just do read() and write() system calls, this can be done. The problem is, DeviceIoControl() has to be implemented using ioctl(), and that's dangerous (sending the right codes to the wrong device can be catastrophic). Also, it's not portable to other OS's, and requires writing a kernel module (which isn't fun). 2. The driver is a file giving a process to start and some IPC method to use. Wine starts the process and uses the IPC method to communicate with the driver. This is good as far as Wine's current ReadFile() and WriteFile() go, since they don't have to know they're not writing to an actual file. The problem here is, which IPC method supports both read() and write() on the same file descriptor, preserves message boundaries, and carries out-of-band data for DeviceIoControl()? I was thinking TCP sockets, but they don't preserve message boundaries. 3. KERNEL32.DLL and / or NTDLL.DLL keep their own handle table so they know which handles are driver handles and deal with those appropriately. Having to look up these tables for every call to ReadFile(), WriteFile() and DeviceIoControl() might be very inefficient, though. 4. Use an in-process solution, like a winelib DLL that has exports for dealing with ReadFile(), WriteFile() and DeviceIoControl(). This could be the most efficient, but then again, you need an efficient way to test a handle for being a driver handle, find the appropriate driver, and call the right exported function, which likely means the wineserver needs to have knowledge of these drivers and provide functionality for testing a handle for being a driver handle and have a way to find the driver. Let me know what you think. Bye Damjan __________________________________ Do you Yahoo!? Yahoo! Small Business - Try our new resources site! http://smallbusiness.yahoo.com/resources/

6 6

Riched20: thanks + regression "beta" not shown
by Tobias Burnus April 3, 2005

April 3, 2005

Hello, first I'd really like to thank the riched20 workers, notably Krzysztof Foltman and Phil Krylov. For the application Diamond it made a big difference: Instead of "[[Aring]]" etc. one sees the proper symbol and it looks much nicer. But the biggest advantage is that one can now copy or save the text; before the app was simply crashing when attempting to do so. Regression: One of the later riched20 patches, possibly http://cvs.winehq.org/patch.py?id=16672, caused a regression with the richedit control in Diamond. Before it showed a beta character from the Symbol font, now it only shows a box ("[]"). If one saves the output (rtf export) one sees ------------------- {\rtf1\ansi\ansicpg1252\uc1\deff0\deflang1031\deflangfe1031{\fonttbl{\f0 Times New Roman;} {\f1\fcharset0 System;} {\f2\fcharset2 Symbol;} }{\*\generator Wine Riched20 2.0.????;}\pard\li0\fi0\ri0{\b\fs18\ul Bibliographic data} \par\pard\li0\fi0\ri0 [...] \par\pard\li0\fi0\ri0{\fs18 }{\i\fs18 b}{\fs18 = 5.8312(2) \'c5} \par\pard\li0\fi0\ri0{\fs18 }{\i\fs18 c}{\fs18 = 7.9564(2) \'c5} \par\pard\li0\fi0\ri0{\fs18 }{\fs18\f2 \u61538?}{\fs18 = 100.77(0) \u176?} ------------------- In the last line, after the \f2 (Symbol font), there should be a beta ("b" + Symbol font). Trace (starting from the "b = 5.8312(2)"): ------------ trace:richedit:ME_CheckCharOffsets run, real ofs = 1 (+ofsp = 177), counted = 177, len = 1, txt = "L"b"", flags=00000000, fx&mask = 44000002 trace:richedit:ME_CheckCharOffsets run, real ofs = 2 (+ofsp = 178), counted = 178, len = 14, txt = "L" = 5.8312(2) \00c5"", flags=00000000, fx&mask = 44000000 trace:richedit:ME_CheckCharOffsets run, real ofs = 16 (+ofsp = 192), counted = 192, len = 1, txt = "L"\00b6"", flags=00100000, fx&mask = 44000000 trace:richedit:ME_CheckCharOffsets para, real ofsp = 193, counted = 193 trace:richedit:ME_CheckCharOffsets run, real ofs = 0 (+ofsp = 193), counted = 193, len = 1, txt = "L"\t"", flags=00000000, fx&mask = 44000000 trace:richedit:ME_CheckCharOffsets run, real ofs = 1 (+ofsp = 194), counted = 194, len = 1, txt = "L"c"", flags=00000000, fx&mask = 44000002 trace:richedit:ME_CheckCharOffsets run, real ofs = 2 (+ofsp = 195), counted = 195, len = 14, txt = "L" = 7.9564(2) \00c5"", flags=00000000, fx&mask = 44000000 trace:richedit:ME_CheckCharOffsets run, real ofs = 16 (+ofsp = 209), counted = 209, len = 1, txt = "L"\00b6"", flags=00100000, fx&mask = 44000000 trace:richedit:ME_CheckCharOffsets para, real ofsp = 210, counted = 210 trace:richedit:ME_CheckCharOffsets run, real ofs = 0 (+ofsp = 210), counted = 210, len = 1, txt = "L"\t"", flags=00000000, fx&mask = 44000000 trace:richedit:ME_CheckCharOffsets run, real ofs = 1 (+ofsp = 211), counted = 211, len = 1, txt = "L"\f062"", flags=00000000, fx&mask = 44000000 trace:richedit:ME_CheckCharOffsets run, real ofs = 2 (+ofsp = 212), counted = 212, len = 14, txt = "L" = 100.77(0) \00b0"", flags=00000000, fx&mask = 44000000 trace:richedit:ME_CheckCharOffsets run, real ofs = 16 (+ofsp = 226), counted = 226, len = 1, txt = "L"\00b6"", flags=00100000, fx&mask = 44000000 ------------ * * * * One feature request: Currently, tabs are shown as box ("[]"), how about replacing them with a simple space - that would increase the readability a lot. Currently, one gets (WINE-CVS): http://www.physik.fu-berlin.de/~tburnus/wine/diamond3.png (Windows: http://www.physik.fu-berlin.de/~tburnus/wine/diamond_list.png) Tobias

6 7

Re: wine/dlls wininet/netconnection.c user/text.c ...
by Dimitrie O. Paun April 1, 2005

April 1, 2005

On Tue, Mar 29, 2005 at 01:49:22PM -0600, Alexandre Julliard wrote: > Log message: > Peter Berg Larsen <pebl(a)math.ku.dk> > Janitorial: Get rid of strncpy/strncpyW. This is cool stuff. Now it would be nice if someone hacks winapi_check to ... check for strncpy() business so it doesn't sneak back in. Other than that, are all strncpy() instances gone? If so we should also nuke strncpyW() from wine/unicode.h too. -- Dimi.

2 1

discusion about a message loop in listview.c
by Dietrich Teickner April 1, 2005

April 1, 2005

I have some weeks before reported, FlashFXP v3.02 loops with a message-loop in listview.c after login. It does this in Odin and in Wine. In Odin it stops in smaller time (deep 1000). Wine has a bigger stack, and so needs wine more time for this, bat I can see in the loog, the args for the function are more and more locatet at lower stack adresses. I have written this workarout for testing this problem in wine and in odin. with this FlashFXH 3.02 will display the contence of the server dir very fast at both environment. In the log I can see, that the message-loop was reported and stopped. I thing, we need a flag inside any item to report every function, that can called recursive, this item is in work (function-separart, or global ?), that can stop recursions of this type in the future or many programms. I have also found this try does also helps Agent 2.0 in the groups->defailt propertys (only odin-tested). This does also every crashs in earlyer builds with stack overflow in odin. Dietrich Index: wine/dlls/comctl32/listview.c =================================================================== RCS file: /home/wine/wine/dlls/comctl32/listview.c,v retrieving revision 1.406 diff -u -r1.406 listview.c --- wine/dlls/comctl32/listview.c 25 Mar 2005 20:49:00 -0000 1.406 +++ wine/dlls/comctl32/listview.c 29 Mar 2005 16:31:48 -0000 @@ -139,6 +139,7 @@ * WM_CREATE does not issue WM_QUERYUISTATE and associated registry * processing for "USEDOUBLECLICKTIME". */ +#define __T__ #include "config.h" #include "wine/port.h" @@ -7050,10 +7051,23 @@ * SUCCESS : TRUE * FAILURE : FALSE */ +#ifdef __T__ +static int zIndex = -2; +typedef struct { + PVOID lTol; + HWND cHwnd; + HWND cHwndParent; + INT cItem; + } SetItemStateLink, *PSetItemStateLink; +#endif static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *infoPtr, INT nItem, const LVITEMW *lpLVItem) { BOOL bResult = TRUE; LVITEMW lvItem; +#ifdef __T__ + int saveLastError = GetLastError(); + SetItemStateLink cTol = { NULL, infoPtr->hwndSelf, infoPtr->hwndNotify, nItem}; +#endif lvItem.iItem = nItem; lvItem.iSubItem = 0; @@ -7062,6 +7076,34 @@ lvItem.stateMask = lpLVItem->stateMask; TRACE("lvItem=%s\n", debuglvitem_t(&lvItem, TRUE)); +#ifdef __T__ + if (-2 == zIndex) + { + zIndex = TlsAlloc(); + SetLastError(saveLastError); + } /* endif */ + if (zIndex >= 0) + { + cTol.lTol = TlsGetValue(zIndex); + if (cTol.lTol < (PVOID)&cTol) + { + cTol.lTol = NULL; + } /* endif */ + SetLastError(saveLastError); + if (cTol.lTol + && (((PSetItemStateLink)cTol.lTol)->cHwnd == infoPtr->hwndSelf) + && (((PSetItemStateLink)cTol.lTol)->cHwndParent == infoPtr->hwndNotify) + && (((PSetItemStateLink)cTol.lTol)->cItem == nItem)) + { + TRACE_(listview)("(DT) Hwnd:%x,%x Parent:%x,%x Item:%d,%d, stop the recursion\n", infoPtr->hwndSelf, ((PSetItemStateLink)cTol.lTol)->cHwnd, + infoPtr->hwndNotify, ((PSetItemStateLink)cTol.lTol)->cHwndParent, + nItem, ((PSetItemStateLink)cTol.lTol)->cItem); + return TRUE; + } + TlsSetValue(zIndex,(LPVOID)&cTol); + SetLastError(saveLastError); + } +#endif if (nItem == -1) { /* apply to all items */ @@ -7070,6 +7112,14 @@ } else bResult = LISTVIEW_SetItemT(infoPtr, &lvItem, TRUE); +#ifdef __T__ + if (zIndex >= 0) + { + saveLastError = GetLastError(); + TlsSetValue(zIndex,(LPVOID)cTol.lTol); + SetLastError(saveLastError); + } +#endif /* *update selection mark

2 1

Re: wine/ windows/scroll.c dlls/x11drv/scroll.c dl ...
by Dimitrie O. Paun April 1, 2005

April 1, 2005

On Fri, Mar 25, 2005 at 11:11:04AM -0600, Alexandre Julliard wrote: > Modified files: > windows : scroll.c > dlls/x11drv : scroll.c > dlls/user/tests: win.c msg.c > > Log message: > Rein Klazes <wijn(a)wanadoo.nl> > ScrollDC and X11DRV_SCROLLDC should scroll only pixels coming from > within the visible region, clipped to the clipping region if that > exists. Add the destination of pixels coming from the outside of this > region to the update region. With tests that depend on this. > > Patch: http://cvs.winehq.org/patch.py?id=16854 Unfortunately, this patch doesn't fix bug 1091: http://bugs.winehq.org/show_bug.cgi?id=1091 -- Dimi.

2 3

Re: KERNEL: improve stubs for DnsHostnameToComputerName{A,W}
by Peter Berg Larsen March 31, 2005

March 31, 2005

+BOOL WINAPI DnsHostnameToComputerNameA(LPCSTR hostname, + LPSTR computername, LPDWORD size) ... + DWORD len; + ... + if (!hostname || !size) return FALSE; + len = lstrlenW(hostname); + + if (len > MAX_COMPUTERNAME_LENGTH) + len = MAX_COMPUTERNAME_LENGTH; + + if (*size < len) + { + *size = len; + return FALSE; + } + if (!computername) return FALSE; + + memcpy( computername, hostname, len ); + computername[len + 1] = 0; + return TRUE; + } I have seen at lot of these where the \0 termination is unspecified for the size parameter, but in this case msdn mentions it. >From msdn: -------- BOOL DnsHostnameToComputerName( LPCTSTR Hostname, LPTSTR ComputerName, LPDWORD nSize ); Parameters Hostname [in] Pointer to a string that specifies the DNS name. If the DNS name is not a valid, translatable name, the function fails. ComputerName [out] Pointer to a string buffer that receives the computer name. The buffer size should be large enough to contain MAX_COMPUTERNAME_LENGTH + 1 characters. nSize [in, out] On input, specifies the size of the buffer, in TCHARs. On output, receives the number of TCHARs copied to the destination buffer, not including the terminating null character. If the buffer is too small, the function fails, GetLastError returns ERROR_MORE_DATA, and nSize receives the required buffer size, not including the terminating null character. ----------- So at least the check should be: if (*size < len + 1) { ... } or you risk the computername[len+1] is invalid. Now the second question is, which might be a convention, where does is say that I cant set computerName size to 3*MAX_COMPUTERNAME_LENGTH and expect it to return the computername not truncated to MAX_COMPUTERNAME_LENGTH? Peter

1 1

Re: Implementation of EnumMoniker and Partial impl on MkParseDisplayName
by Robert Shearman March 31, 2005

March 31, 2005

Jeff Latimer wrote: > This is the first installment of the implementation of > MkParseDisplayName. I would like feed back on style and usage. Ok, I'll happily add comments on the patch. > > I think the implementation of the EnumMoniker interface looks ok. > Comments appreciated. > > Jeff Latimer > >------------------------------------------------------------------------ > >Index: moniker.c >=================================================================== >RCS file: /home/wine/wine/dlls/ole32/moniker.c,v >retrieving revision 1.38 >diff -u -r1.38 moniker.c >--- moniker.c 13 Dec 2004 21:19:02 -0000 1.38 >+++ moniker.c 28 Mar 2005 12:06:51 -0000 >@@ -29,7 +29,6 @@ > > #include <assert.h> > #include <stdarg.h> >-#include <string.h> > > #define COBJMACROS > >@@ -38,6 +37,7 @@ > #include "winbase.h" > #include "winuser.h" > #include "wtypes.h" >+#include "wine/unicode.h" > #include "wine/debug.h" > #include "ole2.h" > >@@ -50,11 +50,11 @@ > /* define the structure of the running object table elements */ > typedef struct RunObject{ > >- IUnknown* pObj; /* points on a running object*/ >- IMoniker* pmkObj; /* points on a moniker who identifies this object */ >+ IUnknown* pObj; /* points on a running object*/ >+ IMoniker* pmkObj; /* points on a moniker who identifies this object */ > FILETIME lastModifObj; >- DWORD identRegObj; /* registration key relative to this object */ >- DWORD regTypeObj; /* registration type : strong or weak */ >+ DWORD identRegObj; /* registration key relative to this object */ >+ DWORD regTypeObj; /* registration type : strong or weak */ > }RunObject; > > /* define the RunningObjectTableImpl structure */ >@@ -106,6 +106,55 @@ > RunningObjectTableImpl_EnumRunning > }; > >+/* define the EnumMonikerImpl structure */ >+typedef struct EnumMonikerImpl{ >+ >+ IEnumMonikerVtbl *lpVtbl; >+ ULONG ref; >+ >+ RunObject* TabMoniker; /* pointer to the first object in the table */ >+ DWORD TabSize; /* current table size */ >+ DWORD TabLastIndx; /* first free index element in the table. */ > > Since you asked for feedback on style, I'll say that you should try to keep the naming conventions consistent. >+ DWORD runObjTabRegister; /* registration key of the next registered object */ >+ DWORD currentPos; /* enum position in the list */ >+ >+} EnumMonikerImpl; >+ >+ >+/* IEnumMoniker prototype functions : */ >+/* IUnknown functions*/ >+static HRESULT WINAPI EnumMonikerImpl_QueryInterface(IEnumMoniker* iface,REFIID riid,void** ppvObject); >+static ULONG WINAPI EnumMonikerImpl_AddRef(IEnumMoniker* iface); >+static ULONG WINAPI EnumMonikerImpl_Release(IEnumMoniker* iface); >+/* IEnumMoniker functions */ >+static HRESULT WINAPI EnumMonikerImpl_Next(IEnumMoniker* iface, ULONG celt, IMoniker** rgelt, ULONG* pceltFetched); >+static HRESULT WINAPI EnumMonikerImpl_Skip(IEnumMoniker* iface, ULONG celt); >+static HRESULT WINAPI EnumMonikerImpl_Reset(IEnumMoniker* iface); >+static HRESULT WINAPI EnumMonikerImpl_Clone(IEnumMoniker* iface, IEnumMoniker** ppenum); > > If you put the vtable after the implementations of the functions then you don't need to declare the prototypes here. >+ >+/* Local functions*/ >+HRESULT WINAPI EnumMonikerImpl_Initialize(void); >+HRESULT WINAPI EnumMonikerImpl_CreateEnumROTMoniker(RunObject* runObjTab, >+ ULONG TabSize, >+ ULONG TabLastIndx, >+ ULONG currentPos, >+ IEnumMoniker ** ppenumMoniker); >+HRESULT WINAPI EnumMonikerImpl_UnInitialize(void); >+HRESULT WINAPI EnumMonikerImpl_Destroy(void); >+HRESULT WINAPI EnumMonikerImpl_GetObjectIndex(EnumMonikerImpl* This,DWORD identReg,IMoniker* pmk,DWORD *indx); > > Presumably, these should all be static since they are not used outside the file. >+ >+/* Virtual function table for the IEnumMoniker class. */ >+static IEnumMonikerVtbl VT_EnumMonikerImpl = >+{ >+ EnumMonikerImpl_QueryInterface, >+ EnumMonikerImpl_AddRef, >+ EnumMonikerImpl_Release, >+ EnumMonikerImpl_Next, >+ EnumMonikerImpl_Skip, >+ EnumMonikerImpl_Reset, >+ EnumMonikerImpl_Clone >+}; >+ > /*********************************************************************** > * RunningObjectTable_QueryInterface > */ >+/*********************************************************************** >+ * EnumMonikerImpl_CreateEnumROTMoniker >+ * Used by EnumRunning to create the structure and EnumClone >+ * to copy the structure >+ */ >+HRESULT WINAPI EnumMonikerImpl_CreateEnumROTMoniker(RunObject* TabMoniker, >+ ULONG TabSize, >+ ULONG TabLastIndx, >+ ULONG currentPos, >+ IEnumMoniker ** ppenumMoniker) >+{ >+ int i; >+ if (currentPos > TabSize) >+ return E_INVALIDARG; >+ >+ if (ppenumMoniker == 0) >+ return E_OUTOFMEMORY; > > This should probably be E_INVALIDARG. >+ >+ *ppenumMoniker = HeapAlloc(GetProcessHeap(), 0, sizeof(EnumMonikerImpl)); >+ > > if (!*ppenumMoniker) return E_OUTOFMEMORY; >+ void *vpThis=*ppenumMoniker; > > Variable used just for changing types?!?! >+ EnumMonikerImpl* This=0; > > Using NULL instead of 0 tends to make it clearer that you are using a pointer. >+ This=vpThis; > > All of these variable declarations need moving to the top of the block. >+ TRACE("(%p)\n",This); >+ /* initialize the virtual table function */ >+ This->lpVtbl = &VT_EnumMonikerImpl; >+ >+ /* the initial reference is set to "1" because if set to "0" it will be not practis when */ >+ /* the ROT referred many times not in the same time (all the objects in the ROT will */ >+ /* be removed every time the ROT is removed ) */ >+ This->ref = 1; /* set the ref count to one */ >+ This->currentPos=0; /* Set the list start posn to start */ >+ This->TabSize=TabSize; /* Need the same size table as ROT */ >+ This->TabLastIndx=TabLastIndx; /* end element */ >+ This->TabMoniker=HeapAlloc(GetProcessHeap(),0,This->TabSize*sizeof(RunObject)); >+ >+ if (This->TabMoniker==NULL) { >+ HeapFree(GetProcessHeap(), 0, This); >+ return E_OUTOFMEMORY; >+ } >+ for (i=0;i<This->TabLastIndx;i++){ >+ >+ This->TabMoniker[i]=TabMoniker[i]; >+ IMoniker_AddRef(TabMoniker[i].pmkObj); >+ } >+ >+ return S_OK; > } > > /*********************************************************************** >@@ -512,8 +621,180 @@ > return res; > } > >+/*********************************************************************** >+ * EnumMoniker_QueryInterface >+ */ >+HRESULT WINAPI EnumMonikerImpl_QueryInterface(IEnumMoniker* iface,REFIID riid,void** ppvObject) >+{ >+ EnumMonikerImpl *This = (EnumMonikerImpl *)iface; >+ >+ TRACE("(%p,%p,%p)\n",This,riid,ppvObject); >+ >+ /* validate arguments */ >+ if (This==0) >+ return CO_E_NOTINITIALIZED; > > Remove this check. It is completely bogus. >+ >+ if (ppvObject==0) >+ return E_INVALIDARG; >+ >+ *ppvObject = 0; >+ >+ if (IsEqualIID(&IID_IUnknown, riid)) >+ *ppvObject = (IEnumMoniker*)This; >+ else >+ if (IsEqualIID(&IID_IEnumMoniker, riid)) >+ *ppvObject = (IEnumMoniker*)This; >+ >+ if ((*ppvObject)==0) >+ return E_NOINTERFACE; >+ >+ EnumMonikerImpl_AddRef(iface); >+ >+ return S_OK; >+} >+ >+/*********************************************************************** >+ * EnumMoniker_AddRef >+ */ >+ULONG WINAPI EnumMonikerImpl_AddRef(IEnumMoniker* iface) >+{ >+ EnumMonikerImpl *This = (EnumMonikerImpl *)iface; >+ >+ TRACE("(%p)\n",This); >+ >+ return InterlockedIncrement(&This->ref); >+} >+ >+/*********************************************************************** >+ * EnumMoniker_Destroy >+ */ >+HRESULT WINAPI EnumMonikerImpl_Destroy() >+{ >+ TRACE("(?)\n"); >+ >+// if (enumMonikerInstance==NULL) >+// return E_INVALIDARG; >+ >+ /* free the enummoniker structure memory */ >+// HeapFree(GetProcessHeap(),0,enumMonikerInstance); >+ >+ return S_OK; >+} > > You are not using this function, so remove it. >+ >+/*********************************************************************** >+ * EnumMoniker_release >+ */ >+ULONG WINAPI EnumMonikerImpl_Release(IEnumMoniker* iface) >+{ >+ DWORD i; >+ EnumMonikerImpl *This = (EnumMonikerImpl *)iface; >+ ULONG ref; >+ >+ TRACE("(%p)\n",This); >+ >+ if (This==0) >+ return E_INVALIDARG; > > Another bogus This pointer check. >+ >+ ref = InterlockedDecrement(&This->ref); >+ >+ /* unitialize rot structure if there's no more reference to it*/ >+ if (ref == 0) { >+ >+ /* release all registered objects in Moniker list */ >+ for(i=0;i<This->TabLastIndx;i++) >+ { >+ IMoniker_Release(This->TabMoniker[i].pmkObj); >+ } >+ >+ /* there're no more elements in the table */ >+ >+ TRACE("(%p) Deleting\n",This); >+ HeapFree (GetProcessHeap(), 0, This->TabMoniker); // free Moniker list >+ HeapFree (GetProcessHeap(), 0, This); // free Enum Instance >+ >+ } >+ >+ return ref; >+} >+/*********************************************************************** >+ * EnmumMoniker_Next >+ */ >+HRESULT WINAPI EnumMonikerImpl_Next(IEnumMoniker* iface, ULONG celt, IMoniker** rgelt, ULONG * pceltFetched) >+{ >+// DWORD i; >+// ULONG ref; > > Remove these lines. >+ >+ EnumMonikerImpl *This = (EnumMonikerImpl *)iface; >+ TRACE("(%p) currentPos %d Tablastindx %d\n",This, (int)This->currentPos, (int)This->TabLastIndx); >+ ULONG i; >+ >+ /* retrieve the requested number of moniker from the current position */ >+ for(i=0;((This->currentPos < This->TabLastIndx) && (i < celt));i++) >+ rgelt[i]=(IMoniker*)This->TabMoniker[This->currentPos++].pmkObj; >+ >+ if (pceltFetched!=NULL) >+ *pceltFetched= i; >+ >+ if (i==celt) >+ return S_OK; >+ else >+ return S_FALSE; >+ >+} >+ >+/*********************************************************************** >+ * EnmumMoniker_Skip >+ */ >+HRESULT WINAPI EnumMonikerImpl_Skip(IEnumMoniker* iface, ULONG celt) >+{ >+ EnumMonikerImpl *This = (EnumMonikerImpl *)iface; >+ >+ TRACE("(%p)\n",This); >+ if (This==0) >+ return E_INVALIDARG; > > Another bogus check. I'll stop commenting about these now, but you should remove all of them. >+ >+ if ((This->currentPos+celt) >= This->TabLastIndx) >+ return S_FALSE; >+ >+ This->currentPos+=celt; >+ >+ return S_OK; >+} >+ >+/*********************************************************************** >+ * EnmumMoniker_Reset >+ */ >+HRESULT WINAPI EnumMonikerImpl_Reset(IEnumMoniker* iface) >+{ >+ EnumMonikerImpl *This = (EnumMonikerImpl *)iface; >+ if (This==0) >+ return E_INVALIDARG; >+ >+ This->currentPos = 0; /* set back to start of list */ >+ >+ TRACE("(%p)\n",This); >+ >+ return S_OK; >+} >+ >+/*********************************************************************** >+ * EnmumMoniker_Clone >+ */ >+HRESULT WINAPI EnumMonikerImpl_Clone(IEnumMoniker* iface, IEnumMoniker ** ppenum) >+{ >+ EnumMonikerImpl *This = (EnumMonikerImpl *)iface; >+ if (This==0) >+ return E_INVALIDARG; >+ >+ TRACE("(%p)\n",This); >+ /* copy the enum structure */ >+ return EnumMonikerImpl_CreateEnumROTMoniker(This->TabMoniker, This->TabSize, >+ This->TabLastIndx, This->currentPos, >+ ppenum); >+} >+ > /****************************************************************************** >- * OleRun [OLE32.@] >+ * olerun [ole32.@] > > The name of the function really is OleRun, not olerun. Feel free to submit the change from OLE32->ole32 in another patch, but make sure you change every instance of this. > */ > HRESULT WINAPI OleRun(LPUNKNOWN pUnknown) > { >@@ -523,22 +804,142 @@ > > ret = IRunnableObject_QueryInterface(This,&IID_IRunnableObject,(LPVOID*)&runable); > if (ret) >- return 0; /* Appears to return no error. */ >+ return 0; /* appears to return no error. */ > ret = IRunnableObject_Run(runable,NULL); > IRunnableObject_Release(runable); > return ret; > } > > /****************************************************************************** >- * MkParseDisplayName [OLE32.@] >+ * MkParseDisplayName [ole32.@] > */ > HRESULT WINAPI MkParseDisplayName(LPBC pbc, LPCOLESTR szUserName, > LPDWORD pchEaten, LPMONIKER *ppmk) > { >- FIXME("(%p, %s, %p, %p): stub.\n", pbc, debugstr_w(szUserName), pchEaten, *ppmk); >+ int char_cnt = 0; >+ int usernamelen = 0; >+ HRESULT rc =0; >+ WCHAR username [2048]; // workspace to parse name into > > Please don't use C99 comments. Use "/* comment */" instead. >+ IRunningObjectTable * pprot; >+ IEnumMoniker *spEM; >+ IMoniker * spMoniker; >+// IUnknown * spUnk; >+ LPMALLOC * ppMalloc; >+ TRACE("(%p)\n", pbc); >+ rc = CoGetMalloc(1, (LPMALLOC *) &ppMalloc); > > You leak references to ppMalloc everywhere. Is it really necessary to use CoGetMalloc? > if (!(IsValidInterface((LPUNKNOWN) pbc))) > return E_INVALIDARG; >+ usernamelen = (int) lstrlenW(szUserName); // overall string len >+ > >+ if (szUserName[char_cnt] == (WCHAR) '@') { // This is a progid not a file name >+ FIXME("Progid not implemented\n"); >+ return MK_E_SYNTAX; >+ } else { >+ char_cnt = 0; >+ if (szUserName[char_cnt+1] == ':') { >+ if ((szUserName[char_cnt] < 'a' || szUserName[char_cnt] > 'z') && >+ (szUserName[char_cnt] < 'A' || szUserName[char_cnt] > 'Z')) { >+ FIXME("bad drive %c\n", szUserName[char_cnt]); > > This should be an ERR instead of FIXME, unless there is something you haven't implemented. If that is the case, please add a comment here as to what that could be. >+ return MK_E_SYNTAX; >+ } >+ username[0] = (WCHAR)szUserName[0]; >+ username[1] = szUserName[1]; >+ char_cnt += 2; // point past drive spec >+ } >+ for (; szUserName[char_cnt] != 0x0 && // until end of string or >+ szUserName[char_cnt] != '!' ; char_cnt++) { // end of component >+ FIXME("%c",szUserName[char_cnt]); > > Is this just a debugging statement? >+ if (szUserName[char_cnt] == '\\' && szUserName[char_cnt+1] == '\\') { >+ FIXME("badchar %c\n",szUserName[char_cnt]); >+ return MK_E_SYNTAX; >+ } >+ if (szUserName[char_cnt] == '/' || >+ szUserName[char_cnt] == '?' || >+ szUserName[char_cnt] == '<' || >+ szUserName[char_cnt] == '>' || >+ szUserName[char_cnt] == '*' || >+ szUserName[char_cnt] == '|' || >+ szUserName[char_cnt] == ':') >+ { >+ FIXME("badchar %c\n",szUserName[char_cnt]); >+ return MK_E_SYNTAX; >+ } >+ username[char_cnt] = (WCHAR) szUserName[char_cnt]; > > Shouldn't need a cast here. >+ } >+ FIXME("\n"); >+ username[char_cnt] = 0x0; // terminate the substring >+ TRACE("File name to be converted to Moniker: %s\n", debugstr_w(username)); >+ rc = IBindCtx_GetRunningObjectTable(pbc, &pprot); >+ if (!SUCCEEDED(rc)) >+ { >+ ERR("IBindCtx_GetRunningObjectTable failed %04x\n", (int) rc); > > This should be: + ERR("IBindCtx_GetRunningObjectTable failed 0x%08lx\n", rc); >+ return MK_E_SYNTAX; >+ } >+ rc = IRunningObjectTable_EnumRunning(pprot, &spEM); >+ TRACE("IRunningObjectTable_EnumRunning rc:%04x %p\n", (int)rc, spEM); > > >+ if (SUCCEEDED(rc)) >+ { >+ rc = MK_E_NOOBJECT; >+ while ((IEnumMoniker_Next(spEM, 1, &spMoniker, NULL)==S_OK) && >+ (*ppmk ==NULL)) >+ { >+ WCHAR *szDisplayn=NULL; >+ rc=IMoniker_GetDisplayName(spMoniker, pbc, NULL, >+ (LPOLESTR*) &szDisplayn); >+ TRACE("Display Name %s for Moniker %p\n", debugstr_w(szDisplayn), spMoniker); >+ if (SUCCEEDED(rc)) >+ { >+ TRACE("IMoniker_GetDisplayName succeeded, rc %08x ROT Name:%s, New name:%s\n", >+ (int)rc, debugstr_w(szDisplayn), debugstr_w(username)); >+ if (0==strcmpiW((WCHAR *)szDisplayn, (WCHAR *)username)) >+ { >+ TRACE("is Equal %p\n", spMoniker); >+ *ppmk = spMoniker; // we already have the Moniker, so use it >+ IMoniker_AddRef(spMoniker); // say we are reusing this Moniker >+ } >+ else >+ TRACE("Not Equal\n"); >+ >+ CoTaskMemFree(szDisplayn); >+ } >+ } >+// rc = IRunningObjectTable_GetObject(pprot, spMoniker, &spUnk); >+// if (!SUCCEEDED(rc)) >+// TRACE("ok\n"); >+ IEnumMoniker_Release(spEM); // Free Enum interface >+ IRunningObjectTable_Release(pprot); // Decrement ROT count >+ pprot = NULL; // Finished with ROT pointer >+ } >+ else >+ ERR("IRunningObjectTable_EnumRunning failed %04x\n", (int ) rc); >+ >+ if (*ppmk == NULL) >+ { >+ rc = CreateFileMoniker(username, ppmk); // convert to moniker >+ if (SUCCEEDED(rc)) >+ { >+ *pchEaten = (int) char_cnt; >+ if (usernamelen > char_cnt) // there is more to do and not implemented >+ { >+ TRACE("Username len %i exceeds parsed text %i\n", usernamelen, char_cnt); > > This should be a FIXME then. >+ return MK_E_SYNTAX; >+ } >+ TRACE(" CreateFileMoniker Succeeded %04x\n", (int) rc); >+ return (S_OK); >+ } else >+ { >+ TRACE("CreateFileMoniker Failed %04x\n", (int) rc); > > ERR >+ return(rc); >+ } >+ } >+ else >+ { >+ *pchEaten = (int) char_cnt; >+ TRACE(" Reused Moniker %p\n", *ppmk); >+ return (S_OK); >+ } >+ } > return MK_E_SYNTAX; > } > >Index: Makefile.in >=================================================================== >RCS file: /home/wine/wine/dlls/ole32/Makefile.in,v >retrieving revision 1.43 >diff -u -r1.43 Makefile.in >--- Makefile.in 17 Mar 2005 20:50:35 -0000 1.43 >+++ Makefile.in 28 Mar 2005 12:06:52 -0000 >@@ -5,7 +5,7 @@ > VPATH = @srcdir@ > MODULE = ole32.dll > IMPORTS = advapi32 user32 gdi32 rpcrt4 kernel32 ntdll >-EXTRALIBS = -luuid $(LIBUNICODE) >+EXTRALIBS = -luuid $(LIBUNICODE) > > C_SRCS = \ > antimoniker.c \ > > Useless whitespace only change. >Index: tests/moniker.c >=================================================================== >RCS file: /home/wine/wine/dlls/ole32/tests/moniker.c,v >retrieving revision 1.2 >diff -u -r1.2 moniker.c >--- tests/moniker.c 28 Jan 2005 12:39:13 -0000 1.2 >+++ tests/moniker.c 28 Mar 2005 12:06:56 -0000 >@@ -22,40 +22,166 @@ > #define COBJMACROS > > #include <stdarg.h> >+//#include <wchar.h> > > Remove this line. > > #include "windef.h" > #include "winbase.h" > #include "objbase.h" >+#include "objidl.h" > #include "comcat.h" > > #include "wine/test.h" > > #define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08lx\n", hr) > >+LPTSTR * prt(HRESULT hr, LPTSTR * lpMsgBuf); > > Not used anywhere. >+ > static void test_MkParseDisplayName() > { > IBindCtx * pbc = NULL; > HRESULT hr; >- IMoniker * pmk = NULL; > ULONG eaten; >- IUnknown * object = NULL; >+ int cnt; >+ > /* CLSID of My Computer */ >- static const WCHAR wszDisplayName[] = {'c','l','s','i','d',':', >+ static const WCHAR wszDisplayName1[] = {'@','c','l','s','i','d',':', >+ '2','0','D','0','4','F','E','0','-','3','A','E','A','-','1','0','6','9','-','A','2','D','8','-','0','8','0','0','2','B','3','0','3','0','9','D',':',0}; > > Does "clsid:..." without the "@" still work? I'd prefer to see that test still in there. >+ >+ hr = CreateBindCtx(0, &pbc); >+ ok_ole_success(hr, CreateBindCtx); >+ IMoniker *pmk1 = NULL; >+ hr = MkParseDisplayName(pbc, wszDisplayName1, &eaten, &pmk1); >+ todo_wine { ok(hr==0x800401e4, "MkParseDisplayName - Progid not implemented hr=%08x\n", (int) hr); } > > MK_E_SYNTAX. See the ok_ole_success macro for how to print out HRESULTs without casts. >+ >+ IBindCtx_Release(pbc); >+ >+ /* A bad drive */ >+ static const WCHAR wszDisplayName2[] = {'1',':','s','i','d',':', > '2','0','D','0','4','F','E','0','-','3','A','E','A','-','1','0','6','9','-','A','2','D','8','-','0','8','0','0','2','B','3','0','3','0','9','D',':',0}; > > hr = CreateBindCtx(0, &pbc); > ok_ole_success(hr, CreateBindCtx); >+ IMoniker *pmk2=NULL; >+ hr = MkParseDisplayName(pbc, wszDisplayName2, &eaten, &pmk2); >+ ok(hr==0x800401e4, "MkParseDisplayName hr=%08x\n", (int) hr); >+ >+ IBindCtx_Release(pbc); > >- hr = MkParseDisplayName(pbc, wszDisplayName, &eaten, &pmk); >- todo_wine { ok_ole_success(hr, MkParseDisplayName); } >+ /* A good drive, bad char */ >+ static const WCHAR wszDisplayName3[] = {'b',':','s','i','d',':', >+ '2','0','D','0','4','F','E','0','-','3','A','E','A','-','1','0','6','9','-','A','2','D','8','-','0','8','0','0','2','B','3','0','3','0','9','D',':',0}; >+ >+ hr = CreateBindCtx(0, &pbc); >+ ok_ole_success(hr, CreateBindCtx); >+ IMoniker *pmk3=NULL; >+ hr = MkParseDisplayName(pbc, wszDisplayName3, &eaten, &pmk3); >+ todo_wine { ok(hr==0x800401e4, "MkParseDisplayName hr=%08x\n", (int) hr); } >+ >+ IBindCtx_Release(pbc); >+ >+ // Good file name >+ static const WCHAR wszDisplayName4[] = {'c',':','\\','w','i','n','d', >+ 'o','w','s','\\','f','r','E','d','.','e','x','E',0x0}; >+ >+ hr = CreateBindCtx(0, &pbc); >+ ok_ole_success(hr, CreateBindCtx); >+ >+ IMoniker *pmk4=NULL; >+ eaten=0; >+ hr = MkParseDisplayName(pbc, wszDisplayName4, &eaten, &pmk4); >+ todo_wine { ok(hr==0, "MkParseDisplayName hr=%08x\n", (int) hr); } >+ >+ IBindCtx_Release(pbc); >+ >+ /* Good file name + item. This test is to see if the whole display >+ * name is consumed >+ */ >+ static const WCHAR wszDisplayName5[] = {'c',':','\\','w','i','n','d', >+ 'o','w','s','\\','f','r','E','d','.','e','x','E','!','m','a','r','k',0x0}; >+ >+ hr = CreateBindCtx(0, &pbc); >+ ok_ole_success(hr, CreateBindCtx); >+ >+ IMoniker *pmk5=NULL; >+ eaten=0; >+ hr = MkParseDisplayName(pbc, wszDisplayName5, &eaten, &pmk5); >+ ok(hr!=0, "MkParseDisplayName failed hr=%08x\n", (int) hr); >+ cnt = (int) lstrlenW(wszDisplayName5); // Get length of text >+ ok(eaten==cnt, "eaten %d string len %i\n", (int) eaten, cnt); // See if consiumed >+ >+ IBindCtx_Release(pbc); >+ >+ /* This test is to create a valid Moniker an then load a couple of >+ * entries into the ROT to test that MkParseDisplayName reuses the >+ * Moniker in the ROT. Currently using the EnumMoniker object as >+ * part of the Register call to satisfy the syntax >+ */ >+ >+ static const WCHAR wszDisplayName6[] = {'c',':','\\','P','r','o','g', >+ 'r','a','m',' ','F','i','l','e','s','\\','v','i','m','\\', >+ 'v','i','m','6','1','\\','g','v','i','m','.','e','x','e',0x0}; >+ hr = CreateBindCtx(0, &pbc); >+ ok_ole_success(hr, CreateBindCtx); > >- if (object) >- { >- hr = IMoniker_BindToObject(pmk, pbc, NULL, &IID_IUnknown, (LPVOID*)&object); >- ok_ole_success(hr, IMoniker_BindToObject); >+ IMoniker *pmk6=NULL; >+ eaten=0; >+ hr = MkParseDisplayName(pbc, wszDisplayName6, &eaten, &pmk6); >+ ok(hr==0, "MkParseDisplayName hr=%08x\n", (int) hr); >+ cnt = lstrlenW(wszDisplayName6); // Get length of text >+ ok(eaten==cnt, "eaten %d string len %i\n", (int) eaten, cnt); // See if consiumed >+ >+ IRunningObjectTable * pprot=NULL; >+ hr = IBindCtx_GetRunningObjectTable(pbc, &pprot); >+ todo_wine { ok(hr==0, "IBindCtx_GetRunningObjectTable hr=%08x\n", (int) hr); } >+ IEnumMoniker *spEM1=NULL; >+ hr = IRunningObjectTable_EnumRunning(pprot, &spEM1); >+ todo_wine { ok(hr==0, "IRunningObjectTable_EnumRunning hr=%08x\n", (int) hr);} >+ IUnknown *lpEM1; >+ hr = IEnumMoniker_QueryInterface(spEM1, &IID_IUnknown, (void*) &lpEM1); >+ todo_wine { ok(hr==0, "IEnumMoniker_QueryInterface hr %08x %p\n", (int) hr, lpEM1); } >+ DWORD pdwReg1=0; >+ DWORD grflags=0; >+ grflags= grflags | ROTFLAGS_REGISTRATIONKEEPSALIVE; >+ hr = IRunningObjectTable_Register(pprot, grflags, lpEM1, pmk5, &pdwReg1); >+ todo_wine { ok(hr==0, "IRunningObjectTable_Register hr=%08x %p %08x %p %p %d\n", >+ (int) hr, pprot, (int) grflags, lpEM1, pmk5, (int) pdwReg1); } >+ >+ DWORD pdwReg2=0; >+ grflags=0; >+ grflags= grflags | ROTFLAGS_REGISTRATIONKEEPSALIVE; >+ hr = IRunningObjectTable_Register(pprot, grflags, lpEM1, pmk6, &pdwReg2); >+ ok(hr==0, "IRunningObjectTable_Register hr=%08x %p %08x %p %p %d\n", (int) hr, >+ pprot, (int) grflags, lpEM1, pmk6, (int) pdwReg2); >+ >+ IEnumMoniker *spEM=NULL; >+ hr = IRunningObjectTable_EnumRunning(pprot, &spEM); >+ todo_wine { ok(hr==0, "IRunningObjectTable_EnumRunning hr=%08x\n", (int) hr); } >+ // Now see if the we get the same moniker after querying the ROT >+ IMoniker *pmk61=NULL; >+ eaten=0; >+ hr = MkParseDisplayName(pbc, wszDisplayName6, &eaten, &pmk61); >+ ok(pmk6==pmk61, "Moniker should be the same address %p != %p\n", pmk6, pmk61); >+ >+ IRunningObjectTable_Revoke(pprot,pdwReg1); >+ IRunningObjectTable_Revoke(pprot,pdwReg2); >+ IEnumMoniker_Release(spEM); >+ IEnumMoniker_Release(spEM1); >+ IRunningObjectTable_Release(pprot); >+ if (pmk61!=NULL) >+ IMoniker_Release(pmk61); >+ if (pmk6!=NULL) >+ IMoniker_Release(pmk6); >+ if (pmk5!=NULL) >+ IMoniker_Release(pmk5); >+ if (pmk4!=NULL) >+ IMoniker_Release(pmk4); >+ if (pmk3!=NULL) >+ IMoniker_Release(pmk3); >+ if (pmk2!=NULL) >+ IMoniker_Release(pmk2); >+ if (pmk1!=NULL) >+ IMoniker_Release(pmk1); > >- IUnknown_Release(object); >- } > IBindCtx_Release(pbc); > } > > > Rob

3 2

installing Win32 Compilers
by Wesley Parish March 31, 2005

March 31, 2005

Installing MinGW32 together with msys-1.* and msysDTK was a breeze. I started installing lccwin32, only to find problems with the library compilation in the latter part of installation, with it hanging once it got to commandline.txt fdlibm.lib lcccrt0.obj libcrt0s.obj stdlib.idx complex.lib gdbmdll.lib lcccrt0s.obj libml.lib tcconio.lib daguid.lib gdbm.lib lcc.lib regexp.lib UUID.LIB dx8math.lib glaux.lib libc.lib scrnsave.lib weditres.lib dxguid.lib iostream.lib libcrt0.obj shell32.lib wizard/ until I stopped it. Consequently it hung on installing Sleepycat's db. I'll erase the installation and try again, this time saving the error messages. Wesley Parish PS But wow, it felt good, watching MinGW32 install _without_ a hitch! Well done! -- Clinersterton beademung, with all of love - RIP James Blish ----- Mau e ki, he aha te mea nui? You ask, what is the most important thing? Maku e ki, he tangata, he tangata, he tangata. I reply, it is people, it is people, it is people.

1 0

Re: Wine Debugger
by Pouech Eric DMI AEI CAEN March 31, 2005

March 31, 2005

use regedit at the beginning of your script to set the AeDebug key to a "" string (and you should have saved the key value before), and restore it at the end of your script > Message du 31/03/05 08:47 > De : "Cal Pierog" > A : wine-devel(a)winehq.org > Copie à : > Objet : Wine Debugger > > I am trying to write a script which, at one point, needs to run the wine > test suite, accomplished with: > > make -k test > > Even though this skips over bad tests, it does not prevent the debugger > from kicking in every once in a while and asking for user input. I would > like this script to be robust enough to run the test suite without user > input, even when one of the tests fails badly enough to call the debugger. > > So, is there any way to disable the debugger so that the script can just > continue on errors and not sit at a "Wine-dbg>" prompt? > > Thanks, > Cal Pierog > > > > >

2 1

Re: winetest: ask for a tag (take 2)
by Alexandre Julliard March 31, 2005

March 31, 2005

Ferenc Wagner <wferi(a)tba.elte.hu> writes: > ChangeLog: Ask for a tag if one was not given on the command line. > > This patch incorporates the suggestions of Rob and Mike. > Some casts are still necessary to suppress the warnings, but > this code is hopefully 64-bit safe. Simply storing the string in a global variable would make things a lot easier and more readable... -- Alexandre Julliard julliard(a)winehq.org

1 0

Wine Debugger
by Cal Pierog March 31, 2005

March 31, 2005

I am trying to write a script which, at one point, needs to run the wine test suite, accomplished with: make -k test Even though this skips over bad tests, it does not prevent the debugger from kicking in every once in a while and asking for user input. I would like this script to be robust enough to run the test suite without user input, even when one of the tests fails badly enough to call the debugger. So, is there any way to disable the debugger so that the script can just continue on errors and not sit at a "Wine-dbg>" prompt? Thanks, Cal Pierog

2 1