* -- ICC_WIN95_CLASSES
*/
-#include "comctl32.h"
-
+#include <stdarg.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
+#include "commctrl.h"
+#include "winerror.h"
+#include "winreg.h"
#define NO_SHLWAPI_STREAM
-#include <shlwapi.h>
+#include "shlwapi.h"
+#include "comctl32.h"
+#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(commctrl);
}
else
{
- BUTTON_Register();
+ BUTTON_Register ();
+ COMBO_Register ();
+ COMBOLBOX_Register ();
+ EDIT_Register ();
+ LISTBOX_Register ();
+ STATIC_Register ();
+
TOOLBARv6_Register();
}
}
else
{
BUTTON_Unregister();
+ COMBO_Unregister ();
+ COMBOLBOX_Unregister ();
+ EDIT_Unregister ();
+ LISTBOX_Unregister ();
+ STATIC_Unregister ();
+
TOOLBARv6_Unregister ();
}
#endif /* __REACTOS__ */
+#ifndef __REACTOS__
+static void unregister_versioned_classes(void)
+{
+#define VERSION "6.0.2600.2982!"
+ static const char *classes[] =
+ {
+ VERSION WC_BUTTONA,
+ VERSION WC_COMBOBOXA,
+ VERSION "ComboLBox",
+ VERSION WC_EDITA,
+ VERSION WC_LISTBOXA,
+ VERSION WC_STATICA,
+ };
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(classes); i++)
+ UnregisterClassA(classes[i], NULL);
+
+#undef VERSION
+}
+#endif
+
/***********************************************************************
* DllMain [Internal]
*
TREEVIEW_Register ();
UPDOWN_Register ();
+ BUTTON_Register ();
+ COMBO_Register ();
+ COMBOLBOX_Register ();
+ EDIT_Register ();
+ LISTBOX_Register ();
+ STATIC_Register ();
+
/* subclass user32 controls */
THEMING_Initialize ();
#else
TRACKBAR_Unregister ();
TREEVIEW_Unregister ();
UPDOWN_Unregister ();
+
+ unregister_versioned_classes ();
+
#else
UninitializeClasses();
#endif
if (uMenuID) {
WCHAR szText[256];
- if (!LoadStringW (hInst, uMenuID, szText, sizeof(szText)/sizeof(szText[0])))
+ if (!LoadStringW (hInst, uMenuID, szText, ARRAY_SIZE(szText)))
szText[0] = '\0';
SendMessageW (hwndStatus, SB_SETTEXTW,
TRACE ("(%p, %p, %lx, %lx)\n", hWnd, pfnSubclass, uIDSubclass, dwRef);
+ if (!hWnd || !pfnSubclass)
+ return FALSE;
+
/* Since the window procedure that we set here has two additional arguments,
* we can't simply set it as the new window procedure of the window. So we
* set our own window procedure and then calculate the other two arguments
{lCentre + 1, l2 - 3},
};
hOldPen = SelectObject(hDC, hPen);
- PolyPolyline(hDC, aptInsertMark, adwPolyPoints, sizeof(adwPolyPoints)/sizeof(adwPolyPoints[0]));
+ PolyPolyline(hDC, aptInsertMark, adwPolyPoints, ARRAY_SIZE(adwPolyPoints));
SelectObject(hDC, hOldPen);
DeleteObject(hPen);
}