Changeset 2126 for trunk/src/comctl32

Timestamp:

Dec 18, 1999, 9:57:01 PM (26 years ago)

Author:

achimha

Message:

WINE 991212 updates - treeview missing

Location:

trunk/src/comctl32

Files:

• comctl32.def (modified) (2 diffs)
• comctl32.h (modified) (4 diffs)
• comctl32undoc.c (modified) (8 diffs)
• datetime.c (modified) (3 diffs)
• draglist.c (modified) (3 diffs)
• imagelist.c (modified) (8 diffs)
• listview.c (modified) (13 diffs)
• propsheet.c (modified) (70 diffs)
• rebar.c (modified) (7 diffs)
• resource.asm (modified) (25 diffs)
• rsrc.rc (modified) (4 diffs)
• tab.c (modified) (4 diffs)
• toolbar.c (modified) (41 diffs)

trunk/src/comctl32/comctl32.def

@@ -1 @@
-; $Id: comctl32.def,v 1.14 1999-11-21 11:04:36 achimha Exp $
+; $Id: comctl32.def,v 1.15 1999-12-18 20:56:57 achimha Exp $
 LIBRARY COMCTL32 INITINSTANCE
 DESCRIPTION 'COMCTL32 Common Controls Library'
@@ -143 +143 @@
 
   comctl32_410        = _comctl32_410@16           @410
-  InitMUILanguage     = _InitMUILanguage@4         @500 ;should be 70
+  comctl32_411        = _comctl32_411@12           @411
+  comctl32_412        = _comctl32_412@12           @412
+  comctl32_413        = _comctl32_413@16           @413
+  InitMUILanguage     = _InitMUILanguage@4         @414 ;should be 70

trunk/src/comctl32/comctl32.h

@@ -1 @@
-/* $Id: comctl32.h,v 1.10 1999-11-14 10:58:37 achimha Exp $ */
+/* $Id: comctl32.h,v 1.11 1999-12-18 20:56:58 achimha Exp $ */
 /*
  * Win32 common controls implementation
@@ -12 +12 @@
  */
 
-/* Status: WINE 990923 */
+/* Status: WINE 991212 */
 
 #ifndef _H_COMCTL32
@@ -74 +74 @@
 #define IDC_SUNKEN_LINE   12326
 
+#define IDS_CLOSE 4160
+
 /* Toolbar customization dialog */
 #define IDD_TBCUSTOMIZE     200
@@ -110 +112 @@
 #define IDM_DEC                         312
 
+/* treeview checkboxes */
+#define IDT_CHECK 401
+
 #endif /* _H_COMCTL32 */

trunk/src/comctl32/comctl32undoc.c

@@ -1 @@
-/* $Id: comctl32undoc.c,v 1.15 1999-11-14 13:09:59 achimha Exp $ */
+/* $Id: comctl32undoc.c,v 1.16 1999-12-18 20:56:58 achimha Exp $ */
 /*
  * Undocumented functions from COMCTL32.DLL
@@ -12 +12 @@
  */
 
-/* WINE 991031 level */
+/* WINE 991212 level */
 
 /* CB: todo
@@ -254 +254 @@
  * lists.
  *
- *
- */
-
-typedef struct tagMRUINFO
-{
-    DWORD  dwParam1;
-    DWORD  dwParam2;
-    DWORD  dwParam3;
-    HKEY   hkeyMain;
-    LPCSTR lpszSubKey;
-    DWORD  dwParam6;
-} MRUINFO, *LPMRUINFO;
-
+ * Stored in the reg. as a set of values under a single key.  Each item in the
+ * list has a value name that is a single char. 'a' - 'z', '{', '|' or '}'.
+ * The order of the list is stored with value name 'MRUList' which is a string
+ * containing the value names (i.e. 'a', 'b', etc.) in the relevant order.
+ */
+
+typedef struct tagCREATEMRULIST
+{
+    DWORD  cbSize;        /* size of struct */
+    DWORD  nMaxItems;     /* max no. of items in list */
+    DWORD  dwFlags;       /* see below */
+    HKEY   hKey;          /* root reg. key under which list is saved */
+    LPCSTR lpszSubKey;    /* reg. subkey */
+    PROC   lpfnCompare;   /* item compare proc */
+} CREATEMRULIST, *LPCREATEMRULIST;
+
+/* dwFlags */
+#define MRUF_STRING_LIST  0 /* list will contain strings */
+#define MRUF_BINARY_LIST  1 /* list will contain binary data */
+#define MRUF_DELAYED_SAVE 2 /* only save list order to reg. is FreeMRUList */
+
+/* If list is a string list lpfnCompare has the following prototype
+ * int CALLBACK MRUCompareString(LPCSTR s1, LPCSTR s2)
+ * for binary lists the prototype is
+ * int CALLBACK MRUCompareBinary(LPCVOID data1, LPCVOID data2, DWORD cbData)
+ * where cbData is the no. of bytes to compare.
+ * Need to check what return value means identical - 0?
+ */
 
 typedef struct tagMRU
@@ -278 +293 @@
 } MRU, *HMRU;
 
-LPVOID WINAPI
-CreateMRUListLazyA (LPMRUINFO lpmi, DWORD dwParam2,
-                    DWORD dwParam3, DWORD dwParam4);
-
-
-/**************************************************************************
- * CreateMRUListA [COMCTL32.151]
- *
- * PARAMS
- *     dwParam
- *
- * RETURNS
- */
-
-LPVOID WINAPI
-CreateMRUListA (LPMRUINFO lpmi)
-{
-     return CreateMRUListLazyA (lpmi, 0, 0, 0);
-}
-
-
+HANDLE WINAPI
+CreateMRUListLazyA (LPCREATEMRULIST lpcml, DWORD dwParam2,
+                    DWORD dwParam3, DWORD dwParam4);
+
+
+/**************************************************************************
+ *              CreateMRUListA [COMCTL32.151]
+ *
+ * PARAMS
+ *     lpcml [I] ptr to CREATEMRULIST structure.
+ *
+ * RETURNS
+ *     Handle to MRU list.
+ */
+HANDLE WINAPI
+CreateMRUListA (LPCREATEMRULIST lpcml)
+{
+     return CreateMRUListLazyA (lpcml, 0, 0, 0);
+}
+
+/**************************************************************************
+ *              FreeMRUListA [COMCTL32.152]
+ *
+ * PARAMS
+ *     hMRUList [I] Handle to list.
+ *
+ */
 DWORD WINAPI
-FreeMRUListA (HMRU hmru)
-{
-//    FIXME (commctrl, "(%p) empty stub!\n", hmru);
+FreeMRUListA (HANDLE hMRUList)
+{
+    FIXME("(%08x) empty stub!\n", hMRUList);
 
 #if 0
     if (!(hmru->dwParam1 & 1001)) {
-        RegSetValueExA (hmru->hKeyMRU, "MRUList", 0, REG_SZ,
-                          hmru->lpszMRUString,
-                          lstrlenA (hmru->lpszMRUString));
+        RegSetValueExA (hmru->hKeyMRU, "MRUList", 0, REG_SZ,
+                          hmru->lpszMRUString,
+                          lstrlenA (hmru->lpszMRUString));
     }
 
@@ -316 +337 @@
 #endif
 
-    return COMCTL32_Free (hmru);
-}
-
-
-
-DWORD WINAPI
-AddMRUData (DWORD dwParam1, DWORD dwParam2, DWORD dwParam3)
-{
-
-//    FIXME (commctrl, "(%lx %lx %lx) empty stub!\n",
-//         dwParam1, dwParam2, dwParam3);
+    return COMCTL32_Free ((LPVOID)hMRUList);
+}
+
+
+/**************************************************************************
+ *              AddMRUData [COMCTL32.167]
+ * 
+ * Add item to MRU binary list.  If item already exists in list them it is
+ * simply moved up to the top of the list and not added again.  If list is
+ * full then the least recently used item is removed to make room.
+ *
+ * PARAMS
+ *     hList [I] Handle to list.
+ *     lpData [I] ptr to data to add.
+ *     cbData [I] no. of bytes of data.
+ *
+ * RETURNS
+ *     No. corresponding to registry name where value is stored 'a' -> 0 etc.
+ *     -1 on error.
+ */
+INT WINAPI
+AddMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData)
+{
+    FIXME("(%08x, %p, %ld) empty stub!\n", hList, lpData, cbData);
 
     return 0;
 }
 
-
-DWORD WINAPI
-FindMRUData (DWORD dwParam1, DWORD dwParam2, DWORD dwParam3, DWORD dwParam4)
-{
-
-//    FIXME (commctrl, "(%lx %lx %lx %lx) empty stub!\n",
-//         dwParam1, dwParam2, dwParam3, dwParam4);
-
+/**************************************************************************
+ *              AddMRUStringA [COMCTL32.153]
+ * 
+ * Add item to MRU string list.  If item already exists in list them it is
+ * simply moved up to the top of the list and not added again.  If list is
+ * full then the least recently used item is removed to make room.
+ *
+ * PARAMS
+ *     hList [I] Handle to list.
+ *     lpszString [I] ptr to string to add.
+ *
+ * RETURNS
+ *     No. corresponding to registry name where value is stored 'a' -> 0 etc.
+ *     -1 on error.
+ */
+INT WINAPI
+AddMRUStringA(HANDLE hList, LPCSTR lpszString)
+{
+    FIXME("(%08x, %s) empty stub!\n", hList, debugstr_a(lpszString));
+
+    return 0;
+}
+
+/**************************************************************************
+ *              DelMRUString [COMCTL32.156]
+ *
+ * Removes item from either string or binary list (despite its name)
+ *
+ * PARAMS
+ *    hList [I] list handle
+ *    nItemPos [I] item position to remove 0 -> MRU
+ *
+ * RETURNS
+ *    TRUE is successful, FALSE if nItemPos is out of range.
+ */
+BOOL WINAPI
+DelMRUString(HANDLE hList, INT nItemPos)
+{
+    FIXME("(%08x, %d): stub\n", hList, nItemPos);
     return TRUE;
 }
 
-
-LPVOID WINAPI
-CreateMRUListLazyA (LPMRUINFO lpmi, DWORD dwParam2, DWORD dwParam3, DWORD dwParam4)
+/**************************************************************************
+ *                  FindMRUData [COMCTL32.169]
+ * 
+ * Searches binary list for item that matches lpData of length cbData.
+ * Returns position in list order 0 -> MRU and if lpRegNum != NULL then value
+ * corresponding to item's reg. name will be stored in it ('a' -> 0).
+ *
+ * PARAMS
+ *    hList [I] list handle
+ *    lpData [I] data to find
+ *    cbData [I] length of data
+ *    lpRegNum [O] position in registry (maybe NULL)
+ *
+ * RETURNS
+ *    Position in list 0 -> MRU.  -1 if item not found.
+ */
+INT WINAPI
+FindMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData, LPINT lpRegNum)
+{
+    FIXME("(%08x, %p, %ld, %p) empty stub!\n",
+           hList, lpData, cbData, lpRegNum);
+
+    return 0;
+}
+
+/**************************************************************************
+ *                  FindMRUStringA [COMCTL32.155]
+ * 
+ * Searches string list for item that matches lpszString.
+ * Returns position in list order 0 -> MRU and if lpRegNum != NULL then value
+ * corresponding to item's reg. name will be stored in it ('a' -> 0).
+ *
+ * PARAMS
+ *    hList [I] list handle
+ *    lpszString [I] string to find
+ *    lpRegNum [O] position in registry (maybe NULL)
+ *
+ * RETURNS
+ *    Position in list 0 -> MRU.  -1 if item not found.
+ */
+INT WINAPI
+FindMRUStringA (HANDLE hList, LPCSTR lpszString, LPINT lpRegNum)
+{
+    FIXME("(%08x, %s, %p) empty stub!\n", hList, debugstr_a(lpszString),
+          lpRegNum);
+
+    return 0;
+}
+
+HANDLE WINAPI
+CreateMRUListLazyA (LPCREATEMRULIST lpcml, DWORD dwParam2, DWORD dwParam3, DWORD dwParam4)
 {
     /* DWORD  dwLocal1;   *
@@ -358 +471 @@
     LPVOID ptr;
 
-//    FIXME (commctrl, "(%p) empty stub!\n", lpmi);
-
-    if (lpmi) {
-//      FIXME (commctrl, "(%lx %lx %lx %lx \"%s\" %lx)\n",
-//             lpmi->dwParam1, lpmi->dwParam2, lpmi->dwParam3,
-//             (DWORD)lpmi->hkeyMain, lpmi->lpszSubKey, lpmi->dwParam6);
-    }
+    FIXME("(%p) empty stub!\n", lpcml);
+
+    if (lpcml == NULL)
+        return 0;
+
+    if (lpcml->cbSize < sizeof(CREATEMRULIST))
+        return 0;
+
+    FIXME("(%lu %lu %lx %lx \"%s\" %p)\n",
+          lpcml->cbSize, lpcml->nMaxItems, lpcml->dwFlags,
+          (DWORD)lpcml->hKey, lpcml->lpszSubKey, lpcml->lpfnCompare);
 
     /* dummy pointer creation */
     ptr = COMCTL32_Alloc (32);
 
-//    FIXME (commctrl, "-- ret = %p\n", ptr);
-
-    return ptr;
+    FIXME("-- ret = %p\n", ptr);
+
+    return (HANDLE)ptr;
+}
+
+/**************************************************************************
+ *                EnumMRUListA [COMCTL32.154]
+ * 
+ * Enumerate item in a list
+ *
+ * PARAMS
+ *    hList [I] list handle
+ *    nItemPos [I] item position to enumerate
+ *    lpBuffer [O] buffer to receive item
+ *    nBufferSize [I] size of buffer
+ *
+ * RETURNS
+ *    For binary lists specifies how many bytes were copied to buffer, for
+ *    string lists specifies full length of string.  Enumerating past the end
+ *    of list returns -1.
+ *    If lpBuffer == NULL or nItemPos is -ve return value is no. of items in
+ *    the list. 
+ */
+INT WINAPI EnumMRUListA(HANDLE hList, INT nItemPos, LPVOID lpBuffer,
+DWORD nBufferSize)
+{
+    FIXME("(%08x, %d, %p, %ld): stub\n", hList, nItemPos, lpBuffer,
+          nBufferSize);
+    return 0;
 }
 
@@ -1976 +2119 @@
 BOOL WINAPI comctl32_410( HWND hw, DWORD b, DWORD c, DWORD d) {
 
-  dprintf(("COMCTL32: comctl32_410 - unimplemented stub\n"));
-   //FIXME_(commctrl)("(%x, %lx, %lx, %lx): stub!\n", hw, b, c, d);
+   FIXME("(%x, %lx, %lx, %lx): stub!\n", hw, b, c, d);
+
+   return TRUE;
+}
+
+/**************************************************************************
+ * comctl32_411 [COMCTL32.411]
+ *
+ * FIXME: What's this supposed to do?
+ *        Parameter 1 is an HWND, you're on your own for the rest.
+ */
+
+BOOL WINAPI comctl32_411( HWND hw, DWORD b, DWORD c) {
+
+   FIXME("(%x, %lx, %lx): stub!\n", hw, b, c);
+
+   return TRUE;
+}
+
+/**************************************************************************
+ * comctl32_412 [COMCTL32.412]
+ *
+ * FIXME: What's this supposed to do?
+ *        Parameter 1 is an HWND, you're on your own for the rest.
+ */
+
+BOOL WINAPI comctl32_412( HWND hwnd, DWORD b, DWORD c)
+{
+    FIXME("(%x, %lx, %lx): stub!\n", hwnd, b, c);
+
+    if (IsWindow (hwnd) == FALSE)
+        return FALSE;
+
+    if (b == 0)
+        return FALSE;
+
+
+    return TRUE;
+}
+
+/**************************************************************************
+ * comctl32_413 [COMCTL32.413]
+ *
+ * FIXME: What's this supposed to do?
+ *        Parameter 1 is an HWND, you're on your own for the rest.
+ */
+
+BOOL WINAPI comctl32_413( HWND hw, DWORD b, DWORD c, DWORD d) {
+
+   FIXME("(%x, %lx, %lx, %lx): stub!\n", hw, b, c, d);
 
    return TRUE;
@@ -1989 +2180 @@
  */
 
-BOOL WINAPI InitMUILanguage( DWORD a ) {
-
-   //FIXME_(commctrl)("(%lx): stub!\n", a);
-  dprintf(("COMCTL32: InitMUILanguage - unimplemented stub\n"));
+BOOL WINAPI InitMUILanguage( LANGID uiLang) {
+
+   FIXME("(%04x): stub!\n", uiLang);
 
    return TRUE;
 }
-

trunk/src/comctl32/datetime.c

@@ -1 @@
-/* $Id: datetime.c,v 1.5 1999-10-24 22:49:42 sandervl Exp $ */
+/* $Id: datetime.c,v 1.6 1999-12-18 20:56:58 achimha Exp $ */
 /*
  * Date and time picker control
@@ -15 +15 @@
  */
 
+/* WINE 991212 level */
+
 #include "winbase.h"
 #include "commctrl.h"
@@ -133 +135 @@
   SIZE size;
   BOOL prssed=FALSE;
-  COLORREF oldBk;
+  COLORREF oldBk = 0;
 
 

trunk/src/comctl32/draglist.c

@@ -13 +13 @@
  */
 
+/* WINE 991212 level */
+
 #include "commctrl.h"
+
+static DWORD dwLastScrollTime = 0;
 
 
 BOOL WINAPI MakeDragList (HWND hwndLB)
 {
-//    FIXME (commctrl, "(0x%x)\n", hwndLB);
+    FIXME("(0x%x)\n", hwndLB);
 
 
@@ -27 +31 @@
 VOID WINAPI DrawInsert (HWND hwndParent, HWND hwndLB, INT nItem)
 {
-//    FIXME (commctrl, "(0x%x 0x%x %d)\n", hwndParent, hwndLB, nItem);
+    FIXME("(0x%x 0x%x %d)\n", hwndParent, hwndLB, nItem);
 
 
@@ -35 +39 @@
 INT WINAPI LBItemFromPt (HWND hwndLB, POINT pt, BOOL bAutoScroll)
 {
-//    FIXME (commctrl, "(0x%x %ld x %ld %s)\n",
-//         hwndLB, pt.x, pt.y, bAutoScroll ? "TRUE" : "FALSE");
+    RECT rcClient;
+    INT nIndex;
+    DWORD dwScrollTime;
 
+    FIXME("(0x%x %ld x %ld %s)\n",
+           hwndLB, pt.x, pt.y, bAutoScroll ? "TRUE" : "FALSE");
+
+    ScreenToClient (hwndLB, &pt);
+    GetClientRect (hwndLB, &rcClient);
+    nIndex = (INT)SendMessageA (hwndLB, LB_GETTOPINDEX, 0, 0);
+
+    if (PtInRect (&rcClient, pt))
+    {
+        /* point is inside -- get the item index */
+        while (TRUE)
+        {
+            if (SendMessageA (hwndLB, LB_GETITEMRECT, nIndex, (LPARAM)&rcClient) == LB_ERR)
+                return -1;
+
+            if (PtInRect (&rcClient, pt))
+                return nIndex;
+
+            nIndex++;
+        }
+    }
+    else
+    {
+        /* point is outside */
+        if (!bAutoScroll)
+            return -1;
+
+        if ((pt.x > rcClient.right) || (pt.x < rcClient.left))
+            return -1;
+
+        if (pt.y < 0)
+            nIndex--;
+        else
+            nIndex++;
+
+        dwScrollTime = GetTickCount ();
+
+        if ((dwScrollTime - dwLastScrollTime) < 200)
+            return -1;
+
+        dwLastScrollTime = dwScrollTime;
+
+        SendMessageA (hwndLB, LB_SETTOPINDEX, (WPARAM)nIndex, 0);
+    }
 
     return -1;
 }
 
+
+static LRESULT CALLBACK
+DRAGLIST_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+
+    return FALSE;
+}

trunk/src/comctl32/imagelist.c

@@ -1 @@
-/* $Id: imagelist.c,v 1.9 1999-11-21 11:04:36 achimha Exp $ */
+/* $Id: imagelist.c,v 1.10 1999-12-18 20:56:58 achimha Exp $ */
 /*
  *  ImageList implementation
@@ -30 +30 @@
 */
 
-/* WINE 990923 level */
+/* WINE 991212 level */
 
 /* This must be defined because the HIMAGELIST type is just a pointer
@@ -42 +42 @@
 #include "commctrl.h"
 #include "comctl32.h"
+#include "winerror.h"
 
 #define _MAX(a,b) (((a)>(b))?(a):(b))
@@ -1910 +1911 @@
 HIMAGELIST WINAPI ImageList_Read (PVOID pstm)
 {
+//    HRESULT errCode;
+//    ULONG ulRead;
+//    ILHEAD ilHead;
+//    HIMAGELIST himl;
+
+
     dprintf(("ImageList_Read empty stub!\n"));
 
-    return NULL;
+//    errCode = IStream_Read (pstm, &ilHead, sizeof(ILHEAD), &ulRead);
+//    if (errCode != S_OK)
+//    return NULL;
+
+    FIXME("Magic: 0x%x\n", ilHead.usMagic);
+
+//    himl = ImageList_Create (32, 32, ILD_NORMAL, 2, 2);
+
+//    return himl;
+  return 0;
 }
 
@@ -2395 +2411 @@
         BitBlt (hdcBitmap, 0, 0, nCopyCount * himl->cx, himl->cy,
                   hdcImageList, 0, 0, SRCCOPY);
-
+#if 0
         /* delete 'empty' image space */
         SetBkColor (hdcBitmap, RGB(255, 255, 255));
@@ -2401 +2417 @@
         PatBlt (hdcBitmap,  nCopyCount * himl->cx, 0,
                   (nNewCount - nCopyCount) * himl->cx, himl->cy, BLACKNESS);
-
+#endif
         DeleteObject (himl->hbmImage);
         himl->hbmImage = hbmNewBitmap;
@@ -2420 +2436 @@
             BitBlt (hdcBitmap, 0, 0, nCopyCount * himl->cx, himl->cy,
                       hdcImageList, 0, 0, SRCCOPY);
-
+#if 0
             /* delete 'empty' image space */
             SetBkColor (hdcBitmap, RGB(255, 255, 255));
@@ -2426 +2442 @@
             PatBlt (hdcBitmap,  nCopyCount * himl->cx, 0,
                       (nNewCount - nCopyCount) * himl->cx, himl->cy, BLACKNESS);
-
+#endif
             DeleteObject (himl->hbmMask);
             himl->hbmMask = hbmNewBitmap;

trunk/src/comctl32/listview.c

@@ -19 +19 @@
  *
  * Data structure:
- *   LISTVIEW_SetItemCount : empty stub 
+ *   LISTVIEW_SetItemCount : not completed
  * 
  * Unicode:
@@ -34 +34 @@
  *   LISTVIEW_GetISearchString : not implemented 
  *   LISTVIEW_GetBkImage : not implemented
- *   LISTVIEW_GetColumnOrderArray : not implemented
- *   LISTVIEW_SetColumnOrderArray : not implemented
+ *   LISTVIEW_GetColumnOrderArray : simple hack only
+ *   LISTVIEW_SetColumnOrderArray : simple hack only
  *   LISTVIEW_Arrange : empty stub
  *   LISTVIEW_ApproximateViewRect : incomplete
@@ -43 +43 @@
  */
 
-/* WINE 991114 level */
+/* WINE 991212 level */
 
 #include <string.h>
@@ -2038 +2038 @@
   nLast = nItem + LISTVIEW_GetCountPerColumn(hwnd) + 1;
   nLast = min(nLast, GETITEMCOUNT(infoPtr));
+
+//AH required for Odin?
+#if 0
+  /* send cache hint notification */
+  if (GetWindowLongA(hwnd,GWL_STYLE) & LVS_OWNERDATA)
+  {
+    NMLVCACHEHINT nmlv;
+
+    nmlv.hdr.hwndFrom = hwnd;
+    nmlv.hdr.idFrom = GetWindowLongA(hwnd,GWL_ID);
+    nmlv.hdr.code = LVN_ODCACHEHINT;
+    nmlv.iFrom = nItem;
+    nmlv.iTo   = nLast;
+
+    SendMessageA(GetParent(hwnd), WM_NOTIFY, (WPARAM)nmlv.hdr.idFrom,
+                 (LPARAM)&nmlv);
+  }
+#endif
+
   for (; nItem < nLast; nItem++)
   {
@@ -3332 +3351 @@
 
 /* LISTVIEW_GetColumnW */
-/* LISTVIEW_GetColumnOrderArray */
+
+static LRESULT LISTVIEW_GetColumnOrderArray(HWND hwnd, INT iCount, LPINT lpiArray)
+{
+/*  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0); */
+    INT i;
+
+    if (!lpiArray)
+        return FALSE;
+
+    /* little hack */
+    for (i = 0; i < iCount; i++)
+        lpiArray[i] = i;
+
+    return TRUE;
+}
 
 /***
@@ -3573 +3606 @@
               }
               strncpy(lpLVItem->pszText, dispInfo.item.pszText, lpLVItem->cchTextMax);
+              lpLVItem->pszText[lpLVItem->cchTextMax-1]='\0';
             }
             else if (lpLVItem->mask & LVIF_TEXT)
             {
               strncpy(lpLVItem->pszText, lpItem->pszText, lpLVItem->cchTextMax);
+              lpLVItem->pszText[lpLVItem->cchTextMax-1]='\0';
             }
 
@@ -3668 +3703 @@
               }
               strncpy(lpLVItem->pszText, dispInfo.item.pszText, lpLVItem->cchTextMax);
+              lpLVItem->pszText[lpLVItem->cchTextMax-1]='\0';
             }
             else if (lpLVItem->mask & LVIF_TEXT)
             {
               strncpy(lpLVItem->pszText, lpSubItem->pszText, lpLVItem->cchTextMax);
+              lpLVItem->pszText[lpLVItem->cchTextMax-1]='\0';
             }
           }
@@ -5125 +5162 @@
 
 /* LISTVIEW_SetColumnW */
-/* LISTVIEW_SetColumnOrderArray */
+
+/***
+ * DESCRIPTION:
+ * Sets the column order array
+ *
+ * PARAMETERS:
+ * [I] HWND : window handle
+ * [I] INT : number of elements in column order array
+ * [I] INT : pointer to column order array
+ *
+ * RETURN:
+ *   SUCCESS : TRUE
+ *   FAILURE : FALSE
+ */
+static LRESULT LISTVIEW_SetColumnOrderArray(HWND hwnd, INT iCount, LPINT lpiArray)
+{
+/*  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0); */
+
+//    FIXME("iCount %d lpiArray %p\n", iCount, lpiArray);
+
+    if (!lpiArray)
+        return FALSE;
+
+    return TRUE;
+}
 
 /***
@@ -5318 +5379 @@
  * PARAMETER(S):
  * [I] HWND : window handle
- * [I] INT : item count (prjected number of items)
+ * [I] INT : item count (projected number of items)
  * [I] DWORD : update flags
  *
@@ -5328 +5389 @@
 {
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLongA(hwnd, 0);
+
 //  FIXME("(%d %08lx)empty stub!\n", nItems, dwFlags);
+
   if (nItems == 0)
     return LISTVIEW_DeleteAllItems (hwnd);
+
+  if (GetWindowLongA(hwnd, GWL_STYLE) & LVS_OWNERDATA)
+  {
+//    FIXME("LVS_OWNERDATA is set!\n");
+  }
+  else
+  {
   if (nItems > GETITEMCOUNT(infoPtr))
 {
     /* append items */
 //    FIXME("append items\n");
+
   }
   else if (nItems < GETITEMCOUNT(infoPtr))
@@ -5340 +5411 @@
     /* remove items */
 //    FIXME("remove items\n");
-  }
+
+  }
+  }
+
   return TRUE;
 }
