Documentation update.

README

@@ -59,7 +59,7 @@ NetBSD info:
   Make sure you have the USER_LDT, SYSVSHM, SYSVSEM, and SYSVMSG options
   turned on in your kernel.
 
-File systems info :
+File systems info:
   Wine should run on most file systems. However, Wine will fail to start
   if umsdos is used for the /tmp directory. A few compatibility problems have
   also been reported using files accessed through Samba.
@@ -77,11 +77,12 @@ must be reentrant, which is probably the default by now.
 If you have libc6 (glibc2), or you compiled the X libraries yourself,
 they were probably compiled with the reentrant option enabled.
 
-You also need to have libXpm installed on your system. The sources for
-it are available at ftp.x.org and all its mirror sites in the directory
-/contrib/libraries. If you are using RedHat, libXpm is distributed as the
-xpm and xpm-devel packages. Debian distributes libXpm as xpm4.7, xpm4g,
-and xpm4g-dev. SuSE calls these packages xpm and xpm-devel.
+You also need to have libXpm (and its header files, e.g. xpm.h)
+installed on your system. The sources for it are available at
+ftp.x.org and all its mirror sites in the directory
+/contrib/libraries.  If you are using RedHat, libXpm is distributed as
+packages xpm and xpm-devel.  Debian distributes libXpm as xpm4.7,
+xpm4g, and xpm4g-dev.  SuSE calls these packages xpm and xpm-devel.
 
 On x86 Systems gcc >= 2.7.2 is required.
 Versions earlier than 2.7.2.3 may have problems when certain files
@@ -142,11 +143,16 @@ man page (documentation/wine.conf.man).
 The file documentation/samples/config contains an example configuration file
 which has to be adapted and copied to the location mentioned above.
 
+Don't forget to add vital registry entries by applying winedefault.reg
+with programs/regapi/. See documentation/ for details.
+
 See http://www.winehq.com/support.shtml for further configuration hints.
 
 In order to verify the correctness of the environment you need for
 Wine to run successfully, run "./tools/winecheck | less".  You'll get
 a percentage score indicating "Wine configuration correctness".
+As this program is alpha, it doesn't run a truly thorough test yet, though,
+so it should be taken as a first verification step only.
 
 6. RUNNING PROGRAMS
 
@@ -178,7 +184,8 @@ of users reporting file corruption. Do NOT run Explorer, for instance,
 if you don't have a proper backup, as it renames/cripples several
 directories sometimes. Not even other MS apps such as e.g. Messenger are safe,
 as they launch Explorer somehow. This particular corruption (!$!$!$!$.pfr)
-can be fixed with http://home.nexgo.de/andi.mohr/download/decorrupt_explorer
+can at least partially be fixed by using
+http://home.nexgo.de/andi.mohr/download/decorrupt_explorer
 
 
 7. GETTING MORE INFORMATION

configure.in

@@ -159,6 +159,7 @@ then
         dnl NOTE: autoconf does not allow commas inside the third 
         dnl       parameter to AC_CHECK_HEADERS, due to some quoting
         dnl       magic it does.
+	echo "Couldn't find the xpm development header X11/xpm.h"
 	echo "Install the following packages:"
 	echo "Red Hat < 7.1	:	xpm xpm-devel"
 	echo "Red Hat >= 7.1	:	XFree86-devel"

dlls/ddraw/dsurface/dib.c

@@ -386,7 +386,16 @@ DIB_DirectDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rdst,
 
     dbuf = (BYTE*)ddesc.lpSurface+(xdst.top*ddesc.u1.lPitch)+(xdst.left*bpp);
 
-    dwFlags &= ~(DDBLT_WAIT|DDBLT_ASYNC);/* FIXME: can't handle right now */
+    if (dwFlags & (DDBLT_WAIT|DDBLT_ASYNC))
+    {
+	static BOOL displayed = FALSE;
+	if (!displayed)
+	{
+	    FIXME("dwFlags DDBLT_WAIT and/or DDBLT_ASYNC: can't handle right now.\n");
+	    displayed = TRUE;
+	}
+        dwFlags &= ~(DDBLT_WAIT|DDBLT_ASYNC);
+    }
 
     /* First, all the 'source-less' blits */
     if (dwFlags & DDBLT_COLORFILL) {

documentation/registry.sgml

@@ -299,7 +299,7 @@ ln -sf /usr/local/etc/wine.userreg wine.userreg
           <term>UseNewFormat</term>
           <listitem>
             <para>
-              This option is obsolete. Wine now always use the new
+              This option is obsolete. Wine now always uses the new
               format; support for the old format was removed a while
               ago.
             </para>

tools/wrc/README.wrc

@@ -17,7 +17,7 @@ Wrc features:
 
 Wrc generates an assembly file that can be assembled with GNU's gas, or
 passed to gcc. The assembly became necessary for two reasons. First, C does
-not ensure relative position of declared data. Secondly, C complaints about
+not ensure relative position of declared data. Secondly, C complains about
 complex initialization schemes that became necessary with the NE/PE
 directory generation.
 
@@ -29,7 +29,9 @@ You can get this message by typing 'wrc -?':
 Usage: wrc [options...] [infile[.rc|.res]]
    -a n        Alignment of resource (win16 only, default is 4)
    -A          Auto register resources (only with gcc 2.7 and better)
-   -b          Create a C array from a binary .res file
+   -b          Create an assembly array from a binary .res file
+   -B x        Set output byte-order x={n[ative], l[ittle], b[ig]}
+               (win32 only; default is n[ative] which equals little-endian)
    -c          Add 'const' prefix to C constants
    -C cp       Set the resource's codepage to cp (default is 0)
    -d n        Set debug level to 'n'
@@ -141,7 +143,7 @@ Language support
 ----------------
 Wrc also understands the LANGUAGE keyword (win32 only) for both global and
 local definitions of language. There are differences with respect to MS' and
-Borland's implementation. Wrc uses 0,0 as the default language if non is
+Borland's implementation. Wrc uses 0,0 as the default language if none is
 specified. Both MS and Borland use the language of the system that the
 compiler runs on.
 
@@ -236,7 +238,7 @@ typedef struct wrc_resource32
 } wrc_resource32_t;
 
 The extension to winerc lies in the addition of the 'typename' field to
