comctl32: Introduce Static control.

dlls/comctl32/Makefile.in

@@ -28,6 +28,7 @@ C_SRCS = \
 	propsheet.c \
 	rebar.c \
 	smoothscroll.c \
+	static.c \
 	status.c \
 	string.c \
 	syslink.c \

dlls/comctl32/button.c

@@ -198,7 +198,7 @@ static inline WCHAR *get_button_text( HWND hwnd )
     return buffer;
 }
 
-static HRGN set_control_clipping( HDC hdc, const RECT *rect )
+HRGN set_control_clipping( HDC hdc, const RECT *rect )
 {
     RECT rc = *rect;
     HRGN hrgn = CreateRectRgn( 0, 0, 0, 0 );

dlls/comctl32/comctl32.h

@@ -173,6 +173,8 @@ INT  WINAPI Str_GetPtrW (LPCWSTR, LPWSTR, INT);
 LRESULT WINAPI SetPathWordBreakProc(HWND hwnd, BOOL bSet);
 BOOL WINAPI MirrorIcon(HICON *phicon1, HICON *phicon2);
 
+HRGN set_control_clipping(HDC hdc, const RECT *rect) DECLSPEC_HIDDEN;
+
 extern void ANIMATE_Register(void) DECLSPEC_HIDDEN;
 extern void ANIMATE_Unregister(void) DECLSPEC_HIDDEN;
 extern void BUTTON_Register(void) DECLSPEC_HIDDEN;
@@ -201,6 +203,7 @@ extern void PROGRESS_Register(void) DECLSPEC_HIDDEN;
 extern void PROGRESS_Unregister(void) DECLSPEC_HIDDEN;
 extern void REBAR_Register(void) DECLSPEC_HIDDEN;
 extern void REBAR_Unregister(void) DECLSPEC_HIDDEN;
+extern void STATIC_Register(void) DECLSPEC_HIDDEN;
 extern void STATUS_Register(void) DECLSPEC_HIDDEN;
 extern void STATUS_Unregister(void) DECLSPEC_HIDDEN;
 extern void SYSLINK_Register(void) DECLSPEC_HIDDEN;

dlls/comctl32/commctrl.c

@@ -100,6 +100,7 @@ static void unregister_versioned_classes(void)
     {
         VERSION WC_BUTTONA,
         VERSION WC_EDITA,
+        VERSION WC_STATICA,
     };
     int i;
 
@@ -170,6 +171,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 
             BUTTON_Register ();
             EDIT_Register ();
+            STATIC_Register ();
 
             /* subclass user32 controls */
             THEMING_Initialize ();

dlls/comctl32/tests/misc.c

@@ -346,7 +346,8 @@ static void check_class( const char *name, int must_exist, UINT style, UINT igno
     if (GetClassInfoA( 0, name, &wc ))
     {
 todo_wine_if(strcmp(name, "Button") &&
-                strcmp(name, "Edit"))
+                strcmp(name, "Edit") &&
+                strcmp(name, "Static"))
         ok( !(~wc.style & style & ~ignore), "System class %s is missing bits %x (%08x/%08x)\n",
             name, ~wc.style & style, wc.style, style );
         ok( !(wc.style & ~style), "System class %s has extra bits %x (%08x/%08x)\n",

dlls/user32/class.c

@@ -172,7 +172,6 @@ static BOOL is_builtin_class( const WCHAR *name )
         {'L','i','s','t','B','o','x',0},
         {'M','D','I','C','l','i','e','n','t',0},
         {'S','c','r','o','l','l','b','a','r',0},
-        {'S','t','a','t','i','c',0},
     };
 
     int min = 0, max = (sizeof(classesW) / sizeof(classesW[0])) - 1;

dlls/user32/tests/class.c

@@ -1236,6 +1236,7 @@ static void test_comctl32_classes(void)
         UPDOWN_CLASSA,
         "!Button",
         "!Edit",
+        "!Static",
     };
 
     winetest_get_mainargs( &argv );