Release 980712
Sun Jul 12 16:23:36 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [server/*] [scheduler/client.c] (new files)
[scheduler/sysdeps.c] [scheduler/thread.c] [scheduler/process.c]
Beginnings of client/server communication for inter-process
synchronisation.
Sat Jul 11 19:45:45 1998 Ulrich Weigand <weigand@informatik.uni-erlangen.de>
* [include/bitmap.h] [objects/bitmap.c] [objects/dib.c]
[objects/oembitmap.c]
Speed up DIB section handling by using pre-allocated colormap and
XImage. Moved DIB section data out of general BITMAPOBJ structure.
Bugfix: GetDIBits32 would overwrite one byte beyond bitmap data.
* [if1632/shell.spec] [if1632/kernel.spec] [win32/kernel32.c]
More verbose error message if ThunkConnect fails.
Implemented KERNEL_475.
* [files/profile.c] [ole/ole2nls.c]
Minor bugfixes.
* [if1632/builtin.c] [if1632/kernel.spec] [include/task.h]
[loader/ne/module.c] [loader/task.c]
Implemented KERNEL.THHOOK.
* [if1632/wprocs.spec] [include/process.h] [msdos/dpmi.c] [msdos/vxd.c]
Implemented Win32s VxD services (W32S.386).
Sat Jul 11 17:52:23 1998 Huw D M Davies <daviesh@abacus.physics.ox.ac.uk>
* [graphics/x11drv/xfont.c] [graphics/x11drv/text.c]
[include/x11font.h]
Improve handling of rotated X11 fonts. Metrics/extents should now be
correct. ExtTextOut should behave better (still doesn't handle lpDx).
* [graphics/painting.c]
DrawFocusRect32: Don't do anything if width or height are zero.
Sat Jul 11 15:21:35 1998 Andreas Mohr <100.30936@germany.net>
* [files/profile.c] [include/windows.h]
The length arguments of *Profile*() need to be treated
as UINTxx instead of INTxx.
* [graphics/env.c] [graphics/win16drv/init.c] [include/print.h]
[misc/printdrv.c]
Many printer driver fixes/changes (many thanks go to Huw !).
Most printers should work again ;)
* [memory/atom.c]
Fixed ATOM_AddAtom to store atoms exactly like Windows.
* [*/*]
Fixed misc compiler warnings.
Fri Jul 10 15:58:36 1998 Marcus Meissner <marcus@jet.franken.de>
* [files/drive.c]
Fixed GetDriveType16 to return DRIVE_REMOTE again.
* [loader/pe_image.c][loader/module.c]
Look for modules that have the same modulename or the same
filename (they sometimes differ).
Fixed up fixup_imports, removed one of the loops.
* [windows/winpos.c]
Added some NULL ptr checks. Needs more.
* [graphics/ddraw.c]
Some stubs added.
* [if1632/snoop.c]
Updated, made WINELIB compatible.
Fri Jul 10 04:39:56 1998 Douglas Ridgway <ridgway@winehq.com>
* [objects/enhmetafile.c] [relay32/gdi32.spec]
Small tweaks for documentation system.
Thu Jul 9 22:00:18 1998 Eric Kohl <ekohl@abo.rhein-zeitung.de>
* [controls/commctrl.c][include/commctrl.h][relay32/comctl32.spec]
Fixed GetEffectiveClientRect, CreateToolbarEx and CreateMappedBitmap.
Added stub for ShowHideMenuCtl. Added some documentation.
* [documentation/common_controls]
Added and updated some information.
* [controls/toolbar.c][include/toolbar.h]
Added string support.
* [misc/shell.c][misc/shellord.c][relay32/shell.spec]
Changed names of undocumented functions to their real names and
fixed the export table.
* [controls/imagelist.c][relay32/comctl32.spec]
Added stub for ImageList_SetFilter.
Fixed some minor bugs and typos.
* [objects/font.c][include/windows.h][relay32/gdi32.spec]
Added stubs for GetCharacterPlacement32[A/W].
* [objects/region.c][relay32/gdi32.spec]
Added stub for UNDOCUMENTED GetRandomRgn.
* [controls/commctrl.c][controls/*.c][include/*.h]
Added dummy listview, pager, rebar, tooltips, trackbar and
treeview control. This keeps some programs from complaining.
Thu Jul 9 11:23:58 1998 Rein Klazes <rklazes@casema.net>
* [graphics/painting.c] [graphics/*/init.c]
[graphics/x11drv/graphics.c] [relay32/gdi32.spec]
[if1632/gdi.spec] [include/gdi.h] [include/x11drv.h]
Implemented drawing bezier curves: PolyBezier16/32 and
PolyBezierTo16/32.
* [graphics/x11drv/graphics.c]
Improved accuracy of several graphic routines, especially the
drawing of pie's.
* [include/windows.h] [misc/spy.c]
Added 25 window messages related to programs based on MFC and/or OLE.
Wed Jul 8 22:00:00 1998 James Juran <jrj120@psu.edu>
* [documentation/wine.man]
Updated manpage.
* [wine.ini]
Added section for Win95Look=true (commented out by default).
Wed Jul 8 06:23:19 1998 Matthew Becker <mbecker@glasscity.net>
* [misc/registry.c]
Fixed a crash in RegEnumValue32A when the dwType parameter is
NULL.
* [programs/regtest/regtest.c]
Improved the printing of errors.
* [misc/ntdll.c]
Added stub for RtlFormatCurrentUserKeyPath.
* [win32/console.c]
Added stub for ScrollConsoleScreenBuffer.
Mon Jul 6 16:41:47 1998 Per Lindström <pelinstr@algonet.se>
* [include/windows.h] [relay32/kernel.spec] [win32/newfns.c]
Added stubs for SleepEx and TerminateProcess.
* [rc/README]
Corrected a grammatical error.
Mon Jul 3 12:00:00 1998 Juergen Schmied <juergen.schmied@metronet.de>
* [misc/shellord.c]
Put some TRACE in.
* [memory/string.c]
Deleted unused variable in lstrcmpi32A.
* [include/windows.h][memory/string.c]
Added functions WideCharToLocal32 LocalToWideChar32 for
OLE-strings
* [include/shlobj.h][include/winerror.h][misc/shell.c]
[ole/folders.c]
Added definition of internal class pidlmgr.
Changed definitions of EnumIDList, IShellFolder.
Added some OLE error constants.
Implemented EnumIDList, IShellFolder, IClassFactory,
PidlMgr, SHELL32_DllGetClassObject, SHGetDesktopFolder,
SHGetSpecialFolderLocation (half), SHGetPathFromIDList
(!!This stuff is not finished yet!!)
* [include/windows.h][misc/network][reley32/mpr.spec]
Added stubs for WNetConnectionDialog32[A|W|API].
Added struct LPCONNECTDLGSTRUCT32[A|W] and some constants.
Added some SetLastError(WN_NO_NETWORK) to the stubs.
Fixed bufferhandling in WNetCancelConnection
Added stub for MultinetGetErrorText[A|W]
* [ole/ole2nls.c]
Rewrote GetTimeFormat32A.
Fri Jul 3 10:27:30 1998 Michael Poole <poole+@andrew.cmu.edu>
* [graphics/ddraw.c] [tsx11/X11_calls]
Implement IDirectDrawPalette_GetEntries.
Use CopyColormapAndFree to avoid erasing previously-set
palette entries.
* [graphics/ddraw.c] [include/ddraw.h]
[tools/make_X11wrappers] [tsx11/X11_calls]
Provide a preliminary, not-yet-working framework for doing
DirectDraw via Xlib or XShm as well as DGA.
Tue Jun 30 00:16:09 1998 Marcel Baur <mbaur@g26.ethz.ch>
* [ole/nls/*.nls]
Added remaining 22 locales (including arabic locales).
diff --git a/msdos/dpmi.c b/msdos/dpmi.c
index 1aa802f..ee20a38 100644
--- a/msdos/dpmi.c
+++ b/msdos/dpmi.c
@@ -18,6 +18,7 @@
#include "debug.h"
#include "selectors.h"
#include "thread.h"
+#include "process.h"
#include "stackframe.h"
#include "callback.h"
@@ -110,19 +111,24 @@
MEMORY_BASIC_INFORMATION mbi;
LPVOID newptr;
- if (!VirtualQuery(ptr,&mbi,sizeof(mbi))) {
- FIXME(int31,"reallocing non DPMI_xalloced region?\n");
- return NULL;
- }
- /* We do not shrink allocated memory. most reallocs only do grows
- * anyway
- */
- if (newsize<=mbi.RegionSize)
- return ptr;
-
newptr = DPMI_xalloc(newsize);
- memcpy(newptr,ptr,newsize);
- DPMI_xfree(ptr);
+ if (ptr) {
+ if (!VirtualQuery(ptr,&mbi,sizeof(mbi))) {
+ FIXME(int31,"realloc of DPMI_xallocd region %p?\n",ptr);
+ return NULL;
+ }
+ if (mbi.State == MEM_FREE) {
+ FIXME(int31,"realloc of DPMI_xallocd region %p?\n",ptr);
+ return NULL;
+ }
+ /* We do not shrink allocated memory. most reallocs
+ * only do grows anyway
+ */
+ if (newsize<=mbi.RegionSize)
+ return ptr;
+ memcpy(newptr,ptr,newsize);
+ DPMI_xfree(ptr);
+ }
return newptr;
}
/**********************************************************************
@@ -293,6 +299,23 @@
break;
}
break;
+ case 0x58: /* GET OR SET MEMORY/UMB ALLOCATION STRATEGY */
+ TRACE(int31,"GET OR SET MEMORY/UMB ALLOCATION STRATEGY subfunction %d\n",
+ AL_reg(context));
+ switch (AL_reg(context))
+ {
+ case 0x00:
+ AX_reg(context) = 1;
+ break;
+ case 0x02:
+ AX_reg(context) = 0;
+ break;
+ case 0x01:
+ case 0x03:
+ break;
+ }
+ RESET_CFLAG(context);
+ break;
case 0x60: {/* CANONICALIZE PATH */
LPCSTR path = (LPCSTR)DOSMEM_MapRealToLinear((DS_reg(&realmode_ctx)<<16)+SI_reg(&realmode_ctx));
@@ -460,8 +483,18 @@
*
* Handler for int 31h (DPMI).
*/
+
void WINAPI INT_Int31Handler( CONTEXT *context )
{
+ /*
+ * Note: For Win32s processes, the whole linear address space is
+ * shifted by 0x10000 relative to the OS linear address space.
+ * See the comment in msdos/vxd.c.
+ */
+ DWORD offset = PROCESS_Current()->flags & PDB32_WIN32S_PROC ? 0x10000 : 0;
+ #define AppToWine(addr) ((addr)? ((DWORD)(addr)) + offset : 0)
+ #define WineToApp(addr) ((addr)? ((DWORD)(addr)) - offset : 0)
+
DWORD dw;
BYTE *ptr;
@@ -547,15 +580,17 @@
}
else
{
- CX_reg(context) = HIWORD(dw);
- DX_reg(context) = LOWORD(dw);
+ CX_reg(context) = HIWORD(WineToApp(dw));
+ DX_reg(context) = LOWORD(WineToApp(dw));
}
break;
case 0x0007: /* Set selector base address */
- TRACE(int31,"set selector base address (0x%04x,0x%08lx)\n",BX_reg(context),MAKELONG(DX_reg(context),CX_reg(context)));
- SetSelectorBase( BX_reg(context),
- MAKELONG( DX_reg(context), CX_reg(context) ) );
+ TRACE(int31, "set selector base address (0x%04x,0x%08lx)\n",
+ BX_reg(context),
+ AppToWine(MAKELONG(DX_reg(context),CX_reg(context))));
+ SetSelectorBase(BX_reg(context),
+ AppToWine(MAKELONG(DX_reg(context), CX_reg(context))));
break;
case 0x0008: /* Set selector limit */
@@ -583,6 +618,8 @@
{
ldt_entry entry;
LDT_GetEntry( SELECTOR_TO_ENTRY( BX_reg(context) ), &entry );
+ entry.base = WineToApp(entry.base);
+
/* FIXME: should use ES:EDI for 32-bit clients */
LDT_EntryToBytes( PTR_SEG_OFF_TO_LIN( ES_reg(context),
DI_reg(context) ), &entry );
@@ -595,6 +632,8 @@
ldt_entry entry;
LDT_BytesToEntry( PTR_SEG_OFF_TO_LIN( ES_reg(context),
DI_reg(context) ), &entry );
+ entry.base = AppToWine(entry.base);
+
LDT_SetEntry( SELECTOR_TO_ENTRY( BX_reg(context) ), &entry );
}
break;
@@ -621,7 +660,7 @@
break;
case 0x0205: /* Set protected mode interrupt vector */
- TRACE(int31,"set protected mode interrupt handler (0x%02x,0x%08lx), stub!\n",
+ TRACE(int31,"set protected mode interrupt handler (0x%02x,%p), stub!\n",
BL_reg(context),PTR_SEG_OFF_TO_LIN(CX_reg(context),DX_reg(context)));
INT_SetHandler( BL_reg(context),
(FARPROC16)PTR_SEG_OFF_TO_SEGPTR( CX_reg(context),
@@ -686,27 +725,31 @@
AX_reg(context) = 0x8012; /* linear memory not available */
SET_CFLAG(context);
} else {
- BX_reg(context) = SI_reg(context) = HIWORD(ptr);
- CX_reg(context) = DI_reg(context) = LOWORD(ptr);
+ BX_reg(context) = SI_reg(context) = HIWORD(WineToApp(ptr));
+ CX_reg(context) = DI_reg(context) = LOWORD(WineToApp(ptr));
}
break;
case 0x0502: /* Free memory block */
- TRACE(int31,"free memory block (0x%08lx)\n",MAKELONG(DI_reg(context),SI_reg(context)));
- DPMI_xfree((void *)MAKELONG(DI_reg(context), SI_reg(context)));
+ TRACE(int31, "free memory block (0x%08lx)\n",
+ AppToWine(MAKELONG(DI_reg(context),SI_reg(context))));
+ DPMI_xfree( (void *)AppToWine(MAKELONG(DI_reg(context),
+ SI_reg(context))) );
break;
case 0x0503: /* Resize memory block */
- TRACE(int31,"resize memory block (0x%08lx,%ld)\n",MAKELONG(DI_reg(context),SI_reg(context)),MAKELONG(CX_reg(context),BX_reg(context)));
+ TRACE(int31, "resize memory block (0x%08lx,%ld)\n",
+ AppToWine(MAKELONG(DI_reg(context),SI_reg(context))),
+ MAKELONG(CX_reg(context),BX_reg(context)));
if (!(ptr = (BYTE *)DPMI_xrealloc(
- (void *)MAKELONG(DI_reg(context),SI_reg(context)),
- MAKELONG(CX_reg(context),BX_reg(context)))))
+ (void *)AppToWine(MAKELONG(DI_reg(context),SI_reg(context))),
+ MAKELONG(CX_reg(context),BX_reg(context)))))
{
AX_reg(context) = 0x8012; /* linear memory not available */
SET_CFLAG(context);
} else {
- BX_reg(context) = SI_reg(context) = HIWORD(ptr);
- CX_reg(context) = DI_reg(context) = LOWORD(ptr);
+ BX_reg(context) = SI_reg(context) = HIWORD(WineToApp(ptr));
+ CX_reg(context) = DI_reg(context) = LOWORD(WineToApp(ptr));
}
break;
@@ -749,8 +792,8 @@
}
else
{
- BX_reg(context) = HIWORD(ptr);
- CX_reg(context) = LOWORD(ptr);
+ BX_reg(context) = HIWORD(WineToApp(ptr));
+ CX_reg(context) = LOWORD(WineToApp(ptr));
RESET_CFLAG(context);
}
break;
@@ -761,4 +804,7 @@
SET_CFLAG(context);
break;
}
+
+ #undef AppToWine
+ #undef WineToApp
}
