Re: DSTRICT: some more fixes for the user dll

[Michael Stefaniuc]

I apologize for sending this to the wrong list.

remorseful
michael

On Wed, Oct 30, 2002 at 12:02:05AM +0100, Michael Stefaniuc wrote:
> Hello,
> 
> this fixes 117 warning in the user dll when compiled with -DSTRICT
> 
> License: LGPL, X11
> Changelog:
>   Michael Stefaniuc <[EMAIL PROTECTED]>
>   - some more fixes for compiling the user dll with -DSTRICT
> 
> bye
>   michael

-- 
Michael Stefaniuc   Tel.: +49-711-96437-199
System Administration   Fax.: +49-711-96437-111
Red Hat GmbHEmail: [EMAIL PROTECTED]
Hauptstaetterstr. 58http://www.redhat.de/
D-70178 Stuttgart



msg13043/pgp0.pgp
Description: PGP signature

DSTRICT: some more fixes for the user dll

[Michael Stefaniuc]

Hello,

this fixes 117 warning in the user dll when compiled with -DSTRICT

License: LGPL, X11
Changelog:
Michael Stefaniuc <[EMAIL PROTECTED]>
- some more fixes for compiling the user dll with -DSTRICT

bye
michael
-- 
Michael Stefaniuc   Tel.: +49-711-96437-199
System Administration   Fax.: +49-711-96437-111
Red Hat GmbHEmail: [EMAIL PROTECTED]
Hauptstaetterstr. 58http://www.redhat.de/
D-70178 Stuttgart

Index: controls/combo.c
===
RCS file: /home/wine/wine/controls/combo.c,v
retrieving revision 1.90
diff -u -u -r1.90 combo.c
--- controls/combo.c29 Oct 2002 21:31:27 -  1.90
+++ controls/combo.c29 Oct 2002 22:53:53 -
@@ -582,7 +582,7 @@
lphc->droppedRect.right - 
lphc->droppedRect.left,
lphc->droppedRect.bottom - 
lphc->droppedRect.top,
hwnd, (HMENU)ID_CB_LISTBOX,
-   GetWindowLongA( hwnd, GWL_HINSTANCE ), 
lphc );
+   (HINSTANCE)GetWindowLongA( hwnd, 
+GWL_HINSTANCE ), lphc );
   else
   lphc->hWndLBox = CreateWindowExA(lbeExStyle, "ComboLBox", NULL, lbeStyle,
lphc->droppedRect.left,
@@ -590,7 +590,7 @@
lphc->droppedRect.right - 
lphc->droppedRect.left,
lphc->droppedRect.bottom - 
lphc->droppedRect.top,
hwnd, (HMENU)ID_CB_LISTBOX,
-   GetWindowLongA( hwnd, GWL_HINSTANCE ), 
lphc );
+   (HINSTANCE)GetWindowLongA( hwnd, 
+GWL_HINSTANCE ), lphc );
 
   if( lphc->hWndLBox )
   {
@@ -623,14 +623,14 @@
lphc->textRect.right - 
lphc->textRect.left,
lphc->textRect.bottom - 
lphc->textRect.top,
hwnd, (HMENU)ID_CB_EDIT,
-   GetWindowLongA( hwnd, 
GWL_HINSTANCE ), NULL );
+   (HINSTANCE)GetWindowLongA( hwnd, 
+GWL_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,
-   GetWindowLongA( hwnd, 
GWL_HINSTANCE ), NULL );
+   (HINSTANCE)GetWindowLongA( hwnd, 
+GWL_HINSTANCE ), NULL );
 
  if( !lphc->hWndEdit )
bEdit = FALSE;
@@ -927,7 +927,8 @@
*/
   if (CB_DISABLED(lphc))
   {
-hBkgBrush = SendMessageW(lphc->owner, WM_CTLCOLORSTATIC, hDC, (LPARAM)lphc->self 
);
+hBkgBrush = (HBRUSH)SendMessageW(lphc->owner, WM_CTLCOLORSTATIC,
+(WPARAM)hDC, (LPARAM)lphc->self );
 
 /*
  * We have to change the text color since WM_CTLCOLORSTATIC will
@@ -940,11 +941,13 @@
   {
 if (lphc->wState & CBF_EDIT)
 {
-  hBkgBrush = SendMessageW(lphc->owner, WM_CTLCOLOREDIT, hDC, (LPARAM)lphc->self 
);
+  hBkgBrush = (HBRUSH)SendMessageW(lphc->owner, WM_CTLCOLOREDIT,
+  (WPARAM)hDC, (LPARAM)lphc->self );
 }
 else
 {
-  hBkgBrush = SendMessageW(lphc->owner, WM_CTLCOLORLISTBOX, hDC, 
(LPARAM)lphc->self );
+  hBkgBrush = (HBRUSH)SendMessageW(lphc->owner, WM_CTLCOLORLISTBOX,
+  (WPARAM)hDC, (LPARAM)lphc->self );
 }
   }
 
@@ -1946,14 +1949,14 @@
 
 case WM_PRINTCLIENT:
if (lParam & PRF_ERASEBKGND)
- COMBO_EraseBackground(hwnd, lphc, wParam);
+ COMBO_EraseBackground(hwnd, lphc, (HDC)wParam);
 
/* Fallthrough */
case WM_PAINT:
/* wParam may contain a valid HDC! */
-   return  COMBO_Paint(lphc, wParam);
+   return  COMBO_Paint(lphc, (HDC)wParam);
case WM_ERASEBKGND:
-   return  COMBO_EraseBackground(hwnd, lphc, wParam);
+   return  COMBO_EraseBackground(hwnd, lphc, (HDC)wParam);
case WM_GETDLGCODE:
{
LRESULT result = DLGC_WANTARROWS | DLGC_WANTCHARS;
@@ -1980,7 +1983,7 @@
  !(lphc->wState & CBF_NORESIZE) ) COMBO_Size( lphc );
return  TRUE;
ca