@@ -6950 +7024 @@
 
   case LVM_GETCOLUMNORDERARRAY:
-    //FIXME("Unimplemented msg LVM_GETCOLUMNORDERARRAY\n");
-    return 0;
-
+    return LISTVIEW_GetColumnOrderArray(hwnd, (INT)wParam, (LPINT)lParam);
 
   case LVM_GETCOLUMNWIDTH:
@@ -7082 +7154 @@
 
   case LVM_SETCOLUMNORDERARRAY:
-    //FIXME("Unimplemented msg LVM_SETCOLUMNORDERARRAY\n");
-    return 0;
+    return LISTVIEW_SetColumnOrderArray(hwnd, (INT)wParam, (LPINT)lParam);
 
   case LVM_SETCOLUMNWIDTH:

trunk/src/comctl32/propsheet.c

@@ -1 @@
-/* $Id: propsheet.c,v 1.16 1999-11-27 18:14:37 achimha Exp $ */
+/* $Id: propsheet.c,v 1.17 1999-12-18 20:56:59 achimha Exp $ */
 /*
  * Property Sheets
@@ -13 +13 @@
  */
 
-/* WINE 991114 level */
+/* WINE 991212 level */
 
 /* CB: Odin problems:
@@ -23 +23 @@
 #include "commctrl.h"
 #include "prsht.h"
+#include "dialog.h"
+#include "win.h"
 #include "winnls.h"
 #include "comctl32.h"
-
+#include "heap.h"
 
 /******************************************************************************
@@ -41 +43 @@
 typedef struct tagPropPageInfo
 {
-  int index; /* corresponds to the index in ppshheader->ppsp */
   HPROPSHEETPAGE hpage; /* to keep track of pages not passed to PropertySheet */
   HWND hwndPage;
@@ -48 +49 @@
   BOOL hasHelp;
   BOOL useCallback;
+  BOOL hasIcon;
 } PropPageInfo;
 
@@ -55 +57 @@
   int nPages;
   int active_page;
-  LPCPROPSHEETHEADERA ppshheader;
+  LPPROPSHEETHEADERA ppshheader;
   BOOL isModeless;
   BOOL hasHelp;
@@ -62 +64 @@
   BOOL restartWindows;
   BOOL rebootSystem;
+  BOOL activeValid;
   PropPageInfo* proppage;
   int x;
@@ -84 +87 @@
 #define MAX_CAPTION_LENGTH 255
 #define MAX_TABTEXT_LENGTH 255
-
+#define MAX_BUTTONTEXT_LENGTH 64
 
 /******************************************************************************
@@ -102 +105 @@
 static int PROPSHEET_CreatePage(HWND hwndParent, int index,
                                 const PropSheetInfo * psInfo,
-                                LPCPROPSHEETPAGEA ppshpage,
-                                BOOL showPage);
+                                LPPROPSHEETPAGEA ppshpage);
 static BOOL PROPSHEET_ShowPage(HWND hwndDlg, int index, PropSheetInfo * psInfo);
 static PADDING_INFO PROPSHEET_GetPaddingInfo(HWND hwndDlg);
@@ -109 +111 @@
 static BOOL PROPSHEET_Next(HWND hwndDlg);
 static BOOL PROPSHEET_Finish(HWND hwndDlg);
-static BOOL PROPSHEET_Apply(HWND hwndDlg);
-static void PROPSHEET_Cancel(HWND hwndDlg);
+static BOOL PROPSHEET_Apply(HWND hwndDlg, LPARAM lParam);
+static void PROPSHEET_Cancel(HWND hwndDlg, LPARAM lParam);
 static void PROPSHEET_Help(HWND hwndDlg);
 static void PROPSHEET_Changed(HWND hwndDlg, HWND hwndDirtyPage);
@@ -123 +125 @@
 static LRESULT PROPSHEET_QuerySiblings(HWND hwndDlg,
                                        WPARAM wParam, LPARAM lParam);
-static LPCPROPSHEETPAGEA PROPSHEET_GetPSPPage(const PropSheetInfo * psInfo,
-                                              int index);
 static BOOL PROPSHEET_AddPage(HWND hwndDlg,
                               HPROPSHEETPAGE hpage);
@@ -135 +135 @@
 static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags);
 static PADDING_INFO PROPSHEET_GetPaddingInfoWizard(HWND hwndDlg);
+static BOOL PROPSHEET_IsDialogMessage(HWND hwnd, LPMSG lpMsg);
+static INT PROPSHEET_DoDialogBox( HWND hwnd, HWND owner);
 
 BOOL WINAPI
@@ -155 +157 @@
   psInfo->isModeless = dwFlags & PSH_MODELESS;
   psInfo->ppshheader = lppsh;
+  psInfo->ppshheader = COMCTL32_Alloc(sizeof(PROPSHEETHEADERA));
+  *psInfo->ppshheader = *lppsh;
+
+  if (HIWORD(lppsh->pszCaption))
+     psInfo->ppshheader->pszCaption = HEAP_strdupA( GetProcessHeap(),
+                                               0, lppsh->pszCaption );
+
   psInfo->nPages = lppsh->nPages;
 
@@ -164 +173 @@
   else
     psInfo->active_page = lppsh->u2.nStartPage;
+
+  if (psInfo->active_page < 0 || psInfo->active_page >= psInfo->nPages)
+     psInfo->active_page = 0;
 
   psInfo->restartWindows = FALSE;
   psInfo->rebootSystem = FALSE;
   psInfo->hImageList = 0;
+  psInfo->activeValid = FALSE;
 
   return TRUE;
@@ -187 +200 @@
   int width, height;
 
-  if (psInfo->ppshheader->dwFlags & PSH_PROPSHEETPAGE)
-    psInfo->proppage[index].hpage = 0;
+  psInfo->proppage[index].hpage = (HPROPSHEETPAGE)lppsp;
   psInfo->proppage[index].hwndPage = 0;
   psInfo->proppage[index].isDirty = FALSE;
@@ -198 +210 @@
   psInfo->proppage[index].useCallback = dwFlags & PSP_USECALLBACK;
   psInfo->proppage[index].hasHelp = dwFlags & PSP_HASHELP;
+  psInfo->proppage[index].hasIcon = dwFlags & (PSP_USEHICON | PSP_USEICONID);
 
   /* as soon as we have a page with the help flag, set the sheet flag on */
@@ -320 +333 @@
       hIcon = lppsp->u2.hIcon;
 
-    if (psInfo->hImageList == 0)
-      psInfo->hImageList = ImageList_Create(icon_cx, icon_cy, ILC_COLOR, 1, 1);
-
-    ImageList_AddIcon(psInfo->hImageList, hIcon);
+  if ( hIcon )
+    {
+      if (psInfo->hImageList == 0 )
+        psInfo->hImageList = ImageList_Create(icon_cx, icon_cy, ILC_COLOR, 1, 1);
+
+      ImageList_AddIcon(psInfo->hImageList, hIcon);
+    }
+
   }
 
   return TRUE;
+}
+
+/******************************************************************************
+ *            PROPSHEET_DoDialogBox
+ *
+ * Copied from windows/dialog.c:DIALOG_DoDialogBox
+ */
+static INT PROPSHEET_DoDialogBox( HWND hwnd, HWND owner)
+{
+   WND * wndPtr;
+   DIALOGINFO * dlgInfo;
+   MSG msg;
+   INT retval;
+
+//AH: that WINE internal - design violation!!1
+#if 0
+     /* Owner must be a top-level window */
+   owner = WIN_GetTopParent( owner );
+   if (!(wndPtr = WIN_FindWndPtr( hwnd ))) return -1;
+   dlgInfo = (DIALOGINFO *)wndPtr->wExtra;
+
+   if (!dlgInfo->flags & DF_END) /* was EndDialog called in WM_INITDIALOG ? */
+   {
+       EnableWindow( owner, FALSE );
+       ShowWindow( hwnd, SW_SHOW );
+       while (GetMessageA(&msg, 0, 0, 0))
+       {
+           if (!PROPSHEET_IsDialogMessage( hwnd, &msg))
+           {
+               TranslateMessage( &msg );
+               DispatchMessageA( &msg );
+           }
+           if (dlgInfo->flags & DF_END) break;
+       }
+       EnableWindow( owner, TRUE );
+   }
+   retval = dlgInfo->idResult; 
+
+   WIN_ReleaseWndPtr(wndPtr);
+#endif
+   DestroyWindow( hwnd );
+   return retval;
 }
 
@@ -335 +394 @@
  */
 
-//AH: WINE 990923 not merged due to changes from CB
+//AH: WINE 9912123 not merged due to design violation (internal WINE structures used)
 
 BOOL PROPSHEET_CreateDialog(PropSheetInfo* psInfo)
 {
+#if 0
   LRESULT ret;
   LPCVOID template;
+  LPVOID temp = 0;
   HRSRC hRes;
-
-  if (psInfo->useCallback)
-    (*(psInfo->ppshheader->pfnCallback))(0, PSCB_PRECREATE, (LPARAM)template);
-
-  if (!(hRes = FindResourceA(COMCTL32_hModule,
-                            MAKEINTRESOURCEA(IDD_PROPSHEET),
+  DWORD resSize;
+  WORD resID = IDD_PROPSHEET;
+
+  if (psInfo->ppshheader->dwFlags & PSH_WIZARD)
+    resID = IDD_WIZARD;
+
+  if(!(hRes = FindResourceA(COMCTL32_hModule,
+                            MAKEINTRESOURCEA(resID),
                             RT_DIALOGA)))
     return FALSE;
 
-  if (!(template = (LPVOID)LoadResource(COMCTL32_hModule, hRes)))
+  if(!(template = (LPVOID)LoadResource(COMCTL32_hModule, hRes)))
     return FALSE;
 
+  /*
+   * Make a copy of the dialog template.
+   */
+  resSize = SizeofResource(COMCTL32_hModule, hRes);
+
+  temp = COMCTL32_Alloc(resSize);
+
+  if (!temp)
+    return FALSE;
+
+  memcpy(temp, template, resSize);
+
   if (psInfo->useCallback)
-    (*(psInfo->ppshheader->pfnCallback))(0, PSCB_PRECREATE, (LPARAM)template);
+    (*(psInfo->ppshheader->pfnCallback))(0, PSCB_PRECREATE, (LPARAM)temp);
+
+  ret = CreateDialogIndirectParamA(psInfo->ppshheader->hInstance,
+                                     (LPDLGTEMPLATEA) temp,
+                                     psInfo->ppshheader->hwndParent,
+                                     (DLGPROC) PROPSHEET_DialogProc,
+                                     (LPARAM)psInfo);
+
+  if (!(psInfo->ppshheader->dwFlags & PSH_MODELESS))
+     ret = PROPSHEET_DoDialogBox((HWND)ret, psInfo->ppshheader->hwndParent);
+ 
+  COMCTL32_Free(temp);
+
+  return ret;
+#endif
+  LRESULT ret;
+  LPCVOID template;
+  LPVOID temp = 0;
+  HRSRC hRes;
+  DWORD resSize;
+  WORD resID = IDD_PROPSHEET;
+
+  if (psInfo->ppshheader->dwFlags & PSH_WIZARD)
+    resID = IDD_WIZARD;
+
+  if(!(hRes = FindResourceA(COMCTL32_hModule,
+                            MAKEINTRESOURCEA(resID),
+                            RT_DIALOGA)))
+    return FALSE;
+
+  if(!(template = (LPVOID)LoadResource(COMCTL32_hModule, hRes)))
+    return FALSE;
+
+  /*
+   * Make a copy of the dialog template.
+   */
+  resSize = SizeofResource(COMCTL32_hModule, hRes);
+
+  temp = COMCTL32_Alloc(resSize);
+
+  if (!temp)
+    return FALSE;
+
+  memcpy(temp, template, resSize);
+
+  if (psInfo->useCallback)
+    (*(psInfo->ppshheader->pfnCallback))(0, PSCB_PRECREATE, (LPARAM)temp);
 
   if (psInfo->ppshheader->dwFlags & PSH_MODELESS)
     ret = CreateDialogIndirectParamA(psInfo->ppshheader->hInstance,
-                                     (LPDLGTEMPLATEA) template,
+                                     (LPDLGTEMPLATEA) temp,
                                      psInfo->ppshheader->hwndParent,
                                      (DLGPROC) PROPSHEET_DialogProc,
@@ -365 +486 @@
   else
     ret = DialogBoxIndirectParamA(psInfo->ppshheader->hInstance,
-                                  (LPDLGTEMPLATEA) template,
+                                  (LPDLGTEMPLATEA) temp,
                                   psInfo->ppshheader->hwndParent,
                                   (DLGPROC) PROPSHEET_DialogProc,
                                   (LPARAM)psInfo);
+
+  COMCTL32_Free(temp);
 
   return ret;
@@ -840 +963 @@
   TCITEMA item;
   int i, nTabs;
+  int iImage = 0;
   char tabtext[MAX_TABTEXT_LENGTH] = "Tab text";
 
@@ -853 +977 @@
   if (psInfo->hImageList)
   {
-    item.mask |= TCIF_IMAGE;
     SendMessageA(hwndTabCtrl, TCM_SETIMAGELIST, 0, (LPARAM)psInfo->hImageList);
   }
@@ -859 +982 @@
   for (i = 0; i < nTabs; i++)
   {
-    item.iImage = i;
+    if ( psInfo->proppage[i].hasIcon )
+    {
+      item.mask |= TCIF_IMAGE;
+      item.iImage = iImage++;
+    }
+    else
+    {
+      item.mask &= ~TCIF_IMAGE;
+    }
 
     WideCharToMultiByte(CP_ACP, 0,
@@ -879 +1010 @@
                                 int index,
                                 const PropSheetInfo * psInfo,
-                                LPCPROPSHEETPAGEA ppshpage,
-                                BOOL showPage)
+                                LPPROPSHEETPAGEA ppshpage)
 {
   DLGTEMPLATE* pTemplate;
@@ -915 +1045 @@
   }
 
-  if (((MyDLGTEMPLATEEX*)pTemplate)->signature == 0xFFFF)
-  {
-    ((MyDLGTEMPLATEEX*)pTemplate)->style |= WS_CHILD;
+ if (((MyDLGTEMPLATEEX*)pTemplate)->signature == 0xFFFF)
+  {
+    ((MyDLGTEMPLATEEX*)pTemplate)->style |= WS_CHILD | DS_CONTROL;
     ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~DS_MODALFRAME;
     ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~WS_CAPTION;
@@ -923 +1053 @@
     ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~WS_POPUP;
     ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~WS_DISABLED;
+    ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~WS_VISIBLE;
   }
   else
   {
-    pTemplate->style |= WS_CHILD;
+    pTemplate->style |= WS_CHILD | DS_CONTROL;
     pTemplate->style &= ~DS_MODALFRAME;
     pTemplate->style &= ~WS_CAPTION;
@@ -932 +1063 @@
     pTemplate->style &= ~WS_POPUP;
     pTemplate->style &= ~WS_DISABLED;
+    pTemplate->style &= ~WS_VISIBLE;
   }
 
@@ -972 +1104 @@
                0, 0, SWP_NOSIZE);
 
-  if (showPage)
-  {
-    NMHDR hdr;
-
-    hdr.hwndFrom = hwndParent;
-    hdr.idFrom = GetWindowLongA(hwndParent,GWL_ID);
-    hdr.code = PSN_SETACTIVE;
-
-    /*
-     * Send the notification before showing the page.
-     */
-    SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr);
-
-    ShowWindow(hwndPage, SW_SHOW);
-  }
-  else
-    ShowWindow(hwndPage, SW_HIDE);
-
   return TRUE;
 }
@@ -1001 +1115 @@
 {
   if (index == psInfo->active_page)
+    {
+      if (GetTopWindow(hwndDlg) != psInfo->proppage[index].hwndPage)
+          SetWindowPos(psInfo->proppage[index].hwndPage, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);
     return TRUE;
-
-  ShowWindow(psInfo->proppage[psInfo->active_page].hwndPage, SW_HIDE);
-
-  if (psInfo->proppage[index].hwndPage != 0)
-    ShowWindow(psInfo->proppage[index].hwndPage, SW_SHOW);
-  else
-  {
-    LPCPROPSHEETPAGEA ppshpage = PROPSHEET_GetPSPPage(psInfo, index);
-    PROPSHEET_CreatePage(hwndDlg, index, psInfo, ppshpage, TRUE);
+    }
+
+  if (psInfo->active_page != -1)
+     ShowWindow(psInfo->proppage[psInfo->active_page].hwndPage, SW_HIDE);
+
+  if (psInfo->proppage[index].hwndPage == 0)
+  {
+     LPCPROPSHEETPAGEA ppshpage;
+     PSHNOTIFY psn;
+
+     ppshpage = (LPCPROPSHEETPAGEA)psInfo->proppage[index].hpage;
+     PROPSHEET_CreatePage(hwndDlg, index, psInfo, ppshpage);
+
+     psn.hdr.hwndFrom = hwndDlg;
+     psn.hdr.code     = PSN_SETACTIVE;
+     psn.hdr.idFrom   = 0;
+     psn.lParam       = 0;
+
+     /* Send the notification before showing the page. */
+     SendMessageA(psInfo->proppage[index].hwndPage,
+                  WM_NOTIFY, 0, (LPARAM) &psn);
+
+     /*
+      * TODO: check return value. 
+      */
+  }
+
+  ShowWindow(psInfo->proppage[index].hwndPage, SW_SHOW);
+
+  if (!(psInfo->ppshheader->dwFlags & PSH_WIZARD))
+  {
+     HWND hwndTabCtrl;
+
+     /* Synchronize current selection with tab control */
+     hwndTabCtrl = GetDlgItem(hwndDlg, IDC_TABCONTROL);
+     SendMessageA(hwndTabCtrl, TCM_SETCURSEL, index, 0);
   }
 
   psInfo->active_page = index;
+  psInfo->activeValid = TRUE;
 
   return TRUE;
@@ -1024 +1169 @@
 {
   BOOL res;
-  NMHDR hdr;
+  PSHNOTIFY psn;
   HWND hwndPage;
-  HWND hwndBack = GetDlgItem(hwndDlg, IDC_BACK_BUTTON);
   PropSheetInfo* psInfo = (PropSheetInfo*) GetPropA(hwndDlg,
                                                     PropSheetInfoStr);
 
-  if (psInfo->active_page <= 0)
+  if (psInfo->active_page < 0)
      return FALSE;
 
-  hdr.hwndFrom = hwndDlg;
-  hdr.idFrom = GetWindowLongA(hwndDlg,GWL_ID);
-  hdr.code = PSN_WIZBACK;
-
+  psn.hdr.code     = PSN_WIZBACK;
+  psn.hdr.hwndFrom = hwndDlg;
+  psn.hdr.idFrom   = 0;
+  psn.lParam       = 0;
+ 
   hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
 
-  if (SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr) == -1)
+  if (SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn) == -1)
     return FALSE;
 
-  res = PROPSHEET_CanSetCurSel(hwndDlg);
-  if(res != FALSE)
-  {
-    res = PROPSHEET_SetCurSel(hwndDlg, psInfo->active_page - 1, 0);
-  }
-
-  /* if we went to page 0, disable Back button */
-  if (res && (psInfo->active_page == 0))
-    EnableWindow(hwndBack, FALSE);
+  if (psInfo->active_page > 0)
+  {
+     res = PROPSHEET_CanSetCurSel(hwndDlg);
+     if(res != FALSE)
+     {
+       res = PROPSHEET_SetCurSel(hwndDlg, psInfo->active_page - 1, 0);
+     }
+  }
 
   return TRUE;
@@ -1060 +1204 @@
 static BOOL PROPSHEET_Next(HWND hwndDlg)
 {
-  NMHDR hdr;
+  PSHNOTIFY psn;
   HWND hwndPage;
   LRESULT msgResult = 0;
@@ -1066 +1210 @@
                                                     PropSheetInfoStr);
 
-  if (psInfo->active_page < 0 || psInfo->active_page == psInfo->nPages - 1)
+  if (psInfo->active_page < 0)
      return FALSE;
 
-  hdr.hwndFrom = hwndDlg;
-  hdr.idFrom = GetWindowLongA(hwndDlg,GWL_ID);
-  hdr.code = PSN_WIZNEXT;
-
+  psn.hdr.code     = PSN_WIZNEXT;
+  psn.hdr.hwndFrom = hwndDlg;
+  psn.hdr.idFrom   = 0;
+  psn.lParam       = 0;
+ 
   hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
 
-  msgResult = SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr);
-
-//  TRACE("msg result %ld\n", msgResult);
+  msgResult = SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
+
+  TRACE("msg result %ld\n", msgResult);
 
   if (msgResult == -1)
@@ -1095 +1240 @@
 static BOOL PROPSHEET_Finish(HWND hwndDlg)
 {
-  NMHDR hdr;
+  PSHNOTIFY psn;
   HWND hwndPage;
   LRESULT msgResult = 0;
@@ -1104 +1249 @@
      return FALSE;
 
-  hdr.hwndFrom = hwndDlg;
-  hdr.idFrom = GetWindowLongA(hwndDlg,GWL_ID);
-  hdr.code = PSN_WIZFINISH;
-
+  psn.hdr.code     = PSN_WIZFINISH;
+  psn.hdr.hwndFrom = hwndDlg;
+  psn.hdr.idFrom   = 0;
+  psn.lParam       = 0;
+ 
   hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
 
-  msgResult = SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr);
-
-//  TRACE("msg result %ld\n", msgResult);
+  msgResult = SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
+
+  TRACE("msg result %ld\n", msgResult);
 
   if (msgResult != 0)
@@ -1118 +1264 @@
 
   if (psInfo->isModeless)
-    psInfo->active_page = -1;
+    psInfo->activeValid = FALSE;
   else
     EndDialog(hwndDlg, TRUE);
@@ -1128 +1274 @@
  *            PROPSHEET_Apply
  */
-static BOOL PROPSHEET_Apply(HWND hwndDlg)
+static BOOL PROPSHEET_Apply(HWND hwndDlg, LPARAM lParam)
 {
   int i;
-  NMHDR hdr;
   HWND hwndPage;
+  PSHNOTIFY psn;
   LRESULT msgResult;
   PropSheetInfo* psInfo = (PropSheetInfo*) GetPropA(hwndDlg,
@@ -1140 +1286 @@
      return FALSE;
 
-  hdr.hwndFrom = hwndDlg;
-  hdr.idFrom = GetWindowLongA(hwndDlg,GWL_ID);
+  psn.hdr.hwndFrom = hwndDlg;
+  psn.hdr.idFrom   = 0;
+  psn.lParam       = 0;
+ 
 
   /*
    * Send PSN_KILLACTIVE to the current page.
    */
-  hdr.code = PSN_KILLACTIVE;
+  psn.hdr.code = PSN_KILLACTIVE;
 
   hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
 
-  if (SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr) != FALSE)
+  if (SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn) != FALSE)
     return FALSE;
 
@@ -1156 +1304 @@
    * Send PSN_APPLY to all pages.
    */
-  hdr.code = PSN_APPLY;
-
+  psn.hdr.code = PSN_APPLY;
+  psn.lParam   = lParam;
+ 
   for (i = 0; i < psInfo->nPages; i++)
   {
     hwndPage = psInfo->proppage[i].hwndPage;
-    msgResult = SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr);
-
-    if (msgResult == PSNRET_INVALID_NOCHANGEPAGE)
-      return FALSE;
+    if (hwndPage)
+    {
+       msgResult = SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
+       if (msgResult == PSNRET_INVALID_NOCHANGEPAGE)
+          return FALSE;
+    }
+  }
+
+  if(lParam)
+  {
+     psInfo->activeValid = FALSE;
+  }
+  else if(psInfo->active_page >= 0)
+  {
+     psn.hdr.code = PSN_SETACTIVE;
+     psn.lParam   = 0;
+     hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
+     SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
   }
 
@@ -1173 +1336 @@
  *            PROPSHEET_Cancel
  */
-static void PROPSHEET_Cancel(HWND hwndDlg)
+static void PROPSHEET_Cancel(HWND hwndDlg, LPARAM lParam)
 {
   PropSheetInfo* psInfo = (PropSheetInfo*) GetPropA(hwndDlg,
                                                     PropSheetInfoStr);
   HWND hwndPage;
-  NMHDR hdr;
+  PSHNOTIFY psn;
+  int i;
 
   if (psInfo->active_page < 0)
@@ -1184 +1348 @@
 
   hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
-  hdr.hwndFrom = hwndDlg;
-  hdr.idFrom = GetWindowLongA(hwndDlg,GWL_ID);
-  hdr.code = PSN_QUERYCANCEL;
-
-  if (SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr))
+  psn.hdr.code     = PSN_QUERYCANCEL;
+  psn.hdr.hwndFrom = hwndDlg;
+  psn.hdr.idFrom   = 0;
+  psn.lParam       = 0;
+ 
+  if (SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn))
     return;
 
-  hdr.code = PSN_RESET;
-
-  SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr);
+  psn.hdr.code = PSN_RESET;
+  psn.lParam   = lParam;
+ 
+  for (i = 0; i < psInfo->nPages; i++)
+  {
+    hwndPage = psInfo->proppage[i].hwndPage;
+
+    if (hwndPage)
+       SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
+  }
 
   if (psInfo->isModeless)
