Author: sserapion Date: Fri Sep 12 19:55:13 2008 New Revision: 36172
URL: http://svn.reactos.org/svn/reactos?rev=36172&view=rev Log: Fix CreateToolBarEx. Build as unicode. No need to allow warnings anymore.
Modified: branches/ros-amd64-bringup/reactos/dll/win32/comctl32/comctl32.rbuild branches/ros-amd64-bringup/reactos/dll/win32/comctl32/commctrl.c
Modified: branches/ros-amd64-bringup/reactos/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/comctl32/comctl32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/comctl32/comctl32.rbuild [iso-8859-1] Fri Sep 12 19:55:13 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" allowwarnings="true"> +<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" unicode="yes"> <autoregister infsection="OleControlDlls" type="DllInstall" /> <importlibrary definition="comctl32.spec.def" /> <include base="comctl32">.</include>
Modified: branches/ros-amd64-bringup/reactos/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] Fri Sep 12 19:55:13 2008 @@ -707,6 +707,7 @@ VOID WINAPI InitCommonControls (void) { + return; }
@@ -772,7 +773,7 @@
HWND WINAPI CreateToolbarEx (HWND hwnd, DWORD style, UINT wID, INT nBitmaps, - HINSTANCE hBMInst, UINT wBMID, LPCTBBUTTON lpButtons, + HINSTANCE hBMInst, UINT_PTR wBMID, LPCTBBUTTON lpButtons, INT iNumButtons, INT dxButton, INT dyButton, INT dxBitmap, INT dyBitmap, UINT uStructSize) {