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

x11drv: XDND: Fix file drop to properly support file:/// URIs (debugging problem)
by Maciej Katafiasz March 22, 2007

March 22, 2007

Hi, (please ignore the other copy I sent from the wrong address by accident) I'm working on a bug in winex11drv/xdnd.c, where file:/// URIs are not correctly interpreted, resulting in DnD broken most of the time. There are two parts of that bug: 1) X11DRV_XDND_BuildDropFiles() fails to properly handle absolute unix paths, which is exactly what you get from file:///, so it won't find the file unless $PWD and the constructed Windows drive-absolute path happen to have the same root. For example, file:///home/mathrick/foo.txt will yield "\\home\\mathrick\\foo.txt" and work only if the current directory is on a drive letter on which that path is valid. 2) X11DRV_XDND_DeconstructTextPlain() fails to accommodate for the fact file:/// URIs are, in fact, URIs and not paths, and doesn't check for validity nor does it unescape % sequences. The result is that paths with spaces, etc. in them won't work. The attached patch is my first take at 1), it works, but there is a problem. My test application is μTorrent, and it'll randomly lock up with the following errors printed: err:ntdll:RtlpWaitForCriticalSection section 0x110020 "heap.c: main process heap section" wait timed out in thread 001f, blocked by 0019, retrying (60 sec) err:ntdll:RtlpWaitForCriticalSection section 0x110020 "heap.c: main process heap section" wait timed out in thread 001e, blocked by 0019, retrying (60 sec) I can reproduce them by attempting to drop a file on µT's window right after startup. If I wait a while, it works. It also happens if I switch to another virtual desktop, then back to the one µT is on and then try to drop. I tried to check the code as well as I could (win32 API is not exactly my everyday environment), and I believe it's correct. At least all the allocations appear to be correct, nothing is overwritten. I've tried debugging in several ways using winedbg, but it fails pretty hard with various exceptions that aren't there when running outside the debugger, or fails to attach to the process, etc. From the circumstances, I believe there's some kind of race condition in allocation from process heap. However, I'm unable to find it as I have no idea about wine internals and how exactly DnD happens, and what threads do what and when. I'd be therefore very grateful if someone knowledgeable would take a look at it and see what's wrong, or at least help me with debugging the issue, as my ideas how to attack it have run out. Cheers, -- Being really good at C++ is like being really good at using rocks to sharpen sticks. (Thant Tessman) -------- Maciej Katafiasz <ml(a)mathrick.org> http://mathrick.org

5 5

Fwd: kernel32: Implement ReplaceFileA/ReplaceFileW (revised)
by Erich Hoover March 22, 2007

March 22, 2007

Request for comments, as per http://www.winehq.com/site/sending_patches. Thanks! Erich Hoover ehoover(a)mines.edu ---------- Forwarded message ---------- From: Erich Hoover <ehoover(a)mines.edu> Date: Mar 3, 2007 2:37 PM Subject: kernel32: Implement ReplaceFileA/ReplaceFileW (revised) To: wine-patches(a)winehq.org Real Name: Erich Hoover Description: Implements the functions ReplaceFileA and ReplaceFileW in kernel32 (Bug #7544). This revision includes a lot of changes as a result of feedback from Felix, see wine-devel for details. Also provides conformance test code to ensure proper functionality. Changelog: kernel32: Implement ReplaceFileA/ReplaceFileW

2 2

Regedit output to STDOUT / force registry files sync
by Vit Hrachovy March 22, 2007

March 22, 2007

