Merge pull request #194 from headcrashing/CLSIDFromProgID

Clsid from prog

Author: dblock

CHANGES.md

@@ -18,6 +18,7 @@ Features
 * [#183](https://github.com/twall/jna/pull/183): Added `StructureFieldOrderInspector` unit test utility to scan for `Structure` field issues; see: `com.sun.jna.platform.StructureFieldOrderTest.testMethodGetFieldOrder` - [@bhamail](https://github.com/bhamail).
 * [#187](https://github.com/twall/jna/pull/187): Allow `StructureFieldOrderTest` unit test in platform project to run on Linux - [@bhamail](https://github.com/bhamail).
 * [#192](https://github.com/twall/jna/pull/192): Added Win32 `SHGetSpecialFolderPath()` and initialization file (.ini) API functions from `kernel32.dll` - [@headcrashing](https://github.com/headcrashing).
+* [#194](https://github.com/twall/jna/pull/194): Added Unit Test for `CLSIDFromProgID()` - [@headcrashing](https://github.com/headcrashing).
 
 Release 3.5.1
 ====================

contrib/platform/test/com/sun/jna/platform/win32/Ole32Test.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2010 Daniel Doubrovkine, All Rights Reserved
+/* Copyright (c) 2010, 2013 Daniel Doubrovkine, Markus Karg, All Rights Reserved
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,11 +18,11 @@
 import com.sun.jna.Pointer;
 import com.sun.jna.platform.win32.Guid.GUID;
 import com.sun.jna.platform.win32.WinNT.HRESULT;
-import com.sun.jna.platform.win32.COM.IUnknown;
 import com.sun.jna.ptr.PointerByReference;
 
 /**
  * @author dblock[at]dblock[dot]org
+ * @author markus[at]headcrashing[dot]eu
  */
 public class Ole32Test extends TestCase {
 
@@ -101,4 +101,10 @@ public void testCoCreateInstance() {
 		if (W32Errors.SUCCEEDED(hrCI.intValue()))
 			Ole32.INSTANCE.CoUninitialize();
 	}
+
+	public final void testCLSIDFromProgID() {
+	    final Guid.CLSID.ByReference clsid = new Guid.CLSID.ByReference();  
+	    assertEquals(WinError.S_OK, Ole32.INSTANCE.CLSIDFromProgID("jpegfile", clsid));
+	    assertEquals("{25336920-03F9-11CF-8FD0-00AA00686F13}", clsid.toGuidString());
+	}
 }