-    psInfo->active_page = -1; /* makes PSM_GETCURRENTPAGEHWND return NULL */
+  {
+     /* makes PSM_GETCURRENTPAGEHWND return NULL */
+     psInfo->activeValid = FALSE;
+  }
   else
     EndDialog(hwndDlg, FALSE);
@@ -1209 +1384 @@
                                                     PropSheetInfoStr);
   HWND hwndPage;
-  NMHDR hdr;
+  PSHNOTIFY psn;
 
   if (psInfo->active_page < 0)
@@ -1215 +1390 @@
 
   hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
-  hdr.hwndFrom = hwndDlg;
-  hdr.idFrom = GetWindowLongA(hwndDlg,GWL_ID);
-  hdr.code = PSN_HELP;
-
-  SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr);
+  psn.hdr.code     = PSN_HELP;
+  psn.hdr.hwndFrom = hwndDlg;
+  psn.hdr.idFrom   = 0;
+  psn.lParam       = 0;
+ 
+  SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
 }
 
@@ -1332 +1508 @@
                                                     PropSheetInfoStr);
   HWND hwndPage;
-  NMHDR hdr;
-
-  if (!psInfo || psInfo->active_page < 0)
+  PSHNOTIFY psn;
+
+  if (!psInfo)
      return FALSE;
+
+  if (psInfo->active_page < 0)
+     return TRUE;
+
   /*
    * Notify the current page.
    */
   hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
-
-  hdr.hwndFrom = hwndDlg;
-  hdr.idFrom = GetWindowLongA(hwndDlg,GWL_ID);
-  hdr.code = PSN_KILLACTIVE;
-
-  return !SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr);
+  psn.hdr.code     = PSN_KILLACTIVE;
+  psn.hdr.hwndFrom = hwndDlg;
+  psn.hdr.idFrom   = 0;
+  psn.lParam       = 0;
+
+  return !SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
 }
 
@@ -1359 +1539 @@
   HWND hwndPage;
   HWND hwndHelp  = GetDlgItem(hwndDlg, IDHELP);
-  NMHDR hdr;
-
-  if (psInfo->active_page < 0)
-     return FALSE;
-
-  hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
-
-  hdr.hwndFrom = hwndDlg;
-  hdr.idFrom = GetWindowLongA(hwndDlg,GWL_ID);
-  /*
-   * hpage takes precedence over index.
-   */
+
+  /* hpage takes precedence over index */
   if (hpage != NULL)
     index = PROPSHEET_GetPageIndex(hpage, psInfo);
@@ -1389 +1559 @@
   {
     int result;
-    hdr.code = PSN_SETACTIVE;
-
-    result = SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr);
+    PSHNOTIFY psn;
+
+    psn.hdr.code     = PSN_SETACTIVE;
+    psn.hdr.hwndFrom = hwndDlg;
+    psn.hdr.idFrom   = 0;
+    psn.lParam       = 0;
+
+    result = SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
+
     /*
-     * TODO: check return value.
+     * TODO: check return value. 
      */
   }
@@ -1487 +1663 @@
 }
 
-/******************************************************************************
- *            PROPSHEET_GetPSPPage
- */
-static LPCPROPSHEETPAGEA PROPSHEET_GetPSPPage(const PropSheetInfo * psInfo,
-                                              int index)
-{
-  BOOL usePSP = psInfo->ppshheader->dwFlags & PSH_PROPSHEETPAGE;
-  LPCPROPSHEETPAGEA lppsp;
-  int realIndex = psInfo->proppage[index].index;
-
-  if (usePSP)
-  {
-    BYTE* pByte;
-
-    lppsp = psInfo->ppshheader->u3.ppsp;
-
-    pByte = (BYTE*) lppsp;
-
-    pByte += (lppsp->dwSize * realIndex);
-    lppsp = (LPCPROPSHEETPAGEA)pByte;
-  }
-  else
-    lppsp = (LPCPROPSHEETPAGEA) psInfo->ppshheader->u3.phpage[realIndex];
-
-  return lppsp;
-}
 
 /******************************************************************************
@@ -1535 +1685 @@
 
   PROPSHEET_CollectPageInfo(ppsp, psInfo, psInfo->nPages);
-  psInfo->proppage[psInfo->nPages].index = -1;
   psInfo->proppage[psInfo->nPages].hpage = hpage;
 
-  /*
-   * Create the page but don't show it.
-   */
-  PROPSHEET_CreatePage(hwndDlg, psInfo->nPages, psInfo, ppsp, FALSE);
+  if (ppsp->dwFlags & PSP_PREMATURE)
+  {
+     /* Create the page but don't show it */
+     PROPSHEET_CreatePage(hwndDlg, psInfo->nPages, psInfo, ppsp);
+  }
 
   /*
@@ -1558 +1708 @@
 
   psInfo->nPages++;
+
+  /* If it is the only page - show it */
+  if(psInfo->nPages == 1)
+     PROPSHEET_ShowPage(hwndDlg, 0, psInfo);
 
   return TRUE;
@@ -1575 +1729 @@
 
   if (!psInfo) {
-//    FIXME("No psInfo for propertysheet at windows 0x%04x, returning FALSE...\n", hwndDlg);
     return FALSE;
   }
@@ -1589 +1742 @@
   /* Make shure that index is within range */
   if (index < 0 || index >= psInfo->nPages)
-    {
-//      TRACE("Could not find page to remove!\n");
+  {
+      TRACE("Could not find page to remove!\n");
       return FALSE;
-    }
-
-//  TRACE("total pages %d removing page %d active page %d\n",
-//        psInfo->nPages, index, psInfo->active_page);
+  }
+
+  TRACE("total pages %d removing page %d active page %d\n",
+        psInfo->nPages, index, psInfo->active_page);
   /*
    * Check if we're removing the active page.
@@ -1616 +1769 @@
     else
     {
-//      TRACE("Removing the only page, close the dialog!\n");
-
-      if (psInfo->isModeless)
-        psInfo->active_page = -1;
-      else
-        EndDialog(hwndDlg, FALSE);
-
-      return TRUE;
+      psInfo->active_page = -1;
+      if (!psInfo->isModeless)
+      {
+         EndDialog(hwndDlg, FALSE);
+         return TRUE;
+      }
     }
   }
-
-  if (index < psInfo->active_page)
+  else if (index < psInfo->active_page)
     psInfo->active_page--;
 
-  /* Destroy page dialog window.
-   * If it's last page in modal dialog, it has been destroyed by EndDialog
-   */
-  if (psInfo->isModeless || psInfo->nPages > 1)
-     DestroyWindow(psInfo->proppage[index].hwndPage);
-
+  /* Destroy page dialog window */
+  DestroyWindow(psInfo->proppage[index].hwndPage);
+
+  /* Free page resources */
+  if(psInfo->proppage[index].hpage)
+  {
+     PROPSHEETPAGEA* psp = (PROPSHEETPAGEA*)psInfo->proppage[index].hpage;
+
+     if ((psp->dwFlags & PSP_USETITLE) && psInfo->proppage[index].pszText)
+        HeapFree(GetProcessHeap(), 0, (LPVOID)psInfo->proppage[index].pszText);
+
+     DestroyPropertySheetPage(psInfo->proppage[index].hpage);
+  }
+ 
   /* Remove the tab */
   SendMessageA(hwndTabControl, TCM_DELETEITEM, index, 0);
@@ -1642 +1800 @@
   psInfo->proppage = COMCTL32_Alloc(sizeof(PropPageInfo) * psInfo->nPages);
 
-  if (index > 0)
+  if (index > 0)  
     memcpy(&psInfo->proppage[0], &oldPages[0], index * sizeof(PropPageInfo));
 
@@ -1664 +1822 @@
 static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags)
 {
-  HWND hwndButton;
-
-//  TRACE("%ld\n", dwFlags);
+  HWND hwndBack   = GetDlgItem(hwndDlg, IDC_BACK_BUTTON);
+  HWND hwndNext   = GetDlgItem(hwndDlg, IDC_NEXT_BUTTON);
+  HWND hwndFinish = GetDlgItem(hwndDlg, IDC_FINISH_BUTTON);
+
+  TRACE("%ld\n", dwFlags);
+
+  EnableWindow(hwndBack, FALSE);
+  EnableWindow(hwndNext, FALSE);
+  EnableWindow(hwndFinish, FALSE);
 
   if (dwFlags & PSWIZB_BACK)
-  {
-    hwndButton = GetDlgItem(hwndDlg, IDC_BACK_BUTTON);
-    EnableWindow(hwndButton, TRUE);
-  }
+    EnableWindow(hwndBack, TRUE);
 
   if (dwFlags & PSWIZB_NEXT)
   {
     /* Hide the Finish button */
-    hwndButton = GetDlgItem(hwndDlg, IDC_FINISH_BUTTON);
-    ShowWindow(hwndButton, SW_HIDE);
+    ShowWindow(hwndFinish, SW_HIDE);
 
     /* Show and enable the Next button */
-    hwndButton = GetDlgItem(hwndDlg, IDC_NEXT_BUTTON);
-
-    ShowWindow(hwndButton, SW_SHOW);
-    EnableWindow(hwndButton, TRUE);
+    ShowWindow(hwndNext, SW_SHOW);
+    EnableWindow(hwndNext, TRUE);
 
     /* Set the Next button as the default pushbutton  */
@@ -1693 +1851 @@
   {
     /* Hide the Next button */
-    hwndButton = GetDlgItem(hwndDlg, IDC_NEXT_BUTTON);
-    ShowWindow(hwndButton, SW_HIDE);
+    ShowWindow(hwndNext, SW_HIDE);
 
     /* Show the Finish button */
-    hwndButton = GetDlgItem(hwndDlg, IDC_FINISH_BUTTON);
-    ShowWindow(hwndButton, SW_SHOW);
+    ShowWindow(hwndFinish, SW_SHOW);
 
     if (dwFlags & PSWIZB_FINISH)
-      EnableWindow(hwndButton, TRUE);
-    else
-      EnableWindow(hwndButton, FALSE);
+      EnableWindow(hwndFinish, TRUE);
 
     /* Set the Finish button as the default pushbutton  */
@@ -1740 +1894 @@
 static void PROPSHEET_CleanUp(HWND hwndDlg)
 {
+  int i;
   PropSheetInfo* psInfo = (PropSheetInfo*) RemovePropA(hwndDlg,
                                                        PropSheetInfoStr);
+
+  TRACE("\n");
+  if (HIWORD(psInfo->ppshheader->pszCaption))
+      HeapFree(GetProcessHeap(), 0, (LPVOID)psInfo->ppshheader->pszCaption);
+
+  COMCTL32_Free((LPVOID)psInfo->ppshheader);
+
+  for (i = 0; i < psInfo->nPages; i++)
+  {
+     PROPSHEETPAGEA* psp = (PROPSHEETPAGEA*)psInfo->proppage[i].hpage;
+
+     if(psInfo->proppage[i].hwndPage)
+        DestroyWindow(psInfo->proppage[i].hwndPage);
+
+     if(psp)
+     {
+        if ((psp->dwFlags & PSP_USETITLE) && psInfo->proppage[i].pszText)
+           HeapFree(GetProcessHeap(), 0, (LPVOID)psInfo->proppage[i].pszText);
+
+        DestroyPropertySheetPage(psInfo->proppage[i].hpage);
+     }
+  }
+
   COMCTL32_Free(psInfo->proppage);
   COMCTL32_Free(psInfo->strPropertiesFor);
@@ -1757 +1935 @@
   PropSheetInfo* psInfo = (PropSheetInfo*) GlobalAlloc(GPTR,
                                                        sizeof(PropSheetInfo));
-  LPCPROPSHEETPAGEA lppsp;
   int i;
+  BYTE* pByte;
 
   PROPSHEET_CollectSheetInfo(lppsh, psInfo);
@@ -1764 +1942 @@
   psInfo->proppage = (PropPageInfo*) COMCTL32_Alloc(sizeof(PropPageInfo) *
                                                     lppsh->nPages);
+  pByte = (BYTE*) psInfo->ppshheader->u3.ppsp;
 
   for (i = 0; i < lppsh->nPages; i++)
   {
-    psInfo->proppage[i].index = i;
     if (!(lppsh->dwFlags & PSH_PROPSHEETPAGE))
       psInfo->proppage[i].hpage = psInfo->ppshheader->u3.phpage[i];
-    lppsp = PROPSHEET_GetPSPPage(psInfo, i);
-    PROPSHEET_CollectPageInfo(lppsp, psInfo, i);
+    else
+    {
+       psInfo->proppage[i].hpage = CreatePropertySheetPageA((LPCPROPSHEETPAGEA)pByte);
+       pByte += ((LPPROPSHEETPAGEA)pByte)->dwSize;
+    }
+
+    PROPSHEET_CollectPageInfo((LPCPROPSHEETPAGEA)psInfo->proppage[i].hpage,
+                               psInfo, i);
   }
 
@@ -1799 +1983 @@
   *ppsp = *lpPropSheetPage;
 
+  if ( !(ppsp->dwFlags & PSP_DLGINDIRECT) && HIWORD( ppsp->u1.pszTemplate ) )
+    ppsp->u1.pszTemplate = HEAP_strdupA( GetProcessHeap(), 0, lpPropSheetPage->u1.pszTemplate );
+
+  if ( (ppsp->dwFlags & PSP_USEICONID) && HIWORD( ppsp->u2.pszIcon ) )
+      ppsp->u2.pszIcon = HEAP_strdupA( GetProcessHeap(), 0, lpPropSheetPage->u2.pszIcon );
+       
+
+  if ((ppsp->dwFlags & PSP_USETITLE) && HIWORD( ppsp->pszTitle ))
+      ppsp->pszTitle = HEAP_strdupA( GetProcessHeap(), 0, lpPropSheetPage->pszTitle );
+  else if ( !(ppsp->dwFlags & PSP_USETITLE) )
+      ppsp->pszTitle = NULL;
+
   return (HPROPSHEETPAGE)ppsp;
 }
@@ -1817 +2013 @@
 BOOL WINAPI DestroyPropertySheetPage(HPROPSHEETPAGE hPropPage)
 {
+  PROPSHEETPAGEA *psp = (PROPSHEETPAGEA *)hPropPage;
+
+  if (!psp)
+     return FALSE;
+
+  if ( !(psp->dwFlags & PSP_DLGINDIRECT) && HIWORD( psp->u1.pszTemplate ) )
+     HeapFree(GetProcessHeap(), 0, (LPVOID)psp->u1.pszTemplate);
+
+  if ( (psp->dwFlags & PSP_USEICONID) && HIWORD( psp->u2.pszIcon ) )
+     HeapFree(GetProcessHeap(), 0, (LPVOID)psp->u2.pszIcon);
+
+  if ((psp->dwFlags & PSP_USETITLE) && HIWORD( psp->pszTitle ))
+      HeapFree(GetProcessHeap(), 0, (LPVOID)psp->pszTitle);
+
   COMCTL32_Free(hPropPage);
 
   return TRUE;
+}
+
+/******************************************************************************
+ *            PROPSHEET_IsDialogMessage
+ */
+static BOOL PROPSHEET_IsDialogMessage(HWND hwnd, LPMSG lpMsg)
+{
+   PropSheetInfo* psInfo = (PropSheetInfo*) GetPropA(hwnd, PropSheetInfoStr);
+
+   if (!psInfo || (hwnd != lpMsg->hwnd && !IsChild(hwnd, lpMsg->hwnd)))
+      return FALSE;
+
+   if (lpMsg->message == WM_KEYDOWN && (GetKeyState(VK_CONTROL) & 0x8000))
+   {
+      int new_page = 0;
+      INT dlgCode = SendMessageA(lpMsg->hwnd, WM_GETDLGCODE, 0, (LPARAM)lpMsg);
+
+      if (!(dlgCode & DLGC_WANTMESSAGE))
+      {
+         switch (lpMsg->wParam)
+         {
+            case VK_TAB:
+               if (GetKeyState(VK_SHIFT) & 0x8000)
+                   new_page = -1;
+                else
+                   new_page = 1;
+               break;
+
+            case VK_NEXT:   new_page = 1;  break;
+            case VK_PRIOR:  new_page = -1; break;
+         }
+      }
+
+      if (new_page)
+      {
+         if (PROPSHEET_CanSetCurSel(hwnd) != FALSE)
+         {
+            new_page += psInfo->active_page;
+
+            if (new_page < 0)
+               new_page = psInfo->nPages - 1;
+            else if (new_page >= psInfo->nPages)
+               new_page = 0;
+
+            PROPSHEET_SetCurSel(hwnd, new_page, 0);
+         }
+
+         return TRUE;
+      }
+   }
+
+   return IsDialogMessageA(hwnd, lpMsg);
 }
 
@@ -1836 +2098 @@
       HWND hwndTabCtrl = GetDlgItem(hwnd, IDC_TABCONTROL);
       LPCPROPSHEETPAGEA ppshpage;
+      int idx;
 
       SetPropA(hwnd, PropSheetInfoStr, (HANDLE)psInfo);
@@ -1872 +2135 @@
       if (psInfo->ppshheader->dwFlags & PSH_WIZARD)
       {
-        HWND hwndBack = GetDlgItem(hwnd, IDC_BACK_BUTTON);
-
         if (PROPSHEET_IsTooSmallWizard(hwnd, psInfo))
         {
@@ -1879 +2140 @@
           PROPSHEET_AdjustButtonsWizard(hwnd, psInfo);
         }
-
-        /* Disable Back button if we start at page 0 */
-        if (psInfo->active_page == 0)
-          EnableWindow(hwndBack, FALSE);
       }
       else
@@ -1897 +2154 @@
                                               PSCB_INITIALIZED, (LPARAM)0);
 
-      ppshpage = PROPSHEET_GetPSPPage(psInfo, psInfo->active_page);
-      PROPSHEET_CreatePage(hwnd, psInfo->active_page, psInfo, ppshpage, TRUE);
+      idx = psInfo->active_page;
+      ppshpage = (LPCPROPSHEETPAGEA)psInfo->proppage[idx].hpage;
+      psInfo->active_page = -1;
+ 
+      PROPSHEET_SetCurSel(hwnd, idx, psInfo->proppage[idx].hpage);
 
       if (!(psInfo->ppshheader->dwFlags & PSH_WIZARD))
@@ -1926 +2186 @@
 
     case WM_CLOSE:
-      PROPSHEET_Cancel(hwnd);
+      PROPSHEET_Cancel(hwnd, 1);
       return TRUE;
 
@@ -1940 +2200 @@
           HWND hwndApplyBtn = GetDlgItem(hwnd, IDC_APPLY_BUTTON);
 
-          if (PROPSHEET_Apply(hwnd) == FALSE)
+          if (PROPSHEET_Apply(hwnd, wID == IDOK ? 1: 0) == FALSE)
             break;
-
-          EnableWindow(hwndApplyBtn, FALSE);
 
           if (wID == IDOK)
@@ -1959 +2217 @@
 
             if (psInfo->isModeless)
-              psInfo->active_page = -1;
+              psInfo->activeValid = FALSE;
             else
               EndDialog(hwnd, result);
           }
+          else
+             EnableWindow(hwndApplyBtn, FALSE);
 
           break;
@@ -1980 +2240 @@
 
         case IDCANCEL:
-          PROPSHEET_Cancel(hwnd);
+          PROPSHEET_Cancel(hwnd, 0);
           break;
 
@@ -2018 +2278 @@
       HWND hwndPage = 0;
 
-      if (psInfo->active_page != -1)
+      if (psInfo->activeValid && psInfo->active_page != -1)
         hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
 
@@ -2062 +2322 @@
     case PSM_CANCELTOCLOSE:
     {
+      char buf[MAX_BUTTONTEXT_LENGTH];
       HWND hwndOK = GetDlgItem(hwnd, IDOK);
       HWND hwndCancel = GetDlgItem(hwnd, IDCANCEL);
 
       EnableWindow(hwndCancel, FALSE);
-      SetWindowTextA(hwndOK, "Close"); /* FIXME: hardcoded string */
-
-      return TRUE;
+      if (LoadStringA(COMCTL32_hModule, IDS_CLOSE, buf, sizeof(buf)))
+         SetWindowTextA(hwndOK, buf);
+ 
+      return FALSE;
     }
 
@@ -2095 +2357 @@
     case PSM_APPLY:
     {
-      BOOL msgResult = PROPSHEET_Apply(hwnd);
+      BOOL msgResult = PROPSHEET_Apply(hwnd, 0);
 
       SetWindowLongA(hwnd, DWL_MSGRESULT, msgResult);
@@ -2134 +2396 @@
     case PSM_ISDIALOGMESSAGE:
     {
-      FIXME("Unimplemented msg PSM_ISDIALOGMESSAGE\n");
-      return 0;
+       BOOL msgResult = PROPSHEET_IsDialogMessage(hwnd, (LPMSG)lParam);
+       SetWindowLongA(hwnd, DWL_MSGRESULT, msgResult);
+       return TRUE;
     }
 

trunk/src/comctl32/rebar.c

@@ -1 @@
-/* $Id: rebar.c,v 1.10 1999-11-17 17:06:23 cbratschi Exp $ */
+/* $Id: rebar.c,v 1.11 1999-12-18 20:57:00 achimha Exp $ */
 /*
  * Rebar control
@@ -21 +21 @@
  *   - All notifications.
  */
+
+/* WINE 991212 */
 
 #include <string.h>
@@ -911 +913 @@
 }
 
+static LRESULT
+REBAR_GetVersion (HWND hwnd)
+{
+    REBAR_INFO *infoPtr = REBAR_GetInfoPtr (hwnd);
+    return infoPtr->iVersion;
+}
 
 static LRESULT
@@ -1523 +1531 @@
 }
 