Hi, I'm trying to find some elegant method to access registry keys added during one WINE session, i.e. without restarting WINE. Test case description: 1. Open WINE session wineconsole --backend=user cmd 2. During session, insert some new registry key regedit new-entry.reg 3. Try to access the new registry entry from bash cat ~/.wine/system.reg |grep AutoHotkey (fails) 4. Close WINE session I've found there was at times an option to save registry periodically, but this can't help me here. This problem can be solved in two ways, both of them can be helpful: a) Create small program to force sync of registry in memory with registry files - 'wineflushregistry'. b) Enhance regedit to be able to output to STDOUT. By default registry search output is done to a specified file. It can be redirected to STDERR, though. (tested on 0.9.29, 0.9.33) Enhancing regedit ----------------- regedit /es "HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\App Paths\AutoHotkey.exe" which will be similar to (non-functional) regedit /e /dev/stdout "HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\App Paths\AutoHotkey.exe" Regards Vit Hrachovy

4 11

Deadline for Summer of Code is March 26th!
by Dan Kegel March 22, 2007

March 22, 2007

Watch out, those deadlines can creep up on you! If you're a student interested in working on Wine as part of Google's Summer of Code, you have only five or so more days to apply. See http://code.google.com/soc or http://groups.google.com/group/google-summer-of-code-announce/web/guide-to-… for more details. And see http://wiki.winehq.org/SummerOfCode for a few ideas. Feel free to post your ideas to wine-devel first for quick feedback. So far, there are only two applications, both of which look pretty good. We will probably have more than two slots, so it's wide open right now! Sharpen your pencils, and good luck! - Dan

2 2

SoC idea: pressure sensitive tablet support
by Dan Kegel March 22, 2007

March 22, 2007

While looking around for a project idea, I noticed that people are starting to ask for pressure sensitive tablet support in Photoshop on Wine. Seems like it could be a fun project for some Summer of Code student. - Dan

1 0

x11drv: XDND: Fix file drop to properly support file:/// URIs (debugging problem)
by Maciej Katafiasz March 22, 2007

March 22, 2007

Hi, I'm working on a bug in winex11drv/xdnd.c, where file:/// URIs are not correctly interpreted, resulting in DnD broken most of the time. There are two parts of that bug: 1) X11DRV_XDND_BuildDropFiles() fails to properly handle absolute unix paths, which is exactly what you get from file:///, so it won't find the file unless $PWD and the constructed Windows drive-absolute path happen to have the same root. For example, file:///home/mathrick/foo.txt will yield "\\home\\mathrick\\foo.txt" and work only if the current directory is on a drive letter on which that path is valid. 2) X11DRV_XDND_DeconstructTextPlain() fails to accommodate for the fact file:/// URIs are, in fact, URIs and not paths, and doesn't check for validity nor does it unescape % sequences. The result is that paths with spaces, etc. in them won't work. The attached patch is my first take at 1), it works, but there is a problem. My test application is μTorrent, and it'll randomly lock up with the following errors printed: err:ntdll:RtlpWaitForCriticalSection section 0x110020 "heap.c: main process heap section" wait timed out in thread 001f, blocked by 0019, retrying (60 sec) err:ntdll:RtlpWaitForCriticalSection section 0x110020 "heap.c: main process heap section" wait timed out in thread 001e, blocked by 0019, retrying (60 sec) I can reproduce them by attempting to drop a file on µT's window right after startup. If I wait a while, it works. It also happens if I switch to another virtual desktop, then back to the one µT is on and then try to drop. I tried to check the code as well as I could (win32 API is not exactly my everyday environment), and I believe it's correct. At least all the allocations appear to be correct, nothing is overwritten. I've tried debugging in several ways using winedbg, but it fails pretty hard with various exceptions that aren't there when running outside the debugger, or fails to attach to the process, etc. From the circumstances, I believe there's some kind of race condition in allocation from process heap. However, I'm unable to find it as I have no idea about wine internals and how exactly DnD happens, and what threads do what and when. I'd be therefore very grateful if someone knowledgeable would take a look at it and see what's wrong, or at least help me with debugging the issue, as my ideas how to attack it have run out. Cheers, -- Maciej Katafiasz <email(a)mathrick.org>

1 0

Re: [3/4] WineD3D: Store the pixel format in the texture
by H. Verbeet March 21, 2007

March 21, 2007

