June 2014 - Wine-Devel - list.winehq.org

Error handling in RpcBindingVectorFree (dlls/rpcrt4/rpc_binding.c)
by Gerald Pfeifer Nov. 22, 2020

Nov. 22, 2020

Looking at RPC_STATUS WINAPI RpcBindingVectorFree( RPC_BINDING_VECTOR** BindingVector ) { RPC_STATUS status; ULONG c; TRACE("(%p)\n", BindingVector); for (c=0; c<(*BindingVector)->Count; c++) { status = RpcBindingFree(&(*BindingVector)->BindingH[c]); } HeapFree(GetProcessHeap(), 0, *BindingVector); *BindingVector = NULL; return RPC_S_OK; } we currently always ignore the outcome of RpcBindingFree and return RPC_S_OK. However, there is one case where RpcBindingFree returns something different (which is if *Binding is null when RPC_S_INVALID_BINDING is returned). What is the proper way of handling this? Just keeping the code as is and removing the unused status variable? Breaking the loop once RpcBindingFree returns something different from RPC_S_OK? Continuing and returning the first / the last status different from RPC_S_OK? Gerald

1 1

ntoskrnl.exe: unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces
by Qian Hong Sept. 28, 2018

Sept. 28, 2018

Dear all, While test another online bank with wine ActiveX, I got an unimplemented fuction of ntoskrnl: IoGetDeviceInterfaces, I found it listed in http://source.winehq.org/WineAPI/ntoskrnl.html as a stup, so I can't understand this log: wine: Unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces called at address 0x7b839552 (thread 0022), starting debugger... Grateful for any explain! env: wine1.3.12 on Ubuntu 10.04 Here are the steps: 1. install an ActiveX from https://e.bank.ecitic.com/perbank5/plugs/CNCBSecPkg_EN.exe $ rm -rf ~/.wine $ winetricks -q mfc42 $ wine CNCBSecPkg_EN.exe fixme:ole:DllRegisterServer stub fixme:win:DisableProcessWindowsGhosting : stub fixme:msg:ChangeWindowMessageFilter c057 00000001 fixme:msg:ChangeWindowMessageFilter c057 00000001 fixme:msg:ChangeWindowMessageFilter c057 00000001 fixme:ole:CoCreateInstance no instance created for interface {ea1afb91-9e28-4b86-90e9-9e9f8a5eefaf} of class {56fdf344-fd6d-11d0-958a-006097c9a090}, hres is 0x80004002 fixme:sfc:SfcIsFileProtected ((nil), L"C:\\Program Files\\\4e2d\4fe1\94f6\884c\7f51\94f6\5b89\5168\63a7\4ef6\\unins000.exe") stub fixme:win:WINNLSEnableIME hUnknown1 0x1011a bUnknown2 0: stub! fixme:win:WINNLSEnableIME hUnknown1 0x1011a bUnknown2 -1: stub! fixme:win:WINNLSEnableIME hUnknown1 0x1011a bUnknown2 0: stub! wine: Call from 0x7b839552 to unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces, aborting wine: Unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces called at address 0x7b839552 (thread 002b), starting debugger... wine: Call from 0x7b839552 to unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces, aborting wine: Call from 0x7b839552 to unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces, aborting 2. open the online bank entry with wine builtin IE, then IE will crash: $ wine iexplore https://e.bank.ecitic.com/perbank5/signIn.do Please checkout the full log here: http://pastebin.com/rbAg7gwj Should I file a singel bug in ntoskrnl component , or separate bugs, one for ntoskrnl and one for the IE crashing? Generalliy what component should I switch while file a bug about IE crashing? Many thanks! -- Regards, Qian Hong - Sent from Ubuntu http://www.ubuntu.com/

5 6

ODBC Databases: Jet/Access success
by Barry Bird June 14, 2018

June 14, 2018

Good Afternoon. In section 3.3.6.2 of your User Guide you ask readers to report successes with databases other than MS SQL. Well here's one (I know Access 2000 can work with Wine, but this doesn't require Access): How to set up Wine to enable Windows programs that read and write to Jet (Access) databases using ODBC. I write such programs in C and use the API defined in ODBC API Reference http://msdn.microsoft.com/en-us/library/ms714562%28VS.85%29.aspx They work fine on Windows and only require Mingw to be installed to compile and link them, both for console programs and those using Windows SDK. You then can write interactive programs in C which use a full-featured SQL database which comes bundled with Windows. No need to purchase Access. With the set-up below they will also run on Linux (Kubuntu 9.04) and Wine 1.1.26. You need to update the registry to install the Access drivers. Under Windows, export from the Registry to *.reg files the registry entries - HKLM\Software\ODBC - HKLM\Software\Microsoft\Jet all subsidiary keys and values come with them. You can carefully edit these files to remove drivers and DSNs you don't need. Import these files using the registry editor in wine: wine regedit.exe. You need to bring across from Windows to Windows\System32 under wine: clbcatq.dll comres.dll expsrv.dll msjet40.dll mswstr10.dll msjter40.dll msjint40.dll msjtes40.dll msrd3x40.dll odbc32.dll odbccp32.dll odbcji32.dll odbcjt32.dll odbcad32.exe odbcint.dll odbctrac.dll vbajet32.dll Register this server in wine: wine regsvr32.exe msjtes40.dll No need to install MDAC. To use Windows ODBC drivers, you have to override Wine's odbccp32.dll and odbc32.dll with the native versions because the Wine versions are currently wired directly to Linux's unixodbc. This can be done by setting up the ODBC Data Source Administrator odbcad32.exe using winecfg: - Add the program to the Applications tab - then in the libraries tab, pick from 'New override for library' drop-down odbc32.dll and odbccp32.dll add them and edit them to be Native for Windows. Then if you do wine odbcad32.exe this brings up the ODBC Data Source Administrator window as in the Windows Control Panel If needed, set up (System) DSNs using this program. Bring across the programs and *.mdb database files from Windows. Using winecfg, you need to set up each program you want to run with overrides for odbc32.dll and odbccp32.dll (Applications and Libraries tabs) as above. The programs should then run as they did in Windows but perhaps a bit slower with: wine Odbc-prog.exe This has been tested twice on a clean .wine install. I cannot vouch for support of all API and SQL facilities however. I hope someone finds this useful. Barry Bird

5 4

IMM / IME work
by Aric Stewart June 16, 2016

June 16, 2016

