March 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

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 18, 2013

June 18, 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

Wine automated testing update
by Jeremy White Aug. 6, 2012

Aug. 6, 2012

Hi Folks, At the last Wine conference, I volunteered to find a home for the WineTestBot that Ge's brother has been hosting, and to take over the Buildbot that Dan and Austin have been so diligently maintaining. This is an update on that project, mostly to help keep my procrastinating self moving it along. First, we have a lovely set of hardware; 4 servers, in a dedicated rack, with a dedicated static ip to the outside world. One server is the gateway, 2 are dedicated Linux test systems (with nice fast processor + gpus), and one is a beefy system capable of running many VMs. The plan was to move the existing VMWare based WineTestBot to this hardware and simply get the existing system up and running on the new hardware. Here we hit our first snag; the VMWare folks are not willing to provide a permanent license for VMWare to us. So, we've shifted gears, and are exploring whether something like qemu + kvm would be a sufficient alternate. I've done a little of this work, and Maarten is hopefully going to help me try converting the existing VMs to see if we can save any hassle by doing a conversion. In parallel, I learned a great deal about buildbot and the buildbot system that Dan has built. There are two especially valuable and useful functions provided by this buildbot: the first is essentially a patch watcher; a process that catches simple mistakes (e.g. build errors on different architectures, and so on). The second is more powerful and is encapsulated by the 'dotests.sh' shell script. The dotests.sh script does a good job of basically running make test and noticing any test failures outside of 'the usual ones'. There is an infrastructure for Buildbot is a good tool, and I invested a lot of energy into it (as have Dan and Austin). However, Alexandre has persuaded me that we should first explore integrating the dotest.sh functionality into the existing WineTestBot, as that would allow us to have a very simple clean web page, and would also allow us to integrate most cleanly with Alexandre's back end tools. Of course, WineTestBot is Perl code, and my Perl fu is low. So I have recently asked Francois to help with that effort as well. So the basic plan is as follows: 1. Test qemu/kvm with a few Windows versions to see if it'll work. 2. If so, modify WineTestBot to use qemu instead of vmware. (This is 'easy' because the WineTestBot code nicely isolates the VM functions, but 'hard', because VMWare provides some APIs that may have to be replicated). 3. Migrate WineTestBot to the new hardware stack 4. Write new code to run 'dotests.sh' as part of WineTestBot Cheers, Jeremy

9 11

Rethinking WineConf
by Jeremy White July 26, 2012

July 26, 2012

Hi All, This past Wine conference, while great fun as always, was not as well attended as Wine conferences in the past. So I would like to stir up trouble by suggesting we rethink WineConf. For those that have not attended, the Wine conference has been a mostly annual affair since 2002. It is open to all, but is advertised as being aimed at Wine developers. About 35 people attend each year. It's been in Minnesota about every 3rd year, and is otherwise 'normally' somewhere in Europe. I see the primary goal as creating human bonds between otherwise anonymous people (aka going to the pub). It's a bonus if it also spurs resolution to tricky issues, or motivates people to get more done. So I'd like to ask folks to brain storm with me. How could Wineconf be different? If you've never been, what would encourage you to come? If you've been to a technical conference recently that you thought was well done, what did they do well? Anything we could emulate? Any other ideas, or suggestions? Cheers, Jeremy

17 25

Re: mshtml: Set outgoing pass-by-address variable in an error case case within confirm_safety_load.
by Jacek Caban July 18, 2012

July 18, 2012

Hi Gerald, On 03/07/12 23:35, Gerald Pfeifer wrote: > I noticed we return in this case, without initializing this variable. > Visual inspection indicates we do not seem to access the variable in > this error case, but a) better safe than sorry, and b) GCC 4.8 currently > warns about it. > > Not sure URLPOLICY_DISALLOW is the best return value, open for better > alternatives. I generally don't think this patch makes things any better (or worse). If we return an error, the caller should not expect this value to be sane. What's the GCC 4.8 warning? Jacek

2 4

Updating GSoC proposal
by Jacek Caban April 19, 2012

April 19, 2012

Hi all, GSoC is starting this year and, if we want to have good applications, we need to update our proposals. Usually the most attention is directed into adding new ones, while we keep obviously bad (or just bad IMO) proposals on the page. I'm planning to remove following project proposals: Security - implement sandboxing Theming - Implement Wine theming support NTDLL - support performance registry keys Winelib Aware Scons (or cmake) Cleanup Winemenubuilder to support generating Application Bundles on Mac OS X Wine-based application virtualization If someone knows a reason to not remove them, please reply. Cheers, Jacek