+static LRESULT
+REBAR_SetVersion (HWND hwnd, INT iVersion)
+{
+    REBAR_INFO *infoPtr = REBAR_GetInfoPtr (hwnd);
+    INT iOldVersion = infoPtr->iVersion;
+
+    if (iVersion > COMCTL32_VERSION)
+        return -1;
+
+    infoPtr->iVersion = iVersion;
+
+    return iOldVersion;
+}
 
 static LRESULT
@@ -1594 +1615 @@
 
     /* initialize info structure */
+    infoPtr->iVersion = 0;
     infoPtr->clrBk = CLR_NONE;
     infoPtr->clrText = RGB(0, 0, 0);
@@ -1922 +1944 @@
             return REBAR_GetUnicodeFormat (hwnd);
 
+        case CCM_GETVERSION:
+            return REBAR_GetVersion (hwnd);
+
         case RB_HITTEST:
             return REBAR_HitTest (hwnd, wParam, lParam);
@@ -1969 +1994 @@
         case RB_SETUNICODEFORMAT:
             return REBAR_SetUnicodeFormat (hwnd, wParam);
+
+        case CCM_SETVERSION:
+            return REBAR_SetVersion (hwnd, (INT)wParam);
 
         case RB_SHOWBAND:

trunk/src/comctl32/resource.asm

@@ -1 +1 @@
 ;/* This file is generated with wrc version 1.0.14 (08-Aug-1999). Do not edit! */
 ;/* Source : rsrc.rc */
-;/* Cmdline: wrc -s -I. -IE:\IBMCPP\include -I..\..\include -I..\..\include\win -o resource.asm rsrc.rc */
-;/* Date   : Sun Nov 21 15:11:29 1999 */
+;/* Cmdline: wrc -s -I. -IH:\IBMCPP3\include -I..\..\include -I..\..\include\win -o resource.asm rsrc.rc */
+;/* Date   : Sat Dec 18 21:17:00 1999 */
 
         .386p
@@ -12 +12 @@
         public  _Resource_PEResTab
         dd      0
-        dd      03837fd91h
-        dd      0
-        dw      0, 4
+        dd      0385bebbch
+        dd      0
+        dw      0, 5
         dd      2
         dd      (L2 - _Resource_PEResTab) or 80000000h
@@ -21 +21 @@
         dd      5
         dd      (L5 - _Resource_PEResTab) or 80000000h
+        dd      6
+        dd      (L6 - _Resource_PEResTab) or 80000000h
         dd      16
         dd      (L16 - _Resource_PEResTab) or 80000000h
 L2:
         dd      0
-        dd      03837fd91h
-        dd      0
-        dw      0, 6
+        dd      0385bebbch
+        dd      0
+        dw      0, 7
         dd      120
         dd      (L2_120 - _Resource_PEResTab) or 80000000h
@@ -40 +42 @@
         dd      131
         dd      (L2_131 - _Resource_PEResTab) or 80000000h
+        dd      401
+        dd      (L2_401 - _Resource_PEResTab) or 80000000h
 L4:
         dd      0
-        dd      03837fd91h
+        dd      0385bebbch
         dd      0
         dw      0, 1
@@ -49 +53 @@
 L5:
         dd      0
-        dd      03837fd91h
+        dd      0385bebbch
         dd      0
         dw      0, 3
@@ -58 +62 @@
         dd      1020
         dd      (L5_1020 - _Resource_PEResTab) or 80000000h
+L6:
+        dd      0
+        dd      0385bebbch
+        dd      0
+        dw      0, 1
+        dd      261
+        dd      (L6_261 - _Resource_PEResTab) or 80000000h
 L16:
         dd      0
-        dd      03837fd91h
+        dd      0385bebbch
         dd      0
         dw      0, 1
@@ -67 +78 @@
 L2_120:
         dd      0
-        dd      03837fd91h
+        dd      0385bebbch
         dd      0
         dw      0, 1
@@ -74 +85 @@
 L2_121:
         dd      0
-        dd      03837fd91h
+        dd      0385bebbch
         dd      0
         dw      0, 1
@@ -81 +92 @@
 L2_124:
         dd      0
-        dd      03837fd91h
+        dd      0385bebbch
         dd      0
         dw      0, 1
@@ -88 +99 @@
 L2_125:
         dd      0
-        dd      03837fd91h
+        dd      0385bebbch
         dd      0
         dw      0, 1
@@ -95 +106 @@
 L2_130:
         dd      0
-        dd      03837fd91h
+        dd      0385bebbch
         dd      0
         dw      0, 1
@@ -102 +113 @@
 L2_131:
         dd      0
-        dd      03837fd91h
+        dd      0385bebbch
         dd      0
         dw      0, 1
         dd      000000000h
         dd      L2_131_0 - _Resource_PEResTab
+L2_401:
+        dd      0
+        dd      0385bebbch
+        dd      0
+        dw      0, 1
+        dd      000000000h
+        dd      L2_401_0 - _Resource_PEResTab
 L4_300:
         dd      0
-        dd      03837fd91h
+        dd      0385bebbch
         dd      0
         dw      0, 1
@@ -116 +134 @@
 L5_200:
         dd      0
-        dd      03837fd91h
+        dd      0385bebbch
         dd      0
         dw      0, 1
@@ -123 +141 @@
 L5_1006:
         dd      0
-        dd      03837fd91h
+        dd      0385bebbch
         dd      0
         dw      0, 1
@@ -130 +148 @@
 L5_1020:
         dd      0
-        dd      03837fd91h
+        dd      0385bebbch
         dd      0
         dw      0, 1
         dd      000000000h
         dd      L5_1020_0 - _Resource_PEResTab
+L6_261:
+        dd      0
+        dd      0385bebbch
+        dd      0
+        dw      0, 1
+        dd      000000000h
+        dd      L6_261_0 - _Resource_PEResTab
 L16_1:
         dd      0
-        dd      03837fd91h
+        dd      0385bebbch
         dd      0
         dw      0, 1
@@ -156 +181 @@
 L2_124_0:
         dd      _Resource_Bmp_124_0_data - _Resource_PEResTab
-        dd      1308
+        dd      4136
         dd      0
         dd      0
@@ -174 +199 @@
         dd      0
         dd      0
+L2_401_0:
+        dd      _Resource_Bmp_401_0_data - _Resource_PEResTab
+        dd      384
+        dd      0
+        dd      0
 L4_300_0:
         dd      _Resource_Men_300_0_data - _Resource_PEResTab
@@ -192 +222 @@
         dd      _Resource_Dlg_1020_0_data - _Resource_PEResTab
         dd      352
+        dd      0
+        dd      0
+L6_261_0:
+        dd      _Resource_StrTab_261_0_data - _Resource_PEResTab
+        dd      44
         dd      0
         dd      0
@@ -230 +265 @@
         db      080h, 000h, 026h, 000h, 041h, 000h, 070h, 000h
         db      070h, 000h, 06ch, 000h, 079h, 000h, 000h, 000h
-        db      000h, 000h, 000h, 000h, 000h, 000h, 001h, 050h
+        db      000h, 000h, 000h, 000h, 000h, 000h, 003h, 050h
         db      000h, 000h, 000h, 000h, 0ebh, 000h, 08ah, 000h
         db      032h, 000h, 00eh, 000h, 009h, 000h, 0ffh, 0ffh
         db      080h, 000h, 048h, 000h, 065h, 000h, 06ch, 000h
         db      070h, 000h, 000h, 000h, 000h, 000h, 000h, 000h
-        db      000h, 000h, 000h, 054h, 000h, 000h, 000h, 000h
+        db      000h, 000h, 001h, 054h, 000h, 000h, 000h, 000h
         db      007h, 000h, 007h, 000h, 016h, 001h, 07dh, 000h
         db      020h, 030h, 053h, 000h, 059h, 000h, 053h, 000h
@@ -274 +309 @@
         db      080h, 000h, 043h, 000h, 061h, 000h, 06eh, 000h
         db      063h, 000h, 065h, 000h, 06ch, 000h, 000h, 000h
-        db      000h, 000h, 000h, 000h, 000h, 000h, 001h, 050h
+        db      000h, 000h, 000h, 000h, 000h, 000h, 003h, 050h
         db      000h, 000h, 000h, 000h, 0ebh, 000h, 08ah, 000h
         db      032h, 000h, 00eh, 000h, 009h, 000h, 0ffh, 0ffh
@@ -399 +434 @@
         db      065h, 000h, 06dh, 000h, 062h, 000h, 065h, 000h
         db      072h, 000h, 000h, 000h
+
+        align   4
+_Resource_Bmp_401_0_data:
+        db      028h, 000h, 000h, 000h, 01fh, 000h, 000h, 000h
+        db      010h, 000h, 000h, 000h, 001h, 000h, 004h, 000h
+        db      002h, 000h, 000h, 000h, 030h, 001h, 000h, 000h
+        db      001h, 000h, 000h, 000h, 001h, 000h, 000h, 000h
+        db      00ah, 000h, 000h, 000h, 00ah, 000h, 000h, 000h
+        db      000h, 000h, 000h, 000h, 000h, 000h, 080h, 000h
+        db      000h, 080h, 000h, 000h, 080h, 000h, 000h, 000h
+        db      0c0h, 0c0h, 0c0h, 000h, 080h, 080h, 080h, 000h
+        db      000h, 0ffh, 000h, 000h, 000h, 0ffh, 0ffh, 000h
+        db      0ffh, 000h, 000h, 000h, 0ffh, 0ffh, 0ffh, 000h
+        db      01fh, 099h, 000h, 000h, 001h, 099h, 00dh, 011h
+        db      002h, 099h, 00eh, 011h, 001h, 099h, 000h, 000h
+        db      001h, 099h, 00dh, 011h, 002h, 099h, 00eh, 011h
+        db      001h, 099h, 000h, 000h, 001h, 099h, 002h, 011h
+        db      009h, 099h, 002h, 011h, 002h, 099h, 002h, 011h
+        db      00ah, 099h, 002h, 011h, 001h, 099h, 000h, 000h
+        db      001h, 099h, 002h, 011h, 009h, 099h, 002h, 011h
+        db      002h, 099h, 002h, 011h, 00ah, 099h, 002h, 011h
+        db      001h, 099h, 000h, 000h, 001h, 099h, 002h, 011h
+        db      009h, 099h, 002h, 011h, 002h, 099h, 002h, 011h
+        db      003h, 099h, 002h, 000h, 005h, 099h, 002h, 011h
+        db      001h, 099h, 000h, 000h, 001h, 099h, 002h, 011h
+        db      009h, 099h, 002h, 011h, 002h, 099h, 002h, 011h
+        db      003h, 099h, 003h, 000h, 004h, 099h, 002h, 011h
+        db      001h, 099h, 000h, 000h, 001h, 099h, 002h, 011h
+        db      009h, 099h, 002h, 011h, 002h, 099h, 002h, 011h
+        db      002h, 099h, 004h, 000h, 004h, 099h, 002h, 011h
+        db      001h, 099h, 000h, 000h, 001h, 099h, 002h, 011h
+        db      009h, 099h, 002h, 011h, 002h, 099h, 002h, 011h
+        db      001h, 099h, 002h, 000h, 002h, 099h, 002h, 000h
+        db      003h, 099h, 002h, 011h, 001h, 099h, 000h, 000h
+        db      001h, 099h, 002h, 011h, 009h, 099h, 002h, 011h
+        db      002h, 099h, 002h, 011h, 002h, 000h, 004h, 099h
+        db      002h, 000h, 002h, 099h, 002h, 011h, 001h, 099h
+        db      000h, 000h, 001h, 099h, 002h, 011h, 009h, 099h
+        db      002h, 011h, 002h, 099h, 002h, 011h, 001h, 000h
+        db      006h, 099h, 002h, 000h, 001h, 099h, 002h, 011h
+        db      001h, 099h, 000h, 000h, 001h, 099h, 002h, 011h
+        db      009h, 099h, 002h, 011h, 002h, 099h, 002h, 011h
+        db      007h, 099h, 002h, 000h, 001h, 099h, 001h, 000h
+        db      001h, 011h, 001h, 099h, 000h, 000h, 001h, 099h
+        db      002h, 011h, 009h, 099h, 002h, 011h, 002h, 099h
+        db      002h, 011h, 008h, 099h, 001h, 000h, 001h, 099h
+        db      001h, 000h, 001h, 011h, 001h, 099h, 000h, 000h
+        db      001h, 099h, 00dh, 011h, 002h, 099h, 00ah, 011h
+        db      002h, 000h, 002h, 011h, 001h, 099h, 000h, 000h
+        db      001h, 099h, 00dh, 011h, 002h, 099h, 00eh, 011h
+        db      001h, 099h, 000h, 000h, 01fh, 099h, 000h, 001h
 
         align   4
@@ -981 +1067 @@
 _Resource_Bmp_124_0_data:
         db      028h, 000h, 000h, 000h, 0c0h, 000h, 000h, 000h
-        db      010h, 000h, 000h, 000h, 001h, 000h, 004h, 000h
-        db      002h, 000h, 000h, 000h, 0b4h, 004h, 000h, 000h
+        db      010h, 000h, 000h, 000h, 001h, 000h, 008h, 000h
+        db      000h, 000h, 000h, 000h, 000h, 00ch, 000h, 000h
         db      000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h
         db      000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h
@@ -989 +1075 @@
         db      080h, 000h, 000h, 000h, 080h, 000h, 080h, 000h
         db      080h, 080h, 000h, 000h, 0c0h, 0c0h, 0c0h, 000h
+        db      0c0h, 0dch, 0c0h, 000h, 0f0h, 0cah, 0a6h, 000h
+        db      004h, 004h, 004h, 000h, 008h, 008h, 008h, 000h
+        db      00ch, 00ch, 00ch, 000h, 011h, 011h, 011h, 000h
+        db      016h, 016h, 016h, 000h, 01ch, 01ch, 01ch, 000h
+        db      022h, 022h, 022h, 000h, 029h, 029h, 029h, 000h
+        db      055h, 055h, 055h, 000h, 04dh, 04dh, 04dh, 000h
+        db      042h, 042h, 042h, 000h, 039h, 039h, 039h, 000h
+        db      080h, 07ch, 0ffh, 000h, 050h, 050h, 0ffh, 000h
+        db      093h, 000h, 0d6h, 000h, 0ffh, 0ech, 0cch, 000h
+        db      0c6h, 0d6h, 0efh, 000h, 0d6h, 0e7h, 0e7h, 000h
+        db      090h, 0a9h, 0adh, 000h, 000h, 000h, 033h, 000h
+        db      000h, 000h, 066h, 000h, 000h, 000h, 099h, 000h
+        db      000h, 000h, 0cch, 000h, 000h, 033h, 000h, 000h
+        db      000h, 033h, 033h, 000h, 000h, 033h, 066h, 000h
+        db      000h, 033h, 099h, 000h, 000h, 033h, 0cch, 000h
+        db      000h, 033h, 0ffh, 000h, 000h, 066h, 000h, 000h
+        db      000h, 066h, 033h, 000h, 000h, 066h, 066h, 000h
+        db      000h, 066h, 099h, 000h, 000h, 066h, 0cch, 000h
+        db      000h, 066h, 0ffh, 000h, 000h, 099h, 000h, 000h
+        db      000h, 099h, 033h, 000h, 000h, 099h, 066h, 000h
+        db      000h, 099h, 099h, 000h, 000h, 099h, 0cch, 000h
+        db      000h, 099h, 0ffh, 000h, 000h, 0cch, 000h, 000h
+        db      000h, 0cch, 033h, 000h, 000h, 0cch, 066h, 000h
+        db      000h, 0cch, 099h, 000h, 000h, 0cch, 0cch, 000h
+        db      000h, 0cch, 0ffh, 000h, 000h, 0ffh, 066h, 000h
+        db      000h, 0ffh, 099h, 000h, 000h, 0ffh, 0cch, 000h
+        db      033h, 000h, 000h, 000h, 033h, 000h, 033h, 000h
+        db      033h, 000h, 066h, 000h, 033h, 000h, 099h, 000h
+        db      033h, 000h, 0cch, 000h, 033h, 000h, 0ffh, 000h
+        db      033h, 033h, 000h, 000h, 033h, 033h, 033h, 000h
+        db      033h, 033h, 066h, 000h, 033h, 033h, 099h, 000h
+        db      033h, 033h, 0cch, 000h, 033h, 033h, 0ffh, 000h
+        db      033h, 066h, 000h, 000h, 033h, 066h, 033h, 000h
+        db      033h, 066h, 066h, 000h, 033h, 066h, 099h, 000h
+        db      033h, 066h, 0cch, 000h, 033h, 066h, 0ffh, 000h
+        db      033h, 099h, 000h, 000h, 033h, 099h, 033h, 000h
+        db      033h, 099h, 066h, 000h, 033h, 099h, 099h, 000h
+        db      033h, 099h, 0cch, 000h, 033h, 099h, 0ffh, 000h
+        db      033h, 0cch, 000h, 000h, 033h, 0cch, 033h, 000h
+        db      033h, 0cch, 066h, 000h, 033h, 0cch, 099h, 000h
+        db      033h, 0cch, 0cch, 000h, 033h, 0cch, 0ffh, 000h
+        db      033h, 0ffh, 033h, 000h, 033h, 0ffh, 066h, 000h
+        db      033h, 0ffh, 099h, 000h, 033h, 0ffh, 0cch, 000h
+        db      033h, 0ffh, 0ffh, 000h, 066h, 000h, 000h, 000h
+        db      066h, 000h, 033h, 000h, 066h, 000h, 066h, 000h
+        db      066h, 000h, 099h, 000h, 066h, 000h, 0cch, 000h
+        db      066h, 000h, 0ffh, 000h, 066h, 033h, 000h, 000h
+        db      066h, 033h, 033h, 000h, 066h, 033h, 066h, 000h
+        db      066h, 033h, 099h, 000h, 066h, 033h, 0cch, 000h
+        db      066h, 033h, 0ffh, 000h, 066h, 066h, 000h, 000h
+        db      066h, 066h, 033h, 000h, 066h, 066h, 066h, 000h
+        db      066h, 066h, 099h, 000h, 066h, 066h, 0cch, 000h
+        db      066h, 099h, 000h, 000h, 066h, 099h, 033h, 000h
+        db      066h, 099h, 066h, 000h, 066h, 099h, 099h, 000h
+        db      066h, 099h, 0cch, 000h, 066h, 099h, 0ffh, 000h
+        db      066h, 0cch, 000h, 000h, 066h, 0cch, 033h, 000h
+        db      066h, 0cch, 099h, 000h, 066h, 0cch, 0cch, 000h
+        db      066h, 0cch, 0ffh, 000h, 066h, 0ffh, 000h, 000h
+        db      066h, 0ffh, 033h, 000h, 066h, 0ffh, 099h, 000h
+        db      066h, 0ffh, 0cch, 000h, 0cch, 000h, 0ffh, 000h
+        db      0ffh, 000h, 0cch, 000h, 099h, 099h, 000h, 000h
+        db      099h, 033h, 099h, 000h, 099h, 000h, 099h, 000h
+        db      099h, 000h, 0cch, 000h, 099h, 000h, 000h, 000h
+        db      099h, 033h, 033h, 000h, 099h, 000h, 066h, 000h
+        db      099h, 033h, 0cch, 000h, 099h, 000h, 0ffh, 000h
+        db      099h, 066h, 000h, 000h, 099h, 066h, 033h, 000h
+        db      099h, 033h, 066h, 000h, 099h, 066h, 099h, 000h
+        db      099h, 066h, 0cch, 000h, 099h, 033h, 0ffh, 000h
+        db      099h, 099h, 033h, 000h, 099h, 099h, 066h, 000h
+        db      099h, 099h, 099h, 000h, 099h, 099h, 0cch, 000h
+        db      099h, 099h, 0ffh, 000h, 099h, 0cch, 000h, 000h
+        db      099h, 0cch, 033h, 000h, 066h, 0cch, 066h, 000h
+        db      099h, 0cch, 099h, 000h, 099h, 0cch, 0cch, 000h
+        db      099h, 0cch, 0ffh, 000h, 099h, 0ffh, 000h, 000h
+        db      099h, 0ffh, 033h, 000h, 099h, 0cch, 066h, 000h
+        db      099h, 0ffh, 099h, 000h, 099h, 0ffh, 0cch, 000h
+        db      099h, 0ffh, 0ffh, 000h, 0cch, 000h, 000h, 000h
+        db      099h, 000h, 033h, 000h, 0cch, 000h, 066h, 000h
+        db      0cch, 000h, 099h, 000h, 0cch, 000h, 0cch, 000h
+        db      099h, 033h, 000h, 000h, 0cch, 033h, 033h, 000h
+        db      0cch, 033h, 066h, 000h, 0cch, 033h, 099h, 000h
+        db      0cch, 033h, 0cch, 000h, 0cch, 033h, 0ffh, 000h
+        db      0cch, 066h, 000h, 000h, 0cch, 066h, 033h, 000h
+        db      099h, 066h, 066h, 000h, 0cch, 066h, 099h, 000h
+        db      0cch, 066h, 0cch, 000h, 099h, 066h, 0ffh, 000h
+        db      0cch, 099h, 000h, 000h, 0cch, 099h, 033h, 000h
+        db      0cch, 099h, 066h, 000h, 0cch, 099h, 099h, 000h
+        db      0cch, 099h, 0cch, 000h, 0cch, 099h, 0ffh, 000h
+        db      0cch, 0cch, 000h, 000h, 0cch, 0cch, 033h, 000h
+        db      0cch, 0cch, 066h, 000h, 0cch, 0cch, 099h, 000h
+        db      0cch, 0cch, 0cch, 000h, 0cch, 0cch, 0ffh, 000h
+        db      0cch, 0ffh, 000h, 000h, 0cch, 0ffh, 033h, 000h
+        db      099h, 0ffh, 066h, 000h, 0cch, 0ffh, 099h, 000h
+        db      0cch, 0ffh, 0cch, 000h, 0cch, 0ffh, 0ffh, 000h
+        db      0cch, 000h, 033h, 000h, 0ffh, 000h, 066h, 000h
+        db      0ffh, 000h, 099h, 000h, 0cch, 033h, 000h, 000h
+        db      0ffh, 033h, 033h, 000h, 0ffh, 033h, 066h, 000h
+        db      0ffh, 033h, 099h, 000h, 0ffh, 033h, 0cch, 000h
+        db      0ffh, 033h, 0ffh, 000h, 0ffh, 066h, 000h, 000h
+        db      0ffh, 066h, 033h, 000h, 0cch, 066h, 066h, 000h
+        db      0ffh, 066h, 099h, 000h, 0ffh, 066h, 0cch, 000h
+        db      0cch, 066h, 0ffh, 000h, 0ffh, 099h, 000h, 000h
+        db      0ffh, 099h, 033h, 000h, 0ffh, 099h, 066h, 000h
+        db      0ffh, 099h, 099h, 000h, 0ffh, 099h, 0cch, 000h
+        db      0ffh, 099h, 0ffh, 000h, 0ffh, 0cch, 000h, 000h
+        db      0ffh, 0cch, 033h, 000h, 0ffh, 0cch, 066h, 000h
+        db      0ffh, 0cch, 099h, 000h, 0ffh, 0cch, 0cch, 000h
+        db      0ffh, 0cch, 0ffh, 000h, 0ffh, 0ffh, 033h, 000h
+        db      0cch, 0ffh, 066h, 000h, 0ffh, 0ffh, 099h, 000h
+        db      0ffh, 0ffh, 0cch, 000h, 066h, 066h, 0ffh, 000h
+        db      066h, 0ffh, 066h, 000h, 066h, 0ffh, 0ffh, 000h
+        db      0ffh, 066h, 066h, 000h, 0ffh, 066h, 0ffh, 000h
+        db      0ffh, 0ffh, 066h, 000h, 021h, 000h, 0a5h, 000h
+        db      05fh, 05fh, 05fh, 000h, 077h, 077h, 077h, 000h
+        db      086h, 086h, 086h, 000h, 096h, 096h, 096h, 000h
+        db      0cbh, 0cbh, 0cbh, 000h, 0b2h, 0b2h, 0b2h, 000h
+        db      0d7h, 0d7h, 0d7h, 000h, 0ddh, 0ddh, 0ddh, 000h
+        db      0e3h, 0e3h, 0e3h, 000h, 0eah, 0eah, 0eah, 000h
+        db      0f1h, 0f1h, 0f1h, 000h, 0f8h, 0f8h, 0f8h, 000h
+        db      0f0h, 0fbh, 0ffh, 000h, 0a4h, 0a0h, 0a0h, 000h
         db      080h, 080h, 080h, 000h, 000h, 000h, 0ffh, 000h
         db      000h, 0ffh, 000h, 000h, 000h, 0ffh, 0ffh, 000h
         db      0ffh, 000h, 000h, 000h, 0ffh, 000h, 0ffh, 000h
         db      0ffh, 0ffh, 000h, 000h, 0ffh, 0ffh, 0ffh, 000h
