From 7adc5e628f237f3be665bbc56ca6a89e340a70c0 Mon Sep 17 00:00:00 2001
From: Samuel Serapion <samuel.serapion@gmail.com>
Date: Sat, 13 Sep 2008 00:55:13 +0000
Subject: [PATCH] Fix CreateToolBarEx. Build as unicode. No need to allow
 warnings anymore.

svn path=/branches/ros-amd64-bringup/; revision=36172
---
 reactos/dll/win32/comctl32/comctl32.rbuild | 2 +-
 reactos/dll/win32/comctl32/commctrl.c      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/reactos/dll/win32/comctl32/comctl32.rbuild b/reactos/dll/win32/comctl32/comctl32.rbuild
index 95259d9bb07..9139d732f74 100644
--- a/reactos/dll/win32/comctl32/comctl32.rbuild
+++ b/reactos/dll/win32/comctl32/comctl32.rbuild
@@ -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>
diff --git a/reactos/dll/win32/comctl32/commctrl.c b/reactos/dll/win32/comctl32/commctrl.c
index 4ff20753020..85188ae905a 100644
--- a/reactos/dll/win32/comctl32/commctrl.c
+++ b/reactos/dll/win32/comctl32/commctrl.c
@@ -707,6 +707,7 @@ CreateUpDownControl (DWORD style, INT x, INT y, INT cx, INT cy,
 VOID WINAPI
 InitCommonControls (void)
 {
+    return;
 }
 
 
@@ -772,7 +773,7 @@ InitCommonControlsEx (const INITCOMMONCONTROLSEX *lpInitCtrls)
 
 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)
 {