2 1

'Pending' patches state
by Dmitry Timoshkov April 10, 2012

April 10, 2012

Hello, http://source.winehq.org/patches has the following legend for the Pending patch status: Pending * The patch is not obviously correct at first glance. Making a more convincing argument, preferably in the form of a test case, may help. * Waiting for feedback from the main developer in that area. It's very confusing, and absolutely not clear what is required from the patch submitter, especially since *there is no any feedback on the patch*. 'Rejected' at least requies some sort of feedback, while 'Pending' doesn't. To me 'Pending' looks like a silent case of 'Reject', but without any obligation to explain why. I find myself on somewhat shaky ground when I see a bunch of my patches in the pending state, especially if they already contain the tests and main developer in the area I'm changing is Alexandre :). Is it possible to get at least some feedback for pending patches? Pretty please? -- Dmitry.

6 13

RFC: KUSER_SHARED_DATA update patch to fix bug 29168
by Joey Yandle April 10, 2012

April 10, 2012

Hi everybody, As originally discovered by Carsten Juttner, Star Wars: The Old Republic uses the time values in KUSER_SHARED_DATA to trigger network send buffers. wine does not currently update these values, so TOR does not make it past an initial server handshake. I'm attaching my current patch which fixes this. It updates the values every 15600000 nanoseconds as does Windows 7, and presumably all Windows versions. The words of the timers are written in the correct order for applications to detect clock tick. It uses a separate thread which does nothing else; a previous attempt at an NtTimer based solution did not work, presumably due to irregularity in the exact callback times. Attempts at setting thread priority were also abandoned after many people were unable to run the code. The patch does not check the return code of nanosleep; I could add code to nanosleep again for the remaining time in the case of an interrupt, but didn't think it was necessary. I could also change it to use clock_nanosleep, which would allow for more absolute timing. Please let me know what you think. cheers, Joey

9 34

Re: wined3d: Added PCI device IDs for AMD Radeon 6750M & 6770M
by Henri Verbeet April 2, 2012

April 2, 2012

On 31 March 2012 21:20, Gaurav Jain <gaurav(a)gauravjain.org> wrote: > CARD_AMD_RADEON_HD6600M = 0x6741, > + CARD_AMD_RADEON_HD6750M = 0x6741, If those are actually supposed to be the same, I don't think there's much of a point in this patch.

2 6

Re: [PATCH] wined3d: When releasing resources, don't perform any other operations on device if it has been released.
by Henri Verbeet April 2, 2012

April 2, 2012

This looks wrong. Is there a legitimate way that this can happen?

2 3

Wine test bot and win16 exe
by Christian Costa April 1, 2012

April 1, 2012

Hi, I wrote a win16 exe test file using open watcom but I cannot submit it to winebot. I fails saying "Unricognized file type". This is a little annoying. Is this a known limitation of wine test bot ? Thanks Christian

2 1

Re: [2/2] gdi32: Simplify font cache. (try 2)
by Alexandre Julliard April 1, 2012

April 1, 2012

Kusanagi Kouichi <slash(a)ac.auone-net.jp> writes: > @@ -1516,23 +1464,8 @@ static void add_face_to_cache(Face *face) > RegSetValueExW(hkey_face, face_full_name_value, 0, REG_SZ, (BYTE*)face->FullName, > (strlenW(face->FullName) + 1) * sizeof(WCHAR)); > > - reg_save_dword(hkey_face, face_index_value, face->face_index); > - reg_save_dword(hkey_face, face_italic_value, (face->ntmFlags & NTM_ITALIC) != 0); > - reg_save_dword(hkey_face, face_bold_value, (face->ntmFlags & NTM_BOLD) != 0); > - reg_save_dword(hkey_face, face_version_value, face->font_version); > - reg_save_dword(hkey_face, face_external_value, face->external); > - > - RegSetValueExW(hkey_face, face_font_sig_value, 0, REG_BINARY, (BYTE*)&face->fs, sizeof(face->fs)); > + RegSetValueExW(hkey_face, face_value, 0, REG_BINARY, (BYTE*)face, sizeof *face); I don't think that's a good idea. There are many things in the structure that don't make sense to have in the registry. Also this won't work on 64-bit. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: msi: add support for MSIRUNMODE_REBOOTNOW in MsiGetMode
by Hans Leidekker March 31, 2012

March 31, 2012

On Fri, 2012-03-30 at 17:27 -0700, Austin English wrote: > + case MSIRUNMODE_REBOOTNOW: > + r = package->need_reboot; > + break; > + MSIRUNMODE_REBOOTNOW and MSIRUNMODE_REBOOTATEND are not the same thing.

