
Sun Mar 1 10:45:23 1998 Andreas Mohr <100.30936@germany.net> * [loader/ne_image.c] Fixed problem with weird DLLs (NE_FFLAGS_SINGLEDATA && DGROUP = 0). * [msdos/dosmem.c] Export address for __0000H, too. * [msdos/dpmi.c] Changed MemAlloc functions to return less fragmented addresses. Sat Feb 28 18:50:12 1998 Alexandre Julliard <julliard@lrc.epfl.ch> * [scheduler/process.c] [scheduler/sysdeps.c] Don't use %fs register before threading initialization. Sat Feb 28 14:04:56 1998 Kristian Nielsen <kristian.nielsen@risoe.dk> * [configure.in] [include/acconfig.h] Autoconf macro to check for non-reentrant X libraries. * [windows/winpos.c] In SetWindowPos32(), do not cause WM_SIZE messages when the SWP_NOSIZE flag is specified. This fixes the division-by-zero in Borland C++ 4.0 "Open Project" menu item. Sat Feb 28 13:11:26 1998 James Moody <013263m@dragon.acadiau.ca> * [ole/ole2nls.c] Changed "English" values from German to English. * [files/dos_fs.c] Fixed off-by-one month bug. Fri Feb 27 22:12:01 1998 Douglas Ridgway <ridgway@winehq.com> * [windows/win.c] Fix winelib class menu loading bug. * [include/module.h] [loader/module.c] LoadModule32 should be implemented in terms of CreateProcess. * [programs/view/*] Metafile viewer sample program. * [documentation/wine.texinfo] [documentation/Makefile.in] Improvements and additions, HTML target. Fri Feb 27 04:27:48 1998 Dimitrie O. Paun <dimi@cs.toronto.edu> * [*/*] Switched to the new debug messages interface. For more information please refer to documentation/debug-msgs. Because the new scheme introduces a new semantic level, I had to manually do through about 530 dprintf_xxx! The rest of about 2400 where transformed via a script. Because of the large number of changes that I had to do, some may have not come out as nicely as I wanted them. If this is the case, please let me know. There is a lot of work left to do: -- a few hundred printf's to be converted -- about 2300 fprintf's to be converted -- about 600 FIXME's to be transformed The problem is that in the above mentioned cases, a lot of manual intervention is required because a lot of the information is missing. There are also a lot of other things to be done to the interface and so forth. I have now ideas for a at least a month worth of full time work :) I will proceed with many changes in the next few releases, so please do not start modifing things because there will be a hell of a lot of conflicts. If you have ideas that you want to integrate or you want to work on different things, please coordinate with me. Thu Feb 26 13:04:29 1998 David Lee Lambert <lamber45@egr.msu.edu> * [ole/ole2nls.c] [include/windows.h] First try at OLE date- and time-formatting functions. Wed Feb 25 11:20:35 1998 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de> * [files/*.c] Changed dos device handling, added 'CON' devicehandling. * [graphics/ddraw.c] Bug fixes, some additions. * [if1632/builtin.c][loader/module.c][library/winestub.c] Small hack so we don't need a dummy BUILTIN_LoadModule in winestub.c. * [ole/*][relay32/ole32.spec][if1632/storage.spec] storage.dll started. winword loads documents (saving doesn't work yet, dunno why). Several ole additions, some cleanups and bugfixes. IMalloc16 implemented. * [loader/pe_image.c] Added some comments, fixed circular dll references, fixed modref ordering, fixed tls allocation. * [memory/global.c] Added validity checks before every GET_ARENA_PTR. (several functions rely on Global* return values on invalid handles, like IsTask). Implemented GlobalUnlockFree16. * [memory/virtual.c] Replaced dprintf_virtual by fprintf, so we can do 'info map' again in the debugger. Increase read linesize for Linux2.1 cases. * [misc/cpu.c][misc/registry.c] Moved cpu registry initialization to misc/cpu.c. * [multimedia/dsound.c] Enhanced, replaced GETOSPACE bufferingcheck by SETFRAGMENT. * [relay32/crtdll.spec][relay32/ntdll.spec] Replaced some ptr by respective 'str' and 'wstr' arguments for libc functions. * [scheduler/thread.c] Added some sanity checks to stackallocation, tlshandling fixed. * [tools/build.c] Fixed cdecl argumenttype order (was reversed). * [win32/ordinals.c] Implemented KERNEL_449. * [windows/dinput.c] Some fixes, needs much more work. Tomb Raider2 works with keyboard ;) Tue Feb 24 20:46:37 1998 James Juran <jrj120@psu.edu> * [windows/win.c] Fixed USER32 ordinal numbers in documentation. Sat Feb 21 12:30:38 1998 John Richardson <jrichard@zko.dec.com> * [files/file.c] [include/k32obj.h] [memory/virtual.c] [scheduler/critsection.c] [scheduler/event.c] [scheduler/handle.c] [scheduler/k32obj.c] [scheduler/mutex.c] [scheduler/process.c] [scheduler/semaphore.c] [scheduler/thread.c] Added generic k32obj read and write routines for k32objs that support I/O. * [documentation/console] Updated console docs. * [win32/console.c] Make console work like a k32obj that supports I/O. * [include/windows.h] Make WriteFile and ReadFile take HANDLE32 for handle. Sun Feb 15 14:07:07 1998 Dimitrie O. Paun <dimi@mail.cs.toronto.edu> * [controls/menu.c] [misc/ver.c] [multimedia/dsound.c] [multimedia/joystick.c] [windows/dialog.c] Modified some dprintf_xxx's to prepare them for a new dprintf_ scheme. Basically, I changed the dprintf's that outputed a line with many dprintf calls to do just one dprintf call.
301 lines
8.2 KiB
C
301 lines
8.2 KiB
C
/*
|
|
* Windows version functions
|
|
*
|
|
* Copyright 1997 Alexandre Julliard
|
|
* Copyright 1997 Marcus Meissner
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <string.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;
|
|
if (!PROCESS_Current()->exe_modref)
|
|
{
|
|
/* HACK: if we have loaded a PE image into this address space,
|
|
* we are probably using thunks, so Win95 is our best bet
|
|
*/
|
|
if (PROCESS_Current()->modref_list) return WIN95;
|
|
return WIN31; /* FIXME: hmm, look at DDB.version ? */
|
|
}
|
|
peheader = PE_HEADER(PROCESS_Current()->exe_modref->module);
|
|
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;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* 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(LPCSTR str)
|
|
{
|
|
fprintf(stderr,"DIAGOUTPUT:%s\n",str);
|
|
}
|