-support usertype resoursec with names for types.
+support usertype resources with names for types.
 
 Note that _ALL_ names generated by wrc and to be used in interfacing with
 wine are PASCAL-style strings, unlike winerc. The first element contains the
@@ -248,14 +250,14 @@ You can also generate header files with wrc when specifying the '-h' or
 
 NE/PE resource directory generation
 -----------------------------------
-A windows executable has a table/directory of resources avalable in that
+A windows executable has a table/directory of resources available in that
 module. Wrc will generate this directory with the '-s' option and place it
 in the assembly output (and header-file). This will enable the separation
 of different modules (dlls) in wine, which is the next project after wrc.
 
 The layout of the PE directory should be exactly like the executable file.
-The NE-directory layout _DIFFERS_ from the real NE-executable in such way
-that all offsets to actual resource-data is relative to the NE-directory and
+The NE directory layout _DIFFERS_ from the real NE executable in such way
+that all offsets to actual resource data are relative to the NE directory and
 _NOT_ the beginning of the file.
 
 
@@ -267,8 +269,8 @@ other sources. The reading of 16 bit .res-files is on the list for the next
 release.
 
 You cannot convert 32 bit .res-files into 16 bit output or vice versa. I
-might implement 16 bit res into 32 bit output in the future, but I stronly
-oppose to the other way arround.
+might implement 16 bit res into 32 bit output in the future, but I strongly
+oppose to the other way around.
 
 
 Bugs
@@ -291,8 +293,8 @@ Send problems to the wine newsgroup or, preferrably,  directly to me at:
 
 bertho@akhphd.au.dk
 
-Please send the problematic rc-source with the bug so I can reproduce it.
-Patches should _not_ be send to Alexandre but to me. I will then review the
+Please send the problematic .rc source with the bug so I can reproduce it.
+Patches should _not_ be sent to Alexandre but to me. I will then review the
 change and send a full patch to be included into the new wine release (I
 prefer 'diff -u' format). You can always upload suggestions to wine
 headquarters, but be sure to send me a copy.

tools/wrc/parser.y

@@ -8,7 +8,7 @@
  *			  non-terminals (see cjunk rule).
  * 21-May-2000 BS	- Partial implementation of font resources.
  *			- Corrected language propagation for binary
- *			  resources such as bitmaps, isons, cursors,
+ *			  resources such as bitmaps, icons, cursors,
  *			  userres and rcdata. The language is now
  *			  correct in .res files.
  *			- Fixed reading the resource name as ident,
@@ -2964,14 +2964,14 @@ static int rsrcid_to_token(int lookahead)
 	case WRC_RT_ANIICON:
 	case WRC_RT_GROUP_CURSOR:
 	case WRC_RT_GROUP_ICON:
-		yywarning("Usertype uses reserved type-ID %d, which is auto-generated", yylval.num);
+		yywarning("Usertype uses reserved type ID %d, which is auto-generated", yylval.num);
 		return lookahead;
 
 	case WRC_RT_DLGINCLUDE:
 	case WRC_RT_PLUGPLAY:
 	case WRC_RT_VXD:
 	case WRC_RT_HTML:
-		yywarning("Usertype uses reserved type-ID %d, which is not supported by wrc", yylval.num);
+		yywarning("Usertype uses reserved type ID %d, which is not supported by wrc yet", yylval.num);
 	default:
 		return lookahead;
 	}
@@ -2979,7 +2979,7 @@ static int rsrcid_to_token(int lookahead)
 	if(remap)
 		return token;
 	else
-		yywarning("Usertype uses reserved type-ID %d, which is used by %s", yylval.num, type);
+		yywarning("Usertype uses reserved type ID %d, which is used by %s", yylval.num, type);
 	return lookahead;
 }