Shouldn't this be done for volume textures as well?

2 1

Accessing File > 4gb problem (was: Debugging Supreme Commander)
by Stephan Rose March 21, 2007

March 21, 2007

I apologize in advance if this ends up on the mailing list twice but..it's been over 12 hours now and my e-mail, as my previous (but now unimportant one) still didn't make it so I am going to try to resend this. =) Allright, I've got the bug nailed to the wall with all of its 6 legs. What I don't know though is what to do about it. Still trying to find the right sledgehammer to squash it with.... Problem boils down to this: Supreme Commander has a .cab file that is just under 6 gigs in size. 0x178d42fce bytes to be exact Now here are the last 5 file seek positions in order from first to last: 0x0ff697fb4 0x0ff69800b 0x0ffebc19a 0x0ffebc1f0 All those succeed fine. But #5 ... 0x1007bc160 results in NTSTATUS c000000d, Invalid Parameter. That address is well within the range of the file though. The status occurs when lseek is called in this part of NtSetInformation, don't mind my added debug fixme's =) case FilePositionInformation: if (len >= sizeof(FILE_POSITION_INFORMATION)) { const FILE_POSITION_INFORMATION *info = ptr; unsigned int* iptr = (unsigned int*)&info->CurrentByteOffset.QuadPart; FIXME( "%i, 0x%08x%08x\n", fd, *(iptr+1), *iptr); if (lseek( fd, info->CurrentByteOffset.QuadPart, SEEK_SET ) == (off_t)-1) { FIXME("Bad result from lseek"); // Above fixme triggered past 4gb io->u.Status = FILE_GetNtStatus(); } } else io->u.Status = STATUS_INVALID_PARAMETER_3; break; I checked sizeof(off_t) and it correctly reports as 8-bytes, so I am not sure what the problem is and why this is happening. I know my system can handle files > 4 gigs....wine dumped 9 gigs of relay output onto my hard drive the first time I played with that debug channel =P Any ideas? On a bright note...I almost have my Supreme Commander CD Key memorized now...how many people can say that!!! ;) Thanks, Stephan

3 4

Debugging Supreme Commander Installer
by Stephan Rose March 21, 2007

March 21, 2007

