Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup dll loader / posix win32 emulation functions. #8798

Merged
merged 13 commits into from Apr 4, 2016

Conversation

@notspiff
Copy link
Contributor

notspiff commented Jan 7, 2016

This is a contribution towards cleaning up the mess that is xbmc/linux and (parts of) xbmc/cores/DllLoader.

  • remove hresult style code from generic code (also removes mixing of errno and hresult codes).
  • remove unused utilities from the win32 emu code
  • remove the includes of these from platformincludes. this makes it much easier to track where these things are actually used, and reduces compilation unit sizes (latter probably only of academic interest).

due to the header changes, i fully expect this to (trivially) break on osx and droid. jenkins will light the way.

@notspiff notspiff changed the title Cleanup dll loader / posix win32 emulation function. Cleanup dll loader / posix win32 emulation functions. Jan 7, 2016
@fritsch

This comment has been minimized.

Copy link
Member

fritsch commented Jan 7, 2016

jenkins build this please

@Paxxi

This comment has been minimized.

Copy link
Member

Paxxi commented Jan 7, 2016

Highly approved

@MartijnKaijser

This comment has been minimized.

Copy link
Member

MartijnKaijser commented Feb 20, 2016

Could you rebase? Thx

@notspiff notspiff force-pushed the notspiff:prune_emu branch from 35678e5 to bb828dc Feb 22, 2016
@notspiff

This comment has been minimized.

Copy link
Contributor Author

notspiff commented Feb 22, 2016

done.

@wsnipex

This comment has been minimized.

Copy link
Member

wsnipex commented Feb 22, 2016

jenkins build this please

@MartijnKaijser

This comment has been minimized.

Copy link
Member

MartijnKaijser commented Feb 22, 2016

seems only win32 is happy

@notspiff notspiff force-pushed the notspiff:prune_emu branch from bb828dc to 5e0ec02 Feb 22, 2016
@notspiff

This comment has been minimized.

Copy link
Contributor Author

notspiff commented Feb 22, 2016

try now.

On Mon, Feb 22, 2016 at 11:13 AM, Martijn Kaijser notifications@github.com
wrote:

seems only win32 is happy


Reply to this email directly or view it on GitHub
#8798 (comment).

@MartijnKaijser

This comment has been minimized.

Copy link
Member

MartijnKaijser commented Feb 22, 2016

jenkins build this please

@notspiff notspiff force-pushed the notspiff:prune_emu branch from 5e0ec02 to eca596d Feb 22, 2016
@notspiff

This comment has been minimized.

Copy link
Contributor Author

notspiff commented Feb 22, 2016

one more round. travis doesn't catch it all it seems.

On Mon, Feb 22, 2016 at 11:20 AM, Martijn Kaijser notifications@github.com
wrote:

jenkins build this please


Reply to this email directly or view it on GitHub
#8798 (comment).

@MartijnKaijser

This comment has been minimized.

Copy link
Member

MartijnKaijser commented Feb 22, 2016

jenkins build this please

@akva2

This comment has been minimized.

Copy link
Contributor

akva2 commented Feb 22, 2016

two failures; the osx one is trivial, can someone on osx replace with PosixFile/Directory usage ?

the rbpi one i asked @popcornmix for some help/info on but he hasn't gotten back to me on it yet.

@popcornmix

This comment has been minimized.

Copy link
Member

popcornmix commented Mar 30, 2016

@akva2 I did comment on IRC but I suspect you missed it.
Can we just move the WAVEFORMATEXTENSIBLE structure into OMXAudio.h?

@notspiff

This comment has been minimized.

Copy link
Contributor Author

notspiff commented Mar 30, 2016

right. yeah, that's the fallback solution. will do so.

@notspiff notspiff force-pushed the notspiff:prune_emu branch from eca596d to 5ed417f Apr 2, 2016
@akva2

This comment has been minimized.

Copy link
Contributor

akva2 commented Apr 2, 2016

somebody kick off jenkins please.

@Memphiz could you please look at the osx thingie? logs are gone now but it's pretty trivial. somewhere in the osx specific code CreateFile / WriteFile is used. this pr removes those wrapper functions so we need to use CPosixFile instead.

@notspiff notspiff force-pushed the notspiff:prune_emu branch from 5ed417f to a817705 Apr 2, 2016
@FernetMenta

This comment has been minimized.

Copy link
Member

FernetMenta commented Apr 2, 2016

jenkins build this please

@Memphiz

This comment has been minimized.

Copy link
Member

Memphiz commented Apr 2, 2016

somebody handled it already?

@akva2

This comment has been minimized.

Copy link
Contributor

akva2 commented Apr 2, 2016

No it was to get you the logs plus check the rbp part

