Changeset 10260 for trunk/src

Timestamp:

Oct 2, 2003, 12:39:59 PM (22 years ago)

Author:

sandervl

Message:

PF: Fixed bug when calling function by pointer in MRU funcs

File:

• trunk/src/comctl32/comctl32undoc.c (modified) (4 diffs)

trunk/src/comctl32/comctl32undoc.c

@@ -612 +612 @@
 
 
+#ifdef __WIN32OS2__
+typedef int (* WIN32API lpComp1)(LPCSTR , LPCSTR );
+typedef int (* WIN32API lpComp2)(LPCVOID, LPCVOID, DWORD);
+#endif
+
 /**************************************************************************
  *                  FindMRUData [COMCTL32.169]
@@ -649 +654 @@
     for(i=0; i<mp->cursize; i++) {
         if (mp->extview.dwFlags & MRUF_BINARY_LIST) {
+#ifdef __WIN32OS2__
+            if (!(lpComp2)mp->extview.lpfnCompare(lpData, &mp->array[i]->datastart,
+#else
             if (!mp->extview.lpfnCompare(lpData, &mp->array[i]->datastart,
+#endif
                                          cbData))
                 break;
@@ -655 +664 @@
         else {
             if(mp->isUnicode) {
+#ifdef __WIN32OS2__
+                if (!((lpComp1)(mp->extview.lpfnCompare))(lpData, &mp->array[i]->datastart))
+#else
                 if (!mp->extview.lpfnCompare(lpData, &mp->array[i]->datastart))
+#endif
                     break;
             } else {
@@ -666 +679 @@
                                     itemA, len, NULL, NULL);
 
+#ifdef __WIN32OS2__
+                cmp = ((lpComp1)(mp->extview.lpfnCompare))(dataA, itemA);
+#else
                 cmp = mp->extview.lpfnCompare(dataA, itemA);
+#endif
                 COMCTL32_Free(itemA);
                 if(!cmp)