Changeset 276 for trunk

Timestamp:

Feb 18, 2005, 1:24:05 AM (21 years ago)

Author:

pr

Message:

Fixes bug 634.

Location:

trunk

Files:

• include/helpers/winh.h (modified) (1 diff)
• src/cppbase/bs_config.cpp (modified) (1 diff)
• src/helpers/winh.c (modified) (3 diffs)

trunk/include/helpers/winh.h

@@ -1071 +1071 @@
     BOOL XWPENTRY winhIsClassRegistered(const char *pcszClass);
 
+    extern BOOL32 APIENTRY WinRestartWorkplace(void);
+
     ULONG XWPENTRY winhResetWPS(HAB hab);
 

trunk/src/cppbase/bs_config.cpp

@@ -1577 +1577 @@
     }
 
+    // V1.0.5 (2005-02-17) [pr]
+    // We now save the object synchronously to prevent objects getting lost if we
+    // restart the WPS imminently due to a class registration for example. @@fixes 634.
+    WinSaveObject (_hobj, FALSE);
     if (pLogFile)
     {

trunk/src/helpers/winh.c

@@ -5375 +5375 @@
  *
  *@@added V0.9.4 (2000-07-01) [umoeller]
+ *@@changed V1.0.5 (2005-02-17) [pr]: replaced this with something less brutal
  */
 
@@ -5380 +5381 @@
 {
     ULONG ulrc = 0;
+
+#if 1
+    WinRestartWorkplace();
+#else
     // find out current profile names
     PRFPROFILE Profiles;
@@ -5411 +5416 @@
     else
         ulrc = 4;
+#endif
 
     return ulrc;
 }
-