Skip to content
Snippets Groups Projects
Commit 6c8147b1 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files

Allow the implementation of the VxDCall entry points to be moved to

separate VxD dlls.
Moved VMM code to a separate dll, and removed the registry calls to
get rid of the code duplication with advapi32.
parent feaad968
No related branches found
No related tags found
No related merge requests found
...@@ -19116,7 +19116,7 @@ MAKE_LIB_RULES=libs/Makelib.rules ...@@ -19116,7 +19116,7 @@ MAKE_LIB_RULES=libs/Makelib.rules
MAKE_PROG_RULES=programs/Makeprog.rules MAKE_PROG_RULES=programs/Makeprog.rules
   
   
ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Maketest.rules libs/Makelib.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/capi2032/Makefile dlls/cfgmgr32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/ctl3d/Makefile dlls/d3d8/Makefile dlls/d3d9/Makefile dlls/d3dim/Makefile dlls/d3dx8/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/dswave/Makefile dlls/dxguid/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/glut32/Makefile dlls/iccvid/Makefile dlls/icmp/Makefile dlls/ifsmgr.vxd/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/iphlpapi/Makefile dlls/iphlpapi/tests/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lzexpand/Makefile dlls/mapi32/Makefile dlls/mmdevldr.vxd/Makefile dlls/monodebg.vxd/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/winemp3/Makefile dlls/msdmo/Makefile dlls/mshtml/Makefile dlls/msi/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrt40/Makefile dlls/msvcrtd/Makefile dlls/msvidc32/Makefile dlls/msvideo/Makefile dlls/msvideo/msrle32/Makefile dlls/mswsock/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/odbc32/Makefile dlls/ole32/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/psapi/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/rasapi32/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/rsabase/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/sti/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/uuid/Makefile dlls/uxtheme/Makefile dlls/vdhcp.vxd/Makefile dlls/version/Makefile dlls/vnb.vxd/Makefile dlls/vnetbios.vxd/Makefile dlls/vtdapi.vxd/Makefile dlls/vwin32.vxd/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/wined3d/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/midimap/Makefile dlls/winmm/tests/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winejack/Makefile dlls/winmm/winenas/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/winspool/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/unicode/Makefile libs/wine/Makefile libs/wpp/Makefile loader/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/notepad/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineboot/Makefile programs/winebrowser/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/winegcc/Makefile tools/wmc/Makefile tools/wrc/Makefile" ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Maketest.rules libs/Makelib.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/capi2032/Makefile dlls/cfgmgr32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/ctl3d/Makefile dlls/d3d8/Makefile dlls/d3d9/Makefile dlls/d3dim/Makefile dlls/d3dx8/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/dswave/Makefile dlls/dxguid/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/glut32/Makefile dlls/iccvid/Makefile dlls/icmp/Makefile dlls/ifsmgr.vxd/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/iphlpapi/Makefile dlls/iphlpapi/tests/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lzexpand/Makefile dlls/mapi32/Makefile dlls/mmdevldr.vxd/Makefile dlls/monodebg.vxd/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/winemp3/Makefile dlls/msdmo/Makefile dlls/mshtml/Makefile dlls/msi/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrt40/Makefile dlls/msvcrtd/Makefile dlls/msvidc32/Makefile dlls/msvideo/Makefile dlls/msvideo/msrle32/Makefile dlls/mswsock/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/odbc32/Makefile dlls/ole32/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/psapi/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/rasapi32/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/rsabase/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/sti/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/uuid/Makefile dlls/uxtheme/Makefile dlls/vdhcp.vxd/Makefile dlls/version/Makefile dlls/vmm.vxd/Makefile dlls/vnb.vxd/Makefile dlls/vnetbios.vxd/Makefile dlls/vtdapi.vxd/Makefile dlls/vwin32.vxd/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/wined3d/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/midimap/Makefile dlls/winmm/tests/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winejack/Makefile dlls/winmm/winenas/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/winspool/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/unicode/Makefile libs/wine/Makefile libs/wpp/Makefile loader/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/notepad/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineboot/Makefile programs/winebrowser/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/winegcc/Makefile tools/wmc/Makefile tools/wrc/Makefile"
   
   
cat >confcache <<\_ACEOF cat >confcache <<\_ACEOF
...@@ -19778,6 +19778,7 @@ do ...@@ -19778,6 +19778,7 @@ do
"dlls/uxtheme/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/uxtheme/Makefile" ;; "dlls/uxtheme/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/uxtheme/Makefile" ;;
"dlls/vdhcp.vxd/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/vdhcp.vxd/Makefile" ;; "dlls/vdhcp.vxd/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/vdhcp.vxd/Makefile" ;;
"dlls/version/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/version/Makefile" ;; "dlls/version/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/version/Makefile" ;;
"dlls/vmm.vxd/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/vmm.vxd/Makefile" ;;
"dlls/vnb.vxd/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/vnb.vxd/Makefile" ;; "dlls/vnb.vxd/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/vnb.vxd/Makefile" ;;
"dlls/vnetbios.vxd/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/vnetbios.vxd/Makefile" ;; "dlls/vnetbios.vxd/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/vnetbios.vxd/Makefile" ;;
"dlls/vtdapi.vxd/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/vtdapi.vxd/Makefile" ;; "dlls/vtdapi.vxd/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/vtdapi.vxd/Makefile" ;;
......
...@@ -1591,6 +1591,7 @@ dlls/uuid/Makefile ...@@ -1591,6 +1591,7 @@ dlls/uuid/Makefile
dlls/uxtheme/Makefile dlls/uxtheme/Makefile
dlls/vdhcp.vxd/Makefile dlls/vdhcp.vxd/Makefile
dlls/version/Makefile dlls/version/Makefile
dlls/vmm.vxd/Makefile
dlls/vnb.vxd/Makefile dlls/vnb.vxd/Makefile
dlls/vnetbios.vxd/Makefile dlls/vnetbios.vxd/Makefile
dlls/vtdapi.vxd/Makefile dlls/vtdapi.vxd/Makefile
......
...@@ -115,6 +115,7 @@ BASEDIRS = \ ...@@ -115,6 +115,7 @@ BASEDIRS = \
uxtheme \ uxtheme \
vdhcp.vxd \ vdhcp.vxd \
version \ version \
vmm.vxd \
vnb.vxd \ vnb.vxd \
vnetbios.vxd \ vnetbios.vxd \
vtdapi.vxd \ vtdapi.vxd \
...@@ -330,6 +331,7 @@ SYMLINKS = \ ...@@ -330,6 +331,7 @@ SYMLINKS = \
uxtheme.dll$(DLLEXT) \ uxtheme.dll$(DLLEXT) \
vdhcp.vxd$(DLLEXT) \ vdhcp.vxd$(DLLEXT) \
version.dll$(DLLEXT) \ version.dll$(DLLEXT) \
vmm.vxd$(DLLEXT) \
vnb.vxd$(DLLEXT) \ vnb.vxd$(DLLEXT) \
vnetbios.vxd$(DLLEXT) \ vnetbios.vxd$(DLLEXT) \
vtdapi.vxd$(DLLEXT) \ vtdapi.vxd$(DLLEXT) \
...@@ -759,6 +761,9 @@ version.dll$(DLLEXT): version/version.dll$(DLLEXT) ...@@ -759,6 +761,9 @@ version.dll$(DLLEXT): version/version.dll$(DLLEXT)
ver.dll$(DLLEXT) : version.dll$(DLLEXT) ver.dll$(DLLEXT) : version.dll$(DLLEXT)
$(RM) $@ && $(LN_S) version.dll$(DLLEXT) $@ $(RM) $@ && $(LN_S) version.dll$(DLLEXT) $@
vmm.vxd$(DLLEXT): vmm.vxd/vmm.vxd$(DLLEXT)
$(RM) $@ && $(LN_S) vmm.vxd/vmm.vxd$(DLLEXT) $@
vnb.vxd$(DLLEXT): vnb.vxd/vnb.vxd$(DLLEXT) vnb.vxd$(DLLEXT): vnb.vxd/vnb.vxd$(DLLEXT)
$(RM) $@ && $(LN_S) vnb.vxd/vnb.vxd$(DLLEXT) $@ $(RM) $@ && $(LN_S) vnb.vxd/vnb.vxd$(DLLEXT) $@
...@@ -1780,6 +1785,7 @@ user/user32.dll$(DLLEXT): user ...@@ -1780,6 +1785,7 @@ user/user32.dll$(DLLEXT): user
uxtheme/uxtheme.dll$(DLLEXT): uxtheme uxtheme/uxtheme.dll$(DLLEXT): uxtheme
vdhcp.vxd/vdhcp.vxd$(DLLEXT): vdhcp.vxd vdhcp.vxd/vdhcp.vxd$(DLLEXT): vdhcp.vxd
version/version.dll$(DLLEXT): version version/version.dll$(DLLEXT): version
vmm.vxd/vmm.vxd$(DLLEXT): vmm.vxd
vnb.vxd/vnb.vxd$(DLLEXT): vnb.vxd vnb.vxd/vnb.vxd$(DLLEXT): vnb.vxd
vnetbios.vxd/vnetbios.vxd$(DLLEXT): vnetbios.vxd vnetbios.vxd/vnetbios.vxd$(DLLEXT): vnetbios.vxd
vtdapi.vxd/vtdapi.vxd$(DLLEXT): vtdapi.vxd vtdapi.vxd/vtdapi.vxd$(DLLEXT): vtdapi.vxd
......
This diff is collapsed.
Makefile
vmm.vxd.dbg.c
vmm.vxd.spec.c
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = vmm.vxd
IMPORTS = kernel32 ntdll
C_SRCS = \
vmm.c
@MAKE_DLL_RULES@
### Dependencies:
/*
* VMM VxD implementation
*
* Copyright 1998 Marcus Meissner
* Copyright 1998 Ulrich Weigand
* Copyright 1998 Patrik Stridvall
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "config.h"
#include "wine/port.h"
#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
#include "winreg.h"
#include "winnls.h"
#include "ntstatus.h"
#include "winternl.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(vxd);
/*
* VMM VxDCall service names are (mostly) taken from Stan Mitchell's
* "Inside the Windows 95 File System"
*/
#define N_VMM_SERVICE 41
static const char * const VMM_Service_Name[N_VMM_SERVICE] =
{
"PageReserve", /* 0x0000 */
"PageCommit", /* 0x0001 */
"PageDecommit", /* 0x0002 */
"PagerRegister", /* 0x0003 */
"PagerQuery", /* 0x0004 */
"HeapAllocate", /* 0x0005 */
"ContextCreate", /* 0x0006 */
"ContextDestroy", /* 0x0007 */
"PageAttach", /* 0x0008 */
"PageFlush", /* 0x0009 */
"PageFree", /* 0x000A */
"ContextSwitch", /* 0x000B */
"HeapReAllocate", /* 0x000C */
"PageModifyPermissions", /* 0x000D */
"PageQuery", /* 0x000E */
"GetCurrentContext", /* 0x000F */
"HeapFree", /* 0x0010 */
"RegOpenKey", /* 0x0011 */
"RegCreateKey", /* 0x0012 */
"RegCloseKey", /* 0x0013 */
"RegDeleteKey", /* 0x0014 */
"RegSetValue", /* 0x0015 */
"RegDeleteValue", /* 0x0016 */
"RegQueryValue", /* 0x0017 */
"RegEnumKey", /* 0x0018 */
"RegEnumValue", /* 0x0019 */
"RegQueryValueEx", /* 0x001A */
"RegSetValueEx", /* 0x001B */
"RegFlushKey", /* 0x001C */
"RegQueryInfoKey", /* 0x001D */
"GetDemandPageInfo", /* 0x001E */
"BlockOnID", /* 0x001F */
"SignalID", /* 0x0020 */
"RegLoadKey", /* 0x0021 */
"RegUnLoadKey", /* 0x0022 */
"RegSaveKey", /* 0x0023 */
"RegRemapPreDefKey", /* 0x0024 */
"PageChangePager", /* 0x0025 */
"RegQueryMultipleValues", /* 0x0026 */
"RegReplaceKey", /* 0x0027 */
"<KERNEL32.101>" /* 0x0028 -- What does this do??? */
};
/* PageReserve arena values */
#define PR_PRIVATE 0x80000400 /* anywhere in private arena */
#define PR_SHARED 0x80060000 /* anywhere in shared arena */
#define PR_SYSTEM 0x80080000 /* anywhere in system arena */
/* PageReserve flags */
#define PR_FIXED 0x00000008 /* don't move during PageReAllocate */
#define PR_4MEG 0x00000001 /* allocate on 4mb boundary */
#define PR_STATIC 0x00000010 /* see PageReserve documentation */
/* PageCommit default pager handle values */
#define PD_ZEROINIT 0x00000001 /* swappable zero-initialized pages */
#define PD_NOINIT 0x00000002 /* swappable uninitialized pages */
#define PD_FIXEDZERO 0x00000003 /* fixed zero-initialized pages */
#define PD_FIXED 0x00000004 /* fixed uninitialized pages */
/* PageCommit flags */
#define PC_FIXED 0x00000008 /* pages are permanently locked */
#define PC_LOCKED 0x00000080 /* pages are made present and locked */
#define PC_LOCKEDIFDP 0x00000100 /* pages are locked if swap via DOS */
#define PC_WRITEABLE 0x00020000 /* make the pages writeable */
#define PC_USER 0x00040000 /* make the pages ring 3 accessible */
#define PC_INCR 0x40000000 /* increment "pagerdata" each page */
#define PC_PRESENT 0x80000000 /* make pages initially present */
#define PC_STATIC 0x20000000 /* allow commit in PR_STATIC object */
#define PC_DIRTY 0x08000000 /* make pages initially dirty */
#define PC_CACHEDIS 0x00100000 /* Allocate uncached pages - new for WDM */
#define PC_CACHEWT 0x00080000 /* Allocate write through cache pages - new for WDM */
#define PC_PAGEFLUSH 0x00008000 /* Touch device mapped pages on alloc - new for WDM */
/* PageCommitContig additional flags */
#define PCC_ZEROINIT 0x00000001 /* zero-initialize new pages */
#define PCC_NOLIN 0x10000000 /* don't map to any linear address */
/* Pop a DWORD from the 32-bit stack */
static inline DWORD stack32_pop( CONTEXT86 *context )
{
DWORD ret = *(DWORD *)context->Esp;
context->Esp += sizeof(DWORD);
return ret;
}
/***********************************************************************
* VxDCall (VMM.VXD.@)
*/
DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT86 *context )
{
static int warned;
switch ( LOWORD(service) )
{
case 0x0000: /* PageReserve */
{
LPVOID address;
LPVOID ret;
DWORD psize = getpagesize();
ULONG page = (ULONG) stack32_pop( context );
ULONG npages = (ULONG) stack32_pop( context );
ULONG flags = (ULONG) stack32_pop( context );
TRACE("PageReserve: page: %08lx, npages: %08lx, flags: %08lx partial stub!\n",
page, npages, flags );
if ( page == PR_SYSTEM ) {
ERR("Can't reserve ring 1 memory\n");
return -1;
}
/* FIXME: This has to be handled separately for the separate
address-spaces we now have */
if ( page == PR_PRIVATE || page == PR_SHARED ) page = 0;
/* FIXME: Handle flags in some way */
address = (LPVOID )(page * psize);
ret = VirtualAlloc ( address, ( npages * psize ), MEM_RESERVE, 0 );
TRACE("PageReserve: returning: %08lx\n", (DWORD )ret );
if ( ret == NULL )
return -1;
else
return (DWORD )ret;
}
case 0x0001: /* PageCommit */
{
LPVOID address;
LPVOID ret;
DWORD virt_perm;
DWORD psize = getpagesize();
ULONG page = (ULONG) stack32_pop( context );
ULONG npages = (ULONG) stack32_pop( context );
ULONG hpd = (ULONG) stack32_pop( context );
ULONG pagerdata = (ULONG) stack32_pop( context );
ULONG flags = (ULONG) stack32_pop( context );
TRACE("PageCommit: page: %08lx, npages: %08lx, hpd: %08lx pagerdata: "
"%08lx, flags: %08lx partial stub\n",
page, npages, hpd, pagerdata, flags );
if ( flags & PC_USER )
if ( flags & PC_WRITEABLE )
virt_perm = PAGE_EXECUTE_READWRITE;
else
virt_perm = PAGE_EXECUTE_READ;
else
virt_perm = PAGE_NOACCESS;
address = (LPVOID )(page * psize);
ret = VirtualAlloc ( address, ( npages * psize ), MEM_COMMIT, virt_perm );
TRACE("PageCommit: Returning: %08lx\n", (DWORD )ret );
return (DWORD )ret;
}
case 0x0002: /* PageDecommit */
{
LPVOID address;
BOOL ret;
DWORD psize = getpagesize();
ULONG page = (ULONG) stack32_pop( context );
ULONG npages = (ULONG) stack32_pop( context );
ULONG flags = (ULONG) stack32_pop( context );
TRACE("PageDecommit: page: %08lx, npages: %08lx, flags: %08lx partial stub\n",
page, npages, flags );
address = (LPVOID )( page * psize );
ret = VirtualFree ( address, ( npages * psize ), MEM_DECOMMIT );
TRACE("PageDecommit: Returning: %s\n", ret ? "TRUE" : "FALSE" );
return ret;
}
case 0x000d: /* PageModifyPermissions */
{
DWORD pg_old_perm;
DWORD pg_new_perm;
DWORD virt_old_perm;
DWORD virt_new_perm;
MEMORY_BASIC_INFORMATION mbi;
LPVOID address;
DWORD psize = getpagesize();
ULONG page = stack32_pop ( context );
ULONG npages = stack32_pop ( context );
ULONG permand = stack32_pop ( context );
ULONG permor = stack32_pop ( context );
TRACE("PageModifyPermissions %08lx %08lx %08lx %08lx partial stub\n",
page, npages, permand, permor );
address = (LPVOID )( page * psize );
VirtualQuery ( address, &mbi, sizeof ( MEMORY_BASIC_INFORMATION ));
virt_old_perm = mbi.Protect;
switch ( virt_old_perm & mbi.Protect ) {
case PAGE_READONLY:
case PAGE_EXECUTE:
case PAGE_EXECUTE_READ:
pg_old_perm = PC_USER;
break;
case PAGE_READWRITE:
case PAGE_WRITECOPY:
case PAGE_EXECUTE_READWRITE:
case PAGE_EXECUTE_WRITECOPY:
pg_old_perm = PC_USER | PC_WRITEABLE;
break;
case PAGE_NOACCESS:
default:
pg_old_perm = 0;
break;
}
pg_new_perm = pg_old_perm;
pg_new_perm &= permand & ~PC_STATIC;
pg_new_perm |= permor & ~PC_STATIC;
virt_new_perm = ( virt_old_perm ) & ~0xff;
if ( pg_new_perm & PC_USER )
{
if ( pg_new_perm & PC_WRITEABLE )
virt_new_perm |= PAGE_EXECUTE_READWRITE;
else
virt_new_perm |= PAGE_EXECUTE_READ;
}
if ( ! VirtualProtect ( address, ( npages * psize ), virt_new_perm, &virt_old_perm ) ) {
ERR("Can't change page permissions for %08lx\n", (DWORD )address );
return 0xffffffff;
}
TRACE("Returning: %08lx\n", pg_old_perm );
return pg_old_perm;
}
case 0x000a: /* PageFree */
{
BOOL ret;
LPVOID hmem = (LPVOID) stack32_pop( context );
DWORD flags = (DWORD ) stack32_pop( context );
TRACE("PageFree: hmem: %08lx, flags: %08lx partial stub\n",
(DWORD )hmem, flags );
ret = VirtualFree ( hmem, 0, MEM_RELEASE );
TRACE("Returning: %d\n", ret );
return ret;
}
case 0x0011: /* RegOpenKey */
stack32_pop( context ); /* kkey */
stack32_pop( context ); /* lpszSubKey */
stack32_pop( context ); /* retkey */
/* return RegOpenKeyExA( hkey, lpszSubKey, 0, KEY_ALL_ACCESS, retkey ); */
if (!warned)
{
ERR( "Using the native Win95 advapi32.dll is no longer supported.\n" );
ERR( "Please configure advapi32 to builtin.\n" );
warned++;
}
return ERROR_CALL_NOT_IMPLEMENTED;
case 0x0012: /* RegCreateKey */
stack32_pop( context ); /* hkey */
stack32_pop( context ); /* lpszSubKey */
stack32_pop( context ); /* retkey */
/* return RegCreateKeyA( hkey, lpszSubKey, retkey ); */
if (!warned)
{
ERR( "Using the native Win95 advapi32.dll is no longer supported.\n" );
ERR( "Please configure advapi32 to builtin.\n" );
warned++;
}
return ERROR_CALL_NOT_IMPLEMENTED;
case 0x0013: /* RegCloseKey */
stack32_pop( context ); /* hkey */
/* return RegCloseKey( hkey ); */
return ERROR_CALL_NOT_IMPLEMENTED;
case 0x0014: /* RegDeleteKey */
stack32_pop( context ); /* hkey */
stack32_pop( context ); /* lpszSubKey */
/* return RegDeleteKeyA( hkey, lpszSubKey ); */
return ERROR_CALL_NOT_IMPLEMENTED;
case 0x0015: /* RegSetValue */
stack32_pop( context ); /* hkey */
stack32_pop( context ); /* lpszSubKey */
stack32_pop( context ); /* dwType */
stack32_pop( context ); /* lpszData */
stack32_pop( context ); /* cbData */
/* return RegSetValueA( hkey, lpszSubKey, dwType, lpszData, cbData ); */
return ERROR_CALL_NOT_IMPLEMENTED;
case 0x0016: /* RegDeleteValue */
stack32_pop( context ); /* hkey */
stack32_pop( context ); /* lpszValue */
/* return RegDeleteValueA( hkey, lpszValue ); */
return ERROR_CALL_NOT_IMPLEMENTED;
case 0x0017: /* RegQueryValue */
stack32_pop( context ); /* hkey */
stack32_pop( context ); /* lpszSubKey */
stack32_pop( context ); /* lpszData */
stack32_pop( context ); /* lpcbData */
/* return RegQueryValueA( hkey, lpszSubKey, lpszData, lpcbData ); */
return ERROR_CALL_NOT_IMPLEMENTED;
case 0x0018: /* RegEnumKey */
stack32_pop( context ); /* hkey */
stack32_pop( context ); /* iSubkey */
stack32_pop( context ); /* lpszName */
stack32_pop( context ); /* lpcchName */
/* return RegEnumKeyA( hkey, iSubkey, lpszName, lpcchName ); */
return ERROR_CALL_NOT_IMPLEMENTED;
case 0x0019: /* RegEnumValue */
stack32_pop( context ); /* hkey */
stack32_pop( context ); /* iValue */
stack32_pop( context ); /* lpszValue */
stack32_pop( context ); /* lpcchValue */
stack32_pop( context ); /* lpReserved */
stack32_pop( context ); /* lpdwType */
stack32_pop( context ); /* lpbData */
stack32_pop( context ); /* lpcbData */
/* return RegEnumValueA( hkey, iValue, lpszValue, lpcchValue, lpReserved, lpdwType, lpbData, lpcbData ); */
return ERROR_CALL_NOT_IMPLEMENTED;
case 0x001A: /* RegQueryValueEx */
stack32_pop( context ); /* hkey */
stack32_pop( context ); /* lpszValue */
stack32_pop( context ); /* lpReserved */
stack32_pop( context ); /* lpdwType */
stack32_pop( context ); /* lpbData */
stack32_pop( context ); /* lpcbData */
/* return RegQueryValueExA( hkey, lpszValue, lpReserved, lpdwType, lpbData, lpcbData ); */
return ERROR_CALL_NOT_IMPLEMENTED;
case 0x001B: /* RegSetValueEx */
stack32_pop( context ); /* hkey */
stack32_pop( context ); /* lpszValue */
stack32_pop( context ); /* dwReserved */
stack32_pop( context ); /* dwType */
stack32_pop( context ); /* lpbData */
stack32_pop( context ); /* cbData */
/* return RegSetValueExA( hkey, lpszValue, dwReserved, dwType, lpbData, cbData ); */
return ERROR_CALL_NOT_IMPLEMENTED;
case 0x001C: /* RegFlushKey */
stack32_pop( context ); /* hkey */
/* return RegFlushKey( hkey ); */
return ERROR_CALL_NOT_IMPLEMENTED;
case 0x001D: /* RegQueryInfoKey */
/* NOTE: This VxDCall takes only a subset of the parameters that the
corresponding Win32 API call does. The implementation in Win95
ADVAPI32 sets all output parameters not mentioned here to zero. */
stack32_pop( context ); /* hkey */
stack32_pop( context ); /* lpcSubKeys */
stack32_pop( context ); /* lpcchMaxSubKey */
stack32_pop( context ); /* lpcValues */
stack32_pop( context ); /* lpcchMaxValueName */
stack32_pop( context ); /* lpcchMaxValueData */
/* return RegQueryInfoKeyA( hkey, lpcSubKeys, lpcchMaxSubKey, lpcValues, lpcchMaxValueName, lpcchMaxValueData ); */
return ERROR_CALL_NOT_IMPLEMENTED;
case 0x001e: /* GetDemandPageInfo */
{
DWORD dinfo = (DWORD)stack32_pop( context );
DWORD flags = (DWORD)stack32_pop( context );
/* GetDemandPageInfo is supposed to fill out the struct at
* "dinfo" with various low-level memory management information.
* Apps are certainly not supposed to call this, although it's
* demoed and documented by Pietrek on pages 441-443 of "Windows
* 95 System Programming Secrets" if any program needs a real
* implementation of this.
*/
FIXME("GetDemandPageInfo(%08lx %08lx): stub!\n", dinfo, flags);
return 0;
}
case 0x0021: /* RegLoadKey */
{
HKEY hkey = (HKEY) stack32_pop( context );
LPCSTR lpszSubKey = (LPCSTR)stack32_pop( context );
LPCSTR lpszFile = (LPCSTR)stack32_pop( context );
FIXME("RegLoadKey(%p,%s,%s): stub\n",hkey, debugstr_a(lpszSubKey), debugstr_a(lpszFile));
return ERROR_CALL_NOT_IMPLEMENTED;
}
case 0x0022: /* RegUnLoadKey */
{
HKEY hkey = (HKEY) stack32_pop( context );
LPCSTR lpszSubKey = (LPCSTR)stack32_pop( context );
FIXME("RegUnLoadKey(%p,%s): stub\n",hkey, debugstr_a(lpszSubKey));
return ERROR_CALL_NOT_IMPLEMENTED;
}
case 0x0023: /* RegSaveKey */
{
HKEY hkey = (HKEY) stack32_pop( context );
LPCSTR lpszFile = (LPCSTR)stack32_pop( context );
LPSECURITY_ATTRIBUTES sa = (LPSECURITY_ATTRIBUTES)stack32_pop( context );
FIXME("RegSaveKey(%p,%s,%p): stub\n",hkey, debugstr_a(lpszFile),sa);
return ERROR_CALL_NOT_IMPLEMENTED;
}
#if 0 /* Functions are not yet implemented in misc/registry.c */
case 0x0024: /* RegRemapPreDefKey */
case 0x0026: /* RegQueryMultipleValues */
#endif
case 0x0027: /* RegReplaceKey */
{
HKEY hkey = (HKEY) stack32_pop( context );
LPCSTR lpszSubKey = (LPCSTR)stack32_pop( context );
LPCSTR lpszNewFile= (LPCSTR)stack32_pop( context );
LPCSTR lpszOldFile= (LPCSTR)stack32_pop( context );
FIXME("RegReplaceKey(%p,%s,%s,%s): stub\n", hkey, debugstr_a(lpszSubKey),
debugstr_a(lpszNewFile),debugstr_a(lpszOldFile));
return ERROR_CALL_NOT_IMPLEMENTED;
}
default:
if (LOWORD(service) < N_VMM_SERVICE)
FIXME( "Unimplemented service %s (%08lx)\n",
VMM_Service_Name[LOWORD(service)], service);
else
FIXME( "Unknown service %08lx\n", service);
return 0xffffffff; /* FIXME */
}
}
@ stdcall VxDCall(long ptr) VMM_VxDCall
...@@ -31,6 +31,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(vxd); ...@@ -31,6 +31,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(vxd);
extern void WINAPI CallBuiltinHandler( CONTEXT86 *context, BYTE intnum ); /* from winedos */ extern void WINAPI CallBuiltinHandler( CONTEXT86 *context, BYTE intnum ); /* from winedos */
/* Pop a DWORD from the 32-bit stack */
static inline DWORD stack32_pop( CONTEXT86 *context )
{
DWORD ret = *(DWORD *)context->Esp;
context->Esp += sizeof(DWORD);
return ret;
}
static void DIOCRegs_2_CONTEXT( DIOC_REGISTERS *pIn, CONTEXT86 *pCxt ) static void DIOCRegs_2_CONTEXT( DIOC_REGISTERS *pIn, CONTEXT86 *pCxt )
{ {
...@@ -150,3 +157,55 @@ BOOL WINAPI VWIN32_DeviceIoControl(DWORD dwIoControlCode, ...@@ -150,3 +157,55 @@ BOOL WINAPI VWIN32_DeviceIoControl(DWORD dwIoControlCode,
return FALSE; return FALSE;
} }
} }
/***********************************************************************
* VxDCall (VWIN32.VXD.@)
*
* Service numbers taken from page 448 of Pietrek's "Windows 95 System
* Programming Secrets". Parameters from experimentation on real Win98.
*
*/
DWORD WINAPI VWIN32_VxDCall( DWORD service, CONTEXT86 *context )
{
switch ( LOWORD(service) )
{
case 0x0000: /* GetVersion */
{
DWORD vers = GetVersion();
return (LOBYTE(vers) << 8) | HIBYTE(vers);
}
case 0x0020: /* Get VMCPD Version */
{
DWORD parm = stack32_pop(context);
FIXME("Get VMCPD Version(%08lx): partial stub!\n", parm);
/* FIXME: This is what Win98 returns, it may
* not be correct in all situations.
* It makes Bleem! happy though.
*/
return 0x0405;
}
case 0x0029: /* Int31/DPMI dispatch */
{
DWORD callnum = stack32_pop(context);
DWORD parm = stack32_pop(context);
TRACE("Int31/DPMI dispatch(%08lx)\n", callnum);
context->Eax = callnum;
context->Ecx = parm;
CallBuiltinHandler( context, 0x31 );
return LOWORD(context->Eax);
}
case 0x002a: /* Int41 dispatch - parm = int41 service number */
{
DWORD callnum = stack32_pop(context);
return callnum; /* FIXME: should really call INT_Int41Handler() */
}
default:
FIXME("Unknown service %08lx\n", service);
return 0xffffffff;
}
}
@ stdcall DeviceIoControl(long ptr long ptr long ptr ptr) VWIN32_DeviceIoControl @ stdcall DeviceIoControl(long ptr long ptr long ptr ptr) VWIN32_DeviceIoControl
@ stdcall VxDCall(long ptr) VWIN32_VxDCall
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment