Changeset 873 for trunk/src

Timestamp:

Jun 30, 2011, 12:36:31 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

general: Restore the FPU Control Word completely after making Win and Gpi calls known to unexpectedly change it, as there are Qt applications relying on other bits as well. Closes #222.

File:

• trunk/src/corelib/global/qt_os2.h (modified) (2 diffs)

trunk/src/corelib/global/qt_os2.h

@@ -69 +69 @@
 LONG APIENTRY WinQueryClipRegion(HWND hwnd, HRGN hrgnClip);
 
-inline LONG APIENTRY __FPU_CW_WinQueryClipRegion (HWND hwnd, HRGN hrgnClip)
+extern inline LONG APIENTRY __FPU_CW_WinQueryClipRegion (HWND hwnd, HRGN hrgnClip)
 {
+    unsigned int cw = __FPU_CW_Get();
     LONG ret = WinQueryClipRegion (hwnd, hrgnClip);
-    __FPU_CW_Restore();
+    __FPU_CW_Set(cw);
     return ret;
 }
@@ -79 +80 @@
 BOOL APIENTRY WinSetClipRegion(HWND hwnd, HRGN hrgnClip);
 
-inline LONG APIENTRY __FPU_CW_WinSetClipRegion (HWND hwnd, HRGN hrgnClip)
+extern inline LONG APIENTRY __FPU_CW_WinSetClipRegion (HWND hwnd, HRGN hrgnClip)
 {
+    unsigned int cw = __FPU_CW_Get();
     LONG ret = WinSetClipRegion (hwnd, hrgnClip);
-    __FPU_CW_Restore();
+    __FPU_CW_Set(cw);
     return ret;
 }