Henri Verbeet has expressed his doubts that the Gallium statetracker will be acceptable upstream. Accordingly I don't think we can accept it into Staging.

Some observation after a brief look at the patches.

* The patches aren't broken up into a manageable chucks.

* There is a ntdll change, without any comment as to why it needed, which affects *all* of wine.

* IDirect3D9Ex structure is defined and yet the structure is full of casts.
  - Indicates to me, that something isn't quite right.
....
+    (void *)d3dadapter9_QueryInterface,

* The use of the memory helper functions would be nice.

* The IDirect3DShaderValidator9/ID3DPresentGroup aren't documented anywhere, how were these worked out?
  - In either case, they should be an in an internal IDL, so that proper structures are created.
  - Are these interfaces really needed?

* It's unrealistic to expect everyone to install these libraries just for nine support which they might never use.

* In it's current form, the effort to maintain this patchset is too high and wont be accepted upstream easily.

Thinks to consider.
* Can any of the changes be broken up and merged upstream?
* Break the patch up into multiple well defined changes.


I'm not completely against having Proof on Concept patches in staging however this needs more work.

The greater concern, as Henri gives it, is that the approach of directly replacing d3d9.dll isn't what we architecturally want upstream.

https://github.com/wine-compholio/wine-staging/pull/333
AFAIK the original PR to staging was way more "compartmented" than those quick patches. 

And at the end of the day, iirc a separate dll was also totally proposed and all. 
But I'll leave the two direct concerned people discuss with you new maintainers.

What kind of approach would be the right one then, perhaps similar to what upstream might be planning to do with bug 46506, comment 1 ?

(In reply to mirh from comment #5)
> What kind of approach would be the right one then, perhaps similar to what
> upstream might be planning to do with bug 46506, comment 1 ?

If you are interested in merging the patches into Staging, Alistair has given some recommendations in comment 2.

If you are interested in merging the patches into upstream Wine, I would recommend that the Nine developers converse with Henri Verbeet about what kind of design the project should take.

As a gallium nine developper it is my understanding the plan is to not merge nine, which is why we worked on making it simpler to install on top of an already existing installation.

We have in our repo several wine version with our patches applied,
and with work such as:
https://github.com/dhewg/nine/

You can compile support for any wine installed on your system.


Note that the wine staging patch live in a separate space, we don't have any ntdll patch. In fact we don't patch wine anywhere since you can run on top of any precompiled wine.


As for IDirect3DShaderValidator9, while recent windows dlls are ok when it isn't implemented, we found The Sims2 requires it. We don't have any doc about what it should do so it is a shot in the dark to please The Sims2, while making everything else still work.


We already discussed with Henri on the mailing list. There is one place where we kinda require using an undocumented winex11 dll function to get the X drawable associated to a HWND. It would be better to have a proper documented function for that, but Henri instead suggested to have our presentation code live in winex11. Unfortunately the proposal requested some changes to our presentation code that are a no go for us, as it would have meant removing a lot of features, but would have simplified the interface. Henri suggested the maintainer of winex11 to discuss with us instead but we never got any reply from any of them.