Robert Reif : secur32: Fix GetComputerObjectName tests based on feedback from Paul Vriens.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 51c7c030eedebc40b07c8cd868f4b15df3fb5df3
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=51c7c030eedebc40b07c8cd8...

Author: Robert Reif <reif(a)earthlink.net>
Date:   Wed Aug 16 07:42:23 2006 -0400

secur32: Fix GetComputerObjectName tests based on feedback from Paul Vriens.

---

 dlls/secur32/tests/secur32.c |   51 +++++++++++++++++++++++++++++++++++-------
 1 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c
index 5c681cd..77e47ce 100644
--- a/dlls/secur32/tests/secur32.c
+++ b/dlls/secur32/tests/secur32.c
@@ -27,22 +27,28 @@ #include <schannel.h>
 
 #include "wine/test.h"
 
-static void testGetComputerObjectName()
+static HMODULE secdll;
+
+static BOOLEAN (WINAPI * pGetComputerObjectNameA)(EXTENDED_NAME_FORMAT NameFormat, LPSTR lpNameBuffer, PULONG lpnSize);
+static BOOLEAN (WINAPI * pGetComputerObjectNameW)(EXTENDED_NAME_FORMAT NameFormat, LPWSTR lpNameBuffer, PULONG lpnSize);
+
+static EXTENDED_NAME_FORMAT formats[] = {
+    NameUnknown, NameFullyQualifiedDN, NameSamCompatible, NameDisplay,
+    NameUniqueId, NameCanonical, NameUserPrincipal, NameCanonicalEx,
+    NameServicePrincipal, NameDnsDomain
+};
+
+static void testGetComputerObjectNameA(void)
 {
     char name[256];
-    WCHAR nameW[256];
     ULONG size;
     BOOLEAN rc;
     int i;
-    EXTENDED_NAME_FORMAT formats[] = { NameUnknown, NameFullyQualifiedDN,
-         NameSamCompatible, NameDisplay, NameUniqueId, NameCanonical,
-         NameUserPrincipal, NameCanonicalEx, NameServicePrincipal,
-         NameDnsDomain };
 
     for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); i++) {
         size = sizeof(name);
         ZeroMemory(name, sizeof(name));
-        rc = GetComputerObjectNameA(formats[i], name, &size);
+        rc = pGetComputerObjectNameA(formats[i], name, &size);
         ok(rc || ((formats[i] == NameUnknown) &&
            (GetLastError() == ERROR_INVALID_PARAMETER)) ||
            (GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO),
@@ -50,10 +56,20 @@ static void testGetComputerObjectName()
            formats[i], GetLastError());
         if (rc)
             trace("GetComputerObjectNameA() returned %s\n", name);
+    }
+}
+
+static void testGetComputerObjectNameW(void)
+{
+    WCHAR nameW[256];
+    ULONG size;
+    BOOLEAN rc;
+    int i;
 
+    for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); i++) {
         size = sizeof(nameW)/sizeof(nameW[0]);
         ZeroMemory(nameW, sizeof(nameW));
-        rc = GetComputerObjectNameW(formats[i], nameW, &size);
+        rc = pGetComputerObjectNameW(formats[i], nameW, &size);
         ok(rc || ((formats[i] == NameUnknown) &&
            (GetLastError() == ERROR_INVALID_PARAMETER)) ||
            (GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO),
@@ -64,5 +80,22 @@ static void testGetComputerObjectName()
 
 START_TEST(secur32)
 {
-    testGetComputerObjectName();
+    secdll = LoadLibraryA("secur32.dll");
+
+    if (!secdll)
+        secdll = LoadLibraryA("security.dll");
+
+    if (secdll)
+    {
+        pGetComputerObjectNameA = (PVOID)GetProcAddress(secdll, "GetComputerObjectNameA");
+        pGetComputerObjectNameW = (PVOID)GetProcAddress(secdll, "GetComputerObjectNameW");
+ 
+        if (pGetComputerObjectNameA)
+            testGetComputerObjectNameA();
+
+        if (pGetComputerObjectNameW)
+            testGetComputerObjectNameW();
+
+        FreeLibrary(secdll);
+    }
 }