Release 971116
Sun Nov 16 07:42:44 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/dce.c] [windows/clipboard.c] [windows/nonclient.c]
Bug fixes.
* [misc/shell.c] [resources/*]
New "About" dialog.
Sat Nov 15 17:30:18 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [configure.in] [Makefile.in]
Replaced --with-library option by --disable-emulator. The default
is now to build both the library and the emulator.
Renamed --with options to --enable to follow autoconf guidelines.
* [loader/main.c] [miscemu/main.c] (New file)
Split initialization in WinelibInit/EmulatorInit.
* [loader/*.c]
Removed all remaining #ifdef's WINELIB.
* [controls/widgets.c] [windows/mdi.c]
Converted MDIClientWndProc to 32-bit.
* [debugger/break.c] [if1632/signal.c] [include/selectors.h]
[scheduler/thread.c]
Code and data selector values are now computed at run-time.
* [library/libres.c]
Moved to loader/ directory.
* [misc/main.c] [misc/version.c] (New file)
Moved all version stuff to version.c. Cleaned up a bit.
* [msdos/dpmi.c]
Update the REALMODECALL structure on return from real-mode
interrupt.
* [windows/event.c] [windows/keyboard.c]
Changed the way event coordinates are determined. Don't rely on
the ConfigureNotify event values. This should fix all problems
with cursor position in -desktop and -managed modes.
Sat Nov 15 16:09:36 1997 Slaven Rezic <eserte@cs.tu-berlin.de>
* [controls/button.c]
(BUTTON_CheckAutoRadioButton): Prevent possible endless loop.
Wed Nov 12 03:42:45 1997 Chris Faherty <chrisf@america.com>
* [misc/ver.c]
Changed VerInstall32A to assume srcdir as destination if destdir
is blank. This was causing alot of DLL installation into SYSTEM
directory to fail.
* [loader/ne_image.c]
NE_LoadSegment buffer[100] was too small and getting overruns.
Changed it to buffer[200].
Sat Nov 8 06:09:57 1997 Len White <phreak@cgocable.net>
* [misc/ddeml.c] [include/ddeml.h] [if1632/ddeml.spec]
Added stub functions DdeConnectList(), DdeQueryNextServer(),
DdeDisconnectList(), DdeSetUserHandle(), DdeAbandonTransaction(),
DdePostAdvise(), DdeCreateDataHandle(), DdeAddData(), DdeGetData(),
DdeAccessData(), DdeUnaccessData(), DdeEnableCallback(),
DdeCmpStringHandles().
Fri Nov 7 19:44:26 1997 Olaf Flebbe <o.flebbe@science-computing.de>
* [files/directory.c]
Fix typo in directory.c [broke loading of cdplayer on nt40]
* [misc/main.c]
Implemented -winver nt40.
* [loader/resource.c] [user32.spec]
Stubs for CopyAcceleratorTable, Destroy AcceleratorTable.
Thu Nov 6 22:37:04 1997 Morten Welinder <welinder@rentec.com>
* [files/drive.c]
(GetDiskFreeSpace32A): Cap at 2GB.
* [include/windows.h]
Prototype DrawIconEx and CreateDIBSection32.
Define OBM_RADIOCHECK.
Add DI_* macros.
* [objects/dib.c] [if1632/gdi.spec]
CreateDIBSection is a WINAPI. Renamed to CreateDIBSection32.
Implement CreateDIBSection16.
* [if1632/user.spec] [if1632/user32.spec]
Add DrawIconEx.
* [objects/cursoricon.c]
(CopyIcon32): Fix bogus implementation.
* [objects/bitmap.c]
(CopyBitmap32): New function.
(CopyImage32): Do bitmaps.
* [graphics/x11drv/text.c]
(X11DRV_ExtTextOut): Change ascent and descent default to avoid
zero-thinkness overstrike line.
* [include/debugstr.h] [misc/debugstr.c]
New files.
* [msdos/dpmi.c]
Don't prototype do_mscdex. In INT_Int31Handler, handle real-mode
int 0x21, ah=0x52.
* [msdos/int2f.c]
Add dummys for 0x1681 and 0x1682.
* [misc/registry.c]
Fix memory leaks in RegDeleteKey32W.
* [objects/text.c]
In TEXT_NextLine, fix another off-by-one bug.
* [include/bitmaps/obm_radiocheck]
New file. (It a small circle used to radio-button menu items
when selected.)
* [objects/oembitmap.c]
Add obm_radiocheck.
* [include/windows.h] [if1632/user32.spec] [controls/menu.c]
[if1632/user.spec]
Define CheckMenuRadioItem{16,32}. Define GetMenuItemRect{16,32}.
Wed Nov 5 11:30:14 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [misc/main.c]
Auto adjust versions depending on binary.
Tue Nov 4 15:21:00 1997 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [controls/listbox.c]
Paint full background in listbox items with tab stops enabled.
* [if1632/thunk.c]
Copy some more message parameter structures (DRAWITEMSTRUCT16,
COMPAREITEMSTRUCT16) to the stack segment to fix broken programs
that need this.
* [windows/dce.c]
Only clip sibling windows when the parent has the WS_CLIPSIBLINGS
style set.
* [windows/focus.c]
Make order of events in FOCUS_SwitchFocus() reflect API docs.
* [windows/defdlg.c]
Fix problem with loss of focus in some dialogs.
* [win32/code_page.c]
Fix return value for MultiByteToWideChar().
* [BUGS]
BCW now works.
1997-11-16 17:38:29 +00:00
|
|
|
/*
|
|
|
|
* Windows version functions
|
|
|
|
*
|
|
|
|
* Copyright 1997 Alexandre Julliard
|
|
|
|
* Copyright 1997 Marcus Meissner
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include "windows.h"
|
|
|
|
#include "winbase.h"
|
|
|
|
#include "process.h"
|
|
|
|
#include "options.h"
|
|
|
|
|
|
|
|
typedef enum
|
|
|
|
{
|
|
|
|
WIN31, /* Windows 3.1 */
|
|
|
|
WIN95, /* Windows 95 */
|
|
|
|
NT351, /* Windows NT 3.51 */
|
|
|
|
NT40, /* Windows NT 4.0 */
|
|
|
|
NB_VERSIONS
|
|
|
|
} VERSION;
|
|
|
|
|
|
|
|
typedef struct
|
|
|
|
{
|
|
|
|
LONG getVersion16;
|
|
|
|
LONG getVersion32;
|
|
|
|
OSVERSIONINFO32A getVersionEx;
|
|
|
|
} VERSION_DATA;
|
|
|
|
|
|
|
|
|
|
|
|
/* FIXME: compare values below with original and fix */
|
|
|
|
static const VERSION_DATA VersionData[NB_VERSIONS] =
|
|
|
|
{
|
|
|
|
/* WIN31 */
|
|
|
|
{
|
|
|
|
MAKELONG( 0x0a03, 0x0616 ), /* DOS 6.22 */
|
|
|
|
MAKELONG( 0x0a03, 0x8000 ),
|
|
|
|
{
|
|
|
|
sizeof(OSVERSIONINFO32A), 3, 10, 0,
|
|
|
|
VER_PLATFORM_WIN32s, "Win32s 1.3"
|
|
|
|
}
|
|
|
|
},
|
|
|
|
/* WIN95 */
|
|
|
|
{
|
|
|
|
0x07005F03,
|
|
|
|
0xC0000004,
|
|
|
|
{
|
|
|
|
sizeof(OSVERSIONINFO32A), 4, 0, 0x40003B6,
|
|
|
|
VER_PLATFORM_WIN32_WINDOWS, "Win95"
|
|
|
|
}
|
|
|
|
},
|
|
|
|
/* NT351 */
|
|
|
|
{
|
|
|
|
0x05000A03,
|
|
|
|
0x04213303,
|
|
|
|
{
|
|
|
|
sizeof(OSVERSIONINFO32A), 3, 51, 0x421,
|
|
|
|
VER_PLATFORM_WIN32_NT, "Service Pack 2"
|
|
|
|
}
|
|
|
|
},
|
|
|
|
/* NT40 */
|
|
|
|
{
|
|
|
|
0x05000A03,
|
|
|
|
0x05650004,
|
|
|
|
{
|
|
|
|
sizeof(OSVERSIONINFO32A), 4, 0, 0x565,
|
|
|
|
VER_PLATFORM_WIN32_NT, "Service Pack 3"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
static const char *VersionNames[NB_VERSIONS] =
|
|
|
|
{
|
|
|
|
"win31",
|
|
|
|
"win95",
|
|
|
|
"nt351",
|
|
|
|
"nt40"
|
|
|
|
};
|
|
|
|
|
|
|
|
/* the current version has not been autodetected but forced via cmdline */
|
|
|
|
static BOOL32 versionForced = FALSE;
|
|
|
|
static VERSION defaultVersion = WIN31;
|
|
|
|
|
|
|
|
|
|
|
|
/**********************************************************************
|
|
|
|
* VERSION_ParseVersion
|
|
|
|
*/
|
|
|
|
void VERSION_ParseVersion( char *arg )
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < NB_VERSIONS; i++)
|
|
|
|
{
|
|
|
|
if (!strcmp( VersionNames[i], arg ))
|
|
|
|
{
|
|
|
|
defaultVersion = (VERSION)i;
|
|
|
|
versionForced = TRUE;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
fprintf( stderr, "Invalid winver value '%s' specified.\n", arg );
|
|
|
|
fprintf( stderr, "Valid versions are:" );
|
|
|
|
for (i = 0; i < NB_VERSIONS; i++)
|
|
|
|
fprintf( stderr, " '%s'%c", VersionNames[i],
|
|
|
|
(i == NB_VERSIONS - 1) ? '\n' : ',' );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**********************************************************************
|
|
|
|
* VERSION_get_version
|
|
|
|
*/
|
|
|
|
static VERSION VERSION_GetVersion(void)
|
|
|
|
{
|
|
|
|
LPIMAGE_NT_HEADERS peheader;
|
|
|
|
|
|
|
|
if (versionForced) /* user has overridden any sensible checks */
|
|
|
|
return defaultVersion;
|
1998-01-18 18:01:49 +00:00
|
|
|
if (!PROCESS_Current()->exe_modref)
|
1997-11-30 17:45:40 +00:00
|
|
|
{
|
|
|
|
/* HACK: if we have loaded a PE image into this address space,
|
|
|
|
* we are probably using thunks, so Win95 is our best bet
|
|
|
|
*/
|
1998-01-18 18:01:49 +00:00
|
|
|
if (PROCESS_Current()->modref_list) return WIN95;
|
Release 971116
Sun Nov 16 07:42:44 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/dce.c] [windows/clipboard.c] [windows/nonclient.c]
Bug fixes.
* [misc/shell.c] [resources/*]
New "About" dialog.
Sat Nov 15 17:30:18 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [configure.in] [Makefile.in]
Replaced --with-library option by --disable-emulator. The default
is now to build both the library and the emulator.
Renamed --with options to --enable to follow autoconf guidelines.
* [loader/main.c] [miscemu/main.c] (New file)
Split initialization in WinelibInit/EmulatorInit.
* [loader/*.c]
Removed all remaining #ifdef's WINELIB.
* [controls/widgets.c] [windows/mdi.c]
Converted MDIClientWndProc to 32-bit.
* [debugger/break.c] [if1632/signal.c] [include/selectors.h]
[scheduler/thread.c]
Code and data selector values are now computed at run-time.
* [library/libres.c]
Moved to loader/ directory.
* [misc/main.c] [misc/version.c] (New file)
Moved all version stuff to version.c. Cleaned up a bit.
* [msdos/dpmi.c]
Update the REALMODECALL structure on return from real-mode
interrupt.
* [windows/event.c] [windows/keyboard.c]
Changed the way event coordinates are determined. Don't rely on
the ConfigureNotify event values. This should fix all problems
with cursor position in -desktop and -managed modes.
Sat Nov 15 16:09:36 1997 Slaven Rezic <eserte@cs.tu-berlin.de>
* [controls/button.c]
(BUTTON_CheckAutoRadioButton): Prevent possible endless loop.
Wed Nov 12 03:42:45 1997 Chris Faherty <chrisf@america.com>
* [misc/ver.c]
Changed VerInstall32A to assume srcdir as destination if destdir
is blank. This was causing alot of DLL installation into SYSTEM
directory to fail.
* [loader/ne_image.c]
NE_LoadSegment buffer[100] was too small and getting overruns.
Changed it to buffer[200].
Sat Nov 8 06:09:57 1997 Len White <phreak@cgocable.net>
* [misc/ddeml.c] [include/ddeml.h] [if1632/ddeml.spec]
Added stub functions DdeConnectList(), DdeQueryNextServer(),
DdeDisconnectList(), DdeSetUserHandle(), DdeAbandonTransaction(),
DdePostAdvise(), DdeCreateDataHandle(), DdeAddData(), DdeGetData(),
DdeAccessData(), DdeUnaccessData(), DdeEnableCallback(),
DdeCmpStringHandles().
Fri Nov 7 19:44:26 1997 Olaf Flebbe <o.flebbe@science-computing.de>
* [files/directory.c]
Fix typo in directory.c [broke loading of cdplayer on nt40]
* [misc/main.c]
Implemented -winver nt40.
* [loader/resource.c] [user32.spec]
Stubs for CopyAcceleratorTable, Destroy AcceleratorTable.
Thu Nov 6 22:37:04 1997 Morten Welinder <welinder@rentec.com>
* [files/drive.c]
(GetDiskFreeSpace32A): Cap at 2GB.
* [include/windows.h]
Prototype DrawIconEx and CreateDIBSection32.
Define OBM_RADIOCHECK.
Add DI_* macros.
* [objects/dib.c] [if1632/gdi.spec]
CreateDIBSection is a WINAPI. Renamed to CreateDIBSection32.
Implement CreateDIBSection16.
* [if1632/user.spec] [if1632/user32.spec]
Add DrawIconEx.
* [objects/cursoricon.c]
(CopyIcon32): Fix bogus implementation.
* [objects/bitmap.c]
(CopyBitmap32): New function.
(CopyImage32): Do bitmaps.
* [graphics/x11drv/text.c]
(X11DRV_ExtTextOut): Change ascent and descent default to avoid
zero-thinkness overstrike line.
* [include/debugstr.h] [misc/debugstr.c]
New files.
* [msdos/dpmi.c]
Don't prototype do_mscdex. In INT_Int31Handler, handle real-mode
int 0x21, ah=0x52.
* [msdos/int2f.c]
Add dummys for 0x1681 and 0x1682.
* [misc/registry.c]
Fix memory leaks in RegDeleteKey32W.
* [objects/text.c]
In TEXT_NextLine, fix another off-by-one bug.
* [include/bitmaps/obm_radiocheck]
New file. (It a small circle used to radio-button menu items
when selected.)
* [objects/oembitmap.c]
Add obm_radiocheck.
* [include/windows.h] [if1632/user32.spec] [controls/menu.c]
[if1632/user.spec]
Define CheckMenuRadioItem{16,32}. Define GetMenuItemRect{16,32}.
Wed Nov 5 11:30:14 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [misc/main.c]
Auto adjust versions depending on binary.
Tue Nov 4 15:21:00 1997 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [controls/listbox.c]
Paint full background in listbox items with tab stops enabled.
* [if1632/thunk.c]
Copy some more message parameter structures (DRAWITEMSTRUCT16,
COMPAREITEMSTRUCT16) to the stack segment to fix broken programs
that need this.
* [windows/dce.c]
Only clip sibling windows when the parent has the WS_CLIPSIBLINGS
style set.
* [windows/focus.c]
Make order of events in FOCUS_SwitchFocus() reflect API docs.
* [windows/defdlg.c]
Fix problem with loss of focus in some dialogs.
* [win32/code_page.c]
Fix return value for MultiByteToWideChar().
* [BUGS]
BCW now works.
1997-11-16 17:38:29 +00:00
|
|
|
return WIN31; /* FIXME: hmm, look at DDB.version ? */
|
1997-11-30 17:45:40 +00:00
|
|
|
}
|
1998-01-18 18:01:49 +00:00
|
|
|
peheader = PE_HEADER(PROCESS_Current()->exe_modref->module);
|
Release 971116
Sun Nov 16 07:42:44 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/dce.c] [windows/clipboard.c] [windows/nonclient.c]
Bug fixes.
* [misc/shell.c] [resources/*]
New "About" dialog.
Sat Nov 15 17:30:18 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [configure.in] [Makefile.in]
Replaced --with-library option by --disable-emulator. The default
is now to build both the library and the emulator.
Renamed --with options to --enable to follow autoconf guidelines.
* [loader/main.c] [miscemu/main.c] (New file)
Split initialization in WinelibInit/EmulatorInit.
* [loader/*.c]
Removed all remaining #ifdef's WINELIB.
* [controls/widgets.c] [windows/mdi.c]
Converted MDIClientWndProc to 32-bit.
* [debugger/break.c] [if1632/signal.c] [include/selectors.h]
[scheduler/thread.c]
Code and data selector values are now computed at run-time.
* [library/libres.c]
Moved to loader/ directory.
* [misc/main.c] [misc/version.c] (New file)
Moved all version stuff to version.c. Cleaned up a bit.
* [msdos/dpmi.c]
Update the REALMODECALL structure on return from real-mode
interrupt.
* [windows/event.c] [windows/keyboard.c]
Changed the way event coordinates are determined. Don't rely on
the ConfigureNotify event values. This should fix all problems
with cursor position in -desktop and -managed modes.
Sat Nov 15 16:09:36 1997 Slaven Rezic <eserte@cs.tu-berlin.de>
* [controls/button.c]
(BUTTON_CheckAutoRadioButton): Prevent possible endless loop.
Wed Nov 12 03:42:45 1997 Chris Faherty <chrisf@america.com>
* [misc/ver.c]
Changed VerInstall32A to assume srcdir as destination if destdir
is blank. This was causing alot of DLL installation into SYSTEM
directory to fail.
* [loader/ne_image.c]
NE_LoadSegment buffer[100] was too small and getting overruns.
Changed it to buffer[200].
Sat Nov 8 06:09:57 1997 Len White <phreak@cgocable.net>
* [misc/ddeml.c] [include/ddeml.h] [if1632/ddeml.spec]
Added stub functions DdeConnectList(), DdeQueryNextServer(),
DdeDisconnectList(), DdeSetUserHandle(), DdeAbandonTransaction(),
DdePostAdvise(), DdeCreateDataHandle(), DdeAddData(), DdeGetData(),
DdeAccessData(), DdeUnaccessData(), DdeEnableCallback(),
DdeCmpStringHandles().
Fri Nov 7 19:44:26 1997 Olaf Flebbe <o.flebbe@science-computing.de>
* [files/directory.c]
Fix typo in directory.c [broke loading of cdplayer on nt40]
* [misc/main.c]
Implemented -winver nt40.
* [loader/resource.c] [user32.spec]
Stubs for CopyAcceleratorTable, Destroy AcceleratorTable.
Thu Nov 6 22:37:04 1997 Morten Welinder <welinder@rentec.com>
* [files/drive.c]
(GetDiskFreeSpace32A): Cap at 2GB.
* [include/windows.h]
Prototype DrawIconEx and CreateDIBSection32.
Define OBM_RADIOCHECK.
Add DI_* macros.
* [objects/dib.c] [if1632/gdi.spec]
CreateDIBSection is a WINAPI. Renamed to CreateDIBSection32.
Implement CreateDIBSection16.
* [if1632/user.spec] [if1632/user32.spec]
Add DrawIconEx.
* [objects/cursoricon.c]
(CopyIcon32): Fix bogus implementation.
* [objects/bitmap.c]
(CopyBitmap32): New function.
(CopyImage32): Do bitmaps.
* [graphics/x11drv/text.c]
(X11DRV_ExtTextOut): Change ascent and descent default to avoid
zero-thinkness overstrike line.
* [include/debugstr.h] [misc/debugstr.c]
New files.
* [msdos/dpmi.c]
Don't prototype do_mscdex. In INT_Int31Handler, handle real-mode
int 0x21, ah=0x52.
* [msdos/int2f.c]
Add dummys for 0x1681 and 0x1682.
* [misc/registry.c]
Fix memory leaks in RegDeleteKey32W.
* [objects/text.c]
In TEXT_NextLine, fix another off-by-one bug.
* [include/bitmaps/obm_radiocheck]
New file. (It a small circle used to radio-button menu items
when selected.)
* [objects/oembitmap.c]
Add obm_radiocheck.
* [include/windows.h] [if1632/user32.spec] [controls/menu.c]
[if1632/user.spec]
Define CheckMenuRadioItem{16,32}. Define GetMenuItemRect{16,32}.
Wed Nov 5 11:30:14 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [misc/main.c]
Auto adjust versions depending on binary.
Tue Nov 4 15:21:00 1997 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [controls/listbox.c]
Paint full background in listbox items with tab stops enabled.
* [if1632/thunk.c]
Copy some more message parameter structures (DRAWITEMSTRUCT16,
COMPAREITEMSTRUCT16) to the stack segment to fix broken programs
that need this.
* [windows/dce.c]
Only clip sibling windows when the parent has the WS_CLIPSIBLINGS
style set.
* [windows/focus.c]
Make order of events in FOCUS_SwitchFocus() reflect API docs.
* [windows/defdlg.c]
Fix problem with loss of focus in some dialogs.
* [win32/code_page.c]
Fix return value for MultiByteToWideChar().
* [BUGS]
BCW now works.
1997-11-16 17:38:29 +00:00
|
|
|
if (peheader->OptionalHeader.MajorSubsystemVersion == 4)
|
|
|
|
/* FIXME: NT4 has the same majorversion; add a check here for it. */
|
|
|
|
return WIN95;
|
|
|
|
if (peheader->OptionalHeader.MajorSubsystemVersion == 3)
|
|
|
|
{
|
|
|
|
/* Win3.10 */
|
|
|
|
if (peheader->OptionalHeader.MinorSubsystemVersion <= 11) return WIN31;
|
|
|
|
/* NT 3.51 */
|
|
|
|
if (peheader->OptionalHeader.MinorSubsystemVersion == 51) return NT351;
|
|
|
|
}
|
|
|
|
fprintf(stderr,"VERSION_GetVersion: unknown subsystem version: %04x.%04x, please report.\n",
|
|
|
|
peheader->OptionalHeader.MajorSubsystemVersion,
|
|
|
|
peheader->OptionalHeader.MinorSubsystemVersion );
|
|
|
|
return defaultVersion;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* GetVersion16 (KERNEL.3)
|
|
|
|
*/
|
|
|
|
LONG WINAPI GetVersion16(void)
|
|
|
|
{
|
|
|
|
VERSION ver = VERSION_GetVersion();
|
|
|
|
return VersionData[ver].getVersion16;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* GetVersion32 (KERNEL32.427)
|
|
|
|
*/
|
|
|
|
LONG WINAPI GetVersion32(void)
|
|
|
|
{
|
|
|
|
VERSION ver = VERSION_GetVersion();
|
|
|
|
return VersionData[ver].getVersion32;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* GetVersionEx32A (KERNEL32.428)
|
|
|
|
*/
|
|
|
|
BOOL32 WINAPI GetVersionEx32A(OSVERSIONINFO32A *v)
|
|
|
|
{
|
|
|
|
VERSION ver = VERSION_GetVersion();
|
|
|
|
if (v->dwOSVersionInfoSize != sizeof(OSVERSIONINFO32A))
|
|
|
|
{
|
|
|
|
fprintf(stderr,"wrong OSVERSIONINFO size from app");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
v->dwMajorVersion = VersionData[ver].getVersionEx.dwMajorVersion;
|
|
|
|
v->dwMinorVersion = VersionData[ver].getVersionEx.dwMinorVersion;
|
|
|
|
v->dwBuildNumber = VersionData[ver].getVersionEx.dwBuildNumber;
|
|
|
|
v->dwPlatformId = VersionData[ver].getVersionEx.dwPlatformId;
|
|
|
|
strcpy( v->szCSDVersion, VersionData[ver].getVersionEx.szCSDVersion );
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* GetVersionEx32W (KERNEL32.429)
|
|
|
|
*/
|
|
|
|
BOOL32 WINAPI GetVersionEx32W(OSVERSIONINFO32W *v)
|
|
|
|
{
|
|
|
|
VERSION ver = VERSION_GetVersion();
|
|
|
|
if (v->dwOSVersionInfoSize!=sizeof(OSVERSIONINFO32W))
|
|
|
|
{
|
|
|
|
fprintf(stderr,"wrong OSVERSIONINFO size from app");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
v->dwMajorVersion = VersionData[ver].getVersionEx.dwMajorVersion;
|
|
|
|
v->dwMinorVersion = VersionData[ver].getVersionEx.dwMinorVersion;
|
|
|
|
v->dwBuildNumber = VersionData[ver].getVersionEx.dwBuildNumber;
|
|
|
|
v->dwPlatformId = VersionData[ver].getVersionEx.dwPlatformId;
|
|
|
|
lstrcpyAtoW( v->szCSDVersion, VersionData[ver].getVersionEx.szCSDVersion );
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* GetWinFlags (KERNEL.132)
|
|
|
|
*/
|
|
|
|
DWORD WINAPI GetWinFlags(void)
|
|
|
|
{
|
|
|
|
static const long cpuflags[5] =
|
|
|
|
{ WF_CPU086, WF_CPU186, WF_CPU286, WF_CPU386, WF_CPU486 };
|
|
|
|
SYSTEM_INFO si;
|
|
|
|
OSVERSIONINFO32A ovi;
|
|
|
|
DWORD result;
|
|
|
|
|
|
|
|
GetSystemInfo(&si);
|
|
|
|
|
|
|
|
/* There doesn't seem to be any Pentium flag. */
|
|
|
|
result = cpuflags[MIN (si.wProcessorLevel, 4)];
|
|
|
|
|
|
|
|
switch(Options.mode)
|
|
|
|
{
|
|
|
|
case MODE_STANDARD:
|
|
|
|
result |= WF_STANDARD | WF_PMODE | WF_80x87;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case MODE_ENHANCED:
|
|
|
|
result |= WF_ENHANCED | WF_PMODE | WF_80x87 | WF_PAGING;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
fprintf(stderr, "Unknown mode set? This shouldn't happen. Check GetWinFlags()!\n");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (si.wProcessorLevel >= 4) result |= WF_HASCPUID;
|
|
|
|
ovi.dwOSVersionInfoSize = sizeof(ovi);
|
|
|
|
GetVersionEx32A(&ovi);
|
|
|
|
if (ovi.dwPlatformId == VER_PLATFORM_WIN32_NT)
|
|
|
|
result |= WF_WIN32WOW; /* undocumented WF_WINNT */
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* GetWinDebugInfo (KERNEL.355)
|
|
|
|
*/
|
|
|
|
BOOL16 WINAPI GetWinDebugInfo(WINDEBUGINFO *lpwdi, UINT16 flags)
|
|
|
|
{
|
|
|
|
printf("GetWinDebugInfo(%8lx,%d) stub returning 0\n",
|
|
|
|
(unsigned long)lpwdi, flags);
|
|
|
|
/* 0 means not in debugging mode/version */
|
|
|
|
/* Can this type of debugging be used in wine ? */
|
|
|
|
/* Constants: WDI_OPTIONS WDI_FILTER WDI_ALLOCBREAK */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* SetWinDebugInfo (KERNEL.356)
|
|
|
|
*/
|
|
|
|
BOOL16 WINAPI SetWinDebugInfo(WINDEBUGINFO *lpwdi)
|
|
|
|
{
|
|
|
|
printf("SetWinDebugInfo(%8lx) stub returning 0\n", (unsigned long)lpwdi);
|
|
|
|
/* 0 means not in debugging mode/version */
|
|
|
|
/* Can this type of debugging be used in wine ? */
|
|
|
|
/* Constants: WDI_OPTIONS WDI_FILTER WDI_ALLOCBREAK */
|
|
|
|
return 0;
|
|
|
|
}
|
Release 980201
Sun Feb 1 13:24:54 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [files/drive.c]
Added Device= parameter to drive configuration.
* [if1632/relay.c]
Throw() and Catch() now use the correct CATCHBUF layout (untested).
* [tools/build.c] [include/stackframe.h] [loader/task.c]
Moved 16-bit stack pointer into thread database.
Save current %fs while running 16-bit code.
Fri Jan 30 09:25:49 1998 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [graphics/mapping.c]
Made DPtoLP32 and LPtoDP32 respect world transforms.
* [graphics/path.c] [graphics/painting.c] [if1632/gdi.spec]
[include/path.h]
More path support.
* [include/gdi.h] [include/windows.h] [objects/dc.c]
[relay/gdi32.spec]
Support for Get/SetArcDirection and Get/SetWorldTransform
* [windows/hook.c]
Fixed a bug in HOOK_Map16To32Common.
Thu Jan 29 23:43:18 1998 Douglas Ridgway <ridgway@taiga.gmcl.com>
* [graphics/metafiledrv/init.c] [objects/metafile.c]
Documentation for metafile related API calls. Fixed a bug to avoid
documenting it.
* [include/windows.h]
Declaration for LoadImage.
Thu Jan 29 21:44:45 1998 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/win16drv/*]
Changes to printing code to enable use of printer fonts with the
win3.1 postscript driver. Remember to add printer=on to [wine]
section of wine.conf . You will also need to disable truetype
fonts from control panel. Winword 6.0 and Write seem to be happy
with this...
* [include/bitmap.h]
Fix Widthbytes for 15bpp displays.
Tue Jan 27 20:54:08 1998 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [tsx11/*] [include/ts*] [tools/make_X11wrappers]
Implemented thread-safe X11 wrappers.
Tue Jan 27 13:54:09 1998 Constantine Sapuntzakis <csapuntz@tma-1.lcs.mit.edu>
* [windows/queue.c]
Forgot to convert thdb to thread_id.
* [misc/registry.c]
Sped up Windows 95 registry reading. Changed code to traverse
registry as a tree rather than read in all possible keys
(including dead ones).
Tue Jan 27 12:46:09 1998 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [loader/pe_image.c][Makefile.in][scheduler/thread.c]
[libtest/hello5.c]
Don't exit() on failed to load referenced dlls.
Fixed static tls allocation for multiple threads.
WINELIB should now be able to load PE dlls. A sample
winelib program, that dynamically loads a internal dll
is included.
* [graphics/ddraw.c][include/ddraw.h][include/d3d.h]
Cleaned up and enhanced further. Added several DirectX5
interface definitions and DirectSurface3 implementation.
Stubs for D3D (NOT coming soon, just there so it fails safely).
* [multimedia/dsound.c][include/dsound.h]
Actually works now for a lot of cases. Some DirectX5 stuff
added. Still lacking several features.
* [windows/dinput.c][include/dinput.h]
Started implementing DirectInput. Doesn't work yet, don't
know why.
* [if1632/thunk.c][misc/callbacks.c]
[win32/kernel.c][include/callbacks.h]
Added WOWCallback16Ex, WOWHandle32.
* [misc/cpu.c]
Fixed GetSystemInfo, IsProcessorFeaturePresent.
* [multimedia/joystick.c][multimedia/time.c]
Several fixes. Small hack to get timerevents in timeGetTime() loops.
Tue Jan 20 11:26:27 1998 Slaven Rezic <eserte@cs.tu-berlin.de>
* [configure.in]
Fixed check for union semun on FreeBSD systems.
Sun Jan 18 23:05:04 1998 Karl Backström <karl_b@geocities.com>
* [misc/ole2nls.c] [programs/progman/Sw.rc] [programs/winhelp/Sw.rc]
[resources/sysres_Sw.rc]
Added/updated Swedish language support.
Sun Jan 18 18:49:01 1998 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [misc/winsock.c] [misc/winsock_dns.c] [windows/event.c]
[windows/win.c] [windows/dce.c] [windows/winpos.c]
Bug fixes.
Sun Jan 18 12:45:23 1997 Andreas Mohr <100.30936@germany.net>
* [msdos/int25.c] [msdos/int26.c]
Implemented "native" absolute disk read/write access.
* [msdos/int13.c] [msdos/ioports.c]
Enhanced GET DRIVE PARAMETERS (int13 AH=08).
* [graphics/win16drv/prtdrv.c] [if1632/gdi.spec]
Fixed typos, implemented dmEnumDFonts,
Started implementation of dmRealizeObject.
* [if1632/compobj.spec] [ole/compobj.c] [relay32/ole32.spec]
Stubs CoCreateInstance, CoFreeUnusedLibraries, implemented
CoFileTimeNow.
* [if1632/kernel.spec] [include/windows.h] [memory/global.c]
[memory/string.c] [misc/kernel.c] [misc/Makefile.in]
[misc/toolhelp.c] [msdos/int21.c]
Implemented GlobalHandleNoRIP, GetFreeMemInfo, DebugFillBuffer,
stubs GetSetKernelDOSProc, DiagQuery, DiagOutput, ToolHelpHook
(Undocumented Windows).
* [if1632/user.spec] [if1632/win32s16.spec] [misc/win32s16.c]
Misc stubs.
* [if1632/winaspi.spec] [misc/aspi.c]
Implemented GetASPIDLLVersion.
* [if1632/wprocs.spec] [msdos/int20.c] [msdos/Makefile.in]
Added handler for Int 0x20 (terminate program, _very_ old-fashioned).
* [misc/w32scomb.c]
Implemented Get16DLLAddress() partially
(big thanks to Marcus and Alexandre).
* [relay32/Makefile.in] [relay32/builtin32.c] [relay32/dplay.spec]
Added built-in DPLAY.DLL.
* [relay32/winmm.spec] [multimedia/joystick.c]
Added joySetThreshold.
* [misc/windebug.c]
Added WinNotify.
* [win32/console.c]
Stubs CreateConsoleScreenBuffer, SetConsoleActiveScreenBuffer,
WriteConsoleOutput32A.
* [windows/user.c]
Stub SetEventHook.
Sat Jan 17 19:30:35 1998 Matthew Toseland <Paul.Toseland@btinternet.com>
* [windows/painting.c]
Fixed broken restore-to-maximized.
Mon Jan 12 21:25:32 1998 Perceval - Marc Huguet Puig <mhp@tinet.fut.es>
* [documentation/wine.man] [include/options.h]
[misc/main.c] [ole/ole2nls.c] [resources/sysres.c]
[resources/sysres_Ca.rc] [resources/Makefile.in]
Added language catalan. (Afegit l'idioma català).
1998-02-01 18:33:27 +00:00
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* DebugFillBuffer (KERNEL.329)
|
|
|
|
*
|
|
|
|
* TODO:
|
|
|
|
* Should fill lpBuffer only if DBO_BUFFERFILL has been set by SetWinDebugInfo()
|
|
|
|
*/
|
|
|
|
void WINAPI DebugFillBuffer(LPSTR lpBuffer, WORD wBytes)
|
|
|
|
{
|
|
|
|
memset(lpBuffer, DBGFILL_BUFFER, wBytes);
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* DiagQuery (KERNEL.339)
|
|
|
|
*
|
|
|
|
* returns TRUE if Win called with "/b" (bootlog.txt)
|
|
|
|
*/
|
|
|
|
BOOL16 WINAPI DiagQuery()
|
|
|
|
{
|
|
|
|
/* perhaps implement a Wine "/b" command line flag sometime ? */
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* DiagOutput (KERNEL.340)
|
|
|
|
*
|
|
|
|
* writes a debug string into <windir>\bootlog.txt
|
|
|
|
*/
|
|
|
|
void WINAPI DiagOutput()
|
|
|
|
{
|
|
|
|
}
|