commit 02f28139681fcb9331d75a6c2782805c21488567
author Alexandre Julliard <julliard@winehq.org> Wed Aug 27 23:14:29 2003 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Aug 27 23:14:29 2003 +0000
tree 79650064f0fcb929599372d47479f9a797fa5656
parent fca4a8f8770e4bdb3e43302dc9572e7df8ff18f7

Renamed a few TEB fields to use the "official" names.

dlls/ole32/compobj.c

diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index 7614e5e..55cb700 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -207,7 +207,7 @@
     apt->next = apts;
     apts = apt;
     LeaveCriticalSection(&csApartment);
-    NtCurrentTeb()->ErrorInfo = apt;
+    NtCurrentTeb()->ReservedForOle = apt;
     return apt;
 }
 
@@ -379,7 +379,7 @@
     ERR("(%p, %x) - Bad parameter passed-in %p, must be an old Windows Application\n", lpReserved, (int)dwCoInit, lpReserved);
   }
 
-  apt = NtCurrentTeb()->ErrorInfo;
+  apt = NtCurrentTeb()->ReservedForOle;
   if (apt && dwCoInit != apt->model) return RPC_E_CHANGED_MODE;
   hr = apt ? S_FALSE : S_OK;
 
@@ -404,7 +404,7 @@
   if (!apt) apt = COM_CreateApartment(dwCoInit);
 
   InterlockedIncrement(&apt->inits);
-  if (hr == S_OK) NtCurrentTeb()->ErrorInfo = apt;
+  if (hr == S_OK) NtCurrentTeb()->ReservedForOle = apt;
 
   return hr;
 }
@@ -423,10 +423,10 @@
 
   TRACE("()\n");
 
-  apt = NtCurrentTeb()->ErrorInfo;
+  apt = NtCurrentTeb()->ReservedForOle;
   if (!apt) return;
   if (InterlockedDecrement(&apt->inits)==0) {
-    NtCurrentTeb()->ErrorInfo = NULL;
+    NtCurrentTeb()->ReservedForOle = NULL;
     COM_DestroyApartment(apt);
     apt = NULL;
   }

dlls/ole32/compobj_private.h

diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h
index a8e19c9..ff9fe0b 100644
--- a/dlls/ole32/compobj_private.h
+++ b/dlls/ole32/compobj_private.h
@@ -200,7 +200,7 @@
 static inline APARTMENT* COM_CurrentInfo(void) WINE_UNUSED;
 static inline APARTMENT* COM_CurrentInfo(void)
 {
-  APARTMENT* apt = NtCurrentTeb()->ErrorInfo;
+  APARTMENT* apt = NtCurrentTeb()->ReservedForOle;
   return apt;
 }
 static inline APARTMENT* COM_CurrentApt(void) WINE_UNUSED;