December 2012 - 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

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

winspool: ERROR_INVALID_NAME in GetDefaultPrinter() ?
by Detlef Riekenberg Oct. 9, 2013

Oct. 9, 2013

Hi. >From which configuration does the "ERROR_INVALID_NAME" came from, when calling GetDefaultPrinter(NULL, &size) and no Printer is installed? This Test is Present in the current "dlls/winspool/tests/info.c". MSDN told us, that we receive an "ERROR_FILE_NOT_FOUND", if no Printer is installed: http://msdn.microsoft.com/library/en-us/gdi/prntspol_0hma.asp I get the "ERROR_FILE_NOT_FOUND" on win98se, winme, w2k and win2003 in this Situation. -- By By ... ... Detlef

3 3

Re: Web based translation tool
by Michal Čihař June 17, 2013

June 17, 2013

Hi Dne Mon, 12 Mar 2012 12:02:49 +0200 Yaron Shahrabani <sh.yaron(a)gmail.com> napsal(a): > The Wine project is thinking about using Weblate in order to translate > Wine, you can look at the following discussion and see for yourself. That sounds great! > Looking good although a litle immature, not sure about authentication as > wel... For authentication you can basically use anything what can be used in Django. Any specific concerns on this topic? > I'll talk to Michal Cihar and ask him for a roadmap for this project. Well I don't have any real roadmap right now. I urgently needed replacement for Pootle because we got hit by too many bugs there and did not manage to understand the code there to be able to fix them myself. So far I think it is in pretty good shape for day to day work (with today's 0.5 release fixing few annoying bugs). Of course there are some features missing, you can check what I plan for 1.0 release here: https://github.com/nijel/weblate/issues?state=open&milestone=1 I currently hope to have 1.0 in a month or so, but I really don't want to commit to any specific date. PS: I'm not subscribed to mailing list so please CC me on reply. -- Michal Čihař | http://cihar.com | http://blog.cihar.com

7 16

Re: [2/2] gdi32/tests: Added tests for GetFontResourceInfoW (try 2)
by Dmitry Timoshkov Jan. 5, 2013

Jan. 5, 2013

Stefan Leichter <Stefan.Leichter(a)camline.com> wrote: > + BYTE buffer[MAX_PATH]; This should be WCHAR if you decided to test unicode version of the API (although testing ANSI variant would be much easier), that will help to avoid all those casts, and protect from insufficient buffer size. Also please use a font that exists in Wine, such as sserife.fon, but be prepared that it could be not found since font file name is locale dependent. -- Dmitry.

2 4

wine-1.5.20 reversion compared to 1.5.19 and previous; MinGW/gcc 4.7.0 segfaults under wineconsole
by Alan W. Irwin Jan. 2, 2013

Jan. 2, 2013

The subject line pretty much says it all. Running MinGW/gcc under wineconsole for any simple test programme should demonstrate the issue for wine-1.5.20 which is not present in wine-1.5.19 and a fairly large selection of 1.5.x and MinGW versions I have tried over the last year or so. I would be happy to supply more details if there is any difficulty replicating this reversion. Alan __________________________ Alan W. Irwin Astronomical research affiliation with Department of Physics and Astronomy, University of Victoria (astrowww.phys.uvic.ca). Programming affiliations with the FreeEOS equation-of-state implementation for stellar interiors (freeeos.sf.net) the Time Ephemerides project (timeephem.sf.net) PLplot scientific plotting software package (plplot.sf.net) the libLASi project (unifont.org/lasi) the Loads of Linux Links project (loll.sf.net) and the Linux Brochure Project (lbproject.sf.net) __________________________ Linux-powered Science __________________________

3 7

Re: xbox 360 emulation with logitech cordless and dinput joy disable
by Stefan Dösinger Jan. 1, 2013

Jan. 1, 2013

Hi, The patch needs a few improvements before it can be accepted into Wine. I can't comment on the dinput / xinput specifics of the patch, so this is a non- exhaustive list of general suggestions. Concerning the big picture, this patch needs a few discussions about xinput.dll design. There have been some discussions about that in the past, and I hope that some dinput devs can help out. Am Dienstag, 12. Juni 2012, 23:48:53 schrieb Giovanni Ongaro: > From: root <root(a)joe.(none)> Please configure git correctly, see http://wiki.winehq.org/GitWine section 3.3. Also consider using a non-root user, but that's your personal setup, so not really my business. > + if (getenv("LINIXFORCENOJOY") != NULL) return FALSE; /*JoeFix disable joystick*/ The problem with dinput vs xinput conflicts should probably be solved in a different manner. That aside, such configurations are usually done via registry keys. Also comments like /* I changed this here */ are useless, the git history stores this information anyway. > + <...> //JoeFix DEAD ZONE This is a C++ comment and not allowed in Wine. See http://wiki.winehq.org/SubmittingPatches > + fdJoy=open("/dev/input/js0",O_RDONLY | O_NONBLOCK); Xinput.dll should not open joystick devices directy, and definitely not a hardcoded one. I don't know if there's consensus about how xinput should be implemented, but basing it on top of dinput might be a start. A good start would be to write a few tests to test how Windows announces(or doesn't announce) Xbox gamepads and other gamepads/joysticks to games. My understanding is that xinput.dll only works for Xbox gamepads. Do those show up in dinput on Windows? > +#define DEAD_ZONE 4096 > ... > + if (e.number == 4) { > + if (e.value == 1) { > + FIXME("TRIGGER LEFT PRESSED\n"); > + pState->Gamepad.bLeftTrigger=32767; > + } > + else { > + pState->Gamepad.bLeftTrigger=0; > + } > ... > +#define JOYMAX 30000 > +#define JOYMIN -30000 The hardcoded numbers look questionable. The 4 and 1 are probably specific to the joystick, the 32767 might have a symbolic name like XINPUT_MAX or something. A part of this seems to be needed due to the attempt to emulate an xbox gamepad with a different device. Personally I'm not opposed to doing that, and you might need some device specific tricks to pull this off. However, this needs a more structured approach than hardcoding the values needed for one specific Logitech device in the code. Best regards, Stefan

3 2

Re: [PATCH] dsound: rework ugly mixer logic
by Andrew Eikum Jan. 1, 2013

Jan. 1, 2013

On Sat, Dec 29, 2012 at 01:24:03AM +0100, Maarten Lankhorst wrote: > + if(!maxq){ > + /* nothing to do! */ > + LeaveCriticalSection(&device->mixlock); > + return; > } This was removed in 8ba4090fc304993. It breaks starting the device in some situations (write primary mode iirc). > + if (native) { > + void *buffer = NULL; > + > + hr = IAudioRenderClient_GetBuffer(device->render, maxq / block, (void*)&buffer); > + if(FAILED(hr)){ > + WARN("GetBuffer failed: %08x\n", hr); > + LeaveCriticalSection(&device->mixlock); > + return; > + } I think this (mixing directly to RenderClient and skipping WaveQueue) could be split into a separate patch. > hres = IAudioClient_Initialize(device->client, > AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST | > - AUDCLNT_STREAMFLAGS_EVENTCALLBACK, prebuf_rt, 0, device->pwfx, NULL); > + AUDCLNT_STREAMFLAGS_EVENTCALLBACK, 800000, 0, device->pwfx, NULL); ... > + frames = (UINT64)device->pwfx->nSamplesPerSec * 800000 / 10000000; Could you #define the 800000? Anyway, I gave it a test on ALSA+Pulse and didn't find any issues. I'll test the other backends when you resubmit. Andrew

2 3

Mail problems for wine-patches
by Detlef Riekenberg Dec. 31, 2012

Dec. 31, 2012

I send several patches the last days with git and with the webmail interface from web.de, but nothing arrived at the wine-patches archive or the patches queue page. I also unsubscribed and subscribed again to the wine-patches list. Any ideas? Has wine-patches a whitelist? -- By by ... Detlef

2 1

Re: atl100: Fixed NULL catmap handling in AtlRegisterClassCategoriesHelper
by Marvin Dec. 31, 2012

Dec. 31, 2012

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 http://testbot.winehq.org/JobDetails.pl?Key=23671 Your paranoid android. === WXPPROSP3 (32 bit atl) === Timeout === W2K3R2SESP2 (32 bit atl) === Timeout

1 0

Re: atl100: Fixed NULL catmap handling in AtlRegisterClassCategoriesHelper
by Marvin Dec. 31, 2012

Dec. 31, 2012

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 http://testbot.winehq.org/JobDetails.pl?Key=23671 Your paranoid android. === WXPPROSP3 (32 bit atl) === Timeout === W2K3R2SESP2 (32 bit atl) === Timeout

1 0

Help Splitting Patches
by Adam Martinson Dec. 31, 2012

Dec. 31, 2012

Looking for some help splitting patch 3, not sure how I can cut it down any more without breaking stuff. I'm guessing patch 9 will need splitting too, same problem. ~Adam

2 1

[AppDB] Cannot submit rejected Test results after change
by Joerg Schiermeier Dec. 30, 2012

Dec. 30, 2012

¡Hola! In AppDB I got a problem, exactly with one of my maintained applications: some days ago someone filed a test about the mail program 'The Bat!'. This test has this URL: <http://appdb.winehq.org/objectManager.php?sClass=version&iId=23662&iTesting…> So AppDB sent me an email about this test and I went to its web interface. There I rejected this test result because of some incorrect version numberings. Than I got some days later a mail about a new submitted test. I logged into AppDB again to my control panel but I didn't saw this new submitted test there. So I had and have no change to commit this test results. If you follow the link above you will see: the test results are still there. So my conclusion: 1.) Someone, maybe you will have to commit this test. 2.) Something went wrong with the AppDB. Thanks for your attention and your help! -- Kindly regards Joerg Schiermeier Bielefeld/Germany

1 0

Re: d3dx9: Implement D3DXSHEvalConeLight [try 4]
by Marvin Dec. 30, 2012

Dec. 30, 2012

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 http://testbot.winehq.org/JobDetails.pl?Key=23666 Your paranoid android. === WXPPROSP3 (32 bit math) === math.c:2578: Test failed: Red: case 0, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 0, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 0, order 6: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 4, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 4, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 4, order 6: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 6, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 6, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 6, order 6: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 7, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 7, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 7, order 6: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 8, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 8, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 8, order 6: expected[12] = 1137.556274, received 137.556320 === W2K3R2SESP2 (32 bit math) === math.c:2578: Test failed: Red: case 0, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 0, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 0, order 6: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 4, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 4, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 4, order 6: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 6, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 6, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 6, order 6: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 7, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 7, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 7, order 6: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 8, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 8, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 8, order 6: expected[12] = 1137.556274, received 137.556320 === WVISTAADM (32 bit math) === math.c:2578: Test failed: Red: case 0, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 0, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 0, order 6: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 4, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 4, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 4, order 6: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 6, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 6, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 6, order 6: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 7, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 7, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 7, order 6: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 8, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 8, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 8, order 6: expected[12] = 1137.556274, received 137.556320 === W2K8SE (32 bit math) === math.c:2578: Test failed: Red: case 0, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 0, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 0, order 6: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 4, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 4, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 4, order 6: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 6, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 6, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 6, order 6: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 7, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 7, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 7, order 6: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 8, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 8, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 8, order 6: expected[12] = 1137.556274, received 137.556320 === W7PRO (32 bit math) === math.c:2578: Test failed: Red: case 0, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 0, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 0, order 6: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 4, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 4, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 4, order 6: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 6, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 6, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 6, order 6: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 7, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 7, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 7, order 6: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 8, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 8, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 8, order 6: expected[12] = 1137.556274, received 137.556320 === W7PROX64 (32 bit math) === math.c:2578: Test failed: Red: case 0, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 0, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 0, order 6: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 4, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 4, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 4, order 6: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 6, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 6, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 6, order 6: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 7, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 7, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 7, order 6: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 8, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 8, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 8, order 6: expected[12] = 1137.556274, received 137.556320 === TEST64_W7SP1 (32 bit math) === math.c:2578: Test failed: Red: case 0, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 0, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 0, order 6: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 4, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 4, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 4, order 6: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 6, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 6, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 6, order 6: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 7, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 7, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 7, order 6: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 8, order 4: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 8, order 5: expected[12] = 1137.556274, received 137.556320 math.c:2578: Test failed: Red: case 8, order 6: expected[12] = 1137.556274, received 137.556320 === W7PROX64 (64 bit math) === math.c:2578: Test failed: Red: case 0, order 4: expected[12] = 1137.556274, received 137.556351 math.c:2578: Test failed: Red: case 0, order 5: expected[12] = 1137.556274, received 137.556351 math.c:2578: Test failed: Red: case 0, order 6: expected[12] = 1137.556274, received 137.556351 math.c:2578: Test failed: Red: case 4, order 4: expected[12] = 1137.556274, received 137.556351 math.c:2578: Test failed: Red: case 4, order 5: expected[12] = 1137.556274, received 137.556351 math.c:2578: Test failed: Red: case 4, order 6: expected[12] = 1137.556274, received 137.556351 math.c:2578: Test failed: Red: case 6, order 4: expected[12] = 1137.556274, received 137.556351 math.c:2578: Test failed: Red: case 6, order 5: expected[12] = 1137.556274, received 137.556351 math.c:2578: Test failed: Red: case 6, order 6: expected[12] = 1137.556274, received 137.556351 math.c:2578: Test failed: Red: case 7, order 4: expected[12] = 1137.556274, received 137.556351 math.c:2578: Test failed: Red: case 7, order 5: expected[12] = 1137.556274, received 137.556351 math.c:2578: Test failed: Red: case 7, order 6: expected[12] = 1137.556274, received 137.556351 math.c:2578: Test failed: Red: case 8, order 4: expected[12] = 1137.556274, received 137.556351 math.c:2578: Test failed: Red: case 8, order 5: expected[12] = 1137.556274, received 137.556351 math.c:2578: Test failed: Red: case 8, order 6: expected[12] = 1137.556274, received 137.556351 === TEST64_W7SP1 (64 bit math) === math.c:2578: Test failed: Red: case 0, order 4: expected[12] = 1137.556274, received 137.556351 math.c:2578: Test failed: Red: case 0, order 5: expected[12] = 1137.556274, received 137.556351 math.c:2578: Test failed: Red: case 0, order 6: expected[12] = 1137.556274, received 137.556351 math.c:2578: Test failed: Red: case 4, order 4: expected[12] = 1137.556274, received 137.556351 math.c:2578: Test failed: Red: case 4, order 5: expected[12] = 1137.556274, received 137.556351 math.c:2578: Test failed: Red: case 4, order 6: expected[12] = 1137.556274, received 137.556351 math.c:2578: Test failed: Red: case 6, order 4: expected[12] = 1137.556274, received 137.556351 math.c:2578: Test failed: Red: case 6, order 5: expected[12] = 1137.556274, received 137.556351 math.c:2578: Test failed: Red: case 6, order 6: expected[12] = 1137.556274, received 137.556351 math.c:2578: Test failed: Red: case 7, order 4: expected[12] = 1137.556274, received 137.556351 math.c:2578: Test failed: Red: case 7, order 5: expected[12] = 1137.556274, received 137.556351 math.c:2578: Test failed: Red: case 7, order 6: expected[12] = 1137.556274, received 137.556351 math.c:2578: Test failed: Red: case 8, order 4: expected[12] = 1137.556274, received 137.556351 math.c:2578: Test failed: Red: case 8, order 5: expected[12] = 1137.556274, received 137.556351 math.c:2578: Test failed: Red: case 8, order 6: expected[12] = 1137.556274, received 137.556351

1 0

Re: [PATCH 2/2] kernel32: conditional variable support
by Nikolay Sivov Dec. 29, 2012

Dec. 29, 2012

On 12/29/2012 23:04, Marcus Meissner wrote: > From: Marcus Meissner <marcus(a)jet.(none)> > > Modeled pretty much after the implementation described > in glibc/nptl/DESIGN-condvar.txt with its futex usage > sofar replaced by regular Win32 Semaphores. > > An additional futex implementation is possible. > > I *think* I have the semantics correct, there is 1 small > place where it might have unnecessary CPU usage though. > > Ciao, Marcus > +/********************************************************************** > + * InitializeConditionVariable (KERNEL32.@) > + */ > +VOID WINAPI InitializeConditionVariable(PCONDITION_VARIABLE variable) > +{ > + struct _condition_var_intern *var; > + variable->Ptr = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(struct _condition_var_intern)); > + var = variable->Ptr; > + if (!var) return; > + InitializeCriticalSection (&var->crit); > + var->crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ConditionVariable.cs"); > +} I don't think it allocates anything at all, what makes me believe that is that stuff like CONDITION_VARIABLE_INIT exists. After googling a bit for it I see that gallium from mesa has some platform dependent stuff in code that uses this API like that: --- +#define pipe_static_condvar(cond) \ + /*static*/ pipe_condvar cond = CONDITION_VARIABLE_INIT --- So this structure has nothing more than a single pointer value, value 0 of it means it's initialized. I think you could just add some tests to see if it's really reset to 0 from initial value. Also regarding tests I don't think randomizing timeouts is a good idea cause it adds some unpredictable behaviour and it's not really clear if we could rely on such tests results.

2 2

Re: [PATCH 1/2] kernel32: refine conditional variable test
by Marvin Dec. 29, 2012

Dec. 29, 2012

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 http://testbot.winehq.org/JobDetails.pl?Key=23659 Your paranoid android. === WXPPROSP3 (32 bit sync) === sync.c:948: Test failed: ChangeTimerQueueTimer

1 0

Re: [PATCH] gdi32: Ensure a fixed-pitch full-width character has double width of a half-width character.
by Alexandre Julliard Dec. 28, 2012

Dec. 28, 2012

Akihiro Sagawa <sagawa.aki(a)gmail.com> writes: > --- > dlls/gdi32/freetype.c | 20 +++++++++-- > dlls/gdi32/tests/font.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 102 insertions(+), 3 deletions(-) It doesn't work here: ../../../tools/runtest -q -P wine -M gdi32.dll -T ../../.. -p gdi32_test.exe.so font.c && touch font.ok font.c:3755: Test failed: expected 19, got 0 (charset 128) -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [3/9] server: Use the same object type for both ends of a named pipe. (try 2)
by Alexandre Julliard Dec. 28, 2012

Dec. 28, 2012

Adam Martinson <adam.r.martinson(a)gmail.com> writes: > From 8eb230b505ddd986b689caf96510fbe016d721a7 Mon Sep 17 00:00:00 2001 > From: Adam Martinson <adam.r.martinson(a)gmail.com> > Date: Thu, 20 Dec 2012 19:55:13 -0600 > Subject: [PATCH 3/9] server: Use the same object type for both ends of a named pipe. > > Makes either end of a named pipe is readable after the other has been closed. > (If the pipe has not been disconnected) This is still changing way too many things at once. Also, using an array for pipe ends doesn't make much sense, just use two variables. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] advapi32: do not use invalid pSD value (Coverity)
by Marvin Dec. 28, 2012

Dec. 28, 2012

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 http://testbot.winehq.org/JobDetails.pl?Key=23641 Your paranoid android. === WNT4WSSP6 (32 bit service) === service.c:1859: Test failed: Expected ERROR_INSUFFICIENT_BUFFER, got 87 === W2KPROSP4 (32 bit service) === service.c:1859: Test failed: Expected ERROR_INSUFFICIENT_BUFFER, got 487 service.c:1862: Test failed: Expected QueryServiceObjectSecurity to succeed: result 0 === WXPPROSP3 (32 bit service) === service.c:1859: Test failed: Expected ERROR_INSUFFICIENT_BUFFER, got 487 service.c:1862: Test failed: Expected QueryServiceObjectSecurity to succeed: result 0 === W2K3R2SESP2 (32 bit service) === service.c:1859: Test failed: Expected ERROR_INSUFFICIENT_BUFFER, got 487 service.c:1862: Test failed: Expected QueryServiceObjectSecurity to succeed: result 0

1 0

Re: [9/9] server: Add support for named pipe message mode.
by Daniel Jelinski Dec. 27, 2012

Dec. 27, 2012

Hello, FWIW, Adam Martinson's named pipe series looks good to me. I tested it with MS SQL Server, which uses message mode pipes, and did not run into any problems. In current git I can't connect to server using named pipes, because as soon as SetNamedPipeHandleState returns false, client application aborts. (However, just changing SNPHS to return true is enough to get it working). I don't think patches 3 and 9 of this series can be split much more, except maybe for moving asserts into a separate file. Yes, reviewing them may cause headaches. The series is supposed to fix bugs 17273 (patch 8/9) and 17195 (patch 9/9). AFAICT the author is willing to make any adjustments necessary to get the patches merged. Patches 1-5 should not cause any problems if applied without the following. Patches 6-8 may cause regressions if applied without patch 9. Regards, Daniel

1 0

Re: netstat: Initial implementation
by Alexandre Julliard Dec. 27, 2012

Dec. 27, 2012

André Hentschel <nerv(a)dawncrow.de> writes: > + __ms_va_start(parms, format); > + len = vsprintfW(output_bufW, format, parms); > + __ms_va_end(parms); You can't mix vsprintfW and ms_va_list. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [2/2] windowscodecs: Implement ComponentFactory_CreateBitmapFromMemory.
by Vincent Povirk Dec. 27, 2012

Dec. 27, 2012

I'm pretty sure CreateBitmapFromMemory copies the data rather than referencing existing data. On Thu, Dec 27, 2012 at 3:29 AM, Dmitry Timoshkov <dmitry(a)baikal.ru> wrote: > --- > dlls/windowscodecs/bitmap.c | 31 +++++++++++++++++++++---------- > dlls/windowscodecs/imgfactory.c | 18 +++++++++++------- > dlls/windowscodecs/tests/bitmap.c | 5 ----- > dlls/windowscodecs/wincodecs_private.h | 1 + > 4 files changed, 33 insertions(+), 22 deletions(-) > > diff --git a/dlls/windowscodecs/bitmap.c b/dlls/windowscodecs/bitmap.c > index 520fdef..4d48651 100644 > --- a/dlls/windowscodecs/bitmap.c > +++ b/dlls/windowscodecs/bitmap.c > @@ -40,6 +40,7 @@ typedef struct BitmapImpl { > int palette_set; > LONG lock; /* 0 if not locked, -1 if locked for writing, count if locked for reading */ > BYTE *data; > + BOOL owndata; > UINT width, height; > UINT stride; > UINT bpp; > @@ -260,7 +261,8 @@ static ULONG WINAPI BitmapImpl_Release(IWICBitmap *iface) > if (This->palette) IWICPalette_Release(This->palette); > This->cs.DebugInfo->Spare[0] = 0; > DeleteCriticalSection(&This->cs); > - HeapFree(GetProcessHeap(), 0, This->data); > + if (This->owndata) > + HeapFree(GetProcessHeap(), 0, This->data); > HeapFree(GetProcessHeap(), 0, This); > } > > @@ -447,28 +449,37 @@ static const IWICBitmapVtbl BitmapImpl_Vtbl = { > }; > > HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, > + UINT stride, UINT datasize, BYTE *data, > REFWICPixelFormatGUID pixelFormat, WICBitmapCreateCacheOption option, > IWICBitmap **ppIBitmap) > { > HRESULT hr; > BitmapImpl *This; > - UINT bpp, stride, datasize; > - BYTE *data; > + UINT bpp; > > hr = get_pixelformat_bpp(pixelFormat, &bpp); > if (FAILED(hr)) return hr; > > - stride = (((bpp*uiWidth)+31)/32)*4; > - datasize = stride * uiHeight; > + if (!stride) stride = (((bpp*uiWidth)+31)/32)*4; > + if (!datasize) datasize = stride * uiHeight; > + > + if (datasize < stride * uiHeight) return WINCODEC_ERR_INSUFFICIENTBUFFER; > + if (stride < (((bpp*uiWidth)+31)/32)*4) return E_INVALIDARG; > > This = HeapAlloc(GetProcessHeap(), 0, sizeof(BitmapImpl)); > - data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, datasize); > - if (!This || !data) > + if (!This) return E_OUTOFMEMORY; > + if (!data) > { > - HeapFree(GetProcessHeap(), 0, This); > - HeapFree(GetProcessHeap(), 0, data); > - return E_OUTOFMEMORY; > + data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, datasize); > + if (!data) > + { > + HeapFree(GetProcessHeap(), 0, This); > + return E_OUTOFMEMORY; > + } > + This->owndata = TRUE; > } > + else > + This->owndata = FALSE; > > This->IWICBitmap_iface.lpVtbl = &BitmapImpl_Vtbl; > This->ref = 1; > diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c > index 54b390b..1d05ef5 100644 > --- a/dlls/windowscodecs/imgfactory.c > +++ b/dlls/windowscodecs/imgfactory.c > @@ -1,5 +1,6 @@ > /* > * Copyright 2009 Vincent Povirk for CodeWeavers > + * Copyright 2012 Dmitry Timoshkov > * > * This library is free software; you can redistribute it and/or > * modify it under the terms of the GNU Lesser General Public > @@ -459,7 +460,7 @@ static HRESULT WINAPI ComponentFactory_CreateBitmap(IWICComponentFactory *iface, > { > TRACE("(%p,%u,%u,%s,%u,%p)\n", iface, uiWidth, uiHeight, > debugstr_guid(pixelFormat), option, ppIBitmap); > - return BitmapImpl_Create(uiWidth, uiHeight, pixelFormat, option, ppIBitmap); > + return BitmapImpl_Create(uiWidth, uiHeight, 0, 0, NULL, pixelFormat, option, ppIBitmap); > } > > static HRESULT WINAPI ComponentFactory_CreateBitmapFromSource(IWICComponentFactory *iface, > @@ -506,7 +507,7 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromSource(IWICComponentFacto > } > > if (SUCCEEDED(hr)) > - hr = BitmapImpl_Create(width, height, &pixelformat, option, &result); > + hr = BitmapImpl_Create(width, height, 0, 0, NULL, &pixelformat, option, &result); > > if (SUCCEEDED(hr)) > { > @@ -576,12 +577,15 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromSourceRect(IWICComponentF > } > > static HRESULT WINAPI ComponentFactory_CreateBitmapFromMemory(IWICComponentFactory *iface, > - UINT uiWidth, UINT uiHeight, REFWICPixelFormatGUID pixelFormat, UINT cbStride, > - UINT cbBufferSize, BYTE *pbBuffer, IWICBitmap **ppIBitmap) > + UINT width, UINT height, REFWICPixelFormatGUID format, UINT stride, > + UINT size, BYTE *buffer, IWICBitmap **bitmap) > { > - FIXME("(%p,%u,%u,%s,%u,%u,%p,%p): stub\n", iface, uiWidth, uiHeight, > - debugstr_guid(pixelFormat), cbStride, cbBufferSize, pbBuffer, ppIBitmap); > - return E_NOTIMPL; > + TRACE("(%p,%u,%u,%s,%u,%u,%p,%p\n", iface, width, height, > + debugstr_guid(format), stride, size, buffer, bitmap); > + > + if (!stride || !size || !buffer || !bitmap) return E_INVALIDARG; > + > + return BitmapImpl_Create(width, height, stride, size, buffer, format, WICBitmapCacheOnLoad, bitmap); > } > > static HRESULT WINAPI ComponentFactory_CreateBitmapFromHBITMAP(IWICComponentFactory *iface, > diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c > index cec714b..3cdbffd 100644 > --- a/dlls/windowscodecs/tests/bitmap.c > +++ b/dlls/windowscodecs/tests/bitmap.c > @@ -436,27 +436,22 @@ static void test_CreateBitmapFromMemory(void) > > hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, > 0, 0, NULL, &bitmap); > -todo_wine > ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); > > hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, > 0, sizeof(data3x3), data3x3, &bitmap); > -todo_wine > ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); > > hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, > 6, sizeof(data3x3), data3x3, &bitmap); > -todo_wine > ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); > > hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, > 12, sizeof(data3x3), data3x3, &bitmap); > -todo_wine > ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "expected WINCODEC_ERR_INSUFFICIENTBUFFER, got %#x\n", hr); > > hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, > 9, sizeof(data3x3) - 1, data3x3, &bitmap); > -todo_wine > ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "expected WINCODEC_ERR_INSUFFICIENTBUFFER, got %#x\n", hr); > > hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, > diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h > index 6857176..508bb2c 100644 > --- a/dlls/windowscodecs/wincodecs_private.h > +++ b/dlls/windowscodecs/wincodecs_private.h > @@ -45,6 +45,7 @@ extern HRESULT IcnsEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void* > extern HRESULT TgaDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; > > extern HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, > + UINT stride, UINT datasize, BYTE *data, > REFWICPixelFormatGUID pixelFormat, WICBitmapCreateCacheOption option, > IWICBitmap **ppIBitmap) DECLSPEC_HIDDEN; > extern HRESULT BitmapScaler_Create(IWICBitmapScaler **scaler) DECLSPEC_HIDDEN; > -- > 1.8.0.2 > > >

2 3

Re: netstat: Initial implementation
by Alexandre Julliard Dec. 27, 2012

Dec. 27, 2012

André Hentschel <nerv(a)dawncrow.de> writes: > +STRINGTABLE > +{ > + IDS_TCP_UNKNOWN, "???" > + IDS_TCP_CLOSED, "CLOSED" > + IDS_TCP_LISTENING, "LISTENING" > + IDS_TCP_SYN_SENT, "SYN_SENT" > + IDS_TCP_SYN_RCVD, "SYN_RCVD" > + IDS_TCP_ESTABLISHED, "ESTABLISHED" > + IDS_TCP_FIN_WAIT1, "FIN_WAIT1" > + IDS_TCP_FIN_WAIT2, "FIN_WAIT2" > + IDS_TCP_CLOSE_WAIT, "CLOSE_WAIT" > + IDS_TCP_CLOSING, "CLOSING" > + IDS_TCP_LAST_ACK, "LAST_ACK" > + IDS_TCP_TIME_WAIT, "TIME_WAIT" > + IDS_TCP_DELETE_TCB, "DELETE_TCB" It's not useful to put these in resources, we don't want to have to translate them. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: msvcrt: Return error in stat function when path is specified with trailing slash character
by Marvin Dec. 27, 2012

Dec. 27, 2012

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 http://testbot.winehq.org/JobDetails.pl?Key=23632 Your paranoid android. === WNT4WSSP6 (32 bit file) === file.c:1449: Test failed: stat returned 0 file.c:1450: Test failed: errno = -559038737 file.c:1514: Test failed: stat returned 0 file.c:1515: Test failed: errno = -559038737

1 0

Re: [PATCH] loader: Build with -fno-builtin.
by Austin English Dec. 26, 2012

Dec. 26, 2012

On Mon, Dec 24, 2012 at 10:38 AM, Charles Davis <cdavis5x(a)gmail.com> wrote: > This prevents Clang from optimizing wld_memset() into a memset(3) call. > --- > loader/Makefile.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/loader/Makefile.in b/loader/Makefile.in > index 41d69c7..ece07c3 100644 > --- a/loader/Makefile.in > +++ b/loader/Makefile.in > @@ -1,4 +1,5 @@ > DEFS = -D__WINESRC__ $(EXTRADEFS) > +MODCFLAGS = -fno-builtin > > C_SRCS = \ > main.c \ > -- > 1.7.12.4 I can confirm it works. -- -Austin

1 0

Re: Aw: Re: [PATCH] comdlg32/tests: Accept win8 failure-code
by Dmitry Timoshkov Dec. 25, 2012

Dec. 25, 2012

"Detlef Riekenberg" <wine.dev(a)web.de> wrote: > >> + /* win8: E_NOTIMPL */ > >> + ok(hr == E_FAIL || hr == E_NOTIMPL, "got 0x%08x.\n", hr); > > >A usual form for such comparisons is > >ok(hr == E_FAIL || hr == E_NOTIMPL /* win8 */, "got 0x%08x.\n", hr); > I disagree! > > Comments at the end of a line are ok, > but a comment in the middle /* broken */ of a line decrease /* ugly by design */ the readability > of the code /* not compiler related */ for humans/developers a lot and should be allowed > only for backwards compatibility. You are confusing a sentence and a set of statements. -- Dmitry.

1 0

Re: oledb32: Partial implementation of GetDataSource()
by Marvin Dec. 24, 2012

Dec. 24, 2012

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 http://testbot.winehq.org/JobDetails.pl?Key=23600 Your paranoid android. === WVISTAADM (32 bit database) === database: unhandled exception c000001d at 0075006C === W2K8SE (32 bit database) === database: unhandled exception c0000005 at 00750064 === W7PRO (32 bit database) === database: unhandled exception c0000005 at 007500A7 === W7PROX64 (32 bit database) === database: unhandled exception c0000005 at 00750064 === TEST64_W7SP1 (32 bit database) === database: unhandled exception c0000005 at 00750064 === W7PROX64 (64 bit database) === Timeout === TEST64_W7SP1 (64 bit database) === Timeout

1 0

Re: msvcrt: Added _stricmp_l implementation
by Marvin Dec. 24, 2012

Dec. 24, 2012

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 http://testbot.winehq.org/JobDetails.pl?Key=23596 Your paranoid android. === WNT4WSSP6 (32 bit string) === string.c:2462: Test failed: _stricmp returned -1 string.c:2464: Test failed: _stricmp returned 1 === W7PROX64 (64 bit string) === string.c:2448: Test failed: _stricmp returned -25 string.c:2450: Test failed: _stricmp returned 25 string.c:2452: Test failed: _stricmp returned -20 === TEST64_W7SP1 (64 bit string) === string.c:2448: Test failed: _stricmp returned -25 string.c:2450: Test failed: _stricmp returned 25 string.c:2452: Test failed: _stricmp returned -20

1 0

re: Clang static analyzer results / wine-1.5.19-186-g1cd0c4a
by Dan Kegel Dec. 21, 2012

Dec. 21, 2012

I had a look at a couple warnings, e.g. file:///home/dank/Downloads/scan-build-2012-12-18-1/report-z07lcL.html#EndPath file:///home/dank/Downloads/scan-build-2012-12-18-1/report-9D2p5I.html#EndPath They're hard to follow, but mostly look like garbage :-( Too bad there's no web interface for marking them as checked. This one's real, but only affects a trace, and only if send fails: file:///home/dank/Downloads/scan-build-2012-12-18-1/report-RBGMAQ.html#EndPath

1 0

dsound: use event based threads, v2
by Joerg-Cyril.Hoehle＠t-systems.com Dec. 21, 2012

Dec. 21, 2012

Maarten, > + hres = IAudioClient_GetStreamLatency(device->client, &period); > + device->sleeptime = period_ms * 5 / 2; > + ret = WaitForSingleObject(dev->sleepev, dev->sleeptime); Although it's a minor point, as we're solely discussing the case of the timeout when mmdevapi doesn't call SetEvent, I wonder why you insist on using GetStreamLatency as the basis of your timeout computations instead of GetDevicePeriod. You know that wineXYZ.drv use the device period as the basis for their SetEvent, thus IMHO the timeout too should be based on it, instead of a GetStreamLatency we know next to nothing about. If you visit testbot jobs 23521 and 23514, you'll see that I've measured the event rates. Sadly, all testbot VMs report a GetStreamLatency of 10.6666ms too close to the DefaultPeriod of 10.0000ms to tell for sure which is used as the average period. W7 and w2k8 machines seem to use DefaultPeriod: render.c:185: Returned periods: 10.0000 ms 3.0000 ms render.c:333: Returned latency: 10.6666 ms render.c:626: event after Start average 10.004ms render.c:2206: event average 9.992ms sigma 0.447 Vista may use its reported StreamLatency as period: render.c:185: Returned periods: 10.0000 ms 3.0000 ms render.c:333: Returned latency: 10.6666 ms render.c:626: event after Start average 10.697ms render.c:2206: event average 10.736ms sigma 0.834 The one w2k8 machine is peculiar as it appears to use the 15.600ms (or 15.625ms?) timers well known from pre-Vista times: render.c:185: Returned periods: 10.0000 ms 3.0000 ms render.c:333: Returned latency: 10.6666 ms render.c:626: event after Start average 15.547ms render.c:2206: event average 15.625ms sigma 5.625 However, the rate is certainly not the 20-30ms StreamLatency that e.g. winealsa returns. Regards, Jörg Höhle

2 3

Need help to install Xlib/xfree86 devlopnemt packeg in ubuntu 10 LTS
by Hamid Lohar Dec. 21, 2012

Dec. 21, 2012

Dear sir, I am installing wine 1.3 from source file but i getting fail to install beacose of Xlib/xfree86 devlopnemt packeg so i neet that packege please help me.

2 3

Re: msvcrt: fix prototypes ov _execvp, _wexecvp, _execvpe and _wexecvpe
by Alexandre Julliard Dec. 21, 2012

Dec. 21, 2012

Jérôme Gardou <jerome.gardou(a)reactos.org> writes: > --- > dlls/msvcrt/process.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) You should also fix the corresponding headers and remove the typecasts. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: jscript: Added null and undefined values support to to_object
by Marvin Dec. 21, 2012

Dec. 21, 2012

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 http://testbot.winehq.org/JobDetails.pl?Key=23578 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 2/2] msvcr100: Added _aligned_msize implementation
by Marvin Dec. 21, 2012

Dec. 21, 2012

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 http://testbot.winehq.org/JobDetails.pl?Key=23573 Your paranoid android. === W7PROX64 (64 bit msvcr100) === msvcr100.c:344: Test failed: _aligned_msize returned 23 msvcr100.c:346: Test failed: _aligned_msize returned 23 msvcr100.c:348: Test failed: _aligned_msize returned 23 msvcr100.c:350: Test failed: _aligned_msize returned 24 msvcr100.c:357: Test failed: _aligned_msize returned 3 === TEST64_W7SP1 (64 bit msvcr100) === msvcr100.c:344: Test failed: _aligned_msize returned 23 msvcr100.c:346: Test failed: _aligned_msize returned 23 msvcr100.c:348: Test failed: _aligned_msize returned 23 msvcr100.c:350: Test failed: _aligned_msize returned 24 msvcr100.c:357: Test failed: _aligned_msize returned 3

1 0

Re: [1/2] wineps.drv: Add an ability to select device resolution from UI.
by Alexandre Julliard Dec. 21, 2012

Dec. 21, 2012

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > @@ -224,10 +229,13 @@ typedef struct > static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, > WPARAM wParam, LPARAM lParam) > { > + static const WCHAR resW[] = {'%','d',' ','d','p','i',0}; > + static const WCHAR resxyW[] = {'%','d','x','%','d',' ','d','p','i',0}; The "dpi" string needs to be loaded from resources. > @@ -267,6 +275,59 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, > } > SendDlgItemMessageA(hwnd, IDD_DUPLEX, CB_SETCURSEL, Cursel, 0); > } > + > + if (list_empty( &di->pi->ppd->Resolutions )) > + { > + WCHAR buf[64]; > + struct item_res_data *data; > + > + sprintfW(buf, resW, di->pi->ppd->DefaultResolution); > + SendDlgItemMessageW(hwnd, IDD_QUALITY, CB_ADDSTRING, 0, (LPARAM)buf); > + > + data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data)); > + data->resx = data->resy = di->pi->ppd->DefaultResolution; > + SendDlgItemMessageW(hwnd, IDD_QUALITY, CB_SETITEMDATA, 0, (LPARAM)data); > + Cursel = 0; You don't need a data structure, you can store the values directly with something like MAKELONG. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH] loader: Use a volatile pointer in wld_memset().
by Alexandre Julliard Dec. 21, 2012

