wine-devel August 2013

wine-devel@winehq.org

74 participants
203 discussions

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

22 Nov '20

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 28 Sep '18

28 Sep '18

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 14 Jun '18

14 Jun '18

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 16 Jun '16

16 Jun '16

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 05 Jul '15

05 Jul '15

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 23 Aug '14

23 Aug '14

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 02 Aug '14

02 Aug '14

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

Re: Raise the minimum version of FreeBSD to 8.0.
by Frédéric Delanoy 27 Oct '13

27 Oct '13

On Sun, Mar 3, 2013 at 12:22 AM, Gerald Pfeifer <gerald(a)pfeifer.com> wrote: > We've had this as a requirement in the FreeBSD ports for quite a > while (and the Wiki describes some background). > > Gerald > --- > - FreeBSD 7.0 or later > + FreeBSD 8.0 or later > ... > FreeBSD info: > - Wine will generally not work properly on versions before FreeBSD 7.0. > + Wine will generally not work properly on versions before FreeBSD 8.0. You should also change the version in the various README.xx translations (in 'documentation' directory). Frédéric

3 2

winspool: ERROR_INVALID_NAME in GetDefaultPrinter() ?
by Detlef Riekenberg 09 Oct '13

09 Oct '13

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

winemac.drv: add fullscreen mode support for Mac OS X 10.7+
by Kevin Eaves 08 Oct '13

08 Oct '13

Attached patch is a proof-of-concept for the fullscreen APIs provided in OS X 10.7+, which allows applications to enter fullscreen in a separate desktop space. The fullscreen button appears if a main window is resizable. Basically this feature is the zoom button on crack. It doesn't actually go fullscreen 'natively' but simply resizes the window fullscreen, and automatically moves it to its own space. As far as Wine is concerned the window resized — just like clicking the zoom button and manually assigning the window to its own space. I doubled the MaxTrackSize in user32/winpos.c, but it only needs +15 for the height.

2 2

Wine Gecko 2.24-beta1
by Jacek Caban 25 Sep '13

25 Sep '13

Hi all, It's time to do another update of Wine Gecko, so I prepared a new beta build. It's already on Sourceforge [1]. Until server-side support for auto install of the package is committed [2], its manual installation is required [3]. I attached a patch to Wine that is required for the new Gecko. Anything that uses MSHTML is worth testing. All help with testing is appreciated! Cheers, Jacek [1] https://sourceforge.net/projects/wine/files/Wine%20Gecko/2.24-beta1/ [2] http://source.winehq.org/patches/data/97881 [3] http://wiki.winehq.org/Gecko

2 2

Embedding a HWND window into an X11 window
by Alexandre Bique 10 Sep '13

10 Sep '13

Hi, How could I embed a HWND window created with CreateWindow() into an X11 window? Thanks! :-) -- Alexandre Bique

5 8

Re: gdi32: Fixed Rectangle() rotation problem with GM_ADVANCED graphics mode.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Ralf Habacker <ralf(a)habacker.de> writes: > see http://bugs.winehq.org/show_bug.cgi?id=34381 > --- > dlls/gdi32/painting.c | 18 ++++++++++++++++-- > 1 Datei geändert, 16 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) This would have to be done in the drivers. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: iphlpapi: Add AllocateAndGetTcpExTableFromStack().
by Bruno Jesus 31 Aug '13

31 Aug '13

On Sat, Aug 31, 2013 at 9:16 AM, Ralf Habacker <ralf.habacker(a)freenet.de> wrote: > new > - add doc for family parameter > - add doc for additional return code > - sorting in c file fixed > > Signed-off-by: Ralf Habacker <ralf.habacker(a)freenet.de> I guess the patch was marked as pending because you didn't add any tests. You are also missing the (try X) at the end of the subject. Regards, Bruno

1 0

Re: [PATCH 3/3] ws2_32: Implement get socket option SO_PROTOCOL_INFO
by Marvin 31 Aug '13

31 Aug '13

1 0

Re: [PATCH] widl: Limit recursion deepth within structs to 1 for checking for full-pointers.
by Paul Chitescu 30 Aug '13

30 Aug '13

