Release 970120
Sun Jan 19 11:46:48 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [loader/module.c]
Fixed LoadModule() to always call the DLL initialization code.
* [windows/event.c]
Moved all the keyboard stuff to windows/keyboard.c
* [tools/build.c]
Fixed Win32 register functions.
Sat Jan 18 22:24:41 1997 David Makepeace <D.Makepeace@mailbox.uq.oz.au>
* [tools/makedep.c]
Fixed bug which causes SEGV on Solaris x86.
Fri Jan 17 18:32:27 1997 Frans van Dorsselaer <dorssel@rulhmpc49.LeidenUniv.nl>
* [controls/edit.c]
Implemented WM_UNDO, WM_CONTEXTMENU (temporary using WM_RBUTTONUP),
WM_COMMAND, WM_INITPOPUPMENU, WM_SYSKEYDOWN.
Fixed EM_SETSEL and some minor bugs (features).
Hence: fully functional undo and a win95 menu with the right mouse
button.
* [include/resources.h] [resources/TODO] [resources/sysres_??.rc]
Added a context menu for the edit control.
Translations, please ...
Fri Jan 17 08:29:52 1997 David Faure <david.faure@ifhamy.insa-lyon.fr>
* [windows/event.c]
Move EVENT_ToAscii to windows/keyboard.c (where name ToAscii)
Fixed Keypad keys 0-9 and . in EVENT_event_to_vkey.
Added 3-state handling of toggle keys (CapsLock, NumLock) in order
to make them work with any X server.
Toggle keys now generate WM_KEYDOWN and WM_KEYUP on each pressing.
* [include/keyboard.h]
Totally replaced the file (formerly containing the vkcase definitions)
by the declaration of 'extern' variables contained by event.c and used
by keyboard.c
* [windows/keyboard.c]
Started to rewrite VkKeyScan and MapVirtualKey, to make them use the
table keyc2vkey or X functions only.
ToAscii : added keypad 0-9 and . special case.
Changed toggle keys active mask from 0x80 to 0x1.
* [misc/keyboard.c]
File deleted. Contents moved to windows/keyboard.c.
* [misc/main.c]
Added putenv XKB_DISABLE to disable XKB extension (which, when
present, causes AltGr to change keyboard group instead of being a
modifier).
Tue Jan 14 22:56:43 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [windows/event.c]
Do not assume NumLockMask is Mod2Mask, but compute it by scanning
output of XGetModifierMapping for XK_Num_Lock.
Tue Jan 14 15:49:49 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [loader/pe_*.c] [include/peexe.h] [include/resource32.h]
[debugger/*.c]
General clean up.
Changed defines/structures to match Windows NT SDK.
* [loader/main.c]
Don't crash on empty command-line.
* [windows/winpos.c]
winpos.c made win32 clean.
* [misc/ntdll.c]
Some string conversion additions.
* [files/file.c]
GetFileAttributes/GetTempFileName fixed.
* [misc/ver.c]
VerInstallFile implemented.
Mon Jan 13 15:03:11 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [tools/build.c]: Use PREFIX also in stabs messages.
Mon Jan 13 10:40:33 1997 John Harvey <john@division.co.uk>
* [graphics/win16drv/*] [include/win16drv.h]
Many fixes and some new features.
* [graphics/x11drv/font.c] [graphics/x11drv/init.c]
[include/x11drv.h] [objects/font.c]
GetTextMetrics() moved to graphics driver.
* [if1632/gdi.spec] [misc/fontengine.c] [misc/Makefile.in]
New dummy EngineEnumerateFont, EngineRealizeFont functions.
* [include/windows.h]
TEXTFORM16 and FONTINFO16 structure definitions moved here from
include/win16drv.h
diff --git a/objects/cursoricon.c b/objects/cursoricon.c
index 0ee8657..46a5405 100644
--- a/objects/cursoricon.c
+++ b/objects/cursoricon.c
@@ -842,12 +842,12 @@
else
{
/* Set the same cursor for all top-level windows */
- HWND hwnd = GetWindow( GetDesktopWindow32(), GW_CHILD );
+ HWND hwnd = GetWindow32( GetDesktopWindow32(), GW_CHILD );
while(hwnd)
{
Window win = WIN_GetXWindow( hwnd );
if (win) XDefineCursor( display, win, cursor );
- hwnd = GetWindow( hwnd, GW_HWNDNEXT );
+ hwnd = GetWindow32( hwnd, GW_HWNDNEXT );
}
}
return TRUE;
diff --git a/objects/font.c b/objects/font.c
index 07b95a6..2489e4d 100644
--- a/objects/font.c
+++ b/objects/font.c
@@ -1027,77 +1027,9 @@
*/
BOOL16 GetTextMetrics16( HDC16 hdc, TEXTMETRIC16 *metrics )
{
- DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
- if (!dc) return FALSE;
- memcpy( metrics, &dc->u.x.font.metrics, sizeof(*metrics) );
-
- metrics->tmAscent = abs( metrics->tmAscent
- * dc->wndExtY / dc->vportExtY );
- metrics->tmDescent = abs( metrics->tmDescent
- * dc->wndExtY / dc->vportExtY );
- metrics->tmHeight = metrics->tmAscent + metrics->tmDescent;
- metrics->tmInternalLeading = abs( metrics->tmInternalLeading
- * dc->wndExtY / dc->vportExtY );
- metrics->tmExternalLeading = abs( metrics->tmExternalLeading
- * dc->wndExtY / dc->vportExtY );
- metrics->tmMaxCharWidth = abs( metrics->tmMaxCharWidth
- * dc->wndExtX / dc->vportExtX );
- metrics->tmAveCharWidth = abs( metrics->tmAveCharWidth
- * dc->wndExtX / dc->vportExtX );
-
- dprintf_font(stdnimp,"text metrics:\n
- InternalLeading = %i
- ExternalLeading = %i
- MaxCharWidth = %i
- Weight = %i
- Italic = %i
- Underlined = %i
- StruckOut = %i
- FirstChar = %i
- LastChar = %i
- DefaultChar = %i
- BreakChar = %i
- CharSet = %i
- Overhang = %i
- DigitizedAspectX = %i
- DigitizedAspectY = %i
- AveCharWidth = %i
- MaxCharWidth = %i
- Ascent = %i
- Descent = %i
- Height = %i\n",
- metrics->tmInternalLeading,
- metrics->tmExternalLeading,
- metrics->tmMaxCharWidth,
- metrics->tmWeight,
- metrics->tmItalic,
- metrics->tmUnderlined,
- metrics->tmStruckOut,
- metrics->tmFirstChar,
- metrics->tmLastChar,
- metrics->tmDefaultChar,
- metrics->tmBreakChar,
- metrics->tmCharSet,
- metrics->tmOverhang,
- metrics->tmDigitizedAspectX,
- metrics->tmDigitizedAspectY,
- metrics->tmAveCharWidth,
- metrics->tmMaxCharWidth,
- metrics->tmAscent,
- metrics->tmDescent,
- metrics->tmHeight);
-
- return TRUE;
-}
-
-
-/***********************************************************************
- * GetTextMetrics32A (GDI32.236)
- */
-BOOL32 GetTextMetrics32A( HDC32 hdc, TEXTMETRIC32A *metrics )
-{
- TEXTMETRIC16 tm;
- if (!GetTextMetrics16( (HDC16)hdc, &tm )) return FALSE;
+ TEXTMETRIC32A tm;
+
+ if (!GetTextMetrics32A( (HDC32)hdc, &tm )) return FALSE;
metrics->tmHeight = tm.tmHeight;
metrics->tmAscent = tm.tmAscent;
metrics->tmDescent = tm.tmDescent;
@@ -1123,12 +1055,72 @@
/***********************************************************************
+ * GetTextMetrics32A (GDI32.236)
+ */
+BOOL32 GetTextMetrics32A( HDC32 hdc, TEXTMETRIC32A *metrics )
+{
+DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
+ if (!dc)
+ {
+ if (!(dc = (DC *)GDI_GetObjPtr( hdc, METAFILE_DC_MAGIC )))
+ return FALSE;
+ }
+
+ if (!dc->funcs->pGetTextMetrics ||
+ !dc->funcs->pGetTextMetrics( dc,metrics ))
+ return FALSE;
+ dprintf_font(stdnimp,"text metrics:\n
+ InternalLeading = %i
+ ExternalLeading = %i
+ MaxCharWidth = %i
+ Weight = %i
+ Italic = %i
+ Underlined = %i
+ StruckOut = %i
+ FirstChar = %i
+ LastChar = %i
+ DefaultChar = %i
+ BreakChar = %i
+ CharSet = %i
+ Overhang = %i
+ DigitizedAspectX = %i
+ DigitizedAspectY = %i
+ AveCharWidth = %i
+ MaxCharWidth = %i
+ Ascent = %i
+ Descent = %i
+ Height = %i\n",
+ metrics->tmInternalLeading,
+ metrics->tmExternalLeading,
+ metrics->tmMaxCharWidth,
+ metrics->tmWeight,
+ metrics->tmItalic,
+ metrics->tmUnderlined,
+ metrics->tmStruckOut,
+ metrics->tmFirstChar,
+ metrics->tmLastChar,
+ metrics->tmDefaultChar,
+ metrics->tmBreakChar,
+ metrics->tmCharSet,
+ metrics->tmOverhang,
+ metrics->tmDigitizedAspectX,
+ metrics->tmDigitizedAspectY,
+ metrics->tmAveCharWidth,
+ metrics->tmMaxCharWidth,
+ metrics->tmAscent,
+ metrics->tmDescent,
+ metrics->tmHeight);
+ return TRUE;
+}
+
+
+/***********************************************************************
* GetTextMetrics32W (GDI32.237)
*/
BOOL32 GetTextMetrics32W( HDC32 hdc, TEXTMETRIC32W *metrics )
{
- TEXTMETRIC16 tm;
- if (!GetTextMetrics16( (HDC16)hdc, &tm )) return FALSE;
+ TEXTMETRIC32A tm;
+ if (!GetTextMetrics32A( (HDC16)hdc, &tm )) return FALSE;
metrics->tmHeight = tm.tmHeight;
metrics->tmAscent = tm.tmAscent;
metrics->tmDescent = tm.tmDescent;
diff --git a/objects/palette.c b/objects/palette.c
index 7a67571..53089a9 100644
--- a/objects/palette.c
+++ b/objects/palette.c
@@ -416,11 +416,11 @@
if( hPal != STOCK_DEFAULT_PALETTE )
{
HWND32 hWnd = WindowFromDC32( hDC );
- HWND32 hActive = GetActiveWindow();
+ HWND32 hActive = GetActiveWindow32();
/* set primary palette if it's related to current active */
- if((!hWnd || (hActive == hWnd || IsChild(hActive,hWnd))) &&
+ if((!hWnd || (hActive == hWnd || IsChild16(hActive,hWnd))) &&
!bForceBackground )
wBkgPalette = 0;
}