Dec. 21, 2012

Charles Davis <cdavis5x(a)gmail.com> writes: > This prevents Clang from optimizing the loop into a memset(3) call. Something like -fno-builtin would be preferable. -- Alexandre Julliard julliard(a)winehq.org

1 0

mmdevapi: Avoid lock contention after SetEvent.
by Joerg-Cyril.Hoehle＠t-systems.com Dec. 21, 2012

Dec. 21, 2012

Hi, what's up with this patch? I wrote: >SetEvent is one of those calls with a high probability that the >Linux scheduler will switch to another thread, e.g. the one receiving >the event. As the critical section is still hold, it'll prevent the >receiver from invoking mmdevapi, e.g. GetCurrentPadding, without two >more thread switches (forth and back). We don't need that. Now that This->event is constant between IAC_Start and IAC_Release, thanks to my "SetEventHandle is allowed once only" patch, it's safe to move SetEvent(This->event) outside of the CS. Unlike the rejected patch about a CreateTimerQueue race condition internal to Wine (and only relevant in lock-less mode), this one is between the driver and the client app that blocks when calling e.g. GetCurrentPadding, what almost all apps will do, including our DSound http://source.winehq.org/source/dlls/dsound/mixer.c#L679 Regards, Jörg Höhle

2 2

Re: oleaut32: Indentation fix (Try 2)
by Andrew Talbot Dec. 20, 2012

