Changeset 130 for trunk/dll/newview.c

Timestamp:

May 23, 2005, 9:04:06 PM (20 years ago)

Author:

root

Message:

Use QWL_USER

File:

• trunk/dll/newview.c (modified) (21 diffs)

trunk/dll/newview.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2003 Steven H.Levine
-
-  Revisions     01 Dec 03 SHL - Comments
-                02 Dec 03 SHL - Correct WM_VSCROLL math
+  Copyright (c) 2001, 2005 Steven H.Levine
+
+  01 Dec 03 SHL Comments
+  02 Dec 03 SHL Correct WM_VSCROLL math
+  23 May 05 SHL Use QWL_USER
 
 ***********************************************************************/
@@ -124 +125 @@
         SHORT count;
 
-        WinSetWindowPtr(hwnd,0,mp2);
+        WinSetWindowPtr(hwnd,QWL_USER,mp2);
         urld = mp2;
         e = urld->line + urld->len + 1;
@@ -203 +204 @@
             SHORT select;
 
-            urld = WinQueryWindowPtr(hwnd,0);
+            urld = WinQueryWindowPtr(hwnd,QWL_USER);
             if(urld) {
               select = (SHORT)WinSendDlgItemMsg(hwnd,URL_LISTBOX,
@@ -261 +262 @@
 static CHAR **BuildAList (HWND hwnd)
 {
-  VIEWDATA      *ad = WinQueryWindowPtr(hwnd,0);
+  VIEWDATA      *ad = WinQueryWindowPtr(hwnd,QWL_USER);
   register ULONG x,y,z = 0;
   ULONG          width;
@@ -342 +343 @@
 static CHAR **BuildAList2 (HWND hwnd)
 {
-  VIEWDATA      *ad = WinQueryWindowPtr(hwnd,0);
+  VIEWDATA      *ad = WinQueryWindowPtr(hwnd,QWL_USER);
   CHAR         **list = NULL,s[SEARCHSTRINGLEN];
   SHORT          x,z;
@@ -377 +378 @@
 
         if(fOtherHelp) {
-          if((!hwndBubble || WinQueryWindowULong(hwndBubble,0) != hwnd) &&
+          if((!hwndBubble || WinQueryWindowULong(hwndBubble,QWL_USER) != hwnd) &&
              !WinQueryCapture(HWND_DESKTOP)) {
 
@@ -548 +549 @@
 static VOID FreeViewerMem (HWND hwnd)
 {
-  VIEWDATA *ad = WinQueryWindowPtr(hwnd,0);
+  VIEWDATA *ad = WinQueryWindowPtr(hwnd,QWL_USER);
 
   if(ad) {
@@ -568 +569 @@
 static HPS InitWindow (HWND hwnd)
 {
-  VIEWDATA     *ad = WinQueryWindowPtr(hwnd,0);
+  VIEWDATA     *ad = WinQueryWindowPtr(hwnd,QWL_USER);
   HPS          hps = (HPS)0;
   SIZEL        sizel;
@@ -626 +627 @@
                        RECTL *Rectl)
 {
-  VIEWDATA       *ad = WinQueryWindowPtr(hwnd,0);
+  VIEWDATA       *ad = WinQueryWindowPtr(hwnd,QWL_USER);
   POINTL          ptl;
   ULONG           width;
@@ -832 +833 @@
     if(hmq2) {
       WinCancelShutdown(hmq2,TRUE);
-      ad = WinQueryWindowPtr(hwnd,0);
+      ad = WinQueryWindowPtr(hwnd,QWL_USER);
       if(ad) {
         if(!DosRequestMutexSem(ad->ScanSem,SEM_INDEFINITE_WAIT)) {
@@ -984 +985 @@
     if(hmq2) {
       WinCancelShutdown(hmq2,TRUE);
-      ad = WinQueryWindowPtr(hwnd,0);
+      ad = WinQueryWindowPtr(hwnd,QWL_USER);
       if(ad) {
         if(!DosRequestMutexSem(ad->ScanSem,SEM_INDEFINITE_WAIT)) {
@@ -1082 +1083 @@
     if(hmq2) {
       WinCancelShutdown(hmq2,TRUE);
-      ad = WinQueryWindowPtr(hwnd,0);
+      ad = WinQueryWindowPtr(hwnd,QWL_USER);
       if(ad) {
         ad->relining = TRUE;
@@ -1256 +1257 @@
     if(hmq2) {
       WinCancelShutdown(hmq2,TRUE);
-      ad = WinQueryWindowPtr(hwnd,0);
+      ad = WinQueryWindowPtr(hwnd,QWL_USER);
       if(ad) {
         if(!DosRequestMutexSem(ad->ScanSem,SEM_INDEFINITE_WAIT)) {
@@ -1352 +1353 @@
 MRESULT EXPENTRY ViewFrameWndProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
 {
-  PFNWP oldproc = (PFNWP)WinQueryWindowPtr(hwnd,0);
+  PFNWP oldproc = (PFNWP)WinQueryWindowPtr(hwnd,QWL_USER);
 
   switch(msg) {
@@ -1525 +1526 @@
         HWND hwndClient = *(HWND *)mp2;
 
-        WinSetWindowULong(hwnd,0,(ULONG)hwndClient);
-        ad = (VIEWDATA *)WinQueryWindowPtr(hwndClient,0);
+        WinSetWindowULong(hwnd,QWL_USER,(ULONG)hwndClient);
+        ad = (VIEWDATA *)WinQueryWindowPtr(hwndClient,QWL_USER);
         MLEsetwrap(WinWindowFromID(hwnd,NEWFIND_MLE),FALSE);
         MLEsetlimit(WinWindowFromID(hwnd,NEWFIND_MLE),SEARCHSTRINGLEN);
@@ -1557 +1558 @@
             IPT   here = 0;
             ULONG len;
-            HWND  hwndClient = WinQueryWindowULong(hwnd,0);
-
-            ad = (VIEWDATA *)WinQueryWindowPtr(hwndClient,0);
+            HWND  hwndClient = WinQueryWindowULong(hwnd,QWL_USER);
+
+            ad = (VIEWDATA *)WinQueryWindowPtr(hwndClient,QWL_USER);
             memset(s,0,SEARCHSTRINGLEN);
             WinSendMsg(WinWindowFromID(hwnd,NEWFIND_MLE),
@@ -1618 +1619 @@
 MRESULT EXPENTRY ViewWndProc (HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
-  VIEWDATA *ad = WinQueryWindowPtr(hwnd,0);
+  VIEWDATA *ad = WinQueryWindowPtr(hwnd,QWL_USER);
 
   switch (msg) {
@@ -1784 +1785 @@
             oldproc = WinSubclassWindow(ad->hwndFrame,(PFNWP)ViewFrameWndProc);
             if(oldproc)
-                WinSetWindowPtr(ad->hwndFrame,0,(PVOID)oldproc);
+                WinSetWindowPtr(ad->hwndFrame,QWL_USER,(PVOID)oldproc);
             ad->hps = InitWindow(hwnd);
             if(_beginthread(LoadFile,NULL,524288,(PVOID)hwnd) != -1) {
@@ -3867 +3868 @@
           dontclose = ((ad->flags & 4) != 0) ? TRUE : FALSE;
           FreeViewerMem(hwnd);
-          WinSetWindowPtr(hwnd,0,NULL);
+          WinSetWindowPtr(hwnd,QWL_USER,NULL);
           free(ad);
         }
@@ -3949 +3950 @@
       if(ad->flags & 16)
         ad->hex = TRUE;
-      WinSetWindowPtr(hwndClient,0,(PVOID)ad);
+      WinSetWindowPtr(hwndClient,QWL_USER,(PVOID)ad);
       if(Firsttime) {
 
@@ -4004 +4005 @@
       ad->ignoreftp = IgnoreFTP;
       memcpy(ad->colors,Colors,sizeof(LONG) * COLORS_MAX);
-      WinSetWindowPtr(hwndClient,0,(PVOID)ad);
+      WinSetWindowPtr(hwndClient,QWL_USER,(PVOID)ad);
       if(WinSendMsg(hwndClient,UM_SETUP,MPVOID,MPVOID)) {
 //        DosSleep(64L);