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

Re: [msi, 1/5, try 5] msi: Add OLE automation conformance test.
by James Hawkins March 4, 2007

March 4, 2007

On 3/4/07, Misha Koshelev <mk144210(a)bcm.tmc.edu> wrote: > Changes: Ok, try 5. This time there are five patches, as this first > patch is a (moderately) comprehensive conformance test for MSI OLE > automation, which checks all the functions that will be implemented, and > does basic checks like set a property, then get it, is the property what > we set it to? I hope this helps get it into git. > > These patches add partial OLE automation support for MSI and then add > JScript/VBScript support for MSI (as the MSI specs specifically state > that applications that need this functionality must install Windows > Script themselves). As a proof of concept, sufficient automation support > is added to conform to the conformance test and to fix bug #7357. > Doesn't compile: ../../../tools/winegcc/winegcc -B../../../tools/winebuild -mconsole automation.o db.o format.o iface.o install.o msi.o package.o record.o suminfo.o testlist.o -o msi_test.exe.so ../../../libs/port/libwine_port.a -lcabinet -lmsi -lshell32 -lole32 -ladvapi32 -lkernel32 -luuid automation.o: In function `invoke': /home/truiken/wine/dlls/msi/tests/automation.c:389: undefined reference to `VariantInit' /home/truiken/wine/dlls/msi/tests/automation.c:404: undefined reference to `VariantClear' /home/truiken/wine/dlls/msi/tests/automation.c:398: undefined reference to `VariantChangeTypeEx' -- James Hawkins

2 3

Re: [PATCH 1/2] comctl32: Added getter-setter tests for the tab control (second attempt)
by Vitaliy Margolen March 4, 2007

March 4, 2007

The_Hagop wrote: > @@ -1,5 +1,6 @@ > /* Unit test suite for tab control. > * > + * Copyright 2007 Hagop Hagopian > * Copyright 2003 Vitaliy Margolen > * > * This library is free software; you can redistribute it and/or These are sorted in historical order. > @@ -52,6 +59,8 @@ > > static HFONT hFont = 0; > > +static HWND hTab; > + > static HWND > create_tabcontrol (DWORD style, DWORD mask) > { You using exactly the same name as parameter to all of your functions. This creates lots of confusion. Please remove this global variable and pass it as a function parameter instead. > + /* Creating a tooltip window*/ > + hwndTT = CreateWindowEx(WS_EX_TOPMOST, > + TOOLTIPS_CLASS, > + NULL, > + WS_POPUP | TTS_NOPREFIX | TTS_ALWAYSTIP, > + CW_USEDEFAULT, > + CW_USEDEFAULT, > + CW_USEDEFAULT, > + CW_USEDEFAULT, > + hTab, > + NULL, > + 0, > + NULL > + ); > + > + SetWindowPos(hwndTT, > + HWND_TOPMOST, > + 0, > + 0, > + 0, > + 0, > + SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); This looks just plain bad. Please put all parameters one after another. There are absolutely no need to have each on it's own line. > + ti.rect.left = rect.left; > + ti.rect.top = rect.top; > + ti.rect.right = rect.right; > + ti.rect.bottom = rect.bottom; You can assign structures to structures in C: ti.rect = rect; > + todo_wine{ > + /* Testing CurFocus with negative value */ > + SendMessage(hTab, TCM_SETCURFOCUS, -1, 0); > + focusIndex = SendMessage(hTab, TCM_GETCURFOCUS, 0, 0); > + expect(-1, focusIndex); > + } Here and all other places - the only part of the test that's failing is "expect(,)". Add "todo_wine" at front of it only. Also it would be interesting to test larger negative numbers, like -10. This is because number of places use -1 to indicate that nothing is selected. So in a sense you might be getting a correct number. > + expect((int) extendedStyle, (int) prevExtendedStyle); > + todo_wine{ > + extendedStyle = SendMessage(hTab, TCM_GETEXTENDEDSTYLE, 0, 0); > + expect(TCS_EX_FLATSEPARATORS, (int) extendedStyle); > + } Why are you casting DWORD to int? > +static void test_getters_setters(INT nTabs) > +{ > + RECT rTab; > + INT nTabsRetrieved; > + INT rowCount; > + > + hTab = createFilledTabControl(TCS_FIXEDWIDTH, TCIF_TEXT|TCIF_IMAGE, nTabs); > + ok(hTab != NULL, "Failed to create tab control\n"); > + > + SendMessage(hTab, TCM_SETMINTABWIDTH, 0, -1); > + > + /* Testing GetItemCount */ > + nTabsRetrieved = SendMessage(hTab, TCM_GETITEMCOUNT, 0, 0); > + expect(nTabs, nTabsRetrieved); > + > + /* Testing GetRowCount */ > + rowCount = SendMessage(hTab, TCM_GETROWCOUNT, 0, 0); > + expect(1, rowCount); > + > + /* Testing GetItemRect */ > + SendMessage(hTab, TCM_GETITEMRECT, 0 , (LPARAM) &rTab ); > + CheckSize(hTab, TAB_DEFAULT_WIDTH, -1 , "Default Width"); > + > + test_getset_curFocus(hTab, nTabs); > + test_getset_curSel(hTab, nTabs); > + > + test_getset_extendedStyle(hTab); > + test_getset_unicodeFormat(hTab); > + test_getset_item(hTab); > + test_getset_tooltip(hTab); > + > + DestroyWindow(hTab); > +} All your small functions should go inside this function. There is no need to create 100 small functions that do 1-3 tests. > + > + test_getters_setters(5); > } This part part of your patch appears to be malformed. Vitlaiy