I've been playing around with the supreme commander install most of today trying to figure out why it does not want to install. Running with +file,+msgbox and noticed the following error for virtually all files: warn:file:wine_nt_to_unix_file_name L"TUB500.xsb" not found in /home/stephan/.wine/dosdevices/c:/Program Files/THQ/Gas Powered Games/Supreme Commander/sounds/Voice/fr/Tutorials This is the file being copied when I get the "Error 87" message from Install shield. Also, pretty much every file, if not every file, gives the same trace in the debug log. It's weird that install shield will copy hundreds of files with that warning in their trace and not complain until it is 80% through. So then I wondered, is that really the cause or not? I think yes. Install shield appears to be kind enough to not re-copy the files if they already exist, so I killed the process to keep all files already copied and added the one missing file above from my windows install and then ran install shield again. This time around, the file was processed correctly and no error. Instead it gives the error now on the next file, which is TUB500.xwb. Some more trace below: trace:file:GetFileAttributesW L"c:\\Program Files\\THQ\\Gas Powered Games\\Supreme Commander\\sounds\\Voice\\fr\\Tutorials\\TUB500.xwb" trace:file:RtlDosPathNameToNtPathName_U (L"c:\\Program Files\\THQ\\Gas Powered Games\\Supreme Commander\\sounds\\Voice\\fr\\Tutorials\ \TUB500.xwb",0x334b84,(nil),(nil)) trace:file:RtlGetFullPathName_U (L"c:\\Program Files\\THQ\\Gas Powered Games\\Supreme Commander\\sounds\\Voice\\fr\\Tutorials\\TUB500.xwb" 520 0x3348f8 (nil)) warn:file:wine_nt_to_unix_file_name L"TUB500.xwb" not found in /home/stephan/.wine/dosdevices/c:/Program Files/THQ/Gas Powered Games/Supreme Commander/sounds/Voice/fr/Tutorials trace:file:MoveFileWithProgressW (L"",(null),(nil),(nil),0004) trace:file:RtlDosPathNameToNtPathName_U (L"",0x3348b8,(nil),(nil)) trace:file:GetFileAttributesW L"c:\\Program Files\\THQ\\Gas Powered Games\\Supreme Commander\\sounds\\Voice\\fr\\Tutorials\\TUB500.xwb" trace:file:RtlDosPathNameToNtPathName_U (L"c:\\Program Files\\THQ\\Gas Powered Games\\Supreme Commander\\sounds\\Voice\\fr\\Tutorials\ \TUB500.xwb",0x334800,(nil),(nil)) trace:file:RtlGetFullPathName_U (L"c:\\Program Files\\THQ\\Gas Powered Games\\Supreme Commander\\sounds\\Voice\\fr\\Tutorials\\TUB500.xwb" 520 0x334574 (nil)) warn:file:wine_nt_to_unix_file_name L"TUB500.xwb" not found in /home/stephan/.wine/dosdevices/c:/Program Files/THQ/Gas Powered Games/Supreme Commander/sounds/Voice/fr/Tutorials Followed by this resulting in the error message box: trace:file:RtlDosPathNameToNtPathName_U (L"C:\\windows\\temp\ \{62CDECF0-D5B2-11DB-C687-0018F32E4A94}\ \ISSetup.dll",0x341404,(nil),(nil)) trace:file:RtlGetFullPathName_U (L"C:\\windows\\temp\ \{62CDECF0-D5B2-11DB-C687-0018F32E4A94}\\ISSetup.dll" 520 0x3411c4 (nil)) trace:file:wine_nt_to_unix_file_name L"\\??\\C:\\windows\\temp\ \{62CDECF0-D5B2-11DB-C687-0018F32E4A94}\\ISSetup.dll" -> "/home/stephan/.wine/dosdevices/c:/windows/temp/{62CDECF0-D5B2-11DB-C687-0018F32E4A94}/ISSetup.dll" trace:file:RtlGetFullPathName_U (L"C:\\windows\\temp\ \{62CDECF0-D5B2-11DB-C687-0018F32E4A94}\\ISSetup.dll" 522 0x34149e (nil)) trace:msgbox:MSGBOX_OnInit L"Error:\t87" So it seems that it freaks out because somehow the file appears in the directory tree late. I'm still trying to think of a way of reproducing this with a test case...but that won't be all that easy without knowing precisely what Install Shield is actually doing in their code! Any thoughts? Stephan Rose

4 4

Re: Makefiles: Be less verbose when performing make rules by only printing the command being executed and the source and/or target file.
by Alexandre Julliard March 21, 2007

March 21, 2007

Robert Shearman <rob(a)codeweavers.com> writes: > I've also modified tools/makerule to respect the "-s" flag passed into make. > > Alexandre suggested on IRC that I always print the destination file, > but I want to make sure that the technical details of this patch are > acceptable before making tweaks to the printed commands. I've been thinking about this some more, and I don't think I'll put it in. It's going to cause a lot of trouble and portability headaches, for only a minor cosmetic gain. This thing really belongs in make itself; it shouldn't be hard to patch GNU make to have a mode where it only displays the command name and target instead of the whole command line. Then it would work for all projects, and wouldn't require adding complexity to the makefiles. -- Alexandre Julliard julliard(a)winehq.org

2 4

Link creation not working _properly_ under 2.6 kernel?
by Tom Spear March 21, 2007

March 21, 2007

