user32: combobox[2/2]: it makes no differance if we call CreateWindowExA or CreateWindowExW

[Mikołaj Zalewski]

This simplifies the code a bit.
-------------- next part --------------
From 599bc24c993c43d701554b5bf52a1bcc3ea87e31 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Miko=C5=82aj_Zalewski?= <mikolaj at zalewski.pl>
Date: Mon, 26 Mar 2007 11:27:00 +0200
Subject: [PATCH] user32: combobox: it makes no differance if we call CreateWindowExA or CreateWindowExW

---
 dlls/user32/combo.c |   43 +++++++++++++------------------------------
 1 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c
index 4be67cc..e4e3935 100644
--- a/dlls/user32/combo.c
+++ b/dlls/user32/combo.c
@@ -594,22 +594,13 @@ static LRESULT COMBO_Create( HWND hwnd, LPHEADCOMBO lphc, HWND hwndParent, LONG
         lbeExStyle |= (WS_EX_TOPMOST | WS_EX_TOOLWINDOW);
       }
 
-      if (unicode)
-          lphc->hWndLBox = CreateWindowExW(lbeExStyle, clbName, NULL, lbeStyle,
-                                           lphc->droppedRect.left,
-                                           lphc->droppedRect.top,
-                                           lphc->droppedRect.right - lphc->droppedRect.left,
-                                           lphc->droppedRect.bottom - lphc->droppedRect.top,
-                                           hwnd, (HMENU)ID_CB_LISTBOX,
-                                           (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE ), lphc );
-      else
-          lphc->hWndLBox = CreateWindowExA(lbeExStyle, "ComboLBox", NULL, lbeStyle,
-                                           lphc->droppedRect.left,
-                                           lphc->droppedRect.top,
-                                           lphc->droppedRect.right - lphc->droppedRect.left,
-                                           lphc->droppedRect.bottom - lphc->droppedRect.top,
-                                           hwnd, (HMENU)ID_CB_LISTBOX,
-                                           (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE ), lphc );
+      lphc->hWndLBox = CreateWindowExW(lbeExStyle, clbName, NULL, lbeStyle,
+                                       lphc->droppedRect.left,
+                                       lphc->droppedRect.top,
+                                       lphc->droppedRect.right - lphc->droppedRect.left,
+                                       lphc->droppedRect.bottom - lphc->droppedRect.top,
+                                       hwnd, (HMENU)ID_CB_LISTBOX,
+                                       (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE ), lphc );
 
       if( lphc->hWndLBox )
       {
@@ -629,20 +620,12 @@ static LRESULT COMBO_Create( HWND hwnd, LPHEADCOMBO lphc, HWND hwndParent, LONG
 
               if (!IsWindowEnabled(hwnd)) lbeStyle |= WS_DISABLED;
 
-              if (unicode)
-                  lphc->hWndEdit = CreateWindowExW(0, editName, NULL, lbeStyle,
-                                                   lphc->textRect.left, lphc->textRect.top,
-                                                   lphc->textRect.right - lphc->textRect.left,
-                                                   lphc->textRect.bottom - lphc->textRect.top,
-                                                   hwnd, (HMENU)ID_CB_EDIT,
-                                                   (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE ), NULL );
-              else
-                  lphc->hWndEdit = CreateWindowExA(0, "Edit", NULL, lbeStyle,
-                                                   lphc->textRect.left, lphc->textRect.top,
-                                                   lphc->textRect.right - lphc->textRect.left,
-                                                   lphc->textRect.bottom - lphc->textRect.top,
-                                                   hwnd, (HMENU)ID_CB_EDIT,
-                                                   (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE ), NULL );
+              lphc->hWndEdit = CreateWindowExW(0, editName, NULL, lbeStyle,
+                                               lphc->textRect.left, lphc->textRect.top,
+                                               lphc->textRect.right - lphc->textRect.left,
+                                               lphc->textRect.bottom - lphc->textRect.top,
+                                               hwnd, (HMENU)ID_CB_EDIT,
+                                               (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE ), NULL );
 
 	      if( !lphc->hWndEdit )
 		bEdit = FALSE;
-- 
1.4.4.2