Hi! It would help to attach the patch, not your editor's swap file. Paul On Friday 30 August 2013 10:57:26 pm Kai Tietz wrote: > Hello, > > attached patch limits recursion in type_has_full_pointer-function to a > deeth of 1. By this all necessary checks should be possible, but > endless-recursion due diamond/cycle type-declarations are avoided. > I was finding this issue by working on propidl.idl rework, and hit > such an endless recursion. > > Regards, > Kai

2 1

Re: [PATCH 5/5] wined3d: Enforce volume texture block restrictions
by Henri Verbeet 30 Aug '13

30 Aug '13

On 30 August 2013 00:19, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > + if (format->flags & WINED3DFMT_FLAG_BLOCKS) > + { > + UINT width_mask = format->block_width - 1; > + UINT height_mask = format->block_height - 1; > + if (desc->width & width_mask || desc->height & height_mask) > + { > + WARN("(%p) : Texture cannot be created - width or height not block size aligned.\n", texture); > + return WINED3DERR_INVALIDCALL; > + } > + } > + Is this different from surfaces? IIRC surfaces are padded up to the next multiple of the block size, although I may have that wrong. Not a fan of the "(%p) : " trace formatting.

2 3

Re: [PATCH 3/5] d3d9/tests: Add a DXT5 volume test
by Henri Verbeet 30 Aug '13

30 Aug '13

On 30 August 2013 00:19, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > + /* A 8x4x2 texture consisting of 4 4x4 blocks. The colors of the blocks are red, green, blue and white. */ > + 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0x00, 0xF8, 0x00, 0x00, 0x00, 0x00, > + 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x07, 0xE0, 0x07, 0x00, 0x00, 0x00, 0x00, > + 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00 In general we're using lower-case hex in wined3d, but I think it should at least be consistent within the same test.

2 1

Sequences in a loop
by matyapiro31 30 Aug '13

30 Aug '13

I found many wine sources use not a pointer,but a sequence . for example: krnl386.exe16/dma.c: for(i=0,p=(char*)DMA_CurrentBaseAddress[channel];i<ret*size;i++) msdaps/usrmarshal.c: for(prop = 0; prop < rgPropertySets[prop_set].cProperties; prop++) I know in some cases to use sequences are wiser way than pointers, but so many of them are used in loops. Should I change them?

3 2

Help to create a server request
by Bruno Jesus 30 Aug '13

30 Aug '13

Hi all, I need some help to continue my current wine work. In order to implement SO_PROTOCOL_INFO for getsockopt I need to retrieve some information from the socket like its family and protocol. I have searched for a few days and ended up with a solution I dislike so I had a better idea (at least I hope I did). Instead of using non-portable SO_DOMAIN and SO_PROTOCOL/SO_PROTOTYPE to retrieve the socket family and protocol or using non-reliable guessing using only the socket type I thought it would be better to ask the server for this information. Using a request just like is used for several other information in ws2_32 (operation which will work on every OS). So, all I need is a server request that based on the socket fd will return the socket family, type and protocol. I tried to understand how requests work but I failed completely. Maybe this request can be later improved to return the connection time so we can finally fix SO_CONNECT_TIME option. The current solution is attached, since I sent the tests separated and they were commited the patch will not apply, it's only for reference. The idea is to remove the functions get_sock_[family|protocol|type] to a single server request. So, is this a good idea? If yes, how can I create and use the request? If not I'm all ears. Best wishes and thanks in advance, Bruno

2 2

Re: oleaut32: Add ICreateTypeInfo2::SetVarName implementation
by Nikolay Sivov 30 Aug '13

30 Aug '13

On 8/30/2013 16:28, Piotr Caban wrote: > --- > dlls/oleaut32/tests/typelib.c | 13 +++++++++++-- > dlls/oleaut32/typelib.c | 13 +++++++++++-- > 2 files changed, 22 insertions(+), 4 deletions(-) > > > > ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); > - FIXME("%p %u %s - stub\n", This, index, wine_dbgstr_w(name)); > - return E_NOTIMPL; > + > + FIXME("%p %u %s\n", This, index, wine_dbgstr_w(name)); > + It probably should be TRACE.

1 0