2 2

Current wine and HL2 family - well done!
by Pavel Troller March 4, 2007

March 4, 2007

Hi! Normally I'm writing complaints here, so for a bit of compensation, I would like to inform that yesterday's wine runs HL2 family of games for the first time without an annoying graphics glitch causing parts of skies to be replaced with some bogus contents like white, black, mirrors of a part of ground etc. So, many thanks to all the DirectX developers especially from my sons, they are very pleased and wish you all the best, especially continuous progress in wine development (a bit egocentric from them, but nice :-)) ). With regards, Pavel Troller

2 1

Re: gdi32: Add a EnumFontFamilies test, make it pass under Wine. Try 2
by Dmitry Timoshkov March 4, 2007

March 4, 2007

"Dmitry Timoshkov" <dmitry(a)codeweavers.com> wrote: > this patch should fix the problem reported in the bug #7571. > > This version of the patch adds a test for the case of enumerating "Symbol"-like > fonts (pointed out by Huw), and makes it pass under Wine as well. > > Changelog: > gdi32: Add a EnumFontFamilies test, make it pass under Wine. Please do not commit this patch, according to the comments in the bug above it needs more work. -- Dmitry.

1 0

Re: Fix compilation on systems that don't support nameless unions.
by Dmitry Timoshkov March 4, 2007

March 4, 2007

"Francois Gouget" <fgouget(a)free.fr> wrote: > This fixes compilation with gcc 2.95. > > programs/cmd/batch.c | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) As a more general solution that would also prevent this kind of breakage in future would be to move #define NONAMELESSUNION #define NONAMELESSSTRUCT from directory.c to wcmd.h. -- Dmitry.

1 0

Re: (resend) Scroll window fix
by Peter Oberndorfer March 3, 2007

March 3, 2007