Hi all, I just got Slackware 11, and have a couple issues with link creation. I cant say that this worked with 10.2 either though, as I havent had a Linux machine in about a year, since the motherboard died on my last one.. The first issue is that regardless of which kernel I use, the Desktop link doesn't have the WinRAR icon, just the default blank paper KDE icon, and the menu entries have no icons at all. Second, with 2.4 the icon is created and put on my desktop, but with 2.6 it is created and put where I have Drive C pointed to in winecfg. Third, with 2.4 the menu entries are put in the menu under the wine folder, but with 2.6 they are put under the installdir of the app. I am using 0.9.32, as I cannot download the git version due to the corporate firewall, and transparent web proxy.. If needed I can create a bug for this issue, and as soon as I get a free minute I will reinstall and get the debug messages. -- Thanks Tom Check out this new 3D Instant Messenger called IMVU. It's the best I have seen yet! http://imvu.com/catalog/web_invitation.php?userId=1547373&from=power-email

4 18

Re: Enlarge max. length of PATH variable in programs/cmd/wcmdmain.c
by Ann & Jason Edmeades March 21, 2007

March 21, 2007

>However according to http://support.microsoft.com/kb/830473 : "the total length .... >cannot contain more than either 2047 or 8191 characters (as appropriate to your >operating system)" I'd suggest changing it to MAXSTRING which is used throughout cmd to refer to a 'big' string (of 8192 chars). At least this way you can grow the max line length simply! >PS: I think char string[1024]; in the main() should be extended > to char string[2048]; as well! (please see the MS note above) Yes, I'd agree (to MAXSTRING, but change the 1024 in at least one of the calls appropriately as well) Jason

2 1

Re: wined3d: Check for float texture formats correctly.
by H. Verbeet March 21, 2007

March 21, 2007

On 21/03/07, Vitaly Budovski <vbudovski(a)gmail.com> wrote: > Move the checks for float texture formats into the correct location. > This allows some Direct3D sample applications to start up which check > for any of the float formats together with D3DUSAGE_RENDERTARGET. > --- That's better, but now those formats can only be used with render targets. I don't think that's correct, since they were probably added in the other place to make some application work.

2 2

wine opinion of a user
by Vijay Kiran Kamuju March 21, 2007

March 21, 2007

Hi, http://www.selfadhesivelabels.com/blog/2007/03/20/windos-software-that-we-d… This is a response from a user. Can any one order and test sage 50 line business s/w. And other s/w. Dan, you can redirect them to appdb. Thanks, VJ

4 5

Ok... Someone tell me WTF is going on here.
by Giles Cameron March 21, 2007

March 21, 2007

Ok. I have been tring to track down what appears to be a bug in wine while trying to get The Sims 2 (Seasons) to work. And so I have been tring to add to the debug a bunch of useless bunk. and I am getting VERY strange results, attached are the cdrom.c file I edited in dlls/ntdll/ and the output. Did I manage to break the wine debugger? or uncover the monster of all bugs? I am sitting here wondering "WTF" right now.... Wtf did I do, Giles Cameron

3 3

Accessing File > 4gb problem (was: Debugging Supreme Commander)
by Stephan Rose March 21, 2007

March 21, 2007

Allright, I've got the bug nailed to the wall with all of its 6 legs. What I don't know though is what to do about it. Still trying to find the right sledgehammer to squash it with.... Problem boils down to this: Supreme Commander has a .cab file that is just under 6 gigs in size. 0x178d42fce bytes to be exact Now here are the last 5 file seek positions in order from first to last: 0x0ff697fb4 0x0ff69800b 0x0ffebc19a 0x0ffebc1f0 All those succeed fine. But #5 ... 0x1007bc160 results in NTSTATUS c000000d, Invalid Parameter. That address is well within the range of the file though. The status occurs when lseek is called in this part of NtSetInformation, don't mind my added debug fixme's =) case FilePositionInformation: if (len >= sizeof(FILE_POSITION_INFORMATION)) { const FILE_POSITION_INFORMATION *info = ptr; unsigned int* iptr = (unsigned int*)&info->CurrentByteOffset.QuadPart; FIXME( "%i, 0x%08x%08x\n", fd, *(iptr+1), *iptr); if (lseek( fd, info->CurrentByteOffset.QuadPart, SEEK_SET ) == (off_t)-1) { FIXME("Bad result from lseek"); // Above fixme triggered past 4gb io->u.Status = FILE_GetNtStatus(); } } else io->u.Status = STATUS_INVALID_PARAMETER_3; break; I checked sizeof(off_t) and it correctly reports as 8-bytes, so I am not sure what the problem is and why this is happening. Any ideas? On a bright note...I almost have my Supreme Commander CD Key memorized now...how many people can say that!!! ;) Thanks, Stephan