-------- Opprinnelig melding --------
Fra: Memphiz notifications@github.com
Dato: 02.04.2016 12:24 (GMT+01:00)
Til: xbmc/xbmc xbmc@noreply.github.com
Ko: Arne Morten Kvarving Arne.Morten.Kvarving@sintef.no
Emne: Re: [xbmc/xbmc] Cleanup dll loader / posix win32 emulation functions. (#8798)

somebody handled it already?


You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHubhttps://github.com//pull/8798#issuecomment-204690177

@popcornmix

This comment has been minimized.

Copy link
Member

popcornmix commented Apr 2, 2016

@akva2 popcornmix@b2eaa43 fixes build of OMXAudio.cpp

@Memphiz

This comment has been minimized.

Copy link
Member

Memphiz commented Apr 2, 2016

well this is what i found : Memphiz@b905955 i can't compile any further because it can't find _aligned_free in CBaseTexture (something which was added in the ffmpeg3 bump - maybe some include is missing now with your cleanup?)

@popcornmix

This comment has been minimized.

Copy link
Member

popcornmix commented Apr 2, 2016

I added popcornmix@f17e84d for the Texture.cpp failure.

@akva2

This comment has been minimized.

Copy link
Contributor

akva2 commented Apr 2, 2016

Yes you need linux/XMemUtils.h explicitly now, instead of pulling it into all compilation units.

-------- Opprinnelig melding --------
Fra: Memphiz notifications@github.com
Dato: 02.04.2016 14:16 (GMT+01:00)
Til: xbmc/xbmc xbmc@noreply.github.com
Ko: Arne Morten Kvarving Arne.Morten.Kvarving@sintef.no
Emne: Re: [xbmc/xbmc] Cleanup dll loader / posix win32 emulation functions. (#8798)

well this is what i found : Memphiz/xbmc@b905955Memphiz@b905955 i can't compile any further because it can't find _aligned_free in CBaseTexture (something which was added in the ffmpeg3 bump - maybe some include is missing now with your cleanup?)


You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHubhttps://github.com//pull/8798#issuecomment-204705237

@fritsch

This comment has been minimized.

Copy link
Member

fritsch commented Apr 2, 2016

@popcornmix that one is correct - please submit it anyways.

@popcornmix

This comment has been minimized.

Copy link
Member

popcornmix commented Apr 2, 2016

@akva2 feel free to cherry-pick/squash my commits.

@akva2

This comment has been minimized.

Copy link
Contributor

akva2 commented Apr 2, 2016

Thanks i will but i am out of the house for a few hours..

-------- Opprinnelig melding --------
Fra: popcornmix notifications@github.com
Dato: 02.04.2016 14:23 (GMT+01:00)
Til: xbmc/xbmc xbmc@noreply.github.com
Ko: Arne Morten Kvarving Arne.Morten.Kvarving@sintef.no
Emne: Re: [xbmc/xbmc] Cleanup dll loader / posix win32 emulation functions. (#8798)

@akva2https://github.com/akva2 feel free to cherry-pick/squash my commits.


You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHubhttps://github.com//pull/8798#issuecomment-204706059

@Memphiz

This comment has been minimized.

Copy link
Member

Memphiz commented Apr 2, 2016

all in all in addition to the missing include in cbasetexture from popcornmix this is what you need for osx:

https://github.com/Memphiz/xbmc/commits/prune_emu (top 3 commits) - not sure if i have enough time to check ios aswell ...

@Memphiz

This comment has been minimized.

Copy link
Member

Memphiz commented Apr 2, 2016

updated https://github.com/Memphiz/xbmc/commits/prune_emu - first 5 will cover osx and ios

@notspiff notspiff force-pushed the notspiff:prune_emu branch from a817705 to e907804 Apr 4, 2016
@akva2

This comment has been minimized.

Copy link
Contributor

akva2 commented Apr 4, 2016

sorry for the delay and thanks for your help. should be fine now (everything is squashed up to avoid broken revisions).

@FernetMenta

This comment has been minimized.

Copy link
Member

FernetMenta commented Apr 4, 2016

thanks
jenkins build this please

notspiff added 3 commits Jun 20, 2014
no reason pulling this header everywhere
no reason to pull this header everywhere
no reason for pulling this header everywhere.

PlatformIncludes is finally a dummy wrapping PlatformDefs.h
@notspiff notspiff force-pushed the notspiff:prune_emu branch from e907804 to 426f0d9 Apr 4, 2016
@akva2

This comment has been minimized.

Copy link
Contributor

akva2 commented Apr 4, 2016

XTimeUtils.h added to droid file as well.

@FernetMenta

This comment has been minimized.

Copy link
Member

FernetMenta commented Apr 4, 2016

jenkins build this please

@FernetMenta

This comment has been minimized.

Copy link
Member

FernetMenta commented Apr 4, 2016

ready to go or do we need to wait for something here?

@akva2

This comment has been minimized.

Copy link
Contributor

akva2 commented Apr 4, 2016

ready to go as far as i am concerned.

@FernetMenta

This comment has been minimized.

Copy link
Member

FernetMenta commented Apr 4, 2016

thanks!

@FernetMenta FernetMenta merged commit dd4ad00 into xbmc:master Apr 4, 2016
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
default Merged build finished.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
9 participants
You can’t perform that action at this time.