- Wine-Devel - list.winehq.org

Re: SHELL32: minor fix in debughlp.c (crash in file dialogs)
by Mike McCormack March 17, 2005

March 17, 2005

This following patch breaks the file open dialog, so if your file open dialog box crashes in the CVS, this is the thing to revert. _dbg_ILGetNext doesn't seem to return NULL if pidl->mkid.cb is zero... Mike Filip Navara wrote: > _dbg_ILGetNext returns NULL if pidl->mkid.cb is zero, fix the > loops accordingly. > > > ------------------------------------------------------------------------ > > --- dlls/shell32/debughlp.c > +++ dlls/shell32/debughlp.c > @@ -215,7 +215,7 @@ > > pidltemp = _dbg_ILGetNext(pidltemp); > > - } while (pidltemp->mkid.cb); > + } while (pidltemp); > } > else > { > @@ -275,7 +275,7 @@ > } > } > pidltemp = _dbg_ILGetNext(pidltemp); > - } while (pidltemp->mkid.cb); > + } while (pidltemp); > } > return ret; > }

1 0

Re: SHELL32: use structure defined in standard headers for advertised shortcut info
by Dmitry Timoshkov March 17, 2005

March 17, 2005

"Mike McCormack" <mike(a)codeweavers.com> wrote: > - LINK_ADVERTISEINFO buffer; > + EXP_DARWIN_LINK buffer; ... > - TRACE("magic %08lx string = %s\n", buffer.magic, debugstr_w(buffer.bufW)); > + TRACE("magic %08lx string = %s\n", buffer.dbh.dwSignature, debugstr_w(buffer.szwDarwinID)); > > - if( (buffer.magic&0xffff0000) != 0xa0000000 ) > + if( (buffer.dbh.dwSignature&0xffff0000) != 0xa0000000 ) After reading your patch I inspected ShlObj.h from PlatformSDK and found out the following: typedef struct { DWORD cbSize; // Size of this extra data block DWORD dwSignature; // signature of this extra data block CHAR szTarget[ MAX_PATH ]; // ANSI target name w/EXP_SZ in it WCHAR swzTarget[ MAX_PATH ]; // UNICODE target name w/EXP_SZ in it } EXP_SZ_LINK, *LPEXP_SZ_LINK; #define EXP_SZ_LINK_SIG 0xA0000001 // LPEXP_SZ_LINK (target) #define EXP_SZ_ICON_SIG 0xA0000007 // LPEXP_SZ_LINK (icon) Is it a better choice? -- Dmitry.

5 4

AW: WineConf: book your hotel now
by Hans-Ulrich Schmid March 17, 2005

March 17, 2005

Hi, there are enough rooms left in the hotel. Please use "WineConf" as keyword. See you in Stuttgart Hans-Ulrich Schmid Wirtschaftsförderung Region Stuttgart GmbH Stuttgart Region Economic Development Corporation FIR_st - Forum IT-Region Stuttgart Friedrichstr. 10 70174 Stuttgart www.first.region-stuttgart.de www.opensource.region-stuttgart.de www.competenzatlas.de www.region-stuttgart.de Tel ++49.711.22835 - 27 Tel mobil ++49.172.7310463 Fax ++49.711.22835 - 55 > -----Ursprüngliche Nachricht----- > Von: Brian Vincent [mailto:brian.vincent(a)gmail.com] > Gesendet: Mittwoch, 16. März 2005 22:41 > An: Paul van Schayck > Cc: wine-devel(a)winehq.org; Hans-Ulrich Schmid > Betreff: Re: WineConf: book your hotel now > > > On Wed, 16 Mar 2005 21:08:29 +0100, Paul van Schayck > <polleke(a)gmail.com> wrote: > > They are already completely booked... they replied "At this time we > > have not any rooms" this afternoon. > > This happened a few weeks ago and they did have rooms available. Did > you include the keyword "WINECON" with your reservation request? As > far as I know we're still ok - the RSVP list is still slightly less > than the number of rooms we've got, plus we know some people on the > RSVP list aren't staying there. > > I'm CC'ing our local contact to see if he can find out what's going > on. Hopefully we're still ok on rooms. Mr. Schmid - can you email > Paul as well as cc the wine-devel(a)winehq.org list when you find out? > > -Brian >

1 0

Re: Problems with VirtualAlloc/Lock
by Michael Ost March 17, 2005

March 17, 2005

On Mon, 2005-03-14 at 20:13, you wrote: > > * VirtualLock does nothing in Wine > VirtualLock does nothing in win95,98,ME as well :) > > I bet the correct behaviour for wine is to do anything in VirtualLock > only if you set windows version to NT/2000/XP. Did you do it? Good point. But the setting is "winxp". I played with the setting and it doesn't change the behavior. > Anyway, mlock() seems to work fine, so this should be implementable. That would be the natural call to use. The absence of mlock in the wine source tree was one of my early clues that there was a problem! %) > > * Wine makes no distinction between MEM_RESERVE and MEM_COMMIT > Assuming that we're talking about VirtualAlloc(). Yes, but I wasn't specific enough. VirtualAlloc(MEM_RESERVE) and MEM_COMMIT are handled differently in the code. I don't understand the code, the design, or Linux mmap() sufficiently to say if they work correctly or not. They both end up calling mmap() which looks right. What I was trying to say is that in winxp MEM_RESERVE and MEM_COMMIT will VirtualAlloc() and/or VirtualLock very different amounts of memory than wine, even on the same (dual booting) machine. Here were my results when I tried to see how much winxp and wine would allocate and lock. The machine has 368M of RAM on it and a ~1GB paging file in Windows. winxp: 1. VirtualAlloc(MEM_RESERVE) -> 2,086,912k 2. SetProcessWorkingSetSize(260,000k) + VirtualAlloc(MEM_COMMIT) + VirtualLock() -> 259,072k 3. VirtualAlloc(MEM_COMMIT) -> 1,011,712k wine: 1. VirtualAlloc(MEM_RESERVE) -> 1,020,928k 2. SetProcessWorkingSetSize(260,000k) + VirtualAlloc(MEM_COMMIT) + VirtualLock() -> 1,020,928k 3. VirtualAlloc(MEM_COMMIT) -> 1,020,928k What I meant by "makes no distinction" is that wine always lets you MEM_RESERVE or MEM_COMMIT 1,020,928k no matter what. In winxp, * VirtualAlloc(MEM_COMMIT) seems bounded by the size of the paging file * VirtualAlloc(MEM_RESERVE) seems just to be 2GB * VirtualLock() is bounded by GetProcessWorkingSet * GetProcessWorkingSet is bounded by how much RAM you have > > * Wine has no implementation of Windows' process working sets > Linux doesn't either. At least I don't know of a documented API that > could > reliably implement semantics of Windows working sets. Maybe it could be > implemented on other OSes like some BSDs if they have such APIs. Maybe > there's something in /proc/sys/vm or somesuch to tweak those, but then > it > would probably be system-wide. I'm no expert here I'm afraid :( I was wondering about getrtlimit/setrlimit. The upper bound of the working set size seems to map well to RLIMIT_MEMLOCK. However I can't see what the parallel would be for the lower bound. Also RLIMIT_AS could be the limit for how much memory you can MEM_RESERVE. These are process based values. They are available in Linux. Not sure about other platforms. > > * Wine limits MEM_RESERVE to 1GB, but WinXP goes up to 2GB > Wine? Maybe linux, but I doubt wine would do anything like that. Yep, it does. Give it a try. As far as I can tell: int total = 0; for (;;) { LPVOID* leak = ::VirtualAlloc(NULL, 1048576, MEM_RESERVE, PROT_NOACCESS); if (leak) { total += 1048576/1024; printf("Allocated %ldk\r", total); } else { printf("\n"); PrintWindowsError("VirtualAlloc", ::GetLastError(); break; } } will stop at 1,022,976k (1GB) on any wine machine. In winxp it goes up to 2GB, as it ought to. > > Further, these DLLs are audio processing plugins. The apparent fact > that > > VirtualLock doesn't _actually_ lock memory into RAM for real time > I didn't look into the code, but anyway a prerequisite for it would be > to set > windows version to NT/2000/XP. Or at least wine should behave like that, > assuming that MSDN doesn't lie here. > > Apart from that, I bet you didn't raise ulimits for your processes. On > my FC3 > system, ulimit -l gives a meager 32 pages. So that's how many mlock() > could > lock anyway. There's not a problem there. My ulimit -l is "unlimited". BTW we are using an old kernel which required a hack to mlock to allow us to lock more than half the ram (regardless of the ulimit), but that doesn't change any of this behavior. Thanks for your feedback... mo

4 9

Re: [SETUPAPI] fix bug 1140
by Alexandre Julliard March 17, 2005

March 17, 2005

Raphael <fenix(a)club-internet.fr> writes: > patch who correct bug 1140 (http://bugs.winehq.org/show_bug.cgi?id=1140) > htmlhelp install is success :) > > Changelog: > - fix GenFormStrWithoutPlaceHolders16 > ie fix PARSER_string_substW to only keep valid texts entries (no comments > or tabs) This is wrong, comments should have already been taken into account when PARSER_string_substW is called. The right fix is to make GenFormStrWithoutPlaceHolders16 properly split the line like the 32-bit functions do. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: dlls/user/button.c - fix AUTO3STATE with BS_OWNERDRAW
by Tony Lambregts March 17, 2005

March 17, 2005

Michael Lin wrote: > AUTO3STATE control with BS_OWNERDRAW set will not get created. > > ChangeLog: > * fix AUTO3STATE with BS_OWNERDRAW set > > > ------------------------------------------------------------------------ > > Index: dlls/user/button.c > =================================================================== > RCS file: /home/wine/wine/dlls/user/button.c,v > retrieving revision 1.6 > diff -r1.6 button.c > 183c183,186 > < return (window_style & 0x0f); > --- > >> if ((window_style & BS_OWNERDRAW) == BS_OWNERDRAW) >> return BS_OWNERDRAW; >> else >> return (window_style & 0x0f); Patches should be in diff -u format (cvs diff -u) please resubmit.. -- Tony Lambregts

1 0

Re: winetest, winrash and new volunteers
by Steven Edwards March 16, 2005

March 16, 2005

--- Chris Morgan <cmorgan(a)alum.wpi.edu> wrote: > winetest to upload the testing results. The winetest building is black magic > to me :-) Right now I am interested in the winetest side of things. Like how to get winetest and the server to talk to each other and what is needed in the build and url files. Thanks Steven __________________________________ Do you Yahoo!? Yahoo! Small Business - Try our new resources site! http://smallbusiness.yahoo.com/resources/

2 1

MSN Webcam patch
by Vladdy Impaler March 16, 2005

March 16, 2005

RIght now I'm working on a patch so I can use my webcam under wine without having to switch to unix or use non-working solutions.. Right now there are 2 patches needed to get MSN to connect to the internet: first is to disable SSL, second strcpy's a value at urlmon getuseragent or something To get this to work, a few modifications to existing files are needed: First of all, if the catagory exists, let devenum return all from videoinput catagory: diff -Nru /root/wine-20050211/dlls/devenum/createdevenum.c wine-20050211/dlls/devenum/createdevenum.c --- /root/wine-20050211/dlls/devenum/createdevenum.c 2005-01-25 11:56:39.000000000 +0100 +++ wine-20050211/dlls/devenum/createdevenum.c 2005-03-15 00:15:47.000000000 +0100 @@ -117,7 +117,8 @@ if (IsEqualGUID(clsidDeviceClass, &CLSID_AudioRendererCategory) || IsEqualGUID(clsidDeviceClass, &CLSID_AudioInputDeviceCategory) || - IsEqualGUID(clsidDeviceClass, &CLSID_MidiRendererCategory)) + IsEqualGUID(clsidDeviceClass, &CLSID_MidiRendererCategory) || + IsEqualGUID(clsidDeviceClass, &CLSID_VideoInputDeviceCategory)) { hbasekey = HKEY_CURRENT_USER; strcpyW(wszRegKey, wszActiveMovieKey); and a few other patches to devenum main (Not sure if those are needed) diff -Nru /root/wine-20050211/dlls/devenum/devenum_main.c wine-20050211/dlls/devenum/devenum_main.c --- /root/wine-20050211/dlls/devenum/devenum_main.c 2004-12-07 15:37:11.000000000 +0100 +++ wine-20050211/dlls/devenum/devenum_main.c 2005-03-15 00:15:47.000000000 +0100 @@ -122,7 +122,7 @@ {&CLSID_AudioCompressorCategory, acmcat, TRUE}, {&CLSID_VideoCompressorCategory, vidcat, TRUE}, {&CLSID_LegacyAmFilterCategory, filtcat, TRUE}, - {&CLSID_VideoInputDeviceCategory, vfwcat, FALSE}, + {&CLSID_VideoInputDeviceCategory, vfwcat, TRUE}, {&CLSID_AudioInputDeviceCategory, wavein, FALSE}, {&CLSID_AudioRendererCategory, waveout, FALSE}, {&CLSID_MidiRendererCategory, midiout, FALSE}, @@ -156,7 +156,7 @@ pMapper = (IFilterMapper2*)mapvptr; - IFilterMapper2_CreateCategory(pMapper, &CLSID_VideoInputDeviceCategory, MERIT_DO_NOT_USE, friendlyvidcap); + IFilterMapper2_CreateCategory(pMapper, &CLSID_VideoInputDeviceCategory, MERIT_NORMAL, friendlyvidcap); IFilterMapper2_CreateCategory(pMapper, &CLSID_LegacyAmFilterCategory, MERIT_NORMAL, friendlydshow); IFilterMapper2_CreateCategory(pMapper, &CLSID_VideoCompressorCategory, MERIT_DO_NOT_USE, friendlyvidcomp); IFilterMapper2_CreateCategory(pMapper, &CLSID_AudioInputDeviceCategory, MERIT_DO_NOT_USE, friendlyaudcap); I wanted to put all custom code into qcap, but because of the pins that's not possible. I wrote a basic stub for CaptureGraphBuilder and added it and regsvr calls to qcap. There s no current implementation of qcap, so therefore I added my gzipped qcap.tgz as an attachment (To keep things simple) My current implementation of the actual interface was based on filesource.c, so i made some functions and struct defs global in quartz: diff -Nru /root/wine-20050211/dlls/quartz/filesource.c wine-20050211/dlls/quartz/filesource.c --- /root/wine-20050211/dlls/quartz/filesource.c 2005-01-06 20:36:47.000000000 +0100 +++ wine-20050211/dlls/quartz/filesource.c 2005-03-15 00:15:47.000000000 +0100 @@ -663,17 +663,6 @@ FileSource_GetCurFile }; - -/* the dwUserData passed back to user */ -typedef struct DATAREQUEST -{ - IMediaSample * pSample; /* sample passed to us by user */ - DWORD_PTR dwUserData; /* user data passed to us */ - OVERLAPPED ovl; /* our overlapped structure */ - - struct DATAREQUEST * pNext; /* next data request in list */ -} DATAREQUEST; - void queue(DATAREQUEST * pHead, DATAREQUEST * pItem) { DATAREQUEST * pCurrent; diff -Nru /root/wine-20050211/dlls/quartz/quartz_private.h wine-20050211/dlls/quartz/quartz_private.h --- /root/wine-20050211/dlls/quartz/quartz_private.h 2005-02-10 18:13:18.000000000 +0100 +++ wine-20050211/dlls/quartz/quartz_private.h 2005-03-15 00:15:47.000000000 +0100 @@ -52,8 +52,8 @@ HRESULT QUARTZ_CreateSystemClock(IUnknown * pUnkOuter, LPVOID * ppv); HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv); HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv); - HRESULT EnumMonikerImpl_Create(IMoniker ** ppMoniker, ULONG nMonikerCount, IEnumMoniker ** ppEnum); +HRESULT VfwCapture_create(IUnknown * pUnkOuter, LPVOID * ppv); typedef struct tagENUMPINDETAILS { @@ -80,4 +80,14 @@ BOOL CompareMediaTypes(const AM_MEDIA_TYPE * pmt1, const AM_MEDIA_TYPE * pmt2, BOOL bWildcards); void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt); +typedef struct DATAREQUEST +{ + IMediaSample * pSample; /* sample passed to us by user */ + DWORD_PTR dwUserData; /* user data passed to us */ + OVERLAPPED ovl; /* our overlapped structure */ + + struct DATAREQUEST * pNext; /* next data request in list */ +} DATAREQUEST; + +void queue(DATAREQUEST * pHead, DATAREQUEST * pItem); #endif /* __QUARTZ_PRIVATE_INCLUDED__ */ As you can see here, a VfwCapture class is being created to use it, we must register it and qcap with regsvr32 diff -Nru /root/wine-20050211/dlls/quartz/regsvr.c wine-20050211/dlls/quartz/regsvr.c --- /root/wine-20050211/dlls/quartz/regsvr.c 2005-02-10 18:13:18.000000000 +0100 +++ wine-20050211/dlls/quartz/regsvr.c 2005-03-15 00:15:47.000000000 +0100 @@ -922,6 +922,12 @@ "quartz.dll", "Both" }, + { &CLSID_VfwCapture, + "Video for wine capture interface", + NULL, + "quartz.dll", + "Both" + }, { NULL } /* list terminator */ }; @@ -1112,6 +1118,18 @@ { 0xFFFFFFFF }, } }, + { &CLSID_VfwCapture, + &CLSID_VideoInputDeviceCategory, + {'V','i','d','e','o',' ','F','o','r',' ','W','i','n','e',' ','(','V','4','W',')', 0}, + 0x800000, + { { REG_PINFLAG_B_OUTPUT, + { { &MEDIATYPE_Stream, &GUID_NULL }, + { NULL } + }, + }, + { 0xFFFFFFFF }, + } + }, /* This creates a fake device for us with an ugly name */ { NULL } /* list terminator */ }; Also, main.c needs to be informed of a new class: diff -Nru /root/wine-20050211/dlls/quartz/main.c wine-20050211/dlls/quartz/main.c --- /root/wine-20050211/dlls/quartz/main.c 2005-03-14 23:47:05.000000000 +0100 +++ wine-20050211/dlls/quartz/main.c 2005-03-15 00:15:47.000000000 +0100 @@ -71,7 +71,8 @@ { &CLSID_AVIDec, AVIDec_create }, { &CLSID_SystemClock, &QUARTZ_CreateSystemClock }, { &CLSID_ACMWrapper, &ACMWrapper_create }, - { &CLSID_WAVEParser, &WAVEParser_create } + { &CLSID_WAVEParser, &WAVEParser_create }, + { &CLSID_VfwCapture, &VfwCapture_create } }; static HRESULT WINAPI And at last, we need the interface of course: diff -Nru /root/wine-20050211/dlls/quartz/Makefile.in wine-20050211/dlls/quartz/Makefile.in --- /root/wine-20050211/dlls/quartz/Makefile.in 2005-02-10 18:13:18.000000000 +0100 +++ wine-20050211/dlls/quartz/Makefile.in 2005-03-15 00:15:47.000000000 +0100 @@ -28,7 +28,8 @@ systemclock.c \ transform.c \ videorenderer.c \ - waveparser.c + waveparser.c \ + v4wsource.c (v4wsource.c added as attachment) Before you think 'yey i can use a webcam now', I have to warn you, you won't What did is made from figuring out what MSN did at every step, for this to work and keeping it debuggable I ONLY used builtin dlls minimum required overrides in wine config: "quartz" = "builtin";FUCKING WORK!!!! "amstream" = "builtin" "qcap" = "builtin";You go girl..... "ole32" = "builtin";Not really needed, but makes debugging easier Currently this is NOT working, and MSN crashes for a reason I do not understand, Iif you want to help me continue working on webcam support i would greatly appreciate it if you could help me pinpoint the source of the crash.. WINEDEBUG=+quartz,+qcap is recommended.. and for now I'm only Currently the code mostly exists out of ugly hacks, what I was working on before msn crashed were the video formats (IKSPropertySet and IAMStreamConfig capabilities), if someone can help me figure out why and were it crashes, I could continue on my webcam project :=). You could try to get it to work through 'Extra' 'Configure webcam' (Or something like that, since I'm using Dutch version), and it crashes for a reason unknown to me.. PS: I accidentally deleted my first patch file, you need to add IAMStreamConfig and perhaps some other class into the include/*.idl files, I'll release a patch when I'm at least 1% awake again :/

2 1

Clipboard regression
by Ron Jensen March 16, 2005

March 16, 2005

>Hello List, > >This patch from 2005/03/07 causes a Clipboard regression: > >http://www.winehq.org/hypermail/wine-cvs/2005/03/0111.html > >Whenever the clipboard is used the process crashes with an X error. >To reproduce it just start notepad and right click into the text area: This also seems to be the cause of X11 errors I am seeing with IrfanView and Textpad. Both apps fail at startup with an X Error, IrfanView is the simpler case: :~$ WINEDEBUG=clipboard wine C/Program\ Files/IrfanView/i_view32.exe trace:clipboard:X11DRV_CLIPBOARD_InsertClipboardFormat Registering format(49173): L"Rich Text Format" drvData 399 trace:clipboard:X11DRV_CLIPBOARD_InsertClipboardFormat Registering format(49174): L"GIF" drvData 396 trace:clipboard:X11DRV_IsClipboardFormatAvailable (0008) trace:clipboard:X11DRV_EmptyClipboard 0 entries remaining in cache. X Error of failed request: BadMatch (invalid parameter attributes) Major opcode of failed request: 1 (X_CreateWindow) Serial number of failed request: 208 Current serial number in output stream: 209 The offending function seems to be the calls to X11DRV_CLIPBOARD_QueryTargets() in X11DRV_CLIPBOARD_QueryAvailableData(). X11DRV_IsClipboardFormatAvailable() calls X11DRV_CLIPBOARD_UpdateCache() which calls X11DRV_CLIPBOARD_QueryAvailableData() which calls X11DRV_CLIPBOARD_QueryTargets() which throws the X Error. These apps both work if started in a desktop window. Ron Jensen

3 4

Re: shell32: set %AllUsersProfile%, and fix shell folder registration
by Juan Lang March 16, 2005

March 16, 2005

--- Alexandre Julliard <julliard(a)winehq.org> wrote: > It's not a c:\windows, it's a %10%. setupapi takes care of putting the > right value in there (defaulting to c:\windows if nothing else is > specified). All I see in dirid.c is a call to GetWindowsDirectoryW. That, in turn, checks %windir%. So the windows directory appears to be set on a per-process basis, not on a per-install basis. This doesn't strike me as correct. --Juan __________________________________ Do you Yahoo!? Make Yahoo! your home page http://www.yahoo.com/r/hs

2 1