Dec. 20, 2012

Sorry, I should have labelled this patch as "Try 2". -- Andy.

1 0

Fwd: [PATCH 3/8] winemac: Implement GetDeviceCaps().
by Per Johansson Dec. 20, 2012

Dec. 20, 2012

Forgot to include list somehow... On Mon, Dec 17, 2012 at 9:16 PM, Alexandre Julliard <julliard(a)winehq.org> wrote: > > My main reason for using it is to test the Mac builds before pushing > commits, so not being able to build the Mac driver on it is a serious > problem (and no, it can't be upgraded apparently). I'll let you guys decide on 10.5 or 10.6, but I'd like to note that all intel Mac should be able to run 10.6, as per Apple's website <http://support.apple.com/kb/SP575>. Regards, -- Per Johansson

1 0

Re: [PATCH 2/2] gdi32: Ensure a fixed-pitch full-width character has double width of a half-width character.
by Alexandre Julliard Dec. 20, 2012

Dec. 20, 2012

Akihiro Sagawa <sagawa.aki(a)gmail.com> writes: > @@ -5866,10 +5867,22 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, > return GDI_ERROR; > } > > + if (!font->orientation) { > + TEXTMETRICW tm; > + double advance = (ft_face->glyph->metrics.horiAdvance + 63) >> 6; > + get_text_metrics(incoming_font, &tm); > + if (!(tm.tmPitchAndFamily & TMPF_FIXED_PITCH) && > + (tm.tmAveCharWidth * 2) != (INT)(advance * widthRatio) && > + (tm.tmAveCharWidth * 2) == (INT)((advance + 1.0) * widthRatio)) { > + TRACE("add fullwidth character padding\n"); > + padding = 1 << 6; > + } > + } Is it really limited to orientation==0? A test case with a different orientation would be useful. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: dsound: use event based threads, v2
by Andrew Eikum Dec. 20, 2012

