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

Clsid from prog #194

Merged
merged 3 commits into from
Feb 23, 2013
Merged

Conversation

headcrashing
Copy link
Contributor

I noticed that there is no test for CLSIDFromProgID so I am providing one here.
It checks the CLSID for "jpegfile" which should be working on all revisions of Windows, as it is part of the Windows Desktop.

@dblock
Copy link
Member

dblock commented Feb 22, 2013

Looks like you branched from your previous branch that has other code. Close the other PR, merge from upstream and update CHANGELOG, please. LMK if you need any help with this.

@headcrashing
Copy link
Contributor Author

While I know subversion rather well, I have to confess that I am a total rookie on GIT and GITHUB. I would be happy if you could provide some help how I can proceed the steps you ask for?

  • I closed the other PR as you certainly noticed. Can you please tell me how to do "merge from upstream"? :-)

@dblock
Copy link
Member

dblock commented Feb 23, 2013

You have a branch called "master", so git checkout master to get to it.

You have a branch called "CLSIDFromProgID", so git checkout CLSIDFromProgID to get to it.

You're a fork from "[email protected]:twall/jna.git" (it's in the little window on https://github.com/twall/jna/. This is your "upstream". So you can add a remote for it so that you don't have to type the whole thing all the time: git remote add upstream [email protected]:twall/jna.git.

To merge changes from upstream's master branch to your branch, you check out the branch then do git pull upstream master. Then you push that to github, git push origin branchname, eg. git push origin CLSIDFromProgID if you're on CLSIDFromProgID. Refresh this page, it should show a new commit and a smaller diff. The name "origin" is just a remote to your fork, same as "upstream" is a remote to where you forked from: git remote -v will show them.

Finally, when you start working on a new feature, git checkout master, then git pull upstream master, then git checkout -b new-branch. This is called a "topic branch".

Try it.

@dblock
Copy link
Member

dblock commented Feb 23, 2013

Thanks, perfect. I think we don't need to have a line for every unit test added in CHANGES, but it's not a big deal, merging.

dblock added a commit that referenced this pull request Feb 23, 2013
@dblock dblock merged commit 68ed3e5 into java-native-access:master Feb 23, 2013
@headcrashing
Copy link
Contributor Author

Thank you for your kind introduction to GIT. In fact, it looks like the powerful tool we waited for, but we have a lot to learn still... :-)

We have some more work in the queue as our project evolves. Now that you gave exact steps how to set up a feature branch, I hope in future we will not produce the same trouble again... ;-)

Regards
-Markus

@dblock
Copy link
Member

dblock commented Feb 23, 2013

There's no trouble at all. It's much easier to learn git than translate Win32 API mappings and esoteric Win32 structures into JNA ;) Thanks for contributing!

@headcrashing headcrashing deleted the CLSIDFromProgID branch February 23, 2013 14:51
mstyura pushed a commit to mstyura/jna that referenced this pull request Sep 9, 2024
Motivation:

Quiche 0.7.0 added QUICHE_ERR_STREAM_STOPPED, we need to handle it

Modifications:

Add missing QUICHE_ERR_STREAM_STOPPED handling

Result:

All errors are correctly converted
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants