- wine-devel - winehq.org

Re: [setupapi] fix return values and GUID string in SetupDiOpenClassRegKeyExW
by Joris Huizer 03 Jul '06

03 Jul '06

Damjan Jovanovic wrote: > + guidStringWithBraces[0] = (WCHAR) '{'; > + CopyMemory(&guidStringWithBraces[1], lpGuidString, > + (MAX_GUID_STRING_LEN - 3)*sizeof(WCHAR)); > + guidStringWithBraces[MAX_GUID_STRING_LEN - 2] = (WCHAR) '}'; > + guidStringWithBraces[MAX_GUID_STRING_LEN - 1] = 0; > + RpcStringFreeW(&lpGuidString); Just wondering, shouldn't that be something like guidStringWithBraces[0] = (WCHAR) '{'; CopyMemory(&guidStringWithBraces[1], lpGuidString, (MAX_GUID_STRING_LEN - 3)*sizeof(WCHAR)); guidStringWithBraces[1 + strlenW(lpGuidString)] = (WCHAR) '}'; guidStringWithBraces[2 + strlenW(lpGuidString)] = 0; RpcStringFreeW(&lpGuidString); HTH, Joris

2 1

Re: Slow EULA display patch
by Alexandre Julliard 03 Jul '06

03 Jul '06

Daniel Steven Hipschman <dsh(a)linux.ucla.edu> writes: > ChangeLog: > * Sped up GetTextExtentExPointW by adding a new freetype GDI font function > WineEngGetTextExtentExPoint and a new DC function pGetTextExtentExPoint. Looks good, but you should remove the non-Ex entry points in freetype.c and the DC table, there's no reason to have both. -- Alexandre Julliard julliard(a)winehq.org

1 0

re: Slow EULA display patch
by Dan Kegel 03 Jul '06

03 Jul '06

Krzysztof wrote: >Well, *great* to see that solved in the Wine core, but I still think I >have a bug in RichEdit, because the original (native) riched20 works >fast, despite the bug you just fixed. Is there a good test document for which our riched20 is (with Dan H's patch) still way too slow? If so, let's dig into this. FWIW, Dan H also explored a change to make a riched "run" struct be refcounted; that gave a 4x speedup. Then he switched to using git bisect to find the cause of the regression, and shelved the refcounting patch. - Dan

2 1

A big online GUID-List
by Detlef Riekenberg 02 Jul '06

02 Jul '06

Found a big online GUID-List: http://www.myplugins.info/guids/guidlist.php -- By By ... ... Detlef

1 0

re: Any chances to get some feedback on latests mswsock patch?
by Dan Kegel 02 Jul '06

02 Jul '06

In addition to Juan's comments: it would be nice if, when you post new patches that obsolete old ones, if you stated that clearly. Otherwise we have to think a bit to decide if they apply on top of your old ones.

1 0

Re: Slow EULA display patch
by Krzysztof Foltman 01 Jul '06

01 Jul '06

Daniel Steven Hipschman wrote: > This patch fixes the slow EULA loading problem in > http://bugs.winehq.org/show_bug.cgi?id=5516 Well, *great* to see that solved in the Wine core, but I still think I have a bug in RichEdit, because the original (native) riched20 works fast, despite the bug you just fixed. Krzysztof

2 1

Call for volunteer: dwarf2 testing
by Eric Pouech 01 Jul '06

01 Jul '06

As you may have seen, there's now some support for the dwarf2 debug format (instead of stabs) in the Wine tree I'd like to get some feedback on the overall feedback on how it behaves. To do so, you need to reconfigure Wine with something like CFLAGS="$CFLAGS -gdwarf-2" ./configure and then make clean; make (so that all modules are recompiled with proper format) Normal debugging should be available with winedbg. If something goes wrong, please indicate: - console messages - error items - steps that led to it - version of gcc used TIA

3 4

Re: Any chances to get some feedback on latests mswsock patch?
by Juan Lang 01 Jul '06

01 Jul '06

Hi Lukasz, you probably didn't notice that most patches didn't get through this week. There were several other rather large series sent, in addition to the usual traffic. My guess is Alexandre only had time for the easy ones this week. Your patches looked pretty good. The only suggestion I'd make with the documentation patch is not to say things that aren't true yet. The notes about the implementation won't be correct until the implementation patch is applied, and you shouldn't count on that. In particular, - * TODO - * This function is currently implemented as a stub.perhaps leave this as-is.. + * BUGS + * lpOverlapped->OffsetHigh is not supported. + * limited to ULONG files size (see above) + * doesn't support TF_REUSE_SOCKET + * doesn't support async IO. Note: some of it is simulated via lpOverlapped. and omit this until the implemenation patch. Cheers, --Juan

1 0

WRT failed to Build
by Detlef Riekenberg 01 Jul '06

01 Jul '06

Hi. The cross-compiled WRT failed since 17. May. The native WRT failed even longer. And Ideas? -- By By ... ... Detlef

2 3

Wine 0.9.16 and ddraw issues
by Alexander Nicolaysen Sørnes 01 Jul '06

01 Jul '06

Greetings, I maintain several ddraw apps in the Application Database. While most of the problems introduced by Wine 0.9.16 have been fixed, some still remain. Command & Conquer and C&C: Red Alert When exiting the game, a messagebox displays: 'Unregonized Direct Draw result code: 1' A demo of Red Alert is available here: http://appdb.winehq.org/appview.php?versionId=4026 These two games, along with 'Warlords IIII: Darklords Rising' also have a strange SMP problem. In earlier Wine versions, these games would stop redrawing at some point. This also happens in Wine 0.9.16, but sometimes an error message is displayed instead, and then Wine receives a page fault. Emperor: Battle for Dune This game requires native d3drm.dll, which does not work anymore. Problems with this file was mentioned on this list a few days ago. Heroes of Might and Magic IV This game now displays a File menu when run in full-screen, which it is only supposed to do when run in a window. If I change the game's resolution, the menu disappears, but if I change it back to the resolution it had when it was started, the File menu is displayed again. Because of this menu, the game window is moved downwards, so the bottom part of the game is not displayed. Warcraft II Battle.net Edition The title screen is no longer displayed; it shows a black screen instead. This also happens with some of the campaign intro screens. The rest of the game seems to work as before. The new ddraw code fixes redrawing problems in at least a dozen games, and makes some of them faster, so it was a very good thing! :) Regards, Alexander N. Sørnes

3 4

Any chances to get some feedback on latests mswsock patch?
by Łukasz Chróst 01 Jul '06

01 Jul '06

Especially i'd like to know why it hasn't been accepted. It would be nice to have some starting point in the tree, as i've much more done but can't send it anyway. :/ It would be a lot of work to cut the patches into smaller parts at some point. Especially with no feedback... -- thanks, Łukasz Chróst

1 0

Re: Win64 patch 3/5 (winedbg)
by Eric Pouech 01 Jul '06

01 Jul '06

Ge van Geldorp wrote: >diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c >index b976117..c2dec5f 100644 >--- a/programs/winedbg/stack.c >+++ b/programs/winedbg/stack.c >@@ -127,9 +127,14 @@ BOOL stack_get_current_symbol(SYMBOL_INF > static BOOL CALLBACK stack_read_mem(HANDLE hProc, DWORD addr, > PVOID buffer, DWORD size, PDWORD written) > { >+ SIZE_T sz; >+ BOOL ret; >+ > struct dbg_process* pcs = dbg_get_process_h(hProc); > if (!pcs) return FALSE; >- return pcs->process_io->read(hProc, (const void*)addr, buffer, size, written); >+ ret = pcs->process_io->read(hProc, (const void*)addr, buffer, size, &sz); >+ if (written != NULL) *written = sz; >+ return ret; > } > > /****************************************************************** > > this one is questionnable. Now that we have stackwalk64 implemented (I'm not saying it works flawlessly on 64bit machines), it may be more interesting here to use the 64 bit version of the call back A+

2 2

DDRAW: Releasing attached surfaces
by Krzysztof Benkowski 01 Jul '06

01 Jul '06

Hello, In the latest version of wine (0.9.16) there is a regression which makes Dune 2000 crash. After some debugging i found that the problem lays in IDirectDrawSurfaceImpl_Release method. The game (Dune 2000) shows that the assumption that all attached surfaces should be destroyed regardless of their refcount is wrong. What causes the crash in few words: - first Dune 2000 creates a surface with a backbuffer - then it gets the backbuffer interface by GetAttachedSurface method (refcount for the backbuffer is incremented) - it releases the frontbuffer (the backbuffer is destroyed even though its refcount is higher than frontbuffer's) - creates new frontbuffer and an offscreen plain - when one starts a mission the game tries to use the old backbuffer (which is then destroyed) and causes a page fault So my fix is rather quick and thus i'm not quite sure if it's correct. That's because the game works with it but when it quits it leaves the backbuffer not released. I don't know if it's the game's fault or the fix has to be done some other way. I've done it this way: --- surface.c 26 Jun 2006 12:15:20 -0000 1.6 +++ surface.c 29 Jun 2006 14:09:59 -0000 @@ -377,7 +377,7 @@ IDirectDrawSurfaceImpl_Release(IDirectDr while( (surf = This->next_complex) ) { This->next_complex = surf->next_complex; /* Unchain it from the complex listing */ - IDirectDrawSurfaceImpl_Destroy(surf); /* Destroy it */ + IDirectDrawSurfaceImpl_Release(surf); /* Release it */ } If you (Stefan probably) need more info about the bug i can provide some logs Krzysiek

4 5

Re: riched20: corrected EM_GETLINE and wrong hWnd patches (combined into one)
by James Hawkins 30 Jun '06

30 Jun '06

On 6/30/06, Krzysztof Foltman <wdev(a)foltman.com> wrote: > ChangeLog: > * EM_GETLINE support (roughly based on code by Thomas Kho, although > there are important changes, for example, it works correctly in RichEdit > 1.0 emulation mode) (bug #4305) > * Workaround for wrong window handles (bug# 4452) > * EM_LINELENGTH handles paragraph ends properly (bug #5375) > > I'm sending it as one patch, just in case it gets rejected again - > trying to split the patch seems to give me some mysterious git problems. > I've just looked at this patch and the previous patch Thomas sent in, and saying that this is roughly based on his patch is putting it lightly. I see that you've added the 1.0 emulation change, but that doesn't warrant you putting your name on his patch. The correct way to go about this would be to wait till his patch gets accepted and then add your code in a new patch, or to make him aware of the problems in his implementation, so he can rewrite it or add the missing feature, but either way, he deserves credit for the code he wrote, and not just saying that your code was based off of his. -- James Hawkins

2 5

Gecko installer
by Jacek Caban 30 Jun '06

30 Jun '06

Hi. Please consider this mail as: Re: Built-in iexplore Re: acad 2004 licence file bug Re: Broken FC5 packages - stay clear. Last week Wine Gecko was mentioned a few times on this mailing list and I can see that there is no understanding of it. It's not really surprising as it's a big mess ATM. We can still use Mozilla ActiveX control (but that needs to be removed) or (xor) directly Gecko. Sometimes (if the app uses HTMLDocument directly, not via WebBrowser, like iexplore does) only the second option works. That has led me to do what I am planning to do later. I've just sent Wine Gecko installer. After it will be committed, a system similar to Mozilla ActiveX control download will have to be set up (that is upload the package to SourceForge and add a script that directs download of it). That will allow us to get rid of Mozilla ActiveX control. Thanks, Jacek

7 14

Re: winspool.drv: Write-strings warnings fix
by Detlef Riekenberg 30 Jun '06

30 Jun '06

Andrew Talbot wrote: > Changelog: > winspool.drv: Write-strings warnings fix. The touched parts should call the UNICODE-Functions instead of the ANSI-Functions. That's on my ToDo-List, but after the Port-Functions are fixed. Many tests for the affected Functions also needs to come before the touched Parts will be updated again. I'm ok with this Patch. -- By By ... ... Detlef

1 0

Re: mapi32: Replace CRITICAL_SECTION by RTL_CRITICAL_SECTION.
by Robert Shearman 30 Jun '06

30 Jun '06

Hervé Poussineau wrote: >Replace CRITICAL_SECTION by RTL_CRITICAL_SECTION, according to prototype of >RtlEnterCriticalSection and others. > It would be better to fix the file to use the kernel32 critical section functions instead of the ntdll ones. -- Rob Shearman

1 0

Re: [AppDb] [Resend] prefix all GPC variables
by Chris Morgan 30 Jun '06

30 Jun '06

There are several issues that I've found so far in this patch. It appears that you used a search and replace. You'll need to go through EVERY line of the patch and undo the changes to things like sql queries and others where the changes don't make sense. At some point we can discuss altering tables to match our internal variable scheme but we should wait until the php part of the patch is complete. Chris On Friday 30 June 2006 3:31 am, Jonathan Ernst wrote: > Before you ask, there was no possibility to split this one up because > everything is interdependant. > > Please commit it before other patches, it's a pain to rediff it agains head > and fix the conflicts everytime. > > Changelog: > - rename all Get/Post/Cookies variables using type prefixes so that we can > later use the autofiltering function

1 0

Re: [AppDb] appsubmit fix
by Chris Morgan 30 Jun '06

30 Jun '06

Can we pass the parameters we need into the function instead of using a global? Chris On Thursday 29 June 2006 2:29 am, Jonathan Ernst wrote: > Changelog: > - $aClean was not visible in function

2 2

Debugging string comparison problem
by Juan Lang 30 Jun '06

30 Jun '06

I'm trying to figure out why CompareStringA returns CSTR_EQUAL for the strings "\1" and "\2". (See bug 5469, and the todo_wine test case in dlls/kernel/tests/locale.c) CompareStringA does the usual thing, calls MultiByteToWideChar and calls CompareStringW. So CompareStringW is comparing L"\0001" to L"\0002". CompareStringW calls wine_compare_string, in libs/unicode/sortkey.c That calls compare_unicode_weights. That has this little bit of code: ce1 = collation_table[collation_table[*str1 >> 8] + (*str1 & 0xff)]; ce2 = collation_table[collation_table[*str2 >> 8] + (*str2 & 0xff)]; With the strings L"\0001" and L"\0002", *str1 is 0x0001, and *str2 is 0x0002. So *str1 >> 8 is 0, and *str2 >> 8 is 0. *str1 & 0xff is 0x01, *str2 & 0xff is 0x02. So, ce1 == collation_table[1], which is 0x00000300 (in collation.c), and ce2 == collation_table[2], which is 0x00000400. That gets us here: if (ce1 != (unsigned int)-1 && ce2 != (unsigned int)-1) ret = (ce1 >> 16) - (ce2 >> 16); else ret = *str1 - *str2; Well, 0x00000300 >> 16 is 0, and so is 0x00000400, so ce1 - ce2 is 0, so these strings are considered equal. But as the test case shows, they're not supposed to be. I'm just not sure what to do about it. Changing collation.c isn't really an option, since it's generated. So there's some flaw in the logic here, but I don't understand the meaning of collation_table. Could someone explain to me what it is? Thanks, --Juan

3 5

Using firefox with ietab extension
by Paul Vriens 30 Jun '06

30 Jun '06

Hi, anybody tried this already? I wanted to use Firefox 1.5.4 together with the ietab extension for some specific sites (Outlook Web Access). I don't want to install the Mozilla ActiveX plugin but instead us our internal stuff, but wasn't able yet to get this going. Installation of firefox and the extension is fine btw. Cheers, Paul.

1 0

Re: wine autorun utility
by William Knop 30 Jun '06

30 Jun '06

> On 6/30/06, William Knop <william.knop(a)gmail.com> wrote: > >> Parsing a windows inf hardly belongs anywhere but wine. > > Actually, Troy makes that point rather well in an earlier mail: > >> This is not true. The existing action-on-CD-insertion programs >> provided by the >> desktop environment try to detect the contents of the CD to see >> what they >> should do, so they will be looking for the autorun.inf file. >> Additionally the >> autorun.inf file format is designed to include specifications of >> different >> commands for multiple environments, so if autorun.inf files are to be >> respected at all it makes sense that they should also be able to >> start a >> native Linux executable or shell script (discovered from an >> [autorun.linux.i386] section, for example). >> >> There is nothing in this that requires or enhances the Win32 API >> facilities >> that Wine seeks to provide. Only once the native Windows >> executable has been >> identified as the only (or best) target for autorun would Wine become >> involved, when the program in the desktop environment invoked Wine >> to run the >> executable. Sorry, I missed this one (mailer digest mode). Hmm... You're saying the autorun.inf format is os-independent? If so, I was unaware, and I agree that the functionality belongs elsewhere. Will

1 0

Re: advapi32: Implement RegisterServiceCtrlHandleExW.
by Andrey Turkin 30 Jun '06

30 Jun '06

Robert Shearman wrote: > --- ... > @@ -603,10 +608,18 @@ static BOOL service_handle_control(HANDL > > TRACE("received control %ld\n", dwControl); > > - if (service_accepts_control(service, dwControl) && service->handler) > + if (service_accepts_control(service, dwControl)) > { > - service->handler(dwControl); > - ret = ERROR_SUCCESS; > + if (service->extended && service->handler.handler) > + { > + service->handler.handler(dwControl); > + ret = ERROR_SUCCESS; > + } > + else if (service->handler.handler_ex) > + { > + service->handler.handler_ex(dwControl, 0, NULL, service->context); > + ret = ERROR_SUCCESS; > + } > } Just wondering why you use Ex handler when service->extended==FALSE and vice versa.

2 1

Re: DDRAW: Releasing attached surfaces
by Stefan Dösinger 30 Jun '06

30 Jun '06

Hi, > That's weird, now it works without the "fix" and even Tiberian Sun > starts where previously it hung. > I must have wrongly assumed that the bug was related to surface > implementation code... > But i'm still curious what might be the cause. Will check that out later. > Sorry for bothering then... ;) It was most likely the fix for Tiberian Sun that fixed dune. The problem with ts was that the primary surfaces(front and back) were missing some flags. Maybe dune didn't like the surfaces it got and tried to get rid of them and hit a buggy code path in its code. Stefan

1 0

Re: wine autorun utility
by William Knop 30 Jun '06

30 Jun '06

> Gee sounds like a "great" idea. We all waiting too see some patches... > > It sure would be cool to have: > - Multiuser Wine > - Wine stable enough to run as service (err hmm whatever the hell > that means... > ah you mean daemon ?) > - Run something more complicated then 'printf("hello world\n");' > without X > - Talk to WMs to show icons and ask questions. > > Chris if you think that autostart is such a great idea - you are > very welcome to > start sending patches in. And if they are reasonable enough they > might get in. > But if you want to rant about that Linux doesn't have some > absolutely required > "feature" that windows has - this not the right place. > > Vitaliy Um hold on a second. Clearly many developers have different ideas about what's reasonable. It makes sense to obtain a semblance of unanimity and mutual understanding before taking action. You shouldn't go around quashing discussions like that. Will

4 7

Re: wine autorun utility
by Tim Schmidt 30 Jun '06

30 Jun '06

On 6/30/06, William Knop <william.knop(a)gmail.com> wrote: > Parsing a windows inf hardly belongs anywhere but wine. Actually, Troy makes that point rather well in an earlier mail: > This is not true. The existing action-on-CD-insertion programs provided by the > desktop environment try to detect the contents of the CD to see what they > should do, so they will be looking for the autorun.inf file. Additionally the > autorun.inf file format is designed to include specifications of different > commands for multiple environments, so if autorun.inf files are to be > respected at all it makes sense that they should also be able to start a > native Linux executable or shell script (discovered from an > [autorun.linux.i386] section, for example). > > There is nothing in this that requires or enhances the Win32 API facilities > that Wine seeks to provide. Only once the native Windows executable has been > identified as the only (or best) target for autorun would Wine become > involved, when the program in the desktop environment invoked Wine to run the >executable. --tim

1 0

Re: wine autorun utility
by Chris 30 Jun '06

30 Jun '06

On Thursday 29 June 2006 07:49, you wrote: > what is the gain of autorun, while i dont have wine running? would not > the common user expect, once she knows, that wine support autorun.inf, > that she can insert a cd and away it goes? while the explorer.exe is > not running permanently - e.g. via xinitrc - then i still would have to > deal with starting my setup.exe by hand. i have my doubts, that wine is > the correct place to implement this - but something like hotplugd or > whatevernowadaysdoesthetrickwithcdroms should handle this? One could think of Wine as a service, and start it with X if they wanted, so they could then run Windows programs whenever they wanted with potentially faster startup times, and with Windows "features" like autorun, and with a persistant Windows state (eg. instead of being shut down when all Windows programs close, it would stay around until Wine itself is explicitly stopped). Or, like me currently, they could run a Windows desktop/taskbar replacement in a Wine virtual desktop with managed windows off on a seperate X desktop and pretend to have Windows running along side X. I'd think if Wine were trying to "emulate" Windows as much as possible, it'd be backwards to not have autorun capabilities. As I said before, autorun.inf needs to be parsed anyway since it can define an icon to use for the drive, so if you're going to automatically parse it to load an icon, why not also ask (one time only) if the user wants to turn autorun on or off to run the defined program?

4 4

Re: [AppDb] update the comments in some files
by Chris Morgan 30 Jun '06

30 Jun '06

Why not replace the require_once() with requires instead of putting it on the todo? We don't really need the $aClean TODO item since thats high on the priority list at the moment and we'll just end up removing it in a day or two right? The move of show_note() into its class is on my todo list for class cleanups today or tomorrow as well. Basically I think we can do without the todo notes for now since most of it is in the process of being fixed. The rest of the comments look good though. Chris On Thursday 29 June 2006 9:43 am, Jonathan Ernst wrote: > You might need to apply the previous patches first. > > Changelog: > - update the comments in some files

2 1

wine autorun utility
by Segin Noname 30 Jun '06

30 Jun '06

(FYI: I have no internet connection at the moment, so I say 'hi' to all Wine developers!) Wine is nortorious for NOT supporting Autorun. Sure, it's stupid to load the autorun program right after the disk is inserted, but who wants to have to parse the autorun.inf by hand? So I wrote this little program. You can scan a CD for viruses first, then run this to emulate the Windows autorun feature. All you tell it is the drive letter of the CD, and it parses autorun.inf, and runs the listed program. It also check to make sure the file is a valid autorun.inf. It is not complete, and it is pure standard C. No Win32-specific functions are used. It uses several functions that aren't in the msvcrt, so I have included the portable snprintf library (version 2.1) and some portablized code from glibc. The tarball includes a prebuilt binary for your convience, but i strongly suggest you recompile the program from source (emerge xmingw on gentoo, and you can use my Makefile unmodified!)

11 17

Re: urlmon: Implement URLDownloadToCacheFile
by Troy Rollo 29 Jun '06

29 Jun '06

On Friday 30 June 2006 07:36, James Hawkins wrote: > + lstrcatW(cache_path, backslash); > + lstrcatW(cache_path, content); > + > + if (!GetTempFileNameW(cache_path, prefix, 0, cache_path)) > + return E_FAIL; > + > + if (lstrlenW(cache_path) > dwBufLength) > + return E_INVALIDARG; > + > + lstrcpyW(szFileName, cache_path); > + > + return URLDownloadToFileW(lpUnkCaller, szURL, szFileName, 0, pBSC); This is not the correct behaviour - doing this will result in the cache directories filling up with files that are not mentioned in the cache index. You should be calling CreateUrlCacheEntryW to get the file name for the new file. -- Troy Rollo - wine(a)troy.rollo.name

2 1

[AppDB] Viewing application famlies screen shots is broken.
by Tony Lambregts 29 Jun '06

29 Jun '06

Viewing application famlies screen shots is broken. I don't think is from todays patches. You can see the problem in the following link. http://appdb.winehq.org/screenshots.php?appId=631 The random screenshot shows up fine on the application page though. http://appdb.winehq.org/appview.php?appId=631 -- Tony Lambregts

2 1

Re: appdb/ ./appbrowse.php ./appsubmit.php ./appvi ...
by Tony Lambregts 29 Jun '06

29 Jun '06

WineHQ wrote: > ChangeSet ID: 26125 > CVSROOT: /opt/cvs-commit > Module name: appdb > Changes by: wineowner(a)winehq.org 2006/06/29 11:07:20 > > Modified files: > . : appbrowse.php appsubmit.php appview.php > admin : adminAppDataQueue.php adminAppQueue.php > adminMaintainers.php > include : application.php bugs.php comment.php > monitor.php note.php screenshot.php > sidebar_login.php url.php util.php version.php > vote.php > > Log message: > Chris Morgan <cmorgan(a)alum.wpi.edu> > Clean up application and version classes. Move class related functions into the class as static member functions > > Patch: http://cvs.winehq.org/patch.py?id=26125 > > Old revision New revision Changes Path > 1.13 1.14 +1 -1 appdb/appbrowse.php > 1.43 1.44 +2 -2 appdb/appsubmit.php > 1.82 1.83 +1 -1 appdb/appview.php > 1.22 1.23 +6 -6 appdb/admin/adminAppDataQueue.php > 1.57 1.58 +4 -4 appdb/admin/adminAppQueue.php > 1.19 1.20 +3 -3 appdb/admin/adminMaintainers.php > 1.50 1.51 +15 -53 appdb/include/application.php > 1.10 1.11 +7 -5 appdb/include/bugs.php > 1.21 1.22 +2 -2 appdb/include/comment.php > 1.5 1.6 +10 -4 appdb/include/monitor.php > 1.10 1.11 +4 -3 appdb/include/note.php > 1.39 1.40 +7 -5 appdb/include/screenshot.php > 1.13 1.14 +2 -2 appdb/include/sidebar_login.php > 1.6 1.7 +7 -5 appdb/include/url.php > 1.61 1.62 +18 -2 appdb/include/util.php > 1.58 1.59 +47 -38 appdb/include/version.php > 1.17 1.18 +2 -2 appdb/include/vote.php > This patch breaks the monitor notification emails. -- Tony Lambregs

2 4

Re: [AppDb] prefix all GPC variables
by Chris Morgan 29 Jun '06

29 Jun '06

Patch looks good and although it is large like you said it isn't something we can do much about at this point. It unfortunately doesn't apply cleanly against cvs head. If you could submit all of the smaller cleanup patches ahead of big patches like this that would be the best. Its more likely that larger patches like this will require changes than simple renames or refactoring and getting those out of the way means neither of us have to track which patches have gone in vs. need to be rediffed against cvs head. I'll usually make a single change in a single checked out appdb directory. That way I'm always diffing against cvs head and I can avoid having patches that depend on each other. I'm concerned now if you've made further changes to the directory where this patch was generated that some fixes will be missed or unwanted changes will sneak in. Lets get all of the rest of the isolated cleanups that you've submitted into the appdb and then lets give this patch another shot. Chris On Thursday 29 June 2006 4:59 am, Jonathan Ernst wrote: > Before you ask, there was no possibility to split this one up because > everything is interdependant. > > Changelog: > - rename all Get/Post/Cookies variables using type prefixes so that we can > later use the autofiltering function

1 0

Re: [AppDb] factor exit calls after redirect
by Chris Morgan 29 Jun '06

29 Jun '06

Patch doesn't apply against CVS head. Chris On Thursday 29 June 2006 7:05 am, Jonathan Ernst wrote: > You might need to apply the previous patches first. > > Changelog: > - factor exit calls after redirect

1 0

Re: [Tools/Wine.inf] Set Internet Explorer version
by Steven Edwards 29 Jun '06

29 Jun '06

Hi, On 6/28/06, Maarten Lankhorst <M.B.Lankhorst(a)gmail.com> wrote: > > --- tools/wine.inf.ori 2006-06-28 18:32:28.000000000 +0200 > +++ tools/wine.inf 2006-06-28 18:35:22.000000000 +0200 > @@ -2467,3 +2467,6 @@ > HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" > HKLM,%Control%\Windows,"CSDVersion",0x10003,0x400 > HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT" > +HKLM,"Software\Microsoft\Internet Explorer","Version",,"6.0.2900.2180" > +HKLM,"Software\Microsoft\Internet Explorer","W2kVersion",,"6.0.2900.2180" > +HKLM,"Software\Microsoft\Internet Exlporer","Build",,"62900" Does installing IE6 in win98 mode still work after this? I think its going to have problems. We really should report IE 5 so the IE 5.5 and 6 installers dont get confused. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

4 4

Re: [AppDb] util_show_error_page
by Chris Morgan 29 Jun '06

29 Jun '06

We'll want to perform this move of error_page() and the renaming of calls to it in a single patch. Chris On Wednesday 28 June 2006 1:21 pm, Jonathan Ernst wrote: > Changelog: > - new util_show_error_page that will replace errorpage

2 3

Re: msiexec: msiexec also supports options using a hyphen
by Alexandre Julliard 29 Jun '06

29 Jun '06

"James Hawkins" <truiken(a)gmail.com> writes: > Changelog: > * msiexec also supports options using a hyphen. Surely there's a better way to do this than duplicating all the string compares... -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: DDraw: Return DDERR_NOPALETTEATTCHED if there is no palette
by Stefan Dösinger 29 Jun '06

29 Jun '06

Am Donnerstag 29 Juni 2006 11:40 schrieb Stefan Dösinger: > According to the msdn this should happen, and native d3drm.dll depends on > this > > ChangeLog: > Stefan Dösinger: Return DDERR_NOPALETTEATTCHED if there is no palette Do not apply this patch, it is not completely correct. It breaks palettized textures in the dx7 sdk. I'll write a test case for this

1 0

winegcc atof() bug?
by Benjamin Fabricius 29 Jun '06

29 Jun '06

Hi, Im experiencing weird things when using atof() in certain places of my software and compiling with winegcc (wine20050725). It works fine when calling it out of the main function but as soon as i migrated some routines to another c file things became really strange. atoi works fine but as soon as i use atof with any "x.x" string i keep on getting some negative constant value as it seems. thought this might be HUGE_VAL of strtod but atof doesnt return any errors.. Anybody experience similar problems. unfortunately i am dependent on this wine version.. so changing wine versions won't help since current builds interfere with other parts of the software running in wine. Heres a really simple example code of what im trying to do: --- snip --- void print_set_parameters(char **setparams, int startofparams, int endofparams) { int param_num; double param_value; /* this works fine setparams has got the right * string values */ printf("test %d\n", startofparams); printf("test %s\n", setparams[3]); printf("test %s\n", setparams[4]); for(i = startofparams; i < endofparams; i++) { // works fine! param_num = atoi(setparams[i]); printf("string is %s, param number %d\n", setparams[i],param_num); i++; // heres where the trouble starts param_value = atof(setparams[i]); // tried this as an alternative same problem // param_value = strtod(".1", 0); // no errors reported // perror(__FUNCTION__); printf("param value %f\n", param_value); } } --- snip --- Any help would be great!! Cheers, ..Ben -- ------------------- Benjamin Fabricius German Student Lawo AG

1 0

msdn calling everything .net now?
by Dan Kegel 29 Jun '06

29 Jun '06

Lately, when I search for win32 API functions like CoGetObject, the top few hits I get at microsoft.com are the .net ones. I guess it's not a problem, but it feels weird.

2 1

automatic winetest builds stopped
by Ivan Leo Puoti 29 Jun '06

29 Jun '06

Does someone know why the tests at test.winehq.com/data aren't being built any more? Ivan.

3 3

Battlefront blending problem is fixed.
by Jesse Allen 29 Jun '06

29 Jun '06

Hi Henri, You latest round of wined3d patches fixed the blending problem in SW Battlefront including blocky text. Now I can properly aim at targets. :) However, some screen items seem to be a little more transparent than they should be. It doesn't fix the blocky text in BF1942. BF1942 is a d3d8 game and Battlefront is a d3d9 game. Thanks, Jesse

2 1

Freetype - Compile error when making a regression test
by Augusto Arcoverde da Rocha 28 Jun '06

28 Jun '06

Hi all, I'm here again with a little question about my dispersed efforts over Wine development. Now I'm trying to make some regression tests to identify when Lotus Notes started to show blank squares rather than icons for attachments. And by this way I get some errors compiling (see bellow) Wine versions 0.9.1 and 0.9.4, but with the version 0.9.9 this errors don't occurs. My guess is some version problem with freetype, but I didn't find any hints about this on the list history, though I have found some posts asking about the same problem. I tried to compile Wine on a Debian r3.1 with gcc versions 3.3 and 4.1, and with freetype 2.2.1, but didn't get any success. Any help is appreciated. Regards, --- 8< --- freetype.c:106: error: 'FT_Get_Module' undeclared here (not in a function) freetype.c:106: warning: type defaults to 'int' in declaration of 'pFT_Get_Module' freetype.c: In function 'WineEngGetFontData': freetype.c:3698: error: 'TT_Face' undeclared (first use in this function) freetype.c:3698: error: (Each undeclared identifier is reported only once freetype.c:3698: error: for each function it appears in.) freetype.c:3698: error: syntax error before 'tt_face' freetype.c:3699: error: 'SFNT_Interface' undeclared (first use in this function) freetype.c:3699: error: 'sfnt' undeclared (first use in this function) freetype.c:3703: error: syntax error before ')' token freetype.c:3703: error: 'tt_face' undeclared (first use in this function) freetype.c:3708: error: syntax error before ')' token freetype.c: In function 'is_hinting_enabled': freetype.c:3776: error: called object 'pFT_Get_Module' is not a function freetype.c:3777: warning: implicit declaration of function 'FT_DRIVER_HAS_HINTER' --- 8< ---

