From 1a0112a47d1cb28a10f308a02165657acb9ba2ff Mon Sep 17 00:00:00 2001
From: Ove Kaaven <ovek@transgaming.com>
Date: Mon, 17 Feb 2003 01:47:54 +0000
Subject: [PATCH] Make NdrDllRegisterProxy use the interface stub header
 instead of the interface proxy header to avoid stubless proxy ambiguities.

---
 dlls/rpcrt4/cpsf.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/rpcrt4/cpsf.c b/dlls/rpcrt4/cpsf.c
index d4c021e8cd3..8ea44e419cc 100644
--- a/dlls/rpcrt4/cpsf.c
+++ b/dlls/rpcrt4/cpsf.c
@@ -166,7 +166,7 @@ HRESULT WINAPI NdrDllRegisterProxy(HMODULE hDll,
   while (*pProxyFileList) {
     unsigned u;
     for (u=0; u<(*pProxyFileList)->TableSize; u++) {
-      CInterfaceProxyVtbl *proxy = (*pProxyFileList)->pProxyVtblList[u];
+      CInterfaceStubVtbl *proxy = (*pProxyFileList)->pStubVtblList[u];
       PCInterfaceName name = (*pProxyFileList)->pNamesArray[u];
       LPSTR iid;
 
@@ -193,7 +193,7 @@ HRESULT WINAPI NdrDllRegisterProxy(HMODULE hDll,
   /* register clsid to point to module */
   snprintf(keyname, sizeof(keyname), "CLSID\\%s", clsid);
   GetModuleFileNameA(hDll, module, sizeof(module));
-  TRACE("registering %s => %s\n", clsid, module);
+  TRACE("registering CLSID %s => %s\n", clsid, module);
   if (RegCreateKeyExA(HKEY_CLASSES_ROOT, keyname, 0, NULL, 0,
                       KEY_WRITE, NULL, &key, NULL) == ERROR_SUCCESS) {
      if (RegCreateKeyExA(key, "InProcServer32", 0, NULL, 0,
@@ -226,7 +226,7 @@ HRESULT WINAPI NdrDllUnregisterProxy(HMODULE hDll,
   while (*pProxyFileList) {
     unsigned u;
     for (u=0; u<(*pProxyFileList)->TableSize; u++) {
-      CInterfaceProxyVtbl *proxy = (*pProxyFileList)->pProxyVtblList[u];
+      CInterfaceStubVtbl *proxy = (*pProxyFileList)->pStubVtblList[u];
       PCInterfaceName name = (*pProxyFileList)->pNamesArray[u];
       LPSTR iid;
 
@@ -243,7 +243,7 @@ HRESULT WINAPI NdrDllUnregisterProxy(HMODULE hDll,
   /* unregister clsid */
   snprintf(keyname, sizeof(keyname), "CLSID\\%s", clsid);
   GetModuleFileNameA(hDll, module, sizeof(module));
-  TRACE("unregistering %s <= %s\n", clsid, module);
+  TRACE("unregistering CLSID %s <= %s\n", clsid, module);
   RegDeleteKeyA(HKEY_CLASSES_ROOT, keyname);
 
   /* done */