[Java-game-lib-cvs] SF.net SVN: java-game-lib: [2577] trunk/LWJGL/src/native/windows/ org_lwjgl_opengl_WindowsDirectInput8.c

[<eli...@us...>]

Revision: 2577
          http://svn.sourceforge.net/java-game-lib/?rev=2577&view=rev
Author:   elias_naur
Date:     2006-09-21 06:49:49 -0700 (Thu, 21 Sep 2006)

Log Message:
-----------
Windows: Don't ignore errors from CoInitialize

Modified Paths:
--------------
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsDirectInput8.c

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsDirectInput8.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsDirectInput8.c	2006-09-20 11:49:14 UTC (rev 2576)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsDirectInput8.c	2006-09-21 13:49:49 UTC (rev 2577)
@@ -49,9 +49,9 @@
 	LPDIRECTINPUT8 lpdi;
 	HRESULT ret;
 
-	ret = CoInitializeEx(NULL, COINIT_MULTITHREADED);
-	if (ret != S_OK && ret != S_FALSE && ret != RPC_E_CHANGED_MODE) {
-		throwFormattedException(env, "CoInitializeEx failed (%x)", ret);
+	ret = CoInitialize(NULL);
+	if (ret != S_OK && ret != S_FALSE) {
+		throwFormattedException(env, "CoInitialize failed (%x)", ret);
 		return (LONG_PTR)NULL;
 	}
 	ret = CoCreateInstance(&CLSID_DirectInput8, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectInput8, (void *)&lpdi);
@@ -97,4 +97,5 @@
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsDirectInput8_release(JNIEnv *env, jobject unused, jlong di_interface) {
 	LPDIRECTINPUT8 lpdi = (LPDIRECTINPUT8)(LONG_PTR)di_interface;
 	IDirectInput8_Release(lpdi);
+	CoUninitialize();
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.