-        db      0c0h, 077h, 000h, 000h, 008h, 077h, 002h, 070h
-        db      004h, 000h, 000h, 008h, 007h, 077h, 074h, 044h
-        db      00ah, 077h, 000h, 004h, 044h, 047h, 004h, 077h
-        db      000h, 004h, 044h, 047h, 004h, 077h, 000h, 018h
-        db      047h, 070h, 000h, 007h, 000h, 007h, 000h, 007h
-        db      077h, 074h, 044h, 047h, 004h, 077h, 000h, 004h
-        db      071h, 077h, 008h, 044h, 000h, 006h, 047h, 077h
-        db      071h, 000h, 00eh, 077h, 002h, 071h, 00eh, 077h
-        db      002h, 071h, 014h, 077h, 002h, 070h, 00ch, 000h
-        db      002h, 077h, 00eh, 070h, 00ah, 000h, 002h, 007h
-        db      004h, 077h, 000h, 000h, 012h, 077h, 000h, 008h
-        db      074h, 0f4h, 070h, 000h, 006h, 077h, 000h, 010h
-        db      04fh, 047h, 000h, 007h, 04fh, 047h, 000h, 007h
-        db      012h, 077h, 000h, 006h, 044h, 077h, 044h, 000h
-        db      004h, 077h, 000h, 006h, 011h, 017h, 04fh, 000h
-        db      006h, 0ffh, 000h, 008h, 047h, 077h, 011h, 017h
-        db      00ch, 077h, 000h, 004h, 011h, 017h, 008h, 000h
-        db      004h, 077h, 000h, 004h, 011h, 017h, 00eh, 000h
-        db      000h, 008h, 007h, 077h, 070h, 078h, 008h, 088h
-        db      002h, 080h, 010h, 077h, 002h, 00bh, 008h, 0fbh
-        db      002h, 007h, 004h, 077h, 000h, 000h, 00ah, 077h
-        db      004h, 044h, 004h, 077h, 000h, 004h, 074h, 047h
-        db      00ah, 077h, 002h, 044h, 006h, 077h, 002h, 044h
-        db      006h, 077h, 000h, 014h, 047h, 070h, 000h, 007h
-        db      000h, 007h, 000h, 007h, 077h, 044h, 006h, 077h
-        db      002h, 071h, 004h, 011h, 002h, 04fh, 006h, 0ffh
-        db      000h, 004h, 047h, 071h, 004h, 011h, 00ah, 077h
-        db      002h, 071h, 004h, 011h, 002h, 00fh, 004h, 0ffh
-        db      000h, 006h, 0f0h, 077h, 071h, 000h, 004h, 011h
-        db      002h, 00fh, 00ch, 0bfh, 000h, 006h, 007h, 077h
-        db      070h, 000h, 00ah, 077h, 000h, 008h, 080h, 077h
-        db      070h, 077h, 008h, 007h, 000h, 004h, 070h, 00fh
-        db      008h, 0bfh, 002h, 007h, 004h, 077h, 000h, 000h
-        db      00ah, 077h, 000h, 004h, 04fh, 0f4h, 034h, 077h
-        db      006h, 044h, 004h, 077h, 000h, 006h, 071h, 077h
-        db      04fh, 000h, 006h, 0ffh, 000h, 00ah, 047h, 077h
-        db      071h, 077h, 070h, 000h, 008h, 000h, 000h, 008h
-        db      077h, 071h, 077h, 00fh, 004h, 0ffh, 002h, 0f0h
-        db      004h, 077h, 000h, 006h, 071h, 077h, 00bh, 000h
-        db      00ch, 0fbh, 000h, 008h, 007h, 077h, 070h, 078h
-        db      008h, 088h, 002h, 080h, 010h, 077h, 002h, 00bh
-        db      008h, 0fbh, 002h, 007h, 004h, 077h, 000h, 000h
-        db      00ah, 077h, 000h, 004h, 04fh, 0f4h, 022h, 077h
-        db      000h, 018h, 047h, 070h, 000h, 007h, 000h, 007h
-        db      000h, 007h, 077h, 044h, 077h, 044h, 004h, 077h
-        db      000h, 006h, 071h, 077h, 04fh, 000h, 006h, 0ffh
-        db      000h, 008h, 047h, 077h, 071h, 077h, 008h, 044h
-        db      000h, 00ah, 040h, 077h, 071h, 077h, 00fh, 000h
-        db      004h, 0ffh, 000h, 010h, 0f0h, 044h, 047h, 071h
-        db      077h, 00fh, 0bfh, 0b0h, 004h, 000h, 000h, 00ah
-        db      00fh, 0bfh, 007h, 077h, 070h, 000h, 00ah, 077h
-        db      000h, 008h, 080h, 077h, 070h, 077h, 008h, 007h
-        db      000h, 004h, 070h, 00fh, 008h, 0bfh, 000h, 006h
-        db      007h, 070h, 077h, 000h, 000h, 000h, 00ah, 077h
-        db      000h, 004h, 04fh, 044h, 00ah, 077h, 000h, 004h
-        db      044h, 047h, 004h, 077h, 000h, 004h, 044h, 047h
-        db      004h, 077h, 000h, 004h, 044h, 047h, 016h, 077h
-        db      000h, 006h, 074h, 044h, 047h, 000h, 004h, 077h
-        db      000h, 006h, 071h, 077h, 04fh, 000h, 006h, 0ffh
-        db      000h, 00ah, 047h, 077h, 071h, 077h, 04fh, 000h
-        db      004h, 07fh, 000h, 00ch, 077h, 040h, 077h, 071h
-        db      077h, 00fh, 004h, 0ffh, 000h, 010h, 0f0h, 0bfh
-        db      047h, 071h, 077h, 00bh, 0fbh, 0f0h, 008h, 0fbh
-        db      004h, 007h, 000h, 004h, 070h, 078h, 006h, 088h
-        db      000h, 004h, 022h, 080h, 010h, 077h, 002h, 00bh
-        db      008h, 0fbh, 004h, 007h, 002h, 077h, 000h, 000h
-        db      002h, 070h, 004h, 000h, 000h, 008h, 007h, 077h
-        db      044h, 047h, 00ah, 077h, 000h, 028h, 04fh, 047h
-        db      000h, 007h, 04fh, 047h, 000h, 007h, 04fh, 047h
-        db      000h, 007h, 047h, 070h, 000h, 007h, 000h, 007h
-        db      000h, 007h, 00ch, 077h, 000h, 006h, 071h, 077h
-        db      04fh, 000h, 006h, 0ffh, 000h, 00ah, 047h, 077h
-        db      071h, 077h, 047h, 000h, 004h, 0f1h, 000h, 00ch
-        db      017h, 040h, 077h, 071h, 077h, 00fh, 004h, 0ffh
-        db      000h, 010h, 0f0h, 0fbh, 047h, 071h, 077h, 00fh
-        db      0bfh, 0b0h, 008h, 0bfh, 002h, 007h, 006h, 070h
-        db      006h, 088h, 000h, 008h, 0aah, 080h, 077h, 070h
-        db      006h, 077h, 004h, 007h, 000h, 004h, 070h, 00fh
-        db      008h, 0bfh, 002h, 000h, 004h, 077h, 000h, 000h
-        db      018h, 077h, 002h, 044h, 006h, 077h, 002h, 044h
-        db      006h, 077h, 002h, 044h, 022h, 077h, 000h, 006h
-        db      071h, 077h, 04fh, 000h, 006h, 0ffh, 000h, 00ah
-        db      047h, 077h, 071h, 077h, 04fh, 000h, 004h, 071h
-        db      000h, 00eh, 07fh, 040h, 077h, 071h, 077h, 00fh
-        db      0ffh, 000h, 004h, 000h, 000h, 00ch, 0bfh, 047h
-        db      071h, 077h, 00bh, 0f0h, 004h, 000h, 006h, 0fbh
-        db      000h, 008h, 007h, 077h, 000h, 007h, 008h, 077h
-        db      000h, 008h, 070h, 011h, 077h, 011h, 00ah, 077h
-        db      00ah, 000h, 002h, 077h, 004h, 007h, 000h, 000h
-        db      002h, 077h, 004h, 044h, 02ah, 077h, 000h, 014h
-        db      047h, 070h, 000h, 007h, 000h, 007h, 000h, 007h
-        db      077h, 074h, 004h, 044h, 004h, 077h, 000h, 004h
-        db      071h, 077h, 008h, 044h, 000h, 030h, 047h, 077h
-        db      071h, 077h, 047h, 011h, 0f7h, 017h, 040h, 077h
-        db      071h, 077h, 00fh, 0ffh, 00fh, 00bh, 0fbh, 047h
-        db      071h, 077h, 00fh, 0bfh, 000h, 00fh, 006h, 0bfh
-        db      000h, 006h, 007h, 000h, 077h, 000h, 00ch, 000h
-        db      000h, 006h, 071h, 011h, 017h, 000h, 00ch, 070h
-        db      004h, 0bfh, 002h, 007h, 004h, 070h, 004h, 077h
-        db      000h, 000h, 000h, 006h, 077h, 04fh, 0f4h, 000h
-        db      03ch, 077h, 000h, 006h, 044h, 077h, 044h, 000h
-        db      004h, 077h, 002h, 071h, 00eh, 077h, 000h, 006h
-        db      071h, 077h, 04fh, 000h, 004h, 071h, 000h, 010h
-        db      01fh, 040h, 077h, 071h, 077h, 00fh, 0ffh, 000h
-        db      004h, 0bfh, 000h, 00ch, 047h, 071h, 077h, 00bh
-        db      0fbh, 0f0h, 008h, 0fbh, 000h, 004h, 007h, 077h
-        db      004h, 007h, 00ch, 077h, 002h, 011h, 00eh, 077h
-        db      004h, 000h, 002h, 077h, 006h, 007h, 002h, 077h
-        db      000h, 000h, 000h, 006h, 077h, 04fh, 0f4h, 000h
-        db      00ah, 077h, 000h, 004h, 074h, 044h, 00ch, 077h
-        db      000h, 004h, 044h, 047h, 004h, 077h, 000h, 004h
-        db      044h, 047h, 004h, 077h, 010h, 044h, 000h, 008h
-        db      077h, 044h, 077h, 044h, 004h, 077h, 002h, 071h
-        db      006h, 077h, 000h, 00eh, 074h, 044h, 047h, 077h
-        db      071h, 077h, 047h, 000h, 006h, 0f7h, 000h, 008h
-        db      040h, 077h, 071h, 077h, 004h, 000h, 000h, 00eh
-        db      00bh, 0f4h, 044h, 047h, 071h, 077h, 00fh, 000h
-        db      00ch, 0bfh, 002h, 007h, 006h, 070h, 00ah, 077h
-        db      000h, 006h, 071h, 011h, 017h, 000h, 010h, 077h
-        db      002h, 070h, 004h, 077h, 000h, 004h, 070h, 077h
-        db      000h, 000h, 000h, 006h, 077h, 04fh, 044h, 000h
-        db      00ah, 077h, 000h, 008h, 074h, 0f4h, 070h, 000h
-        db      008h, 077h, 000h, 010h, 04fh, 047h, 000h, 007h
-        db      04fh, 047h, 000h, 007h, 012h, 077h, 002h, 074h
-        db      004h, 044h, 004h, 077h, 002h, 071h, 006h, 077h
-        db      000h, 00ch, 074h, 0ffh, 047h, 077h, 071h, 077h
-        db      008h, 044h, 000h, 006h, 040h, 077h, 071h, 000h
-        db      004h, 077h, 000h, 004h, 074h, 0bfh, 004h, 0b4h
-        db      000h, 006h, 077h, 071h, 077h, 000h, 00eh, 000h
-        db      000h, 004h, 077h, 007h, 004h, 077h, 002h, 007h
-        db      008h, 077h, 000h, 006h, 011h, 077h, 011h, 000h
-        db      014h, 077h, 002h, 007h, 004h, 077h, 000h, 000h
-        db      000h, 006h, 077h, 044h, 047h, 000h, 00ah, 077h
-        db      000h, 004h, 074h, 047h, 00ch, 077h, 002h, 044h
-        db      006h, 077h, 002h, 044h, 008h, 077h, 000h, 00eh
-        db      070h, 000h, 007h, 000h, 007h, 000h, 007h, 000h
-        db      006h, 077h, 002h, 044h, 004h, 077h, 002h, 071h
-        db      006h, 077h, 000h, 00ch, 074h, 0ffh, 047h, 077h
-        db      071h, 077h, 004h, 04ch, 000h, 00ah, 0cch, 04ch
-        db      040h, 077h, 071h, 000h, 004h, 077h, 000h, 010h
-        db      074h, 0fbh, 0f4h, 047h, 077h, 071h, 077h, 070h
-        db      004h, 0bfh, 002h, 0b0h, 00ah, 077h, 002h, 070h
-        db      02ch, 077h, 000h, 000h, 042h, 077h, 000h, 006h
-        db      074h, 044h, 047h, 000h, 004h, 077h, 002h, 071h
-        db      006h, 077h, 000h, 00ch, 074h, 044h, 047h, 077h
-        db      071h, 077h, 008h, 044h, 000h, 006h, 047h, 077h
-        db      071h, 000h, 004h, 077h, 002h, 074h, 004h, 044h
-        db      004h, 077h, 002h, 071h, 004h, 077h, 004h, 000h
-        db      002h, 007h, 032h, 077h, 002h, 007h, 004h, 077h
-        db      000h, 000h, 092h, 077h, 002h, 070h, 02ch, 077h
-        db      000h, 000h, 000h, 001h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 000h, 000h, 000h, 000h, 000h, 000h, 007h
+        db      007h, 007h, 007h, 004h, 004h, 004h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 000h, 000h, 000h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 000h, 000h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 004h, 004h, 004h, 004h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      004h, 004h, 004h, 004h, 004h, 004h, 004h, 004h
+        db      004h, 007h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      007h, 007h, 092h, 092h, 092h, 092h, 092h, 092h
+        db      092h, 092h, 092h, 092h, 092h, 092h, 092h, 007h
+        db      007h, 007h, 007h, 000h, 000h, 000h, 000h, 000h
+        db      000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h
+        db      007h, 007h, 007h, 000h, 007h, 000h, 007h, 000h
+        db      007h, 000h, 007h, 000h, 007h, 000h, 007h, 000h
+        db      007h, 007h, 06dh, 06dh, 06dh, 06dh, 06dh, 06dh
+        db      06dh, 06dh, 06dh, 06dh, 06dh, 06dh, 06dh, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 004h, 0ffh, 004h, 007h, 000h
+        db      000h, 000h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 0ffh, 0ffh, 000h, 007h, 000h, 000h
+        db      000h, 000h, 000h, 000h, 007h, 007h, 007h, 007h
+        db      007h, 0ffh, 000h, 007h, 000h, 000h, 000h, 000h
+        db      007h, 000h, 000h, 007h, 000h, 000h, 000h, 007h
+        db      007h, 007h, 004h, 004h, 007h, 007h, 004h, 004h
+        db      007h, 007h, 007h, 007h, 001h, 001h, 001h, 007h
+        db      004h, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh
+        db      004h, 007h, 007h, 007h, 001h, 001h, 001h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 001h, 001h, 001h, 007h
+        db      000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h
+        db      007h, 007h, 007h, 007h, 001h, 001h, 001h, 007h
+        db      007h, 000h, 000h, 000h, 000h, 000h, 000h, 000h
+        db      000h, 000h, 000h, 000h, 000h, 000h, 092h, 007h
+        db      007h, 007h, 007h, 000h, 007h, 0ech, 0ech, 0ech
+        db      0ech, 0ech, 0ech, 0ech, 0ech, 0ech, 0ech, 000h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 000h, 000h, 000h, 000h, 000h, 000h, 000h
+        db      000h, 000h, 000h, 000h, 000h, 000h, 06dh, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 004h, 004h, 004h, 004h, 007h, 007h
+        db      007h, 007h, 007h, 004h, 004h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 0ffh, 0ffh, 000h, 007h, 000h, 000h
+        db      000h, 000h, 000h, 000h, 007h, 007h, 007h, 007h
+        db      007h, 0ffh, 000h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 004h, 004h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 001h, 001h, 001h, 001h, 001h
+        db      004h, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh
+        db      004h, 007h, 007h, 001h, 001h, 001h, 001h, 001h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 001h, 001h, 001h, 001h, 001h
+        db      000h, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh, 000h
+        db      007h, 007h, 007h, 001h, 001h, 001h, 001h, 001h
+        db      007h, 000h, 0ffh, 0ddh, 0ddh, 0ddh, 0ddh, 0d6h
+        db      0d6h, 0d6h, 0d6h, 0d6h, 0d6h, 000h, 092h, 007h
+        db      007h, 007h, 007h, 000h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 0ech, 000h
+        db      007h, 007h, 007h, 000h, 007h, 007h, 000h, 007h
+        db      000h, 007h, 000h, 007h, 000h, 007h, 007h, 000h
+        db      007h, 000h, 0ffh, 0ddh, 0ddh, 0ddh, 0ddh, 0d6h
+        db      0d6h, 0d6h, 0d6h, 0d6h, 0d6h, 000h, 06dh, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 004h, 0ffh, 0ffh, 004h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 0ffh, 0ffh, 000h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 004h, 004h, 004h, 004h, 004h, 004h
+        db      007h, 007h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      004h, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh
+        db      004h, 007h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      007h, 000h, 000h, 000h, 000h, 000h, 000h, 000h
+        db      000h, 000h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      000h, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh, 000h
+        db      007h, 007h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      007h, 000h, 0ffh, 0ddh, 0ddh, 0ddh, 0ddh, 0ddh
+        db      0ddh, 0d6h, 0d6h, 0d6h, 0d6h, 000h, 092h, 007h
+        db      007h, 007h, 007h, 000h, 007h, 0ech, 0ech, 0ech
+        db      0ech, 0ech, 0ech, 0ech, 0ech, 0ech, 0ech, 000h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 000h, 0ffh, 0ddh, 0ddh, 0ddh, 0ddh, 0ddh
+        db      0ddh, 0d6h, 0d6h, 0d6h, 0d6h, 000h, 06dh, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 004h, 0ffh, 0ffh, 004h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 000h, 000h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 004h, 004h, 007h, 007h, 004h, 004h
+        db      007h, 007h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      004h, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh
+        db      004h, 007h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      004h, 004h, 004h, 004h, 004h, 004h, 004h, 004h
+        db      004h, 000h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      000h, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh, 000h
+        db      004h, 004h, 004h, 007h, 007h, 001h, 007h, 007h
+        db      007h, 000h, 0ffh, 0ddh, 0ddh, 0ddh, 0ddh, 0ddh
+        db      0ddh, 0ddh, 0d6h, 0d6h, 0d6h, 000h, 092h, 007h
+        db      007h, 007h, 007h, 000h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 0ech, 000h
+        db      007h, 007h, 007h, 000h, 007h, 007h, 000h, 007h
+        db      000h, 007h, 000h, 007h, 000h, 007h, 007h, 000h
+        db      007h, 000h, 0ffh, 0ddh, 0ddh, 0ddh, 0ddh, 0ddh
+        db      0ddh, 0ddh, 0d6h, 0d6h, 0d6h, 000h, 06dh, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 004h, 0ffh, 004h, 004h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      004h, 004h, 004h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 000h, 000h, 000h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 0ffh, 000h, 007h, 000h, 000h, 000h, 000h
+        db      007h, 000h, 000h, 007h, 000h, 000h, 000h, 007h
+        db      007h, 007h, 007h, 004h, 004h, 004h, 004h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      004h, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh
+        db      004h, 007h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      004h, 0ffh, 007h, 0ffh, 007h, 0ffh, 007h, 007h
+        db      004h, 000h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      000h, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh, 000h
+        db      0fbh, 0ffh, 004h, 007h, 007h, 001h, 007h, 007h
+        db      007h, 000h, 0ffh, 0ddh, 0ddh, 0ddh, 0ddh, 01fh
+        db      01fh, 01fh, 0d6h, 0d6h, 0d6h, 000h, 092h, 007h
+        db      000h, 007h, 007h, 000h, 007h, 0ech, 0ech, 0ech
+        db      0ech, 0ech, 0ech, 0ech, 002h, 002h, 0ech, 000h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 000h, 0ffh, 0ddh, 0ddh, 0ddh, 0ddh, 0ddh
+        db      0ddh, 0ddh, 0d6h, 0fbh, 0d6h, 000h, 06dh, 007h
+        db      007h, 000h, 000h, 000h, 000h, 000h, 000h, 007h
+        db      007h, 007h, 004h, 004h, 004h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      004h, 0ffh, 004h, 007h, 000h, 000h, 000h, 007h
+        db      007h, 007h, 0ffh, 0ffh, 000h, 007h, 000h, 000h
+        db      000h, 000h, 000h, 000h, 007h, 007h, 007h, 007h
+        db      007h, 0ffh, 000h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      004h, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh
+        db      004h, 007h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      004h, 007h, 0ffh, 001h, 0ffh, 001h, 001h, 007h
+        db      004h, 000h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      000h, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh, 000h
+        db      0ffh, 0fbh, 004h, 007h, 007h, 001h, 007h, 007h
+        db      007h, 000h, 0ffh, 0ddh, 0ddh, 0ddh, 0ddh, 0ddh
+        db      0ddh, 0ddh, 01fh, 0d6h, 0d6h, 000h, 092h, 007h
+        db      007h, 000h, 007h, 000h, 007h, 000h, 0ech, 0ech
+        db      0ech, 0ech, 0ech, 0ech, 0fah, 0fah, 0ech, 000h
+        db      007h, 007h, 007h, 000h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 000h, 007h, 000h, 007h, 007h, 000h
+        db      007h, 000h, 0ffh, 0ddh, 0ddh, 0ddh, 0ddh, 0ddh
+        db      0ddh, 0ddh, 0d6h, 0fbh, 0d6h, 000h, 06dh, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      004h, 004h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 0ffh, 0ffh, 000h, 007h, 000h, 000h
+        db      000h, 000h, 000h, 000h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      004h, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh
+        db      004h, 007h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      004h, 0ffh, 007h, 001h, 007h, 001h, 007h, 0ffh
+        db      004h, 000h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      000h, 0ffh, 0ffh, 0ffh, 000h, 000h, 000h, 000h
+        db      0fbh, 0ffh, 004h, 007h, 007h, 001h, 007h, 007h
+        db      007h, 000h, 0ffh, 0ddh, 0ddh, 0ddh, 0ddh, 0ddh
+        db      0ddh, 0ddh, 0ddh, 01fh, 0d6h, 000h, 092h, 007h
+        db      007h, 007h, 000h, 000h, 000h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 000h
+        db      001h, 001h, 007h, 007h, 001h, 001h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 000h, 0ffh, 0ddh, 0ddh, 0ddh, 0ddh, 0ddh
+        db      0fbh, 0ddh, 0ddh, 0fbh, 0d6h, 092h, 0fbh, 007h
+        db      007h, 007h, 004h, 004h, 004h, 004h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 0ffh, 0ffh, 000h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 000h, 000h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 004h, 004h, 004h, 004h, 004h
+        db      007h, 007h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      004h, 004h, 004h, 004h, 004h, 004h, 004h, 004h
+        db      004h, 007h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      004h, 007h, 001h, 001h, 0ffh, 007h, 001h, 007h
+        db      004h, 000h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      000h, 0ffh, 0ffh, 0ffh, 000h, 0ffh, 000h, 0fbh
+        db      0ffh, 0fbh, 004h, 007h, 007h, 001h, 007h, 007h
+        db      007h, 000h, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh
+        db      0ffh, 0ffh, 0ffh, 01fh, 0c3h, 000h, 007h, 007h
+        db      000h, 000h, 007h, 007h, 000h, 000h, 000h, 000h
+        db      000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h
+        db      007h, 001h, 001h, 001h, 001h, 007h, 007h, 000h
+        db      007h, 000h, 007h, 000h, 007h, 000h, 007h, 000h
+        db      007h, 000h, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh, 0ffh
+        db      0ffh, 0fbh, 0ffh, 0fbh, 0c3h, 0fbh, 007h, 007h
+        db      007h, 007h, 004h, 0ffh, 0ffh, 004h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 0ffh, 000h, 007h, 000h, 000h, 000h, 000h
+        db      007h, 000h, 000h, 007h, 000h, 000h, 000h, 007h
+        db      007h, 007h, 004h, 004h, 007h, 007h, 004h, 004h
+        db      007h, 007h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      004h, 0ffh, 007h, 001h, 007h, 001h, 001h, 0ffh
+        db      004h, 000h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      000h, 0ffh, 0ffh, 0ffh, 000h, 000h, 0fbh, 0ffh
+        db      0fbh, 0ffh, 004h, 007h, 007h, 001h, 007h, 007h
+        db      007h, 000h, 0d6h, 0d6h, 0d6h, 0d6h, 0d6h, 0d6h
+        db      0d6h, 000h, 000h, 01fh, 000h, 000h, 007h, 007h
+        db      007h, 007h, 000h, 007h, 000h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 001h, 001h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 000h, 0d6h, 0d6h, 0d6h, 0d6h, 0d6h, 0d6h
+        db      0d6h, 092h, 0fbh, 0fbh, 0fbh, 092h, 092h, 007h
+        db      007h, 007h, 004h, 0ffh, 0ffh, 004h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 004h, 004h, 004h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 000h, 000h, 000h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 0ffh, 000h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 004h, 004h, 007h, 007h, 004h, 004h
+        db      007h, 007h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 004h, 004h, 004h
+        db      004h, 007h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      004h, 007h, 0ffh, 007h, 0ffh, 007h, 0ffh, 007h
+        db      004h, 000h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      000h, 000h, 000h, 000h, 000h, 0fbh, 0ffh, 004h
+        db      004h, 004h, 004h, 007h, 007h, 001h, 007h, 007h
+        db      007h, 007h, 000h, 0d6h, 0d6h, 0d6h, 0d6h, 0d6h
+        db      000h, 007h, 007h, 01fh, 007h, 007h, 007h, 007h
+        db      007h, 000h, 007h, 000h, 007h, 000h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 001h, 001h, 001h, 001h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 000h, 0d6h, 0d6h, 0d6h, 0d6h, 0fbh
+        db      0fbh, 0fbh, 0fbh, 0fbh, 0fbh, 0fbh, 0fbh, 0fbh
+        db      007h, 007h, 004h, 0ffh, 004h, 004h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 004h, 0ffh, 004h, 007h, 000h, 000h, 000h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 0ffh, 0ffh, 000h, 007h, 000h, 000h
+        db      000h, 000h, 000h, 000h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 004h, 004h, 004h, 004h, 004h
+        db      007h, 007h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 004h, 0ffh, 0ffh
+        db      004h, 007h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      004h, 004h, 004h, 004h, 004h, 004h, 004h, 004h
+        db      004h, 000h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      007h, 007h, 007h, 004h, 0fbh, 0ffh, 0fbh, 004h
+        db      0fbh, 004h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      007h, 007h, 007h, 000h, 000h, 000h, 000h, 000h
+        db      007h, 007h, 007h, 01fh, 007h, 007h, 007h, 007h
+        db      000h, 007h, 007h, 007h, 007h, 007h, 000h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      001h, 001h, 007h, 007h, 001h, 001h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 000h, 000h, 000h, 000h, 000h
+        db      007h, 092h, 0fbh, 0fbh, 0fbh, 092h, 007h, 007h
+        db      007h, 007h, 004h, 004h, 004h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 004h, 004h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 0ffh, 0ffh, 000h, 007h, 000h, 000h
+        db      000h, 000h, 000h, 000h, 007h, 007h, 007h, 007h
+        db      092h, 092h, 092h, 092h, 092h, 092h, 092h, 092h
+        db      092h, 092h, 092h, 092h, 092h, 092h, 092h, 092h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 004h, 004h
+        db      007h, 007h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 004h, 0ffh, 0ffh
+        db      004h, 007h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      004h, 0fch, 004h, 0fch, 0fch, 0fch, 004h, 0fch
+        db      004h, 000h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      007h, 007h, 007h, 004h, 0ffh, 0fbh, 0ffh, 004h
+        db      004h, 007h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 01fh, 01fh, 01fh, 01fh, 01fh, 007h, 007h
+        db      007h, 007h, 007h, 000h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      0ffh, 0fbh, 007h, 0fbh, 007h, 0fbh, 092h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 0ffh, 0ffh, 000h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      092h, 0ffh, 0ffh, 092h, 0ffh, 0ffh, 0ffh, 0ffh
+        db      092h, 0ffh, 0ffh, 092h, 0ffh, 0ffh, 0ffh, 092h
+        db      007h, 007h, 007h, 004h, 004h, 004h, 004h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 004h, 004h, 004h
+        db      004h, 007h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      004h, 004h, 004h, 004h, 004h, 004h, 004h, 004h
+        db      004h, 007h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      007h, 007h, 007h, 004h, 004h, 004h, 004h, 004h
+        db      007h, 007h, 007h, 007h, 007h, 001h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 01fh, 01fh, 01fh, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      0fbh, 007h, 007h, 0fbh, 007h, 007h, 0fbh, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      092h, 092h, 092h, 092h, 092h, 092h, 092h, 092h
+        db      092h, 092h, 092h, 092h, 092h, 092h, 092h, 092h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 01fh, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 000h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 007h, 007h, 007h, 007h, 007h
+        db      007h, 007h, 007h, 0fbh, 007h, 007h, 007h, 007h
 
         align   4