Dec. 20, 2012

Looks good to me, no problems with any of the drivers. I think it'd be good to get it in on Monday, as release day is tomorrow, but that's not my call. Andrew On Wed, Dec 19, 2012 at 10:30:04AM +0100, Maarten Lankhorst wrote: > Use a thread instead of a timer for greater precision. > > Changes since v1: > - Add WARN on failure of Start or GetStreamLatency > - Set lower bound of sleep time to 5 ms > - Change upper bound of sleep time to 2.5x period > - Fixup comment > > Signed-off-by: Maarten Lankhorst <maarten.lankhorst(a)ubuntu.com> > --- > I like how the most useful part of the changelog always gets stripped out. > What's the point of even adding this info here? > > Obligatory "Yes I know the error handling I added isn't perfect, and I did fix that in my failure rework patch" here.. > > --- > dlls/dsound/dsound.c | 21 +++++++++++---------- > dlls/dsound/dsound_private.h | 7 ++++--- > dlls/dsound/mixer.c | 39 +++++++++++++++++++++++---------------- > dlls/dsound/primary.c | 27 ++++++++++++++++++++++++--- > 4 files changed, 62 insertions(+), 32 deletions(-) > > diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c > index ac85ba2..381d0e1 100644 > --- a/dlls/dsound/dsound.c > +++ b/dlls/dsound/dsound.c > @@ -670,14 +670,13 @@ ULONG DirectSoundDevice_Release(DirectSoundDevice * device) > TRACE("(%p) ref was %u\n", device, ref + 1); > if (!ref) { > int i; > - timeKillEvent(device->timerID); > - timeEndPeriod(DS_TIME_RES); > > - /* The kill event should have allowed the timer process to expire > - * but try to grab the lock just in case. Can't hold lock because > - * secondarybuffer_destroy also grabs the lock */ > - RtlAcquireResourceShared(&(device->buffer_list_lock), TRUE); > - RtlReleaseResource(&(device->buffer_list_lock)); > + SetEvent(device->sleepev); > + if (device->thread) { > + WaitForSingleObject(device->thread, INFINITE); > + CloseHandle(device->thread); > + } > + CloseHandle(device->sleepev); > > EnterCriticalSection(&DSOUND_renderers_lock); > list_remove(&device->entry); > @@ -813,6 +812,7 @@ HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcG > > device->mmdevice = mmdevice; > device->guid = devGUID; > + device->sleepev = CreateEventW(0, 0, 0, 0); > > hr = DSOUND_ReopenDevice(device, FALSE); > if (FAILED(hr)) > @@ -869,9 +869,10 @@ HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcG > ZeroMemory(&device->volpan, sizeof(device->volpan)); > > hr = DSOUND_PrimaryCreate(device); > - if (hr == DS_OK) > - device->timerID = DSOUND_create_timer(DSOUND_timer, (DWORD_PTR)device); > - else > + if (hr == DS_OK) { > + device->thread = CreateThread(0, 0, DSOUND_mixthread, device, 0, 0); > + SetThreadPriority(device->thread, THREAD_PRIORITY_TIME_CRITICAL); > + } else > WARN("DSOUND_PrimaryCreate failed: %08x\n", hr); > > *ppDevice = device; > diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h > index 62656a5..1a3900c 100644 > --- a/dlls/dsound/dsound_private.h > +++ b/dlls/dsound/dsound_private.h > @@ -68,9 +68,9 @@ struct DirectSoundDevice > > GUID guid; > DSCAPS drvcaps; > - DWORD priolevel; > + DWORD priolevel, sleeptime; > PWAVEFORMATEX pwfx, primary_pwfx; > - UINT timerID, playing_offs_bytes, in_mmdev_bytes, prebuf; > + UINT playing_offs_bytes, in_mmdev_bytes, prebuf; > DWORD fraglen; > LPBYTE buffer; > DWORD writelead, buflen, state, playpos, mixpos; > @@ -97,6 +97,7 @@ struct DirectSoundDevice > IAudioStreamVolume *volume; > IAudioRenderClient *render; > > + HANDLE sleepev, thread; > struct list entry; > }; > > @@ -226,7 +227,7 @@ void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan) DECLSPEC_HIDDEN; > void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) DECLSPEC_HIDDEN; > DWORD DSOUND_secpos_to_bufpos(const IDirectSoundBufferImpl *dsb, DWORD secpos, DWORD secmixpos, float *overshot) DECLSPEC_HIDDEN; > > -void CALLBACK DSOUND_timer(UINT timerID, UINT msg, DWORD_PTR dwUser, DWORD_PTR dw1, DWORD_PTR dw2) DECLSPEC_HIDDEN; > +DWORD CALLBACK DSOUND_mixthread(void *ptr) DECLSPEC_HIDDEN; > > /* sound3d.c */ > > diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c > index 84e029b..282808e 100644 > --- a/dlls/dsound/mixer.c > +++ b/dlls/dsound/mixer.c > @@ -820,7 +820,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) > DSOUND_PrimaryStop(device); > } > > - } else { > + } else if (device->state != STATE_STOPPED) { > > DSOUND_WaveQueue(device, TRUE); > > @@ -843,22 +843,29 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) > /* **** */ > } > > -void CALLBACK DSOUND_timer(UINT timerID, UINT msg, DWORD_PTR dwUser, > - DWORD_PTR dw1, DWORD_PTR dw2) > +DWORD CALLBACK DSOUND_mixthread(void *p) > { > - DirectSoundDevice * device = (DirectSoundDevice*)dwUser; > - DWORD start_time = GetTickCount(); > - DWORD end_time; > - TRACE("(%d,%d,0x%lx,0x%lx,0x%lx)\n",timerID,msg,dwUser,dw1,dw2); > - TRACE("entering at %d\n", start_time); > - > - RtlAcquireResourceShared(&(device->buffer_list_lock), TRUE); > - > - if (device->ref) > - DSOUND_PerformMix(device); > + DirectSoundDevice *dev = p; > + TRACE("(%p)\n", dev); > > - RtlReleaseResource(&(device->buffer_list_lock)); > + while (dev->ref) { > + DWORD ret; > > - end_time = GetTickCount(); > - TRACE("completed processing at %d, duration = %d\n", end_time, end_time - start_time); > + /* > + * Some audio drivers are retarded and won't fire after being > + * stopped, add a timeout to handle this. > + */ > + ret = WaitForSingleObject(dev->sleepev, dev->sleeptime); > + if (ret == WAIT_FAILED) > + WARN("wait returned error %u %08x!\n", GetLastError(), GetLastError()); > + else if (ret != WAIT_OBJECT_0) > + WARN("wait returned %08x!\n", ret); > + if (!dev->ref) > + break; > + > + RtlAcquireResourceShared(&(dev->buffer_list_lock), TRUE); > + DSOUND_PerformMix(dev); > + RtlReleaseResource(&(dev->buffer_list_lock)); > + } > + return 0; > } > diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c > index 3ac928b..dd810fd 100644 > --- a/dlls/dsound/primary.c > +++ b/dlls/dsound/primary.c > @@ -152,6 +152,8 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) > REFERENCE_TIME prebuf_rt; > WAVEFORMATEX *wfx = NULL; > HRESULT hres; > + REFERENCE_TIME period; > + DWORD period_ms; > > TRACE("(%p, %d)\n", device, forcewave); > > @@ -192,14 +194,15 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) > prebuf_rt = (10000000 * (UINT64)prebuf_frames) / device->pwfx->nSamplesPerSec; > > hres = IAudioClient_Initialize(device->client, > - AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST, > - prebuf_rt, 0, device->pwfx, NULL); > + AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST | > + AUDCLNT_STREAMFLAGS_EVENTCALLBACK, prebuf_rt, 0, device->pwfx, NULL); > if(FAILED(hres)){ > IAudioClient_Release(device->client); > device->client = NULL; > WARN("Initialize failed: %08x\n", hres); > return hres; > } > + IAudioClient_SetEventHandle(device->client, device->sleepev); > > hres = IAudioClient_GetService(device->client, &IID_IAudioRenderClient, > (void**)&device->render); > @@ -234,6 +237,24 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) > return hres; > } > > + /* Now kick off the timer so the event fires periodically */ > + hres = IAudioClient_Start(device->client); > + if (FAILED(hres)) > + WARN("starting failed with %08x\n", hres); > + > + hres = IAudioClient_GetStreamLatency(device->client, &period); > + if (FAILED(hres)) { > + WARN("GetStreamLatency failed with %08x\n", hres); > + period_ms = 10; > + } else > + period_ms = (period + 9999) / 10000; > + TRACE("period %u ms fraglen %u prebuf %u\n", period_ms, device->fraglen, device->prebuf); > + > + if (period_ms < 3) > + device->sleeptime = 5; > + else > + device->sleeptime = period_ms * 5 / 2; > + > return S_OK; > } > > @@ -379,7 +400,7 @@ HRESULT DSOUND_PrimaryPlay(DirectSoundDevice *device) > TRACE("(%p)\n", device); > > hr = IAudioClient_Start(device->client); > - if(FAILED(hr)){ > + if(FAILED(hr) && hr != AUDCLNT_E_NOT_STOPPED){ > WARN("Start failed: %08x\n", hr); > return hr; > } > -- > 1.8.0 > > > >

1 0

Re: [PATCH 3/3] usp10: Add support for format 2 pair adjustments.
by Dmitry Timoshkov Dec. 20, 2012

Dec. 20, 2012

Huw Davies <huw(a)codeweavers.com> wrote: > typedef struct { > + WORD PosFormat; > + WORD Coverage; > + WORD ValueFormat1; > + WORD ValueFormat2; > + WORD ClassDef1; > + WORD ClassDef2; > + WORD Class1Count; > + WORD Class2Count; > + WORD Class1Record[1]; > +} GPOS_PairPosFormat2; Shouldn't this structure be 2 bytes aligned? -- Dmitry.

3 6

winepulse test data review
by Joerg-Cyril.Hoehle＠t-systems.com Dec. 20, 2012

Dec. 20, 2012

Hi, Maarten Lankhorst wrote: >Actually in winepulse, sleep / 12000 (8 ms I guess?) ms would work, no sleep at all works too, Yes, I wanted to go no further than 8ms below the 10ms period limit. > it was just the mixing of various levels of sleep that was failing. Not sure why though, > might be something about the scheduling throwing it off. There's a perfectly simple explanation of this that applies to both winepulse and winecoreaudio. It goes as follows. IOW, there's a bug in winecoreaudio. It may explain why the test stutters on my MacOS 10.5.8 machine, regardless of how accurate or "improved" GetPosition is. winecoreaudio's IAC_ReleaseBuffer sends packets off as soon as it receives data, unlike winealsa/wineoss. Consider the sleep sequence 0 5 8 0 5 ms... + The transition 8 -> 0ms sleep is fine, as data is sent 2ms after the prior packet - The transition 0 -> 5 is most problematic, as it means that 2 ReleaseBuffer will be 15ms apart, even though only 10ms of data was sent. I believe winepulse is affected by this too, like winecoreaudio. The stable sequences "always 0" or "always 8ms sleep" are paced regularly, so underruns are avoided as long as the OS schedules the threads soon enough. Winealsa and wineOSS are not affected, as they write data on the 10ms period boundaries, -- like native presumably does. winecoreaudio solution paths: - write packets on period tick, not at release time - or add silence lead-in - or delay first packet until period tick only (if small) - or ... I think it should be possible to produce reliable continuous sound in winepulse and winecoreaudio yet maintain their current "send packet" codebase instead of transitioning to a separate buffer that winealsa and wineoss use. Regards, Jörg Höhle

