Clsid from prog

[headcrashing]

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]

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]

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]

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 "git@github.com: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 git@github.com: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]

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.

[headcrashing]

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]

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!