corrections due to structure union name changes

[Chris Green]

In the process of compiling the current CVS, I had to make the following 
changes to allow the compile to complete. There seem to have been some 
changes in unions within the header files.

regards
Chris Green

Index: programs/avitools/aviplay.c
===================================================================
RCS file: /home/wine/wine/programs/avitools/aviplay.c,v
retrieving revision 1.10
diff -u -3 -p -r1.10 aviplay.c
--- programs/avitools/aviplay.c	2001/02/12 03:51:05	1.10
+++ programs/avitools/aviplay.c	2001/11/24 04:56:29
@@ -245,7 +245,7 @@ HRESULT WINAPI (*fnAVIStreamGetFrameClos
 	}
 	/* Argh. AVIs are upside down. */
 	for (i=0;i<dsdesc.dwHeight;i++) {
-	    memcpy( (char *)dsdesc.lpSurface+(i*dsdesc.u1.lPitch),
+	    memcpy( (char *)dsdesc.lpSurface+(i*dsdesc.lPitch),
 		    (char *)decodedbits+bytesline*(dsdesc.dwHeight-i-1),
 		    bytesline
 	    );
Index: programs/wineconsole/dialog.c
===================================================================
RCS file: /home/wine/wine/programs/wineconsole/dialog.c,v
retrieving revision 1.1
diff -u -3 -p -r1.1 dialog.c
--- programs/wineconsole/dialog.c	2001/11/23 23:05:03	1.1
+++ programs/wineconsole/dialog.c	2001/11/24 04:56:29
@@ -489,15 +489,15 @@ BOOL WCUSER_GetProperties(struct inner_d
     psp.hInstance = wndclass.hInstance;
     psp.lParam = (LPARAM)&di;
 
-    psp.u.pszTemplate = MAKEINTRESOURCEA(IDD_OPTION);
+    psp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTION);
     psp.pfnDlgProc = WCUSER_OptionDlgProc;
     psPage[0] = CreatePropertySheetPageA(&psp);
 
-    psp.u.pszTemplate = MAKEINTRESOURCEA(IDD_FONT);
+    psp.pszTemplate = MAKEINTRESOURCEA(IDD_FONT);
     psp.pfnDlgProc = WCUSER_FontDlgProc;
     psPage[1] = CreatePropertySheetPageA(&psp);
 
-    psp.u.pszTemplate = MAKEINTRESOURCEA(IDD_CONFIG);
+    psp.pszTemplate = MAKEINTRESOURCEA(IDD_CONFIG);
     psp.pfnDlgProc = WCUSER_ConfigDlgProc;
     psPage[2] = CreatePropertySheetPageA(&psp);
 
@@ -506,7 +506,7 @@ BOOL WCUSER_GetProperties(struct inner_d
     psHead.pszCaption = "Setup";
     psHead.nPages = 3;
     psHead.hwndParent = data->hWnd;
-    psHead.u3.phpage = psPage;
+    psHead.phpage = psPage;
  
     PropertySheetA(&psHead);
 

_________________________________________________________
Do You Yahoo!?
Get your free @yahoo.com address at http://mail.yahoo.com