3 2

Re: msxml3: Add custom handling for DISPID_VALUE for node map
by Jacek Caban Dec. 20, 2012

Dec. 20, 2012

On 12/19/12 08:24, Nikolay Sivov wrote: > Add custom handling for DISPID_VALUE for node map If this has to be done for all IDispatchEx objects with DISPID_VALUE, it may be worth considering changing dispex.c. Something like: if(id == DISPID_VALUE && wFlags == DISPATCH_METHOD) wFlags |= DISPATCH_PROPERTYGET; before ITypeInfo::Invoke call should do the trick and replace both this patch and already committed node list patch. Cheers, Jacek

2 3

Re: [PATCH 1/2] oleaut32/tests: Add test for ITypeInfo2_fnGetContainingTypeLib (Try 3, resend)
by Nikolay Sivov Dec. 20, 2012

Dec. 20, 2012

On 12/20/2012 14:50, Tatyana Fokina wrote: Hi, Tatyana. Main problem is that your test will crash if run without patch 2/2, that's not how it should be done. You need to merge these patches together to keep tests working or send implementation fix first, so next test patch will work. > + hr = ITypeInfo2_GetContainingTypeLib(ti2, (ITypeLib **)&tl, &Index); > + ok(hr == S_OK, " ITypeInfo2_GetContainingTypeLib failed on Index\n"); > + if(tl) ITypeLib_Release(tl); You don't need a cast here. > + hr = ITypeInfo2_GetContainingTypeLib(ti2, NULL, &Index); > + ok(hr == S_OK, " ITypeInfo2_GetContainingTypeLib failed on ITypeLib = NULL\n"); Please test index value here and above to make sure it really returns something.

1 0

Re: oleaut32: Indentation Fix
by Alexandre Julliard Dec. 20, 2012

Dec. 20, 2012

Andrew Talbot <andrew.talbot(a)talbotville.com> writes: > Changelog: > oleaut32: Indentation Fix. Please avoid reformatting hundreds of lines for no reason. Only fix the parts where the indentation is actually incorrect. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: windowscodecs: Adjust a type in PngDecoder_Frame_GetColorContexts.
by Alexandre Julliard Dec. 19, 2012

Dec. 19, 2012

Gerald Pfeifer <gerald(a)pfeifer.com> writes: > Current snapshots of GCC 4.8.0 issue a warning about some of the > new code in windowscodecs/pngformat.c: > > pngformat.c: In function 'PngDecoder_Frame_GetColorContexts': > pngformat.c:882:5: warning: passing argument 5 of 'ppng_get_iCCP' from > incompatible pointer type [enabled by default] > if (ppng_get_iCCP(This->png_ptr, This->info_ptr, &name, &compression_type,&profile, &len)) > pngformat.c:882:5: note: expected 'png_bytepp' but argument is of type 'char **' > > The patch below addresses this. That will break on older libpng. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 0/5] Moving bare consoles to wineconsole (try #2)
by Alexandre Julliard Dec. 19, 2012

Dec. 19, 2012

Eric Pouech <eric.pouech(a)orange.fr> writes: > The following series implements a new scheme for managing 'bare' consoles. > We now force every program started without a wine parent to be run under > wineconsole (transparently for the user). > This is done using a new backend in wineconsole called 'line'. This backend > only takes care of input; output is kept as a client side operation. > All terminal related code is moved from dlls/kernel32 to programs/wineconsole. > > This basically ensures that: > - Only wineconsole reads from standard input (and writes into input queue). > This fixes bug reported by Jason when $CONIN is opened with read access only. > - It also enforces that wineconsole always has control of the unix terminal, > hence ensuring that we properly reset the terminal settings upon exit. > > Code looks way cleaner now. > > Try #2 (changes from previous patch) > - fix changelog of first patch (was WineHelp...) > - fix date in header for new file > - remove setting title code (will be fixed in later patch) Actually the problem is not only the title. For instance it's still sending escape sequences when stdout is redirected. -- Alexandre Julliard julliard(a)winehq.org

2 3

Re: wininet: Map socket errors to ERROR_INTERNET_CANNOT_CONNECT in create_netconn_socket.
by Marvin Dec. 19, 2012

Dec. 19, 2012

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 http://testbot.winehq.org/JobDetails.pl?Key=23542 Your paranoid android. === W7PRO (32 bit http) === http.c:3337: Test failed: HttpSendRequest failed: 12002

2 1

Re: dsound: change mix rate of primary buffer
by Andrew Eikum Dec. 18, 2012

Dec. 18, 2012

On Tue, Dec 18, 2012 at 08:08:03PM +0100, sebastien chev wrote: > Thank you for the tips. I will look at these. > I guess you're probably also thinking about the mix buffer in dsound itself. That does always mix to float, and there isn't a way to change it right now. What are you planning to use this for? We could support different mix buffer formats, but I'm not sure this use case is worth the effort. Andrew

1 0

Clang static analyzer results / wine-1.5.19-186-g1cd0c4a
by Austin English Dec. 18, 2012

Dec. 18, 2012

Now that http://source.winehq.org/git/wine.git/commitdiff/4adfb787f4e8c36a37ce1d53a7… is in (and clang has improved), several wine/clang bugs are fixed. For those curious, there is one remaining test failure on my machine, with clang instead of gcc: http://bugs.winehq.org/show_bug.cgi?id=25828 The static analyzer results were made with: llvm: git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk(a)170295 91177308-0d34-0410-b5e6-96231b3b80d8 clang: git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk(a)170294 91177308-0d34-0410-b5e6-96231b3b80d8 wine: wine-1.5.19-186-g1cd0c4a ./configure --disable-tests was used to reduce noise austin(a)debian-home:~$ du -h wine-1.5.19-186-g1cd0c4a.tar.bz2 39M wine-1.5.19-186-g1cd0c4a.tar.bz2 austin(a)debian-home:~$ sha1sum wine-1.5.19-186-g1cd0c4a.tar.bz2 bf86469ab3929faf996b76d4a8e533edcf24fd29 wine-1.5.19-186-g1cd0c4a.tar.bz2 Available at http://www.mediafire.com/?0gioifbgw363az3 -- -Austin

1 0

winealsa: Separate read and write pointers.
by Joerg-Cyril.Hoehle＠t-systems.com Dec. 18, 2012

Dec. 18, 2012

Andrew Eikum wrote: >This [lock-less] seems to be the main goal of the patch. It'll not be bad to fix the capture bug independently. >and maybe we can get that into Wine after the next release? That requires agreement on the lock-less protocol. Basis: atomic 32bit updates. Do we want distinguished alignment declarations for e.g. This->held_frames? Write: InterlockedExchange/Increment/etc. is clear Read: Open for discussion Basically, all I need is a snapshot of a 32bit entity, i.e. an atomic read. The code doesn't bother whether that value is stale or not. It works in either case. All that is required is that it's updated some time eventually (i.e. not running off local cache for hours). Back in the old days, people used foo = (volatile X) bar; or even volatile X bar; ... foo=bar; Such code has been present e.g. in mciseq for the last 10 years. Currently, this has my preference for Intel: foo = bar; // e.g. held = This->held_frames; __asm__ __volatile__("":::"memory"); /* compiler barrier is enough for x86 */ I wouldn't be opposed to held = (volatile DWORD) This->held_frames; Purists spit at volatile for threading, but that's what has been used for decades and continues to be used (just google some random threading app...) I've also suggested InterlockedExchange(&held, This->held_frames) but that's just wasting a read of the obsolete value of held. So why use that form? Do we need to care for anything else than Intel? One may envision other approaches, e.g. a second critical section for the callback and Start/Stop only. But This->held_frames is updated within IAC_Get/ReleaseBuffer, so that doesn't solve the issue. POSIX purists would say that a protocol is needed between the two communicating threads (the Get/Release one and the cb, not the Start/Stop thread). But I don't care about POSIX requirements imposed by weird 8/16/24/32/40/64 bit HW and strange non-UNIX systems when the target is Wine-Is-Not-an-Emulator. Regards, Jörg Höhle

1 0

Re: winealsa: Separate read and write pointers.
by Andrew Eikum Dec. 18, 2012

Dec. 18, 2012

On Mon, Dec 17, 2012 at 05:01:29PM +0100, Joerg-Cyril.Hoehle(a)t-systems.com wrote: > Furthermore, this patch eases integration of my lock-less code, which > I'll not release for now, by cleanly separating read and write > pointers during playback and capture. No more adding of two volatile > entities moving in opposite directions! > This seems to be the main goal of the patch. I tested it against my usual set of applications both with and without PulseAudio. This patch seems fine to me. I'll take a look at your lockless patch on bug 29531, and maybe we can get that into Wine after the next release? Andrew

1 0

dsound: change mix rate of primary buffer
by sebastien chev Dec. 18, 2012

Dec. 18, 2012

It seems that no matter what the Windows side program choose for DirectSoundCreate, the DSound subsystem initialize itself with the higher spec sound available (for example 48Khz Float32, or 48kHz Int16 if no Float32 available). While not a big deal on current linux PC, using this on ARM device kill performance. A DirectSound subsystem for ARM, with Integer only for the mixbuffer (as most ARM still use softfloat) and 22kHz should be less taxing for performances.

2 1

Re: mmdevapi: Prevent race condition upon Start.
by Alexandre Julliard Dec. 18, 2012

Dec. 18, 2012

<Joerg-Cyril.Hoehle(a)t-systems.com> writes: > What happened every so often, even on a single-core machine(!), is > that CreateTimerQueue(dueTime=0=immediate) would see the timer thread > created and the callback invoked before the function returns. Since > This->started was not set yet, our callback would return immediately, > in effect causing sound to start only one 10ms period later. > That's obviously was not intended by the author. > So let's set This->started before CTQ. This doesn't make sense, there's a critical section. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: oleaut32: Dont output an error when the typelib cannot be found
by Alexandre Julliard Dec. 18, 2012

Dec. 18, 2012

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c > index fa9b050..04914e0 100644 > --- a/dlls/oleaut32/typelib.c > +++ b/dlls/oleaut32/typelib.c > @@ -2544,9 +2544,11 @@ static HRESULT TLB_PEFile_Open(LPCWSTR path, INT index, LPVOID *ppBase, DWORD *p > return S_OK; > } > } > - > - hr = E_FAIL; > } > + > + TRACE("No TYPELIB resource found\n"); > + hr = E_FAIL; > + SetLastError(0); Setting last error to 0 is almost always wrong. In this case it's most likely just a side effect of CreateFile, and shouldn't need to be done explicitly. -- Alexandre Julliard julliard(a)winehq.org

1 0

Does Wine benefit from libtiff5 over libtiff4?
by Scott Ritchie Dec. 17, 2012

Dec. 17, 2012

I'm trying to manage building for 3 different Ubuntu releases now for our 1.5 releases, and the main delta between them is libtiff 12.04: libtiff4 available 12.10: libtiff4 and libtiff 5 available 13.04: libtiff4 and libtiff 5 available It's much simpler if I can build on 12.04 and copy the binary packages, however this means I can't use libtiff5 if I do so. Is there any benefit in doing a separate build just for this? *note that in 12.10/13.04 official archive we build seperately and just use libtiff5. Thanks, Scott Ritchie

3 3

Call for papers - FOSDEM 2013
by Jeremy White Dec. 17, 2012

Dec. 17, 2012

Alright folks, We need to put together a schedule for our room at FOSDEM. So I would like to formally 'call for papers' for FOSDEM. Please email suggested topics to wineconf(a)winehq.org, where I'll collate them and piece them into a schedule. A 'paper' can be a talk you wish to give, or a topic you think we should discuss. As always, they should be relatively brief, and should emphasize discussion and collaboration. This year it probably makes sense to imagine a few talks aimed at developers outside the Wine community. After all, the hope is that a few bored non Wine developers may wander by from time to time. Perhaps we can suck them in <grin>. Cheers, Jeremy

5 7

Re: [PATCH 3/8] winemac: Implement GetDeviceCaps().
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Ken Thomases <ken(a)codeweavers.com> writes: > --- > dlls/winemac.drv/Makefile.in | 1 + > dlls/winemac.drv/gdi.c | 321 ++++++++++++++++++++++++++++++++++++++++- > dlls/winemac.drv/macdrv.h | 101 +++++++++++++ > 3 files changed, 415 insertions(+), 8 deletions(-) > create mode 100644 dlls/winemac.drv/macdrv.h It doesn't build here on OS X 10.5.8: gcc -m32 -c -I. -I. -I../../include -I../../include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wstrict-prototypes -Wwrite-strings -gstabs+ -fno-omit-frame-pointer -Wpointer-arith -I/usr/local/include/freetype2 -I/usr/local/include -g -O2 -o gdi.o gdi.c gdi.c: In function 'device_init': gdi.c:143: error: 'CGDisplayModeRef' undeclared (first use in this function) gdi.c:143: error: (Each undeclared identifier is reported only once gdi.c:143: error: for each function it appears in.) gdi.c:143: error: syntax error before 'mode' gdi.c:160: error: 'mode' undeclared (first use in this function) gdi.c:162: warning: implicit declaration of function 'CGDisplayModeCopyPixelEncoding' gdi.c:162: warning: initialization makes pointer from integer without a cast gdi.c:164: warning: implicit declaration of function 'CGDisplayModeGetWidth' gdi.c:165: warning: implicit declaration of function 'CGDisplayModeGetHeight' gdi.c:178: warning: implicit declaration of function 'CGDisplayModeRelease' make[1]: *** [gdi.o] Error 1 -- Alexandre Julliard julliard(a)winehq.org