1 0

Re: wine opinion of a user
by Nicholas van Rheede van Oudtshoorn March 21, 2007

March 21, 2007

I imagine the Australian version would do just as well. Here's a page where you can request a download demo: http://www.sagepastel.com.au/au/form_demodownload_request.html I'd do it myself here, but this account that I'm using today is only dialup. Nicholas

1 0

last year's email
by Bill Medland March 21, 2007

March 21, 2007

Is there something wrong with the list server? I am being bombarded with last year's emails. Bill Medland

5 6

Test framework for authentication testing
by Kai Blin March 21, 2007

March 21, 2007

Hi folks, while planning my work on Kerberos and Negotiate, I realized that we need a better way to test things like network authentication, the way we're doing it right now depends on the person running the tests to have a certain setup in the test environment, and e.g. the NTLM SSP tests use an undocumented windows feature to get some of the testing done. Now, a better way to do this would be to actually get some stubbed out user database set up, add a user for testing purposes, run the tests and then delete the test user. Sort of what the Samba project is doing for their smbtorture tests, if I understood those right. Of course this has to be done in a way that will also work on windows, or the tests will be useless. Now the question that's really bugging me is, is this possible at all? Does it make sense? What I'd want to do would be the following: * add a user * set the user password [... run the tests...] * delete the user Cheers, Kai -- Kai Blin, <kai Dot blin At gmail Dot com> WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin/ -- Will code for cotton.

2 3

Re: wined3d: Check for float texture formats correctly.
by Dmitry Timoshkov March 21, 2007

March 21, 2007

"Vitaly Budovski" <vbudovski(a)gmail.com> wrote: > @@ -1662,6 +1662,20 @@ static HRESULT WINAPI IWineD3DImpl_Check > case WINED3DFMT_P8: > TRACE_(d3d_caps)("[OK]\n"); > return WINED3D_OK; > + case WINED3DFMT_R16F: > + case WINED3DFMT_A16B16G16R16F: > + if (!GL_SUPPORT(ARB_HALF_FLOAT_PIXEL)) { > + TRACE_(d3d_caps)("[FAILED]\n"); > + return WINED3DERR_NOTAVAILABLE; > + } I realize that in the original chunk of code there is no a comment /* fall through */ either, but if it's really an intent please add it. > + case WINED3DFMT_R32F: > + case WINED3DFMT_A32B32G32R32F: > + if (!GL_SUPPORT(ARB_TEXTURE_FLOAT)) { > + TRACE_(d3d_caps)("[FAILED]\n"); > + return WINED3DERR_NOTAVAILABLE; > + } > + TRACE_(d3d_caps)("[OK]\n"); > + return WINED3D_OK; -- Dmitry.

1 0

On bugs and docs
by Tom Spear March 21, 2007

March 21, 2007

