comdlg32/cdlg: removed 16 bit dependency

[CJ]

Removed wownt32.h from the includes of cdlg32.h and modified fontdlg.c so
that it no longer relies on the 16 bit dependency.

-- 
Carl J. Raffaele
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.winehq.org/pipermail/wine-devel/attachments/20101025/3ea423ac/attachment.htm>
-------------- next part --------------
From c67da13a9e03857dbb290ae462a43a7f195ac88f Mon Sep 17 00:00:00 2001
From: Carl Raffaele <cjraffae at mtu.edu>
Date: Mon, 25 Oct 2010 20:54:35 -0400
Subject: comdlg32/cdlg: removed 16 bit dependency

Removed wownt32.h from the includes of cdlg32.h and modified fontdlg.c so
that it no longer relies on the 16 bit dependency.
---
 dlls/comdlg32/cdlg.h    |    1 -
 dlls/comdlg32/fontdlg.c |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/dlls/comdlg32/cdlg.h b/dlls/comdlg32/cdlg.h
index b56c167..686baea 100644
--- a/dlls/comdlg32/cdlg.h
+++ b/dlls/comdlg32/cdlg.h
@@ -22,7 +22,6 @@
 #define _WINE_DLL_CDLG_H
 
 #include "dlgs.h"
-#include "wownt32.h"
 
 /* Common dialogs implementation globals */
 #define COMDLG32_Atom	((ATOM)0xa000)	/* MS uses this one to identify props */
diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c
index 83400fc..321bfc6 100644
--- a/dlls/comdlg32/fontdlg.c
+++ b/dlls/comdlg32/fontdlg.c
@@ -754,7 +754,7 @@ static LRESULT CFn_WMInitDialog(HWND hDlg, LPARAM lParam, LPCHOOSEFONTW lpcf)
         {
             j=SendDlgItemMessageW(hDlg,cmb2,CB_SETCURSEL,j,0);
             SendMessageW(hDlg,WM_COMMAND,cmb2,
-                    MAKELONG(HWND_16(GetDlgItem(hDlg,cmb2)),CBN_SELCHANGE));
+                    MAKELONG(LOWORD(GetDlgItem(hDlg,cmb2)),CBN_SELCHANGE));
         }
     }
     CFn_ReleaseDC(lpcf, hdc);
-- 
1.7.0.4