2 6

[PATCH 0/3] Add O_DENY* flags to fcntl and cifs
by Pavel Shilovsky Dec. 17, 2012

Dec. 17, 2012

Network filesystems CIFS, SMB2.0, SMB3.0 and NFSv4 have such flags - this change can benefit cifs and nfs modules. While this change is ok for network filesystems, itsn't not targeted for local filesystems due security problems (e.g. when a user process can deny root to delete a file). Share flags are used by Windows applications and WINE have to deal with them too. While WINE can process open share flags itself on local filesystems, it can't do it if a file stored on a network share and is used by several clients. This patchset makes it possible for CIFS/SMB2.0/SMB3.0. Pavel Shilovsky (3): fcntl: Introduce new O_DENY* open flags for network filesystems CIFS: Add O_DENY* open flags support CIFS: Use NT_CREATE_ANDX command for forcemand mounts fs/cifs/cifsacl.c | 10 ++++---- fs/cifs/cifsglob.h | 11 ++++++++- fs/cifs/cifsproto.h | 9 ++++---- fs/cifs/cifssmb.c | 47 ++++++++++++++++++++------------------ fs/cifs/dir.c | 14 ++++++++---- fs/cifs/file.c | 18 ++++++++++----- fs/cifs/inode.c | 11 +++++---- fs/cifs/link.c | 10 ++++---- fs/cifs/readdir.c | 2 +- fs/cifs/smb1ops.c | 15 ++++++------ fs/cifs/smb2file.c | 10 ++++---- fs/cifs/smb2inode.c | 4 ++-- fs/cifs/smb2ops.c | 10 ++++---- fs/cifs/smb2pdu.c | 6 ++--- fs/cifs/smb2proto.h | 14 +++++++----- fs/fcntl.c | 5 ++-- include/uapi/asm-generic/fcntl.h | 11 +++++++++ 17 files changed, 125 insertions(+), 82 deletions(-) -- 1.7.10.4

11 28

Re: [PATCH 3/6] jscript: Fixed deleting nonexistent identifiers
by Marvin Dec. 17, 2012

Dec. 17, 2012

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 http://testbot.winehq.org/JobDetails.pl?Key=23454 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 2/6] jscript: Fixed deleting nonexisting properties from member expression
by Marvin Dec. 17, 2012

Dec. 17, 2012

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 http://testbot.winehq.org/JobDetails.pl?Key=23453 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 1/6] jscript: Fixed Number.toFixed for value 0 with 0 precision
by Marvin Dec. 17, 2012

Dec. 17, 2012

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 http://testbot.winehq.org/JobDetails.pl?Key=23452 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: msvcrt: implement _strxfrm_l
by Piotr Caban Dec. 17, 2012

Dec. 17, 2012

On 12/14/12 10:28, Jérôme Gardou wrote: > --- > dlls/msvcrt/msvcrt.spec | 2 +- > dlls/msvcrt/string.c | 26 ++++++++++++++++++++++++-- > 2 files changed, 25 insertions(+), 3 deletions(-) > Please add parameters validation. The function also behaves differently with native msvcrt when output buffer is to small. This function should return data that keeps sorting order. It should use LCMAP_SORTKEY flag. Cheers, Piotr

1 0

Re: winex11.drv: give a better warning for broken drivers on 64-bit OS's
by Austin English Dec. 17, 2012

Dec. 17, 2012

On Sun, Dec 16, 2012 at 2:31 PM, Austin English <austinenglish(a)gmail.com> wrote: > -- > -Austin Wrong macro, please ignore. -- -Austin

1 0

Re: [PATCH 2/3] [resend] [cmd] Add more tests for set /a
by Marvin Dec. 16, 2012

Dec. 16, 2012

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 http://testbot.winehq.org/JobDetails.pl?Key=23440 Your paranoid android. === WNT4WSSP6 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') === W2KPROSP4 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 860 (got 'WINE_baz correctly 7', wanted 'WINE_baz correctly 6(a)or_broken@ERROR: WINE_baz incorrectly [7]') === WXPPROSP3 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 860 (got 'WINE_baz correctly 7', wanted 'WINE_baz correctly 6(a)or_broken@ERROR: WINE_baz incorrectly [7]') === W2K3R2SESP2 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 860 (got 'WINE_baz correctly 7', wanted 'WINE_baz correctly 6(a)or_broken@ERROR: WINE_baz incorrectly [7]') === WVISTAADM (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 860 (got 'WINE_baz correctly 7', wanted 'WINE_baz correctly 6(a)or_broken@ERROR: WINE_baz incorrectly [7]') === W2K8SE (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 860 (got 'WINE_baz correctly 7', wanted 'WINE_baz correctly 6(a)or_broken@ERROR: WINE_baz incorrectly [7]') === W7PRO (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 860 (got 'WINE_baz correctly 7', wanted 'WINE_baz correctly 6(a)or_broken@ERROR: WINE_baz incorrectly [7]') === W7PROX64 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 860 (got 'WINE_baz correctly 7', wanted 'WINE_baz correctly 6(a)or_broken@ERROR: WINE_baz incorrectly [7]') === TEST64_W7SP1 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 860 (got 'WINE_baz correctly 7', wanted 'WINE_baz correctly 6(a)or_broken@ERROR: WINE_baz incorrectly [7]') === W7PROX64 (64 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 860 (got 'WINE_baz correctly 7', wanted 'WINE_baz correctly 6(a)or_broken@ERROR: WINE_baz incorrectly [7]') === TEST64_W7SP1 (64 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 860 (got 'WINE_baz correctly 7', wanted 'WINE_baz correctly 6(a)or_broken@ERROR: WINE_baz incorrectly [7]')

1 0

cmd patches - please ignore them
by Ann and Jason Edmeades Dec. 16, 2012

Dec. 16, 2012

Dont know what's happened, need to investigate further - Had 100% pass rate in job 23438 only to fail on submission... Needs some investigation so will work on it later in the week Jason

1 0

Re: [PATCH 1/3] [try2] [cmd] Convert the set /a tests to validate better
by Marvin Dec. 16, 2012

Dec. 16, 2012

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 http://testbot.winehq.org/JobDetails.pl?Key=23439 Your paranoid android. === WNT4WSSP6 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') === W2KPROSP4 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') === WXPPROSP3 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') === W2K3R2SESP2 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') === WVISTAADM (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') === W2K8SE (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') === W7PRO (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') === W7PROX64 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') === TEST64_W7SP1 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') === W7PROX64 (64 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') === TEST64_W7SP1 (64 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19')

1 0

Re: wined3d: Recognize Nvidia GTX660 cards.
by Bruno Jesus Dec. 16, 2012

Dec. 16, 2012

On Fri, Dec 14, 2012 at 2:01 PM, Caron Jensen <caron(a)codeweavers.com> wrote: > CARD_NVIDIA_GEFORCE_GT630M = 0x0de9, > CARD_NVIDIA_GEFORCE_GT640M = 0x0fd2, > CARD_NVIDIA_GEFORCE_GT650M = 0x0fd1, > + CARD_NVIDIA_GEFORCE_GTX660 = 0X1183, > CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, > CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, Accoding to the similar patch from Jiang Yike "GTX660 Ti" is 0x1183, I looked for GTX660 and found different PCI ID's like 0x1185 or 0x110C but I could not find this information in NVIDIA site, only in other sites: https://fah-web.stanford.edu/file-releases/public/GPUs.txt http://pciids.sourceforge.net/pci.ids http://www.techpowerup.com/vgabios/126661/Asus.GTX660.2048.120810.html http://foldingforum.org/viewtopic.php?f=83&t=22477 Best wishes, Bruno

1 0

Re: wined3d: Recognize Nvidia GTX660 cards.
by futureway＠asia.com Dec. 16, 2012

Dec. 16, 2012

Hello, Caron! GTX 660 and GTX 660 Ti are different cards, and 0x1183 is the device code of GTX 660 Ti. You may view my patch: http://source.winehq.org/patches/data/92545 . Best regards! Jiang Yike > ----- Original Message ----- > From: Caron Jensen > Sent: 12/15/12 12:01 AM > To: wine-patches > Subject: wined3d: Recognize Nvidia GTX660 cards. > > --- > dlls/wined3d/directx.c | 3 +++ > dlls/wined3d/wined3d_private.h | 1 + > 2 files changed, 4 insertions(+) > > diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c > index 15ac2ea..386c87a 100644 > --- a/dlls/wined3d/directx.c > +++ b/dlls/wined3d/directx.c > @@ -1095,6 +1095,7 @@ static const struct gpu_description gpu_description_table[] = > {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT630M, "NVIDIA GeForce GT 630M", DRIVER_NVIDIA_GEFORCE6, 1024}, > {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT640M, "NVIDIA GeForce GT 640M", DRIVER_NVIDIA_GEFORCE6, 1024}, > {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT650M, "NVIDIA GeForce GT 650M", DRIVER_NVIDIA_GEFORCE6, 2048}, > + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX660, "NVIDIA GeForce GTX 660", DRIVER_NVIDIA_GEFORCE6, 2048}, > {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE6, 2048}, > {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE6, 2048}, > > @@ -1495,6 +1496,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl > { > {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ > {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ > + {"GTX 660", CARD_NVIDIA_GEFORCE_GTX660}, /* Geforce 600 - midend */ > {"GT 650M", CARD_NVIDIA_GEFORCE_GT650M}, /* Geforce 600 - midend mobile */ > {"GT 640M", CARD_NVIDIA_GEFORCE_GT640M}, /* Geforce 600 - midend mobile */ > {"GT 630M", CARD_NVIDIA_GEFORCE_GT630M}, /* Geforce 600 - midend mobile */ > @@ -2018,6 +2020,7 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i > { > /* Kepler */ > {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, > + {"NVE7", CARD_NVIDIA_GEFORCE_GTX660}, > /* Fermi */ > {"NVCF", CARD_NVIDIA_GEFORCE_GTX550}, > {"NVCE", CARD_NVIDIA_GEFORCE_GTX560}, > diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h > index 0bb3f27..13f9285 100644 > --- a/dlls/wined3d/wined3d_private.h > +++ b/dlls/wined3d/wined3d_private.h > @@ -1425,6 +1425,7 @@ enum wined3d_pci_device > CARD_NVIDIA_GEFORCE_GT630M = 0x0de9, > CARD_NVIDIA_GEFORCE_GT640M = 0x0fd2, > CARD_NVIDIA_GEFORCE_GT650M = 0x0fd1, > + CARD_NVIDIA_GEFORCE_GTX660 = 0X1183, > CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, > CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, > > -- > 1.7.9.5 >

1 0

Re: [PATCH 1/3] [cmd] Convert the set /a tests to validate better
by Frédéric Delanoy Dec. 15, 2012

Dec. 15, 2012

On Thu, Dec 13, 2012 at 10:59 PM, Ann and Jason Edmeades <jason(a)edmeades.me.uk> wrote: > The tests previously set a variable which was not checked until > the subsequent test completed (as env vars are expanded as the > line is read, meaning a sequence of set /a var=x & echo %var% > echos the contents before the set is executed). In addition when > multiple variables are involved in the calculation, only the > first one was being checked, and this is changed to check all > variables involved in the calculation. > + +REM Check the variables are set to the expected value and clear their contents +:check_vars +if not "%1"=="" ( + if "%1"=="%WINE_var1%" ( + echo WINE_var1 correctly %1 + ) else ( + echo ERROR: WINE_var1 incorrectly %WINE_var1% [%1] + ) +) +if not "%2"=="" ( + if "%2"=="%WINE_var2%" ( + echo WINE_var2 correctly %2 + ) else ( + echo ERROR: WINE_var2 incorrectly %WINE_var2% [%2] + ) +) +if not "%3"=="" ( + if "%3"=="%WINE_var3%" ( + echo WINE_var3 correctly %1 + ) else ( + echo ERROR: WINE_var3 incorrectly %WINE_var3% [%3] + ) +) A couple comments: 1. I don't really like hardcoding a variable name in a function... Why not using something like: set /a var=1 +2 & call :compute var set /a foo=8, bar=foo+1 & call :compute foo bar goto :end :compute set %1 set %1= // to clear the contents if not "%2" == "" ( set %2 set %2= // clearing here as well ) goto :eof :end which prints the variable(s) name and value, without hardcoding? var=3 foo=8 bar=9 2. The check for the presence of the first parameter is unneeded since you always call with at least one param (you control all calls) 3. When only 1 variable is used, no need to add a '1' suffix as in 'foo1' or 'WINE_foo1': the '1' doesn't help/add useful information 4. Ideally, for clarity, one would use delayed expansion instead, such as setlocal EnableDelayedExpansion set /a var=1 +2 & echo !var! endlocal but this isn't implemented yet, so adding a preliminary comment like "REM FIXME Simplify tests when EnableDelayedExpansion is supported" would be good IMO 5. You could even simplify the above function (making it more generic, instead of testing for up to 3 arguments) by using SHIFT and an additional label, like :compute :comploop if not "%1" == "" ( set %1 set %1= shift ) else ( goto :eof ) goto :comploop goto :eof Or even better (if NT4 allows): :compute for %%i in (%*) do ( set %%i set %%i= ) goto :eof Frédéric