Re: ntdll: Store full line status register in the internal structure, not just the TIOCSER_TEMT bit. Take 2.
by Alexandre Julliard 30 Aug '13

30 Aug '13

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > Printing complete lsr value in the log may help with diagnosing > test failures on Alexandre's machine. I don't see how, since TIOCSER_TEMT is the only defined bit. Do you actually have a driver that returns other status? -- Alexandre Julliard julliard(a)winehq.org

2 4

Re: kernel32/tests: Add a FlushFileBuffers test for a COM port. Resend.
by Marvin 30 Aug '13

30 Aug '13

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://newtestbot.winehq.org/JobDetails.pl?Key=1932 Your paranoid android. === wxppro (32 bit comm) === comm.c:849: Test failed: WaitCommEvent failed with a timeout comm.c:861: Test failed: WaitCommEvent error 997 comm.c:863: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:867: WaitCommEvent for EV_TXEMPTY took 1000 ms (timeout 1000) comm.c:869: Test failed: WaitCommEvent used 1000 ms for waiting

1 0

Re: d3d9: Partial implementation of IDirect3DSwapChain9Ex
by Stefan Dösinger 30 Aug '13

30 Aug '13

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Am 2013-08-30 10:19, schrieb Michael Müller: > This patch implements the IDirect3DSwapChain9Ex interface as an > extension of IDirect3DSwapChain9 and thus fixes bug 34252 - > "Silverlight accelerated graphics cause a D3D critical section > lockup" since Silverlight does no longer try to create a Direct3D > context in an endless loop. The functions > d3d9_swapchain_GetLastPresentCount and > d3d9_swapchain_GetPresentStatistics are just stubs so far. Good work on finding out what causes that bug! > - if (IsEqualGUID(riid, &IID_IDirect3DSwapChain9) + if > (IsEqualGUID(riid, &IID_IDirect3DSwapChain9) || IsEqualGUID(riid, > &IID_IDirect3DSwapChain9Ex) || IsEqualGUID(riid, &IID_IUnknown)) For IDirect3D9Ex and IDirect3DDevice9Ex, the Ex versions are only available if IDirect3D9 was created with the extended method. I suspect swapchains are the same. Please write some tests for this. > + TRACE("iface %p, pLastPresentCount %p.\n", iface, pLastPresentCount); > + WARN("not implemented.\n"); If a function is not implemented we write a FIXME, e.g. FIXME("iface %p, pLastPresentCount %p, stub!\n", iface, pLastPresentCount); If this causes too much spam on the console, you can use a static variable to print it just once. > + if (SUCCEEDED(hr)) + { + if(pMode){ Please use a code style that is consistent with the rest of the file. Tbh the existing files aren't as consistent as we'd like. The general rule is a space between if and (, and { in newlines. 4 spaces intendation. If there's a one-line statement in an if, put that statement in a new line and don't write curly brackets. My personal opinion, and the style I use, is to use brackets for both branches of an if-else if one of those branches has more than one line. > - * IDirect3DSwapChain9 interface + * IDirect3DSwapChain9(Ex) > interface */ #define INTERFACE IDirect3DSwapChain9 > DECLARE_INTERFACE_(IDirect3DSwapChain9,IUnknown) You have to create a new interface declaration named IDirect3DSwapChain9Ex with all the methods and the invocation macros. The header change should go in a separate patch. The d3d9 code should be changed to always use IDirect3D9Swapchain9Ex, like it does for device and direct3d. Thanks for your work! Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJSIFimAAoJEN0/YqbEcdMwbW0P/jC/gsziWzCtxBH1gDETnX6+ j0csX5cORWKCaq/wsPbT9ZDVV/OYFYlWRB0QZiJIUWAp4PzdGXCxQN8srdybT1hp PG3HTDzv4Kmq57fYSXEoLnZNO/pgfr4JiGmhcwQSyheJ1+lcb5Z/GE09goHwcLce CJVrIQu9f05TQb+r0BJCxIyGAIuq8to7xdIJ1tPR2MmKwYzS0XWkB1yN8QIGy/Qm z4aH7JGsOJ37t/90D4eHVBX6EtiI6pRHHiaO3hFrgYiu7wf/CeiE3E9QWnwycG1h DdPWjreQx+6/JQfg71eXDW81WYgdRl7TfMfBOc8UFh7Byj9b4llR0E+NFSkQ81NL XAQkB/PthmEpJIH1tSo91aNrZkfN/jw7D1gA4kUHFEtr5n1yuUXQQvKLYEOMWrV0 lV1plnzzLEZa50c0Y3/zCgQFCbzgo47ohO/4msMHOU33n255oJg/Bd6CLoA1oPFq hxQkkv0bW5VL6Jn0WVAC1FPjfmRF6zD6h9n8KKPWU2rz/tmkoEhoJ0Nd2a483N86 6EvOTpecczmNBlICFvyUOVAisHnVdwk+cPI+6hoqHBq0C7fGXi7R41pDOvf4o1yH wZyMH4e+kiG+7qaeGRwsTEDW1V77VAbPXJkNZPU2Wvb/gVzLU1TVQ87Bz5T83tpv tFvZjJrjOYO4qL4Afm14 =zjgo -----END PGP SIGNATURE-----

1 0

Re: d3d9: Partial implementation of IDirect3DSwapChain9Ex
by Nikolay Sivov 30 Aug '13

30 Aug '13

On 8/30/2013 12:19, Michael Müller wrote: > This patch implements the IDirect3DSwapChain9Ex interface as an > extension of IDirect3DSwapChain9 and thus fixes bug 34252 - "Silverlight > accelerated graphics cause a D3D critical section lockup" since > Silverlight does no longer try to create a Direct3D context in an > endless loop. The functions d3d9_swapchain_GetLastPresentCount and > d3d9_swapchain_GetPresentStatistics are just stubs so far. > > > --- > dlls/d3d9/swapchain.c | 71 > ++++++++++++++++++++++++++++++++++++++++++++++++- > include/d3d9.h | 14 +++++++++- > include/d3d9types.h | 8 ++++++ > 3 files changed, 91 insertions(+), 2 deletions(-) > > @@ -34,7 +34,7 @@ static HRESULT WINAPI d3d9_swapchain_QueryInterface(IDirect3DSwapChain9 *iface, > { > TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); > > - if (IsEqualGUID(riid, &IID_IDirect3DSwapChain9) > + if (IsEqualGUID(riid, &IID_IDirect3DSwapChain9) || IsEqualGUID(riid, &IID_IDirect3DSwapChain9Ex) > || IsEqualGUID(riid, &IID_IUnknown)) > { > IDirect3DSwapChain9_AddRef(iface); > @@ -221,12 +221,76 @@ static HRESULT WINAPI d3d9_swapchain_GetPresentParameters(IDirect3DSwapChain9 *i > return D3D_OK; > } I don't know if d3d9 is special in this regard, but this is a wrong way to implement derived interface. You need you make everything IDirect3DSwapChain9Ex, for example this one: > /***************************************************************************** > - * IDirect3DSwapChain9 interface > + * IDirect3DSwapChain9(Ex) interface > */ > #define INTERFACE IDirect3DSwapChain9 > DECLARE_INTERFACE_(IDirect3DSwapChain9,IUnknown) > @@ -405,6 +405,10 @@ DECLARE_INTERFACE_(IDirect3DSwapChain9,IUnknown) > STDMETHOD(GetDisplayMode)(THIS_ D3DDISPLAYMODE* pMode) PURE; > STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9** ppDevice) PURE; > STDMETHOD(GetPresentParameters)(THIS_ D3DPRESENT_PARAMETERS* pPresentationParameters) PURE; > + /*** IDirect3DSwapChain9Ex methods ***/ > + STDMETHOD(GetLastPresentCount)(THIS_ UINT* pLastPresentCount) PURE; > + STDMETHOD(GetPresentStats)(THIS_ D3DPRESENTSTATS* pPresentationStatistics) PURE; > + STDMETHOD(GetDisplayModeEx)(THIS_ D3DDISPLAYMODEEX* pMode,D3DDISPLAYROTATION* pRotation) PURE; > }; > #undef INTERFACE is no longer just IDirect3DSwapChain9. This will fix vtbl type too.

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel August 2013