Release 0.4.0
Mon Sep 13 05:00:11 1993 Eric Youngdale
* [Makefile] [if1632/relay.c] [include/dlls.h] [selector.c]
[loader/wine.c] [tools/build.c]
Added ability to generate missing functions statistics.
Mon Sep 13 12:09:47 1993 Scott A. Laird (scott@curly)
* [WIN31-APPLETS]
Added new file.
* [if1632/kernel.spec]
Added definitions for GetProfile{Int,String} and SetHandleCount.
* [if1632/keyboard.spec]
Created interface specification for Keyboard driver DLL.
* [if1632/relay.c]
Added keyboard.dll to list of included DLLs.
* [if1632/user.spec]
Added LoadAccelerators definition.
* [loader/resource.c]
Added LoadAccelerators stub.
* [misc/file.c]
Changed OpenFile, and added SetHandleCount (for winfile.exe)
* [misc/keyboard.c]
Added keyboard code.
* [misc/profile.c] [misc/xt.c]
Moved GetPrivateProfile* commands here, and added GetProfile*
commands.
Mon Sep 13 10:24:37 1993 Andrew Bulhak
* [windows/utility.c]
Implemented MulDiv(), OutputDebugString() and wvsprintf()
Fri Sep 10 09:13:30 1993 John Brezak
* [*/Makefile]
Created patch to allow BSD make to build wine.
* [windows/win.c]
Fixed NULL pointer reference.
* [windows/message.c] [misc/xt.c]
Defined HZ to handle system specific timing.
* [windows/graphics.c]
Use M_PI is PI
* [objects/pallete.c]
NetBSD does not have /usr/include/values.h and MAXINT is INT_MAX.
* [dump.c] [ldt.c] [wine.c]
ifdef'ed linux headers for linux compile.
* [loader/ldtlib.c]
Add NetBSD system calls when compiled on that system.
* [loader/selector.c]
Use mmap(MAP_ANON, ...) for NetBSD.
* [if1632/call.S]
Fixed selector assumptions.
Thu Sep 9 20:01:37 1993 David Metcalfe
* [controls/WinButton*] [controls/button.c] [controls/widget.c]
[windows/win.c] [windows/class.c]
Added 3D button control and tied into CreateWindow()
Thu Sep 9 07:35:24 1993 Scott Laird
* [if1632/sound.spec]
Created interface specification for SOUND DLL.
* [if1632/win87em.spec]
Added more functions to the WIN87EM DLL interface specification
* [misc/emulate.c]
Created stubs for the new math emulation functions.
* [misc/sound.c]
Created stubs for the SOUND DLL.
Sun Sep 5 21:02:10 1993 John Burton
* [if1632/kernel.spec]
Added interface specifications for OpenFile, _lclose, _lread, _lopen,
and _lwrite.
* [include/windows.h]
Added OF_ macros
* [misc/file.c]
Implemented OpenFile, _lclose, _lread, _lopen and _lwrite.
Fri Sep 3 18:47:03 1993 Alexandre Julliard
* [windows/dc.c]
Bug fix
* [objects/text.c]
Bug fix
Fri Sep 3 18:47:03 1993 Bob Amstadt
* [objects/linedda.c]
Finished LineDDA().
diff --git a/objects/linedda.c b/objects/linedda.c
index f95ea48..6d8a1cfe 100644
--- a/objects/linedda.c
+++ b/objects/linedda.c
@@ -6,8 +6,7 @@
static char Copyright[] = "Copyright Bob Amstadt, 1993";
-#include <X11/Intrinsic.h>
-#include <X11/StringDefs.h>
+#include <stdlib.h>
#include "win.h"
/**********************************************************************
@@ -16,4 +15,32 @@
void LineDDA(short nXStart, short nYStart, short nXEnd, short nYEnd,
FARPROC callback, long lParam)
{
+ int x, y;
+ int b;
+ int x_diff = nXEnd - nXStart;
+ int y_diff = nYEnd - nYStart;
+
+ if (x_diff == 0 && y_diff == 0)
+ return;
+
+ if ((abs(x_diff) < abs(y_diff) && x_diff != 0) || y_diff == 0)
+ {
+ b = (nXStart * y_diff) / x_diff - nYStart;
+
+ for (x = nXStart; x <= nXEnd; x++)
+ {
+ y = (x * y_diff) / x_diff + b;
+ CallLineDDAProc(callback, x, y, lParam);
+ }
+ }
+ else
+ {
+ b = (nYStart * x_diff) / y_diff - nXStart;
+
+ for (y = nYStart; y <= nYEnd; y++)
+ {
+ x = (y * x_diff) / y_diff + b;
+ CallLineDDAProc(callback, x, y, lParam);
+ }
+ }
}
diff --git a/objects/palette.c b/objects/palette.c
index bdde29d..887f1de 100644
--- a/objects/palette.c
+++ b/objects/palette.c
@@ -7,7 +7,13 @@
static char Copyright[] = "Copyright Alexandre Julliard, 1993";
#include <stdlib.h>
+#ifdef linux
#include <values.h>
+#endif
+#ifdef __NetBSD__
+#include <limits.h>
+#define MAXINT INT_MAX
+#endif
#include <X11/Xlib.h>
#include "gdi.h"
diff --git a/objects/text.c b/objects/text.c
index 43b095a..97ff35b 100644
--- a/objects/text.c
+++ b/objects/text.c
@@ -23,11 +23,17 @@
*/
int DrawText( HDC hdc, LPSTR str, int count, LPRECT rect, WORD flags )
{
+ SIZE size;
int x = rect->left, y = rect->top;
- if (flags & DT_CENTER) x = (rect->left + rect->right) / 2;
- if (flags & DT_VCENTER) y = (rect->top + rect->bottom) / 2;
if (count == -1) count = strlen(str);
+ if (!GetTextExtentPoint( hdc, str, count, &size )) return 0;
+
+ if (flags & DT_CENTER) x = (rect->left + rect->right - size.cx) / 2;
+ else if (flags & DT_RIGHT) x = rect->right - size.cx;
+ if (flags & DT_VCENTER) y = (rect->top + rect->bottom - size.cy) / 2;
+ else if (flags & DT_BOTTOM) y = rect->bottom - size.cy;
+
if (!TextOut( hdc, x, y, str, count )) return 0;
return 1;
}