On Tuesday 13 February 2007 14:38, Aric Stewart wrote: > finds the case where the scrolling amount exceeds the window but still > falls within the clipping rect. This generates an additional update > region that needs to be invalidated. > includes a test > Hi, I think your patch has a problem. It calls CombineRgn with the deleted Region hrgnClip. I don't know if it impacts real world applications, but i just saw a warning about a invalid handle in my debug log. Maybe moving DeleteObject below the if solves the problem? I don't know... @@ -870,6 +870,26 @@ INT WINAPI ScrollWindowEx( HWND hwnd, IN CombineRgn( hrgnWinupd, hrgnWinupd, hrgnTemp, RGN_OR ); RedrawWindow( hwnd, NULL, hrgnTemp, rdw_flags); DeleteObject( hrgnClip ); //<<<<<<< deleted here + + /* Catch the case where the scolling amount exceeds the size of the + * original window. This generated a second update area that is the + * location where the original scrolled content would end up. + * This second region is not returned by the ScrollDC and sets + * ScrollWindowEx apart from just a ScrollDC. + * + * This has been verified with testing on windows. + */ + if (abs(dx) > abs(rc.right - rc.left) || + abs(dy) > abs(rc.bottom - rc.top)) + { + DeleteObject( hrgnTemp ); + hrgnTemp = CreateRectRgn(rc.left + dx, rc.top + dy, rc.right+dx, rc.bottom + dy); + CombineRgn( hrgnTemp, hrgnTemp, hrgnClip, RGN_AND ); //<<<<<<< used here + CombineRgn( hrgnUpdate, hrgnUpdate, hrgnTemp, RGN_OR ); + + if( !bOwnRgn) + CombineRgn( hrgnWinupd, hrgnWinupd, hrgnTemp, RGN_OR ); + } } DeleteObject( hrgnTemp ); Greetings Peter

1 0

msi ole automation update
by Misha Koshelev March 3, 2007

March 3, 2007

Hi everbody, I have been working on some more stuff for the MSI OLE automation, and I now have a moderately comprehensive conformance test (1000 or so lines, tests each function implemented at least for basic functionality, tests things like return codes, if you set a property and then get it do you get what you set it to, etc.). A few small patches are needed to then make my OLE automation code (which is still hanging out in wine-patches, not in git yet) pass this test. I am going to wait to send all these new patches to wine-patches until my other patches get reviewed/committed by Alexandre. However, I thought I would post them here for any comments. I am going to be _quite_ busy starting Monday for a month though, so I may likely not be able to make any serious modifications to them if people see large problems until April. However, if anyone has any comments about these or my patches already sitting in wine-patches, please do let me know. Thanks Misha

1 1

re: GSoC project proposal: Implement the Negotiate and Kerberos SSPs based on GSSAPI
by Dan Kegel March 3, 2007

March 3, 2007

Kai wrote: >My toy idea is to not implement the ASN.1 stuff myself but instead make >use of GSSAPI for this.... Can you explain for us non-knowledgeable folks what ASN.1 stuff you're talking about? >Should using GSSAPI not work for us for whatever reason, I think it should be >well within the GSoC timeframe to bite the bullet and cobble together an >ASN.1 parser for Negotiate, handle negotiation in Wine and use libkrb5 for >Kerberos. When I first looked at gssapi back in '98 or so, it seemed to be mostly an annoying convenience layer that just got in the way of my project (which was to add authentication to a network game library). Here's a rule of thumb: if a convenience layer does any networking for you, it will do it wrong. Let's look at Heimdal's networking, for instance. In heimdal, its networking implementation uses select(). We've spent a lot of time purging all select()'s from Wine's source tree because any application that uses select() breaks once you have fd's in your app with values above 1024. Sure, we can fix that by submitting patches to Heimdal to use poll() instead, but there are are sure to be other problems. The best thing to do is eschew all functions that do networking for you, and do it all yourself. So, can you do what you're thinking of without being forced to let gssapi do networking for you? For those just tuning in, here's some context: http://www.stacken.kth.se/lists/heimdal-discuss/2006-12/msg00030.html http://www.stacken.kth.se/lists/heimdal-discuss/2006-12/msg00033.html - Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

2 1

Re: [PATCH 2/2] comctl32: Added message sequence tests for the tab control
by Vitaliy Margolen March 3, 2007

March 3, 2007

The_Hagop wrote: > assert(tabHandle); > > - SetWindowLong(tabHandle, GWL_STYLE, WS_CLIPSIBLINGS | WS_CLIPCHILDREN | TCS_FOCUSNEVER | style); > - SendMessage (tabHandle, WM_SETFONT, 0, (LPARAM) hFont); > + if (!tabHandle) > + { > + HeapFree(GetProcessHeap(), 0, info); > + return NULL; > + } This check is redundant. assert will terminate the test if window was not created properly. You probably should remove it and skip the test. > @@ -448,22 +717,42 @@ > INT nTabsRetrieved; > INT rowCount; > > + parent_wnd = createParentWindow(); > + ok(parent_wnd != NULL, "Failed to create parent window!\n"); > + ok_sequence(sequences, PARENT_SEQ_INDEX, create_parent_wnd_seq, "create parent window", TRUE); > + flush_sequences(sequences, NUM_MSG_SEQUENCES); > + No need to test window creation sequence here. It's tested in much more details in user32/tests/msg.c Also you are leaking parent window - you don't destroying it at the end of the test. And, same as hTab, don't make it global. You are not using it outside one function. > @@ -474,6 +763,9 @@ > test_getset_tooltip(hTab); > > DestroyWindow(hTab); > + > + ok_sequence(sequences, TAB_SEQ_INDEX, destroy_tab_control_seq, "Tab sequence, after removing tab control from parent", FALSE); > + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_sequence, "Parent sequence, after removing tab control from parent", FALSE); > } > > START_TEST(tab) Same thing here - there are no common controls' related messages in them- no need to test what's already being tested in the other places. And last but not the least - your tests fail on windows 2k and xp pro in interactive mode (set WINETEST_INTERACTIVE=1): tab: 911 tests executed (0 marked as todo, 20 failures), 0 skipped. Vitaliy.

1 0

Re: DirectPlay should convert dwReserved1/2 registry keys from strings to DWORDs
by Joris Huizer March 3, 2007

March 3, 2007

if( i == 0 ) - memcpy( &lpSpData->dwReserved1, returnBuffer, sizeof(lpSpData->dwReserved1) ); + sscanf(returnBuffer, "%x", &lpSpData->dwReserved1); Couldnt you use: strcpy(lpSpData->dwReserved1,returnBuffer); Sorry for only replying now; Your solution is equivalent, except that it is looks more complicated regards, Joris --------------------------------- The fish are biting. Get more visitors on your site using Yahoo! Search Marketing.

2 2

Re: [2/?]WineD3D: Adjust the rhw transformation for offscreen rendering
by Stefan Dösinger March 3, 2007

March 3, 2007

Am Samstag 03 März 2007 02:53 schrieb Stefan Dösinger: > I hope I explained it correctly, these tripple upside down matrix things > are the perfect way to get insane. Actually that is not totally correct - it should be - Y, -Y - height. It works because all games I have seen use Y = 0 I'll resend a fixed patch

1 0

Re: DirectPlay should convert dwReserved1/2 registry keys from strings to DWORDs
by Kai Blin March 3, 2007

March 3, 2007

On Friday 02 March 2007 22:54, Alessandro Pignotti wrote: > Hi, > This is the first of several patches that will make builtin dplayx > compatible with native dpwsockx, so we can kill the native override of > dplayx This patch adds two compile-time warnings about implicitly declaring sscanf. Please include the appropriate header or provide the function header if you use sscanf. Other than that, this patch stops builtin dplay from blowing up in my face with native dpwsockx.dll. Good work. 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.

1 0

Re: (resend) Scroll window fix
by Dmitry Timoshkov March 3, 2007

March 3, 2007

"Aric Stewart" <aric(a)codeweavers.com> wrote: > + SetRect( &rc, 0,40, 100,60); > + SetRect( &cliprc, 0,0, 100,100); > + ScrollWindowEx( hwnd1, 0, -25, &rc, &cliprc, hrgn, &rcu, SW_INVALIDATE); > + SetRectRgn( tmprgn, 0,15,98,35); > + CombineRgn( exprgn, exprgn, tmprgn, RGN_OR); > + SetRectRgn( tmprgn, 0, 40, 98, 60); > + CombineRgn( exprgn, exprgn, tmprgn, RGN_OR); > + ok( EqualRgn( exprgn, hrgn), "wrong update region in excessive scroll\n"); Under which version of Windows this was tested? According to test.winehq.org this test doesn't pass under any of Win98, NT4, Win2000 nor XP invalidating the (now committed) fix. I'd vote to revert this patch as obviously incorrect. -- Dmitry.

3 4

GSoC project proposal: Implement the Negotiate and Kerberos SSPs based on GSSAPI
by Kai Blin March 3, 2007

March 3, 2007

Hi folks, after I spent my last two summers toying with the NTLM SSP, I'm considering to implement Negotiate and Kerberos this time. As we've discussed on WineConf, there's more than one way to do this. My toy idea is to not implement the ASN.1 stuff myself but instead make use of GSSAPI for this. (With the added bonus that when using Heimdal GSSAPI, we should be able to do NTLM via GSSAPI, too, so Negotiate can actually negotiate between Kerberos and NTLM). I'm not 100% sure that this approach will work, but then again, if I got and write the proof of concept now, I won't have much to do during the summer. Should using GSSAPI not work for us for whatever reason, I think it should be well within the GSoC timeframe to bite the bullet and cobble together an ASN.1 parser for Negotiate, handle negotiation in Wine and use libkrb5 for Kerberos. Dan Kegel seemed to prefer this approach, anyway. In any case I would like to keep the NTLM provider using ntlm_auth in as a fallback solution. What do you think? 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.

1 0

Re: winex11.drv: Try to work around an access violation in dib_convert
by Dmitry Timoshkov March 2, 2007

March 2, 2007

"Louis. Lenders" <xerox_xerox2000(a)yahoo.co.uk> wrote: > @@ -849,7 +858,17 @@ static void convert_888_to_0888_asis(int > for (x=0; x < w2; x++) { > /* Do 4 pixels at a time: 3 dwords in and 4 dwords out */ > DWORD srcval1,srcval2; > - srcval1=srcpixel[0]; > + /* Some apps crash in following code-line, possibly they pass a bad pointer*/ > + __TRY > + { > + srcval1=srcpixel[0]; > + } > + __EXCEPT(exception_filter) > + { > + return; > + } > + __ENDTRY; An exception handler should be set around the whole conversion cycle, not around a single pixel read since it's a very expensive (slow) operation in Wine (unlike in Windows). -- Dmitry.

1 0

Re: [2/3] wined3d: The texldl instruction takes 3 arguments
by Ivan Gyurdiev March 2, 2007

March 2, 2007

> Changelog: > - The texldl instruction takes 3 arguments > Can the SW shader handlers be deleted now that the rest of the SW code is gone. They just get out of sync when you do things like this.

2 1

Re: [programs/cacls] Dummy implementation of cacls.exe (try 2)
by Nigel "Nia-Chiang" Liang March 2, 2007

March 2, 2007

Yes, sorry about that. Here is the modified patch -Nigel On 3/2/07, James Hawkins <truiken(a)gmail.com> wrote: > > On 3/2/07, Nigel Nia-Chiang Liang <ncliang(a)gmail.com> wrote: > > Hi, > > > > This patch implements a dummy version of cacls.exe to fix bug 7593. > > > > +#RC_SRCS = wcmdrc.rc > +#RC_BINSRC = wcmdrc.rc > +#RC_BINARIES = wcmd.ico > > Did you accidentally leave these in? > > -- > James Hawkins >

1 0

Re: Forum proposal
by Tomas Carnecky March 2, 2007

March 2, 2007

Luis C. Busquets Pérez wrote: > I understand that for some people the mailing list is a far better > thing. May be for some other, a forum is better. > > Why not trying both systems? > This question has already been answered.. anyway: if you have both a ML and a forum, you effectively split the community into two parts! Nobody will be on both the forum and the ML, it will be harder for the users because they'll have to two places to go to, and it will be harder for the developers because bug-reports will be posted two two different places. tom

6 9

Re: [programs/cacls] Dummy implementation of cacls.exe
by James Hawkins March 2, 2007

March 2, 2007

On 3/2/07, Nigel Nia-Chiang Liang <ncliang(a)gmail.com> wrote: > Hi, > > This patch implements a dummy version of cacls.exe to fix bug 7593. > +#RC_SRCS = wcmdrc.rc +#RC_BINSRC = wcmdrc.rc +#RC_BINARIES = wcmd.ico Did you accidentally leave these in? -- James Hawkins

1 0

Re: kernel32: Implement ReplaceFileA/ReplaceFileW
by Felix Nawothnig March 2, 2007

March 2, 2007

(CC-ing wine-devel again) Erich Hoover wrote: >> The "right" way would probably to do the copying yourself by >> read/write.. but I dunno. > Except that it would ignore the permissions issues that have already > been coded into the copy routines (and any updates that may eventually No, CreateFile (and friends) does the permissions checks (which you would still have to call). > be made to these routines). Also, it seems to me that MSDN is > describing the list of function calls that ReplaceFile actually makes. No it doesn't? Your other objections were right. Your last version follows for wine-devel. > ------------------------------------------------------------------------ > > /************************************************************************** > * ReplaceFileW (KERNEL32.@) > * ReplaceFile (KERNEL32.@) > */ > BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName,LPCWSTR lpReplacementFileName, > LPCWSTR lpBackupFileName, DWORD dwReplaceFlags, > LPVOID lpExclude, LPVOID lpReserved) > { > HANDLE hReplaced, hReplacement; > BOOL skipBackup = FALSE; > > if(dwReplaceFlags) > FIXME("Ignoring flags %x\n", dwReplaceFlags); > /* First two arguments are mandatory */ > if(!lpReplacedFileName || !lpReplacementFileName) > { > SetLastError( ERROR_INVALID_PARAMETER ); > return FALSE; > } > /* > * Lock the "replacement" file, fail if it does not exist > */ > if((hReplacement = CreateFileW(lpReplacementFileName, GENERIC_READ, > FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, > NULL, OPEN_EXISTING, 0, 0)) == INVALID_HANDLE_VALUE) > { > return FALSE; > } > if(!LockFile( hReplacement, 0, 0, 0, 0 )) > { > CloseHandle( hReplacement ); > return FALSE; > } > /* > * Lock the "replaced" file while we're working. > */ > if((hReplaced = CreateFileW(lpReplacedFileName, GENERIC_READ, > FILE_SHARE_READ | FILE_SHARE_WRITE, > NULL, OPEN_EXISTING, 0, 0)) == INVALID_HANDLE_VALUE) > { > /* If "replaced" does not exist then create it for the lock, but skip backup */ > if((hReplaced = CreateFileW(lpReplacedFileName, GENERIC_READ, > FILE_SHARE_READ | FILE_SHARE_WRITE, > NULL, CREATE_ALWAYS, 0, 0)) == INVALID_HANDLE_VALUE) > { > UnlockFile( hReplacement, 0, 0, 0, 0 ); > CloseHandle( hReplacement ); > return FALSE; > } > skipBackup = TRUE; > } > if(!LockFile( hReplaced, 0, 0, 0, 0 )) > { > UnlockFile( hReplacement, 0, 0, 0, 0 ); > CloseHandle( hReplacement ); > CloseHandle( hReplaced ); > return FALSE; > } > /* > * If the user wants a backup then that needs to be performed first > */ > if( lpBackupFileName && !skipBackup ) > { > /* If an existing backup exists then copy over it */ > if(!CopyFileW( lpReplacedFileName, lpBackupFileName, FALSE )) > goto replace_fail; > } > /* > * Now that the backup has been performed (if requested), copy the replacement > * into place > */ > if(!CopyFileW( lpReplacementFileName, lpReplacedFileName, FALSE )) > { > /* Assume that all access denied errors are a write problem. */ > if(GetLastError() == ERROR_ACCESS_DENIED) > SetLastError( ERROR_UNABLE_TO_REMOVE_REPLACED ); > else > SetLastError( ERROR_UNABLE_TO_MOVE_REPLACEMENT ); > goto replace_fail; > } > /* Delete the replacement file */ > if(!DeleteFileW( lpReplacementFileName )) > return FALSE; > /* Unlock the handles */ > UnlockFile( hReplacement, 0, 0, 0, 0 ); > CloseHandle( hReplacement ); > UnlockFile( hReplaced, 0, 0, 0, 0 ); > CloseHandle( hReplaced ); > /* All done, file replacement successful */ > return TRUE; > > replace_fail: > UnlockFile( hReplacement, 0, 0, 0, 0 ); > CloseHandle( hReplacement ); > UnlockFile( hReplaced, 0, 0, 0, 0 ); > CloseHandle( hReplaced ); > return FALSE; > }

2 4

Re: ntdll: make exception test not hang when creating process fails
by Robert Shearman March 2, 2007

March 2, 2007

Peter Oberndorfer wrote: > --- > Did not seem to happen in the wild, > but just make sure the test fails gracefully > if launching the child fails > > Applies on top of the patch which should fix test result reporting > If it doesn't happen in the wild, then it should stay as an "ok". -- Rob Shearman

1 0

Re: kernel32: Set object security on process object in CreateProcess.[try2]
by Vitaliy Margolen March 2, 2007

March 2, 2007

Vitaliy Margolen wrote: > Removed todo from succeeding tests. > > Tests showed that only DACL can be set this way. Owner and group > are taken from the token. And we don't need SACL at this time if ever. > --- > dlls/advapi32/tests/security.c | 3 --- > dlls/kernel32/process.c | 12 ++++++++++++ > 2 files changed, 12 insertions(+), 3 deletions(-) Any reason this patch was not applied? Vitaliy.

2 1

[TOOLS/RFC] Use skip information on test.winehq.org
by Paul Vriens March 2, 2007

March 2, 2007

Hi, This patch add the skip information to test.winehq.org. I'm not a 100% sure what will happen to the already existing reports when summary.js is patched. This however is only relevant for someone opening the popup window for old reports. There could be an issue when somebody is running an old(er) winetest version and sends the results to test.winehq.org. The summary.txt will be different for the later added ones compared to the ones that are already there. Should I change the fileversion (from 3 to 4)? In that case only new type winetest reports will be accepted by test.winehq.org. Any other remarks and/or suggestions? Changelog Use skip information Cheers, Paul. Index: winetest/dissect =================================================================== RCS file: /home/wine/tools/winetest/dissect,v retrieving revision 1.21 diff -u -p -r1.21 dissect --- winetest/dissect 1 Mar 2007 18:30:28 -0000 1.21 +++ winetest/dissect 2 Mar 2007 10:10:21 -0000 @@ -143,9 +143,9 @@ if ($wine) { /Test output:\r?/ or mydie "no test header: $_"; my ($unit, $test, $source, $rev, $result); -my ($lines,$total, $todo, $failed); +my ($lines,$total, $todo, $failed, $skipped); $unit = undef; # state machine starts -$total = $todo = $failed = 0; +$total = $todo = $failed = $skipped = 0; $lines = 0; while (<IN>) { if (!defined $unit) { # new test @@ -165,13 +165,14 @@ while (<IN>) { $total += $2; $todo += $3; $failed += $4; + $skipped += $5; print OUT; } elsif (s/$unit:$test done $(-?\d+)$\r?$//) { chomp; # current test ended if ($lines==0) { - $result = "failed $1 -"; + $result = "failed $1 - -"; } else { - $result = "$total $todo $failed"; + $result = "$total $todo $failed $skipped"; } FINISH: print SUM "- $unit $test $result $source $rev\n"; @@ -183,7 +184,7 @@ while (<IN>) { mydie "can't rename $tmpfile to $testfile: $!\n"; } $unit = undef; - $total = $todo = $failed = 0; + $total = $todo = $failed = $skipped = 0; $lines = 0; } else { # current test output print OUT; @@ -191,7 +192,7 @@ while (<IN>) { } if (defined $unit) { $_=""; - $result = "failed - -"; + $result = "failed - - -"; goto FINISH; } close SUM or mydie "error writing $tmpdir/summary.txt: $!"; Index: winetest/gather =================================================================== RCS file: /home/wine/tools/winetest/gather,v retrieving revision 1.17 diff -u -p -r1.17 gather --- winetest/gather 11 Jan 2007 17:03:43 -0000 1.17 +++ winetest/gather 2 Mar 2007 10:10:21 -0000 @@ -94,10 +94,10 @@ foreach my $file (glob "$datadir/$build/ next; } while (<TEST>) { - my ($digest, $unit, $test, $count, $todo, $error, + my ($digest, $unit, $test, $count, $todo, $error, $skipped, $source, $rev) = split; my $testname = "$unit:$test"; - $testref->{results}->{$testname} = [$count, $todo, $error]; + $testref->{results}->{$testname} = [$count, $todo, $error, $skipped]; $alltests{$testname} = "http://cvs.winehq.org/cvsweb/wine/$source" . ($rev ne "-"?"#rev$rev":"") unless exists $alltests{$testname}; if ($count ne "failed") { @@ -215,7 +215,7 @@ sub singletest { print OUT " <td class=\"${vis}note\">.</td>\n"; } else { my $file = "$test->{dir}/$testname.txt"; - my ($count, $todo, $error) = @{$test->{results}->{$testname}}; + my ($count, $todo, $error, $skipped) = @{$test->{results}->{$testname}}; if ($count eq "failed") { my $msg = $todo eq "-"?"crash": $todo == 258?"timeout":"failed"; @@ -226,8 +226,8 @@ sub singletest { print OUT <<"EOF"; <td class="$vis$class"><a href="$file" - title="$count tests, $todo TODO, $error errors" - onMouseOver="refresh('$testname','$groupname $test->{tag}',$count,$todo,$error);" + title="$count tests, $todo TODO, $error errors, $skipped skipped" + onMouseOver="refresh('$testname','$groupname $test->{tag}',$count,$todo,$error,$skipped);" >$error</a></td> EOF } Index: winetest/resultform.html =================================================================== RCS file: /home/wine/tools/winetest/resultform.html,v retrieving revision 1.1 diff -u -p -r1.1 resultform.html --- winetest/resultform.html 19 Feb 2004 22:00:34 -0000 1.1 +++ winetest/resultform.html 2 Mar 2007 10:10:21 -0000 @@ -34,6 +34,10 @@ <td>Errors:</td> <td><input type="text" name="errors" size="6" readonly></td> </tr> + <tr> + <td>Skipped:</td> + <td><input type="text" name="skipped" size="6" readonly></td> + </tr> </form> </body> </html> Index: winetest/summary.js =================================================================== RCS file: /home/wine/tools/winetest/summary.js,v retrieving revision 1.2 diff -u -p -r1.2 summary.js --- winetest/summary.js 11 Jan 2005 16:00:44 -0000 1.2 +++ winetest/summary.js 2 Mar 2007 10:10:22 -0000 @@ -9,7 +9,7 @@ function isopen () { return result_window && result_window.document && result_window.document.results; } -function refresh (test, version, tests, todo, errors) { +function refresh (test, version, tests, todo, errors, skipped) { if (isopen ()) { var form = result_window.document.results; form.test.value = test; @@ -17,6 +17,7 @@ function refresh (test, version, tests, form.tests.value = tests; form.todo.value = todo; form.errors.value = errors; + form.skipped.value = skipped; result_window.focus (); } } @@ -31,5 +32,6 @@ function clone () { cf.tests.value = rf.tests.value; cf.todo.value = rf.todo.value; cf.errors.value = rf.errors.value; + cf.skipped.value = rf.skipped.value; } }

1 0

Re: kernel32: Fix GetComputerNameA to not count trailing NULL
by Dmitry Timoshkov March 2, 2007

March 2, 2007

"Alasdair Sinclair" <alasdairs(a)dsl.pipex.com> wrote: > GetComputerNameA shouldn't count the trailing NULL when returning the > buffer. > --- a/dlls/kernel32/computername.c > +++ b/dlls/kernel32/computername.c > @@ -390,8 +390,7 @@ BOOL WINAPI GetComputerNameA(LPSTR name, LPDWORD size) > else > { > WideCharToMultiByte ( CP_ACP, 0, nameW, -1, name, len, NULL, 0 ); > - name[len] = 0; > - *size = len; > + *size = len - 1; > ret = TRUE; This change requires a test case. -- Dmitry.

1 0

Re: [try3, 4/4] msi: Add full JScript/VBScript support.
by James Hawkins March 1, 2007

March 1, 2007

On 3/1/07, Misha Koshelev <mk144210(a)bcm.tmc.edu> wrote: > No changes from previous version. > > Implements the IActiveScriptSite interface which links with the session > object implemented in patch #3 and then adds a call to the script > handler from the common script handling function implemented in patch > #1. This fixes bug #7357 and possibly others. > > Changelog: > > * msi: Add full JScript/VBScript support. > +static HRESULT ASS_create(IUnknown *pUnkOuter, LPVOID *ppObj) +{ I'm not trying to be immature, but you should probably come up with a better prefix. + * Call a script. This is our meat and potatoes. + * - Currently, since the function is relatively new, it will always end up returning S_OK. + * Think of it like a bonus feature, we can run the script - great. If we have a problem, + * we are no worse off than if this function had not been called. + */ +DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function, LPCWSTR action) +{ ... +/* return ret; */ + return ERROR_SUCCESS; /* FIXME: Until thoroughly tested, always return success */ This is wrong...and a hack. Don't be afraid of bugs. By always returning ERROR_SUCCESS, you're just hiding the bugs. What testing are you referring to? If a user runs an installer and the script fails, yet we return ERROR_SUCCESS, how are we going to know that the script is the problem? +static HRESULT WINAPI MsiActiveScriptSite_GetLCID(IActiveScriptSite* iface, LCID* plcid) +{ + MsiActiveScriptSite *This = (MsiActiveScriptSite *)iface; + TRACE("(%p/%p)->(%p) stub!\n", This, iface, plcid); + return E_NOTIMPL; +} If it's a stub, it needs to be marked with a FIXME. -- James Hawkins

2 3