2 4

Re: gdi32: Indentation fix
by Dmitry Timoshkov Dec. 15, 2012

Dec. 15, 2012

Andrew Talbot <andrew.talbot(a)talbotville.com> wrote: > Changelog: > gdi32: Indentation fix. Please keep 4 spaces indentation without tabs. -- Dmitry.

2 1

Re: [2/2] gdi32/tests: Added tests for GetFontResourceInfoW
by Dmitry Timoshkov Dec. 14, 2012

Dec. 14, 2012

Stefan Leichter <Stefan.Leichter(a)camline.com> wrote: > + pCopyFileW = (void *)GetProcAddress(hkernel32, "CopyFileW"); > + pExpandEnvironmentStringsW = (void *)GetProcAddress(hkernel32, "ExpandEnvironmentStringsW"); > + pGetCurrentDirectoryW = (void *)GetProcAddress(hkernel32, "GetCurrentDirectoryW"); There is no reason to import these APIs using GetProcAddress. Also testing GetFontResourceInfo without checking actual buffer contents is not very useful. Google points to http://www.undocprint.org/winspool/getfontresourceinfo which seems to have some description of this API, with symbolic names of the type parameter, so testing something besides type == 1 would be a good idea as well. -- Dmitry.

2 4

Sponsorship to FOSDEM's Wine room
by Jeremy White Dec. 14, 2012

Dec. 14, 2012

The Wine project has a limited fund to sponsor travel to the Wine conference. If you are interested in attending the Wine DevRoom at FOSDEM, but could only do so with financial assistance, we may be able to help! To apply, simply email me a request and indicate if you need help with transportation costs, lodging costs, or both. If you need help with transportation costs, please provide an estimate of your travel costs. Funding decisions will be made by a five member committee including myself, Alexandre, Michael Stefaniuc, Austin English, and Marcus Meissner. Priority will be given to those that have contributed to the Wine project in some form (not necessarily patches). Please send your request to me no later than December 31, 2012. We will try to communicate decisions on or before January 5th, 2013. Cheers, Jeremy

1 0

We're in at FOSDEM!
by Jeremy White Dec. 14, 2012

Dec. 14, 2012

I'm stoked - we've been approved for a dev room at FOSDEM on Saturday, February 2nd, in Brussels. It is just the one day, but I figure we can find ways to gather on Friday night and/or Sunday as well. I really think this will be a fun change of pace for us. If it doesn't work out, we'll just go camp out in Marcus's back yard instead <evil grin>. One thing they require from us is a pre set schedule, so I'll be asking people to suggest topics, and then we'll have to weed through them to figure out what makes the most sense. Cheers, Jeremy

4 5

Re: wined3d: Recognize Nvidia GTX660 cards.
by Henri Verbeet Dec. 14, 2012

Dec. 14, 2012