2 1

Re: quartz: update ICOM_THIS_MULTI to follow the new COM standard
by Jacek Caban March 31, 2012

March 31, 2012

On 03/30/12 17:55, Aric Stewart wrote: > diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h > index 35cd52b..d2f680c 100644 > --- a/dlls/quartz/quartz_private.h > +++ b/dlls/quartz/quartz_private.h > @@ -38,7 +38,7 @@ > #define BYTES_FROM_MEDIATIME(time) SEC_FROM_MEDIATIME(time) > #define MSEC_FROM_MEDIATIME(time) ((time) / 10000) > > -#define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) > +#define ICOM_THIS_MULTI(impl,field,iface) impl* const This=CONTAINING_RECORD(iface, impl, field) These should disappear once the clean up of affected code is done. Cheers, Jacek

3 5

Re: Wine release 1.5.1
by mike＠yurick.ca March 30, 2012

March 30, 2012

I am no longer using this e-mail. Please contact me for my new e-mail address. Thank you, Mike

1 0

Re: jscript: Fixed jsheap_grow implementation
by Marvin March 30, 2012

March 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=17589 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

[PATCH 3/3] dmsynth: Put port caps that match native ones.
by Joerg-Cyril.Hoehle＠t-systems.com March 30, 2012

March 30, 2012

Hi, Andrew Eikum asked Christian Costa: >Just to be clear, which "native" do you mean? Does this match Windows >7's dmusic behavior, or something else? I've been trying to target >Windows 7's behavior in the new audio design. A w7 target makes a lot of sense for mmdevapi/WASAPI. However, isn't DMusic a thing of the past? In that case, I argue that DSound and DMusic should target the "best in class" native OS of the time where apps were written using these APIs, because the app writers "optimized" their apps to the behaviour they could observe. Wouldn't "best in class" mean XP for DSound/DMusic? For similar reasons, the MCI should mimic w9x(/wxp) behaviour, because that's what was available when apps using the MCI were developed. I prefer to hear "thank you guys, app X works like a charm in Wine like it worked on my rusty w98 and later xp box, whereas it refuses to run on w7" rather than "you guys do a great job of making my app X worked as badly in Wine as in w7 :-( whereas it used to work fine on my w98/xp machine". Actually, there are quite a few AppDB comments like the first one. One reason might be that the dlls those app use were added to Wine at a time where the target OS was w9x or xp, whereas if they were written now, targeting w7, the old app would not work in Wine either. A related topic is: we have no idea what the "set compatibility for wXY" checkbox in w7 does. Recently, I discovered that "Age of Empires II - Conquerors" only plays videos on a w7 machine when you set w7 to xp compatibility. Why? The rest of the app seems to work (except for the purple grass issue, which requires a particular DirectDraw compatibility registry entry in w7). Did AoE target w7 when it was written? Obviously not. Regards, Jörg Höhle

2 1

Re: jscript: Add VT_I2 support (try 2)
by Jacek Caban March 30, 2012

March 30, 2012

Hi Alistair, On 03/30/12 12:29, Alistair Leslie-Hughes wrote: > Hi, > > > Changelog: > jscript: Add VT_I2 support > hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, dp, retv, &ei->ei, &ctx->jscaller->IServiceProvider_iface); + if(SUCCEEDED(hres) && retv) + { + if(V_VT(retv) == VT_I2) + VariantChangeType(retv, retv, 0, VT_I4); + } Since the conversion here is trivial, why not do it directly? --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -191,6 +191,10 @@ HRESULT to_primitive(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret case VT_R8: *ret = *v; break; + case VT_I2: + V_VT(ret) = VT_I4; + V_I4(ret) = V_I2(v); + break; I thought the findings we've discussed off-list was that internal values should never be of VT_I2 types, so this should never happen. If it's not the case, I'd like to see a test case. +function TestVT_I2() +{ + varI2 = GetShort(); + num3 = 3 + + ok(getVT(varI2) === "VT_I4", "getVT(varI2) = " + getVT(varI2)); Please include getVT(GetShort()) test I've showed you. This eliminates a lot of flow of value. + if(!strcmp_wa(bstrName, "GetShort")) { + *pid = DISPID_GLOBAL_SHORT; + return S_OK; + } Please follow JavaScript names convention (this should be getShort). Cheers, Jacek

1 0

Re: [2/2] scrrun: Add scrrun tests (try 3)
by Marvin March 30, 2012

March 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=17581 Your paranoid android. === WINEBUILD (build) === Make failed

1 0