Changeset 346

Timestamp:

Dec 16, 2006, 12:42:52 PM (19 years ago)

Author:

pr

Message:

Fix winhStoreWindowPos() Bug 903.

Files:

• branches/branch-1-0/include/helpers/winh.h (modified) (2 diffs)
• branches/branch-1-0/src/helpers/winh.c (modified) (3 diffs)
• trunk/include/helpers/winh.h (modified) (2 diffs)
• trunk/src/helpers/winh.c (modified) (3 diffs)

branches/branch-1-0/include/helpers/winh.h

@@ -674 +674 @@
 
     // V1.0.6 (2006-10-28) [pr]
+    // V1.0.7 (2006-12-16) [pr]: Named screen width/height parameters
 
     /*
@@ -697 +698 @@
         USHORT      usMinXPos;
         USHORT      usMinYPos;
-        ULONG       ulRes3;           // Always 0x0400 (???)
-        ULONG       ulRes4;           // Always 0x0300 (???)
-        ULONG       ulRes5;           // Always 0xFFFFFFFF (???)
-        ULONG       ulRes6;           // Always 0xFFFFFFFF (???)
+        ULONG       ulScreenWidth;
+        ULONG       ulScreenHeight;
+        ULONG       ulRes3;           // Always 0xFFFFFFFF (???)
+        ULONG       ulRes4;           // Always 0xFFFFFFFF (???)
         ULONG       ulPPLen;          // Presentation Parameters length
     } STOREPOS, *PSTOREPOS;

branches/branch-1-0/src/helpers/winh.c

@@ -2484 +2484 @@
  *
  *@@added XWP V1.0.6 (2006-10-31) [pr]: @@fixes 458
+ *@@changed XWP V1.0.7 (2006-12-16) [pr]: detect screen height/width @@fixes 903
  */
 
@@ -2502 +2503 @@
         if ((pStorePos = malloc(ulSize)))
         {
-            // This first bit is all guesswork as I don't know what it all means,
+            // This first bit is guesswork as I don't know what it all means,
             // but it always seems to be the same everywhere I've looked.
             pStorePos->usMagic = 0x7B6A;
             pStorePos->ulRes1 = 1;
             pStorePos->ulRes2 = 1;
-            pStorePos->ulRes3 = 0x0400;
-            pStorePos->ulRes4 = 0x0300;
-            pStorePos->ulRes5 = 0xFFFFFFFF;
-            pStorePos->ulRes6 = 0xFFFFFFFF;
+            pStorePos->ulRes3 = 0xFFFFFFFF;
+            pStorePos->ulRes4 = 0xFFFFFFFF;
 
             pStorePos->ulFlags = swp.fl;
@@ -2527 +2526 @@
             pStorePos->usMinXPos = WinQueryWindowUShort(hwnd, QWS_XMINIMIZE);
             pStorePos->usMinYPos = WinQueryWindowUShort(hwnd, QWS_YMINIMIZE);
+            pStorePos->ulScreenWidth = WinQuerySysValue(HWND_DESKTOP, SV_CXSCREEN);;
+            pStorePos->ulScreenHeight = WinQuerySysValue(HWND_DESKTOP, SV_CYSCREEN);;
             pStorePos->ulPPLen = WinGetFrameTreePPs(hwnd, ulSizePP, (PSZ)(pStorePos + 1));
             ulSize = pStorePos->ulPPLen + sizeof(STOREPOS);

trunk/include/helpers/winh.h

@@ -764 +764 @@
 
     // V1.0.6 (2006-10-28) [pr]
+    // V1.0.7 (2006-12-16) [pr]: Named screen width/height parameters
 
     /*
@@ -787 +788 @@
         USHORT      usMinXPos;
         USHORT      usMinYPos;
-        ULONG       ulRes3;           // Always 0x0400 (???)
-        ULONG       ulRes4;           // Always 0x0300 (???)
-        ULONG       ulRes5;           // Always 0xFFFFFFFF (???)
-        ULONG       ulRes6;           // Always 0xFFFFFFFF (???)
+        ULONG       ulScreenWidth;
+        ULONG       ulScreenHeight;
+        ULONG       ulRes3;           // Always 0xFFFFFFFF (???)
+        ULONG       ulRes4;           // Always 0xFFFFFFFF (???)
         ULONG       ulPPLen;          // Presentation Parameters length
     } STOREPOS, *PSTOREPOS;

trunk/src/helpers/winh.c

@@ -2662 +2662 @@
  *
  *@@added XWP V1.0.6 (2006-10-31) [pr]: @@fixes 458
+ *@@changed XWP V1.0.7 (2006-12-16) [pr]: detect screen height/width @@fixes 903
  */
 
@@ -2680 +2681 @@
         if ((pStorePos = malloc(ulSize)))
         {
-            // This first bit is all guesswork as I don't know what it all means,
+            // This first bit is guesswork as I don't know what it all means,
             // but it always seems to be the same everywhere I've looked.
             pStorePos->usMagic = 0x7B6A;
             pStorePos->ulRes1 = 1;
             pStorePos->ulRes2 = 1;
-            pStorePos->ulRes3 = 0x0400;
-            pStorePos->ulRes4 = 0x0300;
-            pStorePos->ulRes5 = 0xFFFFFFFF;
-            pStorePos->ulRes6 = 0xFFFFFFFF;
+            pStorePos->ulRes3 = 0xFFFFFFFF;
+            pStorePos->ulRes4 = 0xFFFFFFFF;
 
             pStorePos->ulFlags = swp.fl;
@@ -2705 +2704 @@
             pStorePos->usMinXPos = WinQueryWindowUShort(hwnd, QWS_XMINIMIZE);
             pStorePos->usMinYPos = WinQueryWindowUShort(hwnd, QWS_YMINIMIZE);
+            pStorePos->ulScreenWidth = WinQuerySysValue(HWND_DESKTOP, SV_CXSCREEN);;
+            pStorePos->ulScreenHeight = WinQuerySysValue(HWND_DESKTOP, SV_CYSCREEN);;
             pStorePos->ulPPLen = WinGetFrameTreePPs(hwnd, ulSizePP, (PSZ)(pStorePos + 1));
             ulSize = pStorePos->ulPPLen + sizeof(STOREPOS);