On 14 December 2012 17:01, Caron Jensen <caron(a)codeweavers.com> wrote: > @@ -2018,6 +2020,7 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i > { > /* Kepler */ > {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, > + {"NVE7", CARD_NVIDIA_GEFORCE_GTX660}, > /* Fermi */ > {"NVCF", CARD_NVIDIA_GEFORCE_GTX550}, > {"NVCE", CARD_NVIDIA_GEFORCE_GTX560}, That's ok in principle, but please keep the table ordered, so NVE7 above NVE4.

1 0

Re: oleaut32: Added a test for prop getter invocation with different flags
by Marvin Dec. 14, 2012

Dec. 14, 2012

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 http://testbot.winehq.org/JobDetails.pl?Key=23397 Your paranoid android. === WINEBUILD (build) === Make failed

3 3

Use software vertex processing instead of mixed?
by Francois Gouget Dec. 14, 2012

Dec. 14, 2012

A lot of tests get skipped on my Windows XP EeePC just because the Direct3D 9 device creation fails. And apparently that's just because we ask for mixed vertex processing instead of software vertex processing. How important is it to use mixed mode instead of software, at least for these tests? It does not seem to make any difference to the test results on my HD4000 graphics card (that one is on Windows 8 and accepts both mixed and software vertex processing unlike the GMA950). diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index ba0f065..e25a5d3 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -1240,7 +1240,7 @@ START_TEST(core) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if(FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); IDirect3D9_Release(d3d); diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 8e12b74..7f238be 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -2686,7 +2686,7 @@ START_TEST(effect) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); IDirect3D9_Release(d3d); diff --git a/dlls/d3dx9_36/tests/line.c b/dlls/d3dx9_36/tests/line.c index b9eacee..89e4fc6 100644 --- a/dlls/d3dx9_36/tests/line.c +++ b/dlls/d3dx9_36/tests/line.c @@ -138,7 +138,7 @@ START_TEST(line) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); IDirect3D9_Release(d3d); diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 35e38e4..0218000 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -129,7 +129,7 @@ static struct test_context *new_test_context(void) d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, - D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Couldn't create IDirect3DDevice9 object %#x\n", hr); @@ -1183,7 +1183,7 @@ static void D3DXCreateMeshTest(void) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); @@ -1390,7 +1390,7 @@ static void D3DXCreateMeshFVFTest(void) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); @@ -2263,7 +2263,7 @@ static void D3DXLoadMeshTest(void) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); @@ -2462,7 +2462,7 @@ static void D3DXCreateBoxTest(void) memset(&d3dpp, 0, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); @@ -2760,7 +2760,7 @@ static void D3DXCreateSphereTest(void) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); @@ -3004,7 +3004,7 @@ static void D3DXCreateCylinderTest(void) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); @@ -4004,7 +4004,7 @@ static void D3DXCreateTextTest(void) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); @@ -4298,7 +4298,7 @@ static void D3DXGenerateAdjacencyTest(void) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 75139b1..223bebf 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -1370,7 +1370,7 @@ static void test_setting_constants(void) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 84a70cf..7ae7df9 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -1230,7 +1230,7 @@ START_TEST(surface) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if(FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); IDirect3D9_Release(d3d); diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 2b17f64..9972571 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1803,7 +1803,7 @@ START_TEST(texture) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); IDirect3D9_Release(d3d); diff --git a/dlls/d3dx9_36/tests/volume.c b/dlls/d3dx9_36/tests/volume.c index 35cd509..f3976c0 100644 --- a/dlls/d3dx9_36/tests/volume.c +++ b/dlls/d3dx9_36/tests/volume.c @@ -284,7 +284,7 @@ START_TEST(volume) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if(FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); -- 1.7.10.4

2 3

FindFirstVolume crash
by Michael Ost Dec. 14, 2012

Dec. 14, 2012

Hi list, Can someone help me get through the wineserver code for passing data through a buffer in response to an ioctl? Our (slightly out of date 1.3.24 version of) Wine is getting INVALID_HANDLE_VALUE returned for FindFirstVolume. The problem is that the FindNextVolume call inside FindFirstVolume fails because it is told there are no mount points. I have tracked the code through FindFirstVolume through NtDeviceIoControlFile to server_ioctl_file on the app side. On the wineserver side I can see the wineserver fielding the ioctl request, and mountmgr.sys filling a buffer with 5 mount points. But this information is being written into a buffer (address 0x12510) by the wineserver that is not making it back to FindNextVolume buffer (address 0x29820) on the app side. Where do these buffers come from? Do they use shared memory? Or is the info passed through a pipe? I'm having trouble making my way through the wineserver code, so any tips or pointers would be appreciated! Thank you, Michael Ost Muse Research, Inc.

2 1

Re: ole32: fix compilation with mingw32-gcc >= 4.6.0
by Marvin Dec. 14, 2012

Dec. 14, 2012

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 http://testbot.winehq.org/JobDetails.pl?Key=23392 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: [PATCH] msxml3: skip a possible BOM in doparse
by Nikolay Sivov Dec. 13, 2012

Dec. 13, 2012

Actually libxml2 is supposed to take care of that. Relevant code from xmlSwitchInputEncodingInt() : --- /* * Specific handling of the Byte Order Mark for * UTF-16 */ if ((handler->name != NULL) && (!strcmp(handler->name, "UTF-16LE") || !strcmp(handler->name, "UTF-16")) && (input->cur[0] == 0xFF) && (input->cur[1] == 0xFE)) { input->cur += 2; } if ((handler->name != NULL) && (!strcmp(handler->name, "UTF-16BE")) && (input->cur[0] == 0xFE) && (input->cur[1] == 0xFF)) { input->cur += 2; } --- So we need to figure out what's broken and where before skipping it on our side. On Fri, Dec 14, 2012 at 1:34 AM, Marcus Meissner <marcus(a)jet.franken.de>wrote: > Hi, > > Issue encountered in Corel X4 installer. (see bug 11747), > it gets a UTF16 document with BOM in front. > > trace:msxml:domdoc_load (0x131d10)->({VT_BSTR: > L"C:\\users\\marcus\\Temp\\{180A87F9-82B9-42A6-8F0E-3AC30A58AC8C}\\{5A51C731-A877-4C6E-8D51-CD16CDC46C9B}\\CorelDRAW > Graphics Suite X4 Setup Files\\Setup.xml"}) > trace:msxml:create_moniker_from_url > L"C:\\users\\marcus\\Temp\\{180A87F9-82B9-42A6-8F0E-3AC30A58AC8C}\\{5A51C731-A877-4C6E-8D51-CD16CDC46C9B}\\CorelDRAW > Graphics Suite X4 Setup Files\\Setup.xml" > trace:msxml:bind_url 0x131570 > trace:msxml:bsc_AddRef (0x138da0) ref=2 > trace:msxml:bsc_QueryInterface interface > {6d5140c1-7436-11ce-8034-00aa006009fa} not implemented > trace:msxml:bsc_QueryInterface interface > {aaa74ef9-8ee7-4659-88d9-f8c504da73cc} not implemented > trace:msxml:bsc_OnStartBinding (0x138da0)->(ff 0x13a238) > trace:msxml:bsc_QueryInterface interface > {79eac9e4-baf9-11ce-8c82-00aa004ba90b} not implemented > trace:msxml:bsc_OnDataAvailable (0x138da0)->(5 36572 0x33e908 0x33e8fc) > trace:msxml:bsc_OnStopBinding (0x138da0)->(00000000 (null)) > fixme:msxml:doparse start of xml is ffffffff fffffffe 3c 00 49 00 43 > > Bug is only fixed partially by this. > > Ciao, Marcus > --- > dlls/msxml3/domdoc.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c > index 49e6168..3504204 100644 > --- a/dlls/msxml3/domdoc.c > +++ b/dlls/msxml3/domdoc.c > @@ -486,6 +486,16 @@ static xmlDocPtr doparse(domdoc* This, char const* > ptr, int len, xmlCharEncoding > sax_serror /* serror */ > }; > > + /* UTF-16 BOM at start of data */ > + if ((len > 2) && (ptr[0] == (char)0xff) && (ptr[1] == (char)0xfe)) { > + ptr += 2; > + len -= 2; > + if (encoding == XML_CHAR_ENCODING_NONE) > + encoding = XML_CHAR_ENCODING_UTF16LE; > + else > + FIXME("Not changing xml encoding type from %d to > XML_CHAR_ENCODING_UTF16LE.\n", encoding); > + } > + > pctx = xmlCreateMemoryParserCtxt(ptr, len); > if (!pctx) > { > -- > 1.7.10.4 > > > >

1 0

Re: msvcrt: implement _ftol in msvcrt instead of forwarding to ntdll (1/2)
by Alexandre Julliard Dec. 13, 2012

Dec. 13, 2012

Austin English <austinenglish(a)gmail.com> writes: > On Wed, Dec 12, 2012 at 5:57 PM, Austin English <austinenglish(a)gmail.com> wrote: >> From the keeping Focht happy team >> >> This patch series fixes http://bugs.winehq.org/show_bug.cgi?id=13401 >> >> -- >> -Austin > > Only export the symbol on 32-bit. This should be properly integrated with the rest of the math functions. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/7] advapi32: Support service objects in GetSecurityInfo (try 4).
by Alexandre Julliard Dec. 13, 2012

Dec. 13, 2012

"Erich E. Hoover" <ehoover(a)mymail.mines.edu> writes: > + /* Test using GetSecurityInfo to obtain security information */ > + SetLastError(0xdeadbeef); > + retval = pGetSecurityInfo(svc_handle, SE_SERVICE, DACL_SECURITY_INFORMATION, &sidOwner, > + &sidGroup, &dacl, &sacl, &pSD); > + error = GetLastError(); > + LocalFree(pSD); > + ok(retval == ERROR_SUCCESS, "Expected GetSecurityInfo to succeed: result %d\n", retval); > + todo_wine ok(error == ERROR_INSUFFICIENT_BUFFER || broken(error == ERROR_SUCCESS) /* W2K3 */ > + || broken(error == ERROR_IO_PENDING) /* W2K */ || broken(error == ERROR_NONE_MAPPED) /* NT4 */, > + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", error); Testing last error on success is not useful. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/5] [WineHelp]: added basic infrastructure for a new wineconsole mode: line
by Alexandre Julliard Dec. 13, 2012

Dec. 13, 2012

Eric Pouech <eric.pouech(a)orange.fr> writes: > +/****************************************************************** > + * WCLINE_SetTitle > + * > + * Sets the title to the wine console > + */ > +static void WCLINE_SetTitle(const struct inner_data* data) > +{ > + WCHAR wbuf[256]; > + > + if (WINECON_GetConsoleTitle(data->hConIn, wbuf, sizeof(wbuf)/sizeof(WCHAR))) > + { > + char buffer[256]; > + > + WideCharToMultiByte(CP_UNIXCP, 0, wbuf, -1, buffer, sizeof(buffer), > + NULL, NULL); > + fputs("\033]2;", stdout); > + fputs(buffer, stdout); > + fputc('\a', stdout); > + fflush(stdout); > + } > +} I don't think you want to do that. You would need at least to check the terminal type, and make sure that stdout is actually going to the terminal. I'm not sure it's worth the trouble. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: msvcrt: implement _ftol in msvcrt instead of forwarding to ntdll (1/2)
by Piotr Caban Dec. 13, 2012

Dec. 13, 2012

On 12/13/12 02:57, Austin English wrote: + * Based on MSVCRT__ftol in dlls/ntdll/misc.c + */ +#if defined(__GNUC__) && defined(__i386__) +LONGLONG CDECL MSVCRT__ftol(void) +{ +@ cdecl -ret64 _ftol() MSVCRT__ftol +@ cdecl -ret64 _ftol2() MSVCRT__ftol This will not work on 64-bit build or when __GNUC__ is not defined. I don't see _ftol function in native 64-bit msvcrt, maybe it should not be exported there.

2 1

Re: [PATCH 2/4] msvcrt: Support expand_wildcards parameter in __getmainargs function
by Alexandre Julliard Dec. 13, 2012

Dec. 13, 2012

Piotr Caban <piotr(a)codeweavers.com> writes: > @@ -359,6 +360,51 @@ void msvcrt_free_args(void) > HeapFree(GetProcessHeap(), 0, MSVCRT__wenviron); > HeapFree(GetProcessHeap(), 0, MSVCRT__pgmptr); > HeapFree(GetProcessHeap(), 0, MSVCRT__wpgmptr); > + HeapFree(GetProcessHeap(), 0, argv_expand); > +} > + > +static int build_expanded_argv(int *argc, char **argv) > +{ > + int i, size=0, args_no=0; > + HANDLE h; > + > + args_no = 0; > + for(i=0; i<__wine_main_argc; i++) { > + WIN32_FIND_DATAA data; > + int len = 0; > + > + h = FindFirstFileA(__wine_main_argv[i], &data); > + if(h != INVALID_HANDLE_VALUE) { > + do { > + if(data.cFileName[0]=='.' && (data.cFileName[1]=='\0' || > + (data.cFileName[1]=='.' && data.cFileName[2]=='\0'))) > + continue; > + > + len = strlen(data.cFileName)+1; > + if(argv) { > + argv[args_no] = (char*)(argv+*argc)+size; > + memcpy(argv[args_no], data.cFileName, len*sizeof(char)); > + } That won't work if the wildcard contains a path. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] comdlg32/tests: Accept win8 failure-code
by Dmitry Timoshkov Dec. 13, 2012

Dec. 13, 2012

Detlef Riekenberg <wine.dev(a)web.de> wrote: > - ok(hr == E_FAIL, "got 0x%08x.\n", hr); > + /* win8: E_NOTIMPL */ > + ok(hr == E_FAIL || hr == E_NOTIMPL, "got 0x%08x.\n", hr); A usual form for such comparisons is ok(hr == E_FAIL || hr == E_NOTIMPL /* win8 */, "got 0x%08x.\n", hr); that helps to avoid redundant and duplicating information. -- Dmitry.

1 0

Re: [PATCH] comdlg32/tests: Accept win8 failure-code
by Nikolay Sivov Dec. 12, 2012

Dec. 12, 2012

It probably makes sense to marking old one as broken, as E_NOTIMPL sounds better in this case. This could potentially break things of course if application checks for strict equality of the error code. On Thu, Dec 13, 2012 at 8:02 AM, Detlef Riekenberg <wine.dev(a)web.de> wrote: > winetestbot crash sometimes in comdlg32:itemdlg on win7 or win2008, > but that is independant from this win8 fix. > > http://test.winehq.org/data/tests/comdlg32:itemdlg.html > > > -- > By by ... Detlef > --- > dlls/comdlg32/tests/itemdlg.c | 9 ++++++--- > 1 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c > index ce05ed8..7bffcbd 100644 > --- a/dlls/comdlg32/tests/itemdlg.c > +++ b/dlls/comdlg32/tests/itemdlg.c > @@ -278,13 +278,16 @@ static BOOL test_instantiation(void) > IShellBrowser *psb; > > hr = IServiceProvider_QueryService(psp, &SID_STopLevelBrowser, > &IID_IExplorerBrowser, (void**)&peb); > - ok(hr == E_FAIL, "got 0x%08x.\n", hr); > + /* win8: E_NOTIMPL */ > + ok(hr == E_FAIL || hr == E_NOTIMPL, "got 0x%08x.\n", hr); > if(SUCCEEDED(hr)) IExplorerBrowser_Release(peb); > hr = IServiceProvider_QueryService(psp, &SID_STopLevelBrowser, > &IID_IShellBrowser, (void**)&psb); > - ok(hr == E_FAIL, "got 0x%08x.\n", hr); > + /* win8: E_NOTIMPL */ > + ok(hr == E_FAIL || hr == E_NOTIMPL, "got 0x%08x.\n", hr); > if(SUCCEEDED(hr)) IShellBrowser_Release(psb); > hr = IServiceProvider_QueryService(psp, &SID_STopLevelBrowser, > &IID_ICommDlgBrowser, (void**)&punk); > - ok(hr == E_FAIL, "got 0x%08x.\n", hr); > + /* win8: E_NOTIMPL */ > + ok(hr == E_FAIL || hr == E_NOTIMPL, "got 0x%08x.\n", hr); > if(SUCCEEDED(hr)) IUnknown_Release(punk); > hr = IServiceProvider_QueryService(psp, > &SID_SExplorerBrowserFrame, &IID_ICommDlgBrowser, (void**)&punk); > ok(hr == S_OK, "got 0x%08x.\n", hr); > -- > 1.7.5.4 > > > >

1 0

RFC: Remove auto-scan of ALSA devices from winealsa.drv
by Joerg-Cyril.Hoehle＠t-systems.com Dec. 12, 2012

Dec. 12, 2012

Hi, Here's my proposal: winealsa shall stop enumerating ALSA devices. By default, it should solely provide access to ALSA's default device adequately named "default". The code that currently scans the registry Software\Wine\Drivers\winealsa.drv\devices=... shall remain in place, allowing a comma-separated list of alternate ALSA device names for those setups where "default" is not the preferred ALSA choice. Rationale: ALSA front-ends (pulse, dmix etc.) compete for the few back-ends (one or 2 sound cards or audio plugs). Some front-ends cling to the back ends even when unused. This has been known to cause random bugs. - Test suites failing randomly ("resource temporarily unavailable") e.g. bug #28109, #28048 or randomly performing more or less tests, depending on whether the app managed to open the device or not. - Sound stopping in apps (I believe when transitioning from intros to the main menu or game, at which time a rescan of all audio devices happens as mmdevapi is reopened). Nobody found an elegant way to robustly enumerate ALSA devices (some apps hard-wire common names...), so let's simply avoid the issue entirely. On many systems, the current code enumerates a quite uninteresting set of devices, e.g. "default", "plughw:0" and "plughw:4". These days, who wants hw:0 without mixing? I never heard any sound from "hw:4". The current code fails to enumerate some existing devices like "plug:dmix". OTOH, enumerating solely "default" or the user's hand-edited list of devices is expected to provide repeatable and best results. Cost to users: Users with a working ALSA device "default" should experience no drawback, only benefits. I believe this is the vast majority of users. Users that edit their ~/.asoundrc to define other devices without simultaneously overriding !default will have to additionally edit the Wine registry to name their working ALSA capture and render devices, e.g. "asnoop" and "amix". winecfg may or may not provide a GUI for editing this. This would be similar to most multimedia players allowing some way to change the ALSA device to use. It's a pity that the registry scheme AFAIK does not allow per-app audio settings, but that's a completely unrelated issue. Cost of non-adoption: Users and audio devs remain annoyed. Bug reports remain open. Unpredictable and erratic loss of sound possible each time mmdevapi rescans the ALSA devices. Please comment, Jörg Höhle

6 13

Announcing the Mac driver
by Ken Thomases Dec. 12, 2012

Dec. 12, 2012

Greetings Wine community, As many of you may be aware, CodeWeavers just released CrossOver 12. We're pleased to announce that CrossOver 12 includes the long-awaited Mac driver. If you're not familiar with it, the Mac driver is an alternative to Wine's X11 driver for use on Mac OS X. It allows Wine to present windows, receive input from the keyboard and mouse, and interact with system facilities like the clipboard using Cocoa and other Mac-native APIs. That allows for superior integration into the Mac UI and eliminates the need for the foreign X11 middleware. The Mac driver is not yet complete but it's pretty far along. In CrossOver 12, it's described as an "experimental" feature and is disabled by default. We're aware of chunks of functionality, both big and small, that are simply not implemented yet and there are surely many bugs in need of squashing. You can take a look at the source in CodeWeavers' usual Wine source tarball at <http://www.codeweavers.com/products/faq/source/>. The Mac driver lives in dlls/winemac.drv. Because it was under (somewhat chaotic) development right up until the release of CrossOver 12, we do not yet have a series of clean patches for it to submit to Wine. In the coming days and weeks, I will be reconstructing the Mac driver as just such a patch series and submitting it. Mind you, those patches will face the same demanding scrutiny from Alexandre as everything else, so that process may be slow and painful. I'm SO looking forward to that! Thank you to everyone who contributes to Wine for making this possible. It will be fun to work with you on continuing development of the Mac driver. Cheers, Ken

5 6

Re: wininet: Don't perform revocation checks when verifying a certificate.
by Jacek Caban Dec. 12, 2012

Dec. 12, 2012

Hi Hans, On 12/11/12 09:45, Hans Leidekker wrote: > https://testbot.winehq.org/JobDetails.pl?Key=23300 is a test which shows that > revocation checks fail for the certificate on outlook.com when passed straight > to CertVerifyRevocation. The reason is that a CRL link specified in the > certificate does not resolve. > > https://testbot.winehq.org/JobDetails.pl?Key=23301 is a test which makes > a secure connection to outlook.com from wininet and shows that this succeeds. > > My conclusion is that native wininet doesn't perform revocation checks. Your tests prove that we should relax our verification on CERT_TRUST_IS_OFFLINE_REVOCATION or something similar. To prove that revocation checks are not made, a test with truly revoked cert would be needed. Jacek

3 6

Re: [PATCH 1/3] jscript: Throw an error if return statement is in eval code
by Marvin Dec. 12, 2012

Dec. 12, 2012

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 http://testbot.winehq.org/JobDetails.pl?Key=23356 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: d3d11: add a stub dll
by Henri Verbeet Dec. 11, 2012

Dec. 11, 2012

On 11 December 2012 04:16, Austin English <austinenglish(a)gmail.com> wrote: > + * Copyright 2012 The Wine Project I don't think that kind of thing really makes sense unless you also define "The Wine Project" as some kind of legal entity somewhere. > + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); 0x%p is just wrong, and %d is at least questionable for a DWORD. I suspect this was just copied from somewhere else though.

2 1

Re: testbot: Fix the ConfigLocal.pl include path.
by Alexandre Julliard Dec. 11, 2012

Dec. 11, 2012

Francois Gouget <fgouget(a)codeweavers.com> writes: > @@ -88,12 +88,11 @@ $JobArchiveDays = 0; > if (!$::BuildEnv) > { > $::BuildEnv = 0; > - eval 'require "$::RootDir/ConfigLocal.pl";'; > + eval 'require "$::RootDir/lib/WineTestBot/ConfigLocal.pl"'; > if ($@) > { > - print STDERR "Please create a valid $::RootDir/ConfigLocal.pl, " . > - "use $::RootDir/lib/WineTestBot/ConfigLocalTemplate.pl as template\n"; > - exit; > + print STDERR "Please create a valid $::RootDir/lib/WineTestBot/ConfigLocal.pl file, use ConfigLocalTemplate.pl as template\n"; > + exit(1); I had changed it because we don't want to have local config files inside the git checkout. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 1/3] include: Define FIELD_OFFSET to the standard offsetof macro
by Michael Stefaniuc Dec. 11, 2012

Dec. 11, 2012

On 12/10/2012 07:37 PM, Amine Khaldi wrote: > This prevents the undefined behavior (null pointer dereference) > diagnostics (clang with ubsan checks for example). This is a bug in clang. There is no null pointer dereference. Afair gcc tried to pull this trick too but got educated about their error. > > --- > include/winnt.h | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/include/winnt.h b/include/winnt.h > index 207adaa..a3b996a 100644 > --- a/include/winnt.h > +++ b/include/winnt.h > @@ -746,8 +746,12 @@ typedef struct _MEMORY_BASIC_INFORMATION > > #define UNICODE_STRING_MAX_CHARS 32767 > > +#if defined(__GNUC__) || defined(__clang__) > +#define FIELD_OFFSET(type, field) offsetof(type, field) > +#else > #define FIELD_OFFSET(type, field) \ > ((LONG)(INT_PTR)&(((type *)0)->field)) > +#endif > > #define CONTAINING_RECORD(address, type, field) \ > ((type *)((PCHAR)(address) - (PCHAR)(&((type *)0)->field))) bye michael

2 2