Added unicode MDI client window proc.

dlls/user/controls.h

@@ -38,10 +38,6 @@ extern BOOL DESKTOP_SetPattern( LPCSTR pattern );
 /* icon title */
 extern HWND ICONTITLE_Create( struct tagWND * );
 
-/* MDI client */
-extern HWND MDI_CreateMDIWindowA(LPCSTR,LPCSTR,DWORD,INT,INT,INT,INT,HWND,HINSTANCE,LPARAM);
-extern HWND MDI_CreateMDIWindowW(LPCWSTR,LPCWSTR,DWORD,INT,INT,INT,INT,HWND,HINSTANCE,LPARAM);
-
 /* menu controls */
 extern BOOL MENU_Init(void);
 extern BOOL MENU_IsMenuActive(void);

dlls/user/user32.spec

@@ -25,7 +25,7 @@ debug_channels (accel caret class clipboard combo cursor dc ddeml dialog driver
 @ stdcall BeginPaint(long ptr) BeginPaint
 @ stdcall BringWindowToTop(long) BringWindowToTop
 @ stdcall BroadcastSystemMessage(long ptr long long long) BroadcastSystemMessage
-@ stub CalcChildScroll
+@ stdcall CalcChildScroll(long long) CalcChildScroll
 @ stub CallMsgFilter
 @ stdcall CallMsgFilterA(ptr long) CallMsgFilterA
 @ stdcall CallMsgFilterW(ptr long) CallMsgFilterW

include/winuser.h

@@ -3243,6 +3243,7 @@ UINT      WINAPI ArrangeIconicWindows(HWND);
 HDWP      WINAPI BeginDeferWindowPos(INT);
 HDC       WINAPI BeginPaint(HWND,LPPAINTSTRUCT);
 BOOL      WINAPI BringWindowToTop(HWND);
+void      WINAPI CalcChildScroll(HWND, INT);
 BOOL      WINAPI CallMsgFilterA(LPMSG,INT);
 BOOL      WINAPI CallMsgFilterW(LPMSG,INT);
 #define     CallMsgFilter WINELIB_NAME_AW(CallMsgFilter)

windows/win.c

@@ -720,7 +720,7 @@ static HWND WIN_CreateWindowEx( CREATESTRUCTA *cs, ATOM classAtom,
     DWORD clsStyle;
     WNDPROC winproc;
     DCE *dce;
-    LRESULT (CALLBACK *localSend32)(HWND, UINT, WPARAM, LPARAM);
+    LRESULT CALLBACK (*localSend32)(HWND, UINT, WPARAM, LPARAM);
 
     TRACE("%s %s %08lx %08lx %d,%d %dx%d %04x %04x %08x %p\n",
           (type == WIN_PROC_32W) ? debugres_w((LPWSTR)cs->lpszName) : debugres_a(cs->lpszName), 
@@ -1098,7 +1098,7 @@ HWND WINAPI CreateWindowExA( DWORD exStyle, LPCSTR className,
         instance=GetModuleHandleA(NULL);
 
     if(exStyle & WS_EX_MDICHILD)
-        return MDI_CreateMDIWindowA(className, windowName, style, x, y, width, height, parent, instance, (LPARAM)data);
+        return CreateMDIWindowA(className, windowName, style, x, y, width, height, parent, instance, (LPARAM)data);
 
     /* Find the class atom */
 
@@ -1157,7 +1157,7 @@ HWND WINAPI CreateWindowExW( DWORD exStyle, LPCWSTR className,
         instance=GetModuleHandleA(NULL);
 
     if(exStyle & WS_EX_MDICHILD)
-        return MDI_CreateMDIWindowW(className, windowName, style, x, y, width, height, parent, instance, (LPARAM)data);
+        return CreateMDIWindowW(className, windowName, style, x, y, width, height, parent, instance, (LPARAM)data);
 
     /* Find the class atom */