@@ -1750 +2189 @@
 
         align   4
+_Resource_StrTab_261_0_data:
+        db      005h, 000h, 043h, 000h, 06ch, 000h, 06fh, 000h
+        db      073h, 000h, 065h, 000h, 000h, 000h, 000h, 000h
+        db      000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h
+        db      000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h
+        db      000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h
+        db      000h, 000h, 000h, 000h
+
+        align   4
 _Resource_ResourceDescriptor:
         public  _Resource_ResourceDescriptor
@@ -1755 +2203 @@
         dd      _Resource_PEResTab
 _Resource_NumberOfResources:
-        dd      11
+        dd      13
 _Resource_ResourceSectionSize:
         dd      LResTabEnd - _Resource_PEResTab

trunk/src/comctl32/rsrc.rc

@@ -12 +12 @@
   PUSHBUTTON    "Cancel", IDCANCEL,127,138,50,14
   PUSHBUTTON    "&Apply", IDC_APPLY_BUTTON,181,138,50,14
-  PUSHBUTTON    "Help",   IDHELP,235,138,50,14
-  CONTROL       "Tab",    IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS,7,7,278,125
+  PUSHBUTTON    "Help",   IDHELP,235,138,50,14,WS_TABSTOP|WS_GROUP
+  CONTROL       "Tab",    IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_TABSTOP,7,7,278,125
 END
 
@@ -26 +26 @@
   PUSHBUTTON    "< &Back", IDC_BACK_BUTTON,71,138,50,14
   PUSHBUTTON    "Cancel",  IDCANCEL,178,138,50,14
-  PUSHBUTTON    "Help",    IDHELP,235,138,50,14
+  PUSHBUTTON    "Help",    IDHELP,235,138,50,14,WS_GROUP
   LTEXT         "",        IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
   CONTROL       "Tab",     IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
@@ -69 +69 @@
 }
 
+IDT_CHECK BITMAP LOADONCALL DISCARDABLE
+{ 
+ '42 4D 8E 01 00 00 00 00 00 00 5E 00 00 00 28 00'
+ '00 00 1F 00 00 00 10 00 00 00 01 00 04 00 02 00'
+ '00 00 30 01 00 00 01 00 00 00 01 00 00 00 0A 00'
+ '00 00 0A 00 00 00 00 00 00 00 00 00 80 00 00 80'
+ '00 00 80 00 00 00 C0 C0 C0 00 80 80 80 00 00 FF'
+ '00 00 00 FF FF 00 FF 00 00 00 FF FF FF 00 1F 99'
+ '00 00 01 99 0D 11 02 99 0E 11 01 99 00 00 01 99'
+ '0D 11 02 99 0E 11 01 99 00 00 01 99 02 11 09 99'
+ '02 11 02 99 02 11 0A 99 02 11 01 99 00 00 01 99'
+ '02 11 09 99 02 11 02 99 02 11 0A 99 02 11 01 99'
+ '00 00 01 99 02 11 09 99 02 11 02 99 02 11 03 99'
+ '02 00 05 99 02 11 01 99 00 00 01 99 02 11 09 99'
+ '02 11 02 99 02 11 03 99 03 00 04 99 02 11 01 99'
+ '00 00 01 99 02 11 09 99 02 11 02 99 02 11 02 99'
+ '04 00 04 99 02 11 01 99 00 00 01 99 02 11 09 99'
+ '02 11 02 99 02 11 01 99 02 00 02 99 02 00 03 99'
+ '02 11 01 99 00 00 01 99 02 11 09 99 02 11 02 99'
+ '02 11 02 00 04 99 02 00 02 99 02 11 01 99 00 00'
+ '01 99 02 11 09 99 02 11 02 99 02 11 01 00 06 99'
+ '02 00 01 99 02 11 01 99 00 00 01 99 02 11 09 99'
+ '02 11 02 99 02 11 07 99 02 00 01 99 01 00 01 11'
+ '01 99 00 00 01 99 02 11 09 99 02 11 02 99 02 11'
+ '08 99 01 00 01 99 01 00 01 11 01 99 00 00 01 99'
+ '0D 11 02 99 0A 11 02 00 02 11 01 99 00 00 01 99'
+ '0D 11 02 99 0E 11 01 99 00 00 1F 99 00 01'
+}
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_CLOSE    "Close"
+}
 
 IDB_STD_SMALL BITMAP LOADONCALL DISCARDABLE
@@ -366 +399 @@
 }
 
