Release 960611

Tue Jun 11 15:20:43 1996  Alexandre Julliard  <julliard@lrc.epfl.ch>

	* [debugger/break.c] [loader/signal.c]
	Fixed breakpoints in 32-bit code.

	* [include/windows.h]
	Added many more Win32 versions of standard structures.

	* [include/winreg.h] [misc/registry.c]
	Moved private types into registry.c.

	* [memory/string.c] (New file)
	Moved most string functions from misc/lstr.c; added Win32 version
	of all functions.

	* [misc/wsprintf.c]
	Implemented Win32 wsprintf functions.

	* [objects/bitmap.c]
	Implemented Win32 bitmap functions.

	* [windows/dialog.c]
	Don't set dialog procedure before the controls are created. This
	avoids a crash in Winhelp.

Tue Jun 11 14:10:06 1996 Martin von Loewis <loewis@informatik.hu-berlin.de>

	* [controls/menu.c] [if1632/user.spec] [windows/message.c]
	Replace PeekMessage with PeekMessage16.

	* [if1632/kernel32.spec][misc/main.c]
	GetVersion32,GetVersionEx32A,GetVersionEx32W: new functions.
	MAIN_ParseVersion: new function, new command line option -winver.
	GetVersion: modified to take command line argument into account.

	* [if1632/kernel32.spec] [win32/process.c]
	FreeLibrary32: new function.
	TlsAlloc: initialize Tls to zero.
	InterlockedIncrement,InterlockedDecrement,InterlockedExchange: new
	functions.

	* [if1632/kernel32.spec]
	SetErrorMode,GetActiveWindow: new relays to existing functions.

	* [if1632/kernel32.spec][win32/user32.c]
	PeekMessage32A,PeekMessage32W: new functions.

	* [include/struct32.h][include/windows.h]
	Moved MSG32 to windows.h.
	Renamed MSG to MSG16.
	Modified prototypes to use MSG16

	* [include/winbase.h]
	OSVERSIONINFO32A,OSVERSIONINFO32W: new structures.

Sun Jun  9 20:53:30 1996  Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>

	* [if1632/Makefile.in] [loader/builtin.c]
	version.dll,lz32.dll added.

	* [include/lzexpand.h] [if1632/lz32.spec] [if1632/lzexpand.spec]
	  [misc/lzexpand.c]
	lz32.dll added.
	Modified to new function naming standard.

	* [include/ver.h] [if1632/ver.spec] [if1632/version.spec] [misc/ver.c]
	version.dll added (win32 version of ver.dll).
	Modified to new function naming standard.
	Use registry to look up a LOCALE langids too.
	(VerInstallFile,VerFindFile still stubs)

Fri Jun  7 20:40:20 1996  Albrecht Kleine  <kleine@ak.sax.de>

	* [files/file.c]
	Added a warning if GetTempFileName() gets a bad drive parameter.

	* [misc/commdlg.c]
	Changed file listbox color to gray in SaveFile dialog 
	(just like Windows does this).

objects/text.c

diff --git a/objects/text.c b/objects/text.c
index 1d5a5e1..a9a67d3 100644
--- a/objects/text.c
+++ b/objects/text.c
@@ -194,7 +194,7 @@
     int len, lh, count=i_count;
     int prefix_x = 0;
     int prefix_end = 0;
-    TEXTMETRIC tm;
+    TEXTMETRIC16 tm;
     int x = rect->left, y = rect->top;
     int width = rect->right - rect->left;
     int max_width = 0;
@@ -581,20 +581,16 @@
 BOOL GrayString(HDC hdc, HBRUSH hbr, FARPROC gsprc, LPARAM lParam, 
 		INT cch, INT x, INT y, INT cx, INT cy)
 {
-	int s, current_color;
+    BOOL ret;
+    COLORREF current_color;
 
-	if (gsprc) {
-		return CallGrayStringProc(gsprc, hdc, lParam, 
-					cch ? cch : lstrlen((LPCSTR) lParam) );
-	} else {
-		current_color = GetTextColor(hdc);
-		SetTextColor(hdc, GetSysColor(COLOR_GRAYTEXT) );
-		s = TextOut16(hdc, x, y, (LPSTR) lParam, 
-                              cch ? cch : lstrlen((LPCSTR) lParam) );
-		SetTextColor(hdc, current_color);
-		
-		return s;
-	}
+    if (!cch) cch = lstrlen16( (LPCSTR)PTR_SEG_TO_LIN(lParam) );
+    if (gsprc) return CallGrayStringProc( gsprc, hdc, lParam, cch );
+    current_color = GetTextColor( hdc );
+    SetTextColor( hdc, GetSysColor(COLOR_GRAYTEXT) );
+    ret = TextOut16( hdc, x, y, (LPCSTR)PTR_SEG_TO_LIN(lParam), cch );
+    SetTextColor( hdc, current_color );
+    return ret;
 }
 
 
@@ -621,7 +617,7 @@
     }
     else
     {
-        TEXTMETRIC tm;
+        TEXTMETRIC16 tm;
         GetTextMetrics( hdc, &tm );
         defWidth = 8 * tm.tmAveCharWidth;
     }