Jeff Latimer : pdh: Remove unnecessary test done in PdhLookupPerfNameByIndexW.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 75adca5385aa54bf680bb0020d89358440785c45
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=75adca5385aa54bf680bb0020d...

Author: Jeff Latimer 
Date:   Mon Feb 18 20:32:04 2008 +1100

pdh: Remove unnecessary test done in PdhLookupPerfNameByIndexW.

---

dlls/pdh/pdh_main.c |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c
index a42b931..f2ecc89 100644
--- a/dlls/pdh/pdh_main.c
+++ b/dlls/pdh/pdh_main.c
@@ -832,21 +832,17 @@ PDH_STATUS WINAPI PdhLookupPerfIndexByNameW( LPCWSTR machine, LPCWSTR name, LPDW
 PDH_STATUS WINAPI PdhLookupPerfNameByIndexA( LPCSTR machine, DWORD index, LPSTR buffer, LPDWORD size )
 {
     PDH_STATUS ret;
+    WCHAR *machineW = NULL;
     WCHAR bufferW[PDH_MAX_COUNTER_NAME];
     DWORD sizeW = sizeof(bufferW) / sizeof(WCHAR);

TRACE("%s %d %p %p\n", debugstr_a(machine), index, buffer, size);

-    if (machine)
-    {
-        FIXME("remote machine not supported\n");
-        return PDH_CSTATUS_NO_MACHINE;
-    }
-
     if (!buffer || !size) return PDH_INVALID_ARGUMENT;
-    if (!index) return ERROR_SUCCESS;

-    if (!(ret = PdhLookupPerfNameByIndexW( NULL, index, bufferW, &sizeW )))
+    if (machine && !(machineW = pdh_strdup_aw( machine ))) return PDH_MEMORY_ALLOCATION_FAILURE;
+
+    if (!(ret = PdhLookupPerfNameByIndexW( machineW, index, bufferW, &sizeW )))
     {
         int required = WideCharToMultiByte( CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL );

@@ -854,6 +850,7 @@ PDH_STATUS WINAPI PdhLookupPerfNameByIndexA( LPCSTR machine, DWORD index, LPSTR
         else WideCharToMultiByte( CP_ACP, 0, bufferW, -1, buffer, required, NULL, NULL );
         if (size) *size = required;
     }
+    heap_free( machineW );
     return ret;
 }