+/* BINRES idb_view_small.bmp */
 IDB_VIEW_SMALL BITMAP LOADONCALL DISCARDABLE
 {
- '42 4D 2A 05 00 00 00 00 00 00 76 00 00 00 28 00'
- '00 00 C0 00 00 00 10 00 00 00 01 00 04 00 02 00'
- '00 00 B4 04 00 00 00 00 00 00 00 00 00 00 00 00'
+ '42 4D 36 10 00 00 00 00 00 00 36 04 00 00 28 00'
+ '00 00 C0 00 00 00 10 00 00 00 01 00 08 00 00 00'
+ '00 00 00 0C 00 00 00 00 00 00 00 00 00 00 00 00'
  '00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80'
  '00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80'
- '00 00 C0 C0 C0 00 80 80 80 00 00 00 FF 00 00 FF'
+ '00 00 C0 C0 C0 00 C0 DC C0 00 F0 CA A6 00 04 04'
+ '04 00 08 08 08 00 0C 0C 0C 00 11 11 11 00 16 16'
+ '16 00 1C 1C 1C 00 22 22 22 00 29 29 29 00 55 55'
+ '55 00 4D 4D 4D 00 42 42 42 00 39 39 39 00 80 7C'
+ 'FF 00 50 50 FF 00 93 00 D6 00 FF EC CC 00 C6 D6'
+ 'EF 00 D6 E7 E7 00 90 A9 AD 00 00 00 33 00 00 00'
+ '66 00 00 00 99 00 00 00 CC 00 00 33 00 00 00 33'
+ '33 00 00 33 66 00 00 33 99 00 00 33 CC 00 00 33'
+ 'FF 00 00 66 00 00 00 66 33 00 00 66 66 00 00 66'
+ '99 00 00 66 CC 00 00 66 FF 00 00 99 00 00 00 99'
+ '33 00 00 99 66 00 00 99 99 00 00 99 CC 00 00 99'
+ 'FF 00 00 CC 00 00 00 CC 33 00 00 CC 66 00 00 CC'
+ '99 00 00 CC CC 00 00 CC FF 00 00 FF 66 00 00 FF'
+ '99 00 00 FF CC 00 33 00 00 00 33 00 33 00 33 00'
+ '66 00 33 00 99 00 33 00 CC 00 33 00 FF 00 33 33'
+ '00 00 33 33 33 00 33 33 66 00 33 33 99 00 33 33'
+ 'CC 00 33 33 FF 00 33 66 00 00 33 66 33 00 33 66'
+ '66 00 33 66 99 00 33 66 CC 00 33 66 FF 00 33 99'
+ '00 00 33 99 33 00 33 99 66 00 33 99 99 00 33 99'
+ 'CC 00 33 99 FF 00 33 CC 00 00 33 CC 33 00 33 CC'
+ '66 00 33 CC 99 00 33 CC CC 00 33 CC FF 00 33 FF'
+ '33 00 33 FF 66 00 33 FF 99 00 33 FF CC 00 33 FF'
+ 'FF 00 66 00 00 00 66 00 33 00 66 00 66 00 66 00'
+ '99 00 66 00 CC 00 66 00 FF 00 66 33 00 00 66 33'
+ '33 00 66 33 66 00 66 33 99 00 66 33 CC 00 66 33'
+ 'FF 00 66 66 00 00 66 66 33 00 66 66 66 00 66 66'
+ '99 00 66 66 CC 00 66 99 00 00 66 99 33 00 66 99'
+ '66 00 66 99 99 00 66 99 CC 00 66 99 FF 00 66 CC'
+ '00 00 66 CC 33 00 66 CC 99 00 66 CC CC 00 66 CC'
+ 'FF 00 66 FF 00 00 66 FF 33 00 66 FF 99 00 66 FF'
+ 'CC 00 CC 00 FF 00 FF 00 CC 00 99 99 00 00 99 33'
+ '99 00 99 00 99 00 99 00 CC 00 99 00 00 00 99 33'
+ '33 00 99 00 66 00 99 33 CC 00 99 00 FF 00 99 66'
+ '00 00 99 66 33 00 99 33 66 00 99 66 99 00 99 66'
+ 'CC 00 99 33 FF 00 99 99 33 00 99 99 66 00 99 99'
+ '99 00 99 99 CC 00 99 99 FF 00 99 CC 00 00 99 CC'
+ '33 00 66 CC 66 00 99 CC 99 00 99 CC CC 00 99 CC'
+ 'FF 00 99 FF 00 00 99 FF 33 00 99 CC 66 00 99 FF'
+ '99 00 99 FF CC 00 99 FF FF 00 CC 00 00 00 99 00'
+ '33 00 CC 00 66 00 CC 00 99 00 CC 00 CC 00 99 33'
+ '00 00 CC 33 33 00 CC 33 66 00 CC 33 99 00 CC 33'
+ 'CC 00 CC 33 FF 00 CC 66 00 00 CC 66 33 00 99 66'
+ '66 00 CC 66 99 00 CC 66 CC 00 99 66 FF 00 CC 99'
+ '00 00 CC 99 33 00 CC 99 66 00 CC 99 99 00 CC 99'
+ 'CC 00 CC 99 FF 00 CC CC 00 00 CC CC 33 00 CC CC'
+ '66 00 CC CC 99 00 CC CC CC 00 CC CC FF 00 CC FF'
+ '00 00 CC FF 33 00 99 FF 66 00 CC FF 99 00 CC FF'
+ 'CC 00 CC FF FF 00 CC 00 33 00 FF 00 66 00 FF 00'
+ '99 00 CC 33 00 00 FF 33 33 00 FF 33 66 00 FF 33'
+ '99 00 FF 33 CC 00 FF 33 FF 00 FF 66 00 00 FF 66'
+ '33 00 CC 66 66 00 FF 66 99 00 FF 66 CC 00 CC 66'
+ 'FF 00 FF 99 00 00 FF 99 33 00 FF 99 66 00 FF 99'
+ '99 00 FF 99 CC 00 FF 99 FF 00 FF CC 00 00 FF CC'
+ '33 00 FF CC 66 00 FF CC 99 00 FF CC CC 00 FF CC'
+ 'FF 00 FF FF 33 00 CC FF 66 00 FF FF 99 00 FF FF'
+ 'CC 00 66 66 FF 00 66 FF 66 00 66 FF FF 00 FF 66'
+ '66 00 FF 66 FF 00 FF FF 66 00 21 00 A5 00 5F 5F'
+ '5F 00 77 77 77 00 86 86 86 00 96 96 96 00 CB CB'
+ 'CB 00 B2 B2 B2 00 D7 D7 D7 00 DD DD DD 00 E3 E3'
+ 'E3 00 EA EA EA 00 F1 F1 F1 00 F8 F8 F8 00 F0 FB'
+ 'FF 00 A4 A0 A0 00 80 80 80 00 00 00 FF 00 00 FF'
  '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF'
- '00 00 FF FF FF 00 C0 77 00 00 08 77 02 70 04 00'
- '00 08 07 77 74 44 0A 77 00 04 44 47 04 77 00 04'
- '44 47 04 77 00 18 47 70 00 07 00 07 00 07 77 74'
- '44 47 04 77 00 04 71 77 08 44 00 06 47 77 71 00'
- '0E 77 02 71 0E 77 02 71 14 77 02 70 0C 00 02 77'
- '0E 70 0A 00 02 07 04 77 00 00 12 77 00 08 74 F4'
- '70 00 06 77 00 10 4F 47 00 07 4F 47 00 07 12 77'
- '00 06 44 77 44 00 04 77 00 06 11 17 4F 00 06 FF'
- '00 08 47 77 11 17 0C 77 00 04 11 17 08 00 04 77'
- '00 04 11 17 0E 00 00 08 07 77 70 78 08 88 02 80'
- '10 77 02 0B 08 FB 02 07 04 77 00 00 0A 77 04 44'
- '04 77 00 04 74 47 0A 77 02 44 06 77 02 44 06 77'
- '00 14 47 70 00 07 00 07 00 07 77 44 06 77 02 71'
- '04 11 02 4F 06 FF 00 04 47 71 04 11 0A 77 02 71'
- '04 11 02 0F 04 FF 00 06 F0 77 71 00 04 11 02 0F'
- '0C BF 00 06 07 77 70 00 0A 77 00 08 80 77 70 77'
- '08 07 00 04 70 0F 08 BF 02 07 04 77 00 00 0A 77'
- '00 04 4F F4 34 77 06 44 04 77 00 06 71 77 4F 00'
- '06 FF 00 0A 47 77 71 77 70 00 08 00 00 08 77 71'
- '77 0F 04 FF 02 F0 04 77 00 06 71 77 0B 00 0C FB'
- '00 08 07 77 70 78 08 88 02 80 10 77 02 0B 08 FB'
- '02 07 04 77 00 00 0A 77 00 04 4F F4 22 77 00 18'
- '47 70 00 07 00 07 00 07 77 44 77 44 04 77 00 06'
- '71 77 4F 00 06 FF 00 08 47 77 71 77 08 44 00 0A'
- '40 77 71 77 0F 00 04 FF 00 10 F0 44 47 71 77 0F'
- 'BF B0 04 00 00 0A 0F BF 07 77 70 00 0A 77 00 08'
- '80 77 70 77 08 07 00 04 70 0F 08 BF 00 06 07 70'
- '77 00 00 00 0A 77 00 04 4F 44 0A 77 00 04 44 47'
- '04 77 00 04 44 47 04 77 00 04 44 47 16 77 00 06'
- '74 44 47 00 04 77 00 06 71 77 4F 00 06 FF 00 0A'
- '47 77 71 77 4F 00 04 7F 00 0C 77 40 77 71 77 0F'
- '04 FF 00 10 F0 BF 47 71 77 0B FB F0 08 FB 04 07'
- '00 04 70 78 06 88 00 04 22 80 10 77 02 0B 08 FB'
- '04 07 02 77 00 00 02 70 04 00 00 08 07 77 44 47'
- '0A 77 00 28 4F 47 00 07 4F 47 00 07 4F 47 00 07'
- '47 70 00 07 00 07 00 07 0C 77 00 06 71 77 4F 00'
- '06 FF 00 0A 47 77 71 77 47 00 04 F1 00 0C 17 40'
- '77 71 77 0F 04 FF 00 10 F0 FB 47 71 77 0F BF B0'
- '08 BF 02 07 06 70 06 88 00 08 AA 80 77 70 06 77'
- '04 07 00 04 70 0F 08 BF 02 00 04 77 00 00 18 77'
- '02 44 06 77 02 44 06 77 02 44 22 77 00 06 71 77'
- '4F 00 06 FF 00 0A 47 77 71 77 4F 00 04 71 00 0E'
- '7F 40 77 71 77 0F FF 00 04 00 00 0C BF 47 71 77'
- '0B F0 04 00 06 FB 00 08 07 77 00 07 08 77 00 08'
- '70 11 77 11 0A 77 0A 00 02 77 04 07 00 00 02 77'
- '04 44 2A 77 00 14 47 70 00 07 00 07 00 07 77 74'
- '04 44 04 77 00 04 71 77 08 44 00 30 47 77 71 77'
- '47 11 F7 17 40 77 71 77 0F FF 0F 0B FB 47 71 77'
- '0F BF 00 0F 06 BF 00 06 07 00 77 00 0C 00 00 06'
- '71 11 17 00 0C 70 04 BF 02 07 04 70 04 77 00 00'
- '00 06 77 4F F4 00 3C 77 00 06 44 77 44 00 04 77'
- '02 71 0E 77 00 06 71 77 4F 00 04 71 00 10 1F 40'
- '77 71 77 0F FF 00 04 BF 00 0C 47 71 77 0B FB F0'
- '08 FB 00 04 07 77 04 07 0C 77 02 11 0E 77 04 00'
- '02 77 06 07 02 77 00 00 00 06 77 4F F4 00 0A 77'
- '00 04 74 44 0C 77 00 04 44 47 04 77 00 04 44 47'
- '04 77 10 44 00 08 77 44 77 44 04 77 02 71 06 77'
- '00 0E 74 44 47 77 71 77 47 00 06 F7 00 08 40 77'
- '71 77 04 00 00 0E 0B F4 44 47 71 77 0F 00 0C BF'
- '02 07 06 70 0A 77 00 06 71 11 17 00 10 77 02 70'
- '04 77 00 04 70 77 00 00 00 06 77 4F 44 00 0A 77'
- '00 08 74 F4 70 00 08 77 00 10 4F 47 00 07 4F 47'
- '00 07 12 77 02 74 04 44 04 77 02 71 06 77 00 0C'
- '74 FF 47 77 71 77 08 44 00 06 40 77 71 00 04 77'
- '00 04 74 BF 04 B4 00 06 77 71 77 00 0E 00 00 04'
- '77 07 04 77 02 07 08 77 00 06 11 77 11 00 14 77'
- '02 07 04 77 00 00 00 06 77 44 47 00 0A 77 00 04'
- '74 47 0C 77 02 44 06 77 02 44 08 77 00 0E 70 00'
- '07 00 07 00 07 00 06 77 02 44 04 77 02 71 06 77'
- '00 0C 74 FF 47 77 71 77 04 4C 00 0A CC 4C 40 77'
- '71 00 04 77 00 10 74 FB F4 47 77 71 77 70 04 BF'
- '02 B0 0A 77 02 70 2C 77 00 00 42 77 00 06 74 44'
- '47 00 04 77 02 71 06 77 00 0C 74 44 47 77 71 77'
- '08 44 00 06 47 77 71 00 04 77 02 74 04 44 04 77'
- '02 71 04 77 04 00 02 07 32 77 02 07 04 77 00 00'
- '92 77 02 70 2C 77 00 00 00 01'
+ '00 00 FF FF FF 00 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 00'
+ '00 00 00 00 00 07 07 07 07 04 04 04 07 07 07 07'
+ '07 07 07 07 07 07 07 07 00 00 00 07 07 07 07 07'
+ '07 07 07 07 07 07 07 00 00 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 04 04 04 04 07 07 07'
+ '07 07 07 01 07 07 04 04 04 04 04 04 04 04 04 07'
+ '07 07 07 01 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 01 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 01 07 07 07 07 92 92 92 92 92 92 92 92'
+ '92 92 92 92 92 07 07 07 07 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 07 07 07 00 07 00 07 00 07 00'
+ '07 00 07 00 07 00 07 07 6D 6D 6D 6D 6D 6D 6D 6D'
+ '6D 6D 6D 6D 6D 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 04 FF 04 07 00 00 00'
+ '07 07 07 07 07 07 07 07 FF FF 00 07 00 00 00 00'
+ '00 00 07 07 07 07 07 FF 00 07 00 00 00 00 07 00'
+ '00 07 00 00 00 07 07 07 04 04 07 07 04 04 07 07'
+ '07 07 01 01 01 07 04 FF FF FF FF FF FF FF 04 07'
+ '07 07 01 01 01 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 01 01 01 07 00 00 00 00 00 00 00 00 07 07'
+ '07 07 01 01 01 07 07 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 92 07 07 07 07 00 07 EC EC EC EC EC'
+ 'EC EC EC EC EC 00 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 6D 07 07 07 07 07 07 07 07 07 07 07'
+ '04 04 04 04 07 07 07 07 07 04 04 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 FF FF 00 07 00 00 00 00'
+ '00 00 07 07 07 07 07 FF 00 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 04 04 07 07 07 07 07 07'
+ '07 01 01 01 01 01 04 FF FF FF FF FF FF FF 04 07'
+ '07 01 01 01 01 01 07 07 07 07 07 07 07 07 07 07'
+ '07 01 01 01 01 01 00 FF FF FF FF FF FF 00 07 07'
+ '07 01 01 01 01 01 07 00 FF DD DD DD DD D6 D6 D6'
+ 'D6 D6 D6 00 92 07 07 07 07 00 07 07 07 07 07 07'
+ '07 07 07 07 EC 00 07 07 07 00 07 07 00 07 00 07'
+ '00 07 00 07 07 00 07 00 FF DD DD DD DD D6 D6 D6'
+ 'D6 D6 D6 00 6D 07 07 07 07 07 07 07 07 07 07 07'
+ '04 FF FF 04 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 FF FF 00 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 04 04 04 04 04 04 07 07'
+ '07 07 07 01 07 07 04 FF FF FF FF FF FF FF 04 07'
+ '07 07 07 01 07 07 07 00 00 00 00 00 00 00 00 00'
+ '07 07 07 01 07 07 00 FF FF FF FF FF FF 00 07 07'
+ '07 07 07 01 07 07 07 00 FF DD DD DD DD DD DD D6'
+ 'D6 D6 D6 00 92 07 07 07 07 00 07 EC EC EC EC EC'
+ 'EC EC EC EC EC 00 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 00 FF DD DD DD DD DD DD D6'
+ 'D6 D6 D6 00 6D 07 07 07 07 07 07 07 07 07 07 07'
+ '04 FF FF 04 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 00 00 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 04 04 07 07 04 04 07 07'
+ '07 07 07 01 07 07 04 FF FF FF FF FF FF FF 04 07'
+ '07 07 07 01 07 07 04 04 04 04 04 04 04 04 04 00'
+ '07 07 07 01 07 07 00 FF FF FF FF FF FF 00 04 04'
+ '04 07 07 01 07 07 07 00 FF DD DD DD DD DD DD DD'
+ 'D6 D6 D6 00 92 07 07 07 07 00 07 07 07 07 07 07'
+ '07 07 07 07 EC 00 07 07 07 00 07 07 00 07 00 07'
+ '00 07 00 07 07 00 07 00 FF DD DD DD DD DD DD DD'
+ 'D6 D6 D6 00 6D 07 07 07 07 07 07 07 07 07 07 07'
+ '04 FF 04 04 07 07 07 07 07 07 07 07 07 07 04 04'
+ '04 07 07 07 07 07 07 07 00 00 00 07 07 07 07 07'
+ '07 07 07 07 07 07 07 FF 00 07 00 00 00 00 07 00'
+ '00 07 00 00 00 07 07 07 07 04 04 04 04 07 07 07'
+ '07 07 07 01 07 07 04 FF FF FF FF FF FF FF 04 07'
+ '07 07 07 01 07 07 04 FF 07 FF 07 FF 07 07 04 00'
+ '07 07 07 01 07 07 00 FF FF FF FF FF FF 00 FB FF'
+ '04 07 07 01 07 07 07 00 FF DD DD DD DD 1F 1F 1F'
+ 'D6 D6 D6 00 92 07 00 07 07 00 07 EC EC EC EC EC'
+ 'EC EC 02 02 EC 00 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 00 FF DD DD DD DD DD DD DD'
+ 'D6 FB D6 00 6D 07 07 00 00 00 00 00 00 07 07 07'
+ '04 04 04 07 07 07 07 07 07 07 07 07 07 07 04 FF'
+ '04 07 00 00 00 07 07 07 FF FF 00 07 00 00 00 00'
+ '00 00 07 07 07 07 07 FF 00 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 01 07 07 04 FF FF FF FF FF FF FF 04 07'
+ '07 07 07 01 07 07 04 07 FF 01 FF 01 01 07 04 00'
+ '07 07 07 01 07 07 00 FF FF FF FF FF FF 00 FF FB'
+ '04 07 07 01 07 07 07 00 FF DD DD DD DD DD DD DD'
+ '1F D6 D6 00 92 07 07 00 07 00 07 00 EC EC EC EC'
+ 'EC EC FA FA EC 00 07 07 07 00 07 07 07 07 07 07'
+ '00 07 00 07 07 00 07 00 FF DD DD DD DD DD DD DD'
+ 'D6 FB D6 00 6D 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 04 04'
+ '07 07 07 07 07 07 07 07 FF FF 00 07 00 00 00 00'
+ '00 00 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 01 07 07 04 FF FF FF FF FF FF FF 04 07'
+ '07 07 07 01 07 07 04 FF 07 01 07 01 07 FF 04 00'
+ '07 07 07 01 07 07 00 FF FF FF 00 00 00 00 FB FF'
+ '04 07 07 01 07 07 07 00 FF DD DD DD DD DD DD DD'
+ 'DD 1F D6 00 92 07 07 07 00 00 00 07 07 07 07 07'
+ '07 07 07 07 07 00 01 01 07 07 01 01 07 07 07 07'
+ '07 07 07 07 07 07 07 00 FF DD DD DD DD DD FB DD'
+ 'DD FB D6 92 FB 07 07 07 04 04 04 04 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 FF FF 00 07 07 07 07 07'
+ '07 07 07 07 07 07 07 00 00 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 04 04 04 04 04 07 07'
+ '07 07 07 01 07 07 04 04 04 04 04 04 04 04 04 07'
+ '07 07 07 01 07 07 04 07 01 01 FF 07 01 07 04 00'
+ '07 07 07 01 07 07 00 FF FF FF 00 FF 00 FB FF FB'
+ '04 07 07 01 07 07 07 00 FF FF FF FF FF FF FF FF'
+ 'FF 1F C3 00 07 07 00 00 07 07 00 00 00 00 00 00'
+ '00 00 00 00 00 00 07 01 01 01 01 07 07 00 07 00'
+ '07 00 07 00 07 00 07 00 FF FF FF FF FF FF FF FB'
+ 'FF FB C3 FB 07 07 07 07 04 FF FF 04 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 FF 00 07 00 00 00 00 07 00'
+ '00 07 00 00 00 07 07 07 04 04 07 07 04 04 07 07'
+ '07 07 07 01 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 01 07 07 04 FF 07 01 07 01 01 FF 04 00'
+ '07 07 07 01 07 07 00 FF FF FF 00 00 FB FF FB FF'
+ '04 07 07 01 07 07 07 00 D6 D6 D6 D6 D6 D6 D6 00'
+ '00 1F 00 00 07 07 07 07 00 07 00 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 01 01 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 00 D6 D6 D6 D6 D6 D6 D6 92'
+ 'FB FB FB 92 92 07 07 07 04 FF FF 04 07 07 07 07'
+ '07 07 07 07 07 07 07 04 04 04 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 00 00 00 07 07 07 07 07'
+ '07 07 07 07 07 07 07 FF 00 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 04 04 07 07 04 04 07 07'
+ '07 07 07 01 07 07 07 07 07 07 07 04 04 04 04 07'
+ '07 07 07 01 07 07 04 07 FF 07 FF 07 FF 07 04 00'
+ '07 07 07 01 07 07 00 00 00 00 00 FB FF 04 04 04'
+ '04 07 07 01 07 07 07 07 00 D6 D6 D6 D6 D6 00 07'
+ '07 1F 07 07 07 07 07 00 07 00 07 00 07 07 07 07'
+ '07 07 07 07 07 07 07 01 01 01 01 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 00 D6 D6 D6 D6 FB FB FB'
+ 'FB FB FB FB FB FB 07 07 04 FF 04 04 07 07 07 07'
+ '07 07 07 07 07 07 07 04 FF 04 07 00 00 00 07 07'
+ '07 07 07 07 07 07 07 07 FF FF 00 07 00 00 00 00'
+ '00 00 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 04 04 04 04 04 07 07'
+ '07 07 07 01 07 07 07 07 07 07 07 04 FF FF 04 07'
+ '07 07 07 01 07 07 04 04 04 04 04 04 04 04 04 00'
+ '07 07 07 01 07 07 07 07 07 04 FB FF FB 04 FB 04'
+ '07 07 07 01 07 07 07 07 07 00 00 00 00 00 07 07'
+ '07 1F 07 07 07 07 00 07 07 07 07 07 00 07 07 07'
+ '07 07 07 07 07 07 01 01 07 07 01 01 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 00 00 00 00 00 07 92'
+ 'FB FB FB 92 07 07 07 07 04 04 04 07 07 07 07 07'
+ '07 07 07 07 07 07 07 04 04 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 FF FF 00 07 00 00 00 00'
+ '00 00 07 07 07 07 92 92 92 92 92 92 92 92 92 92'
+ '92 92 92 92 92 92 07 07 07 07 07 07 04 04 07 07'
+ '07 07 07 01 07 07 07 07 07 07 07 04 FF FF 04 07'
+ '07 07 07 01 07 07 04 FC 04 FC FC FC 04 FC 04 00'
+ '07 07 07 01 07 07 07 07 07 04 FF FB FF 04 04 07'
+ '07 07 07 01 07 07 07 07 07 07 07 07 07 07 07 1F'
+ '1F 1F 1F 1F 07 07 07 07 07 00 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 FF FB'
+ '07 FB 07 FB 92 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 FF FF 00 07 07 07 07 07'
+ '07 07 07 07 07 07 92 FF FF 92 FF FF FF FF 92 FF'
+ 'FF 92 FF FF FF 92 07 07 07 04 04 04 04 07 07 07'
+ '07 07 07 01 07 07 07 07 07 07 07 04 04 04 04 07'
+ '07 07 07 01 07 07 04 04 04 04 04 04 04 04 04 07'
+ '07 07 07 01 07 07 07 07 07 04 04 04 04 04 07 07'
+ '07 07 07 01 07 07 07 07 07 07 07 07 07 07 07 07'
+ '1F 1F 1F 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 FB 07'
+ '07 FB 07 07 FB 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 92 92 92 92 92 92 92 92 92 92'
+ '92 92 92 92 92 92 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 1F 07 07 07 07 07 07 07 00 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 FB 07 07 07 07'
 }
 

trunk/src/comctl32/tab.c

@@ -1 @@
-/* $Id: tab.c,v 1.17 1999-11-05 13:01:33 achimha Exp $ */
+/* $Id: tab.c,v 1.18 1999-12-18 20:57:00 achimha Exp $ */
 /*
  * Tab control
@@ -15 +15 @@
  */
 
-/* WINE 991031 level */
+/* inconsistent: report! */
+/* WINE 991212 level */
 
 #include <string.h>
@@ -849 +850 @@
     INT    oldBkMode;
     INT    cx,cy;
+    BOOL deleteBrush = TRUE;
 
     if (lStyle & TCS_BUTTONS)
@@ -866 +868 @@
         if (!(lStyle & TCS_OWNERDRAWFIXED))
         {
+          COLORREF bk = GetSysColor(COLOR_3DHILIGHT);
           DeleteObject(hbr);
-          hbr = CreateSolidBrush(GetSysColor(COLOR_3DHILIGHT));
+          hbr = GetSysColorBrush(COLOR_SCROLLBAR);
+          SetTextColor(hdc, GetSysColor(COLOR_3DFACE));
+          SetBkColor(hdc, bk);
+
         }
 

trunk/src/comctl32/toolbar.c

@@ -1 @@
-/* $Id: toolbar.c,v 1.18 1999-11-19 16:19:22 achimha Exp $ */
+/* $Id: toolbar.c,v 1.19 1999-12-18 20:57:01 achimha Exp $ */
 /*
  * Toolbar control
@@ -10 +10 @@
  *   - A little bug in TOOLBAR_DrawMasked()
  *   - Button wrapping (under construction).
- *   - Messages.
+ *   - Messages (under construction).
  *   - Notifications.
  *   - Fix TB_SETROWS.
  *   - Tooltip support (almost complete).
- *   - Fix TOOLBAR_SetButtonInfo32A.
+ *   - Unicode support (under construction).
+ *   - Fix TOOLBAR_SetButtonInfo32A/W.
  *   - Drag & drop of buttons
  *
@@ -27 +28 @@
  */
 
