From: jinhyung.jo <jinhyung.jo@samsung.com>
Date: Tue, 21 Aug 2012 04:53:21 +0000 (+0900)
Subject: [Title] remove a duplicated function
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~1444^2~97^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7c6a8229985372331e2ddc99f5875d1bc1a78e71;p=sdk%2Femulator%2Fqemu.git

[Title] remove a duplicated function
[Type] Bugfix
[Module] Emulator / Camera
[Priority] Critical
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
---

diff --git a/tizen/src/hw/maru_camera_win32_pci.c b/tizen/src/hw/maru_camera_win32_pci.c
index 22eea737c1..504574d117 100644
--- a/tizen/src/hw/maru_camera_win32_pci.c
+++ b/tizen/src/hw/maru_camera_win32_pci.c
@@ -1452,75 +1452,10 @@ static STDMETHODIMP SetVideoProcAmp(long nProperty, long value)
 int marucam_device_check(void)
 {
     int ret = 0;
-    HRESULT hr;
+    HRESULT hr = E_FAIL;
     ICreateDevEnum *pCreateDevEnum = NULL;
     IEnumMoniker *pEnumMK = NULL;
-    IMoniker *pMoniKer;
-
-    hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
-    if (FAILED(hr)) {
-        ERR("[%s] failed to CoInitailizeEx\n", __func__);
-        goto error;
-    }
-
-    hr = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, &IID_ICreateDevEnum, (void**)&pCreateDevEnum);
-    if (FAILED(hr)) {
-        ERR("[%s] failed to create instance of CLSID_SystemDeviceEnum\n", __func__);
-        goto error;
-    }
-
-    hr = pCreateDevEnum->lpVtbl->CreateClassEnumerator(pCreateDevEnum, &CLSID_VideoInputDeviceCategory, &pEnumMK, 0);
-    if (FAILED(hr))
-    {
-        pCreateDevEnum->lpVtbl->Release(pCreateDevEnum);
-        ERR("[%s] failed to create class enumerator\n");
-        goto error;
-    }
-
-    if (!pEnumMK)
-    {
-        pCreateDevEnum->lpVtbl->Release(pCreateDevEnum);
-        ERR("[%s] class enumerator is NULL!!\n");
-        goto error;
-    }
-    pEnumMK->lpVtbl->Reset(pEnumMK);
-
-    hr = pEnumMK->lpVtbl->Next(pEnumMK, 1, &pMoniKer, NULL);
-    if (hr == S_FALSE)
-    {
-        hr = E_FAIL;
-    }
-    if (SUCCEEDED(hr))
-    {
-        IPropertyBag *pBag = NULL;
-        hr = pMoniKer->lpVtbl->BindToStorage(pMoniKer, 0, 0, &IID_IPropertyBag, (void **)&pBag);
-        if(SUCCEEDED(hr))
-        {
-            VARIANT var;
-            var.vt = VT_BSTR;
-            hr = pBag->lpVtbl->Read(pBag, L"FriendlyName", &var, NULL);
-            if (hr == NOERROR)
-            {
-                ret = 1;
-                SysFreeString(var.bstrVal);
-            }
-            pBag->lpVtbl->Release(pBag);
-        }
-        pMoniKer->lpVtbl->Release(pMoniKer);
-    }
-
-error:
-    CoUninitialize();
-    return ret;
-}
-
-int marucam_device_check(void)
-{
-    int ret = 0;
-    HRESULT hr;
-    ICreateDevEnum *pCreateDevEnum = NULL;
-    IEnumMoniker *pEnumMK = NULL;
-    IMoniker *pMoniKer;
+    IMoniker *pMoniKer = NULL;
 
     hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
     if (FAILED(hr)) {
@@ -1553,6 +1488,7 @@ int marucam_device_check(void)
     hr = pEnumMK->lpVtbl->Next(pEnumMK, 1, &pMoniKer, NULL);
     if (hr == S_FALSE)
     {
+        ERR("[%s] enum moniker returns a invalid value.\n", __func__);
         hr = E_FAIL;
     }
     if (SUCCEEDED(hr))