Hi all, just some quick questions. Is it just me or has anyone else noticed that the documentation for wine is kind of scattered all over the place? I mean personally I can name about 8 different places (that are affiliated with winehq) that people can go to get information, not including the mailing lists. IMHO if it were even possible to consolidate all of the information, it would still take months to do, especially with people not knowing to post to the central location. Also, is it against the rules in bugzilla to try to organize the bugs some way? IOW The very old games metabug that I created (bug 1434).. I originally opened it not realizing that if every bug related to a game was attached the page would become overloaded. So I decided a year or two ago to close it. Then I recently realized how I could reorganize it and decided to reopen it, only to have it closed again by someone else who in not so many words told me that I was spamming the bug list and that I was annoying everyone. Basically my idea was to make several tasklists to link to 1434 (bugs like dinput9, d3d8, etc), and then link individual games to each of those, so that someone working on games, and in specific on dinput9 for example could easily find bugs related to dinput 9 without having to do a query. But now I am worried that I am overstepping my bounds by trying to do so. Does anyone _else_ object to this idea? -- Thanks Tom Check out this new 3D Instant Messenger called IMVU. It's the best I have seen yet! http://imvu.com/catalog/web_invitation.php?userId=1547373&from=power-email

5 12

Re: comctl32: CreateToolbarEx should send TB_SETBITMAPSIZE twice (fixes bug #6392)
by James Hawkins March 20, 2007

March 20, 2007

On 3/19/07, Mikołaj Zalewski <mikolaj(a)zalewski.pl> wrote: > As can be seen in Spy++ and by the attached tests, CreateToolbarEx sends > TB_SETBITMAPSIZE twice instead of TB_SETBITMAPSIZE and TB_SETBUTTONSIZE. > ShellExViewer depends on this bug. The patch contains also some tests > and fixes for d[xy]Button <= 0. > > From c8a84900ae5d9ca7d77d443990e935b8c268bf4c Mon Sep 17 00:00:00 2001 > From: =?utf-8?q?Miko=C5=82aj_Zalewski?= <mikolaj(a)zalewski.pl> > Date: Mon, 19 Mar 2007 10:40:53 +0100 > Subject: [PATCH] comctl32: CreateToolbarEx should send TB_SETBITMAPSIZE twice (fixes bug #6392) > > --- > dlls/comctl32/commctrl.c | 13 +++++++------ > dlls/comctl32/tests/toolbar.c | 40 ++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 47 insertions(+), 6 deletions(-) > > diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c > index c21cae3..7e44e03 100644 > --- a/dlls/comctl32/commctrl.c > +++ b/dlls/comctl32/commctrl.c > @@ -693,12 +693,13 @@ CreateToolbarEx (HWND hwnd, DWORD style, UINT wID, INT nBitmaps, > SendMessageW (hwndTB, TB_SETBITMAPSIZE, 0, > MAKELPARAM((WORD)dxBitmap, (WORD)dyBitmap)); > > - if (dxButton <= 0) > - dxButton = 24; > - if (dyButton <= 0) > - dyButton = 22; > - SendMessageW (hwndTB, TB_SETBUTTONSIZE, 0, > - MAKELPARAM((WORD)dxButton, (WORD)dyButton)); > + if (dxButton < 0) > + dxButton = dxBitmap; > + if (dyButton < 0) > + dyButton = dyBitmap; > + /* TB_SETBUTTONSIZE -> TB_SETBITMAPSIZE bug introduced for Windows compatibility */ > + if (dxButton != 0 && dyButton != 0) > + SendMessageW(hwndTB, TB_SETBITMAPSIZE, 0, MAKELPARAM(dxButton, dyButton)); > > > /* add bitmaps */ > diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c > index 164644e..b583295 100644 > --- a/dlls/comctl32/tests/toolbar.c > +++ b/dlls/comctl32/tests/toolbar.c > @@ -869,6 +869,45 @@ static void test_sizes(void) > DestroyWindow(hToolbar); > } > > + > +static void test_createtoolbarex() > +{ > + HWND hToolbar; > + TBBUTTON btns[3]; > + ZeroMemory(&btns, sizeof(btns)); > + > + hToolbar = CreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandle(NULL), IDB_BITMAP_128x15, btns, > + 3, 20, 20, 16, 16, sizeof(TBBUTTON)); > + CHECK_IMAGELIST(16, 20, 20); > + compare((int)SendMessage(hToolbar, TB_GETBUTTONSIZE, 0, 0), 0x1a001b, "%x"); > + DestroyWindow(hToolbar); > + > + hToolbar = CreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandle(NULL), IDB_BITMAP_128x15, btns, > + 3, 4, 4, 16, 16, sizeof(TBBUTTON)); > + CHECK_IMAGELIST(32, 4, 4); > + compare((int)SendMessage(hToolbar, TB_GETBUTTONSIZE, 0, 0), 0xa000b, "%x"); > + DestroyWindow(hToolbar); > + > + hToolbar = CreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandle(NULL), IDB_BITMAP_128x15, btns, > + 3, 0, 8, 12, 12, sizeof(TBBUTTON)); > + CHECK_IMAGELIST(16, 12, 12); > + compare((int)SendMessage(hToolbar, TB_GETBUTTONSIZE, 0, 0), 0x120013, "%x"); > + DestroyWindow(hToolbar); > + > + hToolbar = CreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandle(NULL), IDB_BITMAP_128x15, btns, > + 3, -1, 8, 12, 12, sizeof(TBBUTTON)); > + CHECK_IMAGELIST(16, 12, 8); > + compare((int)SendMessage(hToolbar, TB_GETBUTTONSIZE, 0, 0), 0xe0013, "%x"); > + DestroyWindow(hToolbar); > + > + hToolbar = CreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandle(NULL), IDB_BITMAP_128x15, btns, > + 3, -1, 8, -1, 12, sizeof(TBBUTTON)); > + CHECK_IMAGELIST(16, 16, 8); > + compare((int)SendMessage(hToolbar, TB_GETBUTTONSIZE, 0, 0), 0xe0017, "%x"); > + DestroyWindow(hToolbar); > +} > + > + > START_TEST(toolbar) > { > WNDCLASSA wc; > @@ -899,6 +938,7 @@ START_TEST(toolbar) > test_add_string(); > test_hotitem(); > test_sizes(); > + test_createtoolbarex(); > > PostQuitMessage(0); > while(GetMessageA(&msg,0,0,0)) { > -- > 1.4.4.2 > If you're testing what message is sent, why not use the message sequence testing code? -- James Hawkins

2 1

Re: wine opinion of a user
by Ann & Jason Edmeades March 20, 2007

March 20, 2007

> Sage Line 50 already has a bug filed: > http://bugs.winehq.org/show_bug.cgi?id=2956 > but we're hampered because there's no free demo for us to test. > You could register for a free trial cd? http://www.sage.co.uk/considering/TryNow.aspx?tid=213114

1 0

WineCfg and DirectX options
by Michael Lothian March 20, 2007

March 20, 2007

Hi Has anyone thought about adding the directx options to the Graphics tab in WineCfg Just now I've been testing all the work been done on the graphics layer on different games so I've been switching on and off GLSL and changing backbuffer to fbo etc using regedit Would it not be better to change these things easily instead to allow for wider testing. PS With GLSL and FBO Tomb Raider Legent Opening Level Sequence the cliffs are black With all other options the watter effect is applied the the whole screen when any water is in the screen at all. Has anyone else noticed this. Also none of the menu writing shows up in FarCry but the game works a treat I'm now just waiting for mmstream to be implemented to I can see my video's on X3 Keep up all the good work your beating Transgaming hands down Mike PS the above reports were testing with 0.9.31, 0.9.32 and the latest git

8 9

Road to 1.0
by Dave Bialac March 20, 2007

March 20, 2007

Hi All I've been following the list for about a year now, just reading and learning. Through this process, I've come to wonder about the following question -- what should be the goal for Wine 1.0? I know a lot of development is focused around getting one particular application or another to work, especially from the folks over at Code Weavers, but with version numbers approaching 1.0, should there not be a set goal of functionality? My personal thought is that Wine should head in the direction of 100% compatibility with a particular version of Windows. Anything that ran on that version should run on Wine 1.0 with no problems. Any thoughts? Dave

3 2