Changeset 7916 for trunk/src/oleaut32/oleaut.c

Timestamp:

Feb 15, 2002, 4:07:41 PM (24 years ago)

Author:

sandervl

Message:

Wine 20020215 resync + added extended logging

File:

• trunk/src/oleaut32/oleaut.c (modified) (11 diffs)

trunk/src/oleaut32/oleaut.c

@@ -21 +21 @@
 #include "wine/obj_oleaut.h"
 #include "wine/obj_olefont.h"
+
+#include "tmarshal.h"
+
 #include "debugtools.h"
 
@@ -40 +43 @@
 
         StringFromGUID2(rcid,guidbuf,39);
-#ifdef __WIN32OS2__
-        dprintf(("RegisterActiveObject %x %ls (%x) %x %x", punk, guidbuf, rcid, dwFlags, pdwRegister));
-#endif
         ret = CreateItemMoniker(pdelimiter,guidbuf,&moniker);
         if (FAILED(ret)) 
@@ -65 +65 @@
         HRESULT                 ret;
 
-#ifdef __WIN32OS2__
-        dprintf(("RevokeActiveObject %x %x", xregister, reserved));
-#endif
-
         ret = GetRunningObjectTable(0,&runobtable);
         if (FAILED(ret)) return ret;
@@ -88 +84 @@
 
         StringFromGUID2(rcid,guidbuf,39);
-#ifdef __WIN32OS2__
-        dprintf(("GetActiveObject %ls (%x) %x %x", guidbuf, rcid, preserved, ppunk));
-#endif
         ret = CreateItemMoniker(pdelimiter,guidbuf,&moniker);
         if (FAILED(ret)) 
@@ -105 +98 @@
 }
 
+
 /***********************************************************************
  *           OaBuildVersion           [OLEAUT32.170]
@@ -111 +105 @@
  * OLE 2.1  NT                          1993-95 10     3023
  * OLE 2.1                                      10     3027
+ * Win32s 1.1e                                  20     4049
  * OLE 2.20 W95/NT                      1993-96 20     4112
  * OLE 2.20 W95/NT                      1993-96 20     4118
@@ -117 +112 @@
  * OLE 2.40 NT??                        1993-98 40     4267
  * OLE 2.40 W98 SE orig. file           1993-98 40     4275
+ * OLE 2.40 W2K orig. file              1993-XX 40     4514
+ *
+ * I just decided to use version 2.20 for Win3.1, 2.30 for Win95 & NT 3.51,
+ * and 2.40 for all newer OSs. The build number is maximum, i.e. 0xffff.
  */
 UINT WINAPI OaBuildVersion()
 {
-#ifdef __WIN32OS2__
-    dprintf(("OaBuildVersion %x", GetVersion() & 0x8000ffff));
-#else
-    FIXME("Please report to a.mohr@mailto.de if you get version error messages !\n");
-#endif
     switch(GetVersion() & 0x8000ffff)  /* mask off build number */
     {
     case 0x80000a03:  /* WIN31 */
-                return MAKELONG(4049, 20); /* from Win32s 1.1e */
-    case 0x80000004:  /* WIN95 */
-                return MAKELONG(4265, 30);
+                return MAKELONG(0xffff, 20);
+    case 0x00003303:  /* NT351 */
+                return MAKELONG(0xffff, 30);
+    case 0x80000004:  /* WIN95; I'd like to use the "standard" w95 minor
+                         version here (30), but as we still use w95
+                         as default winver (which is good IMHO), I better
+                         play safe and use the latest value for w95 for now.
+                         Change this as soon as default winver gets changed
+                         to something more recent */
     case 0x80000a04:  /* WIN98 */
-                return MAKELONG(4275, 40); /* value of W98 SE; orig. W98 AFAIK has 4265, 30 just as W95 */
-    case 0x00003303:  /* NT351 */
-                return MAKELONG(4265, 30); /* value borrowed from Win95 */
     case 0x00000004:  /* NT40 */
-#ifdef __WIN32OS2__
-                return 0x2810b5; //returned by NT4, SP6
-#else
-                return MAKELONG(4122, 20); /* ouch ! Quite old, I guess */
-#endif
+    case 0x00000005:  /* W2K */
+                return MAKELONG(0xffff, 40);
     default:
                 ERR("Version value not known yet. Please investigate it !\n");
@@ -148 +142 @@
 
 /***********************************************************************
- *              DllRegisterServer
+ *              DllRegisterServer (OLEAUT32.320)
  */
 HRESULT WINAPI OLEAUT32_DllRegisterServer() { 
@@ -156 +150 @@
 
 /***********************************************************************
- *              DllUnregisterServer
+ *              DllUnregisterServer (OLEAUT32.321)
  */
 HRESULT WINAPI OLEAUT32_DllUnregisterServer() {
@@ -162 +156 @@
     return S_OK;
 }
-
 
 extern void _get_STDFONT_CF(LPVOID);
@@ -179 +172 @@
         }
     }
+    if (IsEqualGUID(rclsid,&CLSID_PSOAInterface)) {
+        if (S_OK==TypeLibFac_DllGetClassObject(rclsid,iid,ppv))
+            return S_OK;
+        /*FALLTHROUGH*/
+    }
     FIXME("\n\tCLSID:\t%s,\n\tIID:\t%s\n",debugstr_guid(rclsid),debugstr_guid(iid));
     return CLASS_E_CLASSNOTAVAILABLE;