-/* WINE 991114 level */
+/* WINE 991212 level */
 
 /* CB: Odin32/WINE bugs
@@ -68 +69 @@
 static void
 TOOLBAR_DrawString (TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr,
-                    HDC hdc, INT nState)
+                    HDC hdc, INT nState, DWORD dwStyle)
 {
     RECT   rcText = btnPtr->rect;
@@ -78 +79 @@
     if ((btnPtr->iString > -1) && (btnPtr->iString < infoPtr->nNumStrings)) {
         InflateRect (&rcText, -3, -3);
-        rcText.top += infoPtr->nBitmapHeight;
+        if (dwStyle & TBSTYLE_LIST) {
+          rcText.left += infoPtr->nBitmapWidth;
+        }
+        else {
+          rcText.top += infoPtr->nBitmapHeight;
+        }
         if (nState & (TBSTATE_PRESSED | TBSTATE_CHECKED))
             OffsetRect (&rcText, 1, 1);
@@ -209 +215 @@
         TOOLBAR_DrawMasked (infoPtr, btnPtr, hdc, rc.left+1, rc.top+1);
 
-      TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState);
+      TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState, dwStyle);
       return;
     }
@@ -216 +222 @@
     if (btnPtr->fsState & TBSTATE_PRESSED)
     {
-      DrawEdge (hdc, &rc, EDGE_SUNKEN, BF_RECT | BF_MIDDLE | BF_ADJUST);
+      if (dwStyle & TBSTYLE_FLAT)
+        DrawEdge(hdc, &rc, BDR_SUNKENOUTER, BF_RECT | BF_MIDDLE | BF_ADJUST);
+      else
+        DrawEdge (hdc, &rc, EDGE_SUNKEN, BF_RECT | BF_MIDDLE | BF_ADJUST);
       ImageList_Draw (infoPtr->himlDef, btnPtr->iBitmap, hdc,
                       rc.left+2, rc.top+2, ILD_NORMAL);
-      TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState);
+      TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState, dwStyle);
       return;
     }
@@ -238 +247 @@
                         rc.left+2, rc.top+2, ILD_NORMAL);
 
-        TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState);
+        TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState, dwStyle);
         return;
     }
@@ -250 +259 @@
       TOOLBAR_DrawPattern (hdc, &rc);
       TOOLBAR_DrawMasked (infoPtr, btnPtr, hdc, rc.left+1, rc.top+1);
-      TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState);
+      TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState, dwStyle);
       return;
     }
@@ -258 +267 @@
     {
       if(btnPtr->bHot)
-          DrawEdge (hdc, &rc, BDR_RAISEDINNER,
-                     BF_RECT | BF_MIDDLE | BF_SOFT);
+          DrawEdge (hdc, &rc, BDR_RAISEDINNER, BF_RECT | BF_MIDDLE);
 
       if(btnPtr->bHot && infoPtr->himlHot)
@@ -276 +284 @@
     }
 
-    TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState);
+    TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState, dwStyle);
 }
 
@@ -342 +350 @@
 
 static void
-TOOLBAR_WrapToolbar( HWND hwnd )
+TOOLBAR_WrapToolbar( HWND hwnd, DWORD dwStyle )
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
     TBUTTON_INFO *btnPtr;
-    DWORD dwStyle = GetWindowLongA (hwnd, GWL_STYLE);
     INT x, cx, i, j;
     RECT rc;
@@ -491 +498 @@
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(hwnd);
+    DWORD dwStyle = GetWindowLongA(hwnd, GWL_STYLE);
     TBUTTON_INFO *btnPtr;
     INT i, nRows, nSepRows;
@@ -500 +508 @@
     TOOLBAR_CalcStrings (hwnd, &sizeString);
 
-    if (sizeString.cy > 0)
-        infoPtr->nButtonHeight = sizeString.cy + infoPtr->nBitmapHeight + 6;
-    else if (infoPtr->nButtonHeight < infoPtr->nBitmapHeight + 6)
-        infoPtr->nButtonHeight = infoPtr->nBitmapHeight + 6;
-
-    if (sizeString.cx > infoPtr->nBitmapWidth)
-        infoPtr->nButtonWidth = sizeString.cx + 6;
-    else if (infoPtr->nButtonWidth < infoPtr->nBitmapWidth + 6)
-        infoPtr->nButtonWidth = infoPtr->nBitmapWidth + 6;
-
-    TOOLBAR_WrapToolbar( hwnd );
+    if (dwStyle & TBSTYLE_LIST) {
+      infoPtr->nButtonHeight = max(infoPtr->nBitmapHeight, sizeString.cy) + 6;
+      infoPtr->nButtonWidth = infoPtr->nBitmapWidth + sizeString.cx + 6;
+    }
+    else {
+      if (sizeString.cy > 0)
+          infoPtr->nButtonHeight = sizeString.cy + infoPtr->nBitmapHeight + 6;
+      else if (infoPtr->nButtonHeight < infoPtr->nBitmapHeight + 6)
+          infoPtr->nButtonHeight = infoPtr->nBitmapHeight + 6;
+
+      if (sizeString.cx > infoPtr->nBitmapWidth)
+          infoPtr->nButtonWidth = sizeString.cx + 6;
+      else if (infoPtr->nButtonWidth < infoPtr->nBitmapWidth + 6)
+          infoPtr->nButtonWidth = infoPtr->nBitmapWidth + 6;
+    }
+
+    TOOLBAR_WrapToolbar( hwnd, dwStyle );
 
     x  = infoPtr->nIndent;
-    y  = TOP_BORDER;
+    y  = (dwStyle & TBSTYLE_FLAT) ? 0: TOP_BORDER;
     cx = infoPtr->nButtonWidth;
     cy = infoPtr->nButtonHeight;
@@ -1557 +1571 @@
 TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-    TOOLBAR_INFO *infoPtr;
+    TOOLBAR_INFO *infoPtr = (TOOLBAR_INFO *)GetWindowLongA (hwnd, DWL_USER);
+    static HDSA hDsa = NULL;
 
     switch (uMsg)
     {
-        case WM_INITDIALOG:
-            return TBCUSTOMIZE_InitDialog(hwnd,wParam,lParam);
-
-        case WM_CLOSE:
-            return TBCUSTOMIZE_Close(hwnd,wParam,lParam);
-
-        case WM_COMMAND:
-            return TBCUSTOMIZE_Command(hwnd,wParam,lParam);
-
-        case WM_DESTROY:
-            return TBCUSTOMIZE_Destroy(hwnd,wParam,lParam);
-
-        case WM_DRAWITEM:
-            return TBCUSTOMIZE_DrawItem(hwnd,wParam,lParam);
-
-        case WM_MEASUREITEM:
-            return TBCUSTOMIZE_MeasureItem(hwnd,wParam,lParam);
-
-        default:
-            return FALSE;
+        case WM_INITDIALOG:
+            infoPtr = (TOOLBAR_INFO *)lParam;
+            SetWindowLongA (hwnd, DWL_USER, (DWORD)infoPtr);
+
+            hDsa = DSA_Create (sizeof(TBUTTON_INFO), 5);
+
+            if (infoPtr)
+            {
+                TBUTTON_INFO *btnPtr;
+                INT i;
+
+                /* insert 'virtual' separator button into 'available buttons' list */
+                SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_ADDSTRING, 0, (LPARAM)"");
+
+                /* copy all buttons and append them to the right listbox */             
+                btnPtr = infoPtr->buttons;
+                for (i = 0; i < infoPtr->nNumButtons; i++, btnPtr++)
+                {
+                    DSA_InsertItem (hDsa, i, btnPtr);
+
+                    /* FIXME: hidden buttons appear in the 'toolbar buttons' list too */
+                    if (btnPtr->fsState & TBSTATE_HIDDEN)
+                    {
+                        SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_ADDSTRING, 0, (LPARAM)"");
+                    }
+                    else
+                    {
+                        SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_ADDSTRING, 0, (LPARAM)"");
+                    }
+                }
+
+                /* append 'virtual' separator button to the 'toolbar buttons' list */
+                /* TODO */
+            }
+            return TRUE;
+
+        case WM_CLOSE:
+            EndDialog(hwnd, FALSE);
+            return TRUE;
+
+        case WM_COMMAND:
+            switch (LOWORD(wParam))
+            {
+                case IDCANCEL:
+                    EndDialog(hwnd, FALSE);
+                    break;
+            }
+            return TRUE;
+
+        case WM_DESTROY:
+            if (hDsa)
+                DSA_Destroy (hDsa);
+            return TRUE;
+
+        case WM_DRAWITEM:
+            if (wParam == IDC_AVAILBTN_LBOX || wParam == IDC_TOOLBARBTN_LBOX)
+            {
+                LPDRAWITEMSTRUCT lpdis = (LPDRAWITEMSTRUCT)lParam;
+                TBUTTON_INFO btnPtr;
+                RECT rcButton;
+                RECT rcText;
+                HPEN hOldPen;
+                HBRUSH hOldBrush;
+                COLORREF oldText = 0;
+                COLORREF oldBk = 0;
+
+                FIXME("action: %x itemState: %x\n",
+                      lpdis->itemAction, lpdis->itemState);             
+
+                DSA_GetItem (hDsa, 0 /*lpdis->itemID*/, &btnPtr);
+
+                if (lpdis->itemState & ODS_FOCUS)
+                {
+                    oldBk = SetBkColor (lpdis->hDC, GetSysColor(COLOR_HIGHLIGHT));
+                    oldText = SetTextColor (lpdis->hDC, GetSysColor(COLOR_HIGHLIGHTTEXT));
+                }
+
+                hOldPen = SelectObject (lpdis->hDC, GetSysColorPen ((lpdis->itemState & ODS_SELECTED)?COLOR_HIGHLIGHT:COLOR_WINDOW));
+                hOldBrush = SelectObject (lpdis->hDC, GetSysColorBrush ((lpdis->itemState & ODS_FOCUS)?COLOR_HIGHLIGHT:COLOR_WINDOW));
+
+                /* fill background rectangle */
+                Rectangle (lpdis->hDC, lpdis->rcItem.left, lpdis->rcItem.top,
+                           lpdis->rcItem.right, lpdis->rcItem.bottom);
+
+                /* calculate button and text rectangles */
+                CopyRect (&rcButton, &lpdis->rcItem);
+                InflateRect (&rcButton, -1, -1);
+                CopyRect (&rcText, &rcButton);
+                rcButton.right = rcButton.left + infoPtr->nBitmapWidth + 6;
+                rcText.left = rcButton.right + 2;
+
+                /* draw focus rectangle */
+                if (lpdis->itemState & ODS_FOCUS)
+                    DrawFocusRect (lpdis->hDC, &lpdis->rcItem);
+
+                /* draw button */
+                DrawEdge (lpdis->hDC, &rcButton, EDGE_RAISED, BF_RECT|BF_MIDDLE|BF_SOFT);
+
+                /* draw image and text */
+                if (wParam == IDC_AVAILBTN_LBOX && lpdis->itemID == 0)
+                {
+                    /* virtual separator in the 'available' list */
+                    DrawTextA (lpdis->hDC, "Separator", -1, &rcText,
+                               DT_LEFT | DT_VCENTER | DT_SINGLELINE);
+                }
+                else
+                {
+                    /* real button */
+
+                    ImageList_Draw (infoPtr->himlDef, btnPtr.iBitmap, lpdis->hDC,
+                                    rcButton.left+1, rcButton.top+1, ILD_NORMAL);
+
+                    DrawTextW (lpdis->hDC,  infoPtr->strings[btnPtr.iString], -1, &rcText,
+                               DT_LEFT | DT_VCENTER | DT_SINGLELINE);
+
+                }
+
+                if (lpdis->itemState & ODS_FOCUS)
+                {
+                    SetBkColor (lpdis->hDC, oldBk);
+                    SetTextColor (lpdis->hDC, oldText);
+                }
+
+                SelectObject (lpdis->hDC, hOldBrush);
+                SelectObject (lpdis->hDC, hOldPen);
+
+                return TRUE;
+            }
+            return FALSE;
+
+        case WM_MEASUREITEM:
+            if (wParam == IDC_AVAILBTN_LBOX || wParam == IDC_TOOLBARBTN_LBOX)
+            {
+                MEASUREITEMSTRUCT *lpmis = (MEASUREITEMSTRUCT*)lParam;
+
+                if (infoPtr)
+                    lpmis->itemHeight = infoPtr->nBitmapHeight + 8;
+                else
+                    lpmis->itemHeight = 16 + 8; /* default height */
+
+                return TRUE;
+            }
+            return FALSE;
+
+        default:
+            return FALSE;
     }
 }
@@ -1795 +1936 @@
 }
 
-
-static LRESULT TOOLBAR_AddButtonsW(HWND hwnd,WPARAM wParam,LPARAM lParam)
-{
-  //CB: just call AddButtonsA, no Unicode used?!?
-
-  return TOOLBAR_AddButtonsA(hwnd,wParam,lParam);
-}
-
-/* << TOOLBAR_AddButtons32W >> */
+static LRESULT
+TOOLBAR_AddButtonsW (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
+    LPTBBUTTON lpTbb = (LPTBBUTTON)lParam;
+    INT nOldButtons, nNewButtons, nAddButtons, nCount;
+
+    TRACE("adding %d buttons!\n", wParam);
+
+    nAddButtons = (UINT)wParam;
+    nOldButtons = infoPtr->nNumButtons;
+    nNewButtons = nOldButtons + nAddButtons;
+
+    if (infoPtr->nNumButtons == 0) {
+        infoPtr->buttons =
+            COMCTL32_Alloc (sizeof(TBUTTON_INFO) * nNewButtons);
+    }
+    else {
+        TBUTTON_INFO *oldButtons = infoPtr->buttons;
+        infoPtr->buttons =
+            COMCTL32_Alloc (sizeof(TBUTTON_INFO) * nNewButtons);
+        memcpy (&infoPtr->buttons[0], &oldButtons[0],
+                nOldButtons * sizeof(TBUTTON_INFO));
+        COMCTL32_Free (oldButtons);
+    }
+
+    infoPtr->nNumButtons = nNewButtons;
+
+    /* insert new button data */
+    for (nCount = 0; nCount < nAddButtons; nCount++) {
+        TBUTTON_INFO *btnPtr = &infoPtr->buttons[nOldButtons+nCount];
+        btnPtr->iBitmap   = lpTbb[nCount].iBitmap;
+        btnPtr->idCommand = lpTbb[nCount].idCommand;
+        btnPtr->fsState   = lpTbb[nCount].fsState;
+        btnPtr->fsStyle   = lpTbb[nCount].fsStyle;
+        btnPtr->dwData    = lpTbb[nCount].dwData;
+        btnPtr->iString   = lpTbb[nCount].iString;
+        btnPtr->bHot      = FALSE;
+
+        if ((infoPtr->hwndToolTip) && !(btnPtr->fsStyle & TBSTYLE_SEP)) {
+            TTTOOLINFOW ti;
+
+            ZeroMemory (&ti, sizeof(TTTOOLINFOW));
+            ti.cbSize   = sizeof (TTTOOLINFOW);
+            ti.hwnd     = hwnd;
+            ti.uId      = btnPtr->idCommand;
+            ti.hinst    = 0;
+            ti.lpszText = LPSTR_TEXTCALLBACKW;
+
+            SendMessageW (infoPtr->hwndToolTip, TTM_ADDTOOLW,
+                            0, (LPARAM)&ti);
+        }
+    }
+
+    TOOLBAR_CalcToolbar (hwnd);
+
+    InvalidateRect(hwnd, NULL, FALSE);
+
+    return TRUE;
+}
 
 
@@ -1951 +2143 @@
 
 static LRESULT
-TOOLBAR_AutoSize (HWND hwnd, WPARAM wParam, LPARAM lParam)
+TOOLBAR_AutoSize (HWND hwnd)
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
@@ -2218 +2410 @@
 
 
-/* << TOOLBAR_GetAnchorHighlight >> */
+static LRESULT
+TOOLBAR_GetAnchorHighlight (HWND hwnd)
+{
+    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
+
+    return infoPtr->bAnchor;
+}
 
 
@@ -2356 +2554 @@
 }
 
-/* << TOOLBAR_GetButtonInfo32W >> */
-
 
 static LRESULT
@@ -2447 +2643 @@
 
 
-/* << TOOLBAR_GetHotItem >> */
+static LRESULT
+TOOLBAR_GetHotItem (HWND hwnd)
+{
+    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
+
+    if (!(GetWindowLongA (hwnd, GWL_STYLE) & TBSTYLE_FLAT))
+        return -1;
+
+    if (infoPtr->nHotItem < 0)
+        return -1;
+
+    return (LRESULT)infoPtr->nHotItem;
+}
 
 
@@ -2618 +2826 @@
 }
 
+static LRESULT
+TOOLBAR_GetVersion (HWND hwnd)
+{
+    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
+    return infoPtr->iVersion;
+}
 
 static LRESULT
@@ -2687 +2901 @@
     if (lpTbb == NULL)
         return FALSE;
-    if (nIndex < 0)
-        return FALSE;
+
+    if (nIndex == -1) {
+       /* EPP: this seems to be an undocumented call (from my IE4)
+        * I assume in that case that:
+        * - lpTbb->iString is a string pointer (not a string index in strings[] table
+        * - index of insertion is at the end of existing buttons
+        * I only see this happen with nIndex == -1, but it could have a special
+        * meaning (like -nIndex (or ~nIndex) to get the real position of insertion).
+        */
+       int      len = lstrlenA((char*)lpTbb->iString) + 2;
+       LPSTR    ptr = COMCTL32_Alloc(len);
+
+       nIndex = infoPtr->nNumButtons;
+       strcpy(ptr, (char*)lpTbb->iString);
+       ptr[len - 1] = 0; /* ended by two '\0' */
+       lpTbb->iString = TOOLBAR_AddStringA(hwnd, 0, (LPARAM)ptr);
+       COMCTL32_Free(ptr);
+
+    } else if (nIndex < 0)
+       return FALSE;
+
 
 //    TRACE (toolbar, "inserting button index=%d\n", nIndex);
@@ -2930 +3163 @@
 
 /* << TOOLBAR_SaveRestore32W >> */
-/* << TOOLBAR_SetAnchorHighlight >> */
+
+static LRESULT
+TOOLBAR_SetAnchorHighlight (HWND hwnd, WPARAM wParam)
+{
+    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
+    BOOL bOldAnchor = infoPtr->bAnchor;
+
+    infoPtr->bAnchor = (BOOL)wParam;
+
+    return (LRESULT)bOldAnchor;
+}
 
 
@@ -3155 +3398 @@
 
 
-/* << TOOLBAR_SetHotItem >> */
+static LRESULT
+TOOLBAR_SetHotItem (HWND hwnd, WPARAM wParam)
+{
+    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(hwnd);
+    INT nOldHotItem = infoPtr->nHotItem;
+
+    if (GetWindowLongA (hwnd, GWL_STYLE) & TBSTYLE_FLAT)
+    {
+        infoPtr->nHotItem = (INT)wParam;
+
+        /* FIXME: What else must be done ??? */
+
+    }
+
+    if (nOldHotItem < 0)
+        return -1;
+
+    return (LRESULT)nOldHotItem;
+}
 
 
@@ -3345 +3606 @@
 }
 
+static LRESULT
+TOOLBAR_SetVersion (HWND hwnd, INT iVersion)
+{
+    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
+    INT iOldVersion = infoPtr->iVersion;
+
+    infoPtr->iVersion = iVersion;
+
+    return iOldVersion;
+}
 
 static LRESULT
@@ -3372 +3643 @@
     infoPtr->hwndNotify = GetParent (hwnd);
     infoPtr->bTransparent = (dwStyle & TBSTYLE_FLAT);
-    infoPtr->dwDTFlags = DT_CENTER;
+    infoPtr->dwDTFlags = (dwStyle & TBSTYLE_LIST) ? DT_LEFT | DT_VCENTER | DT_SINGLELINE : DT_CENTER;
+    infoPtr->bAnchor = FALSE; /* no anchor highlighting */
+    infoPtr->iVersion = 0;
 
     infoPtr->hwndToolbar = hwnd;
@@ -3446 +3719 @@
     /* free toolbar info data */
     COMCTL32_Free (infoPtr);
+    SetWindowLongA(hwnd, 0, 0);
 
     return 0;
@@ -3526 +3800 @@
         if (!(btnPtr->fsState & TBSTATE_ENABLED))
             return 0;
+
+        if (btnPtr->fsStyle &  TBSTYLE_DROPDOWN)
+        {
+            NMTOOLBARA nmtb;
+
+            nmtb.hdr.hwndFrom = hwnd;
+            nmtb.hdr.idFrom = GetWindowLongA (hwnd, GWL_ID);
+            nmtb.hdr.code = TBN_DROPDOWN;
+            nmtb.iItem = btnPtr->idCommand;
+
+            SendMessageA (infoPtr->hwndNotify, WM_NOTIFY,
+                          (WPARAM)nmtb.hdr.idFrom, (LPARAM)&nmtb);
+        }
 
         SetCapture (hwnd);
@@ -3597 +3884 @@
         ReleaseDC (hwnd, hdc);
 
-        if (bSendMessage)
-            SendMessageA (infoPtr->hwndNotify, WM_COMMAND,
-                          MAKEWPARAM(btnPtr->idCommand, 0), (LPARAM)hwnd);
+        if (bSendMessage) {
+            SendMessageA (GetParent(hwnd), WM_COMMAND,
+                          MAKEWPARAM(btnPtr->idCommand, 0), (LPARAM)hwnd);
+
+            if ((GetWindowLongA(hwnd, GWL_STYLE) & TBSTYLE_DROPDOWN) ||
+                (btnPtr->fsStyle & 0x08/* BTNS_DROPDOWN */)) {
+               NMTOOLBARW       nmtb;
+
+               nmtb.hdr.hwndFrom = hwnd;
+               nmtb.hdr.idFrom   = GetWindowLongA (hwnd, GWL_ID);
+               nmtb.hdr.code     = TBN_DROPDOWN;
+               nmtb.iItem        = nHit;
+               /* nmtb.tbButton not used with TBN_DROPDOWN */
+               if ((btnPtr->iString >= 0) && (btnPtr->iString < infoPtr->nNumStrings)) {
+                  nmtb.pszText      = infoPtr->strings[btnPtr->iString];
+                  nmtb.cchText      = lstrlenW(nmtb.pszText);
+               } else {
+                  nmtb.pszText      = NULL;
+                  nmtb.cchText      = 0;
+               }
+               nmtb.rcButton     = btnPtr->rect;
+
+               SendMessageW(infoPtr->hwndNotify, WM_NOTIFY,
+                            (WPARAM)nmtb.hdr.idFrom, (LPARAM)&nmtb);
+            }
+        }
 
         infoPtr->nButtonDown = -1;
@@ -3867 +4177 @@
 
 static LRESULT
-TOOLBAR_StyleChanged (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    TOOLBAR_AutoSize (hwnd, wParam, lParam);
+TOOLBAR_StyleChanged (HWND hwnd, INT nType, LPSTYLESTRUCT lpStyle)
+{
+    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
+
+    if (nType == GWL_STYLE) {
+        if (lpStyle->styleNew & TBSTYLE_LIST) {
+            infoPtr->dwDTFlags = DT_LEFT | DT_VCENTER | DT_SINGLELINE;
+        }
+        else {
+            infoPtr->dwDTFlags = DT_CENTER;
+        }
+    }
+
+    TOOLBAR_AutoSize (hwnd);
 
     InvalidateRect(hwnd, NULL, FALSE);
@@ -3881 +4202 @@
 ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
+   switch (uMsg)
+    {
+       case WM_DESTROY:
+           return TOOLBAR_Destroy (hwnd, wParam, lParam);
+
+       case WM_NCCREATE:
+           return TOOLBAR_NCCreate (hwnd, wParam, lParam);
+    }
+
+    if (!TOOLBAR_GetInfoPtr (hwnd))
+    {
+       return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+    }
+
     switch (uMsg)
     {
@@ -3898 +4233 @@
             return TOOLBAR_AddStringW (hwnd, wParam, lParam);
 
-        case TB_AUTOSIZE:
-            return TOOLBAR_AutoSize (hwnd, wParam, lParam);
+        case TB_AUTOSIZE:
+            return TOOLBAR_AutoSize (hwnd);
 
         case TB_BUTTONCOUNT:
@@ -3925 +4260 @@
             return TOOLBAR_EnableButton (hwnd, wParam, lParam);
 
-/*      case TB_GETANCHORHIGHLIGHT:             */ /* 4.71 */
+        case TB_GETANCHORHIGHLIGHT:
+            return TOOLBAR_GetAnchorHighlight (hwnd);
 
         case TB_GETBITMAP:
@@ -3962 +4298 @@
             return TOOLBAR_GetHotImageList (hwnd, wParam, lParam);
 
-/*      case TB_GETHOTITEM:                     */ /* 4.71 */
+        case TB_GETHOTITEM:
+            return TOOLBAR_GetHotItem (hwnd);
 
         case TB_GETIMAGELIST:
@@ -3999 +4336 @@
         case TB_GETUNICODEFORMAT:
             return TOOLBAR_GetUnicodeFormat (hwnd, wParam, lParam);
+
+        case CCM_GETVERSION:
+            return TOOLBAR_GetVersion (hwnd);
 
         case TB_HIDEBUTTON:
@@ -4054 +4394 @@
             return TOOLBAR_SaveRestoreW(hwnd,wParam,lParam);
 
-/*      case TB_SETANCHORHIGHLIGHT:             */ /* 4.71 */
+        case TB_SETANCHORHIGHLIGHT:
+            return TOOLBAR_SetAnchorHighlight (hwnd, wParam);
 
         case TB_SETBITMAPSIZE:
@@ -4088 +4429 @@
             return TOOLBAR_SetHotImageList (hwnd, wParam, lParam);
 
-/*      case TB_SETHOTITEM:                     */ /* 4.71 */
+        case TB_SETHOTITEM:
+            return TOOLBAR_SetHotItem (hwnd, wParam);
 
         case TB_SETIMAGELIST:
@@ -4124 +4466 @@
             return TOOLBAR_SetUnicodeFormat (hwnd, wParam, lParam);
 
+        case CCM_SETVERSION:
+            return TOOLBAR_SetVersion (hwnd, (INT)wParam);
 
 /*      case WM_CHAR: */
@@ -4130 +4474 @@
             return TOOLBAR_Create (hwnd, wParam, lParam);
 
-        case WM_DESTROY:
-            return TOOLBAR_Destroy (hwnd, wParam, lParam);
-
         case WM_ERASEBKGND:
             return TOOLBAR_EraseBackground (hwnd, wParam, lParam);
@@ -4160 +4501 @@
             return TOOLBAR_NCCalcSize (hwnd, wParam, lParam);
 
-        case WM_NCCREATE:
-            return TOOLBAR_NCCreate (hwnd, wParam, lParam);
-
         case WM_NCPAINT:
             return TOOLBAR_NCPaint (hwnd, wParam, lParam);
@@ -4177 +4515 @@
             return TOOLBAR_Size (hwnd, wParam, lParam);
 
-        case WM_STYLECHANGED:
-            return TOOLBAR_StyleChanged (hwnd, wParam, lParam);
+        case WM_STYLECHANGED:
+            return TOOLBAR_StyleChanged (hwnd, (INT)wParam, (LPSTYLESTRUCT)lParam);
 
 /*      case WM_SYSCOLORCHANGE: */