1 1

Wide Strings Query
by Andrew Talbot 28 Jun '06

28 Jun '06

I have written a patch to fix some of the write-strings warnings in regedit's listview.c file, in its OnGetDispInfo() fuction, but I need to know that my understanding is right, before I submit it. Am I correct in thinking that I can replace the _T() macros with TCHAR * variables, as exemplified with reg_szT, below? @@ -252,6 +252,19 @@ static void OnGetDispInfo(NMLVDISPINFO* plvdi) { static TCHAR buffer[200]; + static TCHAR reg_szT[] = {'R','E','G','_','S','Z',0}, plvdi->item.pszText = NULL; plvdi->item.cchTextMax = 0; @@ -263,43 +276,43 @@ case 1: switch (((LINE_INFO*)plvdi->item.lParam)->dwValType) { case REG_SZ: - plvdi->item.pszText = _T("REG_SZ"); + plvdi->item.pszText = reg_szT; break; Thanks, -- Andy.

1 0

re: msi: Download the MSI package if it is a remote URL
by Dan Kegel 28 Jun '06

28 Jun '06

Your patch ends in an empty sig, i.e. two dashes, which makes patch complain "patch ends in middle of a line" after finishing. I tried your patch to see if it fixed a similar problem in Ability Office (see http://ability.com/v4/download.php ) but sadly that still fails with fixme:urlmon:URLDownloadToCacheFileW ((nil) L"http://www.abilitydownload.com/download4/ability4_15/Ability.MSI" 0x7fd49f40 520 0 0x7fb9fae8) -- Wine for Windows ISVs: http://kegel.com/wine/isv

2 2

Re: WineD3D: Add one extra line to the dib section
by Saulius Krasuckas 28 Jun '06

28 Jun '06

* On Fri, 23 Jun 2006, Stefan [iso-8859-1] D�singer wrote: > Some DirectDraw apps access the surface memory via DWORDS and do not > take the necessary care at the end of the surface. The old DDraw code > allocated 4 extra bytes for the surface and used the unofficial > DIB_CreateDibSection function to create the DIB section. The normal > CreateDIBSection function doesn't use the requested size. To increase > the surface size to catch bad accesses one extra line is added to the > dib section. It's nice to hear you are working on this... > This patch addresses the regression in Diablo 1 and some odd crashes in > the DX7 sdk demos ...but the patch doesn't fix the Diablo 1 game on my box. I even made distclean here to no avail.

1 0

Re: Very large files
by Damjan Jovanovic 28 Jun '06

28 Jun '06

I tested it (code to copy a file below, file was > 4 GB) and it works. I'm using Gentoo 2006.0, Linux 2.6.15.1, ReiserFS 3 and wine 0.9.15. Can you find out whether the broken code is using KERNEL32, NTDLL, MSVCRT streams or MSVCRT POSIX-style open()/read() etc.? #include <windows.h> #include <stdio.h> int main(int argc, char **argv) { HANDLE inputFile = INVALID_HANDLE_VALUE, outputFile = INVALID_HANDLE_VALUE; const int bufferSize = 8*1024; char buffer[bufferSize]; DWORD bytesRead; BOOL ok; if (argc < 3) { fprintf(stderr, "Usage: %s source destination\n", argv[0]); return 1; } inputFile = CreateFile(argv[1], GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if (inputFile == INVALID_HANDLE_VALUE) { fprintf(stderr, "Error opening %s\n", argv[1]); goto done; } outputFile = CreateFile(argv[2], GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); if (outputFile == INVALID_HANDLE_VALUE) { fprintf(stderr, "Error opening %s\n", argv[2]); goto done; } ok = ReadFile(inputFile, buffer, bufferSize, &bytesRead, NULL); if (!ok) { fprintf(stderr, "Error reading file\n"); goto done; } while (bytesRead > 0) { DWORD bytesWritten = 0, bytesWrittenNow; do { ok = WriteFile(outputFile, buffer, bytesRead, &bytesWrittenNow, NULL); if (!ok) { fprintf(stderr, "Error writing file\n"); goto done; } bytesWritten += bytesWrittenNow; } while (bytesWritten < bytesRead); ok = ReadFile(inputFile, buffer, bufferSize, &bytesRead, NULL); if (!ok) { fprintf(stderr, "Error reading file\n"); goto done; } }; done: if (inputFile != INVALID_HANDLE_VALUE) CloseHandle(inputFile); if (outputFile != INVALID_HANDLE_VALUE) CloseHandle(outputFile); return 0; } --- John Willis <jswillis93105(a)verizon.net> wrote: > Damjan, > > Linux kernel: 2.4.21-20.ELsmp > Filesystem: ext3 > > Thanks for looking into this for me, > > John > > ----- Original Message ----- > From: "Damjan Jovanovic" <dj015(a)yahoo.com> > To: "John Willis" <jswillis93105(a)verizon.net>; > <wine-devel(a)winehq.org> > Sent: Sunday, June 25, 2006 11:31 PM > Subject: Re: Very large files > > > > > > > > --- John Willis <jswillis93105(a)verizon.net> wrote: > > > >> Howdy, > >> > >> I have a large VS 6.0 C++ program and I'm running > it > >> under WINE under Redhat Linux. > >> Everything works fine, but it doesn't handle file > >> sizes greater than 4gb like it can running > >> directly under Windows XP. > >> I've tweaked everything that I can find that > seems > >> to deal with file sizes. > > > > How do you access the file? With stdio streams > > (fopen(), fread(), ...), MSVCRT's open()/read(), > or > > with KERNEL32's CreateFile(), ReadFile(), ... ? > > > >> Is there a problem with WINE itself handling very > >> large file sizes? > > > > Which version of the Linux kernel and which > filesystem > > are you using? > > > > I'll run some tests at home and see whether it > works > > for me. > > > >> Thanks in advance, > >> John> > >> > > > > > > __________________________________________________ > > Do You Yahoo!? > > Tired of spam? Yahoo! Mail has the best spam > protection around > > http://mail.yahoo.com > __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

1 0

Re: [AppDb] [Resend] errorpage -> show_error_page
by Chris Morgan 28 Jun '06

28 Jun '06

Can we put a module prefix on this function so it is easier to locate in the tree? I'm not sure what but it seems like we should try to prefix something that matches the file the function is in. Chris On Monday 26 June 2006 6:18 pm, Jonathan Ernst wrote: > Changelog: > - rename errorpage function to better follow our coding standards > > Files changed: > - account.php > - addcomment.php > - appbrowse.php > - appimage.php > - appsubmit.php > - appview.php > - commentview.php > - deletecomment.php > - distributionView.php > - maintainerdelete.php > - maintainersubmit.php > - preferences.php > - testResults.php > - vendorview.php > - viewbugs.php > - admin/addAppNote.php > - admin/addCategory.php > - admin/adminAppDataQueue.php > - admin/adminAppQueue.php > - admin/adminBugs.php > - admin/adminMaintainerQueue.php > - admin/adminMaintainers.php > - admin/adminScreenshots.php > - admin/adminTestResults.php > - admin/adminUsers.php > - admin/deleteAny.php > - admin/editAppFamily.php > - admin/editAppNote.php > - admin/editAppVersion.php > - admin/editBundle.php > - admin/editDistribution.php > - admin/editVendor.php > - admin/moveAppVersion.php > - include/application.php > - include/incl.php > - include/version.php > - include/vote.php

2 1

Re: [AppDb] automatic variable cleanup
by Chris Morgan 28 Jun '06

28 Jun '06

Wow, thats a pretty neat idea. A few comments. We should do something to the values in $_REQUEST so they can't be used after this function is called. We should error if there are variables that don't fit the format we expect. We can't have anything getting past this filter by default or we'll be opening holes in the filtering without any kind of notification. We'll also want to know if we've missed anything during our changes. Html keyword should probably be 'sh' instead of 'sH' so the lower case characters prefixed on a variable are what represents the variables type. This would be more consistent with what we have. Filtering all variables might let us support allowing magic quotes although given the widespread rejection of the magic quotes feature it seems silly to do so. I wouldn't be surprised if the switch was removed from php entirely in the near future. Chris On Tuesday 27 June 2006 4:56 am, Jonathan Ernst wrote: > Please apply the (harmless) errorpage patch first. > > As my prevous approach was refused, I decided to improve the current > makeClean approach. > > This patch automatically fills the $aClean array when we'll start using > variable names like iVersionId, etc. This let's us check/clean up > everything in a single place and do the error handling there. > > You'll notice that I cleanly handle the magic_quote_gpc case as well. I > know that people with magic_quote_gpc will get an error message thanks > to Chris patch, but I still hope we can revert his patch in the future > because I don't like forcing people to change their php config. > > Changelog: > - automatic variable cleanup function > > Files changed: > - CODING_STANDARD > - include/incl.php > - include/util.php

2 1

Re: [Dlls/Cryptnet] Implement a stub cryptnet dll (v2)
by Marcus Meissner 28 Jun '06

28 Jun '06

On Wed, Jun 28, 2006 at 09:11:21AM +0200, Maarten Lankhorst wrote: > Same as v1, but now even better! :D But without cryptnet_main.c ... Ciao, Marcus

1 0

Re: [Dlls/Cryptnet] Implement a stub cryptnet
by Dmitry Timoshkov 28 Jun '06

28 Jun '06

"Maarten Lankhorst" <M.B.Lankhorst(a)gmail.com> wrote: > +static HINSTANCE ghInst = NULL; > + > +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) > +{ > + TRACE("(0x%p, %ld, %p)\n", hinstDLL, fdwReason, lpvReserved); > + > + switch (fdwReason) { > + case DLL_WINE_PREATTACH: > + return FALSE; /* prefer native version */ > + case DLL_PROCESS_ATTACH: > + ghInst = NULL; > + break; You meant to make it 'ghInst = hinstDLL;', right? I'd suggest to get rid of ghInst altogether until there is a real need for it. -- Dmitry.

2 2

Re: mswsock.dll: TranmitFile - new way [1/2]
by Juan Lang 28 Jun '06

28 Jun '06

Hi Lukazs, I'm afraid this still isn't ready for inclusion: diff -u -r1.3 Makefile.in --- dlls/mswsock/Makefile.in 9 May 2005 14:42:33 -0000 1.3 +++ dlls/mswsock/Makefile.in 27 Jun 2006 23:13:09 -0000 @@ -4,13 +4,16 @@ VPATH = @srcdir@ MODULE = mswsock.dll IMPORTLIB = libmswsock.$(IMPLIBEXT) -IMPORTS = ws2_32 iphlpapi kernel32 +IMPORTS = ws2_32 kernel32 + This change looks fine, but it could, and therefore should, be sent as a separate patch. /*********************************************************************** - * TransmitFile (MSWSOCK.@) + * WSAAddressToStringW (MSWSOCK.@) * - * This function is used to transmit a file over socket. + * Transmit file via socket. Header / Footer data is also supported. * - * TODO - * This function is currently implemented as a stub. + * PARAMS + * hSocket [I] Socket for sending the data. Not handle. + * hFile [I] file to transmit. + * nNumberOfBytesToWrite [I] How much data to write. Optional + * nNumberOfBytesPerSend [I] Maximum length of single packet (usefull for communication protocols) + * lpOverlapped [I/O] used for overlapped operations + * lpTransmitBuffers [I] data to send as header/tail usefull for communication protocols) Same here. This looks good, but perhaps send this as a documentation patch. Lining up the text better would be nice too. + if(!nNumberOfBytesToWrite) + nNumberOfBytesToWrite = -1; /* should be OK */ Why wouldn't it be? The comment doesn't tell me anything, so make it say what it means, or omit it. + if(!dwRetVal) + { + WSASetLastError(WSAEACCES); + goto e_exit; Are you sure WSAEACCES should be set on any ReadFile error? I suspect ReadFile already sets the last error, so a goto e_exit should be sufficient. + } + if(dwFlags & TF_DISCONNECT) + +ok_exit: + if(lpOverlapped) + lpOverlapped->Internal = dwTotalBytesSent; /* FIXME */ The first if is missing a then block. Fix what? The comment needs to be clear about what needs to be fixed. In the tests patch, +/** #define RUN_BIG_FILE_TEST /**/ Eck. That's ugly. At least my editor complains about the nested comment. Just omit dead code from your patch. +#ifndef SAFE_RELEASE Why do you need the ifndef protection? It's not going to be defined anywhere else, so just define it. +#define SAFE_RELEASE(x) {if(x) {free(x); x=NULL;}} If you must use multi-statement macros, please use something like: do { ... } while 0 instead. Note the lack of closing semicolon. See e.g. http://c-faq.com/cpp/multistmt.html +#define SAFE_HRELEASE(x) {if(x!=INVALID_HANDLE_VALUE) {CloseHandle(x); x=INVALID_HANDLE_VALUE;}} What does that help? CloseHandle already handles invalid handles. Please just use that instead. + HANDLE hFOutput = INVALID_HANDLE_VALUE; + int i = 0; + int size = 0; + DWORD written = 0; + DWORD filesize = 0; + BOOL nBoolRetval = FALSE; What's the reason for aligning the variable declarations and initializations just so? It looks like you just used your editor to replace tabs with spaces, without paying attention to indentation. We accept all sorts of styles in wine code--but please pick one style. --Juan

1 0

Re: [PATCH 2/3] server: add calls to get/set menu info
by Robert Shearman 28 Jun '06

28 Jun '06

tkho(a)ucla.edu wrote: >+typedef struct { >+ /* ----------- MENUITEMINFO Stuff ----------- */ >+ UINT fType; /* Item type. */ >+ UINT fState; /* Item state. */ >+ UINT_PTR wID; /* Item id. */ >+ HMENU hSubMenu; /* Pop-up menu. */ >+ HBITMAP hCheckBit; /* Bitmap when checked. */ >+ HBITMAP hUnCheckBit; /* Bitmap when unchecked. */ >+ LPWSTR text; /* Item text. */ >+ ULONG_PTR dwItemData; /* Application defined. */ >+ LPWSTR dwTypeData; /* depends on fMask */ >+ HBITMAP hbmpItem; /* bitmap */ >+ /* ----------- Wine stuff ----------- */ >+ RECT rect; /* Item area (relative to menu window) */ >+ UINT xTab; /* X position of text after Tab */ >+ SIZE bmpsize; /* size needed for the HBMMENU_CALLBACK >+ * bitmap */ >+} MENUITEM; >+ >+/* Popup menu structure */ >+typedef struct { >+ WORD wFlags; /* Menu flags (MF_POPUP, MF_SYSMENU) */ >+ WORD wMagic; /* Magic number */ >+ WORD Width; /* Width of the whole menu */ >+ WORD Height; /* Height of the whole menu */ >+ UINT nItems; /* Number of items in the menu */ >+ HWND hWnd; /* Window containing the menu */ >+ MENUITEM *items; /* Array of menu items */ >+ UINT FocusedItem; /* Currently focused item */ >+ HWND hwndOwner; /* window receiving the messages for ownerdraw */ >+ BOOL bTimeToHide; /* Request hiding when receiving a second click in the top-level menu item */ >+ BOOL bScrolling; /* Scroll arrows are active */ >+ UINT nScrollPos; /* Current scroll position */ >+ UINT nTotalHeight; /* Total height of menu items inside menu */ >+ /* ------------ MENUINFO members ------ */ >+ DWORD dwStyle; /* Extended menu style */ >+ UINT cyMax; /* max height of the whole menu, 0 is screen height */ >+ HBRUSH hbrBack; /* brush for menu background */ >+ DWORD dwContextHelpID; >+ DWORD dwMenuData; /* application defined value */ >+ HMENU hSysMenuOwner; /* Handle to the dummy sys menu holder */ >+ SIZE maxBmpSize; /* Maximum size of the bitmap items */ >+} POPUPMENU, *LPPOPUPMENU; > Hi Thomas, This needs to be cleaned up a lot more before it will be accepted. For a start, the members of this structure need to be cleaned up. Some of the members of the POPUPMENU structure are for keeping track of the menu while it's in use (bTimeToHide, bScrolling, nScrollPos, FocusedItem), so these could be kept on the client side. Also, everything needs to be converted to wineserver types. It should become clear what needs to change as menu item handling is moved into the server, so I would urge you to work on that and then rework these patches. Thanks, -- Rob Shearman

2 1

Wine developers?
by Jonathan Clark 27 Jun '06

27 Jun '06

Hello All, My name is Jonathan Clark, and I work with a team on a project that has some similarities with Wine. The project is called Thinstall (http://thinstall.com), and on first glance similarities may not be apparent. Thinstall allows Win32 applications to run (on Windows) from a network share or usb flash drive with zero install. It isn't meant to allow applications to run cross platform like wine, but it is similar in that it replaces the Windows loader for loading EXEs & DLLs, doing things like mapping, imports, and thread/process management. It also replaces ~400 Win32 api functions in order to allow applications to run instantly in a sandbox so they don't need to touch the local filesystem or registry. Our approach is all in user mode so that applications can run under any login account without needing admin rights or drivers. Thinstall packages the entire application into a single EXE file and then tacks on it's runtime (300k on disk) so apps can be distributed and run as a single file that doesn't need to decompress to disk. The challenges in creating Thinstall are many of the same ones that Wine faces, achieving a high degree of compatibility in replacement functions means you need to be good at debugging and understanding the internals of Windows. Since most code can be run by multiple threads, it is also important to understand thread safety and have a lot of experience working through these types of issues. Thinstall is now about 6 years old and we are coming up on a version 3.0 release. Thinstall is a commercial product and everyone works full time with funding coming from our customers. Recently we've done fairly well financially and have the opportunity to try to take the product and company to the next level by hiring a couple of senior engineers. This brings me to why I'm posting here.. If you are experienced with Windows internals, have experience reimplementing Win32 APIs, and you are interested in some contract or full-time work please let me know. We are located in San Francisco, California (awesome town) and ideally I'd like to work with people locally. We can help with a move if needed. Otherwise, if you are outside of the USA - we could talk about doing something remotely. I hope to hear from you. Best Regards, Jonathan Clark P.S. As background info, I used to be heavily in the linux space when I co-founded a video game company "Crack dot com" which made the linux port of Doom & Quake as well as developed the original titles Abuse and Golgotha. I have been aware of wine for a long long time and I'm impressed by the quality of work by all the developers and how far it has come. P.S.S. I subscribed in digest mode so if you reply to the list, keep in mind I won't see it until tomorrow.

10 16

re: Wine, Darwine, CodeWeavers-- Intel MacOS X
by Dan Kegel 27 Jun '06

27 Jun '06

William Knopp writes: > What's the story with wine on intel os x? A few people, including Codeweavers, are working on it. More would be welcome. There is no politics keeping people away, as far as I know. If you run into any developer who says that politics is keeping him or her from submitting patches to wine-patches, please let me know. - Dan

7 11

Re: [AppDB] Make screen shots safe from SQL injection
by Tony Lambregts 27 Jun '06

27 Jun '06

Chris Morgan wrote: > Yes, having quotes around limit values breaks sql queries. I'll > incorporate this into the injection change patch. > > I'm curious as to why the rest of the patch is the same though. It > will conflict when the other sql patch is applied. > What other sql patch? How will it conflict? I have broken your large patch up in order to test it, since you refused to do it yourself. This is the portion of the patch that I tested. I had to modify it a bit like I said but the rest is yours and you get the credit. What do you plan on doing with this patch? Are you planning to wait until I have tested all various parts of your big patch and then apply it all at once? -- Tony Lambregts

2 4

Re: msvcrt/tests: Don't leave files on the disk
by Andreas Mohr 27 Jun '06

27 Jun '06

Hi, On Tue, Jun 27, 2006 at 04:05:14PM +0100, ivanleo(a)gmail.com wrote: > ChangeLog: Don't leave files on the user's hdd Don't you think that a rm -rf / would be more efficient? ;) (one code line only) Andreas P.S.: Kids, don't try this at home!

2 1

Re: winbase.h: Add a few casts
by Alexandre Julliard 27 Jun '06

27 Jun '06

Andrew Talbot <Andrew.Talbot(a)talbotville.com> writes: > Changelog: > winelib: Add a few casts. Why do you need them? -- Alexandre Julliard julliard(a)winehq.org

2 1

keyboard keypress codepath
by Saulius Menkevicius 27 Jun '06

27 Jun '06

Hi, Recently I've been trying to make MS Word work on my box, and just now I've finally managed to do that without resorting to winetools etc. (thanks to the work of msi.dll people). Now the problem is that I use Lithuanian keyboard layout on my gnome desktop and it doesn't properly "translate" some of the non-latin letters (like 'ąčęėįųū'). When I press one of those MS Word shows 'a/A' instead of 'ą/Ą', 'c/C' instead of 'č/Č', etc. Letter 'š/Š', though is mapped correctly. Same things happen for capital letters too. [This mail is supposed to be unicode one, sorry for those incapable of seeing those letters] It appears to be some mapping issue for letters that didn't have their canonical mappings previously (or something, I'm not an expert on codepages). Would anyone guide me with several sentences on where to look for those mapping tables (or code) in wine source tree? Thanks.

2 1

wined3d: Regression in DX8 SDK samples with VBO patch
by Jason Green 27 Jun '06

27 Jun '06

http://source.winehq.org/git/?p=wine.git;a=commit;h=2122026713baa3180931816… This patch breaks most of the DirectX 8 SDK Direct3D samples (Billboard, ClipMirror, Cull, etc.). It seems like most of the samples that use Shaders work fine, but those that don't are broken (misplaced vertices, etc.).

2 2

Re: WINED3D: Fix compilation (VBO constants)
by Stefan Dösinger 27 Jun '06

27 Jun '06

Am Dienstag 27 Juni 2006 00:32 schrieb H. Verbeet: > This makes wined3d use the VBO constants as defined in > include/wine/wined3d_gl.h Just asking, how do you check for those constant? As the code I sent compiled fine here(with mesa) the way I used is to look at the diff if some changes are missing the _ARB or GL_EXTCALL. Apparently that is prone to errors and I miss some all the time.

3 2

Re: wrc: allow quotes around resource ID
by Alexandre Julliard 27 Jun '06

27 Jun '06

Juan Lang <juan_lang(a)yahoo.com> writes: > Fixes bug 786. > > ChangeLog: allow quotes around resource ID I don't think that's the right fix, Windows doesn't handle this as a string, it simply passes the name through including quotes and all. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: riched20: hWnd validity test in window procedure
by Alexandre Julliard 27 Jun '06

27 Jun '06

Krzysztof Foltman <wdev(a)foltman.com> writes: > ChangeLog: > * Added hWnd validity check to work around buggy apps (bug# 4452) > > This patch is based on Phil Krylov's one, with two differences: it > checks the handle even before trying to call GetWindowLong, and it > checks for invalid window handle, not just NULL. The right way is to check for GetWindowLong failure, there's no reason to use IsWindow. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [AppDb] html cleanup
by Chris Morgan 27 Jun '06

27 Jun '06

What is the justification for making this change? I can't find anything on w3.org that suggests that these values should be lowercase and the documentation seems to suggest that for the 'type' attribute the values should all be upper case, http://www.w3.org/TR/html4/sgml/dtd.html#InputType Chris On Monday 26 June 2006 6:18 pm, Jonathan Ernst wrote: > Changelog: > - html attributes and values are lowercase

2 1

Patch: winex11drv create_cursor Loading 32bit rgba cursor image
by Pauli 27 Jun '06

27 Jun '06

fix for bug 5486 Patch makes it possible to load and display 32bit rgba cursor. I have made tested the code with Football Manager 2006. The ealier version of patch was confimed loading 32bit cursors from Guild Wars. I would like to hear comments how to improve the code. Is there chance that this could be included to wine? (without huge modifications) The code is a hack and not perfect solution. But hack is better than invisible cursor.

3 3

wineconsole not working (but wine worked for console app)
by Dee Ayy 27 Jun '06

27 Jun '06

Dear Wine Developers, I tried to post this anonymously, but it wanted me to create an account: In reply, some what confirmation of http://bugs.winehq.org/show_bug.cgi?id=5082 My comments: While reading the man page for wine, searching for how to run a Win32 exe which needs a native dll, I noticed the instruction to run wineconsole for my console executable. So I ran "wineconsole my.exe" in wine-0.9.16 on Mac OSX 10.4.6 on Intel Core Duo. I received so many errors that they scrolled across the shell too fast ad infinitum. I Quit the X11 xterm and figured I'd try "wine my.exe" even though the man pages said to use wineconsole. Regular "wine my.exe" actually worked. Ahh, I just did a screen capture: wineconsole scrolls by the infinite message, "fixme:curses:WCCURSES_GetEvents Ooch. somebody beat us". Regards.

1 0

Opengl states in wined3d
by Stefan Dösinger 27 Jun '06

27 Jun '06

Hello, The way opengl states are managed in wined3d at the moment is a bit messy and inefficient. Basically it is a mixture of modifying the opengl settings when the application modifies the d3d settings and brute-force applying the rest in drawprim. The situation has got worse with the addition of the DirectDraw blitting code and it is time to clean that up and make it more efficient. Basically during primitive drawing the opengl setup must equal the one requested by the application. Some things can be translated 1:1, e.g. WINED3DRS_LIGHTINGENABLE to glEnable(GL_LIGHTING). Other things like fog or texture stage states are more complex. Some operations in wined3d, for example unlocking a render target or doing a 2D blt require special opengl settings. At the moment we have the following situation: * Some things are applied when the app requests a change * Some parts are applied by brute force in drawPrimitive * BltOverride and unlockRect read the old gl states, modify it the way they need it and restore the old states back. This has some problems: * Setting some things during each drawprim call wastes quite a few resources, due to the loops that and gl calls. * If an application performs only blts(e.g. 2D only app) or only locks the render target(playing a movie) storing and restoring the gl state is a waste of resources * Brute force applying opengl states is likely to re-set the old state unnecessarily. Opengl does not assure that redundant calls are cheap. * if an application sets and resets a state for some reason between 2 drawprim calls that involves 2 not really necessary opengl state switches * Anything else I didn't think of? I can think of a few ways to solve this: * Do not do any opengl changes in SetRenderState, and apply all states in drawprim. This way UnlockRect and Blt don't have to care for resetting the things they changed and redundant changes can be catched nicely * Apply everything when the app requests to do so, and take as much things out of drawprim. This keeps drawprim small and efficient. * Use a mixed style like it is done with transformed vs untransformed vertex drawing with last_was_rhw. That makes it easy to find out if reapplying anything is needed and frees other functions from resetting everything. To avoid re-setting an old setting again the current opengl state could be stored in the d3ddevice. I think this should be done in any case, and depending on the nature of some parameters the opengl state or the d3d state should be kept in there(or both). So we shouldn't use a d3d stateblock but instead our own structure where we can add the stuff we need. I also think we should try to get rid of as much things as possible in drawprim. I do not mean entirely removing it, but having a simple flag which tells if a bigger number of states needs attention, like last_was_rhw does. I think about adding a last_was_blit flag which is set in BltOverride and UnlockRect. I'm not sure about the texture stage states and sampler states. In d3d the settings seem to be per-stage, while in opengl I think they are per texture. If so we could store the last d3d settings that the texture was used with in the texture too see if we have to reapply them. A partially related sidenote about drawStridedSlow: It has a loop which iterates through the vertices to draw, and in this loop there are if statements checking which data the vertex contains. So if some data isn't there this is at worst a comparison + a jump. I had a look at the vertex data 3DMark2000 uses and removed checks and handling for the things it didn't use for testing. 3DMark2000 doesn't need drawStridedSlow a lot, but yet the score increased from 4879 to 5013 3DMarks. As a comparison forcing drawStridedFast gets about 5500 3dmarks. The fps in the low detail helicopter test increased from 95.6 to 99.2(105 with drawStridedFast). Cheers, Stefan

2 1

Wine, Darwine, CodeWeavers-- Intel MacOS X
by William Knop 27 Jun '06

27 Jun '06

Hello all, What's the story with wine on intel os x? It's barely mentioned in the wine wiki and on the darwine website (not at all on winehq). I'm under the impression darwine is concentrating on running wine on ppc/ darwin. I know codeweavers is working specifically on making wine on intel/darwin happen, however there is no status page anywhere. Just from keeping up with the mailing list, I've gleaned that Quartz and Core Audio are being worked on, in addition to a stack alignment patch. They seem to be pretty far along, but I don't really know. Are there any other intel/darwin areas that require attention or are being worked on? I'd like to add this info to the wine wiki. It seems odd that intel os x is sort of not officially recognized by wine, what with there being no mention of it on the download page, to do lists, or bugzilla... I know there're some politics involved, but it really should have more attention. Its existence is practically not even recognized by wine. At the least, that's turning away potential wine developers, and the thing is, the mac community could be all about wine with a little effort. Thanks, Will

3 5

Re: [AppDB] - user class cleanup and implement user class unit test
by Jonathan Ernst 27 Jun '06

27 Jun '06

Le lundi 26 juin 2006 à 15:33 -0400, Chris Morgan a écrit : [...] > Comments? Questions? > Index: index.php =================================================================== RCS file: /opt/cvs-commit/appdb/index.php,v retrieving revision 1.33 diff -u -r1.33 index.php --- index.php 21 Jun 2006 01:04:12 -0000 1.33 +++ index.php 26 Jun 2006 19:26:39 -0000 @@ -7,7 +7,7 @@ * application environment */ include("path.php"); -require(BASE."include/incl.php"); +require_once(BASE."include/incl.php"); Why use require_once ? It is slower and is bad unless you intend to include index.php in another file where incl.php is also included... Index: include/image.php =================================================================== RCS file: /opt/cvs-commit/appdb/include/image.php,v retrieving revision 1.5 diff -u -r1.5 image.php --- include/image.php 21 Sep 2005 14:16:40 -0000 1.5 +++ include/image.php 26 Jun 2006 19:26:40 -0000 @@ -3,6 +3,8 @@ /* image and image_resource classes */ /*************************************/ +include_once(BASE."include/incl.php"); + This time you use include once, we should use require everywhere if incl.php is required (and including a file in another include is not so pretty IMHO). + /* NOTE: we can't update the users password like we can update other */ + /* fields such as their email or username because the password is hashed */ + /* in the database so we can't keep the users password in a class member variable */ + /* and use update() because we can't check if the password changed without hashing */ + /* the newly supplied one */ + function update_password($sPassword) Should updatePassword according to our coding standards (method names).

2 1

cvs compile broken
by James Hawkins 26 Jun '06

26 Jun '06

Hey, CVS compile is broken on my machine: make[2]: Entering directory `/home/jhawkins/wine/dlls/wined3d' gcc -c -I. -I. -I../../include -I../../include -I/usr/X11R6/include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -gstabs+ -Wpointer-arith -g -O2 -o arb_program_shader.o arb_program_shader.c gcc -c -I. -I. -I../../include -I../../include -I/usr/X11R6/include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -gstabs+ -Wpointer-arith -g -O2 -o baseshader.o baseshader.c gcc -c -I. -I. -I../../include -I../../include -I/usr/X11R6/include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -gstabs+ -Wpointer-arith -g -O2 -o basetexture.o basetexture.c gcc -c -I. -I. -I../../include -I../../include -I/usr/X11R6/include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -gstabs+ -Wpointer-arith -g -O2 -o cubetexture.o cubetexture.c gcc -c -I. -I. -I../../include -I../../include -I/usr/X11R6/include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -gstabs+ -Wpointer-arith -g -O2 -o device.o device.c device.c: In function `process_vertices_strided': device.c:5015: `GL_READ_ONLY' undeclared (first use in this function) device.c:5015: (Each undeclared identifier is reported only once device.c:5015: for each function it appears in.) device.c:5033: `GL_WRITE_ONLY' undeclared (first use in this function) device.c: In function `IWineD3DDeviceImpl_ProcessVertices': device.c:5352: `GL_READ_ONLY' undeclared (first use in this function) make[2]: *** [device.o] Error 1 make[2]: Leaving directory `/home/jhawkins/wine/dlls/wined3d' make[1]: *** [wined3d] Error 2 make[1]: Leaving directory `/home/jhawkins/wine/dlls' make: *** [dlls] Error 2 -- James Hawkins

4 6

How are we doing?&In-Reply-To=44802036.6030100@codeweavers.com
by john＠opensoftcorp.com 26 Jun '06

26 Jun '06

On Friday, June 02, 2006 07:25, Mike McCormack wrote: > >> lack of comments in the code > > > > +1, I think it's horrifying. > > void the_function_that_adds_one_to_i(int i) > { > /* this adds one to i */ > i = i + 1; > > /* this returns i to the caller */ > return i; > } > > Horrifying, yes :) > > Mike I'm not opposed to having bug number in the comments ;) ---------------------------------------------------------------- This message was sent using IMP, the Internet Messaging Program.

2 1

Build on kubuntu 6.06,amd_64 works
by Amaury 26 Jun '06

26 Jun '06

Hi, Sorry if I'm ask a stupid question, but I'm a newbie to Linux, trying to learn... I've been trying to install wine through the package manager but it said it was not possible (error message: "Depends: wine-dev but it is not installable"). I kind of knew it cos i'm running under Ubuntu 6.06-LTS for amd 64 and I had read somewhere that wine didn't run on such system. My investigations led me to your post on http://www.winehq.com/pipermail/wine-devel/2006-June/048637.html Could you please detail step by step how the installation works cos the command lines don't make much sense to me MT A.

1 0

New dlls/ddraw/device.c warnings
by Gerald Pfeifer 26 Jun '06

26 Jun '06

After the recent sets of changes, I found that GCC 3.4 issues the following warnings (on FreeBSD 5.4. I checked and depending on how a compiler implements assert(), the warnings are valid, insofar as the compiler doesn't have a way to automatically determine that all code paths are covered: device.c: In function `Thunk_IDirect3DDeviceImpl_2_Begin': device.c:1826: warning: 'FVF' might be used uninitialized in this function device.c: In function `Thunk_IDirect3DDeviceImpl_2_BeginIndexed': device.c:1886: warning: 'FVF' might be used uninitialized in this function device.c: In function `Thunk_IDirect3DDeviceImpl_2_DrawPrimitive': device.c:2752: warning: 'FVF' might be used uninitialized in this function device.c: In function `Thunk_IDirect3DDeviceImpl_2_DrawIndexedPrimitive': device.c:2891: warning: 'FVF' might be used uninitialized in this function Could you have a look into this, Stefan? If someone has a hint on the preferred approach to address this, I can give it a try as well. Thanks, Gerald -- Gerald (Jerry) Pfeifer gerald(a)pfeifer.com http://www.pfeifer.com/gerald/

2 1

Re: [AppDb] [2/3] safe functions
by Chris Morgan 26 Jun '06

26 Jun '06

Hi Jonathan. You'll want to talk to EA about the filtering changes. The plan is to filter using the same syntax and flags that the php filter extension is going to use so we can easily switch over to this extension in the future. Also, I've submitted a patch for review to appdb(a)winehq.com and wine-patches(a)winehq.com that removes all of our get_magic_quotes_gpc() use and adds a check in include/incl.php that warns and prevents appdb from running if magic quotes is enabled. So you shouldn't need to have any get_magic_quotes_gpc() checks anymore. I also noticed your quote_smart_sql() call. This call isn't used anywhere, we shouldn't add calls to functions that aren't called. We also already have a function that will make sql calls safe called query_paramters() in include/db.php. Also, do we want to strip tags from sql? Won't that remove all tags from things like app/version descriptions, comments and notes? Chris On 6/25/06, Jonathan Ernst <jonathan(a)ernstfamily.ch> wrote: > Hi, > > The code I made is not dependent on magic_quote value and shouldn't > allow anybody to mess with the values read or written from/to the > database. Also it doesn't require to make copies of every single string the user > passes to us. > > It is based on php manual's best practices for avoiding injection. > > I'd be very glad if we'll use such mechanism for the rest of the > queries and get rid of compile_whatever, makeSafe & co. > > Changelog: > - functions to avoid sql/html injection without having issues with addslashes/magic_quotes_gpc > > Files changed: > - include/util.php > > > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.4.2.2 (GNU/Linux) > > iD8DBQBEnt7SIW5mR/h6b38RAii/AKCB26o0DAM978gQz8baVz6VuubW3ACgqBoJ > Or4cDg49YqCUD3dughsW1oY= > =keDV > -----END PGP SIGNATURE----- > > > > > > >

3 4

Re: Wine, Darwine, CodeWeavers-- Intel MacOS X
by William Knop 26 Jun '06

26 Jun '06

On 6/26/06, Alexandre Julliard <julliard(a)winehq.org> wrote: > There's no quartz driver in WineHQ. There are some patches floating > around but it's very far from working. Oops, I realized that just after I hit send. I'll make sure to state that it has rudimentary support.

1 0

Autocad 2004 STATUS_INVALID_LDT_OFFSET
by Jaap Stolk 26 Jun '06

26 Jun '06

I'm trying to run Autocad 2004. (installation from cd "works") current status: (/blog) http://wiki.jswindle.com/index.php/AutoCad#Forum_Comments It starts a long way, and wine seems to handle the usual CreateFileA("\\\\.\\NTICE") and IsDebuggerPresent() properly, and it generates and runs some dll's in the temp directory. But the program exists without any waring or error. I'm still searching for the reason, but i have several clues. But today the log files are shorter, the above calls are missing, and instead I get an c0000119 error (STATUS_INVALID_LDT_OFFSET) 200135:0011: read_process_memory() = 0 { data={00,00,00,00} } 200136:0011: get_handle_fd( handle=0xc, access=00000002 ) 200137:0011: get_handle_fd() = 0 { fd=9, removable=0, flags=0 } 200138:0x4074fc00: 00000000 00000000 00000000 00000000 200139:0011: get_selector_entry( handle=0x2c, entry=7 ) 200140:000f: *signal* signal=19 200141:0011: get_selector_entry() = 0 { base=00000000, limit=00000000, flags=00 } 200142:fixme:ntdll:RtlNtStatusToDosErrorNoTeb no mapping for c0000119 200143:0011: get_handle_fd( handle=0xc, access=00000002 ) 200144:0011: get_handle_fd() = 0 { fd=9, removable=0, flags=0 } 200145:Backtrace: 200146:0011: get_handle_fd( handle=0xc, access=00000002 ) 200147:0011: get_handle_fd() = 0 { fd=9, removable=0, flags=0 } 200148:=>1 0xffffe002 (0xffffe002) 200149:0009:Ret ntdll.NtDelayExecution() retval=00000000 ret=4037416a 200150:0009:Ret kernel32.Sleep() retval=00000000 ret=408fc345 200151:0009:Call ntdll.NtQuerySystemInformation(0000000b,00000000,00000000,4072ef3c) ret=408fc296 I don't have any "+all" log files from yesterday, but I'm sure there was no "fixme" then. Is Wine actually simulating the LDT stuff ? I think I should try with a fresh install.

5 15

Compilation error using winegcc
by Vikas Gera 26 Jun '06

26 Jun '06

Hello!! I am new user to Wine. I have downloaded Wine-0.9.15 sources on solaris box and tried to compile a simple "Hello World" program using WineLib. I am getting following error: winegcc: -Wl,-G,-B,symbolic failed. *** Error code 2 make: Fatal error: Command failed for target `helloworld.so' Can anybody guide me as to what went wrong? I have following environment setup Solaris 10, gcc, wine sources 0.9.15 built (compiled) using patch released on 2006/05/22 (http://www.blastwave.org/wine). regards, Vikas Gera

1 0

Re: mshtml 8: Added beginning IDM_BROWSEMODE implementation.
by Alexandre Julliard 26 Jun '06

26 Jun '06

This one breaks the tests: ../../../tools/runtest -q -P wine -M mshtml.dll -T ../../.. -p mshtml_test.exe.so htmldoc.c && touch htmldoc.ok htmldoc.c:1703: Test failed: expected Invoke_AMBIENT_USERMODE htmldoc.c:1703: Test failed: expected Invoke_AMBIENT_USERMODE htmldoc.c:1703: Test failed: expected Invoke_AMBIENT_USERMODE htmldoc.c:1703: Test failed: expected Invoke_AMBIENT_USERMODE -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: riched20: (updated) EM_GETLINE implementation and test
by Alexandre Julliard 26 Jun '06

26 Jun '06

Krzysztof Foltman <wdev(a)foltman.com> writes: > This is the EM_GETLINE patch from Thomas Kho, updated to current git > and with L"" replaced by proper WCHAR array. There are many more problems with that patch. For instance, it shouldn't call IsWindowUnicode all the time, once is enough. Also casting pointers to int is a bad idea (and not needed), it should use sizeof(WCHAR) instead of hardcoding 2, and preferably use proper data types instead of the nBPC hack. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: winspool.drv: Write-strings warnings fix
by Mike McCormack 26 Jun '06

26 Jun '06

Andrew Talbot wrote: > + static CHAR dtype[] = "RAW", > + processor[] = "WinPrint", These strings should really be const. IMO, a better fix would be to add a cast to cast them back to (char*) than to change their storage class. Mike

2 1

Very large files
by John Willis 26 Jun '06

26 Jun '06

Howdy, I have a large VS 6.0 C++ program and I'm running it under WINE under Redhat Linux. Everything works fine, but it doesn't handle file sizes greater than 4gb like it can running directly under Windows XP. I've tweaked everything that I can find that seems to deal with file sizes. Is there a problem with WINE itself handling very large file sizes? Thanks in advance, John

4 3

Re: [AppDB] - protect against sql injection in select, update and delete statements
by Tony Lambregts 26 Jun '06

26 Jun '06

Chris Morgan wrote: > On Sunday 25 June 2006 10:00 pm, Tony Lambregts wrote: >> Chris Morgan wrote: >>> Testing once beats testing over and over and over again IMO. >> Thats why you want to make the patches small. Small patches are easy to >> review, test and prove the correctness of. Big patches are difficult to >> test and one bug rejects the whole thing, so you have to start all over >> again. >> >>> I suspect that if your testing looks good and mine does as well then we >>> should be ready to go. >> I will NOT be able to test a big patch again for a while, nor am I really >> willing to. I took quite a while out of my weekend to do the testing >> because I don't want a bad patch going into production again. We have had >> enough bad feelings going on over this that it was easier for me to do the >> testing then to continue arguing with you. I really have a limit though and >> I ask you politely to meet me half way by breaking it up. >> >>> I'll fix up moving test results, that should be an easy one, and do >>> another once over of the patch before comitting it. >>> I'm pretty confident that it is all set, I've tested submitting notes, >>> comments, applications, distributions etc here and it looks good. >> I do not support that idea. If you break the patch up into smaller chunks >> then Those can be tested and hopfully put in. >> >> -- >> >> Tony Lambregts > > I'll break up the patch if you'll start submitting patches that implement > automated testing. > > Otherwise our testing is always going to have poor coverage and is going to be > a waste of time. It might be more difficult to implement automated testing > but it will improve the codebase by allowing us to test it quickly and > reproducably. > > Chris > > Oh for crying out loud. Go ahead and automate if you know how to. If you or someone else can show me how I am willing to work on it too, I an not opposed to automating all of the testing if that is possible. In the mean time am against these large patches that are difficult to test because the are so large. -- Tony Lambregts

2 2

Re: [AppDB] - protect against sql injection in select, update and delete statements
by Tony Lambregts 26 Jun '06

26 Jun '06

Chris Morgan wrote: > Testing once beats testing over and over and over again IMO. Thats why you want to make the patches small. Small patches are easy to review, test and prove the correctness of. Big patches are difficult to test and one bug rejects the whole thing, so you have to start all over again. > I suspect that if your testing looks good and mine does as well then we > should be ready to go. I will NOT be able to test a big patch again for a while, nor am I really willing to. I took quite a while out of my weekend to do the testing because I don't want a bad patch going into production again. We have had enough bad feelings going on over this that it was easier for me to do the testing then to continue arguing with you. I really have a limit though and I ask you politely to meet me half way by breaking it up. > > I'll fix up moving test results, that should be an easy one, and do > another once over of the patch before comitting it. > I'm pretty confident that it is all set, I've tested submitting notes, comments, > applications, distributions etc here and it looks good. > I do not support that idea. If you break the patch up into smaller chunks then Those can be tested and hopfully put in. -- Tony Lambregts

2 1

Re: [AppDb] [3/3] Comments handling cleanup
by Chris Morgan 26 Jun '06

26 Jun '06

The makeSafe() changes for filtering data and the query_parameters() changes for sql injection parameters are related but independent changes. It seems like query_parameters() is a better fix than putting inline sprintf()s and quote_safe_sql() calls. query_parameters() encapsulates the calls to whatever 'escape' function that we choose. query_parameters() also uses the syntax that pear db uses for place holders, ?, ~ and &. Chris On 6/25/06, Jonathan Ernst <jonathan(a)ernstfamily.ch> wrote: > Hi, > > Here is a cleaned up version of the comments handling that better fixes > (imho) all problems related to sql and html injection (it requires the previous patches to be applied). > > It is based on php manual's best practices for avoiding injection. > > I'd be very glad if we'll use such mechanism for the rest of the > queries and get rid of compile_whatever, makeSafe & co. > > Changelog: > - avoid sql/html injection in the comments > > Files changed: > - addcomment.php > - deletecomment.php > - include/comment.php > > > > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.4.2.2 (GNU/Linux) > > iD8DBQBEnt7XIW5mR/h6b38RAqtqAKCw7qX+8JTVDI0VvvHSfZTbeGYJOQCglZtg > gRVPintjJeZ1yhupSF5V+RE= > =6bPd > -----END PGP SIGNATURE----- > > > > > > >

1 0

[AppDb] stuff thats broken
by Tony Lambregts 26 Jun '06

26 Jun '06

So I was testing Chris's "query_parameters" patch and I found the following things broken with current CVS. This note is mostly to archive the issues I found than anything else. Most of these are minor problems but they should be fixed. If you want to have a go at fixing any of the issues feel free to do so. 1.) When I go to enter a new distribution in the testing data (new application, new version or new testing data) I get the following error We found the following errors: * Please enter a distribution. Please correct them. This is probably due to the makesafe() patch. I have no idea how long these next 3 have not worked. 2.) I also cannot add a new category under the "Main" category This is minor but we should fix it 3.) Editing a category is broken all fields are blank 4.) deleting a category is broken. I get this error at least *Database Error!* Query: DELETE FROM appCategory WHERE catId = LIMIT 1 You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'LIMIT 1' at line 3 5.) If you add a hyperlink in a note it is broken with makesafe() turned on. 6.) Voting is broken (I don't care really) the whole thing is kind meaningless right now anyway. but that is another subject. -- Tony Lambregts

3 4

SecuRom investigation
by Martin Owen 25 Jun '06

25 Jun '06

Hello all, I have been investigating getting rid of a terminal anoyancy for wine game users, SecuRom security. I don't believe it is good enough to crack the games as this makes us out to look like criminals rather than trying to get legitimate games to work. I have sent a query to sony, asking if they will help with providing information, but I'm not hopeful of a positive response. I found an interesting tool here: http://www.gameburnworld.com/securompatches.htm which if we could get our hands on the source code would at least give us more information about how this security works and may even allow us to work around it perminently with in wine. Best Regards, Martin Owens

4 4

Re: [AppDb] Comments handling cleanup
by Tony Lambregts 25 Jun '06

25 Jun '06

Jonathan Ernst wrote: > Hi, > > I followed your discussions about sql/html injection and had a look at > what you are doing in order to fix the situation and I don't want to > offense anybody but I feel that what you are trying to do is a bit hacky > ;-). > > Here is a cleaned up version of the comments handling that better fixes > (imho) all problems related to sql and html injection. > > The code I made is not dependent on magic_quote value and should'nt > allow anybody to mess with the values read or written from/to the > database. Also it doesn't require to make copies of every single string the user > passes to us. > > It is based on php manual's best practices for avoiding injection. > > I'd be very glad if we'll use such mechanism for the rest of the > queries and get rid of compile_whatever, makeSafe & co. > > This patch follows the Coding Standards we set up a little bit more as > well. > > Awaiting your comments. I am more in favor of this approach than using makeSafe() and do the same thing as Chris's query_parameters() patch. However I am hard pressed to say whether this method is really better or safer than query_parameters(). I have had real issues with makeSafe() the primary one is that IMO the place to make sure that we are safe from sql injection is where we create the SQL. The makeSafe() did not do that. The changes to that are only cosmetic and make it harder to see the actual changes. Formating changes should be in a separate patch. Also I would really appreciate a "Files Changed:" section that lists the files changed/added/removed by this patch. I find that it really helps in reviewing patches. Please resubmit with the formating changes in a separate patch. -- Tony Lambregts

2 1

An RPM of wine with safedisc support
by ivanleo＠gmail.com 25 Jun '06

25 Jun '06

Safedisc has now been working on wine for almost a year, but it'll still take some time before we get the code into winehq, so I've decided to build an RPM of wine with safedisc 1 support so users can play around with it, you can download it from http://www003.portalis.it/115/wine-safedisc-0.9.16-mdk.i586.rpm Safedisc 2 and above are not supported. This is based on wine 0.9.16, however it isn't an official winehq release, and is provided on an as is basis. To run a safedisc protected game, you must run winecfg and set the drive type of your cdrom drive to "cdrom" in the drives tab. Yes, this sounds dumb, but it has to be done. Then run the game normally, and as long as you have an original CD (Ok, copies can work too but that's Macrovision's fault) in the drive, the game will start. Ivan.

3 4

Ole-BSTR-Concat broken?
by Olaf Schmidt 25 Jun '06

25 Jun '06

Hi *.*, seems, that the Ole-BSTR-Concat doesn't work anymore: (Debian Sid, from wine 0.9.12 upwards - wine configured, to use the builtin Ole-Stuff) In VB-Applications (wich are using (wide) Ole-BSTRs under the hood), I can reduce the problem to the following: If I define two Strings with the Content: S1, containing a Zero WChar (BSTR-LenDescriptor=2, ByteSequence 0 0) and S2, containing "A|Zero|B" (BSTR-LenDescriptor=6, ByteSequence 65 0 | 0 0 | 66 0) and then do the concat: SResult = S1 + S2 the resulting string contains only an "A" (BSTR-LenDescriptor=2, ByteSequence 65 0) instead of the correct ByteSequence: 0 0 | 65 0 | 0 0 | 66 0 That means, that the current implementation does not use the BSTR-Len-Descriptor anymore (it has worked in 0.9.10 or 0.9.11 - not very sure, but think it was 0.9.11 in my last tests) Instead it now behaves like routines, wich have to concat Zero-Terminated Strings. Nothing changed in my wine-configuration - only apt-getted to 0.9.12 first -> then to the latest 0.9.16 (ubuntu-deb) -> same problem. Do you handle the OLE-BSTR-stuff directly in wine, or do you give that jobs to other Libs in the system (the 0.9.12er winelib- update has also changed some dependencies (Gtk, libc* and others)? Olaf Schmidt

4 3

Re: Recording with "Lexia" (mci "open new")
by Damjan Jovanovic 25 Jun '06

25 Jun '06

> 3) Most importantly: Why is it necessary to add > CAPTURE to system.ini? > Perhaps the "alias" argument isn't correctly > handled? Yes wine's MCI is broken: the parsing of some formats of MCI commands is incorrect, one of the examples I clearly remember being: "open G: type cdaudio alias cd" and wine complains that it could not load driver for type G: (whereas the driver type is cdaudio, no?) and you have to add "G:=mcicda.dll" in system.ini __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

3 3

Re: riched20: WM_SETFONT support
by Matt Finnicum 25 Jun '06

25 Jun '06

I was just about to send in the same patch when you did. I'll have to keep you updated on what I'm working on in the future. (You can see what I'm planning to do for my SoC project at http://wiki.winehq.org/MatthewFinnicum) I've attached the patch I was going to send - I suggest we use some parts of each (either I can merge them into a patch or you can, your call). Our code is actually quite similar - though your "ME_CharFormatFromLogFont" is definitely superior to mine (I just did it all in function / was slightly less awesome). Aside from my conformance tests (Which your patch passed just fine), my patch covers some extra things: 1) You need to rewrap the paragraphs, since line lengths change. 2) Your code ignores lParam (which is supposed to specify if it repaints immediately) 3) You need to invalidate the entire control - otherwise just the are the text takes up will be redrawn - if the text shrinks, then the area outside it's new size won't be blanked / you'll see fragments of the old text. 4) Your code (I believe) will reset the scroll position - I store it ahead of time and then restore it. Thanks, --Matt On 6/24/06, Krzysztof Foltman <wdev(a)foltman.com> wrote: > ChangeLog: > * WM_SETFONT implementation - sets the default font and the font for > the whole pre-existing text > > Seems to fix bug 4563 and half of the bug 3917. > > Krzysztof > > > diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c > old mode 100644 > new mode 100755 > index 50527ca..61ecc72 > --- a/dlls/riched20/editor.c > +++ b/dlls/riched20/editor.c > @@ -92,7 +92,7 @@ > - EM_SELECTIONTYPE > - EM_SETBIDIOPTIONS 3.0 > + EM_SETBKGNDCOLOR > - - EM_SETCHARFORMAT (partly done, no ANSI) > + + EM_SETCHARFORMAT (partly done, no ANSI) > - EM_SETEDITSTYLE > + EM_SETEVENTMASK (few notifications supported) > - EM_SETFONTSIZE > @@ -135,7 +135,7 @@ > + WM_GETTEXT (ANSI&Unicode) > + WM_GETTEXTLENGTH (ANSI version sucks) > + WM_PASTE > - - WM_SETFONT > + + WM_SETFONT > + WM_SETTEXT (resets undo stack !) (proper style?) ANSI&Unicode > - WM_STYLECHANGING > - WM_STYLECHANGED (things like read-only flag) > @@ -1442,7 +1442,6 @@ LRESULT WINAPI RichEditANSIWndProc(HWND > UNSUPPORTED_MSG(EM_SETTYPOGRAPHYOPTIONS) > UNSUPPORTED_MSG(EM_SETWORDBREAKPROCEX) > UNSUPPORTED_MSG(EM_SHOWSCROLLBAR) > - UNSUPPORTED_MSG(WM_SETFONT) > UNSUPPORTED_MSG(WM_STYLECHANGING) > UNSUPPORTED_MSG(WM_STYLECHANGED) > /* UNSUPPORTED_MSG(WM_UNICHAR) FIXME missing in Wine headers */ > @@ -1844,6 +1843,27 @@ LRESULT WINAPI RichEditANSIWndProc(HWND > > return 0; > } > + case WM_SETFONT: > + { > + LOGFONTW lf; > + CHARFORMAT2W fmt; > + HDC hDC; > + BOOL bRepaint = LOWORD(lParam); > + > + if (!wParam) > + wParam = (WPARAM)GetStockObject(DEFAULT_GUI_FONT); > + GetObjectW((HGDIOBJ)wParam, sizeof(LOGFONTW), &lf); > + hDC = GetDC(hWnd); > + ME_CharFormatFromLogFont(hDC, &lf, &fmt); > + ReleaseDC(hWnd, hDC); > + ME_SetCharFormat(editor, 0, ME_GetTextLength(editor), &fmt); > + ME_SetDefaultCharFormat(editor, &fmt); > + > + ME_CommitUndo(editor); > + if (bRepaint) > + ME_UpdateRepaint(editor); > + return 0; > + } > case WM_SETTEXT: > { > ME_InternalDeleteText(editor, 0, ME_GetTextLength(editor)); > diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h > old mode 100644 > new mode 100755 > index 33b7626..a4d4980 > --- a/dlls/riched20/editor.h > +++ b/dlls/riched20/editor.h > @@ -55,6 +55,7 @@ void ME_CopyToCF2W(CHARFORMAT2W *to, CHA > CHARFORMAT2W *ME_ToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from); > void ME_CopyToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from); > void ME_CopyCharFormat(CHARFORMAT2W *pDest, CHARFORMAT2W *pSrc); /* only works with 2W structs */ > +void ME_CharFormatFromLogFont(HDC hDC, LOGFONTW *lf, CHARFORMAT2W *fmt); /* ditto */ > > /* list.c */ > void ME_InsertBefore(ME_DisplayItem *diWhere, ME_DisplayItem *diWhat); > diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c > old mode 100644 > new mode 100755 > index f420f09..6104a0c > --- a/dlls/riched20/style.c > +++ b/dlls/riched20/style.c > @@ -286,6 +286,25 @@ ME_LogFontFromStyle(HDC hDC, LOGFONTW *l > lf->lfCharSet = s->fmt.bCharSet; > } > > +void ME_CharFormatFromLogFont(HDC hDC, LOGFONTW *lf, CHARFORMAT2W *fmt) > +{ > + int rx, ry; > + > + ME_InitCharFormat2W(fmt); > + rx = GetDeviceCaps(hDC, LOGPIXELSX); > + ry = GetDeviceCaps(hDC, LOGPIXELSY); > + lstrcpyW(fmt->szFaceName, lf->lfFaceName); > + fmt->dwEffects = 0; > + fmt->dwMask = CFM_WEIGHT|CFM_BOLD|CFM_ITALIC|CFM_UNDERLINE|CFM_STRIKEOUT|CFM_SIZE|CFM_FACE|CFM_CHARSET; > + fmt->wWeight = lf->lfWeight; > + fmt->yHeight = -lf->lfHeight*1440/ry; > + if (lf->lfWeight>400) fmt->dwEffects |= CFM_BOLD; > + if (lf->lfItalic) fmt->dwEffects |= CFM_ITALIC; > + if (lf->lfUnderline) fmt->dwEffects |= CFM_UNDERLINE; > + if (lf->lfStrikeOut) fmt->dwEffects |= CFM_STRIKEOUT; > + fmt->bPitchAndFamily = lf->lfPitchAndFamily; > + fmt->bCharSet = lf->lfCharSet; > +} > > BOOL ME_IsFontEqual(LOGFONTW *p1, LOGFONTW *p2) > { > > > > > >

2 2

Re: wined3d: declaration/FVF conversion test
by Jason Green 25 Jun '06

25 Jun '06

On 6/19/06, Ivan Gyurdiev <ivg231(a)gmail.com> wrote: > Does the windows box support shader model 3.0 ? The reason I keep asking > about this is that MSDN talks about a ' pre-3.0' driver and a 3.0 driver, > and I wanted to see if behavior was different. Just tested on my primary machine which has an NVidia 6600GT (Shader Model 3.0) in Windows XP, and got this: vertexdeclaration: 441 tests executed, 0 marked as todo, 0 failures. So, looks like we are good to go.

1 0

How do I get the unix filename for a wine handle?
by Christoph Probst 24 Jun '06

24 Jun '06

Hi, I'm one of the Google Summer of Code students and I'm working on the ClamAV integration in wine. Today I was discussing an issue with my mentor and he suggested to post it here. Currently I'm working on a scan-after-write functionality: Whenever a file was changed the virusscanner checks the file. My plan is to hook in NtWriteFile() (dlls/ntdll/file.c), because whenever a windows program writes to a file this function is called. Within this function the file is accessed using its unix_handle. The problem is that I need to know the unix filename for clamAV to access the file, but I see no proper way or function to get it as long as I just know the unix_handle or fd. Possible solutions so far: 1. searching /proc/self/fd/%d for the name. This would be an easy but very ugly solution. 2. maintaining a table mapping unix_handles to filenames from within NtCreateFile(). Hence I don't have the feeling that this is a good solution. 3. storing the unix filename in the wineserver handle object when it's created. This is probably the right place to keep this information but it would require some changes to the wineserver. If I understand it right it is already planned to implement something like this ("lookup_name" in server/object.c) But maybe I just missed an even better approach. What would you recommend to do? Any comment is appreciated. Cheers, Chris -- Kontakt-Details: http://www.christoph-probst.com/kontakt/ PGP-FP: B171 7EA4 988C DD90 1601 D21C 5279 2FAF 9978 AF86

5 8

Re: setupapi: Fix SetupCloseInfFile when a NULL handle is given, with tests
by Joris Huizer 24 Jun '06

24 Jun '06

James Hawkins wrote: > Hi, > > This fixes bug 5511. > > Changelog: > * Fix SetupCloseInfFile when a NULL handle is given, with tests. > > dlls/setupapi/parser.c | 2 ++ > dlls/setupapi/tests/parser.c | 9 +++++++++ > 2 files changed, 11 insertions(+), 0 deletions(-) > > -- > James Hawkins > > > ------------------------------------------------------------------------ > > This attachment seems to be empty; regards, Joris

1 0

Variable sized server replies
by Thomas Kho 24 Jun '06

24 Jun '06

In protocol.def, the get_startup_info request declares two VARARGS as replies. Unless I've mistaken, replies are limited to one VARARG that the server call writes into preallocated data, right? That leads me to my next question: I'm currently working on moving menus into the server (see <http://silenceisdefeat.org/~tkho/seas/wine/patches/menu-0622-3/> for a series of patches that moves most menu data into the server. Most logic is still on the client, but it's still surprisingly snappy.) If you look at <http://silenceisdefeat.org/~tkho/seas/wine/patches/menu-0622-3/10-server-mii>, my problem is that I don't know the size of the data that the server is going to return and my current hack is to set a hard upper limit. I can think of two ways to tackle this: 1. Do a server call before hand to request the size of the data to be returned. This has the overhead of the additional call, but doesn't increase the complexity of the server itself. 2. Instead of preallocating memory for the variable reply, have the request mechanism allocate it (like it does on the server end for variable sized data in the request). This also adds complexity as the reply would be callee-allocated, caller-freed (or perhaps we could take advantage of SERVER_END_REQ?). However, it seems kind of natural to have the request process parallel the reply process. Is there another alterative? Any comments on which approach is better? Thomas Kho

2 1

Re: [AppDB] - protect sql insert statements from injection attacks
by Tony Lambregts 24 Jun '06

24 Jun '06

Chris Morgan wrote: > Here is the new version. I've switched to the fully expanded method of > writing out the sql. This is the same format used by several db wrapper > libraries, in prepared sql statements and is the recommended style under > c#/.net for queries. > > I've tested creating new users and distributions and submitting an > application. > I have tested the patch thoroughly and it looks good to me. -- Tony Lambregts

1 0

Re: LoadResource with module=0x00400000 followed by stack overflow
by Jonathan Clark 23 Jun '06

23 Jun '06

On Tue, 20 Jun 2006 12:49:25 +0200, Jan-Espen Pettersen wrote: > Can a win32 program expect that it has write access to the memory > pointed to by the return value of LoadResource with module 0x00400000? > Should LoadResource in some cases copy the memory and return a > writeable copy of the resource? I noticed a similar problem under Windows Server 2003 when DEP is enabled, but haven't seen it on other platforms. If I recall, there is code in version.dll which calls LoadResource with RT_VERSION and then expects to be able to write to pages that are clearly marked not-writable in the PE image. The pages remain read-only until after a call to GetVersionInfo so something in the kernel is altering them. I didn't dig into it, but thought it was really weird. When I turn off DEP for that program I got different behavior. I don't know what this means for wine but maybe that is useful. Jonathan

1 0

Move all common Dll[un]RegisterServer stuff to advapi
by Vijay Kiran Kamuju 23 Jun '06

23 Jun '06

Hi All, I would like to move all the helper functions register_coclass,etc to a separate file in advapi.dll called regsvr_helper.c and all declarations of structs, consts moved to a separate file called, wineregsvr.h in include/wine So that it would be easy for other dlls to implement the DllRegisterServer and DllUnRegisterServer. And also clean up the code base. I need your suggestions, before i submit patches. Thanks, Vijay

3 6

LoadResource with module=0x00400000 followed by stack overflow
by Jan-Espen Pettersen 23 Jun '06

23 Jun '06

I get this stack overflow exception while trying to run the Watchtower Library Setup on FreeBSD 6.1. I have extracted some debug lines which I think is relevant. Please ask if you need more information. 0009:Call ntdll.LdrFindResource_U(00400000,0034ecf0,00000003,0034ec8c) ret=9c266b12 0009:trace:resource:LdrFindResource_U module 0x400000 type #0006 name #0901 lang 0414 level 3 0009:trace:resource:find_entry_by_id root 0x40b000 dir 0x40b000 id 0006 ret 0x40b090 0009:trace:resource:find_entry_by_id root 0x40b000 dir 0x40b090 id 0901 ret 0x40bb98 0009:trace:resource:find_entry_by_id root 0x40b000 dir 0x40bb98 id 0414 ret 0x40d1c8 0009:Ret ntdll.LdrFindResource_U() retval=00000000 ret=9c266b12 0009:Ret kernel32.FindResourceExA() retval=0040d1c8 ret=00405ac0 0009:Call kernel32.LoadResource(00400000,0040d1c8) ret=00405ae4 0009:trace:resource:LoadResource 0x400000 0x40d1c8 0009:Call ntdll.LdrAccessResource(00400000,0040d1c8,0034ed48,00000000) ret=9c26807b 0009:trace:resource:access_resource access resource 0009:trace:resource:access_resource *ptr=0x4219d0 0009:Ret ntdll.LdrAccessResource() retval=00000000 ret=9c26807b 0009:Ret kernel32.LoadResource() retval=004219d0 ret=00405ae4 0009:Call ntdll.NtCreateEvent(0034e634,001f0003,0034e8dc,00000001,00000000) ret=9c22d14a 0009:Ret ntdll.NtCreateEvent() retval=00000000 ret=9c22d14a wine: Unhandled stack overflow at address 0x405b1d (thread 0009), starting debugger... (There was thread two (to 000b and back to 0009) context switches in between, which I filtered out) I single stepped the last instructions before the crash and found that it crashed while trying to write to the memory pointed to by the returned pointer from LoadResource. It loaded the address with some offset into register %esi and crashed at an andw instruction: First chance exception: stack overflow in 32-bit code (0x00405b1d). file_set_error: Bad address file_set_error: Bad address Register dump: CS:0033 SS:003b DS:003b ES:003b FS:1007 GS:001b EIP:00405b1d ESP:0035ee08 EBP:0035f224 EFLAGS:00010346( - 00 RITZP1) EAX:0000006c EBX:00000000 ECX:00000003 EDX:00000000 ESI:00421b5e EDI:00421a86 Stack dump: 0x0035ee08: 9c266cc0 0035f954 0035f230 00000000 0x0035ee18: 00401df3 00009003 0035f224 0035f958 0x0035ee28: 0035f954 00000000 9c086a19 9c0da2c0 0x0035ee38: 0035ee78 9c092b72 00120020 00000001 0x0035ee48: 9c086957 00000000 00000000 0035ee34 0x0035ee58: 005ca2c0 9c08b791 00167e10 00000000 0200: sel=1007 base=00110000 limit=00001fff 32-bit rw- Backtrace: =>1 0x00405b1d in setup (+0x5b1d) (0x00405b1d) 0x00405b1d: andw $0,0x0(%esi) Wine-dbg>info share Module Address Debug info Name (3 modules) PE 0x9c070000-9c0dd000 --none-- ntdll PE 0x9c210000-9c2f1000 --none-- kernel32 PE 0x00400000-0042b000 Export setup Can a win32 program expect that it has write access to the memory pointed to by the return value of LoadResource with module 0x00400000? Should LoadResource in some cases copy the memory and return a writeable copy of the resource? Jan-Espen Pettersen

2 1

ddraw assert prevents Ankh from starting
by Christoph Frick 23 Jun '06

23 Jun '06

hiho on the end of this mail is a patch, that removes an assert(0) from the surface code in ddraw. but removing it let Ankh[1][2] start (it started before, but there where no loading screen visible). yet there are other problems with this game - but it now actually works better than before. so let the ddraw developers decide what to do there - this mail is just a reminder, that there is a poor little homeless assert, that needs your attention ;) [1] german demo: http://www.gamershell.com/download_12062.shtml [2] engl. demo: http://www.gamershell.com/download_12202.shtml -- cu Index: dlls/ddraw/surface.c =================================================================== RCS file: /home/wine/wine/dlls/ddraw/surface.c,v retrieving revision 1.4 diff -u -r1.4 surface.c --- dlls/ddraw/surface.c 19 Jun 2006 10:44:41 -0000 1.4 +++ dlls/ddraw/surface.c 20 Jun 2006 07:10:07 -0000 @@ -1865,7 +1865,6 @@ WINED3DFORMAT newFormat = WINED3DFMT_UNKNOWN; HRESULT hr; FIXME("(%p)->(%p,%lx)\n", This, DDSD, Flags); - assert(0); if(!DDSD) return DDERR_INVALIDPARAMS;

2 4

Re: [AppDB] - protect sql insert statements from injection attacks
by Chris Morgan 23 Jun '06

23 Jun '06

Here is the new version. I've switched to the fully expanded method of writing out the sql. This is the same format used by several db wrapper libraries, in prepared sql statements and is the recommended style under c#/.net for queries. I've tested creating new users and distributions and submitting an application. Chris On Friday 23 June 2006 1:05 am, Chris Morgan wrote: > On Thursday 22 June 2006 10:21 pm, Tony Lambregts wrote: > > Chris Morgan wrote: > > > Change compile_insert_string() to compile_insert_array() and add a new > > > first parameter of $sTable that represents the table you are building > > > the insert statement for. The output of compile_insert_array() is > > > passed to query_insert() to perform the insertion. Change all existing > > > calls of compile_insert_string() to compile_insert_array() and specify > > > the table as the first parameter. Make all instances of sql inserts > > > that didn't use compile_insert_string() use compile_insert_array(). > > > > > > The use of mysql_real_escape_string() inside of compile_insert_array() > > > protects the insert statement from sql injection attacks. > > > > > > Chris > > > > Just a couple of nits > > > > This Could have been broken before but when I try to edit a bundle I > > get: *Database Error!* > > Query: SELECT bundleId, appBundle.appId, appName FROM appBundle, > > appFamily WHERE bundleId = AND appFamily.appId = appBundle.appId > > You have an error in your SQL syntax; check the manual that corresponds > > to your MySQL server version for the right syntax to use near 'AND > > appFamily.appId = appBundle.appId' at line 1 > > This is fixed now. Was broken all the way back to the import into cvs :-) > > > This is probably broken from before (makesafe?) but I cannot create a > > new distribution. > > Yes, makesafe changes broke this. Fixed now. > > > Here is a big one though. I cannot create a new account. I just get a > > blank screen. This is .new see below > > > > You could have broken the patch in two IE: > > > > Change log: The use of mysql_real_escape_string() on inserts to protect > > from sql injection attacks. > > > > Files changed: > > include/application.php / > > include/bugs.php / > > include/category.php / > > include/comment.php / > > include/db.php / > > include/distributions.php > > include/monitor.php / > > include/note.php / > > include/screenshot.php > > include/testResults.php / > > include/url.php / > > include/user.php / > > include/util.php / > > include/vendor.php / > > include/version.php / > > > > Change log: Make all remaining instances of sql inserts use > > compile_insert_array(). > > > > Files changed: > > maintainersubmit.php / > > admin/adminAppDataQueue.php / > > admin/editBundle.php / > > include/appdb.php / > > include/vote.php / > > > > I'm not say you should have just that it could have been done that way. > > > > You should include the "change log:" and "files changed:" to the patch > > the files. "Changed files: really helps in that it gives you an > > overview of the scope of the patch. > > > > > ----------------------------------------------------------------------- > > >- > > > > > > ? compile_insert_array.patch > > > ? hits_table_alter > > > ? injection_protect.patch > > > ? injection_protect2.patch > > > ? limittestresults.patch4 > > > ? vote_table_alter > > > ? data/screenshots > > > > Last really trivial nit (these are not really part of the patch) > > > > > Index: include/user.php > > > =================================================================== > > > RCS file: /opt/cvs-commit/appdb/include/user.php,v > > > retrieving revision 1.67 > > > diff -u -r1.67 user.php > > > --- include/user.php 21 Jun 2006 01:04:13 -0000 1.67 > > > +++ include/user.php 22 Jun 2006 20:07:17 -0000 > > > @@ -83,14 +83,15 @@ > > > return false; > > > } else > > > { > > > - $aInsert = compile_insert_string(array( 'realname' => > > > $sRealname, > > > - 'email' => > > > $sEmail, - > > > 'CVSrelease' => $sWineRelease )); > > > + $aInsert = compile_insert_array("user_list", > > > + array( 'realname' => > > > $sRealname, > > > + 'email' => > > > $sEmail, > > > + 'CVSrelease' => > > > $sWineRelease, > > > + 'password' => > > > password($sPassword), > > > + 'stamp' => > > > "NOW()", > > > + 'created' => > > > "NOW()")); > > > > I remember fighting with this before. password() and NOW() cannot be > > put into the array like this I do not have an easy answer for this at > > all at this point > > > > > - $sFields = "({$aInsert['FIELDS']}, `password`, `stamp`, > > > `created`)"; > > > - $sValues = "({$aInsert['VALUES']}, > > > password('".$sPassword."'), NOW(), NOW() )"; > > > - > > > - query_appdb("INSERT INTO user_list $sFields VALUES > > > $sValues", "Error while creating a new user."); > > > + query_insert($aInsert, "Error while creating a new > > > user."); > > > > > > $retval = $this->login($sEmail, $sPassword); > > > $this->setPref("comments:mode", "threaded"); /* set the > > > users default comments:mode to threaded */ > > > @@ -183,7 +184,11 @@ > > > return false; > > > > > > $hResult = query_appdb("DELETE FROM user_prefs WHERE userid = > > > ".$this->iUserId." AND name = '$sKey'"); > > > - $hResult = query_appdb("INSERT INTO user_prefs > > > VALUES(".$this->iUserId.", '$sKey', '$sValue')"); > > > + $aInsert = compile_insert_array("user_prefs", > > > + array( 'userid' => > > > $this->iUserId, > > > + 'name' => $sKey, > > > + 'value' => $sValue)); > > > + $hResult = query_insert($aInsert); > > > return $hResult; > > > } > > > > Other than that its clean. We need to find a way of fixing new > > accounts though. > > > > -- > > > > Tony Lambregts > > I've got a fix for this. The basic jist is to simply get rid of > compile_insert_array() and use a fancier version of query_parameter() that > uses pear db replacement operators. There isn't any other way to know > whether any given variable should be surrounded with '' or not > escaped(something else that is useful in certain cases apparently). Should > have this change in place soon. > > Chris

1 0

CFileDialog::OnFolderChange() problem with Customized file open dialog
by Dan Kegel 23 Jun '06

23 Jun '06

Ravinder wrote: > I am currently working on making a windows program function in > wine. it works for the most part, so i'm trying to iron out a > few critical bugs. first off... i'm looking at microsoft's > CFileDialog class - it is what the standard windows 'open > file' and 'save file' dialog windows use. the problem is this: > CFileDialog has a built in function called OnFolderChange, that > is used to determine whether the user has changed folders in the > dialog, whether by double click or what not.. the program i'm > working on overrides the CFileDialog class, and includes more > code for the OnFolderChange function (and for other functions) > for its own purposes. the new OnFolderChange function works > perfectly fine in windows, but is completely ignored when using > wine - it never even gets called, while the rest of the dialog > window retains all of its intended functionality. I see you've filed http://bugs.winehq.org/show_bug.cgi?id=5475 about on Jonathan Ernst's advice. Good advice! But be sure to add the full source code and project file for your sample code, as some people do have Visual C++, and will want to build it and step through. ATL problems are, I suspect, hard to diagnose because it requires understanding a bit about how ATL works under the hood, which few people do. If you're in a hurry for a solution, you could engage Codeweavers to solve problems like this. - Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

1 0

Re: riched20: EM_GETLINE implementation and test
by James Hawkins 22 Jun '06

22 Jun '06

On 6/22/06, Krzysztof Foltman <wdev(a)foltman.com> wrote: > This patch seems to have been overlooked or rejected - yet I do not see > any reason being mentioned. > > Was it rejected because of use of L"" syntax? > Probably, L"" is not portable, and you have to use: static const WHCAR string[] = {'s','t','r','i','n','g',0}; -- James Hawkins

5 7

Re: riched20: (updated) EM_GETLINE implementation and test
by James Hawkins 22 Jun '06

22 Jun '06

On 6/22/06, Krzysztof Foltman <wdev(a)foltman.com> wrote: > This is the EM_GETLINE patch from Thomas Kho, updated to current git and > with L"" replaced by proper WCHAR array. > > Krzysztof > > ====================================================== > > Hi, > > The following patch implements EM_GETLINE. This feature was requested in > bug #4305 <http://bugs.winehq.org/show_bug.cgi?id=4305> and also > mentioned at > <http://groups.google.com/group/comp.emulators.ms-windows.wine/msg/f89762653…> > > Regards, > > Thomas Kho > > > diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c > index 9a2b966..23538ab 100644 > --- a/dlls/riched20/editor.c > +++ b/dlls/riched20/editor.c ... > @@ -2016,6 +2016,62 @@ LRESULT WINAPI RichEditANSIWndProc(HWND > return nChars; > } > } > + case EM_GETLINE: > + { > + ME_DisplayItem *run; > + ME_String *strText; > + int nMaxChars = (int) *(WORD *) lParam; > + int nBPC = 1; /* bytes per character */ > + int nEndChars; > + char *dest = (char *) lParam; > + > + TRACE("EM_GETLINE: row=%d, nMaxChars=%d (%s)\n", (int) wParam, nMaxChars, > + IsWindowUnicode(hWnd) ? "Unicode" : "Ansi"); > + A case this long should be moved into its own function and called from case EM_GETLINE. In fact, most of these should probably be factored into separated functions to reduce clutter. As it stands, RichEditANSIWndProc is a 1048 line function...yikes. -- James Hawkins

1 0

Re: OleView: Added CreateInstanceOn functionality
by James Hawkins 22 Jun '06

22 Jun '06

On 6/22/06, Piotr Caban <piotr.caban(a)gmail.com> wrote: > Hi, > > Changelog: > - Added CreateInstanceOn functionality > Make sure you label a series of patches as OleView [1/x] etc. where x is the total number of patches, so if they are received out of order, Alexandre knows what order to apply them in. -- James Hawkins

1 0

Re: msi: Load all components, not just components associated with a feature
by James Hawkins 22 Jun '06

22 Jun '06

On 6/21/06, James Hawkins <truiken(a)gmail.com> wrote: > Hi, > > This fixes bug 3590. > > Changelog: > * Load all components, not just components associated with a feature. > Ignore this patch, it's not correct. -- James Hawkins

1 0

Re: [SETUPAPI] SetupDiCreateDeviceInfoA stub
by Detlef Riekenberg 22 Jun '06

22 Jun '06

Hi Christian Gmeiner: > It seems that there > is no SetupDiCreateDeviceInfoW exporteded by setupapi.dll on windows SetupDiCreateDeviceInfoW is exported: http://support.microsoft.com/dllhelp/?dlltype=file&l=55&S=1&alpha=setupapi.… Example Version: http://support.microsoft.com/dllhelp/?fid=91484&l=55&det=1 $ winedump dump -j export setupapi* | grep SetupDiCreate 00023DFE 299 SetupDiCreateDevRegKeyA 00001C0F 300 SetupDiCreateDevRegKeyW 000173E8 301 SetupDiCreateDeviceInfoA 000015A7 302 SetupDiCreateDeviceInfoList 000170D1 303 SetupDiCreateDeviceInfoListExA 000048E5 304 SetupDiCreateDeviceInfoListExW 0001746F 305 SetupDiCreateDeviceInfoW 00018A9F 306 SetupDiCreateDeviceInterfaceA 0002471C 307 SetupDiCreateDeviceInterfaceRegKeyA 00001CCE 308 SetupDiCreateDeviceInterfaceRegKeyW 00018B03 309 SetupDiCreateDeviceInterfaceW -- By By ... ... Detlef

2 1

Re: OleView: Removed use of strlenW, strcmpW and strcpyW functions
by Jacek Caban 22 Jun '06

22 Jun '06

Hi, Piotr Caban wrote: > Hi, > > Changelog: > - Removed use of strlenW, strcmpW, strcpyW functions > > programs/oleview/details.c | 14 +++++++------- > programs/oleview/tree.c | 16 ++++++++-------- > 2 files changed, 15 insertions(+), 15 deletions(-) > > -- > Piotr > You should also remove include wine/unicode.h. Jacek

1 0

forgotten patch
by Krzysztof Foltman 22 Jun '06

22 Jun '06

This patch apparently has been lost, and there's at least one bug in Bugzilla that the patch seems to fix (bug# 4452, checked here). http://www.winehq.org/pipermail/wine-patches/2006-January/023875.html I don't see anything wrong with the patch, did Phil just send it in a wrong moment, or is there anything to fix? Krzysztof

2 1

Re: oleview: Link with wine's unicode libarary
by James Hawkins 22 Jun '06

22 Jun '06

On 6/21/06, Andrew Talbot <Andrew.Talbot(a)talbotville.com> wrote: > Changelog: > oleview: Link with wine's unicode libarary. > We should be changing the strlenW to lstrlenW, not adding $(LIBUNICODE) to the Makefile. -- James Hawkins

1 0

Oleview: undefined references
by Andrew Talbot 22 Jun '06

22 Jun '06

Does anyone know why details.c and tree.c might have undefined references to the unicode string functions, such as strlenW()? My guess is that there might be something wrong with the Makefile.in. Compilation breaks if the -Write-strings flag is specified. Thanks, -- Andy.

3 5

Re: WineD3D: VBO patch 3/3
by Stefan Dösinger 21 Jun '06

21 Jun '06

Am Mittwoch 21 Juni 2006 15:05 schrieb Stefan Dösinger: > This patch finally adds code for creating VBOs. > > ChangeLog: > Stefan Dösinger(for CodeWeavers): Create vertex buffer objects for D3D > vertex buffers Do not apply that patch yet. It is missing some GL constant definitions(GL_STREAM_DRAW, GL_STATIC_COPY, ...) I will send an updated patch tomorrow

1 0

RE: Win64 status
by Ge van Geldorp 21 Jun '06

21 Jun '06

> From: Kuba Ober <kuba(a)mareimbrium.org> > > I'm currently hacking on gcc for an embedded target (Z8 > Encore), but I wouldn't mind giving it a try while I'm > digging in the gcc tree. Cool! > I'd like to hear any suggestions as to how to tell the > compiler to use that calling convention (I'm not talking > about implementation, just how the compiler used would tell it). > > I presume it'd need to be something that can be set globally > per each compiler invocation, as well as a per declaration override. > > I'm thinking of "-msvc" (like -liberty ;) compiler option to > force a MSVC-compatible ABI, and for now that'd only apply to > 64 bit code (i.e. with -m64). Maybe in the future it could > enable something special for 32 bit code as well. > > I'm all ears about the per-declaration override (a pragma? an > __attribute__?), and about alternatives to -msvc. __attribute__ seems most logical to me. Perhaps __attribute__(__msvccall__) (in the __attribute__(__stdcall__) tradition? An alternative to -msvc could perhaps be -mrtd ("Alternate calling convention"). For i386 builds of gcc, -mrtd makes stdcall the default calling convention. It is currently a noop for x86_64. I kind of like your -msvc though :-) For Wine the compiler option seems more important then the override. > I'd be submitting a patch to mingw32 people as soon as it's > done, in addition to posting it here. Note that the only way > for me to test it would be to inspect the assembly output, as > I'm not running 64 bit environment here (even though I'm on a > 64 bit AMD processor). So it'd need testing from 64 bit > people here at least. I'm volunteering. I could also give you ssh access to a 64 bit environment. Ge van Geldorp.

5 7

appdb redesign
by Evgeny Burzak 21 Jun '06

21 Jun '06

take a new look at appdb. Suggestions, crtitical opinion, spell-checking, pizza, money, post-cards are welcome -__- Evgeny

3 4

Re: APPDB patch - adminAppQueue.php
by Tony Lambregts 21 Jun '06

21 Jun '06

EA Durbin wrote: >> >> I'm going to look into the orphaned version issue right now but there >> may be >> others. >> > > What is the orphaned version issue? > When users submitted an new version of an application the appId was set to 0 instead of the proper number. Fixed by Chris with this patch http://cvs.winehq.org/patch.py?id=25914

1 0

Re: GetMessage: Return -1 if an invalid window handle has been passed
by James Hawkins 21 Jun '06

21 Jun '06

On 6/21/06, Michael Kaufmann <hallo(a)michael-kaufmann.ch> wrote: > Changelog: > GetMessage: Return -1 if an invalid window handle has been passed > A test case would be good. -- James Hawkins

1 0

[ntdll patch] Patch dropped?
by Andrew Talbot 21 Jun '06

21 Jun '06

I saw a patch I posted yesterday (ntdll: server.c, write-strings fix) appear on the wine-cvs page for a while :), and now it has disappeared :(. Did it fall, or was it pushed? ;) -- Andy.

1 1

Re: Resend: WineD3D: pixel format cleanup
by Stefan Dösinger 21 Jun '06

21 Jun '06

> It doesn't (last I checked)... neither does CreateVolume(). > This also requires a test to see what Windows does. > > Checking if a format is supported before > > > returning the gl config doesn't really make sense. If the format isn't > > supported and we ask gl for a compressed texture we will get an error > > returned and broken graphics(because we ignore gl errors generally). If > > we pass 0 instead for the gl format and internal format we will have > > broken graphics too but I don't think gl returns an error then(although > > I'd have to > > check the man page for that) > > I agree, but I thought the patch was a no-op :) Oh well, not a 100% no op then. But that is hard to nop with a constant table :-) Well, almost all cards support that extension, so it's a de-facto no-op

1 0

Re: Resend: WineD3D: pixel format cleanup
by Ivan Gyurdiev 21 Jun '06

21 Jun '06

On 6/21/06, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > > This is a resend of the patch from a few days ago with some modifications > requested by Alexandre: > > *getFormatDescEntry returns a pointer to a format structure, not an index > in > the array > > * Removed the format counter Stefan, can you clarify what happened to the GL_SUPPORT check for compressed formats?

2 1

ntoskrnl status
by Mario Demontis 21 Jun '06

21 Jun '06

Hello It's my first post here... Any news about ntoskrnl.exe support? As far as I can understand it's not yet integrated... Are there any new patches? Thanks in advance Mario -- Email.it, the professional e-mail, gratis per te: http://www.email.it/f Sponsor: Grande Offerta di Benvenuto Cassine di Pietra: * 36 bottiglie di ottimo vino veneto direttamente a casa tua! * Clicca qui: http://adv.email.it/cgi-bin/foclick.cgi?mid=3923&d=15-6

9 14

Re: [Bug 5463] ie6 installs now, but doesn't work...
by Peter Åstrand 21 Jun '06

21 Jun '06

On Mon, 19 Jun 2006, Wine Bugs wrote: > vitaliy(a)kievinfo.com changed: > > What |Removed |Added > ---------------------------------------------------------------------------- > Status|RESOLVED |CLOSED > > > ------- Additional Comments From vitaliy(a)kievinfo.com 2006-19-06 14:11 ------- > Again this is not a bug. There is nothing to fix because there is nothing that > broke. I disagree. If IE doesn't run, it's a bug. I would actually say that it's a major bug - IE is one the those core applications that users expects to work. You are incorrect about "there is nothing to fix": Perhaps the source code is fine, but the documentation is certainly not. http://appdb.winehq.org/appview.php?versionId=469 even says: "(to be continued because then it still doesn\'t run because of ole errors)" > Anyone is welcome to write up instructions on what to override and place them in > appDB. Bugzilla is not the right place for that. Why do you think Bugzilla cannot be used for tracking documentation bugs? There is a "wine-documentation" component and a "WineHQ Apps Database" component, if you think that wine-misc is totally wrong. I would very much prefer is this bug could be left open until someone has managed to figure out what needs to be overridden to actually *run* IE. Regards, -- Peter Åstrand ThinLinc Chief Developer Cendio http://www.cendio.se Teknikringen 3 583 30 Linköping Phone: +46-13-21 46 00

7 7

Re: wined3d: Bind correct # of samplers for GLSL shaders
by Ivan Gyurdiev 21 Jun '06

21 Jun '06

On 6/20/06, Jason Green <jave27(a)gmail.com> wrote: > > - We are only checking against GL_MAX_TEXTURES when binding samplers, > when we should be checking against the maximum number of samplers that > the card supports. Spotted by H. Verbeet. Yes, I'm aware of that...it was done on purpose. This limit is in a lot of other places - stateblock code, drawprim code. Have you checked that it will all interact properly using this higher limit? Specifically, have you tested a sampler > 4 with SetTexture()? I think this problem should be solved by a single patch that updates all the necessary places to use the higher texture units value, as opposed to the legacy one (there's some caps code to write for this).

2 1

solution: IE6 setup says "The download location information is damaged"
by James Hawkins 21 Jun '06

21 Jun '06

Hey, If you're still having this problem, please make sure you are not on a remote or network-mounted drive. IE6 setup checks if the drive is remote, and will not install if it is, complaining with the completely non-related error that "The download location information is damaged." If you're not sure whether you're on a remote drive or not, and the IE6 setup is still not working, please post back and attach a +volume trace. I was frustrated that the setup was not working on my work machine, while it was on my home machine. Reading through a +all log showed that GetDriveTypeW was returning 4 for my work machine, which is DRIVE_REMOTE, and then it would fail with the message box. Hacking GetDriveTypeW to always return DRIVE_FIXED let me install onto my remote drive. Thanks, James Hawkins

2 3

wined3d:add an "\n" to a fixme to fix an overflow
by Louis. Lenders 21 Jun '06

21 Jun '06

Hi, i get this crash in an application (ftp://ftp.avault.com/demos/puzzleblastsetup.exe) : wine_dbg_vprintf: debugstr buffer overflow (contents: 'fixme:d3d_surface:IWineGDISurfaceImpl_Blt Unsupported flags: 00000010 Unsupported flags: 00000010 Unsupported flags: 00000010 Unsupported flags: 00000010 etcetera This simple patch fixes it. Changelog:add an "\n" to a fixme to fix an overflow --------------------------------- All New Yahoo! Mail Tired of Vi@gr@! come-ons? Let our SpamGuard protect you.

1 0

Very large fonts cause loss of connection to X server
by Troy Rollo 21 Jun '06

21 Jun '06

Rendering text to a screen DC with a font height on the order of 17,000 pixels results in glyphs being uploaded to the X server that are on the order of 30MB in size (or more for some wide characters). The next attempt to make a request of the server results in a SIGPIPE. This is possible if an app has the ability to zoom in on a document containing text and allows the user to specify the scaling factor without limiting it. Very large screen fonts can also arise when some WYSIWYG display strategies are used, although this would not ordinarily get to the 17,000 pixel range. Windows deals with such behaviour without problems. I'm not sure there's anything that can be done about this other than imposing an arbitrary sanity check on the size of the screen font prior to uploading the glyph - if the font is much larger than the screen, for instance, then perhaps the best thing is just not to upload the glyph but mark it internally as having been uploaded. Presumably that will prevent the loss of connection without breaking WYSIWYG display strategies that involve calculating positions using large fonts in a screen DC. -- Troy Rollo - wine(a)troy.rollo.name

1 0

Re: [AppDB] - make variables more consistent, fix indenting
by Tony Lambregts 21 Jun '06

21 Jun '06

Chris Morgan wrote: > Make the code more consistent by using the appdb coding standards. > > Change $result = query_appdb(...) to $hResult = ... etc. > > Also fix some odd indenting due to spaces vs. tabs. > > There are still a ton of variables that are integers or strings that should be > prefixed with 'i' or 's' if anyone is interested in cleaning some of that up. > > Chris I am not opposed to doing this but I think that the patch is way too big. At the momment we still have issues with the last "big patch" that are not cleared up [1]. On the whole unless we cannot avoid it I really do not think that we should be making such large changes in one go like this. Please break up the patch into smaller patches. That way it is easier to find and fix any issues that arise. [1] New versions end up as orphans with current setup. -- Tony Lambregts

2 4

Re: [MSI 1/4] add streams table
by Mike McCormack 21 Jun '06

21 Jun '06

Hi, Thanks for submitting the patch, and keeping the coding style consistent! Andrey Turkin wrote: > This patch adds virtual _Streams table to MSI because native MSI > maintains such table > > ChangeLog: > virtual _Streams table added > +static UINT STREAMS_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, IStream **stm ) > +{ .... > + > + /* > + * The column marked with the type stream data seems to have a single number > + * which references the column containing the name of the stream data > + * > + * Fetch the column to reference first. > + */ > + r = view->ops->fetch_int( view, row, col, &ival ); I'm not so keen on the way this is done. You seem to have duplicated alot of code from TABLE_fetch_stream here. > + if( r != ERROR_SUCCESS ) > + { > + ERR("1: %d\n", r); > + return r; > + } > + > + ERR("fetched %d\n", ival); And forgotten to remove your debug code. > +MSIVIEWOPS streams_ops = > +{ > + TABLE_fetch_int, > + STREAMS_fetch_stream, > + TABLE_set_int, > + TABLE_insert_row, > + STREAMS_execute, > + TABLE_close, > + TABLE_get_dimensions, > + TABLE_get_column_info, > + TABLE_modify, > + TABLE_delete, > + TABLE_find_matching_rows > +}; The streams table is just another table. How about generating an MSITABLE structure containing the data rather than treat it as a special case in here? Mike

2 1

Re: [WiKI] Common site menu 4/4
by Tony Lambregts 21 Jun '06

21 Jun '06

Is there anything wrong with this patch? Change log: update menus for all sites to have a common "WineHQ Menu". files changed: winehq/winehq.py ? winehq/winehq ? winehq/img/logo.png Index: winehq/winehq.py =================================================================== RCS file: /cvsroot/wine/wiki/winehq/winehq.py,v retrieving revision 1.3 diff -u -r1.3 winehq.py --- winehq/winehq.py 16 May 2005 03:57:10 -0000 1.3 +++ winehq/winehq.py 3 Jun 2006 20:09:15 -0000 @@ -271,6 +271,22 @@ ''' return html % args + def winepanel(self, d): + """ Create wiki panel """ + _ = self.request.getText + html = [ + u'<div class="sidepanel">', + self.sidetitle(_("WineHQ Menu")), + u' <div class="sidecontent">', + u' <li><a href="http://www.winehq.org/"> WineHQ</a></li>', + u' <li><a href="http://appdb.winehq.org/"> AppDB</a></li>', + u' <li><a href="http://bugs.winehq.org/"> Bugzilla</a></li>', + u' <li><a href="http://wiki.winehq.org/"> Wine Wiki</a></li>', + u' </div>', + u'</div>', + ] + return u'\n'.join(html) + def wikipanel(self, d): """ Create wiki panel """ _ = self.request.getText @@ -351,6 +367,7 @@ # Sidebar u'<div id="sidebar">', + self.winepanel(d), self.wikipanel(d), self.pagepanel(d), self.userpanel(d),

3 2

Wine talk in LA june 20th,22nd. Slide check, anyone?
by Dan Kegel 20 Jun '06

20 Jun '06

I'm giving a short talk on Wine at lula.org tonight and again at aitp-la.org Thursday night. The audience at aitp-la is IT professionals who don't really know much about Wine or Linux, so I'm trying for a gentle, practical talk. I'll demo a few apps (Office '97, Picasa, Firefox, Kid Pix, and Visual C++) and I'll even run an app that doesn't work too well yet (Visual Basic 6's IDE). The slides, such as they are, are up at kegel.com/wine/wine-2006-june-talk.ppt kegel.com/wine/wine-2006-june-talk.pdf (I usually use magicpoint, but for this talk, I used Office 97's powerpoint on the theory that one should eat one's own dogfood...) Corrections/improvements welcome. - Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

1 0

riched slowdown
by James Hawkins 20 Jun '06

20 Jun '06

Hi, I just did a +relay log of the ie6setup.exe installation. I had to ctrl-c after the log grew to 3.5gb and the initial screen hadn't been displayed yet. tail -n 1000 relay.log showed call after call to WideCharToMultibyte before I finally killed the install. Here is a sample of one of the calls: WideCharToMultiByte(000004e4,00000000,40895ae4 L"S\5524",00000001,40895ae7,00000001,00000000,40895ae8) So the length of the "string" we're converting is 1. Not exactly efficient. grep'ing the log for WideCharToMultiByte reveals 39426680 calls, and it wasn't even done loading the EULA. I'm pretty sure this is a recent bug in riched, as overriding riched20 and riched32 gets rid of the problem. -- James Hawkins

1 0

Re: lz32: remove dead code from the LZOpenFileW test.
by Detlef Riekenberg 20 Jun '06

20 Jun '06

Saulius Krasuckas wrote: > + ok(file >= 0, "LZOpenFileW failed on switching to a compressed file name\n"); .. > + ok(test.nErrCode == 0, "LZOpenFileW set test.nErrCode to %d\n", > + test.nErrCode); Did you mean "test.nErrCode == ERROR_SUCCESS"? You test the Errorcode here, but you did not use SetLastError() before LZOpenFileW. > + ok(lstrcmpA(test.szPathName, expected) == 0, > + "LZOpenFileW returned '%s', but was expected to return '%s'\n", > + test.szPathName, expected); This is strange: An ANSI-Compare for an UNICODE-Function. After reading the source and OFSTRUCT, this is correct. I suggest a command before the above "ok()". An extra Patch with the WINAPI-Documentation for the Implementation would be nice. This should include a note, that the ANSI-String "szPathName" in "OFSTRUCT" is the correct Parameter for the UNICODE-Implementation. ---- cut ---- This part from your previous Patch is already in the tree, but: > > + /* Delete the file then make sure it doesn't exist anymore. */ > + file = LZOpenFileW(filename_W, &test, OF_DELETE); > + ok(file >= 0, "LZOpenFileA failed on delete\n"); > + retval = GetFileAttributesW(filename_W); > + ok(retval == INVALID_FILE_ATTRIBUTES, > + "GetFileAttributesA succeeded on deleted file\n"); The Messages in the "W"-Tests have ANSI Function-Names -- By By ... ... Detlef

2 1

appdb: makeSafe improvement
by Vitaly Lipatov 20 Jun '06

20 Jun '06

After last security fixes in AppDB there is introduced makeSafe function with one parameter. Typical using of makeSafe: $aClean['sub'] = makeSafe($_REQUEST['sub']); When $_REQUEST does not contain 'sub', we get "Notice: Undefined index:" if mod_php in strict mode (do not permit undefined variables). What about use makeSafe in the form $aClean['sub'] = makeSafe($_REQUEST,'sub'); Then we can use isset inside makeSafe for additional checking. -- Vitaly Lipatov, ALT Linux Team Russia, Saint-Petersburg, www.etersoft.ru

1 0

Winelib Getting Started 1.3.2. Test Drive
by Dee Ayy 20 Jun '06

20 Jun '06

Hello, Would a wine developer please revisit this page http://www.winehq.org/site/docs/winelib-guide/winelib-getting-started and modify it to have a step by step guide to take a Linux box without wine nor winelib to a running notepad exe built by the newbie (and not downloaded)? Or if you are a wine-user, please provide such steps to this list. As a newbie, the statement "It can be found in the programs subdirectory." had me lost. I don't know if the steps I took are correct, but somehow I found http://www.winehq.org/site/cvs. Perhaps the winelib-getting-started page could be modified to direct a newbie how to download the "test drive" at this point. Then I only checked out wine/programs/notepad since the statement "(but read the next section before actually doing this!)" intimidated me on the cvs page. The first error after a make was "dialog.c:27:21: error windows.h: No such file or directory". Then I had the brilliant idea to checkout all of wine, even though I was intimidated initially by the statement "(but read the next section before actually doing this!)". The make still failed with the same error, even though I now have the wine/include directory. Not knowing any better, I modified the Makefile from INCLUDE_PATH = -I. to INCLUDE_PATH = -I.:/my/path/to/wine/include. I retried make and get the same error. I'm stumped. The 1.3.3 Step by step guide was too general for me. But maybe that's because I needed section 1.3.2 to be more detailed for the task at hand, building notepad. And perhaps 1.3.3 can be left alone for more general information. Please advise. Thanks, D

4 4

Re: msi: Fix handling of the no-op identifier in the Directory table [resend]
by Alexandre Julliard 20 Jun '06

20 Jun '06

"James Hawkins" <truiken(a)gmail.com> writes: > Is there anything wrong with this patch? > > Changelog: > * Fix handling of the no-op identifier in the Directory table. You are assigning a const string to a non-const variable, that causes warnings. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [WINED3D 3/3] Fix fog in the case of vertex shaders
by Ivan Gyurdiev 20 Jun '06

20 Jun '06

On 6/19/06, Jason Green <jave27(a)gmail.com> wrote: > > - Fixes both ARB and GLSL shaders that use fog. > Is it really necessary to keep track of whether the shader uses fog or not? What happens if you disable this post-processing for a shader that doesn't write to the fog register? Also, how come the ARB version forces the fog value to be > 0, but the GLSL one has both lower and upper limit (clamp to 0,1) ? Shouldn't you use saturate (_SAT) to achieve the same effect?

2 1

Re: Win64 patch 1/13
by Mike McCormack 20 Jun '06

20 Jun '06

Ge van Geldorp wrote: > +SPEC_SRC32 = $(BASEMODULE).spec > +SPEC_SRC64 ?= $(SPEC_SRC32) Not sure we want seperate spec files. In any case, ?= doesn't look portable. > -ULONG WINAPI MAPILogon(ULONG uiparam, LPSTR profile, LPSTR password, > +ULONG WINAPI MAPILogon(ULONG_PTR uiparam, LPSTR profile, LPSTR password, > FLAGS flags, ULONG reserved, LPLHANDLE session) > --- programs/wordpad/wordpad.c 14 Feb 2006 16:48:40 -0000 1.1 > +++ programs/wordpad/wordpad.c 19 Jun 2006 17:34:48 -0000 I thought I already fixed these... I don't think these will apply to the current git tree. > --- dlls/ntdll/tests/generated.c 3 Jul 2005 11:23:30 -0000 1.23 > +++ dlls/ntdll/tests/generated.c 19 Jun 2006 17:20:17 -0000 You should be changing tools/winapi/winapi_test*, not the generated files. The heap changes look useful, I will check them out when I get back from my holiday. Mike

2 4

re: MSI database _Streams table
by Dan Kegel 20 Jun '06

20 Jun '06

In http://www.winehq.org/pipermail/wine-patches/2006-June/027528.html, Andrey Turkin wrote: > Some installers depends on _Streams built-in table Which installers? It'd be nice to have a bug in bugzilla to hang your MSI work on. Thanks! - Dan

2 1

Re: Win64 patch 9/13
by Dmitry Timoshkov 20 Jun '06

20 Jun '06

"Ge van Geldorp" <ge(a)gse.nl> wrote: > - GWL_HINSTANCE is not defined on Win64, hInstance is documented as not > required in CreateWindowEx calls > - HINSTANCE hInstance = (HINSTANCE)GetWindowLong(hWnd, GWL_HINSTANCE); > + HINSTANCE hInstance; Please use HINSTANCE hInstance = GetWindowLongPtr(hWnd, GWLP_HINSTANCE); instead. -- Dmitry.

1 0

Usage of checkGLcall in wined3d
by Paul Vriens 19 Jun '06

19 Jun '06

Hi, while going through some wined3d code I've seen that a 'normal' sequence is: <some call>; checkGLcall("<some call>"); there are however several cases where the call isn't followed by a checkGLcall: surface.c:1713: glEnable(GL_TEXTURE_2D); surface.c:2165: glEnable(GL_SCISSOR_TEST); or that parameters/text are wrong for checkGLcall: surface.c-2220- glBindTexture(GL_TEXTURE_2D, 0); surface.c:2221: checkGLcall("glEnable glBindTexture"); surface.c-2406- glGetIntegerv(GL_DRAW_BUFFER, &prev_draw); surface.c:2407: vcheckGLcall("glIntegerv"); Should this one be defined as a janitorial task? Cheers, Paul.

3 2

Win64 status
by Ge van Geldorp 19 Jun '06

19 Jun '06

With the Win64 patches I just submitted to wine-patches, I'm able to successfully build Win64-enabled Wine and execute the following 64-bit winelib (winelib64? wine64lib?) application: #include "windows.h" int WINAPI WinMain(HINSTANCE hinst, HINSTANCE hprev, LPSTR cmdline, int cmdshow) { DWORD Written; WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), "Hello, world\r\n", 14, &Written, NULL); return 0; } Unfortunately, compiling the above app as a true 64-bit HELLO64.EXE using Microsoft Visual Studio and then executing it using Wine doesn't work. The problem is that the calling convention for functions is different between MSVC and GCC generated apps. Basically, MSVC puts the function arguments in registers RCX, RDX, R8, R9 while GCC puts function arguments in registers RDI, RSI, RDX, RCX, R8, R9. I guess we'll have to wait for true .EXE support until someone teaches GCC the MSVC calling convention. To prevent confusion: the "normal" 32-bit Wine version runs fine on x86_64 Linux. This is the version you'll want to use, it allows you to run 32-bit Windows stuff. The remarks above are about running 64-bit Windows executables which are virtually non-existant at the moment. Gé van Geldorp.

2 1

wined3d: declaration/FVF conversion test
by Ivan Gyurdiev 19 Jun '06

19 Jun '06

Hi, I'm attaching test, which demonstrates incorrect behavior of SetFVF and SetVertexDeclaration. Windows converts one to the other and backwards (at least partially), and we do not such thing - this breaks at least 2 demos (dx9_hlsl_*) I'm posting it here, because: - I don't have Windows, and I need someone to try it on machine with pixel shader support (preferably 3.0, will need to enable pshaders and GLSL registry key). The whole first part of the test checks decl to fvf conversions, and they're almost all set to 0 in order to pass on H. Verbeet and V. Margolen's setups [ which have no pshaders ]. MSDN has a whole page on how to convert to an fvf, and the values there are definitely *not* 0, so that's why I'm suspicious. - Secondly, I am leaving for NYC in 2 days to look for a place to live, so I have limited time to clean up the test (ok/trace usage and the like), and I have no time to implement the fix. I am hoping someone else can finish it, because afterwards I go to Denver for a month, where I will have limited computing capabilities. Then I start a full time job back at NYC, so I'll be pretty busy. Anyway, I'm sure Jave has shaders under control and will be done with sm 2, 3, 4, 5.. 10 by the end of the summer whether I help or not :)

5 9

wine XShm problem on remote display
by Benjamin Fabricius 19 Jun '06

19 Jun '06

Hello all, I am working on a vst (audio-plugin-)server with embedded linux. Everything is up and running in a testing phase. Unfortunately i am experiencing difficulties, that i think could derive from wine. First of all my setup vst:/opt/fst # uname -a; wine --version Linux vst 2.6.15 #21 PREEMPT Thu Mar 30 22:11:02 CEST 2006 i686 unknown Wine 20050725 Also i am using FreeST which is a binary in order to mount and maintain the vst plugins. The server runs as a x client and my development laptop as x server. This setup works satisfactory i can display any graphical windows on my laptop including wine loaded windows executables. now though, when loading certain plugins on the server (x client) (these all work fine on my local development host) i get a weird x server fault 8<----8<----8<----8<----8<----8<----8<---- vst:/opt/fst # ./fst /mnt/testsuite/oberon4/Oberon-8.dll yo... lets see... The program 'fst.exe.so' received an X Window System error. This probably reflects a bug in the program. The error was 'BadAccess (attempt to access private resource denied)'. (Details: serial 114 error_code 10 request_code 144 minor_code 1) (Note to programmers: normally, X errors are reported asynchronously; that is, you will receive the error a while after causing it. To debug your program, run it with the --sync command line option to change this behavior. You can then get a meaningful backtrace from your debugger if you break on the gdk_x_error() function.) 8<----8<----8<----8<----8<----8<----8<---- An xdpyinfo on my xserver gives me ben@barney:~> xdpyinfo -queryExt | grep 144 MIT-SHM (opcode: 144, base event: 94, base error: 166) So the MIT-SHM extension seems to be the source of the trouble. looking into the MIT-SHM extension headers gives me the minor opcode: ben@barney:/usr/include/X11/extensions> less XShm.h ... #define X_ShmQueryVersion 0 #define X_ShmAttach 1 #define X_ShmDetach 2 #define X_ShmPutImage 3 #define X_ShmGetImage 4 #define X_ShmCreatePixmap 5 ... so attaching a shared memory pixmap appears to be causing the trouble. Now I`m not sure yet if a wine or fst function is causing the trouble. It could derive from some Gtk call... Isn't it problematic to use the shared memory extension when working on a remote display? Now some google entries tell me one must have been able to disable wine using xshm in /etc/wine.conf for example. Is this still so because i can not find any config file allowing this in my distro. And using winecfg didn't really deliver results either. My handicap is my lack of profound knowledge in wine and x matters. Maybe you guys now some work around or can imagine what could be causing all the havoc here... Any help would be great... thank for your time, Cheers, bf -- ------------------- Benjamin Fabricius German Student Lawo AG

4 4

Re: x11drv: Escape international characters
by Dmitry Timoshkov 19 Jun '06

19 Jun '06

"Andrew Talbot" <Andrew.Talbot(a)talbotville.com> wrote: > It seems better to represent international characters with escape sequences, > both to increase clarity - especially for those who do not normally use > ISO-8859-1 encoding - and to make editing easier for some. Please don't do that. Anyone who wants to edit keyboard tables should set editor to ISO-8859-1 encoding. Otherwise it becomes really hard to add new tables or fix existing ones by just comparing or even copy/pasting from the +key log. -- Dmitry.

3 2

Re: configure: datarootdir is unused, and causes a warning with newer versions of autoconf.
by Marcus Meissner 19 Jun '06

19 Jun '06

On Mon, Jun 19, 2006 at 06:12:38PM +0900, Mike McCormack wrote: > diff --git a/Make.rules.in b/Make.rules.in > index 9af2d3e..9deee72 100644 > --- a/Make.rules.in > +++ b/Make.rules.in > @@ -98,7 +98,6 @@ prefix = @prefix@ > exec_prefix = @exec_prefix@ > bindir = @bindir@ > libdir = @libdir@ > -datarootdir = @datarootdir@ > datadir = @datadir@ > infodir = @infodir@ > mandir = @mandir@ We added this especially because configure warned about it. Ciao, Marcus

2 1

Re: Fix definition of SECURITY_INTEGER
by Kai Blin 19 Jun '06

19 Jun '06

* Thomas Weidenmueller <wine-patches(a)reactsoft.com> [19/06/06, 11:38:54]: > Index: dlls/secur32/negotiate.c > =================================================================== > RCS file: /home/wine/wine/dlls/secur32/negotiate.c,v > retrieving revision 1.3 > diff -u -r1.3 negotiate.c > --- dlls/secur32/negotiate.c 23 May 2006 12:48:34 -0000 1.3 > +++ dlls/secur32/negotiate.c 19 Jun 2006 09:10:31 -0000 > @@ -110,7 +110,10 @@ > phCredential->dwUpper = fCredentialsUse; > /* Same here, shamelessly stolen from schannel.c */ > if (ptsExpiry) > - ptsExpiry->QuadPart = 0; > + { > + ptsExpiry->LowPart = 0; > + ptsExpiry->HighPart = 0; > + } > ret = SEC_E_OK; > } > return ret; Be aware that negotiate.c is a complete stub. If this function is changed, it should be changed like this: diff --git a/dlls/secur32/negotiate.c b/dlls/secur32/negotiate.c index b8531aa..586e559 100644 --- a/dlls/secur32/negotiate.c +++ b/dlls/secur32/negotiate.c @@ -93,28 +93,6 @@ static SECURITY_STATUS SEC_ENTRY nego_Qu return ret; } -static SECURITY_STATUS nego_AcquireCredentialsHandle(ULONG fCredentialsUse, - PCredHandle phCredential, PTimeStamp ptsExpiry) -{ - SECURITY_STATUS ret; - - if(fCredentialsUse == SECPKG_CRED_BOTH) - { - ret = SEC_E_NO_CREDENTIALS; - } - else - { - /* Ok, just store the direction like schannel does for now. - * FIXME: This should probably do something useful later on - */ - phCredential->dwUpper = fCredentialsUse; - /* Same here, shamelessly stolen from schannel.c */ - if (ptsExpiry) - ptsExpiry->QuadPart = 0; - ret = SEC_E_OK; - } - return ret; -} /*********************************************************************** * AcquireCredentialsHandleA @@ -124,11 +102,10 @@ static SECURITY_STATUS SEC_ENTRY nego_Ac PLUID pLogonID, PVOID pAuthData, SEC_GET_KEY_FN pGetKeyFn, PVOID pGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry) { - TRACE("(%s, %s, 0x%08lx, %p, %p, %p, %p, %p, %p)\n", + TRACE("(%s, %s, 0x%08lx, %p, %p, %p, %p, %p, %p) stub\n", debugstr_a(pszPrincipal), debugstr_a(pszPackage), fCredentialUse, pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); - return nego_AcquireCredentialsHandle(fCredentialUse, phCredential, - ptsExpiry); + return SEC_E_UNSUPPORTED_FUNCTION; } /*********************************************************************** @@ -139,11 +116,10 @@ static SECURITY_STATUS SEC_ENTRY nego_Ac PLUID pLogonID, PVOID pAuthData, SEC_GET_KEY_FN pGetKeyFn, PVOID pGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry) { - TRACE("(%s, %s, 0x%08lx, %p, %p, %p, %p, %p, %p)\n", + TRACE("(%s, %s, 0x%08lx, %p, %p, %p, %p, %p, %p) stub\n", debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialUse, pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); - return nego_AcquireCredentialsHandle(fCredentialUse, phCredential, - ptsExpiry); + return SEC_E_UNSUPPORTED_FUNCTION; } /*********************************************************************** There's just no use in fixing negotiate.c as long as ntlm.c is in flux. Negotiate will use the same solution as NTLM. Cheers, Kai -- Kai Blin, (blin at gmx dot net) "There are things that are so serious that you can only joke about them" - Heisenberg

2 1

Re: appdb security
by Christoph Frick 19 Jun '06

19 Jun '06

On Thu, Jun 08, 2006 at 11:25:08AM -0400, Chris Morgan wrote: > $sQuery = "Select versionId from appVersion where > appId='"$_REQUEST['appId']."';"; > > Who's '' around $_REQUEST should prevent the string from being interpreted as > anything but a single value passed as the value of appId. with appId="' or 1=1;'"? -- cu

6 12

[dinput] multiple /dev/input joysticks (for test/review)
by Christoph Frick 19 Jun '06

19 Jun '06

hiho, the attached patch detects _all_ joysticks of /dev/input/event%d; please have a test before i refine the patch for submission. i tried it with Il2 Sturmovik and with Live For Speed - both games worked. as neither my cougar nor my brd wheel have force feedback i was not able to test, if everything still works. details: - use a seperate struct for holding infos about the /dev/input/event devices - use the general infos about the devices instead of acquiring/unacquiring before/after infos about the device are needed - changed the dinput_main to use three states to return on create_device: -1 == dont try further, 0 == there is no such device, 1 == there we go next ideas/patches: - use a linked list for storing only the JoyDev's that there are - the guid is stored in the JoyImpl and the JoyDev - the logic in setting the guids is as "first joystick == GUID_Joystick" then use the wine default; this currently leads into the same GUID for instance and product; i saw in joystick_linux.c how this is solved there - as dmesg shows a proper name for the device we might somehow retrieve it with an ioctl-call; currently the /dev/... name is used, which is good for developers but not for users - per-device-config via registry (e.g. combine axes) this patch actually is longer than the things it really does - introducing a "sub-struct" for holding common data adds lots of ``->joydev'' so i decided instead of splitting this patch into several fragments send an "unfinished" version and then finish the job with the following small patches. please note: the patch is against ~wine/dll/dinput (i use cvs for the wine original and git where i need it for patching) -- cu diff --git a/device.c b/device.c diff --git a/dinput_main.c b/dinput_main.c index 9f93a52..d928d96 100644 --- a/dinput_main.c +++ b/dinput_main.c @@ -220,10 +220,11 @@ static HRESULT WINAPI IDirectInputAImpl_ for (i = 0; i < NB_DINPUT_DEVICES; i++) { if (!dinput_devices[i]->enum_deviceA) continue; - for (j = 0, r = -1; r != 0; j++) { + TRACE(" - checking device %d ('%s')\n", i, dinput_devices[i]->name); + for (j = 0, r = 0; r != -1; j++) { devInstance.dwSize = sizeof(devInstance); - TRACE(" - checking device %d ('%s')\n", i, dinput_devices[i]->name); - if ((r = dinput_devices[i]->enum_deviceA(dwDevType, dwFlags, &devInstance, This->dwVersion, j))) { + if (1 == (r = dinput_devices[i]->enum_deviceA(dwDevType, dwFlags, &devInstance, This->dwVersion, j))) { + TRACE(" - found id %d\n", j); if (lpCallback(&devInstance,pvRef) == DIENUM_STOP) return 0; } @@ -250,10 +251,11 @@ static HRESULT WINAPI IDirectInputWImpl_ for (i = 0; i < NB_DINPUT_DEVICES; i++) { if (!dinput_devices[i]->enum_deviceW) continue; - for (j = 0, r = -1; r != 0; j++) { + TRACE(" - checking device %d ('%s')\n", i, dinput_devices[i]->name); + for (j = 0, r = 0; r != -1; j++) { devInstance.dwSize = sizeof(devInstance); - TRACE(" - checking device %d ('%s')\n", i, dinput_devices[i]->name); - if ((r = dinput_devices[i]->enum_deviceW(dwDevType, dwFlags, &devInstance, This->dwVersion, j))) { + if (1 == (r = dinput_devices[i]->enum_deviceW(dwDevType, dwFlags, &devInstance, This->dwVersion, j))) { + TRACE(" - found id %d\n", j); if (lpCallback(&devInstance,pvRef) == DIENUM_STOP) return 0; } diff --git a/joystick_linux.c b/joystick_linux.c index d56271d..abedc5c 100644 --- a/joystick_linux.c +++ b/joystick_linux.c @@ -162,11 +162,15 @@ static int joydev_get_device(char *dev, return ret; } -static BOOL joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) +static int joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) { int fd = -1; char dev[32]; + if (id>0) { + return -1; + } + if (dwFlags & DIEDFL_FORCEFEEDBACK) { WARN("force feedback not supported\n"); return FALSE; @@ -209,13 +213,17 @@ static BOOL joydev_enum_deviceA(DWORD dw return FALSE; } -static BOOL joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) +static int joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) { int fd = -1; char name[MAX_PATH]; char dev[32]; char friendly[32]; + if (id>0) { + return -1; + } + if (dwFlags & DIEDFL_FORCEFEEDBACK) { WARN("force feedback not supported\n"); return FALSE; diff --git a/joystick_linuxinput.c b/joystick_linuxinput.c index 30f81f1..94a0383 100644 --- a/joystick_linuxinput.c +++ b/joystick_linuxinput.c @@ -85,12 +85,28 @@ HRESULT linuxinput_get_info_W(int fd, RE typedef struct JoystickImpl JoystickImpl; static const IDirectInputDevice8AVtbl JoystickAvt; static const IDirectInputDevice8WVtbl JoystickWvt; + +struct JoyDev { + int is_joystick; + char *device; + GUID guid; + + int has_ff; + int num_effects; + + /* data returned by EVIOCGBIT for caps, EV_ABS, EV_KEY, and EV_FF */ + BYTE evbits[(EV_MAX+7)/8]; + BYTE absbits[(ABS_MAX+7)/8]; + BYTE keybits[(KEY_MAX+7)/8]; + BYTE ffbits[(FF_MAX+7)/8]; +}; + struct JoystickImpl { const void *lpVtbl; LONG ref; GUID guid; - + struct JoyDev *joydev; /* The 'parent' DInput */ IDirectInputImpl *dinput; @@ -130,100 +146,115 @@ struct JoystickImpl #define AXE_ABSMAX 2 #define AXE_ABSFUZZ 3 #define AXE_ABSFLAT 4 - - - /* data returned by EVIOCGBIT for caps, EV_ABS, EV_KEY, and EV_FF */ - BYTE evbits[(EV_MAX+7)/8]; - BYTE absbits[(ABS_MAX+7)/8]; - BYTE keybits[(KEY_MAX+7)/8]; - BYTE ffbits[(FF_MAX+7)/8]; }; +static void fake_current_js_state(JoystickImpl *ji); +static int find_property_offset(JoystickImpl *This, LPCDIPROPHEADER ph); +static DWORD map_pov(int event_value, int is_x); +static void find_joydevs(void); + /* This GUID is slightly different from the linux joystick one. Take note. */ -static GUID DInput_Wine_Joystick_GUID = { /* 9e573eda-7734-11d2-8d4a-23903fb6bdf7 */ +static const GUID DInput_Wine_Joystick_Base_GUID = { /* 9e573eda-7734-11d2-8d4a-23903fb6bdf7 */ 0x9e573eda, 0x7734, 0x11d2, {0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7} }; -static void fake_current_js_state(JoystickImpl *ji); -static int find_property_offset(JoystickImpl *This, LPCDIPROPHEADER ph); -static DWORD map_pov(int event_value, int is_x); - #define test_bit(arr,bit) (((BYTE*)(arr))[(bit)>>3]&(1<<((bit)&7))) -static int joydev_have(BOOL require_ff) +#define MAX_JOYDEV 64 + +static int have_joydevs = -1; +static int first_joydev = -1; +static struct JoyDev joydevs[MAX_JOYDEV] = {}; + +static void find_joydevs(void) { - int i, fd, flags, num_effects; - int havejoy = 0; + int i; + + if (have_joydevs!=-1) { + return; + } + + have_joydevs = 0; + + for (i=0;i<MAX_JOYDEV;i++) { + char buf[200]; + struct JoyDev *joydev = &joydevs[i]; + int fd; + int no_ff_check = 0; + + sprintf(buf,EVDEVPREFIX"%d",i); + + if ((fd=open(buf, O_RDWR))==-1) { + fd = open(buf, O_RDONLY); + no_ff_check = 1; + } + + if (fd!=-1) { + if ((-1==ioctl(fd,EVIOCGBIT(0,sizeof(joydev->evbits)),joydev->evbits))) { + perror("EVIOCGBIT 0"); + close(fd); + continue; + } + if (-1==ioctl(fd,EVIOCGBIT(EV_ABS,sizeof(joydev->absbits)),joydev->absbits)) { + perror("EVIOCGBIT EV_ABS"); + close(fd); + continue; + } + if (-1==ioctl(fd,EVIOCGBIT(EV_KEY,sizeof(joydev->keybits)),joydev->keybits)) { + perror("EVIOCGBIT EV_KEY"); + close(fd); + continue; + } + /* A true joystick has at least axis X and Y, and at least 1 + * button. copied from linux/drivers/input/joydev.c */ + if (test_bit(joydev->absbits,ABS_X) && test_bit(joydev->absbits,ABS_Y) && + ( test_bit(joydev->keybits,BTN_TRIGGER) || + test_bit(joydev->keybits,BTN_A) || + test_bit(joydev->keybits,BTN_1) + ) + ) { + TRACE("Found a joystick '%s'\n", buf); + + joydev->is_joystick = 1; + joydev->device = strdup(buf); + joydev->guid = DInput_Wine_Joystick_Base_GUID; + joydev->guid.Data1 += have_joydevs; + have_joydevs++; + if (first_joydev==-1) { + first_joydev = i; + } + +#ifdef HAVE_STRUCT_FF_EFFECT_DIRECTION + if (!no_ff_check) { + if ((!test_bit(joydev->evbits,EV_FF)) + || (-1==ioctl(fd,EVIOCGBIT(EV_FF,sizeof(joydev->ffbits)),joydev->ffbits)) + || (-1==ioctl(fd,EVIOCGEFFECTS,&joydev->num_effects)) + || (joydev->num_effects <= 0)) { + close(fd); + continue; + } - for (i=0;i<64;i++) { - char buf[200]; - BYTE absbits[(ABS_MAX+7)/8],keybits[(KEY_MAX+7)/8]; - BYTE evbits[(EV_MAX+7)/8],ffbits[(FF_MAX+7)/8]; - - sprintf(buf,EVDEVPREFIX"%d",i); - - if (require_ff) - flags = O_RDWR; - else - flags = O_RDONLY; - - if (-1!=(fd=open(buf,flags))) { - if (-1==ioctl(fd,EVIOCGBIT(EV_ABS,sizeof(absbits)),absbits)) { - perror("EVIOCGBIT EV_ABS"); - close(fd); - continue; - } - if (-1==ioctl(fd,EVIOCGBIT(EV_KEY,sizeof(keybits)),keybits)) { - perror("EVIOCGBIT EV_KEY"); - close(fd); - continue; - } - - /* test for force feedback if it's required */ - if (require_ff) { - if ((-1==ioctl(fd,EVIOCGBIT(0,sizeof(evbits)),evbits))) { - perror("EVIOCGBIT 0"); - close(fd); - continue; - } - if ( (!test_bit(evbits,EV_FF)) - || (-1==ioctl(fd,EVIOCGBIT(EV_FF,sizeof(ffbits)),ffbits)) - || (-1==ioctl(fd,EVIOCGEFFECTS,&num_effects)) - || (num_effects <= 0)) { - close(fd); - continue; - } - } - - /* A true joystick has at least axis X and Y, and at least 1 - * button. copied from linux/drivers/input/joydev.c */ - if (test_bit(absbits,ABS_X) && test_bit(absbits,ABS_Y) && - ( test_bit(keybits,BTN_TRIGGER) || - test_bit(keybits,BTN_A) || - test_bit(keybits,BTN_1) - ) - ) { - FIXME("found a joystick at %s!\n",buf); - havejoy = 1; - } - close(fd); + TRACE(" ... with force feedback\n"); + + joydev->has_ff = 1; + } +#endif } - if (havejoy || (errno==ENODEV)) - break; + + close(fd); + } } - return havejoy; } -static BOOL joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) +static int joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) { - int havejoy = 0; - - if (id != 0) - return FALSE; - + if (id >= MAX_JOYDEV) { + return -1; + } + if (!((dwDevType == 0) || ((dwDevType == DIDEVTYPE_JOYSTICK) && (version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800)))) @@ -234,35 +265,34 @@ static BOOL joydev_enum_deviceA(DWORD dw return FALSE; #endif - havejoy = joydev_have(dwFlags & DIEDFL_FORCEFEEDBACK); - - if (!havejoy) - return FALSE; + find_joydevs(); - TRACE("Enumerating the linuxinput Joystick device\n"); - - /* Return joystick */ - lpddi->guidInstance = GUID_Joystick; - lpddi->guidProduct = DInput_Wine_Joystick_GUID; + if (joydevs[id].is_joystick && ((!(dwFlags & DIEDFL_FORCEFEEDBACK)) || joydevs[id].has_ff)) { + if (id==first_joydev) { + lpddi->guidInstance = GUID_Joystick; + } else { + lpddi->guidInstance = joydevs[id].guid; + } + lpddi->guidProduct = joydevs[id].guid; - lpddi->guidFFDriver = GUID_NULL; - if (version >= 0x0800) - lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); - else - lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); + lpddi->guidFFDriver = GUID_NULL; + if (version >= 0x0800) + lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); + else + lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); - strcpy(lpddi->tszInstanceName, "Joystick"); - /* ioctl JSIOCGNAME(len) */ - strcpy(lpddi->tszProductName, "Wine Joystick"); - return TRUE; + strcpy(lpddi->tszInstanceName, "Joystick"); + strcpy(lpddi->tszProductName, joydevs[id].device); + return TRUE; + } + return FALSE; } -static BOOL joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) +static int joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) { - int havejoy = 0; - - if (id != 0) - return FALSE; + if (id >= MAX_JOYDEV) { + return -1; + } if (!((dwDevType == 0) || ((dwDevType == DIDEVTYPE_JOYSTICK) && (version < 0x0800)) || @@ -274,30 +304,27 @@ static BOOL joydev_enum_deviceW(DWORD dw return FALSE; #endif - havejoy = joydev_have(dwFlags & DIEDFL_FORCEFEEDBACK); - - if (!havejoy) - return FALSE; - - TRACE("Enumerating the linuxinput Joystick device\n"); - - /* Return joystick */ - lpddi->guidInstance = GUID_Joystick; - lpddi->guidProduct = DInput_Wine_Joystick_GUID; + find_joydevs(); - lpddi->guidFFDriver = GUID_NULL; - if (version >= 0x0800) - lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); - else - lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); + if (joydevs[id].is_joystick && ((!(dwFlags & DIEDFL_FORCEFEEDBACK)) || joydevs[id].has_ff)) { + /* Return joystick */ + lpddi->guidInstance = GUID_Joystick; + lpddi->guidProduct = joydevs[id].guid; + + lpddi->guidFFDriver = GUID_NULL; + if (version >= 0x0800) + lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); + else + lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); - MultiByteToWideChar(CP_ACP, 0, "Joystick", -1, lpddi->tszInstanceName, MAX_PATH); - /* ioctl JSIOCGNAME(len) */ - MultiByteToWideChar(CP_ACP, 0, "Wine Joystick", -1, lpddi->tszProductName, MAX_PATH); - return TRUE; + MultiByteToWideChar(CP_ACP, 0, "Joystick", -1, lpddi->tszInstanceName, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, joydevs[id].device, -1, lpddi->tszProductName, MAX_PATH); + return TRUE; + } + return FALSE; } -static JoystickImpl *alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *dinput) +static JoystickImpl *alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *dinput, struct JoyDev *joydev) { JoystickImpl* newDevice; int i; @@ -307,6 +334,7 @@ static JoystickImpl *alloc_device(REFGUI newDevice->ref = 1; newDevice->joyfd = -1; newDevice->dinput = dinput; + newDevice->joydev = joydev; #ifdef HAVE_STRUCT_FF_EFFECT_DIRECTION newDevice->ff_state = FF_STATUS_STOPPED; #endif @@ -327,25 +355,30 @@ static JoystickImpl *alloc_device(REFGUI static HRESULT joydev_create_deviceA(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPDIRECTINPUTDEVICEA* pdev) { - int havejoy = 0; + int i; - havejoy = joydev_have(FALSE); + find_joydevs(); - if (!havejoy) + if (!have_joydevs) return DIERR_DEVICENOTREG; - if ((IsEqualGUID(&GUID_Joystick,rguid)) || - (IsEqualGUID(&DInput_Wine_Joystick_GUID,rguid))) { - if ((riid == NULL) || - IsEqualGUID(&IID_IDirectInputDeviceA,riid) || - IsEqualGUID(&IID_IDirectInputDevice2A,riid) || - IsEqualGUID(&IID_IDirectInputDevice7A,riid) || - IsEqualGUID(&IID_IDirectInputDevice8A,riid)) { - *pdev = (IDirectInputDeviceA*) alloc_device(rguid, &JoystickAvt, dinput); - TRACE("Creating a Joystick device (%p)\n", *pdev); - return DI_OK; - } else - return DIERR_NOINTERFACE; + for (i=0; i<MAX_JOYDEV; i++) { + if (joydevs[i].is_joystick && ( + IsEqualGUID(&GUID_Joystick,rguid) || + IsEqualGUID(&joydevs[i].guid,rguid) + )) { + if ((riid == NULL) || + IsEqualGUID(&IID_IDirectInputDeviceA,riid) || + IsEqualGUID(&IID_IDirectInputDevice2A,riid) || + IsEqualGUID(&IID_IDirectInputDevice7A,riid) || + IsEqualGUID(&IID_IDirectInputDevice8A,riid)) { + *pdev = (IDirectInputDeviceA*) alloc_device(rguid, &JoystickAvt, dinput, &joydevs[i]); + TRACE("Creating a Joystick device (%p)\n", *pdev); + return DI_OK; + } else { + return DIERR_NOINTERFACE; + } + } } return DIERR_DEVICENOTREG; @@ -354,25 +387,30 @@ static HRESULT joydev_create_deviceA(IDi static HRESULT joydev_create_deviceW(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPDIRECTINPUTDEVICEW* pdev) { - int havejoy = 0; + int i; - havejoy = joydev_have(FALSE); + find_joydevs(); - if (!havejoy) + if (!have_joydevs) return DIERR_DEVICENOTREG; - if ((IsEqualGUID(&GUID_Joystick,rguid)) || - (IsEqualGUID(&DInput_Wine_Joystick_GUID,rguid))) { - if ((riid == NULL) || - IsEqualGUID(&IID_IDirectInputDeviceW,riid) || - IsEqualGUID(&IID_IDirectInputDevice2W,riid) || - IsEqualGUID(&IID_IDirectInputDevice7W,riid) || - IsEqualGUID(&IID_IDirectInputDevice8W,riid)) { - *pdev = (IDirectInputDeviceW*) alloc_device(rguid, &JoystickWvt, dinput); - TRACE("Creating a Joystick device (%p)\n", *pdev); - return DI_OK; - } else - return DIERR_NOINTERFACE; + for (i=0; i<MAX_JOYDEV; i++) { + if (joydevs[i].is_joystick && ( + IsEqualGUID(&GUID_Joystick,rguid) || + IsEqualGUID(&joydevs[i].guid,rguid) + )) { + if ((riid == NULL) || + IsEqualGUID(&IID_IDirectInputDeviceW,riid) || + IsEqualGUID(&IID_IDirectInputDevice2W,riid) || + IsEqualGUID(&IID_IDirectInputDevice7W,riid) || + IsEqualGUID(&IID_IDirectInputDevice8W,riid)) { + *pdev = (IDirectInputDeviceW*) alloc_device(rguid, &JoystickWvt, dinput, &joydevs[i]); + TRACE("Creating a Joystick device (%p)\n", *pdev); + return DI_OK; + } else { + return DIERR_NOINTERFACE; + } + } } return DIERR_DEVICENOTREG; @@ -461,9 +499,8 @@ static HRESULT WINAPI JoystickAImpl_SetD */ static HRESULT WINAPI JoystickAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) { - int i,buttons; + int i, buttons; JoystickImpl *This = (JoystickImpl *)iface; - char buf[200]; BOOL readonly = TRUE; TRACE("(this=%p)\n",This); @@ -472,68 +509,23 @@ static HRESULT WINAPI JoystickAImpl_Acqu if (This->df==NULL) { return DIERR_INVALIDPARAM; } - for (i=0;i<64;i++) { - sprintf(buf,EVDEVPREFIX"%d",i); - if (-1==(This->joyfd=open(buf,O_RDWR))) { - if (-1==(This->joyfd=open(buf,O_RDONLY))) { - /* Couldn't open the device at all */ - if (errno==ENODEV) - return DIERR_NOTFOUND; - perror(buf); - continue; - } - else { - /* Couldn't open in r/w but opened in read-only. */ - WARN("Could not open %s in read-write mode. Force feedback will be disabled.\n",buf); - } - } - else { - /* Opened device in read-write */ - readonly = FALSE; - } - if ((-1!=ioctl(This->joyfd,EVIOCGBIT(0,sizeof(This->evbits)),This->evbits)) && - (-1!=ioctl(This->joyfd,EVIOCGBIT(EV_ABS,sizeof(This->absbits)),This->absbits)) && - (-1!=ioctl(This->joyfd,EVIOCGBIT(EV_KEY,sizeof(This->keybits)),This->keybits)) && - (test_bit(This->absbits,ABS_X) && test_bit(This->absbits,ABS_Y) && - (test_bit(This->keybits,BTN_TRIGGER)|| - test_bit(This->keybits,BTN_A) || - test_bit(This->keybits,BTN_1) - ) - ) - ) - break; - close(This->joyfd); - This->joyfd = -1; - } - if (This->joyfd==-1) - return DIERR_NOTFOUND; - This->has_ff = FALSE; - This->num_effects = 0; - -#ifdef HAVE_STRUCT_FF_EFFECT_DIRECTION - if (!readonly && test_bit(This->evbits, EV_FF)) { - if (-1!=ioctl(This->joyfd,EVIOCGBIT(EV_FF,sizeof(This->ffbits)),This->ffbits)) { - if (-1!=ioctl(This->joyfd,EVIOCGEFFECTS,&This->num_effects) - && This->num_effects > 0) { - This->has_ff = TRUE; - TRACE("Joystick seems to be capable of force feedback.\n"); - } - else { - TRACE("Joystick does not support any effects, disabling force feedback.\n"); - } - } - else { - TRACE("Could not get EV_FF bits; disabling force feedback.\n"); - } - } - else { - TRACE("Force feedback disabled (device is readonly or joystick incapable).\n"); + if (-1==(This->joyfd=open(This->joydev->device,O_RDWR))) { + if (-1==(This->joyfd=open(This->joydev->device,O_RDONLY))) { + /* Couldn't open the device at all */ + perror(This->joydev->device); + return DIERR_NOTFOUND; + } else { + /* Couldn't open in r/w but opened in read-only. */ + WARN("Could not open %s in read-write mode. Force feedback will be disabled.\n", This->joydev->device); + } + } else { + /* Opened device in read-write */ + readonly = FALSE; } -#endif for (i=0;i<ABS_MAX;i++) { - if (test_bit(This->absbits,i)) { + if (test_bit(This->joydev->absbits,i)) { if (-1==ioctl(This->joyfd,EVIOCGABS(i),&(This->axes[i]))) continue; TRACE("axe %d: cur=%d, min=%d, max=%d, fuzz=%d, flat=%d\n", @@ -550,14 +542,14 @@ static HRESULT WINAPI JoystickAImpl_Acqu } buttons = 0; for (i=0;i<KEY_MAX;i++) { - if (test_bit(This->keybits,i)) { + if (test_bit(This->joydev->keybits,i)) { TRACE("button %d: %d\n", i, buttons); This->buttons[i] = 0x80 | buttons; buttons++; } } - fake_current_js_state(This); + fake_current_js_state(This); return 0; } @@ -985,7 +977,6 @@ static HRESULT WINAPI JoystickAImpl_GetC LPDIDEVCAPS lpDIDevCaps) { JoystickImpl *This = (JoystickImpl *)iface; - int xfd = This->joyfd; int i,axes,buttons; TRACE("%p->(%p)\n",iface,lpDIDevCaps); @@ -1000,11 +991,6 @@ static HRESULT WINAPI JoystickAImpl_GetC return DIERR_INVALIDPARAM; } - if (xfd==-1) { - /* yes, games assume we return something, even if unacquired */ - JoystickAImpl_Acquire(iface); - } - lpDIDevCaps->dwFlags = DIDC_ATTACHED; if (This->dinput->dwVersion >= 0x0800) lpDIDevCaps->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); @@ -1012,9 +998,9 @@ static HRESULT WINAPI JoystickAImpl_GetC lpDIDevCaps->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); axes=0; - for (i=0;i<ABS_MAX;i++) if (test_bit(This->absbits,i)) axes++; + for (i=0;i<ABS_MAX;i++) if (test_bit(This->joydev->absbits,i)) axes++; buttons=0; - for (i=0;i<KEY_MAX;i++) if (test_bit(This->keybits,i)) buttons++; + for (i=0;i<KEY_MAX;i++) if (test_bit(This->joydev->keybits,i)) buttons++; if (This->has_ff) lpDIDevCaps->dwFlags |= DIDC_FORCEFEEDBACK; @@ -1022,10 +1008,6 @@ static HRESULT WINAPI JoystickAImpl_GetC lpDIDevCaps->dwAxes = axes; lpDIDevCaps->dwButtons = buttons; - if (xfd==-1) { - JoystickAImpl_Unacquire(iface); - } - return DI_OK; } @@ -1052,7 +1034,6 @@ static HRESULT WINAPI JoystickAImpl_Enum { JoystickImpl *This = (JoystickImpl *)iface; DIDEVICEOBJECTINSTANCEA ddoi; - int xfd = This->joyfd; TRACE("(this=%p,%p,%p,%08lx)\n", This, lpCallback, lpvRef, dwFlags); if (TRACE_ON(dinput)) { @@ -1061,10 +1042,6 @@ static HRESULT WINAPI JoystickAImpl_Enum TRACE("\n"); } - /* We need to work even if we're not yet acquired */ - if (xfd == -1) - IDirectInputDevice8_Acquire(iface); - /* Only the fields till dwFFMaxForce are relevant */ ddoi.dwSize = FIELD_OFFSET(DIDEVICEOBJECTINSTANCEA, dwFFMaxForce); @@ -1075,7 +1052,7 @@ static HRESULT WINAPI JoystickAImpl_Enum BYTE i; for (i = 0; i < ABS_MAX; i++) { - if (!test_bit(This->absbits,i)) continue; + if (!test_bit(This->joydev->absbits,i)) continue; switch (i) { case ABS_X: @@ -1122,9 +1099,6 @@ static HRESULT WINAPI JoystickAImpl_Enum sprintf(ddoi.tszName, "%d-Axis", i); _dump_OBJECTINSTANCEA(&ddoi); if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) { - /* return to unaquired state if that's where we were */ - if (xfd == -1) - IDirectInputDevice8_Unacquire(iface); return DI_OK; } } @@ -1135,15 +1109,12 @@ static HRESULT WINAPI JoystickAImpl_Enum int i; ddoi.guidType = GUID_POV; for (i=0; i<4; i++) { - if (test_bit(This->absbits,ABS_HAT0X+(i<<1)) && test_bit(This->absbits,ABS_HAT0Y+(i<<1))) { + if (test_bit(This->joydev->absbits,ABS_HAT0X+(i<<1)) && test_bit(This->joydev->absbits,ABS_HAT0Y+(i<<1))) { ddoi.dwOfs = DIJOFS_POV(i); ddoi.dwType = DIDFT_MAKEINSTANCE(i << WINE_JOYSTICK_POV_BASE) | DIDFT_POV; sprintf(ddoi.tszName, "%d-POV", i); _dump_OBJECTINSTANCEA(&ddoi); if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) { - /* return to unaquired state if that's where we were */ - if (xfd == -1) - IDirectInputDevice8_Unacquire(iface); return DI_OK; } } @@ -1159,25 +1130,18 @@ static HRESULT WINAPI JoystickAImpl_Enum ddoi.guidType = GUID_Button; for (i = 0; i < KEY_MAX; i++) { - if (!test_bit(This->keybits,i)) continue; + if (!test_bit(This->joydev->keybits,i)) continue; ddoi.dwOfs = DIJOFS_BUTTON(btncount); ddoi.dwType = DIDFT_MAKEINSTANCE(btncount << WINE_JOYSTICK_BUTTON_BASE) | DIDFT_PSHBUTTON; sprintf(ddoi.tszName, "%d-Button", btncount); btncount++; _dump_OBJECTINSTANCEA(&ddoi); if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) { - /* return to unaquired state if that's where we were */ - if (xfd == -1) - IDirectInputDevice8_Unacquire(iface); return DI_OK; } } } - /* return to unaquired state if that's where we were */ - if (xfd == -1) - IDirectInputDevice8_Unacquire(iface); - return DI_OK; } @@ -1300,74 +1264,66 @@ static HRESULT WINAPI JoystickAImpl_Enum DIEFFECTINFOA dei; /* feif */ DWORD type = DIEFT_GETTYPE(dwEffType); JoystickImpl* This = (JoystickImpl*)iface; - int xfd = This->joyfd; - TRACE("(this=%p,%p,%ld) type=%ld fd=%d\n", This, pvRef, dwEffType, type, xfd); + TRACE("(this=%p,%p,%ld) type=%ld\n", This, pvRef, dwEffType, type); dei.dwSize = sizeof(DIEFFECTINFOA); - /* We need to return something even if we're not yet acquired */ - if (xfd == -1) - IDirectInputDevice8_Acquire(iface); - if ((type == DIEFT_ALL || type == DIEFT_CONSTANTFORCE) - && test_bit(This->ffbits, FF_CONSTANT)) { + && test_bit(This->joydev->ffbits, FF_CONSTANT)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_ConstantForce); (*lpCallback)(&dei, pvRef); } if ((type == DIEFT_ALL || type == DIEFT_PERIODIC) - && test_bit(This->ffbits, FF_PERIODIC)) { - if (test_bit(This->ffbits, FF_SQUARE)) { + && test_bit(This->joydev->ffbits, FF_PERIODIC)) { + if (test_bit(This->joydev->ffbits, FF_SQUARE)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Square); (*lpCallback)(&dei, pvRef); } - if (test_bit(This->ffbits, FF_SINE)) { + if (test_bit(This->joydev->ffbits, FF_SINE)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Sine); (*lpCallback)(&dei, pvRef); } - if (test_bit(This->ffbits, FF_TRIANGLE)) { + if (test_bit(This->joydev->ffbits, FF_TRIANGLE)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Triangle); (*lpCallback)(&dei, pvRef); } - if (test_bit(This->ffbits, FF_SAW_UP)) { + if (test_bit(This->joydev->ffbits, FF_SAW_UP)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_SawtoothUp); (*lpCallback)(&dei, pvRef); } - if (test_bit(This->ffbits, FF_SAW_DOWN)) { + if (test_bit(This->joydev->ffbits, FF_SAW_DOWN)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_SawtoothDown); (*lpCallback)(&dei, pvRef); } } if ((type == DIEFT_ALL || type == DIEFT_RAMPFORCE) - && test_bit(This->ffbits, FF_RAMP)) { + && test_bit(This->joydev->ffbits, FF_RAMP)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_RampForce); (*lpCallback)(&dei, pvRef); } if (type == DIEFT_ALL || type == DIEFT_CONDITION) { - if (test_bit(This->ffbits, FF_SPRING)) { + if (test_bit(This->joydev->ffbits, FF_SPRING)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Spring); (*lpCallback)(&dei, pvRef); } - if (test_bit(This->ffbits, FF_DAMPER)) { + if (test_bit(This->joydev->ffbits, FF_DAMPER)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Damper); (*lpCallback)(&dei, pvRef); } - if (test_bit(This->ffbits, FF_INERTIA)) { + if (test_bit(This->joydev->ffbits, FF_INERTIA)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Inertia); (*lpCallback)(&dei, pvRef); } - if (test_bit(This->ffbits, FF_FRICTION)) { + if (test_bit(This->joydev->ffbits, FF_FRICTION)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Friction); (*lpCallback)(&dei, pvRef); } } - /* return to unaquired state if that's where it was */ - if (xfd == -1) - IDirectInputDevice8_Unacquire(iface); #endif return DI_OK; @@ -1390,60 +1346,56 @@ static HRESULT WINAPI JoystickWImpl_Enum dei.dwSize = sizeof(DIEFFECTINFOW); - /* We need to return something even if we're not yet acquired */ - if (xfd == -1) - IDirectInputDevice8_Acquire(iface); - if ((type == DIEFT_ALL || type == DIEFT_CONSTANTFORCE) - && test_bit(This->ffbits, FF_CONSTANT)) { + && test_bit(This->joydev->ffbits, FF_CONSTANT)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_ConstantForce); (*lpCallback)(&dei, pvRef); } if ((type == DIEFT_ALL || type == DIEFT_PERIODIC) - && test_bit(This->ffbits, FF_PERIODIC)) { - if (test_bit(This->ffbits, FF_SQUARE)) { + && test_bit(This->joydev->ffbits, FF_PERIODIC)) { + if (test_bit(This->joydev->ffbits, FF_SQUARE)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Square); (*lpCallback)(&dei, pvRef); } - if (test_bit(This->ffbits, FF_SINE)) { + if (test_bit(This->joydev->ffbits, FF_SINE)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Sine); (*lpCallback)(&dei, pvRef); } - if (test_bit(This->ffbits, FF_TRIANGLE)) { + if (test_bit(This->joydev->ffbits, FF_TRIANGLE)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Triangle); (*lpCallback)(&dei, pvRef); } - if (test_bit(This->ffbits, FF_SAW_UP)) { + if (test_bit(This->joydev->ffbits, FF_SAW_UP)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_SawtoothUp); (*lpCallback)(&dei, pvRef); } - if (test_bit(This->ffbits, FF_SAW_DOWN)) { + if (test_bit(This->joydev->ffbits, FF_SAW_DOWN)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_SawtoothDown); (*lpCallback)(&dei, pvRef); } } if ((type == DIEFT_ALL || type == DIEFT_RAMPFORCE) - && test_bit(This->ffbits, FF_RAMP)) { + && test_bit(This->joydev->ffbits, FF_RAMP)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_RampForce); (*lpCallback)(&dei, pvRef); } if (type == DIEFT_ALL || type == DIEFT_CONDITION) { - if (test_bit(This->ffbits, FF_SPRING)) { + if (test_bit(This->joydev->ffbits, FF_SPRING)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Spring); (*lpCallback)(&dei, pvRef); } - if (test_bit(This->ffbits, FF_DAMPER)) { + if (test_bit(This->joydev->ffbits, FF_DAMPER)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Damper); (*lpCallback)(&dei, pvRef); } - if (test_bit(This->ffbits, FF_INERTIA)) { + if (test_bit(This->joydev->ffbits, FF_INERTIA)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Inertia); (*lpCallback)(&dei, pvRef); } - if (test_bit(This->ffbits, FF_FRICTION)) { + if (test_bit(This->joydev->ffbits, FF_FRICTION)) { IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Friction); (*lpCallback)(&dei, pvRef); } diff --git a/keyboard.c b/keyboard.c index 9640db9..2cd9314 100644 --- a/keyboard.c +++ b/keyboard.c @@ -186,10 +186,10 @@ static void fill_keyboard_dideviceinstan memcpy(lpddi, &ddi, (dwSize < sizeof(ddi) ? dwSize : sizeof(ddi))); } -static BOOL keyboarddev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) +static int keyboarddev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) { if (id != 0) - return FALSE; + return -1; if ((dwDevType == 0) || ((dwDevType == DIDEVTYPE_KEYBOARD) && (version < 0x0800)) || @@ -204,10 +204,10 @@ static BOOL keyboarddev_enum_deviceA(DWO return FALSE; } -static BOOL keyboarddev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) +static int keyboarddev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) { if (id != 0) - return FALSE; + return -1; if ((dwDevType == 0) || ((dwDevType == DIDEVTYPE_KEYBOARD) && (version < 0x0800)) || diff --git a/mouse.c b/mouse.c index 8bd395e..f313b10 100644 --- a/mouse.c +++ b/mouse.c @@ -202,10 +202,10 @@ static void fill_mouse_dideviceinstanceW memcpy(lpddi, &ddi, (dwSize < sizeof(ddi) ? dwSize : sizeof(ddi))); } -static BOOL mousedev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) +static int mousedev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) { if (id != 0) - return FALSE; + return -1; if ((dwDevType == 0) || ((dwDevType == DIDEVTYPE_MOUSE) && (version < 0x0800)) || @@ -220,10 +220,10 @@ static BOOL mousedev_enum_deviceA(DWORD return FALSE; } -static BOOL mousedev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) +static int mousedev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) { if (id != 0) - return FALSE; + return -1; if ((dwDevType == 0) || ((dwDevType == DIDEVTYPE_MOUSE) && (version < 0x0800)) ||

1 0

Re: wininet file scheme
by Mike McCormack 19 Jun '06

19 Jun '06

Nick Cronin wrote: > unlike http:// etc, file:/// has 3 slashes, this patch removes the third > slash. Could you provide a test case for this please? Specifically, is "http:///foo.bar" different to "http://foo.bar"? Your code treats them equally. How about "file:///" and "file://"? Mike

3 2

Re: Allow 'wine foo.exe' to work when foo.exe is a symlink
by Jesse Allen 19 Jun '06

19 Jun '06

On 6/18/06, Dan Kegel <dank(a)kegel.com> wrote: > Currently, when I install a Windows app on Ubuntu, > the apps don't show up in the system menus. > I'm doing a demo of Wine for a users' group in a few > days, so I thought "How would the average user deal with this?" > Probably they'd navigate down to the directory > where the app was installed, make a shortcut to the app, > and drag the shortcut to the desktop. So I tried > that -- and it didn't work. But it does work if I apply > the following trivial patch, which just uses readlink() to find the > target of the shortcut. I didn't really analyze the > code, just slammed the readlink in there, and was happy to > see it worked. > > Changelog: > kernel/process.c: if argv[1] is a symlink, use its target > > process.c | 14 ++++++++++++-- > 1 file changed, 12 insertions(+), 2 deletions(-) > > >From my own playing around with the issue, I believe I understand why you are making this change for shortcuts. I do have to state, that with this change, it will break the method using symlinks to pass the exe check on blizzard games logging into battle.net. It will also break my workaround for an app that expands its program path funny (symlinking again). However, you can still use a hard link to do the same thing so there's nothing wrong with this change happening. Now I have to go tell everyone to use a hard link instead. :)

1 0

Forcing Wine process to use a specific IP address
by Keshav Attrey 18 Jun '06

18 Jun '06

I want to make a process running under Wine believe that its machine's IP address is whatever IP address I specify. More specifically: I have set up several virtual interfaces on my machine. When I run a process under Wine, it by default uses the actual IP address of the machine, which is normal. But I want to force the process to be able to see and use only the virtual IP address that I specify, and not the real IP address of the machine. Do you have any ideas on how to do this? I have been trying to go through the Wine source code, and have been looking in socket.c and iphlpapi_main.c, but I have not been able to find the right places to change to force Wine to use only one particular IP address. The big idea is to run many copies of a Windows app on the same machine and make each copy think that it is running on a separate machine, each with its own IP address. Although VMWare or QEMU would make this possible, Wine is so much lighter that I could have many more copies of Wine running than VMWare. I imagine Wine would also be lighter than using Wine over Linux VServer or FreeBSD Jail... but I'm not quite sure. Any ideas? Thanks, Keshav

1 0

re: how to debug a segfault in wine-preloader?
by Dan Kegel 18 Jun '06

18 Jun '06

paul wrote: > when i run the result with wine, i get a segfault long before control > has been transferred to my code. it appears to be in wine-preloader > i cannot see how to debug this without endless printf's Don't pooh-pooh print statements as a debugging technique. It's like the duct tape of the debugging world. wine-preloader is a special environment, though; you'll have to use wld_printf rather than normal printf. - Dan

1 0

acad 2004 license file bug
by Jaap Stolk 18 Jun '06

18 Jun '06

Hi, I'm new to wine, but I have used the wine source in the past as "unofficial" windows api documentation, to write decompilers etc. I would like to thank all the developers, I'm very impressed! I'm trying to install/run autocad 2004, or at least see where possible problems are. I first uninstalled the old rpm wine package in redhat, then I compiled from CVS and it al worked (apart from the waring about freetype not being detected) Compiling took almost 1.5 hours on an AMD Athlon 1200 Mhz 640Mb. The autocad installer indicated that I needed internet explorer 6.0, so I installed that using winetools. (can wine fake internet explorer, so i don't need to install the real thing?) The winetools RPM failed because i installed wine from CVS, so i installed winetools from source. winetools failed to detect my existing ~/.wine/drive_c/ and it seems to have overwritten everything i had in there. :-( anyway, the autocad installer now complains that the licence file could not be found, but this bug report indicates that this problem is supposed to be fixed: http://bugs.winehq.org/show_bug.cgi?id=3226 is it possible that it's fixed but the patch is not yet in CVS ? Should I try the suggested "fix": copy the bin/acadfeui/eula directory from the cd-rom to the c:\ root ? I would like to avoid native software if at all possible (like native MSI), and rather fix wine instead. Linux 2.4.20, RedHat 9, GCC 3.2.2, CVS 1.11.2, Wine 0.9.14 (today's cvs) Jaap.

4 8

Dogfood report: Firefox autoupdate works
by Dan Kegel 18 Jun '06

18 Jun '06

Windows Firefox just happily updated itself under Wine to 1.5.0.3. Nice that an uncommon code path worked fine. Firefox is solid for my uses lately. Performance could use some work (reading the wine-devel archive index gets annoying towards the end of the month when it's long, as firefox takes a long time to fetch it (?)). - Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

8 16

Re: Add support for full screen window state using the NETWM protocol
by Mike Hearn 17 Jun '06

17 Jun '06

On Fri, 16 Jun 2006 18:24:34 +0900, Dmitry Timoshkov wrote: > Hello, > > this patch works for me with Internet Explorer and Diablo II demo. I think for full IE support we need more; if you start IE, set it to fullscreen then quit and restart it the window will now be created unmanaged. Or at least this is how it used to work. Still this is fine for the usual case of having it temporarily full screen. It is most instructive to compare this with my own patch. I can see how you have simplified some of the logic there. So, thankyou for that. thanks -mike

2 1

Re: [PATCH 1/3] user: extend conformance test for remote-menu accesses
by Dmitry Timoshkov 17 Jun '06

17 Jun '06

<tkho(a)ucla.edu> wrote: > + ok (CreateProcess(NULL, "notepad.exe", NULL, NULL, FALSE, 0, NULL, NULL, > + &si, &pi), > + "CreateProcess error=%ld\n", GetLastError()); > + > + while (elapsed < timeout) > + { > + Sleep(50); > + elapsed += 50; > + > + hNotepad = GetForegroundWindow(); > + if (!hNotepad) > + continue; > + if (GetWindowText(hNotepad, wndTitle, 30) == 0) > + continue; > + if (strstr(wndTitle, "Notepad")) > + break; > + } WaitForInputIdle is supposed to be used instead of the while loop above. -- Dmitry.

1 0

Build on kubuntu 6.06,amd_64 works
by David Anderson 16 Jun '06

16 Jun '06

AMD_64 cpu, Kubuntu 6.06 (Dapper Drake), on HP laptop. I finally got around to finishing a build, with current cvs sources. First one must install the necessary libraries: Finding the correct set may take a few minutes and several tries. configure will find several omissions, but a few will only be noticed by the 'make' steps. # The following is links that the library install does not make: # Do this by hand, it won't work as a script as written. sudo sh cd /usr/lib32 ln -s libX11.so.6 libX11.so ln -s libXext.so.6 libXext.so LDFLAGS="-L/lib32 -L/usr/lib32 -Wl,-rpath,/lib32 -Wl,-rpath,/usr/lib32" \ ./configure make depend make all sudo make install If all needed libraries are present there will be no missing-library warnings or errors anywhere. wine seems to work (installed in /usr/local) Hope this is of some interest. David Anderson

3 2

Re: [WINED3D 7/7] Fix lookup for LOOP register
by Ivan Gyurdiev 16 Jun '06

16 Jun '06

Jason Green wrote: > - The LOOP register is an extended register and wasn't being checked > for in the current code. This moves the check up a level and checks > against the instruction code which is more efficient anyway. It's important to also correct the reason why it wasn't being detected where it was - instead of using the REGTYPE mask, we should call the shader_get_regtype function, which takes into account extended registers.

1 0

MS-Announced: Bill Gates will transition out of a day-to-day role in the company
by Detlef Riekenberg 16 Jun '06

16 Jun '06

15. June 2006: --- quote --- Microsoft Corp. today announced that effective July 2008 Bill Gates, chairman, will transition out of a day-to-day role in the company --- quote --- http://www.microsoft.com/presspass/press/2006/jun06/06-15CorpNewsPR.mspx Just for info. -- By By ... ... Detlef

1 0

Re: [dbghelp] improve dwarf support
by Eric Pouech 16 Jun '06

16 Jun '06

2006/6/16, Raphael <fenix(a)club-internet.fr>: > > Hi, > > Changelog: > - map lines section > - better robustness > - support of unamed syms > - better traces > - ref hash table to stabilize model > > TODO: > - find a clean way to handle forward declarations (some assertions can > happen) > - debug lines parsing I did (in parallel) some work on the dwarf2 support. I have 20+ patches to make it really work. Those patches bring : - type support, including forward declarations (which really requires a two pass parser, hence a major rewrite of the code) - function's variables & parameter support - line information is ok (except for inlined functions) - a couple of bug fixes from current code I'd suggest hence not to apply this patch and to wait for the full solution (likely sometimes this week-end). -- Eric Pouech

2 1

slight modification to debug issue
by Paul Davis 16 Jun '06

16 Jun '06

seg fault is in wine-pthread, not wine-preloader, which is even tougher - two exec boundaries to cross.

3 2

Re:gdiplus.dll
by Vijay Kiran Kamuju 16 Jun '06

16 Jun '06

Hi, I think we rather use mono project's libgdiplus(gdiplus.dll implementation) than a stub implementation. This will help in later implementing the .Net Compatibility Layer to Wine. Thanks, Vijay

3 5

Re: Added initial version of OleView (part 1/8)
by Piotr Caban 16 Jun '06

16 Jun '06

Is there anything wrong with my patches?

1 0

Re: setupapi.dll: partially implement SetupDiGetClassDevsExA
by Mike McCormack 16 Jun '06

16 Jun '06

Christian Gmeiner wrote: > Partially implement SetupDiGetClassDevsExA. This patch bases on reactos > setupapi.dll. Don't be suprised if your patch isn't accepted. ReactOS is considered a dirty reverse engineering project by many, and Alexandre has rejected patches using their code before. The fact that some developers work both on tinykrnl (a self-admitted 'dirty' reverse engineering effort) and ReactOS at the same time should be enough to show you that they're walking close to, or maybe over the fine line. Please don't post ReactOS code to wine-patches again. Mike

7 26

Shell integration
by Mikołaj Zalewski 16 Jun '06

16 Jun '06

I've changed the code not to use COM. Now it loads a DLL and searches for a GetIntegrationObject entry point. That function returns structures with a pointer to the ops structure. This is similar to how GDI objects are implemented. One could also export all the function from the DLL and build the ops structs on the client side (like it is done in GDI/User drivers) but that would require more code to be written and make it harder to forward all the unhandler objects from e.g. the kde driver to the freedesktop driver - we would need to add entry point forwarding every time we add a new functions to the freedesktop driver. Is this approach good? Mikolaj Zalewski

4 4

Re: [uxtheme] Added test for IsAppThemed and grouped it with IsThemeActive
by Alexandre Julliard 16 Jun '06

16 Jun '06

Paul Vriens <Paul.Vriens(a)xs4all.nl> writes: > + SetLastError(0xdeadbeef); > + bAppThemed = pIsAppThemed(); > + todo_wine > + { > + ok( bAppThemed == FALSE, "Expected FALSE as this test executable is not (yet) themed.\n"); > + ok( GetLastError() == S_OK, > + "Expected S_OK, got 0x%08lx\n", > + GetLastError()); > + } This won't work right if theming is disabled, since IsAppThemed returns FALSE in that case. Also note that GetLastError doesn't return an HRESULT, so ERROR_SUCCESS is a better name than S_OK. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: PATCH: sane.ds / DECLSPEC hidden
by Alexandre Julliard 16 Jun '06

16 Jun '06

Marcus Meissner <marcus(a)jet.franken.de> writes: > Hi, > > Alexandre, is this how to reduce exports? ;) No, that's only hiding them. It's not a bad thing to do in a second step for functions that really need to be global, but the first step should be to make functions static as much as possible. If we need to have a lot of global functions, it's a sign that the code is not split into files along logical boundaries. -- Alexandre Julliard julliard(a)winehq.org

3 6

Broken FC5 packages - stay clear.
by Vitaliy Margolen 16 Jun '06

16 Jun '06

It seems that FC5 packager created a broken Wine distribution. Instead of being 1-3 packages it's 15 (from what user told me on #winehq. And it doesn't work at all: "Application tried to create a window, but no driver could be loaded." Which tells me it's compiled without X headers. I didn't even new Wine could compile without X, since we don't have tty driver. Vitaliy

9 23

Re: add stub for Direct3DShaderValidatorCreate9 (d3d9)
by Dmitry Timoshkov 16 Jun '06

16 Jun '06

"Louis. Lenders" <xerox_xerox2000(a)yahoo.co.uk> wrote: > It's not really possible to test this function on windows , but > i think this is quite a good guess for the function's prototype. > I've tested with quite some samples from www.codesampler.com. Other > implementations make the samples crash . > > (http://www.codesampler.com/source/dx9_cg_simple.zip is an example > of an app that calls this function) You're must be doing something not usual, but the .exe pointed out above doesn't contain Direct3DShaderValidatorCreate9 in its imports. -- Dmitry.

1 0

Re: Remove an assert in StgStreamImpl_Write()
by Robert Shearman 16 Jun '06

16 Jun '06

Francois Gouget wrote: > > Changelog: > > * dlls/ole32/stg_stream.c > > Aric Stewart <aric(a)codeweavers.com> > Remove an assert and instead just fail. > This allows iTunes to finish installing with the reboot. > A better fix would be to check the result of IStream_SetSize in this function, although I think the original problem may well be fixed after the STG_E_REVERTED checks. -- Rob Shearman

2 1

Re: Quartz: Improve a stub
by Robert Shearman 16 Jun '06

16 Jun '06

ivanleo(a)gmail.com wrote: > It looks like someone was implementing some stuff and left it half way > through, That was me. I didn't have any documentation on how the extensions processing was meant to work. > so the result is GetClassMediaFile was hard coded to fail > because process_extensions always fails. Err, no. Did you read the code? The fallback is the more common method of recognising a byte sequence at the start of the file. > This patch is needed by the > IAMMultiMediaStreamImpl_OpenFile which will follow. The two together > allow Crimson Skies to start and get to the menu instead of crashing. >--- winenew/dlls/quartz/filesource.c 2006-05-23 13:48:29.000000000 +0100 >+++ wine/dlls/quartz/filesource.c 2006-06-15 22:50:40.000000000 +0100 >@@ -65,7 +65,10 @@ > static HRESULT process_extensions(HKEY hkeyExtensions, LPCOLESTR pszFileName, GUID * majorType, GUID * minorType) > { > /* FIXME: implement */ >- return E_NOTIMPL; >+ >+ FIXME("(%p, %s, %p, %p), stub!\n", hkeyExtensions, debugstr_w(pszFileName), majorType, minorType); >+ >+ return S_OK; > } > > Great. Now majorType and minorType will be left uninitialised, causing weird and hard-to-debug problems later on. -- Rob Shearman

1 0

wined3d compile failure
by James Hawkins 16 Jun '06

16 Jun '06

Hi, I'm getting this compile failure as of today: make[2]: Entering directory `/home/jhawkins/wine/dlls/wined3d' gcc -c -I. -I. -I../../include -I../../include -I/usr/X11R6/include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -gstabs+ -Wpointer-arith -g -O2 -o device.o device.c device.c: In function `IWineD3DDeviceImpl_SetRenderState': device.c:3833: `GL_FOG_COORD_SRC' undeclared (first use in this function) device.c:3833: (Each undeclared identifier is reported only once device.c:3833: for each function it appears in.) device.c:3873: `GL_FOG_COORD' undeclared (first use in this function) make[2]: *** [device.o] Error 1 make[2]: Leaving directory `/home/jhawkins/wine/dlls/wined3d' make[1]: *** [wined3d] Error 2 make[1]: Leaving directory `/home/jhawkins/wine/dlls' make: *** [dlls] Error 2 -- James Hawkins

4 4

how to debug a segfault in wine-preloader?
by Paul Davis 16 Jun '06

16 Jun '06

i am building ardour (http://ardour.org) as a win32 executable to allow us to continue using win32 DLL's as plugins. when i run the result with wine, i get a segfault long before control has been transferred to my code. it appears to be in wine-preloader (based on what "file core.NNNN" says). i cannot see how to debug this without endless printf's - wine-preloader appears to need wine to run before it, and gdb cannot cross exec boundaries. any hints on how to debug this sort of issue? btw, wine in general works fine, of course. --p

1 0

Re: Will pay $$ for fix of Magic: The Gathering Online bug
by Kyle Winkler 16 Jun '06

16 Jun '06

---------- Forwarded message ---------- From: Kyle Winkler <kylewinkler(a)gmail.com> Date: Jun 15, 2006 6:47 PM Subject: Re: Will pay $$ for fix of Magic: The Gathering Online bug To: EA Durbin <ead1234(a)hotmail.com> I'm currently using Kanotix 2005.04, 32 bit. However, according to my own experience and the info on wine's bug list (its bug 5404), this problem is universal to all distros. On 6/15/06, EA Durbin <ead1234(a)hotmail.com> wrote: > > > >On 6/14/06, Mike McCormack <mike(a)codeweavers.com> wrote: > >>hehe. If you're compiling Wine yourself, do I get $200 for telling you > >>to install the latest version of Fontforge, and make sure recent > >>freetype libraries are on your system? > > Which distro are you using, and is it 64 bit or 32 bit? > > I ran in to a similar problem on my 64 bit gentoo box. If you have 64 bit > linux make sure you copy freetype over to a directory containing your 32 > compatibility libraries. > > cp /usr/lib/libfreetype.* /emul/linux/x86/usr/lib/ > > ./configure --x-libraries=/emul/linux/x86/usr/lib ; make clean ; make > depend > ; make > > > > >

1 0

Will pay $$ for fix of Magic: The Gathering Online bug
by Kyle Winkler 15 Jun '06

15 Jun '06

Currently, Magic: the Gathering Online almost works, except that the fonts are either absent or illegible. I am willing the pay US $200 (via PayPal) for this bug to be fixed. If any of you are willing to give it a try, let me know. I will pay up front.

4 5

Re: secur32: Implement QueryContextAttributes. Add tests. cbMaxToken is 1904 not 2010.
by Kai Blin 15 Jun '06

15 Jun '06

* Kai Blin <kai.blin(a)gmail.com> [15/06/06, 20:50:47]: Please disregard this patch. I sent this out to wine-patches by accident. It still has some errors. > + case SECPKG_ATTR_LOCAL_CRED: > + TRACE("MSDN claims SECPKG_ATTR_LOCAL_CRED is obsolete\n"); > + /* fall through */ > + case SECPKG_ATTR_LOCAL_CERT_CONTEXT: > + FIXME("SECPKG_ATTR_LOCAL_CERT_CONTEXT.stub\n"); > + break; > + case SECPKG_ATTR_ROOT_STORE: > + FIXME("SECPKG_ATTR_ROOT_STORE stub\n"); > + break; Those only exist for SCHANNEL, not NTLM. > + case SECPKG_ATTR_SIZES: > + { > + PSecPkgContext_Sizes spcs = > + SECUR32_ALLOC(sizeof(SecPkgContext_Sizes)); > + spcs->cbMaxToken = NTLM_MAX_BUF; > + spcs->cbMaxSignature = 16; > + spcs->cbBlockSize = 1; > + spcs->cbSecurityTrailer = 16; > + pBuffer = spcs; > + return SEC_E_OK; > + } This doesn't seem to set pBuffer to spcs. What did I miss here? > + switch(sec_pkg_name) > + { > + case "NTLM": This doesn't work, of course. -- Kai Blin, (blin at gmx dot net) "Let us condemn to hellfire all those who disagree with us." -- militant religionists everywhere

2 1

Re: Re: [WineD3D] fix bug 4872
by fenix＠club-internet.fr 15 Jun '06

15 Jun '06

----Message d'origine---- >Date: Wed, 14 Jun 2006 22:03:58 -0600 >De: Vitaliy Margolen <wine-devel(a)kievinfo.com> >A: Raphael <fenix(a)club-internet.fr> >Copie à: wine-devel(a)winehq.org >Sujet: Re: [WineD3D] fix bug 4872 > >Wednesday, June 14, 2006, 6:51:21 PM, Raphael wrote: >> On Thursday 15 June 2006 02:34, Raphael wrote: >>> Hi, >>> >>> first patch since a long time :) >>> >>> Changelog: >>> - rename WineD3D_(Create|Release)FakeGLContext to WineD3D_(Create| >>> Release)FakeGLContextOnNeed >>> - and if a GL context is already active (and was not a fake context) >>> returns simili fake context with current GL context infos >>> - cleanup not more needed checks >>> >>> fix #4872: make IWineD3DImpl_CheckDeviceType working if a GL context is >>> already active >>> >>> Regards, >>> Raphael > >> Use this patch instead, i let some stupid (and buggy) debug code > >> Regards, >> Raphael > >I think I counted at least 5 indentation stiles in your patch. I understand >staying consistent with the code's style and using your own stile. But 5?! No i only see two problems, and made by use of xemacs (as i have broken my kate install). Anyway i plan to cleanup code in file in a next patch See http://marc.theaimsgroup.com/?l=wine-patches&m=115033272215006&w=2 >> } >You forgot LEAVE_GL(); NO, LEAVE_GL() is done on ReleaseFakeGLContextOnNeed. to permit between two calls to can make X/GLX calls safely >> + case WINED3DFMT_A4R4G4B4: >> + if (4 == rb && 4 == gb && 4 == bb && 4 == ab) return TRUE; >> + break; >Has nothing to do with context. ?? >> + case WINED3DFMT_A8: >> + if (8 == ab) return TRUE; >> + break; >Same here ?? >> if (Adapter >= IWineD3D_GetAdapterCount(iface)) { >> - TRACE("(%p) Failed: Atapter (%u) higher than supported adapters (%u) returning WINED3DERR_INVALIDCALL\n", This, Adapter, IWineD3D_GetAdapterCount(iface)); >> + TRACE_(d3d_caps)("[FAILED: Atapter (%u) higher than supported adapters (%u)]\n", Adapter, IWineD3D_GetAdapterCount(iface)); >> return WINED3DERR_INVALIDCALL; >> } >This one as well. And I haven't seen any traces so far that used square >brackets. Now we will! Have you ever seen D3D traces ? I only made same as IWineD3DImpl_CheckDeviceFormat (for coherency) see http://source.winehq.org/source/dlls/wined3d/directx.c#L1425 Anyway displaying [OK] or [FAILED] for checks results seems a good idea (and easy to find in logs) > >Vitaliy Margolen Regards, Raphael PS: before many complains, my ISP webmail is buggy, sorry :)

5 4

Re: comctl32: Add a short test for the listview.
by Detlef Riekenberg 15 Jun '06

15 Jun '06

Am Donnerstag, den 15.06.2006, 17:30 +0900 schrieb Mike McCormack: > + * License along with this library; if not, write to the Free > Software > + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA > 02111-1307 The old Address slipped in. -- By By ... ... Detlef

1 0

Re: Alexandre Julliard : winedbg: Avoid a crash when there' s no backtrace to print.
by Eric Pouech 15 Jun '06

15 Jun '06

Alexandre Julliard wrote: >Module: wine >Branch: refs/heads/master >Commit: d47dcbf05a0159a87234ac6e41ae011150019f09 >URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d47dcbf05a0159a87234ac6… > >Author: Alexandre Julliard <julliard(a)winehq.org> >Date: Thu Jun 15 11:38:43 2006 +0200 > >winedbg: Avoid a crash when there's no backtrace to print. > > I wonder if it's the right fix. It would be better in the case where we cannot fetch any frame to set a dummy frame from current registers (even if the frame isn't 100% valid) A+

1 0

Re: msi: Cast the total memory to an unsigned int to avoid overflow in machines with more than 2Gb of RAM [resend]
by Alexandre Julliard 15 Jun '06

15 Jun '06

"James Hawkins" <truiken(a)gmail.com> writes: > Is there anything wrong with this patch? I have a machine with 3gb of > ram and a lot of installers complain that I don't have enough memory. > 3gb should certainly satisfy a 32mb condition, but we return "-1303" > etc. The existing code should work fine, and yours will return 0 for a 4Gb box... It sounds like the problem is in GlobalMemoryStatusEx. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: configure: Fix test for ability to link with ICU libraries.
by Alexandre Julliard 15 Jun '06

15 Jun '06

Scott Bambrough <scottb(a)xandros.com> writes: > In the worst case this code will run through 9 tests searching for the > ICU library. In the default case (no environment variables set) it > will run through 4 tests at worst before giving up. > > In your case, (assuming you have libicuuc.so and libicudata.so in > /usr/lib) it will take two tests, as the code will test in > /usr/local/lib first. In the unpatched version it would have taken 1 > test. In my case it takes 4 tests. I'm not so worried about the number of tests, but about the complexity of the code. You are turning a simple 10-line check in a 90-line monster, that's really too much for such an obscure feature that pretty much nobody uses. I'd suggest something along these lines: for i in ${ICU_LIB_DIR-/usr/lib}/libicu \ ${ICU_LIB_DIR-/usr/lib}/libsicu do LIBS="${i}uc.a ${i}data.a $LIBS" AC_TRY_LINK etc. done You can add /usr/local/lib to the mix if you like, but I don't think that's really necessary. -- Alexandre Julliard julliard(a)winehq.org

1 0

Parallels Virtualization Software does not work with Wine
by Benjamin Arai 15 Jun '06

15 Jun '06

Hi, Just a quick note to any body using VMware or the like for testing Wine, as of Parallels version 2.1 Wine would not run under any guest operating system that I tested (in all cases Wine caused a segmentation fault upon starting). I was using Parallels (Host: Windows XP, Guest: Centos OS 4.3, Ubuntu 6.06, and Fedora Core 5), none worked in Parallels and all worked running native. I am pretty sure this is not a Wine problem, I think it is a trapping issue on Parallels side. Benjamin Arai me(a)benjaminarai.com http://www.benjaminarai.com <http://www.benjaminarai.com/>

1 0

Re: wineuser.h [do NOT apply]
by Vitaly Lipatov 15 Jun '06

15 Jun '06

Sorry for incompetence, please do not aplly it. В сообщении от 15 июня 2006 20:17 Vitaly Lipatov написал(a): > Changelog > Add some WM_ message defines. -- Vitaly Lipatov, ALT Linux Team Russia, Saint-Petersburg, www.etersoft.ru

1 0

Re: [Bug 5409] ie6setup fails with "The download location information is damaged"
by Peter Åstrand 15 Jun '06

15 Jun '06

On Tue, 13 Jun 2006, Wine Bugs wrote: > http://bugs.winehq.org/show_bug.cgi?id=5409 > truiken(a)gmail.com changed: > > What |Removed |Added > ---------------------------------------------------------------------------- > Status|UNCONFIRMED |RESOLVED > Resolution| |DUPLICATE Since you obviously doesn't believe this is a bug, let's take this discussion on the devel list, instead of ping-ponging between RESOLVED/REOPENED. > ------- Additional Comments From truiken(a)gmail.com 2006-13-06 03:21 ------- > Either way, the bug is: wine does not provide inseng.dll, which ie6setup.exe > requires. You don't need to tell me that over and over; I did understand the first time. But again, I *have* installed inseng.dll. I've tried the same version that comes with the IE download package. I've tried the version from Windows XP. I've tried the version from Windows 2000. I've also registered the DLL with: $ wine regsvr32 inseng.dll which gave me: "Successfully registered DLL inseng.dll" So I have a hard time believing that inseng.dll is the cause of my problems. > If you're having problems with native dlls, that's not wine's bug. Strange comment. > Marking as a duplicate, but it really should be invalid, worksforme, etc. If you don't think this is a duplicate, why mark it as that? > *** This bug has been marked as a duplicate of 1293 *** I don't believe this is a duplicate of 1293. A comment on that bug says, which you have written yourself, says: "ie6setup.exe claims that it can't download the setup files because inseng.dll is not registered." Again, it doesn't look like this is my problem. Also, the error message is different. Regards, -- Peter Åstrand ThinLinc Chief Developer Cendio http://www.cendio.se Teknikringen 3 583 30 Linköping Phone: +46-13-21 46 00

2 1

Re: [WineD3D] fix bug 4872
by Raphael 15 Jun '06

15 Jun '06

On Thursday 15 June 2006 02:34, Raphael wrote: > Hi, > > first patch since a long time :) > > Changelog: > - rename WineD3D_(Create|Release)FakeGLContext to WineD3D_(Create| > Release)FakeGLContextOnNeed > - and if a GL context is already active (and was not a fake context) > returns simili fake context with current GL context infos > - cleanup not more needed checks > > fix #4872: make IWineD3DImpl_CheckDeviceType working if a GL context is > already active > > Regards, > Raphael Use this patch instead, i let some stupid (and buggy) debug code Regards, Raphael

2 1

More evidence Wine is important...
by Dan Kegel 14 Jun '06

14 Jun '06

http://whatjapanthinks.com/2006/06/15/over-a-third-of-japanese-engineers-wo… is one more survey showing that users who don't want to switch to Linux base their opinion primarily on a perceived lack of apps on linux.

1 0

Wine on ppc/linux.
by Mike Mestnik 14 Jun '06

14 Jun '06

I'm trying/working to get x86 windows programs to run under linux on a ppc and eventualy a sparc. After reading the Darwine list, I'm not sure where the best place for this. Will the current move by Apple to x86 hardware replace this project? What about alpha, ARM, MIPS and sparc? -- /**************************************************************** * Mike Mestnik: Junior Admin 612-395-8932 * * mmestnik(a)visi.com VISI/Digital North * ****************************************************************/ Alt address: collections(a)spam.visi.com

3 3

Re: configure: Fix test for ability to link with ICU libraries.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Scott Bambrough <scottb(a)xandros.com> writes: > @@ -603,8 +603,8 @@ if test "$ac_cv_header_unicode_ubidi_h" > then > saved_libs="$LIBS" > ICU_LIB_DIR="${ICU_LIB_DIR-/usr/lib}" > - ICUUC_LIB="${ICUUC_LIB-$ICU_LIB_DIR/libsicuuc.a}" > - ICUDATA_LIB="${ICUDATA_LIB-$ICU_LIB_DIR/libsicudata.a}" > + ICUUC_LIB="${ICUUC_LIB-$ICU_LIB_DIR/libicuuc.a}" > + ICUDATA_LIB="${ICUDATA_LIB-$ICU_LIB_DIR/libicudata.a}" The libraries have different names on different setups, that's why there are environment variables you can set. If you want a better fix you need to make configure probe for the various names. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [Setuapi] implement SetupDiCreateDeviceInfoListExW - try 3
by Juan Lang 14 Jun '06

14 Jun '06

Hi Christian, > I want to make a generic setupapi.dll and I will remove old serial > device list, but as too big patches wont get accepted, I will do this in > one of my next patches. I put that hacky serial device list in there. I don't actually use the app that fixed under Wine, as 1) Wine's serial code never worked for the app, and 2) I no longer have the device it used. So, I don't know if that'll convince AJ or not, but I'm fine with you axing it. Leaving half-working code in there is more likely to get rejected than a big patch, IMO, so I'd suggest you remove it. --Juan __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

2 1

Duplicate message by configure
by Gerald Pfeifer 14 Jun '06

14 Jun '06

Disclaimer: I am aware that the system I tested this on is lacking a required library, this is not what I'm trying to describe. When running configure, I get the following message twice: checking for xmlParseMemory in -lxml2... yes checking for xmlReadMemory in -lxml2... yes Package libxslt was not found in the pkg-config search path. Perhaps you should add the directory containing `libxslt.pc' to the PKG_CONFIG_PATH environment variable No package 'libxslt' found -> Package libxslt was not found in the pkg-config search path. -> Perhaps you should add the directory containing `libxslt.pc' -> to the PKG_CONFIG_PATH environment variable -> No package 'libxslt' found checking for libxslt/pattern.h... no checking for libxslt/transform.h... no Where does this come from? Can we fix this somehow? Gerald

2 1

How are we doing?
by Mike Hearn 14 Jun '06

14 Jun '06

As the Summer Of Code begins and new blood joins us all at once, I thought it'd be a good time to open a discussion on how we are doing as a project. Questions to consider: * Is Wine improving or is the regression rate matching the improvement rate? * Are we producing a quality product, from the perspective of non-technical end users? (I appreciate this isn't a goal for everyone) * Are we turning away potential developers for any reason? Could we do more to attract new hackers? * Are the projects fundamental processes serving us well? * Any other thoughts for improvement? In case it's not clear, I'm talking about the project as a community adventure here rather than technical aspects of the codebase. >From my own perspective I think Wine is doing better than ever before. What prompted this email is the realisation that in the past few days I've used Wine nearly every day to run a variety of apps - from games to utilities - and it's succeeded with every single one. Not always perfect but always good enough. I am no longer surprised when Wine runs an app correctly as I was when I first came to the project, these days I nearly take it for granted. Though this may be due to having developed a feel for what will work and what won't :) So clearly we're doing something right ... I also think we are doing OK with attracting and keeping new hackers. The influx of new Direct3D talent lately is fabulous for instance. The experiences of our SoC students will be useful in assessing how to improve the learning curve and we need to tap this resource better than we did last year. In other words, I think we're doing pretty well. I feel more positive about the project that I have done for a long time. It seems like as Win32 stagnated and slowed down over the past 6 years we've been able to turn the tide and add our own code faster than Microsoft can, which is the tipping point. So areas for improvement? * We seem to be doing very well in recruiting hackers who work on one particular DLL or area and solidly improve that, but a less well when it comes to 'general purpose' hackers who just take random apps and make them work. It might just be that I'm out of touch but I don't see as much patch traffic these days along the lines of "This patch set fixes XYZ app" followed by 6 patches to 6 different DLLs. Discussion on IRC/wine-devel is * No clear roadmap to 1.0 - for 0.9 we had Dimis TODO list and it was quite satisfying to see them go green as tasks were completed. I guess we have a 1.0 TODO list too but I never see any updates to it :( * Integration with other projects is still a weak area. Desktop/kernel/X integration could all use some work. I know I know, I'm guilty in not doing my bit here too .... maybe I will find my hack-fu returning sometime soon and work on the fullscreen patch again :) * App specific patches. Well I don't expect policy here to change anytime soon but extreme cases like the WoW VMA layout problem which affects tons of users do highlight the issue. * A few random things I already got into arguments about (forums, libwine api etc) :) What do you guys think? thanks -mike

34 69

Re: msvcrt[2/3]: add initial tests for dlls/msvcrt/data.c [try 2]
by Uwe Bonnes 14 Jun '06

14 Jun '06

>>>>> "Andrew" == Andrew Ziem <ahziem1(a)mailbolt.com> writes: Andrew> because tests yield inconsistent results */ +#if 0 + /* address #if 0 in a patch is depreciated. If the test fails on wine, butt succeeds in windows, use todo_wine(). If there are other conditions that must be met, tell these conditions, perhaps like #define SOME_SPECIAL_TEST 0 #ifdef SOME_SPECIAL_TEST so that others can decipher what you mean. Bye -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

3 2

Re: [Setuapi] implement SetupDiCreateDeviceInfoListExW - try 3
by Detlef Riekenberg 14 Jun '06

14 Jun '06

Hi Christian Gmeiner: > Sorry for the new version, but i got rid of the whitspace stuff and also > added a check if Reserved != NULL. > > I hope that this patch is ready to commit now. + if (MachineName != NULL) + { + FIXME("remote support is not implemented"); + goto cleanup; + } A failure should always set an error. You should add a test for this in the testsuite. (winspool as example uses an empty servername the same way as NULL). For external Servers, ERROR_ACCESS_DENIED is a very common Result. + if (Reserved != NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + goto cleanup; + } Same here. This is simple to test in the testsuite. - SerialPortList *list = (SerialPortList *)devinfo; + struct DeviceInfoSet *list = (struct DeviceInfoSet *)devinfo; - if (list->magic == SETUP_SERIAL_PORT_MAGIC) + if (list->magic == SETUP_DEVICE_INFO_SET_MAGIC) { This is wrong. Read: static HDEVINFO SETUP_CreateSerialDeviceList(void) (line 904) --------------- In your test: + // create empty DeviceInfoList C++ comments are not allow (not supported by some compiler) + devlist = SetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, NULL); + + ok(devlist && devlist != INVALID_HANDLE_VALUE, "SetupDiCreateDeviceInfoListExW failed : %p %ld\n", devlist, GetLastError()); - You missed the "SetLastError(0xdeadbeef);" before the tested function. - The first Part of your "ok()" - message ("SetupDiCreateDeviceInfoListExW failed :") has no additional infos. When a test fails, you will already get: "__FILE__:__LINE__: Test failed:" You know the dll, file and line of the failing "ok()" - statement. Example: info.c:932: Test failed: returned 0 with 1801 (expected '!=0' or '0' with ERROR_INVALID_PARAMETER) You may want to look at my recent Tests / Implementations for GetPrintProcessorDirectory or AddMonitor/DeleteMonitor (winspool.drv), but do not use the macro "MAGIC_DEAD" in the tests (it works, but 0xdeadbeef has more advantages). As an Example, that we really need tests for every API-Function: The second Parameter of "DeleteMonitor" is ignored in all tested Windows-Versions. -- By By ... ... Detlef

2 1

Re: wine XShm problem on remote display
by Benjamin Fabricius 14 Jun '06

14 Jun '06

Am Dienstag, den 13.06.2006, 16:22 +0200 schrieb Alexandre Julliard: > Benjamin Fabricius <benjamin.fabricius(a)lawo.de> writes: > > > vst:/opt/fst # ./fst /mnt/testsuite/oberon4/Oberon-8.dll > > yo... lets see... > > The program 'fst.exe.so' received an X Window System error. > > This probably reflects a bug in the program. > > The error was 'BadAccess (attempt to access private resource denied)'. > > (Details: serial 114 error_code 10 request_code 144 minor_code 1) > > (Note to programmers: normally, X errors are reported asynchronously; > > that is, you will receive the error a while after causing it. > > To debug your program, run it with the --sync command line > > option to change this behavior. You can then get a meaningful > > backtrace from your debugger if you break on the gdk_x_error() > > function.) > > Wine will handle that error properly, but here it sounds like fst (or > more likely Gtk) has replaced the Wine error handler with its own, so > Wine doesn't get a chance to handle it. > thanks for the hint, isn't there a possibility in wine to turn of the use of the xshm extension globally? i read that there used to be wine.conf with [x11drv] ...... ; Use XFree86 DGA extension if present UseDGA = Y ; Use XShm extension if present UseXShm = Y ...... is there a mechanism to do this in my wine version (20050725) or current builds? or do you see a way different way to workaround this, i. e. to write an own error handler. i'm not to deep into the x matter though... thanks again bf -- ------------------- Benjamin Fabricius German Student Lawo AG

2 1

Re: Implement more GLSL instructions
by Ivan Gyurdiev 14 Jun '06

14 Jun '06

> As of this patch, Wine now supports more opcodes in GLSL than > ARB_vp/fp and we can handle many of the shader 2.0+ instructions not > available before. There are a few missing texture operations compared > to ARB still, and we're not properly handling textures for any shaders > <2.0, but that's true in ARB as well. Yes, the missing texture operations are kind of important, I think [ but they are valid in SM 1.x only ]. Other suggestions I have: - fix swizzle, make it work consistently across all instructions (see cmp). - may be a good idea to centralize casting in one place to avoid failures [ yes, I probably should have done that when adding casting in my patch :) - merge the rest of the SHADER_ARB code, and organize it the same as the SHADER_GLSL code (in arb_shader.c or something like that). Then go through and compare the two and make sure modifiers and other such things work the same way. ===== For 1.x texture support we could delay compilation until we know what kind of textures will be bound, and then recompile if textures change their dimensionality [ which hopefully they won't ].

1 0

One more shot at ntoskrl implementation
by Vitaliy Margolen 14 Jun '06

14 Jun '06

Here is last instalment of safedisc support in Wine. The major change from last version is the way user space talks to ntoskrnl. Now I'm passing the information through wineserver with a help of 4 server calls. There are still some areas that require work. I will appreciate any input that you guys might have about any part of this code. It's been on my lap for way too long. It would be really cool to finally get it in. PS: Diffed against 1d40bf0141b7f67b1188555962698f5dab631bc3. Need to run tools/make_reqwests. -- Best regards, Vitaliy

2 2

Re: msi: Add tests for MsiInstallProduct
by James Hawkins 13 Jun '06

13 Jun '06

On 6/12/06, James Hawkins <truiken(a)gmail.com> wrote: > Hi, > > Changelog: > * Add tests for MsiInstallProduct. > Ignore this patch for now. Eclipse changed necessary tabs to spaces, and I forgot to include module imports for Makefile.in. I'll resend it tonight. -- James Hawkins

1 0

Re: [Wine] Re: wine-0.9.15 & winetools problems.
by Rick Romero 13 Jun '06

13 Jun '06

On Tue, 2006-06-13 at 21:47 +0200, Peter Åstrand wrote: > On Tue, 13 Jun 2006, Jonathan Ernst wrote: > > > BTW, as I used to maintain this entry, > > If you consider yourself an inactive maintainer, perhaps you should let > someone else takeover? > > > > I updated it with current > > informations. I don't have time to test the runtime settings so I'd be > > glad if you could fill the missing part and send me the details so I'll > > update the entry http://appdb.winehq.org/appview.php?versionId=469 > > Thanks for the update. A few comments: > > * I think the reference to WineTools and Sidenet should be removed. Wine > version 20050725 is quite old. I think we should focus on having the > latest AppDb pages document the latest Wine, rather than old stuff. > > * The manual installation still doesn't work for me (see bug 5409 etc), > but let's get back to that. > > * I think it would be nice if you could include my command lines for > fetching & extracting inseng.dll, for those users without a Windows > installation nearby: > > $ wget http://download.microsoft.com/download/ie6sp1/finrel/6_sp1/W98NT42KMeXP/EN-… > $ cabextract -L IE_S5.CAB > $ cabextract -L -F inseng.dll ie_5.cab > $ rm -rf ~/.wine ie_5.cab IE_S5.CAB > $ wineprefixcreate > $ cp inseng.dll ~/.wine/drive_c/windows/system32/ > $ wget http://download.microsoft.com/download/ie6sp1/finrel/6_sp1/W98NT42KMeXP/EN-… > $ wine ie6setup.exe > Interestingly I _JUST_ decided to go through this myself on a raw wine install of .9.15 So I did the following (Some relate this Subject, some just FYI): 1. Ok, RPM installed. Now what? I need IE. 2. run winecfg, create new Wine install. (Icon says 'Add Application', thought it was for installing applications :/ ) Exit. 2. Read Install/Config HowTo http://www.winehq.org/site/howto 3. Follow link to appdb 4. type 'Internet Explorer' in search 5. Click Internet Explorer link 6. Click 6.0 7. Look confused for a moment, then scroll down far enough to see there's a HOWTO with a dark green background that's hard to see in Opera. 8. 'Install dll?' Screw that, follow link to IE6 at MS. 9. Download IE6SP1 ie6setup.exe 500k. 10. wine ie6setup.exe 11. Error. Go back to Appdb, get dll from link at dlldump.com 12. wine ie6setup.exe 13. Error. "The download location information is damaged" WTF? 14. Ok, maybe I should choose custom install.. Did I get the option? wine ie6setup.exe No options, installs complete. 15. wine IEXPLORE.EXE White Page. Not good. 16. Search for 'Could not load Mozilla' 17. Install ActiveX Control and learn it's re-written and not done yet. So I did all this to test some 'web' VoiceChat, http://www.univoice.us/demo/ that installs from a cab file through IE. Is this functionality lost with this migration from IE to internal rendering? Rick > Regards, > _______________________________________________ > wine-users mailing list > wine-users(a)winehq.org > http://www.winehq.org/mailman/listinfo/wine-users

3 2

wined3d: GLSL Patch feedback requested
by Jason Green 13 Jun '06

13 Jun '06

The current cumulative patch is located here: http://cmhousing.net/wine/glsl_cumul.diff (This includes the recently submitted "Split constant loading out of drawPrim()" patch, which hasn't been applied to git yet) Before submitting, I plan to fix the following things: - Fix relative addressing (it was working correctly, then I lost some stuff when my hard drive got corrupted, and now it's using R0 instead of A0 as the address register for some reason) - Switch the shader_reg_maps.constantsF[] to a CHAR array instead of a BOOL array (maybe even a bitmap(?)) This whole patchset should be a no-op for normal users, unless they have the UseGLSL registry key enabled. Here's a list of the changelogs that this cumulative patch entails, somewhat in the order that I'll be sending them: [already sent] Move constant loading out of DrawPrimDrawStrided() - DrawPrim is just too big of a function. This separates the passing of constants to the shader into new functions. - Fixes an off-by-one error when loading vertex declaration constants (should be <, not <=) - Adds a function for GLSL loading of constants (aka Uniforms) - Adds a GLSL program variable to the stateblock and sets it to 0 (a future patch will actually create this program) Add GLSL helper functions to device.c - Adds functions to attach & detach shader objects, create and delete programs, and maintain the list of programs. - Adds a list of GLSL shader programs to the device which is initialized on Init3D(), and deleted on Release() Add the bulk of the GLSL string generation functions - Add a new file glsl_shader.c which contains almost every GLSL specific function we'll need - Move print_glsl_info() into glsl_shader.c - Move the shader_reg_maps struct info into the private header, and make it part of SHADER_OPCODE_ARG. - Create a new shared ps/vs register map for float constants (future patch will make ARB programs use this, too) - This is a big patch, but none of the new functions in glsl_shader.c are being called yet. This just sets them up. Unified float constant register mapping between ARB pixel and vertex shaders. - Got rid of the separate constant maps. - Side effect of this is that the map is a bit larger for pixel shaders than it needs to be. - Will make this dynamic in a future patch. Added more declarations to GLSL in generate_glsl_declarations() - Declare more variable names for GLSL programs. - Correct output name for pixel shaders (gl_FragColor instead of glFragColor) Map pixel shader instructions to GLSL generating functions. - Also, delete the GLSL program when the refcount hits 0 Map vertex shader instructions to GLSL generating functions. - Also, delete the GLSL program when the refcount hits 0 Allow drawPrim to create and use the GLSL program - Now that we can fully create a GLSL program, this patch lets us actually use it. I would have submitted these all separate for review, but I have some janitorial git cleanup to do first to get all of this in the right order.

5 8

WINED3D: Bug 5418
by H. Verbeet 13 Jun '06

13 Jun '06

http://bugs.winehq.org/show_bug.cgi?id=5418 The code in question does look a bit dodgy. Bad merge perhaps?

2 1

Re: Martin Fuchs : shell32: SHELL32_GetItemAttributes()
by Rein Klazes 13 Jun '06

13 Jun '06

Hallo Martin. This patch is giving me trouble: >Author: Martin Fuchs <martin-fuchs(a)gmx.net> >Date: Sat Feb 11 12:16:56 2006 +0100 > >shell32: SHELL32_GetItemAttributes() >- correct documentation which incorrectly claimed not to set any > attribute bits >- retrieve file attributes using SHGetPathFromIDListW() when they are > not already present in the internal PIDL structures >- add test case to show the previously wrong folder attributes when > using absolute PIDLs >- fix some memory leaks in the tests in a couple of wine configurations that I use this leads to an infinite lop when the openfile dialog is called. The call sequence is SHELL32_GetItemAttributes->SHGetPathFromIDListW->ISF_Desktop_fnGetAttributesOf->SHELL32_GetItemAttributes which repeats until the stack overflows. Here is a part of a back trace: | 13 0x7b8533ed SHELL32_GetItemAttributes+0x2dd(psf=0x7bc6bc28, pidl=0x7bc5e058, pdwAttributes=0x7ba5ae54) [/usr/home/projects/wine/mywine/dlls/shell32/shlfolder.c:430] in shell32 (0x7b8533ed) | 14 0x7b83fcb8 ISF_Desktop_fnGetAttributesOf+0x148(iface=0x7bc6bc28, cidl=0x1, apidl=0x7ba5ae5c, rgfInOut=0x7ba5ae54) [/usr/home/projects/wine/mywine/dlls/shell32/shfldr_desktop.c:459] in shell32 (0x7b83fcb8) | 15 0x7b8288cd SHGetPathFromIDListW+0x7d(pidl=0x7bc5e058, pszPath=0x7ba5b0c0) [/usr/home/projects/wine/mywine/dlls/shell32/pidl.c:1273] in shell32 (0x7b8288cd) | 16 0x7b8533ed SHELL32_GetItemAttributes+0x2dd(psf=0x7bc6bbb8, pidl=0x7bc5e058, pdwAttributes=0x7ba5b334) [/usr/home/projects/wine/mywine/dlls/shell32/shlfolder.c:430] in shell32 (0x7b8533ed) | 17 0x7b83fcb8 ISF_Desktop_fnGetAttributesOf+0x148(iface=0x7bc6bbb8, cidl=0x1, apidl=0x7ba5b33c, rgfInOut=0x7ba5b334) [/usr/home/projects/wine/mywine/dlls/shell32/shfldr_desktop.c:459] in shell32 (0x7b83fcb8) | 18 0x7b8288cd SHGetPathFromIDListW+0x7d(pidl=0x7bc5e058, pszPath=0x7ba5b5a0) [/usr/home/projects/wine/mywine/dlls/shell32/pidl.c:1273] in shell32 (0x7b8288cd) | 19 0x7b8533ed SHELL32_GetItemAttributes+0x2dd(psf=0x7bc6dd70, pidl=0x7bc5e058, pdwAttributes=0x7ba5b814) [/usr/home/projects/wine/mywine/dlls/shell32/shlfolder.c:430] in shell32 (0x7b8533ed) A +relay,+shell log of one loop is attached below. Running wineprefixcreate or reinstalling wine.inf does not help. On a clean new installation there is no problem (but I like to keep using the old stuff with a hundred or so of installed windows programs). Any idea? Rein.

3 4

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