Hello all, I know this will only interest a small portion of you but thought i would give a quick update on the state of IMM32 since I have brought it to a major milestone. All the main patches are in which now separate IMM32 and IMEs. There is still more work to do but the major framework is in place. X11 XIM processing should be unchanged. However wine can now begin to load native windows IMEs as well. I have tested with windows ATOK20 (a popular Japanese IME) and successfully had text processing in a fully IME aware application. There are still clear issues to resolve in many aspects of this processing but we have forward progress. ImmInstallIME does not work yet, nor does switching keyboards. So to get the native IME to work you need to add this registry key. [System\\CurrentControlSet\\Control\\Keyboard Layouts\\<keyboard layout>] "Ime File"=<IME filename> so for example for ATOK20 in Japanese i used. [System\\CurrentControlSet\\Control\\Keyboard Layouts\\e0010411] "Ime File"="ATOK20W.IME" I would love to hear how well things work. I am sure using native IMEs will quickly show us many places where IMM32 needs to be improved. One issues I am going to investigate next is that sometimes non x11drv ime initialization, if occurring too early, causes x11drv to fail to create windows. I have not investigated with the latest changes to xim.c (which may already correct this problem) but if you see this problem this patch may help and i believe the IME_UpdateAssociation(NULL) is already unneeded. diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index d4df9f7..0c98136 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -475,7 +475,6 @@ static void X11DRV_OpenIM(Display *display, XPointer ptr, XP XUnregisterIMInstantiateCallback(display, NULL, NULL, NULL, X11DRV_OpenIM, wine_tsx11_unlock(); IME_XIMPresent(TRUE); - IME_UpdateAssociation(NULL); } thanks, -aric

5 7

Re: XInput [1/4]: Implement XInputGetState
by Stefan Dösinger July 5, 2015

July 5, 2015

Am 09.07.2009 um 02:58 schrieb Michael Gruber: > This patch series implements parts of the XInput library. You can use > this to play games that support Xbox 360 Controllers. To be able to > use this you will need to have your Controller working on Linux via > the xpad kernel driver and the event interface. It will not work on > any OS other than Linux. It supports gamepads, should work with > guitars and wheels, but will not work with dance-mats. > <1-XInputGetState.patch> Is it possible to implement XInput on top of DirectInput? DirectInput already has some internal abstraction layers for differnet joystick APIs, and has basic support for OSX joysticks. Does DInput have enough capabilities to access all the Xbox controller's features? My gut says no, otherwise MS wouldn't have created a new lib. I guess its worth checking though.

5 6

Wine 64 bit
by Kevin Davies June 5, 2015

June 5, 2015

Hello, Where would you find information on wine64 status for running 64 bit windows software under OSX. These days a lot of Windows programs are going 64bit to make use of the available memory. Its becoming necessary to have this capability. Many thanks Kevin

13 31

Re: [PATCH] user32/tests: Test SetUserObjectInformation for invisible winstation.
by Alexandre Julliard April 23, 2015

April 23, 2015

Qian Hong <qhong(a)codeweavers.com> writes: > --- > dlls/user32/tests/winstation.c | 57 > ++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 57 insertions(+) Can you please fix the test failures introduced by your previous changes first? cf. https://test.winehq.org/data/tests/user32:winstation.html -- Alexandre Julliard julliard(a)winehq.org

3 8

[RFC 0/11] Linux FF: Intro
by Elias Vanderstuyft Sept. 7, 2014

Sept. 7, 2014

Hi, This is the sequel of the mail with title: "Discussion and Improvement of Wine's Linux Force Feedback implementation". This mail is meant to give an introduction to the next 11 mails: All tests were performed using wine-1.7.11-206-g82b3813 (but none of the files of which I propose changes to be made in, are affected in the current (2014-03-04) wine-version 1.7.13) Because I haven't created any (formal) patch yet (and instead first request for comments), I tried to keep the line numbers to reference the affected files more or less based to the version I started from, where I could. However, the orig code of a (informal) patch that has to be applied after (and thus is dependent of) a previous patch, may be different from the initial code of the wine-version I started from. After having discussed everything, I will send a proper patchset. In these mails, sometimes 'FEdit' is mentioned: it's a MS application that allows to create all FF effect types (except CustomForce and rumble/vibration effects), and therefore the ideal test application. Physical behavior is compared between Windows7 (using Logitech MOMO wheel with latest drivers installed) running in Virtualbox, and my patched Wine-version. In the end, (using a dummy FF driver on the Linux side, thanks to Michal Malý), the behavior of Wine is almost (limitations caused by the dummy ff driver, such as updating an effect while playing is not implemented) identical, if not better (in some aspects) then the Windows equivalent. Sometimes I refer to linux-input mailing lists to prove a statement, because the links may vanish (unlikely though), I provide the titles corresponding with the links: (http://www.mail-archive.com/linux-input(a)vger.kernel.org/msg08513.html) "ff-core effect id handling in case of a failed effect upload" (http://www.mail-archive.com/linux-input(a)vger.kernel.org/msg08459.html) "Questions about the documentation/specification of Linux ForceFeedback input.h" Subjects [11] ------------- - Joystick control panel program [2] - Linux effect status management [3] - Linux effect parameter: start delay [1] - Linux effect parameter: periodic effect's phase [1] - Linux effect parameters: time parameters [3] - Linux effect: conditional effect's parameters [2] - Linux effect: axes [1] - Linux effect direction [7] - Linux effect parameters (global) [6] - Linux joystick initialization [1] - Debug message fixes/additions [6] Elias

2 3

Re: configure: Add -linotify when present, for non-Linux platforms.
by Alexandre Julliard Aug. 23, 2014

Aug. 23, 2014

Gerald Pfeifer <gerald(a)pfeifer.com> writes: > A FreeBSD user ran into this when sys/inotify.h was present via an > extra package and Wine went ahead using that, only to fail at link- > time. We'd want to use kqueue instead on FreeBSD. -- Alexandre Julliard julliard(a)winehq.org

2 1

What happened to the Fedora packages?
by Neal Gompa Aug. 2, 2014

Aug. 2, 2014

What happened to the Fedora packages? They have not been updated since 0.9.2!!!! Right now it is at 0.9.10!!! Nearly every other Linux distro supported has the up to date packages!!! And why does the Red Hat packages site not go to the SourceForge site as it does for SUSE packages and the others?? I have not really had the guts to ask until now, because I thought that maybe there was a slump, but now, its getting annoying!! And Fedora just released Fedora Core 5 yesterday!!! Please tell me new packages will be ready soon!!! Compiling WINE always crashes my computer, so I prefer to use the RPMs...

10 18

New WineHQ Server
by Jeremy White July 11, 2014

July 11, 2014

Hi Folks, As you probably saw, we have deployed a new server to replace our 5 year old work horse. This new server will hopefully hold us for the next 5 years. It's got good specs; 6 core Xeon, 32G of RAM (easily expandable to 128), raid 10 (also easily expandable). In a particularly nice development, this server was purchased by the Software Freedom Conservancy using funds provided by a donor. This donor doesn't want a particularly big fuss made out of it, and so prefers that I not announce a name publicly. I'd like to thread this needle somewhat carefully, as *I* think it's a remarkably generous gift. So I propose that, at our next convenient opportunity, we all lift a glass in appreciation of anonymous donors everywhere! Cheers, Jeremy

4 3

Re: [PATCH 6/6] wined3d: Do not warn about WINED3DUSAGE_WRITEONLY.
by Henri Verbeet July 7, 2014

July 7, 2014

On 3 June 2014 09:41, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > As the previous tests show, we can't do anything with this flag. Sort of. It may make sense to set WINED3D_BUFFER_DOUBLEBUFFER if WINED3DUSAGE_WRITEONLY isn't set.

2 7

Wine freetext search no longer working
by Hugh McMaster July 3, 2014

July 3, 2014

As of 29 June 2014, the freetext source code search option at http://source.winehq.org/search is not working. The error message is "Unexpected return value 2 from Glimpse". A quick search on the internet reveals the following from http://lxr.sourceforge.net/en/troubleshooting.shtml: Unexpected return value x from Glimpse Glimpse was unable to complete the free-text search query. If x is 2, files are inaccessible. These usually are the auxiliary caches, which may be missing or have incorrect access rights. The relevant directory is defined by the 'glimpsedir' or 'glimpsedirbase' configuration parameters. There is no problem with the identifier search option. -- Hugh McMaster

2 3

Re: [PATCH 3/3] winecoreaudio.drv: Use AUHAL API instead of AudioQueue
by Ken Thomases July 1, 2014

July 1, 2014

Hi, I'm concerned about the use of the AudioConverter API within the capture callback (ca_capture_cb). I have it embedded in my memory that it's not permitted to call a converter on the device thread. I can't find a hard and fast declaration of that in the documentation, although Technical Note TN2091: Device input using the HAL Output Audio Unit does say this: <https://developer.apple.com/library/mac/technotes/tn2091/_index.html> "If sample rate conversion is needed, it can be accomplished by buffering the input and converting the data on a separate thread with another AudioConverter." If what you're doing were allowed, it would seem they would have mentioned that and not suggested the use of "a separate thread". It also seems that the HAL Output Audio Unit would just do this itself and not have the restriction on the sample rate in the first place. I could have sworn that the API would actually generate errors if you tried to use it on the AUHAL's thread, but I may be thinking of the AUConverter audio unit, instead. Ah, after more searching, I believe it was for the AUConverter audio unit. There's an error, kAudioUnitErr_CannotDoInCurrentContext, that is generated if you try to use such a unit or if you try to make the AudioOutputUnit do the conversion itself. Besides my specific recollection that sample rate conversion is not allowed, there's the general requirement to avoid slow operations in those callbacks. The call to AudioConverterFillComplexBuffer() may be such a slow operation. So could the calls to malloc() in your ca_capture_cb() and feed_cb(). Could you not move the sample rate conversion to the application thread, at the point where the application calls in to get the captured data (or metadata about it)? In AudioClient_IsFormatSupported(), is it really the case that any format for which a stream description can be constructed is supported? Is there a need to try setting the format on an AudioConverter to see if it will accept it? There are still two mentions of AudioQueue in lines like: WARN("AudioQueue doesn't support per-channel volume control\n"); -Ken

2 1

Re: d3dx9: Implement D3DXCreateTorus() + tests
by Matteo Bruni June 30, 2014

June 30, 2014

Hi Gediminas, 2014-06-30 19:29 GMT+02:00 Gediminas Jakutis <gediminas(a)varciai.lt>: > --- > dlls/d3dx9_36/d3dx9_36.spec | 2 +- > dlls/d3dx9_36/mesh.c | 129 +++++++++++++++++++++++++++++++ > dlls/d3dx9_36/tests/mesh.c | 183 ++++++++++++++++++++++++++++++++++++++++++++ > include/d3dx9shape.h | 2 + > 4 files changed, 315 insertions(+), 1 deletion(-) > +HRESULT WINAPI D3DXCreateTorus(struct IDirect3DDevice9 *device, + float innerradius, float outerradius, UINT sides, UINT rings, struct ID3DXMesh **mesh, ID3DXBuffer **adjacency) The "usual" style is 8 spaces for line continuations (that also applies to some other places in the patch). + float sin; + float cos; Not really an issue but I'd prefer if these wouldn't shadow the functions from math.h. + if (!device || innerradius < 0.0f || outerradius < 0.0f || sides < 3 || rings < 3 || !mesh) + { + return D3DERR_INVALIDCALL; + } Not strictly required but you can either avoid the curly braces (here and below) or add a WARN for the error return condition. Probably a WARN here is nicer. + rotation_step = D3DX_PI / sides * -2.0f; + rotation_curr = 0; Please use 0.0f there instead. + for (i = 0; i < sides; ++i) + { + sin = sinf(rotation_curr); + cos = cosf(rotation_curr); + vertices[i].position.x = innerradius * cos + outerradius; + vertices[i].position.y = 0.0f; + vertices[i].position.z = innerradius * -sin; + vertices[i].normal.x = cos; + vertices[i].normal.y = 0.0f; + vertices[i].normal.z = -sin; + + rotation_curr += rotation_step; + } I might be mistaken but I think you can remove the "-" from the previous "-2.0f" and from both "-sin" here. + for (i = 0; i < numfaces - sides * 2; ++i) + { + faces[i][0] = i % 2 ? i / 2 + sides : i / 2; + faces[i][1] = (i / 2 + 1) % sides ? i / 2 + 1 : i / 2 + 1 - sides; + if ((i + 1 >= sides * 4) && !((i + 1) % sides) && !((i + 1) / sides % 2)) + { + faces[i][2] = (i + 1) / 2; + } + else if (i) + { + faces[i][2] = (i + 1) % (sides * 2) ? (i + 1) / 2 + sides : (i / sides) * sides; + } + else + { + faces[i][2] = sides; + } + } Can't the last "else" just be dropped (and the condition from the previous "else" removed)? I.e. the first "else" for the i == 0 case is equivalent to the second one, AFAICS. Actually the first two branches also look to be the same so this should be enough for the third vertex of each face: faces[i][2] = (i + 1) % (sides * 2) ? (i + 1) / 2 + sides : (i + 1) / 2; + for (j = 0; i < numfaces; ++i, ++j) + { + faces[i][0] = i % 2 ? j / 2 : sides * (rings - 1) + j / 2; This should be equivalent: faces[i][0] = i % 2 ? j / 2 : i / 2; I don't mind all that much for this one though. + faces[i][1] = (i / 2 + 1) % sides ? i / 2 + 1 : i / 2 + 1 - sides; + faces[i][2] = i == numfaces - 1 ? 0 : (j + 1) / 2; + } I guess this separate loop for the last "strip" of the mesh is there to avoid a bunch of "% numvert" in the previous loop. That's okay for me. + hr = D3DXCreateTorus(NULL, 0.0f, 0.0f, 3, 3, &torus, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n",hr,D3DERR_INVALIDCALL); Missing spaces after the commas. The notes regarding vertices and faces generation also apply to compute_torus in the test obviously. For some reason your patch has DOS-style CRLF line terminators and that made "git apply" fail for me. Testbot didn't complain though so probably that's not an issue. Generally it's preferred to generate patches with "git format-patch" or even better directly "git send-email".

1 0

Re: [PATCH] riched20: Don't create too many IRichEditOle interfaces for a RichEdit. (try 3)
by Huw Davies June 30, 2014

June 30, 2014

On Thu, Jun 26, 2014 at 02:52:16PM +0800, Jactry Zeng wrote: > diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c > index 2af2582..55821bf 100644 > --- a/dlls/riched20/editor.c > +++ b/dlls/riched20/editor.c > @@ -4468,7 +4468,20 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, > case EM_GETOLEINTERFACE: > { > LPVOID *ppvObj = (LPVOID*) lParam; > - return CreateIRichEditOle(editor, ppvObj); > + if (editor->reOle) > + { > + *ppvObj = editor->reOle; > + IRichEditOle_AddRef(*ppvObj); > + return 1; > + } > + > + if (CreateIRichEditOle(editor, ppvObj)) > + { > + editor->reOle = *ppvObj; > + IRichEditOle_AddRef(*ppvObj); > + return 1; > + } > + return 0; I'm sure you can think about how to simplify this a bit. The clue that it needs simplification is that you've got two AddRef()s in there. Hint: The code is trying to do two things: 1. If needed, assign an interface to reOle 2. AddRef and return. > --- a/dlls/riched20/richole.c > +++ b/dlls/riched20/richole.c > @@ -126,12 +126,13 @@ IRichEditOle_fnRelease(IRichEditOle *me) > > TRACE ("%p ref=%u\n", This, ref); > > - if (!ref) > + if (ref == 1) > { > TRACE ("Destroying %p\n", This); > This->txtSel->reOle = NULL; > ITextSelection_Release(&This->txtSel->ITextSelection_iface); > IOleClientSite_Release(&This->clientSite->IOleClientSite_iface); > + This->editor->reOle = NULL; No, this is wrong. This function should remain unchanged. The editor is in charge of the reOle reference, so it needs to release it when the editor is destroyed - ie in ME_DestroyEditor(). Huw.

2 2

RFC: patch 105133
by Jérôme Gardou June 30, 2014

June 30, 2014

Hello wine team. According to the patch status page, the following patch is still marked as "new". http://source.winehq.org/patches/data/105133 Is there any prioritisation for the testbot regarding the jobs it processes ? Also, that put aside, I'd like to discuss the approach and the problem there as I understand it: with "modern" stubs, allocations and frees are made per argument. If there is no prioritisation on how this is done, the "freeer" of one argument can rely on data which were freed before in the loop and overwritten, thus causing the mayhem in the heap that can be witnessed here (see https://bugs.winehq.org/show_bug.cgi?id=36743) The patch tries to overcome the problem and frees the arguments marked as "MustFree" before anything else. I believe this is the right approach, but a comment from someone more proficient as me in RPC matters would be greatly appreciated. Regards Jérôme

2 3

Re: [PATCH 3/5] d3d8: Check the device status in present calls.
by Marvin June 30, 2014

June 30, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7768 Your paranoid android. === w8 (32 bit device) === device.c:2397: Test failed: Expected foreground window 000301BA, got 0002004C. device.c:3039: Test failed: Expected wndproc 0x412780, got 0x412780.

1 0

Re: [PATCH 2/5] d3d8: Improve d3d8_device_TestCooperativeLevel().
by Marvin June 30, 2014

June 30, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7767 Your paranoid android. === w8 (32 bit device) === device.c:2397: Test failed: Expected foreground window 000301BA, got 0002004C. device.c:3039: Test failed: Expected wndproc 0x412780, got 0x412780.

1 0

Re: [2/2] ddraw: add dsurface dimension tests, try 10
by Stefan Dösinger June 30, 2014

June 30, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, You forgot to fix some IDirectDrawSurface2 macros. Otherwise this looks good. Thanks again for your work! Stefan Am 2014-06-29 16:37, schrieb Patrick Rudolph: > + hr = IDirectDraw2_CreateSurface(ddraw, &surfacedesc, &surface, NULL); > + ok(hr == tests[i].hr, "Pixelformat %s, test %d returned %08x\n", formats[j].name, i, hr); > + > + if (surface) > + { > + IDirectDrawSurface2_Release(surface); > + surface = NULL; > + } > ... > + hr = IDirectDraw2_CreateSurface(ddraw, &surfacedesc, &surface, NULL); > + ok(SUCCEEDED(hr), "CreateSurface returned %08x\n", hr); > + if (surface) > + { > + hr = IDirectDrawSurface2_GetSurfaceDesc(surface, &surfacedesc); > + ok(SUCCEEDED(hr), "GetSurfaceDesc returned %x\n", hr); -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJTsTBWAAoJEN0/YqbEcdMwThEP/3uJuJuU4gZNiiRy3AkP6guK cVnLXyasOBmwMNxLSFnt1RXQmYmcmY/cR16I/RRd1NbemC8+tB8PbO3Vp6bTGnx0 i4ZM+EFh+6F6xFzjua99sK67x0MNXqW+fp1L8tz5804piaqcJK/MX9XloMeG45ZL WrGVFqZnFKb67OjoXKqZSo0S4bR/GJveRz9x8KxpGnqsc2Wa/sRftIoiO67FSoaq P1ffH0OEPbkj7pzXFyV2BwHFVIC4LzFXmTWVNgmZfNSnTPossSyg8tuCe9+ZvVZa lVHRu95nda2nh/RRfEk+jH2strX2psmb20/bsNa1RQ4ujWJT+HBcaGbeicsyzqZL i+iJjNG/Pm0DRZ6DPfnUfW6/xIJW89L1fZ8sHLtSJ+jsR3tGQeYV5IAh0G5SBnM2 tXsbrQkVeZ3UfwGVK3zxl+C4UqkXyOhxSR2Bagr3QJqPGi7z2MR0/ScRdfJAAuMj 3yUbHZFYzsGBrgWZ4LYGDaZN2HL2Bnb7Er7QXPCSApgE8klHUwGTOPiRmyuKyYkJ cgysMnnxflVRwLEaMO6roLw4xL849yOiWGIJkFJ+zWZxuweEBEjOPUUv7ch+PfLY UNAWE7+BerPf/0UyNZvXw3MtYOd7cQxFCfwItboUV3iFEaG3ZBYhpT6+/mITHJ2i eP7C9M4fGnoU8F6TbLcZ =ELAp -----END PGP SIGNATURE-----

1 0

Re: [1/2] ddraw: add dsurface dimension tests, try 10
by Stefan Dösinger June 30, 2014

June 30, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, This patch looks good to me. There are two minor style issues, but I don't think they warrant a resend. If Henri has further suggestions you can fix those style issues as well: Note that I have not tested them on Windows yet. My my Mingw is currently broken, and I'm still struggling with Gentoo's crossdev tool. The tests pass on Linux on 32 and 64 bit Wine builds. Am 2014-06-29 16:37, schrieb Patrick Rudolph: > + if ((desc->dwWidth>0xFFFF) || (desc->dwHeight>0xFFFF)) Most other places (and your patch 2) use 0xffff and spaces around ">". > - > - /* Check that we have enough video ram left */ > + > if (pool == WINED3D_POOL_DEFAULT && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) Trailing whitespace. I think Alexandre's git automatically removes that. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJTsS+qAAoJEN0/YqbEcdMwrjwP/1duFUNuI9buzIl58xj/uRc0 zueU33ssfT0ktJWY2RIWpsOQI79j+WX3MlQvRTCKBY6vYPhYKM8DzAN4QNgGhGLT yPBnmrKQiQwRfmDlpXJkwB1/mV3gSIc6RYHW2vMu2qyiOAPS13Mb5gDuQFnlhLNm tlWrVmvTslkL0hdFt5w/uumqZO/NHnN7kdSktMHFtdQaRYT9PSldYGdYQTT4mFul 8lQ2DaKfUQPc92iJSywEMRwQs/NZf0FYsNaNN47YDAj+8xi4tsQjHoSAZzaU6LVP /izGhSzwTFToEO+MHgYbuU8NNFLSGcceNSkaEzMikIyLYvaHYvBhRSnb9ki6Y04s F2timDIagvSUqn97GTlM2FvQBn8vHVlTFLKx4FPlFC6sFXoJPkQkDf6zjPuRn4oY ZkbXemBJNnU+sLHoOpRJGhoYLktEYmOvHc0WPar3QvrGd1xKbUeRAOUO5YMMPiKe CbhBs00GBrxjaBoXUkiGRnHCs+cBRIo3IbcFrCE3LX5/aDlASNg70p6y2JqGi+BJ aiitq7ds6+OAlvbagPwuuR2YMfSVa5DFbvi8kMpJj+Uh+VQa/8829oY1XVqS3n9j uE/Vd1LqCmLA/wKVG8WqJ60O/pz0nO3fXx4ChLp3fVWu+DHF+XT4PW83FFAX8+u/ jkU5hoc6qI3sXbmggbS6 =ApEH -----END PGP SIGNATURE-----

1 0

Re: [PATCH 3/5] d3d8: Check the device status in present calls.
by Michael Stefaniuc June 30, 2014

June 30, 2014

On 06/30/2014 11:17 AM, Henri Verbeet wrote: > diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c > index e9f4976..067a3e0 100644 > --- a/dlls/d3d8/swapchain.c > +++ b/dlls/d3d8/swapchain.c > @@ -91,11 +91,15 @@ static HRESULT WINAPI d3d8_swapchain_Present(IDirect3DSwapChain8 *iface, > const RGNDATA *dirty_region) > { > struct d3d8_swapchain *swapchain = impl_from_IDirect3DSwapChain8(iface); > + struct d3d8_device *device = impl_from_IDirect3DDevice8(swapchain->parent_device); I kinda don't like this: impl_from_IFoo() should be called only from methods of IFoo. For the rest there is unsafe_impl_from_IFoo(). But in this case, my first impulse would be to make swapchain->parent_device a struct d3d8_device thus avoiding the impl_from_IDirect3DDevice8() altogether. bye michael

1 0

Test bot error unrelated to patch, should I resend?
by Joris van der Wel June 29, 2014

June 29, 2014

After I submitted a patch the testbot failed because of an error unrelated to my patch: === build (build) === Could not copy the patch to the VM: the "nc -q0 '10.42.42.130' '4242'" command returned 1 Should I resend my patch, or will this be resolved on its own? Thanks

3 3

Re: [Patch 1/2] winecfg: Set default button in Libraries tab [fixes bug 12804]
by André Hentschel June 29, 2014

June 29, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 24.06.2014 10:35, schrieb Hugh McMaster: > This patch sets the default button to IDC_DLLS_ADDDLL in the Libraries tab of winecfg when a user is typing in the combo box. > > This allows the user to hit the Enter key and add the override. Currently, hitting the Enter key closes winecfg, which is causing problems with many users. > > The patch fixes bug 12804 and was tested by Austin English. That's just a workaround, if you modify winecfg to run on Windows you'll see that the button works there as expected, the problem lies deeper in the Wine code... Of course we maybe want a workaround to satisfy our users... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQGcBAEBAgAGBQJTqdjyAAoJEGm5GZTakYsswH4L/198JPSwjgYiwSnLkYgBjZJ6 YD5XWVA3YfdexdV2urNIIN8fHv97xVR9INqnbEksS/HJpTY9QU9CIYTSw8IkxlS4 3423KKJe+St7cjKLwoAMFK6LJNQrtloxik2S8Y7y7QMLocPxmRPZOFK45032RTEM BH/vAwxtud4yux13rKsl9TX4Z6LwoqeKcGk9k0I2vYy0ez53rIS0bP9sytasNTLL 34Vmj65kVX5lQGYNhECgkd5W2LNDSUxXecpc+BQ1iaHNNnGkne0uZPERVoqIRHYv TZuhtzF/VI4nXO9bRnAkZhMycHH8aZI4vk5D/kvamzEApDx8dC78S+s0by+RFLfb 7UMaV24GM6DI3QS6aK7e/UjTSBKq4fqyOykrn0Pdjhb7fx5OPHevV84HoPil5Sx0 LRsrNZQY+tr+0jqHvAV0YPohspZb05qZDQbv/6jnt085m6SIQdPiJq4RqD6Vwl81 cpy1fYd1hTO1hY5zSrVl+6TbN9PgniTb6d5OfhI5+g== =Z18S -----END PGP SIGNATURE-----

2 2

Re: [4/5] user32: Set capture earlier on popup menus.
by Marvin June 29, 2014

June 29, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7665 Your paranoid android. === wxppro (32 bit msg) === msg.c:11766: Test failed: SetActiveWindow(0): 0: the msg sequence is not complete: expected 0086 - actual 0000 msg.c:11787: Test failed: SetActiveWindow(hwnd), hwnd not visible: 8: in msg 0x0086 expecting wParam 0x1 got 0x0 msg.c:11793: Test failed: SetActiveWindow(popup), hwnd not visible, popup not visible: 9: in msg 0x0086 expecting wParam 0x1 got 0x0 msg.c:13528: Test failed: key release only: 0: the msg sequence is not complete: expected 0101 - actual 0000 msg.c:13540: Test failed: key press only: 0: the msg sequence is not complete: expected 0100 - actual 0000 msg.c:13552: Test failed: key press repeat: 0: the msg sequence is not complete: expected 0100 - actual 0000 msg.c:13564: Test failed: key release repeat: 0: the msg sequence is not complete: expected 0101 - actual 0000 msg.c:13584: Test failed: key press after setkeyboardstate: 0: the msg sequence is not complete: expected 0100 - actual 0000 msg.c:13604: Test failed: key release after setkeyboardstate: 0: the msg sequence is not complete: expected 0101 - actual 0000 msg.c:13804: Test failed: window hotkey press LWIN: 1: the msg sequence is not complete: expected 0100 - actual 0000 msg.c:13829: Test failed: window hotkey release: 1: the msg sequence is not complete: expected 0101 - actual 0000 msg.c:13834: Test failed: window hotkey release LWIN: 1: the msg sequence is not complete: expected 0101 - actual 0000 msg.c:13862: Test failed: window hotkey combined: 7: the msg sequence is not complete: expected 0100 - actual 0000 msg.c:13876: Test failed: window hotkey previous: 4: the msg sequence is not complete: expected 0100 - actual 0000 msg.c:13891: Test failed: window hotkey new: 3: the msg sequence is not complete: expected 0101 - actual 0000 msg.c:13915: Test failed: thread hotkey press LWIN: 1: the msg sequence is not complete: expected 0100 - actual 0000 msg.c:13944: Test failed: thread hotkey release: 1: the msg sequence is not complete: expected 0101 - actual 0000 msg.c:13952: Test failed: thread hotkey release LWIN: 1: the msg sequence is not complete: expected 0101 - actual 0000 === w7u (32 bit msg) === msg.c:12099: Test failed: unexpected hwnd 00090138 msg.c:12121: Test failed: bad time 30ab9/30ac9

1 0

Re: [2/2] ddraw: add dsurface dimension tests, try 9
by Stefan Dösinger June 29, 2014

June 29, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-06-28 17:43, schrieb Patrick Rudolph: > + for (j = 0; j < sizeof(formats) / sizeof(*formats); j ++) > + { > + for (i = 0; i < sizeof(tests) / sizeof(*tests); i ++) > + { I don't think we use "i ++" with a space anywhere. Please make it i++ or ++i. > + hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); > + ok(SUCCEEDED(hr), "SetCooperativeLevel failed with %08x\n", hr); > + IDirectDraw_Release(ddraw); > + DestroyWindow(window); > +} The SetCooperativeLevel call is redundant here. I think it was used in the old test because dsurface.c re-used the IDirectDraw object. > + hr = IDirectDraw2_CreateSurface(ddraw, &surfacedesc, &surface, NULL); > + ok(hr == tests[i].hr, "Pixelformat %s, test %d returned %08x\n", formats[j].name, i, hr); > + > + if (surface) > + { > + IDirectDrawSurface2_Release(surface); > + surface = NULL; > + } IDirectDraw2_CreateSurface returns an IDirectDrawSurface, not IDirectDrawSurface2. Other than that this patch looks good to me. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJTr7XvAAoJEN0/YqbEcdMwYwMP/RXeG9kiO+8EJVRDOaPiSi3O YOWppnsurP6oDCWo9RdtdbarfLGYeypGMPwTi/RAkdgYFbBJvqZhMGyINQ3DqCkn nLVKZCfSBkKFFRG3IR4HixVqqlk/vXqtdFizV7IuzQYuGLdUCFPDKYqldDCQtdGH vKGH97qJjIe28ArcHXPufdpV0ZxJBgKPn4XxD8ZquElPEPB0obF7jONYMohmWvWr 7bea+n7ecKNlfWUM/ROb0S/OBP2l8aQ/ZoGKdxQTJKDS6LJzAbkClt5limDnsToV uabvHXvfv8t4jw2Sa3MkJEAcqWQ4fgkcqxltGk/AKNdmgs0Wfhp7ZdLGpZqFPjp6 tlNWsoU69NHRocghc41UB2droIbcU17U7jP7hd1kZOwGg1ksjDoDF2P/n375MFV7 gdKEMELD0c/i9Hy6pFYpQUgnS5X6pNcnHJR3EcxOi/lLUMBMnPpsWiDIQzcG9f58 hcTznm8MR2J1tphYZ4bnE7VmOXZOpDNqY7kyLe8PRMaOJlo70Z2yRAiqTL1dCqVP ntZ7i7CeSxrejg8SWkzWwgBKKMHJ22fCK3UkfewbLqxmUcMVteypZ/ESh82C3LFE OZVOW/iY2Ilt+dEdoH6guRV/2trzfj3UXOsLC9ZNmcl+VL4PLN+N8gytH9Q23/Ak ApTtStXqJfLTv4OI7AHI =VHdx -----END PGP SIGNATURE-----

1 0

Re: [1/2] ddraw: add dsurface dimension tests, try 9
by Stefan Dösinger June 29, 2014

June 29, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-06-28 17:43, schrieb Patrick Rudolph: > + if ((desc->ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY) && (hr == E_OUTOFMEMORY)) > + hr = DDERR_OUTOFVIDEOMEMORY; I don't like this. wined3d should return WINED3DERR_OUTOFVIDEOMEMORY when the emulated adapter memory is exhausted. I guess it returns E_OUTOFMEMORY because it first tries to allocate heap memory and then checks if there's enough adapter memory left. If you swap the order of operations in resource_init() in dlls/wined3d/resource.c this should be much nicer. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJTr7QkAAoJEN0/YqbEcdMwQEAQAJbgNG0XDSpLeU6PjGhJf9+2 jAwldh9cCrKtSotndSe7IQ9aKGKtG/akF7u219ciaEHE2oXy9Qtcj31PIpA0Zh80 V2kv+rMU4gN+b55OaInIO8hEFxMcHEUGcaMguMyUJdjsZtHUBX066QwmP2VKP822 mYsNT4E4pNi20Bn7HoddGzlb5oA0EwNXLojnQhHQLBE6EUSA/EIgYWuRBRcyTGrY 4144gvnXHUMSxajxi+cQKcWKD56+hODNGTtDZeuo94h+PoV/B+QNz0OOUCy5O+3F KnNL/Njy/FeNYoi+MCdVdBhhJiQAaUuV2vhxGbSmHmBf1p71/JcCsORAg5pefemD hRsThGJrNfPPFdksF6pbszEQRPNLU8n0a+5HQ2j7xKqGTmT+Rek1H8etVQM/xVt3 e3nhN5VY2UNT0irckjK0imMr/3ydYs7wWxE++Xh4mKAeXbWII1lcVJSlq+dGTnVx dtOdPUtJS9QSiMgDjBETRG1JjyC57TNfXK2IwLHst1wZ+0jMZ3tENZZX2H6F2XWT T+UK9+lLJnvztmcA8KC4VirsLPJmJJGlhFsuZEsCUUH/rUC3CFFCAuvk3fA83mJp +Nxf/uLkUkSZTAMX717vXoL5p0i6/Vzdx2vYjX3O/H7DiP1mU/OyTOccklhmAhb/ 7K15mms5Z4VV6FdOjXPG =dq6I -----END PGP SIGNATURE-----

1 0

XFORM matrix and rotation bug
by Alexander Almaleh June 28, 2014

June 28, 2014

While working on the previous bug with PlgBlt(), I noticed there is another one with the XFORM matrix. I've submitted a bug report at https://bugs.winehq.org/show_bug.cgi?id=36815 . I want to try to debug it and find a solution, but I need some help. Can someone tell me where the code is where the XFORM matrix is used to transform the coordinates? I mean where the actual blitting is done. Also, how is it done? Does wine use an internal buffer and all the operations are made manually, or does it just translate the blitting operations to the X server?

1 0

Re: mshtml/tests: Fix a memory leak (valgrind).
by Marvin June 27, 2014

June 27, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7746 Your paranoid android. === w2000pro (32 bit htmldoc) === htmldoc: unhandled exception c0000005 at 00090100 === wxppro (32 bit htmldoc) === htmldoc: unhandled exception c0000005 at 3C8363A7 === wvistau64 (32 bit htmldoc) === htmldoc: unhandled exception c0000005 at 00000000 === w7u (32 bit htmldoc) === htmldoc.c:2863: Test failed: unexpected command 74 The test timed out === w8 (32 bit htmldoc) === htmldoc.c:2863: Test failed: unexpected command 74 htmldoc.c:2863: Test failed: unexpected command 74 htmldoc.c:2863: Test failed: unexpected command 74 htmldoc.c:6113: Test failed: LoadHistory failed: 80070057 htmldoc.c:6117: Test failed: expected FireBeforeNavigate2 htmldoc.c:6118: Test failed: expected Invoke_AMBIENT_SILENT htmldoc.c:6119: Test failed: expected Invoke_AMBIENT_OFFLINEIFNOTCONNECTED htmldoc.c:2781: Test failed: unexpected state L"uninitialized", expected 1 htmldoc.c:2781: Test failed: VT_I4(out)=0, expected 1 htmldoc.c:367: Test failed: expected Exec_SETTITLE htmldoc.c:5666: Test failed: unexpected state L"uninitialized", expected 1 htmldoc.c:5666: Test failed: VT_I4(out)=0, expected 1 htmldoc.c:2781: Test failed: unexpected state L"uninitialized", expected 1 htmldoc.c:2781: Test failed: VT_I4(out)=0, expected 1 htmldoc.c:2781: Test failed: unexpected state L"uninitialized", expected 1 htmldoc.c:2781: Test failed: VT_I4(out)=0, expected 1 The test timed out === wvistau64 (64 bit htmldoc) === htmldoc: unhandled exception c0000005 at 000000007137D8A6

1 0

Re: [PATCH 3/4] vbscript: Implemented Sgn(try 4)
by Piotr Caban June 27, 2014

June 27, 2014

Please add VT_NULL argument handling and tests. This function is returning error on Sgn(Null) call.

2 1

Re: [PATCH 2/3] mmdevapi: Don't stop sending event signals after IAudioClient::Stop
by Marvin June 27, 2014

June 27, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7740 Your paranoid android. === w7u (32 bit capture) === capture.c:427: Test failed: Wait(event) after Stop gave 102 === w8 (32 bit capture) === capture.c:228: Test failed: Position 1655 expected 823 capture.c:256: Test failed: Position 1655 expected 823 capture.c:307: Test failed: expect DISCONTINUITY 0 capture.c:313: Test failed: Position 2103 gap 832 capture.c:333: Test failed: Position 3063 expected 1719 capture.c:334: Test failed: flags 1 capture.c:358: Test failed: Position 4215 expected 2167 === w7u (32 bit render) === render.c:1976: Test failed: Got wrong volume: 0.501088 render.c:2005: Test failed: Got wrong volume: 0.501088 === w8 (32 bit render) === render.c:1976: Test failed: Got wrong volume: 0.671337 render.c:2005: Test failed: Got wrong volume: 0.671337

1 0

Re: [PATCH 1/4] vbscript: Implemented TypeName(try 4)
by Piotr Caban June 27, 2014

June 27, 2014

This patch was already committed. Please update wine source before sending patches. Cheers, Piotr

2 1

Re: [PATCH 2/5] d3d8/tests: Add some lost device tests.
by Marvin June 27, 2014

June 27, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7731 Your paranoid android. === w8 (32 bit device) === device.c:2397: Test failed: Expected foreground window 000B00CA, got 0002004C. device.c:3039: Test failed: Expected wndproc 0x412780, got 0x412780.

1 0

Re: [PATCH 4/4] vbscript: Implemented Abs(try 4)
by Marvin June 27, 2014

June 27, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7727 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 3/4] vbscript: Implemented Sgn(try 4)
by Marvin June 27, 2014

June 27, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7726 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 2/4] vbscript: Implemented VarType(try 4)
by Marvin June 27, 2014

June 27, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7725 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 1/4] vbscript: Implemented TypeName(try 4)
by Marvin June 27, 2014

June 27, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7724 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [2/7] advapi32: Changed an invalid comment
by Marvin June 27, 2014

June 27, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7716 Your paranoid android. === w2008s64 (32 bit security) === Unable to set the VM system time: the "nc -q0 '10.42.42.136' '4242'" command returned 1

1 0

Re: [PATCH 4/4] vbscript: Implemented Abs(try 4)
by Piotr Caban June 27, 2014

June 27, 2014

On 06/27/14 04:44, Shuai Meng wrote: > static HRESULT Global_Abs(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) > { > - FIXME("\n"); > - return E_NOTIMPL; > + double v; > + HRESULT hres; > + > + TRACE("(%s)\n", debugstr_variant(arg)); > + > + assert(args_cnt == 1); > + > + > + if(V_VT(arg) == VT_NULL) > + return return_null(res); > + > + hres = to_double(arg, &v); > + if (FAILED(hres)) > + return hres; > + > + if(res) { > + V_VT(res) = VT_R8; > + V_R8(res) = v >= 0 ? v : -v; > + } > + return S_OK; > } You can use return_double helper here. Also there are 2 newlines after assert.

1 0

Re: [PATCH 2/4] vbscript: Implemented VarType(try 4)
by Piotr Caban June 27, 2014

June 27, 2014

On 06/27/14 04:40, Shuai Meng wrote: > + if(res) { > + V_VT(res) = VT_I2; > + V_I2(res) = V_VT(arg); > + } > + return S_OK; You can use return_short helper here.

1 0

Re: [1/7] server: Any of the 4 SE_*_DEFAULTED controls should not be stored on objects, their usage is transient. (try 3)
by Marvin June 26, 2014

June 26, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7715 Your paranoid android. === build (build) === Could not copy the patch to the VM: the "nc -q0 '10.42.42.130' '4242'" command returned 1

2 1

Re: [PATCH 4/5] msvcrt: Use file->_flag to check if file buffering is enabled
by Alexandre Julliard June 26, 2014

June 26, 2014

Piotr Caban <piotr(a)codeweavers.com> writes: > --- > dlls/msvcrt/file.c | 64 > +++++++++++++++++++++++++++++------------------------- > 1 file changed, 35 insertions(+), 29 deletions(-) It breaks the tests: ../../../tools/runtest -q -P wine -T ../../.. -M mshtml.dll -p mshtml_test.exe.so dom && touch dom.ok wine: Unhandled page fault on write access to 0x00000000 at address 0x559c685b (thread 0045), starting debugger... Unhandled exception: page fault on write access to 0x00000000 in 32-bit code (0x559c685b). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:559c685b ESP:0032ea30 EBP:0032ea58 EFLAGS:00210246( R- -- I Z- -P- ) EAX:00000000 EBX:55a2ba90 ECX:00000030 EDX:00000001 ESI:55a33cc0 EDI:003d2de3 Stack dump: 0x0032ea30: 0000001e 00000000 4d430003 00000000 0x0032ea40: 0032ea60 55a2ba90 0032ea98 559c6943 0x0032ea50: 55a2ba90 55a33cc0 0032ea98 559c6a7e 0x0032ea60: 00000030 55a33cc0 0032ed78 7bc3c409 0x0032ea70: 00000000 003d2d24 0000004b 00000000 0x0032ea80: 000001f4 003d2de3 0032eab8 003d2d98 Backtrace: =>0 0x559c685b MSVCRT__flsbuf+0x4b(c=<is not available>, file=<is not available>) [/home/julliard/wine/wine/dlls/msvcrt/file.c:3671] in msvcrt (0x0032ea58) 1 0x559c6a7e MSVCRT_fwrite+0x17d(ptr=<is not available>, size=<is not available>, nmemb=<is not available>, file=<is not available>) [/home/julliard/wine/wine/dlls/msvcrt/file.c:3738] in msvcrt (0x0032ea98) 2 0x00334cd0 in nspr4 (+0x4ccf) (0x0032eab8) 3 0x003354d3 in nspr4 (+0x54d2) (0x0032ed38) 4 0x6a65ce06 in xul (+0xa1ce05) (0x0032edd8) 5 0x69f4e2ef in xul (+0x30e2ee) (0x0032ef18) 0x559c685b MSVCRT__flsbuf+0x4b [/home/julliard/wine/wine/dlls/msvcrt/file.c:3671] in msvcrt: movb %cl,0x0(%eax) 3671 *file->_ptr++ = c; -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 3/5] msvcrt: Support NULL buffer in setvbuf
by Marvin June 26, 2014

June 26, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7709 Your paranoid android. === build (build) === Patch failed to apply

3 2

Re: [PATCH 4/4] vbscript: Implemented Abs(try 2)
by Jacek Caban June 26, 2014

June 26, 2014

On 06/17/14 08:00, Shuai Meng wrote: > diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c > index d21784d..e646a29 100644 > --- a/dlls/vbscript/global.c > +++ b/dlls/vbscript/global.c > @@ -1302,8 +1302,24 @@ static HRESULT Global_ChrW(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI > > static HRESULT Global_Abs(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) > { > - FIXME("\n"); > - return E_NOTIMPL; > + VARIANT v; > + HRESULT hres; > + > + TRACE("(%s)\n", debugstr_variant(arg)); > + > + assert(args_cnt == 1); > + > + V_VT(&v) = VT_EMPTY; > + hres = VariantChangeType(&v, arg, VARIANT_LOCALBOOL, VT_R8); > + if (FAILED(hres)) > + return S_OK; Please use to_double here. Also note weird indention here. Jacek

3 6

[PATCH] gdi32: XFORM matrix in PlgBlt() is calculated incorrectly
by Alexander Almaleh June 26, 2014

June 26, 2014

As suggested by Sebastian Lackner, I am submitting his much simpler version of the fix. Only one line is touched. The patch file is attached. The bugzilla link is http://bugs.winehq.org/show_bug.cgi?id=36504

2 2

Re: [PATCH 5/5] msvcrt: Don't touch _bufsiz value while initializing FILE structure
by Marvin June 26, 2014

June 26, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7710 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [4/7] server: Setting a security descriptor should not replace an existing owner or group if only a DACL is being set.
by Michael Stefaniuc June 26, 2014

June 26, 2014

Hello Joris, On 06/26/2014 01:13 AM, Joris van der Wel wrote: > +#define CHECK_DACL_IS_NULL(o) \ > + do{ \ > + SECURITY_DESCRIPTOR *queriedSD = NULL; \ > + PACL queriedAcl = NULL; \ > + BOOL dacl_present; \ > + BOOL dacl_defaulted; \ > + SECURITY_DESCRIPTOR_CONTROL control; \ > + DWORD revision; \ > + queriedSD = test_get_security_descriptor( o, __LINE__ ); \ > + queriedAcl = (PACL)0xdeadbeef; \ > + res = GetSecurityDescriptorDacl(queriedSD, &dacl_present, &queriedAcl, &dacl_defaulted); \ > + ok(res, "GetSecurityDescriptorDacl failed with error %d\n", GetLastError()); \ > + res = GetSecurityDescriptorControl(queriedSD, &control, &revision); \ > + ok(res, "GetSecurityDescriptorControl failed with error %d\n", GetLastError()); \ > + ok(dacl_present, "DACL should be present (even though the DACL is NULL)\n"); \ > + ok(queriedAcl == NULL, "Setting a NULL DACL, should also return a NULL DACL\n"); \ > + ok(!dacl_defaulted, "Defaulted is true\n"); \ > + ok((control & SE_DACL_DEFAULTED) == 0, "SE_DACL_DEFAULTED is set\n"); \ > + HeapFree(GetProcessHeap(), 0, queriedSD); \ > + }while(0) > + please try to avoid monster macros and use separate functions instead. You can still use a macro to pass __LINE__ to the function and use ok(__FILE__, line)(...) inside that function. bye michael

1 0

Re: [PATCH 2/4] vbscript: Implemented VarType(try 2)
by Jacek Caban June 26, 2014

June 26, 2014

On 06/17/14 07:59, Shuai Meng wrote: > diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c > index 5357df8..c2b2edd 100644 > --- a/dlls/vbscript/global.c > +++ b/dlls/vbscript/global.c > @@ -602,8 +602,52 @@ static HRESULT Global_Oct(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA > > static HRESULT Global_VarType(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) > { > - FIXME("\n"); > - return E_NOTIMPL; > + TRACE("(%s)\n", debugstr_variant(arg)); > + > + assert(args_cnt == 1); > + > + if(res) { > + V_VT(res) = VT_I2; > + switch(V_VT(arg)) { > + case VT_EMPTY: > + V_I2(res) = VT_EMPTY; > + break; > + case VT_NULL: > + V_I2(res) = VT_NULL; > + break; > + case VT_I2: > + V_I2(res) = VT_I2; > + break; (...) This all could be just: V_I2(res) = V_VT(arg); To handle unsupported types, you could use something like: if(V_VT(arg) & ~VT_TYPEMASK) { FIXME("..."); return E_NOTIMPL; } if(res) { V_VT(res) = VT_I2; V_I2(res) = V_VT(arg); } Jacek

3 2

Re: wined3d: Use shader and fragment capabilities to select d3d level
by Henri Verbeet June 25, 2014

June 25, 2014

On 23 June 2014 21:10, Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> wrote: > +static UINT d3d_level_from_gl_info(const struct wined3d_gl_info *gl_info) > +{ > + struct shader_caps shader_caps; > + struct fragment_caps fragment_caps; > + const struct wined3d_shader_backend_ops *shader_backend; > + const struct fragment_pipeline *fragment_pipeline; > + > + shader_backend = select_shader_backend(gl_info); > + shader_backend->shader_get_caps(gl_info, &shader_caps); > + > + if (shader_caps.vs_version >= 4) > + return 10; > + //wine can not use SM 4 on mesa drivers as the necessary functionality is not exposed on compatibility contexts, but still set the pci id accordingly Please avoid C99 features like // comments. > + if (shader_caps.vs_version == 3 && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30)) > + return 10; > + if (shader_caps.vs_version >= 2) > + return 9; > + if (shader_caps.vs_version == 1) > + return 8; > + > + fragment_pipeline = select_fragment_implementation(gl_info, shader_backend); > + fragment_pipeline->get_caps(gl_info, &fragment_caps); > + > + if (fragment_caps.TextureOpCaps & WINED3DTEXOPCAPS_DOTPRODUCT3) > + return 7; > + if (gl_info->limits.textures > 1) > + return 6; That's "fragment_caps.MaxSimultaneousTextures". It probably makes sense to reorganize things a bit. For example, the gl_info parameter to the select_card() callbacks in struct gl_vendor_selection is really only used by select_card_nvidia_binary() and select_card_amd_binary() to call d3d_level_from_gl_info(), but I don't think anything of value would be lost if those used a plain table like e.g. select_card_amd_mesa(). (At which point you wouldn't need a callback there anymore either.) d3d_level_from_gl_info() should probably get the shader and fragment caps passed as parameters, and be renamed. It probably makes sense to make it return some kind of enum instead of a plain number, so you can e.g. distinguish between D3D9 SM2 and D3D9 SM3. That would also allow the fallback card selection code to use plain tables instead of callbacks.

2 2

Tahoma fonts and Greek language
by Petros F June 25, 2014

June 25, 2014

Hello, When you install wine in a PC with Greek language, or run a program that requires or uses Greek fonts, the fonts could not appear correctly because of the pre-installed tahoma font which it hasn't Greek letters for some reason. So the user has to change the font manually to another font or to paste a Greek tahoma font into /usr/share/fonts or /home/.fonts folder. I was wondering if it is possible to include these tahoma fonts (that have Greek letters) and the procedure of their installation in the wine installation? Petros

3 2

Re: [PATCH] riched20: Don't create too many IRichEditOle interfaces for a RichEdit. (try 2)
by Huw Davies June 25, 2014

June 25, 2014

On Wed, Jun 25, 2014 at 06:56:00PM +0800, Jactry Zeng wrote: > diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c > index 2af2582..65e70fa 100644 > --- a/dlls/riched20/editor.c > +++ b/dlls/riched20/editor.c > @@ -4468,6 +4468,13 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, > case EM_GETOLEINTERFACE: > { > LPVOID *ppvObj = (LPVOID*) lParam; > + if (editor->reOle) > + { > + *ppvObj = editor->reOle; > + IRichEditOle_AddRef(*ppvObj); > + return 1; > + } > + > return CreateIRichEditOle(editor, ppvObj); > } > case EM_GETPASSWORDCHAR: Better to assign editor->reOle here too. That will be one ref, then every returned iface should add another ref. So the first iface returned will have refcount of 2 and then your tests will pass. You release the final ref in the editor destructor. > diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h > index f139c29..3722c82 100644 > --- a/dlls/riched20/editstr.h > +++ b/dlls/riched20/editstr.h > @@ -388,6 +388,7 @@ typedef struct tagME_TextEditor > { > HWND hWnd, hwndParent; > ITextHost *texthost; > + LPVOID reOle; Needs correct type. Huw.

2 1

Failing tests on test bots
by Jeremy White June 25, 2014

June 25, 2014

Alright, We have a new VM server. We have a new WineHQ server. Things should be stable, or getting better from now on. But we still have 32 failures: http://www.winehq.org/~jwhite/e29fd5429234.html This sucks. Let's fix it. Cheers, Jeremy

1 0

Re: [PATCH 2/4] vbscript: Implemented VarType(try 3)
by Piotr Caban June 25, 2014

June 25, 2014

On 06/25/14 04:19, Shuai Meng wrote: > static HRESULT Global_VarType(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) > { > - FIXME("\n"); > - return E_NOTIMPL; > + TRACE("(%s)\n", debugstr_variant(arg)); > + > + assert(args_cnt == 1); > + > + if(V_VT(arg) & ~VT_TYPEMASK) { > + FIXME("not supported %s\n", debugstr_variant(arg)); > + return E_NOTIMPL; > + } > + > + if(!res) > + return DISP_E_BADVARTYPE; This function should not return error if res is NULL.

2 3

Re: [PATCH] riched20: Don't create too many IRichEditOle interfaces for a RichEdit.
by Huw Davies June 25, 2014

June 25, 2014

On Wed, Jun 25, 2014 at 01:59:42PM +0800, Jactry Zeng wrote: > @@ -1502,6 +1503,13 @@ LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *ppObj) > { > IRichEditOleImpl *reo; > > + if (editor->reOle) > + { > + reo = editor->reOle; > + reo->ref++; > + *ppObj = reo; > + return 1; > + } > reo = heap_alloc(sizeof(IRichEditOleImpl)); > if (!reo) > return 0; This is not the way to do this. You want to be calling AddRef on the interface. You probably want to do the if(editor->reOle) check in the EM_GETOLEINTERFACE handler and only call this constructor when needed. Huw.

2 1

Re: [PATCH 3/4] vbscript: Implemented Sgn(try 3)
by Piotr Caban June 25, 2014

June 25, 2014

On 06/25/14 04:21, Shuai Meng wrote: > + hres = VariantChangeType(&dst, v, VARIANT_LOCALBOOL, VT_R8); There's no need to pass VARIANT_LOCALBOOL flag here. > static HRESULT Global_Sgn(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) > { > - FIXME("\n"); > - return E_NOTIMPL; > + double v; > + HRESULT hres; > + > + TRACE("(%s)\n", debugstr_variant(arg)); > + > + assert(args_cnt == 1); > + > + hres = to_double(arg, &v); > + if (FAILED(hres)) > + return S_OK; > + > + if(!res) > + return DISP_E_BADVARTYPE; This function should not return error if res is NULL. There's similar mistake in Abs implementation. Cheers, Piotr

2 2

Re: [Patch 3/3] regsvr32: Convert char* to WCHAR*
by Vincent Povirk June 25, 2014

June 25, 2014

You should probably combine this with patch 1, so we don't have an intermediate stage where the output is broken. On Tue, Jun 24, 2014 at 7:07 AM, Hugh McMaster <hugh.mcmaster(a)masterindexing.com> wrote: > This patch converts the char* strings of DllRegisterServer, DllUnregisterServer and DllInstall to WCHAR* strings for direct Unicode output. This avoids the need to modify any resource strings. > > >

2 1

Re: [PATCH 4/4] vbscript: Implemented Abs(try 3)
by Marvin June 24, 2014

June 24, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7680 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 3/4] vbscript: Implemented Sgn(try 3)
by Marvin June 24, 2014

June 24, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7679 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 2/4] vbscript: Implemented VarType(try 3)
by Marvin June 24, 2014

June 24, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7678 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 1/4] vbscript: Implemented TypeName(try 3)
by Marvin June 24, 2014

June 24, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7677 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 3/4] vbscript: Implemented Sgn(try 2)
by Jacek Caban June 24, 2014

June 24, 2014

On 06/17/14 07:59, Shuai Meng wrote: > diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c > index c2b2edd..d21784d 100644 > --- a/dlls/vbscript/global.c > +++ b/dlls/vbscript/global.c > @@ -1320,8 +1320,24 @@ static HRESULT Global_Int(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA > > static HRESULT Global_Sgn(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) > { > - FIXME("\n"); > - return E_NOTIMPL; > + VARIANT v; > + HRESULT hres; > + > + TRACE("(%s)\n", debugstr_variant(arg)); > + > + assert(args_cnt == 1); > + > + V_VT(&v) = VT_EMPTY; > + hres = VariantChangeType(&v, arg, VARIANT_LOCALBOOL, VT_R8); > + if (FAILED(hres)) > + return S_OK; Please use to_double() instead. to_double may need some fixes (it may require similar changes as you did for to_string first). Jacek

2 4

Re: [5/5] user32: Skip menu loop for empty popup menus.
by Marvin June 24, 2014

June 24, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7669 Your paranoid android. === w7u (32 bit msg) === msg.c:12099: Test failed: unexpected hwnd 003D013E msg.c:12121: Test failed: bad time 30e71/30e80

1 0

Re: [3/5] user32: Set capture on the owner of popup menus.
by Marvin June 24, 2014

June 24, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7664 Your paranoid android. === w7u (32 bit msg) === msg.c:12098: Test failed: unexpected hwnd 0007013A

1 0

Re: [4/5] user32: Set capture earlier on popup menus.
by Marvin June 24, 2014

June 24, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7665 Your paranoid android. === build (build) === Failure running the build script in the VM: network read timed out (Connect:AgentVersion.h:0/9)

1 0

Re: ntdll/nt: Improve NtQuerySystemInformation, cpu_user/cpu_nice already include cpu_guest/cpu_guest_nice
by André Hentschel June 24, 2014

June 24, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 24.06.2014 01:57, schrieb Bernard Ladenthin: Somehow too many comments... Also you just number your patches like e.g. [1/2] in the subject, see other patches -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQGcBAEBAgAGBQJTqdl5AAoJEGm5GZTakYssInAL/j59ymw++Chfn8hfF9TYsGU7 Gg8w1k451vXrezpRHsLrYB72UrLbnlD35TJx3FBV3nCEhuX/LVGj7EyTh6gA+aki p1RmHmqZSvxzuI7RF6a9LbfwjwwSQ392huraBUzmNFOMKMwQ1cZfCfFxA+Xvr/kL bwKcN/+EeSBYDUHIp3ug9ib0SL+d1IMeqQDSstviEKEHfAjbUsAICWBKMU5jmrDt ZEHLrugbfQ15qRITbBbqKvPTSrR1VRglOYwT44kwB4w+xZCJ8u+zgEQhMpg6dN6H JkgG4VjH7ObksiASY0wUAmL+c9KwNcmwyJ7SwG5o+nmgF/kNjzOZhgw80wtrXNCi 659GCVBLFENKSOPWh84nxhRFXKlH6uubqxcRI4WtTNQGfdsI7MqB1qGf9Y45TvyP aHfEd/hBVvNaNRj9Vzax3z3ze2nshEczhpuv8PkTcyLUr/zA+ju+w+FkwUJesjY9 zbGao2AjHszVl9LDvJoKXV6cc+lCTqlIe3BTYa79qw== =8YJ/ -----END PGP SIGNATURE-----

1 0

Re: fix stack corruption and LastError results in shlwapi PathCombine
by Vincent Povirk June 24, 2014

June 24, 2014

The length of the ANSI string doesn't necessarily match the length of the Unicode string after conversion. We should be checking the return value of MultiByteToWideChar to find out whether the converted string fit. Why aren't the 'strlenW(szTemp) + strlenW(lpszFile)' test and uses of lstrcpynW in PathCombineW sufficient to avoid stack corruption?

1 0

Re: wininet/tests: Add more HTTP_QUERY_RAW_HEADERS tests
by Alexandre Julliard June 24, 2014

June 24, 2014

Bruno Jesus <00cpxxx(a)gmail.com> writes: > Related to http://bugs.winehq.org/show_bug.cgi?id=36641 It doesn't work here: ../../../tools/runtest -q -P wine -T ../../.. -M wininet.dll -p wininet_test.exe.so http && touch http.ok http.c:647: Test succeeded inside todo block: HttpQueryInfoA(HTTP_QUERY_RAW_HEADERS) failed with error 122 http.c:649: Test succeeded inside todo block: Expected 0x00, got 00 http.c:652: Test succeeded inside todo block: Value should not have changed: 465 != 465 http.c:647: Test succeeded inside todo block: HttpQueryInfoA(HTTP_QUERY_RAW_HEADERS) failed with error 122 http.c:649: Test succeeded inside todo block: Expected 0x00, got 00 http.c:652: Test succeeded inside todo block: Value should not have changed: 403 != 403 wine: Unhandled page fault on write access to 0x00630065 at address 0x7bc4ef6f (thread 0088), starting debugger... -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: opengl32: glGetString() requires an active GL context (try 2)
by Alexandre Julliard June 24, 2014

June 24, 2014

Bruno Jesus <00cpxxx(a)gmail.com> writes: > try2: > > Add tests. That test will work fine on Wine without code changes, so it's not very convincing. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: gdi32: Avoid compiler warnings in freetype_SelectFont. Simplify logic a bit.
by Alexandre Julliard June 24, 2014

June 24, 2014

Gerald Pfeifer <gerald(a)pfeifer.com> writes: > This is similar to the warning removal patch I submitted yesterday. > > On top of that it replaces > ! something == ! a_0_1_boolean > by > !! something == a_0_1_boolean > since !! reflects the intention (to convert whatever value to one of > 0 or 1) better than the former and may be more efficient, too. That's not an improvement. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: opengl32: glBindTexture() and glDeleteTextures() require an active GL context
by Roderick Colenbrander June 23, 2014

June 23, 2014

Hi Bruno, My initial feeling is that the app is just buggy, since calling functions without a context is very questionable. Assuming we want to any checking on NULL-contexts, please edit the make_opengl script since opengl_norm.c is all auto-generated. Since this code is tricky, I would recommend writing a test case for our test suite. Years ago (pre-wine 1.0) we had code to keep some implicit GL context around, because allegedly some game required it (I think it was Homeland). Though when I tried to reproduce that behavior I didn't see it in the game. I think I wrote some tests for Windows, but don't remember the results. Thanks, Roderick On Sat, Jun 21, 2014 at 11:36 AM, Bruno Jesus <00cpxxx(a)gmail.com> wrote: > Very similar to bug 36506 but for other functions. > > Fixes bug http://bugs.winehq.org/show_bug.cgi?id=34847 > > > >

2 3

Re: user32/tests: Add a missing call to ReleaseActCtx().
by Marvin June 23, 2014

June 23, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7654 Your paranoid android. === w7u (32 bit msg) === msg.c:12099: Test failed: unexpected hwnd 0012013E msg.c:12121: Test failed: bad time 30e90/30ea0

1 0

WineHQ Downtime (try 2)
by Jeremy Newman June 23, 2014

June 23, 2014

WineHQ will be going offline starting at 10:00 CDT Monday 2014-06-23 and will be down for up to an hour. We are moving the site and all services (other than the Wiki) to new hardware. This includes: WineHQ.org, Forums, AppDB, Bugzilla, Git, FTP, Mailing lists, and WineTestBot Web Even after the things come back online, some services may need some tweaking. We will be on the issues as fast as we can. -N

2 5

Re: [3/3] ntdll/tests: Add tests for DBG_RIPEXCEPTION debugger events.
by Marvin June 22, 2014

June 22, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7645 Your paranoid android. === w2000pro (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00950000/00950001 exception: unhandled exception 80000004 at 00950000 exception.c:484: Test failed: 42: Wrong exception address 7C5C20B0/00950001 === wxppro (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00A30000/00A30001 exception: unhandled exception 80000004 at 00A30000 exception.c:484: Test failed: 42: Wrong exception address 7C80DF3C/00A30001 === wvistau64 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 003C0000/003C0001 exception: unhandled exception 80000004 at 003C0000 exception.c:484: Test failed: 42: Wrong exception address 7751ED97/003C0001 === w2008s64 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 002C0000/002C0001 exception: unhandled exception 80000004 at 002C0000 exception.c:484: Test failed: 42: Wrong exception address 77E5ED97/002C0001 === w7u (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 003C0000/003C0001 exception: unhandled exception 80000004 at 003C0000 exception.c:484: Test failed: 42: Wrong exception address 77CDE34F/003C0001 === w8 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 003F0000/003F0001 exception: unhandled exception 80000004 at 003F0000 exception.c:484: Test failed: 42: Wrong exception address 77174D17/003F0001

1 0

Re: msvcp90/msvcp90.h: right-hand operand of comma expression has no effect (PING)
by Alexandre Julliard June 22, 2014

June 22, 2014

Gerald Pfeifer <gerald(a)pfeifer.com> writes: > On Wed, 16 Apr 2014, Paul Chitescu wrote: >>> Digging into this in more detail I see >>> >>> ../msvcp90/ios.c: In function 'basic_streambuf_char__Xsgetn_s': >>> ../msvcp90/msvcp90.h:529:75: warning: right-hand operand of comma >>> expression has no effect [-Wunused-value] >>> #define memcpy_s( dst, size, src, count ) (memcpy( (dst), (src), (count) >>> ), 0) ^ ../msvcp90/ios.c:1218:13: note: in expansion of macro 'memcpy_s' >>> memcpy_s(ptr+copied, size, *this->prpos, chunk); >>> ^ >> memcpy_s() returns an errno_t so the author tried to force returning >> zero (no error). > > Since, clearly, the result is never intended to be used, we can as > well simply cast the result away instead of using ", 0". memcpy_s is supposed to return a value, and callers could (and probably should) check it. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: shell32: Fix SHFileOperation when deleting a nonexistent directory. (try 3)
by Marvin June 22, 2014

June 22, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7630 Your paranoid android. === wvistau64 (32 bit shlfileop) === shlfileop.c:815: Test failed: Expected ERROR_CANCELLED or DE_DIFFDIR === wvistau64 (64 bit shlfileop) === shlfileop.c:815: Test failed: Expected ERROR_CANCELLED or DE_DIFFDIR

2 1

Re: windowscodecs: Fix interlaced PNG writing.
by Sebastian Lackner June 20, 2014

June 20, 2014

Am 20.06.2014 22:15, schrieb Vincent Povirk: > + row_pointers = HeapAlloc(GetProcessHeap(), 0, This->height * sizeof(png_byte*)); > + if (!row_pointers) > + { > + LeaveCriticalSection(&This->lock); > + return E_OUTOFMEMORY; > + } There should be a corresponding HeapFree( ... ) to release row_pointers again.

1 0

Re: [3/4] server: Process OutputDebugString events like regular exceptions.
by Alexandre Julliard June 20, 2014

June 20, 2014

Sebastian Lackner <sebastian(a)fds-team.de> writes: > As recently mentioned in one of my other patches, Windows internally > processes debug string events the same way as regular exceptions. This > patch removes the output_debug_string wineserver call, and instead uses > always an exception to send debug strings to the debugger. The > wineserver function queue_exception_event is then responsible to > translate exceptions into the corresponding debug events. Make sure to > run ./tools/make_requests after applying this patch. This could probably be done on the client side when retrieving the event, to avoid adding special cases in the server code. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [4/4] ntdll/tests: Add more tests for debug string events.
by Marvin June 20, 2014

June 20, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7619 Your paranoid android. === w2000pro (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00950000/00950001 exception: unhandled exception 80000004 at 00950000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 7C5C20B0/00950001 === wxppro (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00A30000/00A30001 exception: unhandled exception 80000004 at 00A30000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 7C80DF3C/00A30001 === wvistau64 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 003C0000/003C0001 exception: unhandled exception 80000004 at 003C0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 7751ED97/003C0001 === w2008s64 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 002D0000/002D0001 exception: unhandled exception 80000004 at 002D0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 77E5ED97/002D0001 === w7u (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 003C0000/003C0001 exception: unhandled exception 80000004 at 003C0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 77CDE34F/003C0001 === w8 (32 bit exception) === exception.c:1127: Test failed: Got exception offset 0x1b, expected 0x19 exception.c:1136: Test failed: Got exception offset 0x19, expected 0x17 exception.c:484: Test failed: 42: Wrong exception address 003E0000/003E0001 exception: unhandled exception 80000004 at 003E0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 77174D17/003E0001

1 0

Re: [2/4] ntdll/tests: Run crashing i386 exception tests as the last step.
by Marvin June 19, 2014

June 19, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7618 Your paranoid android. === w2000pro (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00950000/00950001 exception: unhandled exception 80000004 at 00950000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 7C5C20B0/00950001 === wxppro (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00A30000/00A30001 exception: unhandled exception 80000004 at 00A30000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 7C80DF3C/00A30001 === wvistau64 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 002C0000/002C0001 exception: unhandled exception 80000004 at 002C0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 7751ED97/002C0001 === w2008s64 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 003D0000/003D0001 exception: unhandled exception 80000004 at 003D0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 77E5ED97/003D0001 === w7u (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00280000/00280001 exception: unhandled exception 80000004 at 00280000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 77CDE34F/00280001 === w8 (32 bit exception) === exception.c:1102: Test failed: Got exception offset 0x1b, expected 0x19 exception.c:1111: Test failed: Got exception offset 0x19, expected 0x17 exception.c:484: Test failed: 42: Wrong exception address 004F0000/004F0001 exception: unhandled exception 80000004 at 004F0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 77174D17/004F0001

1 0

Re: [1/4] ntdll/tests: Use an EXCEPTION_REGISTRATION_RECORD array to prevent compiler from reordering variables.
by Marvin June 19, 2014

June 19, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7617 Your paranoid android. === w2000pro (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00950000/00950001 exception: unhandled exception 80000004 at 00950000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 7C5C20B0/00950001 === wxppro (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00A30000/00A30001 exception: unhandled exception 80000004 at 00A30000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 7C80DF3C/00A30001 === wvistau64 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 002C0000/002C0001 exception: unhandled exception 80000004 at 002C0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 7751ED97/002C0001 === w2008s64 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 002C0000/002C0001 exception: unhandled exception 80000004 at 002C0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 77E5ED97/002C0001 === w7u (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 002F0000/002F0001 exception: unhandled exception 80000004 at 002F0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 77CDE34F/002F0001 === w8 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 003F0000/003F0001 exception: unhandled exception 80000004 at 003F0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 77174D17/003F0001

1 0

Re: Revert "windowscodecs: Fix leak in test_QueryCapability."
by Marvin June 19, 2014

June 19, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7603 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: ntdll: Add exception tests for RtlUnwind on i386.
by Marvin June 19, 2014

June 19, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7598 Your paranoid android. === w2000pro (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00950000/00950001 exception: unhandled exception 80000004 at 00950000 exception.c:484: Test failed: 42: Wrong exception address 7C5C20B0/00950001 === wxppro (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00A30000/00A30001 exception: unhandled exception 80000004 at 00A30000 exception.c:484: Test failed: 42: Wrong exception address 7C80DF3C/00A30001 === wvistau64 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 002D0000/002D0001 exception: unhandled exception 80000004 at 002D0000 exception.c:484: Test failed: 42: Wrong exception address 7751ED97/002D0001 === w2008s64 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 002D0000/002D0001 exception: unhandled exception 80000004 at 002D0000 exception.c:484: Test failed: 42: Wrong exception address 77E5ED97/002D0001 === w7u (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 003C0000/003C0001 exception: unhandled exception 80000004 at 003C0000 exception.c:484: Test failed: 42: Wrong exception address 77CDE34F/003C0001 === w8 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00310000/00310001 exception: unhandled exception 80000004 at 00310000 exception.c:484: Test failed: 42: Wrong exception address 77174D17/00310001

1 0

Re: windowscodecs: Fix leak in test_QueryCapability.
by Marvin June 18, 2014

June 18, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7580 Your paranoid android. === wvistau64 (32 bit tiffformat) === tiffformat.c:245: Test failed: CreateDecoderFromStream error 0x88982f8b tiffformat: unhandled exception c0000005 at 0EEE3AA7 === w2008s64 (32 bit tiffformat) === tiffformat.c:245: Test failed: CreateDecoderFromStream error 0x88982f8b tiffformat: unhandled exception c0000005 at 0EEE3AA7 === w7u (32 bit tiffformat) === tiffformat.c:245: Test failed: CreateDecoderFromStream error 0x88982f8b tiffformat: unhandled exception c0000005 at 0EEE3AA7 === w8 (32 bit tiffformat) === tiffformat: unhandled exception c0000005 at 0042395C === wvistau64 (64 bit tiffformat) === No test summary line found === w2008s64 (64 bit tiffformat) === No test summary line found

1 0

Re: [PATCH 1/4] packager: Implement IOleObject::SetClientSite
by Marvin June 18, 2014

June 18, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7573 Your paranoid android. === build (build) === Patch failed to apply

1 0

WineHQ Downtime
by Jeremy Newman June 18, 2014

June 18, 2014

WineHQ will be going offline starting at 10:00 CDT tomorrow (Wednesday 2014-06-18) and will be down for up to an hour. We are moving the site and all services (other than the Wiki) to new hardware. This includes: WineHQ.org, Forums, AppDB, Bugzilla, Git, FTP, Mailing lists, and WineTestBot Web Even after the things come back online, some services may need some tweaking. We will be on the issues as fast as we can. -N

4 4

Re: oleaut32: Fix TLB dependencies lookup (retry 3)
by Marvin June 18, 2014

June 18, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7567 Your paranoid android. === w2000pro (32 bit typelib) === typelib.c:5491: Test failed: got: 80029c4a

1 0

Re: [2/3] msvcrt: Clear _cnt on buffer flush.
by Piotr Caban June 18, 2014

June 18, 2014

On 06/18/14 02:03, Grazvydas Ignotas wrote: > @@ -3662,6 +3662,7 @@ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) > if(file->_cnt <= 0) > res = msvcrt_flush_buffer(file); > if(!res) { > + file->_cnt=file->_bufsiz; > *file->_ptr++ = c; > file->_cnt--; > } file->_cnt value should only be set if msvcrt_flush_buffer was called. Cheers, Piotr

1 0

Re: [4/5] msvcrt: Move write flag setting code for reuse.
by Piotr Caban June 17, 2014

June 17, 2014

On 06/14/14 01:23, Grazvydas Ignotas wrote: > --- > dlls/msvcrt/file.c | 27 +++++++++++++++------------ > 1 file changed, 15 insertions(+), 12 deletions(-) > > diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c > index 7523bbb..d6fb9ef 100644 > --- a/dlls/msvcrt/file.c > +++ b/dlls/msvcrt/file.c > @@ -3641,6 +3641,17 @@ MSVCRT_wchar_t * CDECL MSVCRT_fgetws(MSVCRT_wchar_t *s, int size, MSVCRT_FILE* f > return buf_start; > } > > +static inline int msvcrt_set_write_direction(MSVCRT_FILE* file) > +{ > + if(!(file->_flag & MSVCRT__IOWRT)) { > + if(file->_flag & MSVCRT__IORW) > + file->_flag |= MSVCRT__IOWRT; > + else > + return MSVCRT_EOF; > + } > + return 0; > +} I don't see a good reason for making this code reusable. The code is used to inform how the buffer is used (if it's used for writing or reading). This means that it doesn't make sense to set it if buffer is not used. The only valid use of it I can see in wine sources is _flsbuf. I've wrote a test that shows that _IOWRT flag is not set if _bufsiz==0 or in the case you're implementing. You can see it's code and result on windows here: https://testbot.winehq.org/JobDetails.pl?Key=7552

2 1

Re: [PATCH 2/2] packager: Add loading support for Ole10Native storage objects
by Vincent Povirk June 17, 2014

June 17, 2014

+ hr = IStorage_OpenStream(pStg, ole10nativeW, NULL, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stream); You should probably use STGM_READ here.

1 0

Re: [PATCH 1/5] d2d1: Implement d2d_d3d_render_target_CreateSolidColorBrush().
by Jacek Caban June 17, 2014

June 17, 2014

Hi Henri, On 06/16/14 13:13, Henri Verbeet wrote: > diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h > index 5609db6..9e91728 100644 > --- a/dlls/d2d1/d2d1_private.h > +++ b/dlls/d2d1/d2d1_private.h > @@ -33,4 +33,13 @@ struct d2d_d3d_render_target > void d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, ID2D1Factory *factory, > IDXGISurface *surface, const D2D1_RENDER_TARGET_PROPERTIES *desc) DECLSPEC_HIDDEN; > > +struct d2d_brush > +{ > + ID2D1Brush ID2D1Brush_iface; Given how you use this object, this should be ID2D1SolidColorBrush. I guess you want to somehow reuse this struct for other brush types, but there should be better ways for this. Then: +void d2d_solid_color_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, + const D2D1_COLOR_F *color, const D2D1_BRUSH_PROPERTIES *desc) +{ + FIXME("Ignoring brush properties.\n"); + + brush->ID2D1Brush_iface.lpVtbl = (ID2D1BrushVtbl *)&d2d_solid_color_brush_vtbl; + brush->refcount = 1; +} This cast should not be needed. > + LONG refcount; > +}; > + > +void d2d_solid_color_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, > + const D2D1_COLOR_F *color, const D2D1_BRUSH_PROPERTIES *desc) DECLSPEC_HIDDEN; > + > #endif /* __WINE_D2D1_PRIVATE_H */ > diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c > index be9c1b6..e8c56a0 100644 > --- a/dlls/d2d1/render_target.c > +++ b/dlls/d2d1/render_target.c > @@ -117,9 +117,19 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapBrush(ID2D1Re > static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateSolidColorBrush(ID2D1RenderTarget *iface, > const D2D1_COLOR_F *color, const D2D1_BRUSH_PROPERTIES *desc, ID2D1SolidColorBrush **brush) > { > - FIXME("iface %p, color %p, desc %p, brush %p stub!\n", iface, color, desc, brush); > + struct d2d_brush *object; > > - return E_NOTIMPL; > + TRACE("iface %p, color %p, desc %p, brush %p.\n", iface, color, desc, brush); > + > + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) > + return E_OUTOFMEMORY; > + > + d2d_solid_color_brush_init(object, iface, color, desc); > + > + TRACE("Created brush %p.\n", object); > + *brush = (ID2D1SolidColorBrush *)&object->ID2D1Brush_iface; Same here, the cast should not be needed. Also allocating memory in brush.c seems more logical to me (although that's a matter of taste). Cheers, Jacek

2 7

Re: [PATCH 1/4] vbscript: Implemented TypeName(try 2)
by Jacek Caban June 17, 2014

June 17, 2014

On 06/17/14 07:58, Shuai Meng wrote: > iff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c > index 5160374..5357df8 100644 > --- a/dlls/vbscript/global.c > +++ b/dlls/vbscript/global.c > @@ -1502,8 +1502,57 @@ static HRESULT Global_DatePart(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, > > static HRESULT Global_TypeName(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) > { > - FIXME("\n"); > - return E_NOTIMPL; > + static const WCHAR ByteW[] = {'B', 'y', 't', 'e', 0}; > + static const WCHAR IntegerW[] = {'I', 'n', 't', 'e', 'g', 'e', 'r', 0}; > + static const WCHAR LongW[] = {'L', 'o', 'n', 'g', 0}; > + static const WCHAR SingleW[] = {'S', 'i', 'n', 'g', 'l', 'e', 0}; > + static const WCHAR DoubleW[] = {'D', 'o', 'u', 'b', 'l', 'e', 0}; > + static const WCHAR CurrencyW[] = {'C', 'u', 'r', 'r', 'e', 'n', 'c', 'y', 0}; > + static const WCHAR DecimalW[] = {'D', 'e', 'c', 'i', 'm', 'a', 'l', 0}; > + static const WCHAR DateW[] = {'D', 'a', 't', 'e', 0}; > + static const WCHAR StringW[] = {'S', 't', 'r', 'i', 'n', 'g', 0}; > + static const WCHAR BooleanW[] = {'B', 'o', 'o', 'l', 'e', 'a', 'n', 0}; > + static const WCHAR EmptyW[] = {'E', 'm', 'p', 't', 'y', 0}; > + static const WCHAR NullW[] = {'N', 'u', 'l', 'l', 0}; > + /*static const WCHAR ObjectW[] = {'O', 'b', 'j', 'e', 'c', 't', 0}; Please don't leave such commented things in the patch. You could remove it, but ideally this should have tests and implementation. > + static const WCHAR NothingW[] = {'N', 'o', 't', 'h', 'i', 'n', 'g', 0};*/ > + > + TRACE("(%s)\n", debugstr_variant(arg)); > + > + assert(args_cnt == 1); > + > + if(res) { This if() is not needed. return_string will take care of NULL res. > + switch(V_VT(arg)) { > + case VT_UI1: Please don't add 8 space indention. I personally prefer no additional indentions for cases, but in any case, if you do indention, use 4 spaces as the rest of file. > + return return_string(res, ByteW); > + case VT_I2: > + return return_string(res, IntegerW); > + case VT_I4: > + return return_string(res, LongW); > + case VT_R4: > + return return_string(res, SingleW); > + case VT_R8: > + return return_string(res, DoubleW); > + case VT_CY: > + return return_string(res, CurrencyW); > + case VT_DECIMAL: > + return return_string(res, DecimalW); > + case VT_DATE: > + return return_string(res, DateW); > + case VT_BSTR: > + return return_string(res, StringW); > + case VT_BOOL: > + return return_string(res, BooleanW); > + case VT_EMPTY: > + return return_string(res, EmptyW); > + case VT_NULL: > + return return_string(res, NullW); > + default: > + FIXME("arg %s not supported\n", debugstr_variant(arg)); > + return E_NOTIMPL; > + } > + } > + return S_OK; > } > > static HRESULT Global_Array(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) > diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs > index 2cf9bb7..32f4dc3 100644 > --- a/dlls/vbscript/tests/api.vbs > +++ b/dlls/vbscript/tests/api.vbs > @@ -845,4 +845,25 @@ MyObject.myval = 0 > Call ok(CSng(MyObject) = 0, "CSng(MyObject) = " & CSng(MyObject)) > Call ok(getVT(CSng(MyObject)) = "VT_R4", "getVT(CSng(MyObject)) = " & getVT(CSng(MyObject))) > > +Call ok(TypeName(CByte(255)) = "Byte", "TypeName(CByte(255)) = " & TypeName(CByte(255))) > +Call ok(getVT(TypeName(CByte(255))) = "VT_BSTR", "getVT(TypeName(CByte(255))) = " & getVT(TypeName(CByte(255)))) > +Call ok(TypeName(255) = "Integer", "TypeName(255) = " & TypeName(255)) > +Call ok(getVT(TypeName(255)) = "VT_BSTR", "getVT(TypeName(255)) = " & getVT(TypeName(255))) > +Call ok(TypeName(32768) = "Long", "TypeName(32768) = " & TypeName(32768)) > +Call ok(getVT(TypeName(32768)) = "VT_BSTR", "getVT(TypeName(32768)) = " & getVT(TypeName(32768))) > +Call ok(TypeName(CSng(0.5)) = "Single", "TypeName(CSng(0.5)) = " & TypeName(CSng(0.5))) > +Call ok(getVT(TypeName(CSng(0.5))) = "VT_BSTR", "getVT(TypeName(CSng(0.5))) = " & getVT(TypeName(CSng(0.5)))) > +Call ok(TypeName(-0.5) = "Double", "TypeName(-0.5) = " & TypeName(-0.5)) > +Call ok(getVT(TypeName(-0.5)) = "VT_BSTR", "getVT(TypeName(-0.5)) = " & getVT(TypeName(-0.5))) > +Call ok(TypeName(CCur(0.5)) = "Currency", "TypeName(CCur(0.5)) = " & TypeName(CCur(0.5))) > +Call ok(getVT(TypeName(CCur(0.5))) = "VT_BSTR", "getVT(TypeName(CCur(0.5))) = " & getVT(TypeName(CCur(0.5)))) > +Call ok(TypeName(CStr(0.5)) = "String", "TypeName(CStr(0.5)) = " & TypeName(CStr(0.5))) > +Call ok(getVT(TypeName(CStr(0.5))) = "VT_BSTR", "getVT(TypeName(CStr(0.5))) = " & getVT(TypeName(CStr(0.5)))) > +Call ok(TypeName(CBool(0.5)) = "Boolean", "TypeName(CBool(0.5)) = " & TypeName(CBool(0.5))) > +Call ok(getVT(TypeName(CBool(0.5))) = "VT_BSTR", "getVT(TypeName(CBool(0.5))) = " & getVT(TypeName(CBool(0.5)))) Using True or False directly instead of CBool() would be cleaner. Jacek

1 0

Re: [PATCH 4/4] vbscript: Implemented Abs(try 2)
by Marvin June 17, 2014

June 17, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7551 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 3/4] vbscript: Implemented Sgn(try 2)
by Marvin June 17, 2014

June 17, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7550 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 2/4] vbscript: Implemented VarType(try 2)
by Marvin June 17, 2014

June 17, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7549 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 1/4] vbscript: Implemented TypeName(try 2)
by Marvin June 17, 2014

June 17, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7548 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 4/4] vbscript: Implemented Abs
by Marvin June 16, 2014

June 16, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7547 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 3/4] vbscript: Implemented Sgn
by Marvin June 16, 2014

June 16, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7546 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 2/4] vbscript: Implemented VarType
by Marvin June 16, 2014

June 16, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7545 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 1/4] vbscript: Implemented TypeName
by Marvin June 16, 2014

June 16, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7544 Your paranoid android. === build (build) === Patch failed to apply

1 0

Fix for PlgBlt, the XFORM matrix was calculated incorrectly
by Alexander Almaleh June 16, 2014

June 16, 2014

I had tried to submit a patch for that 5 years ago<http://www.winehq.org/pipermail/wine-devel/2009-December/080391.html>, but couldn't figure out how to make a patch/test it, and eventually gave up and forgot about it. But recently I remembered about it, and now I want to try again. So, this time I've prepared a test that can prove that the previous implementation does not calculate the XFORM matrix correctly, and that my patch will fix it. The test is a VC6 project, you can find it at https://drive.google.com/file/d/0B9PGUhmmnsm1S2VvZzc3WmhBY3c/edit?usp=shari…. The test is a demo of PlgBlt that I found on CodeProject<http://www.codeproject.com/Articles/17712/The-GDI-magic-Rendering-reflectio…>. You can compare how it works on XP and on Wine. For testing, I directly inserted the original Wine implementation of PlgBlt, as well as my patched version, into the VC6 project, and tested on that. This is because there seems to be an additional problem with MaskBlt, which I'll try tackling next. I have screenshots of what the demo looks using Windows's PlgBlt<http://imgur.com/q8qKGd7>, and Wine's PlgBlt <http://imgur.com/smYEV6z>. To test it, simply look at this function in the VC6 project: BOOL MyPlgBlt( HDC hdcDest, const POINT *lpPoint, HDC hdcSrc, INT nXSrc, INT nYSrc, INT nWidth, INT nHeight, HBITMAP hbmMask, INT xMask, INT yMask) { // return MyPlgBltWinePatched(hdcDest, lpPoint, hdcSrc, nXSrc, nYSrc, nWidth, nHeight, hbmMask, xMask, yMask); return MyPlgBltWineUnpatched(hdcDest, lpPoint, hdcSrc, nXSrc, nYSrc, nWidth, nHeight, hbmMask, xMask, yMask); // return PlgBlt(hdcDest, lpPoint, hdcSrc, nXSrc, nYSrc, nWidth, nHeight, hbmMask, xMask, yMask); } Uncomment the function you want to test. If you need something else (like binaries), just write. And this is the patch itself. I've tried to keep the changes minimal, with respect to white-space, etc. I've removed a "return FALSE", because I don't calculate a determinant explicitly. commit c9ca2cab58fa0cba3d6b24cfb2af507fd1c07227 Author: Alexander Almaleh <sashoalm(a)gmail.com> Date: Tue May 20 18:33:55 2014 +0300 Fix for the calculation of the XFORM matrix in PlgBlt. diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 4750d1b..1de25b9 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -992,22 +992,32 @@ BOOL WINAPI PlgBlt( HDC hdcDest, const POINT *lpPoint, HDC hdcSrc, INT nXSrc, INT nYSrc, INT nWidth, INT nHeight, HBITMAP hbmMask, INT xMask, INT yMask) { + /* we need to use floating-point precision when calculating the + * XFORM matrix to avoid loss of precision due to rounding */ + typedef struct tagPOINTLF + { + double x, y; + } POINTLF; + int oldgMode; /* parallelogram coords */ - POINT plg[3]; + POINTLF plg[3]; /* rect coords */ - POINT rect[3]; + POINTLF rect[3]; XFORM xf; XFORM SrcXf; XFORM oldDestXf; - double det; + int ii; /* save actual mode, set GM_ADVANCED */ oldgMode = SetGraphicsMode(hdcDest,GM_ADVANCED); if (oldgMode == 0) return FALSE; - memcpy(plg,lpPoint,sizeof(POINT)*3); + for (ii = 0; ii < 3; ii++) { + plg[ii].x = lpPoint[ii].x; + plg[ii].y = lpPoint[ii].y; + } rect[0].x = nXSrc; rect[0].y = nYSrc; rect[1].x = nXSrc + nWidth; @@ -1015,33 +1025,39 @@ BOOL WINAPI PlgBlt( HDC hdcDest, const POINT *lpPoint, rect[2].x = nXSrc; rect[2].y = nYSrc + nHeight; /* calc XFORM matrix to transform hdcDest -> hdcSrc (parallelogram to rectangle) */ - /* determinant */ - det = rect[1].x*(rect[2].y - rect[0].y) - rect[2].x*(rect[1].y - rect[0].y) - rect[0].x*(rect[2].y - rect[1].y); - - if (fabs(det) < 1e-5) - { - SetGraphicsMode(hdcDest,oldgMode); - return FALSE; - } TRACE("hdcSrc=%p %d,%d,%dx%d -> hdcDest=%p %d,%d,%d,%d,%d,%d\n", hdcSrc, nXSrc, nYSrc, nWidth, nHeight, hdcDest, plg[0].x, plg[0].y, plg[1].x, plg[1].y, plg[2].x, plg[2].y); /* X components */ - xf.eM11 = (plg[1].x*(rect[2].y - rect[0].y) - plg[2].x*(rect[1].y - rect[0].y) - plg[0].x*(rect[2].y - rect[1].y)) / det; - xf.eM21 = (rect[1].x*(plg[2].x - plg[0].x) - rect[2].x*(plg[1].x - plg[0].x) - rect[0].x*(plg[2].x - plg[1].x)) / det; - xf.eDx = (rect[0].x*(rect[1].y*plg[2].x - rect[2].y*plg[1].x) - - rect[1].x*(rect[0].y*plg[2].x - rect[2].y*plg[0].x) + - rect[2].x*(rect[0].y*plg[1].x - rect[1].y*plg[0].x) - ) / det; + xf.eM11 = -(rect[1].y*plg[2].x+rect[0].y*(plg[1].x-plg[2].x) + -rect[2].y*plg[1].x+plg[0].x*(rect[2].y-rect[1].y)) + /(rect[0].y*(rect[2].x-rect[1].x)-rect[1].y*rect[2].x+ + rect[2].y*rect[1].x+(rect[1].y-rect[2].y)*rect[0].x); + xf.eM21 = (plg[0].x*(rect[2].x-rect[1].x)-plg[1].x*rect[2].x + +plg[2].x*rect[1].x+(plg[1].x-plg[2].x)*rect[0].x) + /(rect[0].y*(rect[2].x-rect[1].x)-rect[1].y*rect[2].x + +rect[2].y*rect[1].x+(rect[1].y-rect[2].y)*rect[0].x); + xf.eDx = -(rect[0].y*(plg[2].x*rect[1].x-plg[1].x*rect[2].x) + +plg[0].x*(rect[1].y*rect[2].x-rect[2].y*rect[1].x) + +(rect[2].y*plg[1].x-rect[1].y*plg[2].x)*rect[0].x) + /(rect[0].y*(rect[2].x-rect[1].x)-rect[1].y*rect[2].x+rect[2].y + *rect[1].x+(rect[1].y-rect[2].y)*rect[0].x); /* Y components */ - xf.eM12 = (plg[1].y*(rect[2].y - rect[0].y) - plg[2].y*(rect[1].y - rect[0].y) - plg[0].y*(rect[2].y - rect[1].y)) / det; - xf.eM22 = (plg[1].x*(rect[2].y - rect[0].y) - plg[2].x*(rect[1].y - rect[0].y) - plg[0].x*(rect[2].y - rect[1].y)) / det; - xf.eDy = (rect[0].x*(rect[1].y*plg[2].y - rect[2].y*plg[1].y) - - rect[1].x*(rect[0].y*plg[2].y - rect[2].y*plg[0].y) + - rect[2].x*(rect[0].y*plg[1].y - rect[1].y*plg[0].y) - ) / det; + xf.eM12 = -(rect[1].y*(plg[2].y-plg[0].y)+rect[0].y*(plg[1].y + -plg[2].y)+rect[2].y*(plg[0].y-plg[1].y))/(rect[0].y*(rect[2].x + -rect[1].x)-rect[1].y*rect[2].x+rect[2].y*rect[1].x+(rect[1].y + -rect[2].y)*rect[0].x); + xf.eM22 = ((plg[0].y-plg[1].y)*rect[2].x+(plg[2].y-plg[0].y)*rect[1].x + +(plg[1].y-plg[2].y)*rect[0].x) /(rect[0].y*(rect[2].x-rect[1].x) + -rect[1].y*rect[2].x+rect[2].y*rect[1].x+(rect[1].y-rect[2].y) + *rect[0].x); + xf.eDy = (rect[0].y*(plg[1].y*rect[2].x-plg[2].y*rect[1].x) + -rect[1].y*plg[0].y*rect[2].x+rect[2].y*plg[0].y*rect[1].x + +(rect[1].y*plg[2].y-rect[2].y*plg[1].y)*rect[0].x)/(rect[0].y + *(rect[2].x-rect[1].x)-rect[1].y*rect[2].x+rect[2].y*rect[1].x + +(rect[1].y-rect[2].y)*rect[0].x); GetWorldTransform(hdcSrc,&SrcXf); CombineTransform(&xf,&xf,&SrcXf);

4 10

Re: msvcr110: Fix typo in exported symbol _set_SSE2_enable.
by Piotr Caban June 16, 2014

June 16, 2014

Hi, You need to generate the patch on top of newest wine from git. Cheers, Piotr

1 0

Re: ole32: Return the correct error in FileLockBytesImpl_*LockRegion*().
by Vincent Povirk June 16, 2014

June 16, 2014

It looks to me like locks that fail due to conflicts will set ERROR_LOCK_VIOLATION, not ERROR_ACCESS_DENIED. We should probably add some tests for the error to the LockFileEx tests. I'd also be interested in what Windows returns on a filesystem that doesn't support locking, if such a thing exists.

1 0

Re: ole32: Fix StorageImpl_LockRegionSync() to actually wait between locking attempts.
by Vincent Povirk June 16, 2014

June 16, 2014

Oops. Thanks for the fix. On Mon, Jun 16, 2014 at 11:23 AM, Francois Gouget <fgouget(a)free.fr> wrote: > --- > dlls/ole32/storage32.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c > index 757138d..49d16fd 100644 > --- a/dlls/ole32/storage32.c > +++ b/dlls/ole32/storage32.c > @@ -2874,16 +2874,16 @@ static HRESULT StorageImpl_LockRegionSync(StorageImpl *This, ULARGE_INTEGER offs > ULARGE_INTEGER cb, DWORD dwLockType) > { > HRESULT hr; > + int delay; > > /* if it's a FileLockBytesImpl use LockFileEx in blocking mode */ > if (SUCCEEDED(FileLockBytesImpl_LockRegionSync(This->lockBytes, offset, cb))) > return S_OK; > > /* otherwise we have to fake it based on an async lock */ > + delay = 0; > do > { > - int delay=0; > - > hr = ILockBytes_LockRegion(This->lockBytes, offset, cb, dwLockType); > > if (hr == STG_E_ACCESSDENIED) > -- > 2.0.0 > > >

1 0

Re: [PATCH 5/5] ddraw/tests: Properly declare matrices.
by Marvin June 16, 2014

June 16, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7524 Your paranoid android. === w8 (32 bit visual) === visual.c:2619: Test failed: unexpected colortable on offscreen surface === w2000pro (32 bit d3d) === d3d.c:1261: Test failed: Homogeneous output was generated despite UNCLIPPED flag === wxppro (32 bit d3d) === d3d.c:1261: Test failed: Homogeneous output was generated despite UNCLIPPED flag === wvistau64 (32 bit d3d) === d3d.c:1261: Test failed: Homogeneous output was generated despite UNCLIPPED flag === w2008s64 (32 bit d3d) === d3d.c:1261: Test failed: Homogeneous output was generated despite UNCLIPPED flag === w7u (32 bit d3d) === d3d.c:1261: Test failed: Homogeneous output was generated despite UNCLIPPED flag === w8 (32 bit d3d) === d3d.c:1261: Test failed: Homogeneous output was generated despite UNCLIPPED flag

2 1

Re: kernel32: Raise DBG_PRINTEXCEPTION_C exception in OutputDebugStringA.
by Marvin June 15, 2014

June 15, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7510 Your paranoid android. === w2000pro (32 bit exception) === exception.c:406: Test failed: 42: Wrong exception address 00950000/00950001 exception: unhandled exception 80000004 at 00950000 exception.c:406: Test failed: 42: Wrong exception address 7C5C20B0/00950001 === wxppro (32 bit exception) === exception.c:406: Test failed: 42: Wrong exception address 00A30000/00A30001 exception: unhandled exception 80000004 at 00A30000 exception.c:406: Test failed: 42: Wrong exception address 7C80DF3C/00A30001 === wvistau64 (32 bit exception) === exception.c:406: Test failed: 42: Wrong exception address 00340000/00340001 exception: unhandled exception 80000004 at 00340000 exception.c:406: Test failed: 42: Wrong exception address 7751ED97/00340001 === w2008s64 (32 bit exception) === exception.c:406: Test failed: 42: Wrong exception address 003C0000/003C0001 exception: unhandled exception 80000004 at 003C0000 exception.c:406: Test failed: 42: Wrong exception address 77E5ED97/003C0001 === w7u (32 bit exception) === exception.c:406: Test failed: 42: Wrong exception address 003F0000/003F0001 exception: unhandled exception 80000004 at 003F0000 exception.c:406: Test failed: 42: Wrong exception address 77CDE34F/003F0001 === w8 (32 bit exception) === exception.c:406: Test failed: 42: Wrong exception address 004F0000/004F0001 exception: unhandled exception 80000004 at 004F0000 exception.c:406: Test failed: 42: Wrong exception address 77174D17/004F0001

1 0

Re: windowscodecs/tests: Fixed some leaks on error path (Valgrind)
by Vincent Povirk June 15, 2014

June 15, 2014

+ if (FAILED(hr)) + { + IStream_Release(stream); + IWICComponentFactory_Release(factory); + return; + } The rest of the function is already has code to handle failure, so returning early is unnecessary.

1 0

Re: shell32: Fix SHFileOperation when deleting a nonexistent directory. (try 2)
by Zhenbo Li June 14, 2014

June 14, 2014

2014-05-21 9:23 GMT+08:00 Zhenbo Li <litimetal(a)gmail.com>: > Thanks Alexandre > > try 2: > 1. Let SHELL_DeleteDirectoryW return DWORD > 2. Get the right return value by > ret = SHNotifyRemoveDirectoryW(pszDir) > origin: > Thanks Bruno Jesus > This patch would fix bug 34324, by returning correct > error value of SHFileOperation. > > --- > dlls/shell32/shlfileop.c | 55 > +++++++++++++++++++++--------------------- > dlls/shell32/tests/shlfileop.c | 4 --- > 2 files changed, 27 insertions(+), 32 deletions(-) Hi, Could someone have a look with my patch after three weeks :-) Thank you very much -- Have a nice day! Zhenbo Li

1 0

Re: ws2_32/socket.c: Fix compile for linux systems without net/ipx.h
by Bruno Jesus June 13, 2014

June 13, 2014

On Mon, Jun 2, 2014 at 3:01 PM, Felix Janda <felix.janda(a)posteo.de> wrote: > --- > dlls/ws2_32/socket.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c > index e31f396..cf5473d 100644 > --- a/dlls/ws2_32/socket.c > +++ b/dlls/ws2_32/socket.c > @@ -109,6 +109,8 @@ > # include <linux/types.h> > # endif > # include <linux/ipx.h> > +# define SOL_IPX 256 > +# define IPX_TYPE 1 > # define HAS_IPX > #endif Hi, can you share the details about how you are compiling this? There may be a better solution like not defining HAS_IPX if SOL_IPX is not present. If you help me reproduce the issue I can help to fix it. Best regards, Bruno

2 3

Re: [1/4] msvcrt/tests: Add a test for fwrite flushing behavior. (try 2)
by Piotr Caban June 13, 2014

June 13, 2014

Hi, On 06/13/14 01:27, Grazvydas Ignotas wrote: > +static void test_write_flush(void) > +{ > + char iobuf[1024]; > + char *tempf; > + FILE *file; > + > + tempf = _tempnam(".","wne"); > + file = fopen(tempf, "wb+"); > + ok(file != NULL, "unable to create test file\n"); > + /* the default should be 4K */ > + test_write_flush_size(file, 4096); It would be nice to read the size from the file->_bufsiz instead of hard-coding 4096. This value is not initialized while the file is opened so you will need to call something before reading it's value. > + setvbuf(file, iobuf, _IOFBF, sizeof(iobuf)); > + test_write_flush_size(file, sizeof(iobuf)); > + fclose(file); Current implemententation of setvbuf is broken in wine. This code will cause free(iobuf) to be called. I think that setvbuf needs to be fixed before this test can be added. > + unlink(tempf); > + free(tempf); _tempnam returns internal buffer, free should not be called on it. Thanks, Piotr

2 2

Re: vbscript: Reset error number on error mode change.
by Marvin June 13, 2014

June 13, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7476 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 1/2] riched20: Implement ITextSelection::GetText.
by Jactry Zeng June 13, 2014

June 13, 2014

Hello, Could someone take a look at this patch? Any comment will be appreciate! Thanks. 2014-05-28 15:17 GMT+08:00 Jactry Zeng <wine(a)jactry.com>: > ChangeLog: > - skip a test in native 64bit riched20 > - implementing without helper function > > --- > dlls/riched20/richole.c | 28 +++++++++++++- > dlls/riched20/tests/richole.c | 88 ++++++++++++++++++++++++++++++ > ++++++++++++- > 2 files changed, 113 insertions(+), 3 deletions(-) > > > > > > -- Regards, Jactry Zeng

1 0

Re: [PATCH 2/2] vbscript: Fixed CStr
by Jacek Caban June 13, 2014

June 13, 2014

Hi Shuai, On 06/13/14 06:26, Shuai Meng wrote: > - hres = to_string(arg, &str); > + assert(args_cnt == 1); > + > + V_VT(&v) = VT_EMPTY; > + hres = VariantChangeType(&v, arg, VARIANT_LOCALBOOL, VT_BSTR); Why do you change it? to_string() already does the same call. Jacek

2 1

Re: [3/4] msvcrt: change default buffer size to 4k.
by Piotr Caban June 13, 2014

June 13, 2014

On 06/13/14 01:27, Grazvydas Ignotas wrote: > -#define MSVCRT_BUFSIZ 512 > +#define MSVCRT_BUFSIZ 4096 You can't change BUFSIZ value.

2 2

Re: [PATCH 2/2] vbscript: Fixed CStr
by Piotr Caban June 13, 2014

June 13, 2014

On 06/13/14 06:26, Shuai Meng wrote: > --- > dlls/vbscript/global.c | 16 +++++++++++++--- > dlls/vbscript/tests/api.vbs | 21 +++++++++++++++++++++ > 2 files changed, 34 insertions(+), 3 deletions(-) > You have probably sent wrong patch, one that you've sent me earlier is better (https://github.com/Shuai-Meng/wine/commit/54bb6a783a623a3bf30c8fe33187c8a35…) Taking in account you'll need to resend it, could you please also change: + if(!res) + return DISP_E_BADVARTYPE; + else { + *res = v; + return S_OK; + } to if(!res) return DISP_E_BADVARTYPE; *res = v; return S_OK; It's a style change that makes your code similar to other code in global.c Thanks, Piotr

1 0

Re: [PATCH 2/2] vbscript: Fixed CStr
by Marvin June 13, 2014

June 13, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7468 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 1/2] msvcrt: Add _strxfrm_l implementation
by Marvin June 12, 2014

June 12, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7457 Your paranoid android. === w2000pro (32 bit string) === string: unhandled exception c0000005 at 78010362 === wxppro (32 bit string) === string: unhandled exception c0000005 at 77C47AD8

1 0

Re: services: Defer service delete until all handles are closed
by Marvin June 12, 2014

June 12, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7438 Your paranoid android. === w7u (32 bit service) === service.c:1381: Test failed: Something wrong in the calculation service.c:1417: Test failed: Active services mismatch 1 The test timed out

2 1

Re: [PATCH 07/10] dmloader: Use the generic DirectMusicObject implementation for DMContainer.
by Marvin June 12, 2014

June 12, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7450 Your paranoid android. === build (build) === Patch failed to apply

2 1

Re: [PATCH 09/10] dmloader: Add and use a generic IPersistStream_GetClassID.
by Marvin June 12, 2014

June 12, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7452 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 08/10] dmloader/tests: Add more DirectMusicCollection tests.
by Marvin June 12, 2014

June 12, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7451 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: wined3d: Recognize cards that expose GLSL 1.30 as DX10 capable even if they don't support EXT_GPU_SHADER4 (try 4)
by Stefan Dösinger June 11, 2014

June 11, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-05-30 00:45, schrieb Andrei Slăvoiu: > Add back glsl check to make sure the card is capable of DX10. > > --- dlls/wined3d/directx.c | 4 +++- 1 file changed, 3 > insertions(+), 1 deletion(-) Looks good to me. Note that Alexandre and Henri are on holidays right now, so it might take a while before it is committed or you receive further comments. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJTiD0QAAoJEN0/YqbEcdMwcjcP/jAOsNo8MoM8sSlc2RVtU7Y5 tHVmUyMZ0xPSa7DaA13GFT7/hPnRXimRY39epjJ3subulmprkXV+HNtaHWBVkEvR lB+YSJJDFGJ9V81o7aVSUfXydeY81C3TB6TbztO9WtVPSVaE9/ZXJ1ZO3edufoXT XhXMJwce9HmL8nU+SRFo+mAc/FLimCuTwMMf6OF61KlAMTkzGSQoh8sUSwO0hndL /+yARXxgYhBAtepVb2vuL7411/VWlbzrD8S8h4sZhEnCgLNuyGjXFyggjTZn+MWd zYf5MgBWmY/YJu1VES3lkM8VM5FpgJgEcM3DG8BEQ3yI5eyBLReMiKQe3uuyhlnJ KdE9tSPP3Ts2gHYeZ90kGImebtjy5sxA0gsekY5J4oNsbDUfO01OoHde+54GG6WD 25aogs1+edJNZMGI6pxScDl6EoPgbTlBjL5dJ2xDYc1P/ACezNqPBe+tCDoqoVon WBlqNSNntcfCUBEoiXpOcRFK0PeJDIMHRKpZEBM63V3gFW6w0KuI+Sj0JcwFxy+u saLOwXDpaGerhar2njWiCEKwM1NfW2Wj7wcY0/eiy56bi9UvhDCAUqqZ98xlFZuP m8Js4Bwzlp7NHQjaqXo/h3uK36B0OngHZkjRm/hXMEFuQHfCSbKtUMZLn27JI+3a chXJiqk95eUes6GLKzGo =tusS -----END PGP SIGNATURE-----

3 2

Re: [PATCH 4/5] ddraw: Properly support creating compressed user memory surfaces.
by Marvin June 11, 2014

June 11, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7433 Your paranoid android. === wvistau64 (64 bit ddraw7) === ddraw7.c:6467: Test failed: Test 7: Got unexpected pitch 252, expected 256. === w2008s64 (64 bit ddraw7) === ddraw7.c:6467: Test failed: Test 7: Got unexpected pitch 252, expected 256. === wvistau64 (64 bit ddraw4) === ddraw4.c:6644: Test failed: Test 7: Got unexpected pitch 252, expected 256. === w2008s64 (64 bit ddraw4) === ddraw4.c:6644: Test failed: Test 7: Got unexpected pitch 252, expected 256.

1 0

Re: [PATCH 1/5] ddraw: Clear DDSD_LINEARSIZE on uncompressed surfaces.
by Marvin June 11, 2014

June 11, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7432 Your paranoid android. === wvistau64 (64 bit ddraw2) === ddraw2.c:5647: Test failed: Test 3: Got unexpected pitch 252, expected 256. ddraw2.c:5647: Test failed: Test 7: Got unexpected pitch 252, expected 256. === w2008s64 (64 bit ddraw2) === ddraw2.c:5647: Test failed: Test 3: Got unexpected pitch 252, expected 256. ddraw2.c:5647: Test failed: Test 7: Got unexpected pitch 252, expected 256. === wvistau64 (64 bit ddraw1) === ddraw1.c:4571: Test failed: Test 3: Got unexpected pitch 252, expected 256. ddraw1.c:4571: Test failed: Test 7: Got unexpected pitch 252, expected 256. === w2008s64 (64 bit ddraw1) === ddraw1.c:4571: Test failed: Test 3: Got unexpected pitch 252, expected 256. ddraw1.c:4571: Test failed: Test 7: Got unexpected pitch 252, expected 256. === wvistau64 (64 bit ddraw7) === ddraw7.c:6377: Test failed: Test 7: Got unexpected pitch 252, expected 256. === w2008s64 (64 bit ddraw7) === ddraw7.c:6377: Test failed: Test 7: Got unexpected pitch 252, expected 256. === wvistau64 (64 bit ddraw4) === ddraw4.c:6554: Test failed: Test 7: Got unexpected pitch 252, expected 256. === w2008s64 (64 bit ddraw4) === ddraw4.c:6554: Test failed: Test 7: Got unexpected pitch 252, expected 256.

1 0

Undocumented Function in WINE-API
by Pit Demmer June 11, 2014

June 11, 2014

Hi! I´m a 47 year old German - programming BASIC, Assembler and sometime pure C since 1981. Please! NO discussion´s about my love - the VB and Power BASIC's... ;-) My newest project (It´s called LetsLOCO), is a "MultiIO-LongDistance-BusSystem for Logging and Controlling" over an electrical- and protocol-extended I2C-Bus which can adress standard I2C compatible IC´s, too. The fully Project is not only Software! I´ve made many HardWare, too. I want to make this Project free. Hardware fully free under a license similar to a GPL. The Software should be at first Freeware, but only for running under WINE! If somebody plan to use the Software outside WINE... I want some little money for it. And here is the problem... I need a function, which exist in the WINE-API but not in the Original Win-API´s. Can anyone from the WINE-Developers help me? Exist a little 'dummy'-function in user32.dll, kernel32.dll, shell32.dll,... which have no similar function in the original Win-DLL´s? Any other 'safe' way to verify that my EXEs and DLLs running through WINE is welcome, too. Thanks! And sorry for my English! Pit

2 1

Re: gdi32: CLIP_DFA_DISABLE should disable the font association mechanism.
by Marvin June 10, 2014

June 10, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7430 Your paranoid android. === wvistau64 (32 bit font) === The test timed out === wvistau64 (64 bit font) === The test timed out

1 0

Re: ntdll: Use lockfree implementation for get_cached_fd. (try 3)
by Bruno Jesus June 9, 2014

June 9, 2014

On Tue, Jun 10, 2014 at 12:08 AM, Sebastian Lackner <sebastian(a)fds-team.de> wrote: > Thanks for all the feedback @ Ken, Daniel, Bruno and all the other > people I talked to. > > Changes in try 3: > > * Although the fd_cache_epoch was slightly faster in my tests (-> see > plots in mail for try 1) and should also work on PPC, its probably > better to choose a method which is easier to verify, and where we can be > sure, that it doesn't break with the next gcc release. ;) In this patch > I switched back to the old approach using interlocked_cmpxchg64 to > set/get both fd and associated attributes at the same time. > > * Although used in some other places, its probably better to avoid > assert() for stuff, which should never be optimized away. Just an update to my tests: http://influenza.blog.br/wine/testpatch3.pdf As expected it' slightly slower (Try 3 column), but still much better than the current implementation and still under windows 7 measures in my machine. Best wishes, Bruno

1 0

Re: [PATCH try2] vbscript: Added support for exponental form of numeric literals.
by Marvin June 5, 2014

June 5, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7411 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: vbscript: Added support for exponental form of numeric literals.
by Marvin June 5, 2014

June 5, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7409 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: oleaut32: Fix TLB dependencies lookup (try 2)
by Marvin June 4, 2014

June 4, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7406 Your paranoid android. === w2000pro (32 bit typelib) === typelib.c:5452: Test failed: got: 80029c4a

1 0

Re: [PATCH 2/6] wined3d: Set palettes on the swapchain (v3).
by Henri Verbeet June 4, 2014

June 4, 2014

On 3 June 2014 09:41, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > @@ -473,17 +473,17 @@ static HRESULT ddraw_surface_set_palette(struct ddraw_surface *surface, IDirectD > prev->flags &= ~DDPCAPS_PRIMARYSURFACE; > if (palette_impl) > palette_impl->flags |= DDPCAPS_PRIMARYSURFACE; > - /* Update the wined3d frontbuffer if this is the primary. */ > - if (surface->ddraw->wined3d_frontbuffer) > - wined3d_surface_set_palette(surface->ddraw->wined3d_frontbuffer, > + /* Update the wined3d swapchain if this is the primary. */ > + if (surface->ddraw->wined3d_swapchain) > + wined3d_swapchain_set_palette(surface->ddraw->wined3d_swapchain, > palette_impl ? palette_impl->wineD3DPalette : NULL); > + ddraw_surface_update_frontbuffer(surface, NULL, FALSE); Can this get called when wined3d_swapchain is NULL? The main case I'm not sure of would be ddraw_destroy_swapchain(), but in that case you may not want to call ddraw_surface_update_frontbuffer() either.

1 0

Re: oleaut32: Fix TLB dependencies lookup
by Nikolay Sivov June 4, 2014

June 4, 2014

> -IMPORTS = oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 > +IMPORTS = oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 shlwapi > + StrCatW(pathW, (WCHAR[3]){'\\','4',0}); You don't need this. Just use lstrcatW() and please define constant string in a cleaner way.

1 0

Re: oleaut32: Fix TLB dependencies lookup
by Guillaume Charifi June 4, 2014

June 4, 2014

Hello, Thanks for your remarks, I am sending a corrected patch. Regards

1 0

Re: oleaut32: Fix TLB dependencies lookup
by Andrew Eikum June 4, 2014

June 4, 2014

Looking mostly good, but some problems below. On Tue, Jun 03, 2014 at 08:50:46PM +0200, guillaume.charifi(a)sfr.fr wrote: > + hr = LoadTypeLibEx(testTLBNameW, REGKIND_NONE, &ptLib); > + if(hr == S_OK) { > + ITypeLib_Release(ptLib); > + win_skip("test_tlb.tlb is on the path or registered, skipping typelib dependency tests\n"); > + return; > + } > + This fails when I run the tests in my source tree: [aeikum(a)aeikum tests]$ pwd /home/aeikum/wine/dlls/oleaut32/tests typelib.c:5434: Test failed: test_tlb.tlb is on the path or registered, skipping typelib dependency tests Makefile:345: recipe for target 'typelib.ok' failed make: *** [typelib.ok] Error 1 > + /* Search in resource table */ > + if(1) { Why is this if-statement here? > + static const WCHAR TYPELIBW[] = {'T','Y','P','E','L','I','B',0}; > + struct search_res_tlb_param *param = heap_alloc(sizeof(*param)); Why aren't you allocating this on the stack? > + > + param->guid = (GUID *)TLB_get_guid_null(ref_type->pImpTLInfo->guid); > + > + EnumResourceNamesW(NULL, TYPELIBW, search_res_tlb, (LONG_PTR)param); > + > + pTLib = param->pTLib; > + result = param->result; If search_res_tlb() is never run, I think (result == 0 == S_OK). You should initialize it to some failure condition before calling EnumResourceNames. Andrew

1 0

Re: oleaut32: Fix TLB dependencies lookup
by Marvin June 3, 2014

June 3, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7404 Your paranoid android. === w2000pro (32 bit typelib) === typelib.c:5451: Test failed: got: 80029c4a

1 0

Re: [3/3] msvcrt: Implement 4k block flushing behavior.
by Piotr Caban June 3, 2014

June 3, 2014

On 05/31/14 01:00, Grazvydas Ignotas wrote: > + } else if(wrcnt >= MSVCRT_WRITE_BLOCK_SIZE) { > + if(msvcrt_set_write_direction(file) != 0) > + break; > + > + if(file->_bufsiz && file->_ptr != file->_base) > + if(msvcrt_flush_buffer(file) == MSVCRT_EOF) > + break; > + > + if(MSVCRT__write(file->_file, ptr, MSVCRT_WRITE_BLOCK_SIZE) <= 0) { > + file->_flag |= MSVCRT__IOERR; > + break; > + } > + written += MSVCRT_WRITE_BLOCK_SIZE; > + wrcnt -= MSVCRT_WRITE_BLOCK_SIZE; > + ptr = (const char*)ptr + MSVCRT_WRITE_BLOCK_SIZE; This doesn't look right for me. It doesn't make sense to have some special size blocks written in different way. I think this is caused by 2 differences in native and wine's implementation of fwrite: - if you check file->_bufsiz value on windows it's set to 4096 (on wine it's 512), this is probably causing the flash to be done when 4096 bytes are written - probably there's some kind of optimization that writes integral number of buffers directly to file - I was not checking it but maybe native flushes the output when buffer is full, wine will exit fwrite with full buffer in this case I've also seen that _bufsiz is set to 0 on wine if buffer was not yet allocated. On windows it's value is 4096 just after opening the file. Cheers, Piotr

2 3

Re: [PATCH 4/6] d3d8/tests: Add a test for D3DUSAGE_WRITEONLY.
by Marvin June 3, 2014

June 3, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7398 Your paranoid android. === w8 (32 bit device) === device.c:2397: Test failed: Expected foreground window 000B00CA, got 0002004C. device.c:3039: Test failed: Expected wndproc 0x412780, got 0x412780.

1 0

Re: Recognize cards that expose GLSL 1.30 as DX10 capable even if they don't support EXT_GPU_SHADER4
by Stefan Dösinger June 3, 2014

June 3, 2014

Am 23.05.2014 um 00:23 schrieb Andrei Slăvoiu <andrei.slavoiu(a)gmail.com>: > Mesa drivers do not expose EXT_GPU_SHADER4 as all functionality it offers is > already part of OpenGL 3.0. This causes all cards that are not explicitly > recognized by wine (for example all GCN cards) to be treated as DX9 cards and > presented to Windows apps as Radeon 9500. The problem is that without GL_EXT_gpu_shader4 or GL_ARB_shader_texture_lod we cannot handle the texldd instruction. Right now we cannot use core contexts, so unless the driver exposes one of those extensions in compatibility contexts we are stuck on a shader model 2 feature level :-( . The level detection your patch changes isn't directly related to this, as the shader model version support is controlled differently. But a Radeon 9500 matches a card with shader model 2 support much better than a Radeon R9. Does this driver / gpu combination support GL_ARB_shader_texture_lod?

3 9

[PATCH 0/4] Improve compilation with musl libc
by Felix Janda June 3, 2014

June 3, 2014

Hello, I'm trying to reduce the number of patches required to build wine on a musl libc[1] based system. The first two patches merely fix warnings because of use of deprecated headers. So they are not strictly necessary. The patches should also update configure but why is configure at all in the git repo? To compile wine without patches two other issues remain: Various tools used during the build expect getopt_long_only() to have GNU semantics. They don't expect that musl's getopt_long_only() stops after the first non-option argument. The cleanest fix seems to be to add a configure check testing whether getopt_long_only() behaves correctly instead of just testing for its existence. Then there are problems with compiling dlls/ws2_32/socket.c related to IPX but I haven't investigated their cause yet. [1]: http://musl-libc.org Felix Janda (4): Use <poll.h> instead of <sys/poll.h> Remove unecessary <sys/signal> includes Add missing includes of <poll.h> (POLLIN,...) dnsapi: Replace NETDB_INTERNAL by -1 configure.ac | 2 -- dlls/dinput/joystick_linux.c | 4 ++-- dlls/dinput/joystick_linuxinput.c | 4 ++-- dlls/dnsapi/query.c | 2 +- dlls/iphlpapi/icmp.c | 4 ++-- dlls/kernel32/console.c | 4 ++-- dlls/ntdll/file.c | 5 +---- dlls/ntdll/serial.c | 4 ++-- dlls/ntdll/signal_arm.c | 3 --- dlls/ntdll/signal_arm64.c | 3 --- dlls/ntdll/signal_i386.c | 3 --- dlls/ntdll/signal_powerpc.c | 4 ---- dlls/ntdll/signal_x86_64.c | 3 --- dlls/ntdll/sync.c | 5 +---- dlls/rpcrt4/rpc_transport.c | 4 ++-- dlls/wineoss.drv/midi.c | 5 +---- dlls/winex11.drv/event.c | 5 +---- dlls/wininet/internet.c | 5 +---- dlls/wininet/netconnection.c | 5 +---- dlls/winmm/time.c | 5 +---- dlls/ws2_32/socket.c | 5 +---- include/config.h.in | 6 ------ programs/winedbg/gdbproxy.c | 4 ++-- server/change.c | 3 +++ server/fd.c | 5 +---- server/file.c | 2 +- server/named_pipe.c | 2 +- server/object.h | 4 ++-- server/process.c | 2 +- server/queue.c | 3 +++ server/request.c | 2 +- server/serial.c | 2 +- server/signal.c | 5 +---- server/sock.c | 3 +++ server/thread.c | 2 +- 35 files changed, 42 insertions(+), 87 deletions(-) -- 1.8.5.5

3 8

Re: ntdll: Use lockfree implementation for get_cached_fd.
by Ken Thomases June 2, 2014

June 2, 2014

On May 31, 2014, at 10:28 AM, Sebastian Lackner wrote: > Explanation: The basic idea of this patch is that we have a global > counter 'fd_cache_epoch' which is incremented, whenever the file > descriptor cache is updated. get_cached_fd() first reads the counter, > then the fd entry, and afterwards the counter again - if the counter has > changed we know that a second thread has maybe modified the content, and > have to read it again. The memory barrier is there to ensure that > compilers don't optimize away the two reads of 'fd_cache_epoch'. Please > note that: > > * the order of the write instructions when updating the content is > important - this way we ensure that threads only see either (0, *) = not > set, or a valid entry. > > * I assume that reading/writing up to the pointer size can be done as an > atomic operation (threads either see the old or new value, but no > partial updates). This assumption is also used in a lot other parts of > wine, for example here: > http://source.winehq.org/source/dlls/ntdll/sync.c#L1295 > [ It would probably be more safe to introduce special > interlocked_get/interlocked_set macros/functions for that, but not sure > what other people think about that... ] Thanks for working on this. Interesting stuff. I think there are still some issues. In order to ensure a consistent view of the ordering of memory operations, memory barriers have to be used in both the writer and the reader. The writer issues a write barrier after it has written and the reader issues a read barrier before it reads. The appropriate barriers are implicit in interlocked_xchg_add() for incrementing fd_cache_epoch, but the first read of it in get_cached_fd() has no read barrier before it. I think this is benign, though, because I think this can only result in the code thinking the epoch changed when it hasn't. It may retry unnecessarily. More problematic is the writing of the fd and its attributes. There are barriers implicit in the interlocked_xchg() which clears the fd, but there's no write barrier after the final write to it. There's no read barrier before the first read of them. You mention the order of writing, attributes first then fd, as being important. But there's no barrier in between the two operations, so either the compiler or the CPU could reorder either the writes or the reads, thwarting your design. The compiler can also reorder the reading of the fd_cache_epoch with respect to the reading of the fd or attributes. I think you can get this as the effective sequence: thread1 / get_cached_fd / read fd, get old fd thread2 / add_fd_to_cache / clear fd thread2 / add_fd_to_cache / increment epoch thread2 / add_fd_to_cache / set fd thread1 / get_cached_fd / read epoch thread1 / get_cached_fd / check if epoch has changed, conclude it hasn't thread1 / get_cached_fd / return old fd I think it's sufficient to have a write barrier after writing the fd and then a read barrier just before reading it. I _think_ that this obviates the need for the barrier at the bottom of the do-while loop. That is, you can just move that barrier up a line. I'm not 100% confident of my analysis of that. (Well, frankly, I'm never 100% certain of my analysis of this sort of code.) In the email thread regarding Daniel Horn's patch, I suggested an approach using interlocked_cmpxchg() to check if the fd had changed after reading the attributes. Was there a reason you rejected that approach? You mentioned an approach you experimented with using interlocked_cmpxchg64(). What was that about? Were you treating the fd and attributes combined as a single 64-bit value and then checking them both? Was that safer than my suggestion for some reason? If the only advantage is a slight performance improvement (especially in light of the huge difference that either approach has to the status quo, judging by your chart), then I'd argue for the simpler approach that's more easily analyzed for correctness. If the above issue is addressed, that leaves one remaining problem: get_cached_fd() can encounter a false negative: thread1 / add_fd_to_cache / set fd to -1 thread1 / add_fd_to_cache / increment epoch thread2 / get_cached_fd / read epoch thread2 / get_cached_fd / read attributes thread2 / get_cached_fd / read fd, gets -1 thread2 / get_cached_fd / check if epoch has changed, conclude it hasn't thread1 / add_fd_to_cache / set attributes thread1 / add_fd_to_cache / set fd thread2 / get_cached_fd / return -1 thread2 / server_get_unix_fd / see get_cached_fd as having failed since it returns -1 thread2 / server_get_unix_fd / do get_handle_fd server request thread2 / server_get_unix_fd / call add_fd_to_cache to cache the new fd I think you want to try get_cached_fd() again, inside the critical section, if the first call fails. -Ken

2 2

Re: [2/2] imagehlp: Implement (parts of) BindImageEx (try 8)
by Marvin June 2, 2014

June 2, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7391 Your paranoid android. === wvistau64 (64 bit image) === image.c:426: Test failed: Expected StatusRoutine to be called once with reason BindImportProcedure, but it was called 0 times === w2008s64 (64 bit image) === image.c:426: Test failed: Expected StatusRoutine to be called once with reason BindImportProcedure, but it was called 0 times

1 0

Re: [1/2] imagehlp: Implement (parts of) BindImageEx (try 8)
by Marvin June 2, 2014

June 2, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7390 Your paranoid android. === wvistau64 (64 bit image) === image.c:426: Test failed: Expected StatusRoutine to be called once with reason BindImportProcedure, but it was called 0 times === w2008s64 (64 bit image) === image.c:426: Test failed: Expected StatusRoutine to be called once with reason BindImportProcedure, but it was called 0 times

1 0

Video memory size detection in D3D
by Ruslan Kabatsayev June 2, 2014

June 2, 2014

Hello all, It seems Wine doesn't use any way to reliably detect video memory size, and for many video cards needs it to be specified as HKCU\Software\Wine\Direct3D\VideoMemorySize key in registry. But there exist at least three (vendor-specific) GL/GLX extensions which seem to address exactly this. Namely, for Mesa it's GLX_MESA_query_renderer [1], for nVidia it's GL_NVX_gpu_memory_info [2], and for ATI/AMD it's GL_ATI_meminfo [3]. Mesa extension is shipping starting from Mesa 10.0, nVidia ships their extension in 195.XX drivers (said in specification; I have it exposed with my 313.09 driver), don't know status of ATI extension though (marked as "???" in spec). It'd be good if Wine could utilize these. Is there any work towards this already? Regards, Ruslan [1]: http://www.opengl.org/registry/specs/MESA/glx_query_renderer.txt [2]: https://www.opengl.org/registry/specs/NVX/gpu_memory_info.txt [3]: http://www.opengl.org/registry/specs/ATI/meminfo.txt

5 6

Re: wined3d: Recognize cards that expose ARB_shader_texture_lod as DX10 capable even if they don't support EXT_gpu_shader4 (try 3)
by Stefan Dösinger June 2, 2014

June 2, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-05-29 01:33, schrieb Andrei Slăvoiu: > Drop the check for glsl_version. All wine shaders use #version 120 > so it doesn't matter. That's not quite right. Yes, it is true that we never use GLSL 130, so the version check isn't representative for what wined3d actually supports. For shader model 4 support we need much more than just GLSL 130, half of the d3d10 infrastructure is still missing. GL_ARB_shader_texture_lod doesn't imply shader model 4 support. My Radeon X1600 supports this extension on OSX, and this is a shader model 3 card. The X1600 doesn't support EXT_gpu_shader4 or GLSL 130. The point of this code is to check the capabilities of the card, not the capabilities of our d3d implementation. Thus to prevent SM 3 cards from being reported with PCI IDs that suggest SM 4 capabilities you need to check for all the other functionality that's supported by EXT_gpu_shader4 / GLSL 130. Even if we have a SM 4 capable card our d3d9 implementation does not expose SM 4 support. But neither does Microsoft's d3d9 implementation. There's also GLX_MESA_query_renderer. It gives us the PCI IDs and video memory size directly, without all the string parsing guesswork. We cannot use it wined3d directly. A possible approach would be to expose a similar WGL_WINE/MESA_query_renderer extension from winex11.drv and winemac.drv and use that in wined3d. The current wined3d guesswork code could be moved to winex11.drv and used in cases where GLX_MESA_query_renderer is not supported. (OSX has similar functionality that's always available) User32 also has a function (EnumDisplayDevices) to query the GPU identification string, and some applications (Company of Heroes demo) fail if the user32 GPU name differs from the d3d9 GPU name. So maybe a WGL extension isn't quite the right interface, and it should be something that does not require a GL context so user32.dll can use it as well. EnumDisplayDevices does not export all the information wined3d needs though - the PCI IDs and video memory size are missing I think. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJThvZZAAoJEN0/YqbEcdMwsY8QAJG1NQVMSqjwaguVR0cwwNXq IMYCRWL+5cJPxK4Eodt4bF+zZDObqCz9r3hAJVlkA6bJIcflNHJwedT0ddeOAfpe 0Xc8g+NvspN715yNt51PpzcnlSqh2vS18qp1JLb4l00pZuPt8PMNqC0gaePkv+tY 1wY3B/kgbl0TfcIRpxWbwZBcIAM2h4g+FGCHFPFeznhMYWqFaJ67OKW1KAdfpBTT lPZsaNDXtU8hSaVQYVk7ITulUl0C8tW/MExnh4zclz6b/wQuG+/M0WRg5v/YDlNq 0ZAsVqT60+MbepR87ehYDnLB7RMjZMjZhEZ4/drafFbOQBmqL7YJjgbFsbBBXLTt COf/1mjiz7TptUvSUyDRc27o1K+YP1UoswsVdXT37sWkP9gtHtQFeLLNx8ZuR4pa 2yQ7xNIBi7KPNBjz9Q0RKYvc11oGVUvFSuD0gLgNuHZxdOmBWwZyHeSce9adHHGU 5t4Oz0FsTZuEiiuJXPTDatp06KQQpUZ/c7FgcO7bxIpn/NNUCZGKZdKT/ZYM1waf BEtBL2Ov+DzRnvRM3/lVPdaiMD1IY54bqTeU7NOiKCEFhBl0elCAblj155tVaKdR 5WekiCEsvB8S4FE6stDa+GewpBWUZiVLGSL49S0MViPqAbkbgcjcNlRVg6IEH2Zo tyQIl6/9DwdY1TCllA9W =Z1W8 -----END PGP SIGNATURE-----

3 7

New Wine patches
by Chakke, Neha (GE Oil & Gas) June 2, 2014

June 2, 2014

Hello , I am trying to run a GE software and hardware on Debian (Linux platform) using WineHQ. In order to run the hardware we need to install device drivers for USB (Cypress) . http://wiki.winehq.org/USB I have been trying to look for some solutions online since a week. Could you kindly send me the new wine patches and please guide me with the procedure. Thanks and regards, Miss Neha Chakke Engineering/Technology GE Oil & Gas Measurement & Control T: +49 (0) 2233 601 123 neha.chakke(a)ge.com<mailto:neha.chakke(a)ge.com> www.ge-mcs.com<http://www.ge-mcs.com/> [NewMeatball] GE Sensing & Inspection Technologies GmbH Robert-Bosch-Str. 3 50354 Hürth Germany

3 2

Re: [PATCH 3/3] vbscript: Fixed CInt(try 2)
by Marvin June 1, 2014

June 1, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7387 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 2/3] vbscript: Implemented CLng(try 2)
by Marvin June 1, 2014

June 1, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7386 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 1/3] vbscript: Implemented CDbl(try 2)
by Marvin June 1, 2014

June 1, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7385 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: shlwapi/tests: Skip if test ini file wasn't created
by Marvin June 1, 2014

June 1, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7382 Your paranoid android. === wvistau64 (32 bit ordinal) === ordinal.c:1934: Test failed: expected (L"01 \062c\0648\0627\0646, 2014") got (L"\200f01 \200f\062c\0648\0627\0646, \200f2") for date part ordinal.c:1960: Test failed: expected (L"01 \062c\0648\0627\0646, 2014") got (L"\200f01 \200f\062c\0648\0627\0646, \200f2") for date part === wvistau64 (64 bit ordinal) === ordinal.c:1934: Test failed: expected (L"01 \062c\0648\0627\0646, 2014") got (L"\200f01 \200f\062c\0648\0627\0646, \200f2") for date part ordinal.c:1960: Test failed: expected (L"01 \062c\0648\0627\0646, 2014") got (L"\200f01 \200f\062c\0648\0627\0646, \200f2") for date part

2 1

Re: ntdll: Use lockfree implementation for get_cached_fd. (try 2)
by Ken Thomases June 1, 2014

June 1, 2014

On May 31, 2014, at 12:05 PM, Sebastian Lackner wrote: > Changes in try 2: > > * Always try to access the fd cache two times - this ensures that we > don't release a file descriptor when its still in use by a second thread. Heh. Well, you can ignore that part of my reply to your previous try. :) > * Replace interlocked_xchg() with an assert(). The original code looks > like its valid that the fd is nonzero at this point, but in fact this > would cause releasing a file descriptor which is still in use. I'll leave it to others to comment on that. > Replacing with an assert() also saves a couple of CPU cycles. I understand that this is an attempt to improve performance, but I don't think it's necessary to squeeze every last CPU cycle out of this code. -Ken

2 1