[hbelusca] 66827: [CLT2015] Grab r66826, r66825, r66824, r66823, r66822, r66813, r66799 (WMI implementation), r66821, r66820 (NTVDM fixes), r66819, r66818 and other RAPPS fixes, plus r66807. And th...
19 Mar
2015
19 Mar
'15
11:51 p.m.
Author: hbelusca
Date: Thu Mar 19 23:51:20 2015
New Revision: 66827
URL: http://svn.reactos.org/svn/reactos?rev=66827&view=rev
Log:
[CLT2015]
Grab r66826, r66825, r66824, r66823, r66822, r66813, r66799 (WMI implementation), r66821,
r66820 (NTVDM fixes), r66819, r66818 and other RAPPS fixes, plus r66807. And the PSDK
fixes.
Added:
branches/ReactOS-0.3.17-CLT2015/reactos/drivers/input/i8042prt/dmi.h
- copied unchanged from r66826, trunk/reactos/drivers/input/i8042prt/dmi.h
branches/ReactOS-0.3.17-CLT2015/reactos/drivers/input/i8042prt/hwhacks.c
- copied unchanged from r66826, trunk/reactos/drivers/input/i8042prt/hwhacks.c
branches/ReactOS-0.3.17-CLT2015/reactos/include/ddk/wmiguid.h
- copied, changed from r66813, trunk/reactos/include/ddk/wmiguid.h
branches/ReactOS-0.3.17-CLT2015/reactos/include/reactos/wmiioctl.h
- copied unchanged from r66800, trunk/reactos/include/reactos/wmiioctl.h
branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/wmi/guidobj.c
- copied, changed from r66800, trunk/reactos/ntoskrnl/wmi/guidobj.c
branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/wmi/smbios.c
- copied unchanged from r66826, trunk/reactos/ntoskrnl/wmi/smbios.c
branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/wmi/wmidrv.c
- copied, changed from r66800, trunk/reactos/ntoskrnl/wmi/wmidrv.c
branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/wmi/wmip.h
- copied, changed from r66800, trunk/reactos/ntoskrnl/wmi/wmip.h
Modified:
branches/ReactOS-0.3.17-CLT2015/reactos/ (props changed)
branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/fr-FR.rc
branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/winmain.c
branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/iexplore.c
branches/ReactOS-0.3.17-CLT2015/reactos/drivers/input/i8042prt/CMakeLists.txt
branches/ReactOS-0.3.17-CLT2015/reactos/drivers/input/i8042prt/i8042prt.c
branches/ReactOS-0.3.17-CLT2015/reactos/drivers/input/i8042prt/i8042prt.h
branches/ReactOS-0.3.17-CLT2015/reactos/drivers/input/i8042prt/pnp.c
branches/ReactOS-0.3.17-CLT2015/reactos/include/ddk/nt_vdd.h
branches/ReactOS-0.3.17-CLT2015/reactos/include/ddk/vddsvc.h
branches/ReactOS-0.3.17-CLT2015/reactos/include/ddk/wdm.h
branches/ReactOS-0.3.17-CLT2015/reactos/include/psdk/bcrypt.h
branches/ReactOS-0.3.17-CLT2015/reactos/include/psdk/commctrl.h
branches/ReactOS-0.3.17-CLT2015/reactos/include/psdk/wmistr.h
branches/ReactOS-0.3.17-CLT2015/reactos/include/xdk/iofuncs.h
branches/ReactOS-0.3.17-CLT2015/reactos/lib/rtl/error.c
branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/include/internal/ps.h
branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/io/iomgr/iomgr.c
branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/ke/i386/exp.c
branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/ke/i386/traphdlr.c
branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/ke/i386/v86vdm.c
branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/ntos.cmake
branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/ps/i386/psldt.c
branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/wmi/wmi.c
branches/ReactOS-0.3.17-CLT2015/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt
branches/ReactOS-0.3.17-CLT2015/reactos/subsystems/mvdm/ntvdm/memory.c
Propchange: branches/ReactOS-0.3.17-CLT2015/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 19 23:51:20 2015
@@ -6,7 +6,7 @@
/branches/condrv_restructure:63104-65657
/branches/header-work:45691-47721
/branches/kd++:58883-58973
-/branches/kernel-fun/reactos:62304,62353,62531-62532,62853,64152,64173-64174,65253
+/branches/kernel-fun/reactos:62291,62294,62301-62302,62304,62321-62322,62353,62531-62532,62853,64152,64173-64174,65253
/branches/ntvdm:59241-63176
/branches/reactos-yarotows:45219-46371,46373-48025,48027-49273
/branches/reactx/reactos:49994-49995
@@ -20,4 +20,4 @@
/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
/branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567
/branches/wlan-bringup:54809-54998
-/trunk/reactos:66727-66770,66776-66779,66795,66810,66812,66814-66816
+/trunk/reactos:66727-66826
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
---
branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/fr-FR.rc [iso-8859-1]
(original)
+++
branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/fr-FR.rc [iso-8859-1]
Thu Mar 19 23:51:20 2015
@@ -10,8 +10,8 @@
END
POPUP "&Programmes"
BEGIN
- MENUITEM "&Installer\tCtrl+Enter", ID_INSTALL
- MENUITEM "&Désinstaller\tCtrl+Del", ID_UNINSTALL
+ MENUITEM "&Installer\tCtrl+Entrée", ID_INSTALL
+ MENUITEM "&Désinstaller\tCtrl+Suppr", ID_UNINSTALL
MENUITEM "&Modifier", ID_MODIFY
MENUITEM SEPARATOR
MENUITEM "&Supprimer du registre", ID_REGREMOVE
@@ -40,8 +40,8 @@
BEGIN
POPUP "popup"
BEGIN
- MENUITEM "&Installer\tCtrl+Enter", ID_INSTALL
- MENUITEM "&Désinstaller\tCtrl+Del", ID_UNINSTALL
+ MENUITEM "&Installer\tCtrl+Entrée", ID_INSTALL
+ MENUITEM "&Désinstaller\tCtrl+Suppr", ID_UNINSTALL
MENUITEM "&Modifier", ID_MODIFY
MENUITEM SEPARATOR
MENUITEM "&Supprimer du registre", ID_REGREMOVE
@@ -129,15 +129,15 @@
STRINGTABLE
BEGIN
- IDS_INFO_VERSION "\nVersion: "
- IDS_INFO_DESCRIPTION "\nDescription: "
+ IDS_INFO_VERSION "\nVersion : "
+ IDS_INFO_DESCRIPTION "\nDescription : "
IDS_INFO_PUBLISHER "\nAuteur : "
IDS_INFO_HELPLINK "\nLien d'aide : "
IDS_INFO_HELPPHONE "\nTéléphone d'aide : "
IDS_INFO_README "\nLisez-moi : "
IDS_INFO_REGOWNER "\nUtilisateur enregistré : "
IDS_INFO_PRODUCTID "\nID du produit : "
- IDS_INFO_CONTACT "\nContact: "
+ IDS_INFO_CONTACT "\nContact : "
IDS_INFO_UPDATEINFO "\nInformation de mise à jour : "
IDS_INFO_INFOABOUT "\nInformation à propos : "
IDS_INFO_COMMENTS "\nCommentaires : "
@@ -150,11 +150,11 @@
STRINGTABLE
BEGIN
- IDS_AINFO_VERSION "\nVersion: "
- IDS_AINFO_DESCRIPTION "\nDescription: "
+ IDS_AINFO_VERSION "\nVersion : "
+ IDS_AINFO_DESCRIPTION "\nDescription : "
IDS_AINFO_SIZE "\nTaille : "
IDS_AINFO_URLSITE "\nSite internet : "
- IDS_AINFO_LICENSE "\nLicense: "
+ IDS_AINFO_LICENSE "\nLicence : "
END
STRINGTABLE
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/winmain.c
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/winmain.c [iso-8859-1]
(original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/winmain.c [iso-8859-1]
Thu Mar 19 23:51:20 2015
@@ -196,6 +196,8 @@
HICON hIcon;
HIMAGELIST hImageListView;
+ SendMessage(hListView, WM_SETREDRAW, FALSE, 0);
+
(VOID) ListView_DeleteAllItems(hListView);
/* Create image list */
@@ -253,6 +255,8 @@
/* set automatic column width for program names if the list is not empty */
if (ListView_GetItemCount(hListView) > 0)
ListView_SetColumnWidth(hListView, 0, LVSCW_AUTOSIZE);
+
+ SendMessage(hListView, WM_SETREDRAW, TRUE, 0);
}
VOID
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/iexplore.c
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/iexplore.c [iso-8859-1]
(original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/iexplore.c [iso-8859-1] Thu
Mar 19 23:51:20 2015
@@ -385,7 +385,7 @@
#ifdef __REACTOS__
static void ie_dialog_properties(HWND hwnd)
{
- ShellExecute(hwnd, TEXT("open"), TEXT("rundll32.exe"),
TEXT("shell32.dll, Control_RunDLL inetcpl.cpl"), NULL, SW_SHOWNORMAL);
+ ShellExecuteW(hwnd, NULL, L"inetcpl.cpl", NULL, NULL, 0);
}
#endif
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/drivers/input/i8042prt/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
---
branches/ReactOS-0.3.17-CLT2015/reactos/drivers/input/i8042prt/CMakeLists.txt [iso-8859-1]
(original)
+++
branches/ReactOS-0.3.17-CLT2015/reactos/drivers/input/i8042prt/CMakeLists.txt [iso-8859-1]
Thu Mar 19 23:51:20 2015
@@ -1,6 +1,7 @@
list(APPEND SOURCE
createclose.c
+ hwhacks.c
i8042prt.c
keyboard.c
misc.c
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/drivers/input/i8042prt/i8042prt.c
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- branches/ReactOS-0.3.17-CLT2015/reactos/drivers/input/i8042prt/i8042prt.c [iso-8859-1]
(original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/drivers/input/i8042prt/i8042prt.c [iso-8859-1]
Thu Mar 19 23:51:20 2015
@@ -560,5 +560,7 @@
DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = i8042SystemControl;
DriverObject->MajorFunction[IRP_MJ_PNP] = i8042Pnp;
+ i8042InitializeHwHacks();
+
return STATUS_SUCCESS;
}
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/drivers/input/i8042prt/i8042prt.h
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- branches/ReactOS-0.3.17-CLT2015/reactos/drivers/input/i8042prt/i8042prt.h [iso-8859-1]
(original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/drivers/input/i8042prt/i8042prt.h [iso-8859-1]
Thu Mar 19 23:51:20 2015
@@ -441,4 +441,19 @@
IN PUNICODE_STRING RegistryPath,
OUT PI8042_SETTINGS Settings);
+/* hwhacks.c */
+
+VOID
+NTAPI
+i8042InitializeHwHacks(
+ VOID);
+
+enum _FLAGS
+{
+ FL_NOLOOP = 0x01,
+ FL_INITHACK = 0x02,
+};
+
+extern ULONG i8042HwFlags;
+
#endif /* _I8042PRT_PCH_ */
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/drivers/input/i8042prt/pnp.c
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- branches/ReactOS-0.3.17-CLT2015/reactos/drivers/input/i8042prt/pnp.c [iso-8859-1]
(original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/drivers/input/i8042prt/pnp.c [iso-8859-1] Thu
Mar 19 23:51:20 2015
@@ -481,10 +481,11 @@
Irql = KeAcquireInterruptSpinLock(DeviceExtension->HighestDIRQLInterrupt);
/* HACK: the mouse has already been reset in i8042DetectMouse. This second
reset prevents some touchpads/mice from working (Dell D531, D600).
- See CORE-6901*/
- #ifndef __I8042PRT_HACK_FOR_NOTEBOOK__
- i8042IsrWritePort(DeviceExtension, MOU_CMD_RESET, CTRL_WRITE_MOUSE);
- #endif
+ See CORE-6901 */
+ if (!(i8042HwFlags & FL_INITHACK))
+ {
+ i8042IsrWritePort(DeviceExtension, MOU_CMD_RESET, CTRL_WRITE_MOUSE);
+ }
KeReleaseInterruptSpinLock(DeviceExtension->HighestDIRQLInterrupt, Irql);
}
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/include/ddk/nt_vdd.h
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- branches/ReactOS-0.3.17-CLT2015/reactos/include/ddk/nt_vdd.h [iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/include/ddk/nt_vdd.h [iso-8859-1] Thu Mar 19
23:51:20 2015
@@ -191,25 +191,19 @@
PVOID FaultAddress,
ULONG RWMode);
-PBYTE
-WINAPI
-Sim32pGetVDMPointer(
- _In_ ULONG Address,
- _In_ BOOLEAN ProtectedMode);
-
-PBYTE
-WINAPI
-MGetVdmPointer(
- _In_ ULONG Address,
- _In_ ULONG Size,
- _In_ BOOLEAN ProtectedMode);
-
PVOID
WINAPI
VdmMapFlat(
_In_ USHORT Segment,
_In_ ULONG Offset,
_In_ VDM_MODE Mode);
+
+#ifdef _X86_
+
+#define VdmFlushCache(sel, off, len, mode) TRUE
+#define VdmUnmapFlat(sel, off, buf, mode) TRUE
+
+#else
BOOL
WINAPI
@@ -227,6 +221,8 @@
_In_ PVOID Buffer,
_In_ VDM_MODE Mode);
+#endif
+
BOOL
WINAPI
VDDInstallMemoryHook(
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/include/ddk/vddsvc.h
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- branches/ReactOS-0.3.17-CLT2015/reactos/include/ddk/vddsvc.h [iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/include/ddk/vddsvc.h [iso-8859-1] Thu Mar 19
23:51:20 2015
@@ -34,15 +34,71 @@
VOID
WINAPI
-call_ica_hw_interrupt
-(
- INT ms,
- BYTE line,
- INT count
-);
-
-#define VDDSimulateInterrupt(ms, line, count) \
+call_ica_hw_interrupt(
+ _In_ INT ms,
+ _In_ BYTE line,
+ _In_ INT count);
+
+#define VDDSimulateInterrupt(ms, line, count) \
call_ica_hw_interrupt((ms), (line), (count)) // Windows specifies a count of 1 ...
+
+
+/*
+ * Memory services
+ */
+
+#ifdef i386
+
+PBYTE
+WINAPI
+MGetVdmPointer(
+ _In_ ULONG Address,
+ _In_ ULONG Size,
+ _In_ BOOLEAN ProtectedMode);
+
+#define Sim32GetVDMPointer(Address, Size, Mode) \
+ MGetVdmPointer((Address), (Size), (Mode))
+
+#define Sim32FlushVDMPointer(Address, Size, Buffer, Mode) TRUE
+
+#else
+
+PBYTE
+WINAPI
+Sim32GetVDMPointer(
+ _In_ ULONG Address,
+ _In_ ULONG Size,
+ _In_ BOOLEAN ProtectedMode);
+
+BOOLEAN
+WINAPI
+Sim32FlushVDMPointer(
+ _In_ ULONG Address,
+ _In_ ULONG Size,
+ _In_ PBYTE Buffer,
+ _In_ BOOLEAN ProtectedMode);
+
+#endif
+
+PBYTE
+WINAPI
+Sim32pGetVDMPointer(
+ _In_ ULONG Address,
+ _In_ BOOLEAN ProtectedMode);
+
+/* This API appears to have never been implemented anywhere... */
+#define Sim32FreeVDMPointer(Address, Size, Buffer, Mode) TRUE
+
+#define GetVDMAddress(usSeg, usOff) (((ULONG)(usSeg) << 4) + (ULONG)(usOff))
+
+#define GetVDMPointer(Address, Size, Mode) \
+ Sim32GetVDMPointer(Address, Size, Mode)
+
+#define FlushVDMPointer(Address, Size, Buffer, Mode) \
+ Sim32FlushVDMPointer(Address, Size, Buffer, Mode)
+
+#define FreeVDMPointer(Address, Size, Buffer, Mode) \
+ Sim32FreeVDMPointer(Address, Size, Buffer, Mode)
/*
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/include/ddk/wdm.h
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- branches/ReactOS-0.3.17-CLT2015/reactos/include/ddk/wdm.h [iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/include/ddk/wdm.h [iso-8859-1] Thu Mar 19
23:51:20 2015
@@ -13558,7 +13558,7 @@
NTSTATUS
NTAPI
IoWMIOpenBlock(
- _In_ GUID *DataBlockGuid,
+ _In_ LPCGUID DataBlockGuid,
_In_ ULONG DesiredAccess,
_Out_ PVOID *DataBlockObject);
Copied: branches/ReactOS-0.3.17-CLT2015/reactos/include/ddk/wmiguid.h (from r66813,
trunk/reactos/include/ddk/wmiguid.h)
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- trunk/reactos/include/ddk/wmiguid.h [iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/include/ddk/wmiguid.h [iso-8859-1] Thu Mar 19
23:51:20 2015
@@ -25,22 +25,22 @@
#include <guiddef.h>
#define DATA_PROVIDER_INFO_GUID \
- {0x5494dfdc, 0xa98a, 0x11d1, 0xbf, 0x43, 0x00, 0xa0, 0xc9, 0x06, 0x29, 0x10}
+ {0x5494dfdc, 0xa98a, 0x11d1, {0xbf, 0x43, 0x00, 0xa0, 0xc9, 0x06, 0x29, 0x10}}
#define SMBIOS_DATA_GUID \
- {0x8f680850, 0xa584, 0x11d1, 0xbf, 0x38, 0x00, 0xa0, 0xc9, 0x06, 0x29, 0x10}
+ {0x8f680850, 0xa584, 0x11d1, {0xbf, 0x38, 0x00, 0xa0, 0xc9, 0x06, 0x29, 0x10}}
#define INSTANCE_INFO_GUID \
- {0xc7bf35d0, 0xaadb, 0x11d1, 0xbf, 0x4a, 0x00, 0xa0, 0xc9, 0x6, 0x29, 0x10}
+ {0xc7bf35d0, 0xaadb, 0x11d1, {0xbf, 0x4a, 0x00, 0xa0, 0xc9, 0x06, 0x29, 0x10}}
#define BINARY_MOF_GUID \
- {0x05901221, 0xD566, 0x11d1, 0xB2, 0xF0, 0x00, 0xA0, 0xC9, 0x06, 0x29, 0x10}
+ {0x05901221, 0xD566, 0x11d1, {0xB2, 0xF0, 0x00, 0xA0, 0xC9, 0x06, 0x29, 0x10}}
#define ENUMERATE_GUIDS_GUID \
- {0xe3dff7bd, 0x3915, 0x11d2, 0x91, 0x03, 0x00, 0xc0, 0x4f, 0xb9, 0x98, 0xa2}
+ {0xe3dff7bd, 0x3915, 0x11d2, {0x91, 0x03, 0x00, 0xc0, 0x4f, 0xb9, 0x98, 0xa2}}
#define MS_SYSTEM_INFORMATIONGUID \
- {0x98a2b9d7, 0x94dd, 0x496a, {0x84, 0x7e, 0x67, 0xa5, 0x55, 0x7a, 0x59, 0xf2}}
+ {0x98a2b9d7, 0x94dd, 0x496a, {0x84, 0x7e, 0x67, 0xa5, 0x55, 0x7a, 0x59, 0xf2}}
DEFINE_GUID(MS_SYSTEM_INFORMATION_GUID, \
0x98a2b9d7, 0x94dd, 0x496a, 0x84, 0x7e, 0x67, 0xa5, 0x55, 0x7a, 0x59, 0xf2);
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/include/psdk/bcrypt.h
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- branches/ReactOS-0.3.17-CLT2015/reactos/include/psdk/bcrypt.h [iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/include/psdk/bcrypt.h [iso-8859-1] Thu Mar 19
23:51:20 2015
@@ -48,6 +48,7 @@
} BCRYPT_ALGORITHM_IDENTIFIER;
typedef PVOID BCRYPT_ALG_HANDLE;
+typedef PVOID BCRYPT_HANDLE;
#define BCRYPT_RNG_USE_ENTROPY_IN_BUFFER 0x00000001
#define BCRYPT_USE_SYSTEM_PREFERRED_RNG 0x00000002
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/include/psdk/commctrl.h
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- branches/ReactOS-0.3.17-CLT2015/reactos/include/psdk/commctrl.h [iso-8859-1]
(original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/include/psdk/commctrl.h [iso-8859-1] Thu Mar
19 23:51:20 2015
@@ -5095,6 +5095,14 @@
#endif /* NOTASKDIALOG */
+#if (NTDDI_VERSION >= NTDDI_VISTA)
+enum _LI_METRIC
+{
+ LIM_SMALL,
+ LIM_LARGE,
+};
+#endif
+
#ifdef __cplusplus
}
#endif
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/include/psdk/wmistr.h
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- branches/ReactOS-0.3.17-CLT2015/reactos/include/psdk/wmistr.h [iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/include/psdk/wmistr.h [iso-8859-1] Thu Mar 19
23:51:20 2015
@@ -156,4 +156,18 @@
WMI_EXECUTE_METHOD
} WMIDPREQUESTCODE;
+#define WMIGUID_QUERY 0x0001
+#define WMIGUID_SET 0x0002
+#define WMIGUID_NOTIFICATION 0x0004
+#define WMIGUID_READ_DESCRIPTION 0x0008
+#define WMIGUID_EXECUTE 0x0010
+#define TRACELOG_CREATE_REALTIME 0x0020
+#define TRACELOG_CREATE_ONDISK 0x0040
+#define TRACELOG_GUID_ENABLE 0x0080
+#define TRACELOG_ACCESS_KERNEL_LOGGER 0x0100
+#define TRACELOG_LOG_EVENT 0x0200
+#define TRACELOG_CREATE_INPROC 0x0200
+#define TRACELOG_ACCESS_REALTIME 0x0400
+#define TRACELOG_REGISTER_GUIDS 0x0800
+
#endif /* _WMISTR_ */
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/include/xdk/iofuncs.h
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- branches/ReactOS-0.3.17-CLT2015/reactos/include/xdk/iofuncs.h [iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/include/xdk/iofuncs.h [iso-8859-1] Thu Mar 19
23:51:20 2015
@@ -1977,7 +1977,7 @@
NTSTATUS
NTAPI
IoWMIOpenBlock(
- _In_ GUID *DataBlockGuid,
+ _In_ LPCGUID DataBlockGuid,
_In_ ULONG DesiredAccess,
_Out_ PVOID *DataBlockObject);
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/lib/rtl/error.c
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- branches/ReactOS-0.3.17-CLT2015/reactos/lib/rtl/error.c [iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/lib/rtl/error.c [iso-8859-1] Thu Mar 19
23:51:20 2015
@@ -1550,4 +1550,4 @@
{ 0xc0130001, 0xc0130017, table_c0130001 },
{ 0xc0150001, 0xc0150028, table_c0150001 },
{ 0, 0, NULL } /* last entry */
-};
+};
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/include/internal/ps.h
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/include/internal/ps.h [iso-8859-1]
(original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/include/internal/ps.h [iso-8859-1]
Thu Mar 19 23:51:20 2015
@@ -313,13 +313,13 @@
//
// VDM and LDT Support
//
-NTSTATUS
+VOID
NTAPI
PspDeleteLdt(
IN PEPROCESS Process
);
-NTSTATUS
+VOID
NTAPI
PspDeleteVdmObjects(
IN PEPROCESS Process
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/io/iomgr/iomgr.c
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1]
(original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Thu Mar
19 23:51:20 2015
@@ -24,6 +24,11 @@
IN PVOID SystemArgument1,
IN PVOID SystemArgument2
);
+
+BOOLEAN
+NTAPI
+WmiInitialize(
+ VOID);
/* DATA ********************************************************************/
@@ -526,6 +531,9 @@
/* Initialize PnP manager */
IopInitializePlugPlayServices();
+ /* Initialize WMI */
+ WmiInitialize();
+
/* Initialize HAL Root Bus Driver */
HalInitPnpDriver();
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/ke/i386/exp.c
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1]
(original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] Thu Mar 19
23:51:20 2015
@@ -549,6 +549,7 @@
{
/* FIXME: Handle FPU Emulation */
//ASSERT(FALSE);
+ UNIMPLEMENTED;
}
}
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/ke/i386/traphdlr.c
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1]
(original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Thu
Mar 19 23:51:20 2015
@@ -1673,7 +1673,6 @@
if (!NT_SUCCESS(Result))
{
/* Set the last error and fail */
- //SetLastWin32Error(RtlNtStatusToDosError(Result));
goto ExitCall;
}
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/ke/i386/v86vdm.c
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1]
(original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] Thu Mar
19 23:51:20 2015
@@ -691,7 +691,7 @@
Context->ContextFlags = CONTEXT_FULL;
/* Free VDM objects */
- ExFreePool(PsGetCurrentProcess()->VdmObjects);
+ ExFreePoolWithTag(PsGetCurrentProcess()->VdmObjects, ' eK');
PsGetCurrentProcess()->VdmObjects = NULL;
/* Return status */
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/ntos.cmake
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/ntos.cmake [iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/ntos.cmake [iso-8859-1] Thu Mar 19
23:51:20 2015
@@ -269,7 +269,10 @@
${REACTOS_SOURCE_DIR}/ntoskrnl/se/sid.c
${REACTOS_SOURCE_DIR}/ntoskrnl/se/token.c
${REACTOS_SOURCE_DIR}/ntoskrnl/vf/driver.c
- ${REACTOS_SOURCE_DIR}/ntoskrnl/wmi/wmi.c)
+ ${REACTOS_SOURCE_DIR}/ntoskrnl/wmi/guidobj.c
+ ${REACTOS_SOURCE_DIR}/ntoskrnl/wmi/smbios.c
+ ${REACTOS_SOURCE_DIR}/ntoskrnl/wmi/wmi.c
+ ${REACTOS_SOURCE_DIR}/ntoskrnl/wmi/wmidrv.c)
list(APPEND ASM_SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/zw.S)
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/ps/i386/psldt.c
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/ps/i386/psldt.c [iso-8859-1]
(original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/ps/i386/psldt.c [iso-8859-1] Thu Mar
19 23:51:20 2015
@@ -14,20 +14,28 @@
/* FUNCTIONS *****************************************************************/
-NTSTATUS
+VOID
NTAPI
PspDeleteLdt(PEPROCESS Process)
{
- /* FIXME */
- return STATUS_SUCCESS;
+ /* FIXME - LdtInformation must be null as long as we don't implement VDMs */
+ ASSERT(Process->LdtInformation == NULL);
}
-NTSTATUS
+VOID
NTAPI
PspDeleteVdmObjects(PEPROCESS Process)
{
- /* FIXME */
- return STATUS_SUCCESS;
+ /* If there are no VDM objects, just exit */
+ if (Process->VdmObjects == NULL)
+ return;
+
+ /* FIXME: Need to do more than just freeing the main VdmObjects member! */
+ UNIMPLEMENTED;
+
+ /* Free VDM objects */
+ ExFreePoolWithTag(Process->VdmObjects, ' eK');
+ Process->VdmObjects = NULL;
}
NTSTATUS
Copied: branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/wmi/guidobj.c (from r66800,
trunk/reactos/ntoskrnl/wmi/guidobj.c)
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- trunk/reactos/ntoskrnl/wmi/guidobj.c [iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/wmi/guidobj.c [iso-8859-1] Thu Mar 19
23:51:20 2015
@@ -167,21 +167,12 @@
static
NTSTATUS
WmipCreateGuidObject(
- _In_ PUNICODE_STRING GuidString,
+ _In_ const GUID *Guid,
_Out_ PWMIP_GUID_OBJECT *OutGuidObject)
{
OBJECT_ATTRIBUTES ObjectAttributes;
- GUID Guid;
PWMIP_GUID_OBJECT GuidObject;
NTSTATUS Status;
-
- /* Convert the string into a GUID structure */
- Status = WmipGUIDFromString(GuidString, &Guid);
- if (!NT_SUCCESS(Status))
- {
- DPRINT1("WMI: Invalid uuid format for guid '%wZ'\n",
GuidString);
- return Status;
- }
/* Initialize object attributes for an unnamed object */
InitializeObjectAttributes(&ObjectAttributes,
@@ -207,7 +198,7 @@
}
RtlZeroMemory(GuidObject, sizeof(*GuidObject));
- GuidObject->Guid = Guid;
+ GuidObject->Guid = *Guid;
*OutGuidObject = GuidObject;
@@ -217,37 +208,22 @@
NTSTATUS
NTAPI
WmipOpenGuidObject(
- POBJECT_ATTRIBUTES ObjectAttributes,
- ACCESS_MASK DesiredAccess,
- KPROCESSOR_MODE AccessMode,
- PHANDLE OutGuidObjectHandle,
- PVOID *OutGuidObject)
-{
- static UNICODE_STRING Prefix = RTL_CONSTANT_STRING(L"\\WmiGuid\\");
- UNICODE_STRING GuidString;
+ _In_ LPCGUID Guid,
+ _In_ ACCESS_MASK DesiredAccess,
+ _In_ KPROCESSOR_MODE AccessMode,
+ _Out_ PHANDLE OutGuidObjectHandle,
+ _Outptr_ PVOID *OutGuidObject)
+{
+ PWMIP_GUID_OBJECT GuidObject;
ULONG HandleAttributes;
- PWMIP_GUID_OBJECT GuidObject;
- NTSTATUS Status;
- PAGED_CODE();
-
- /* Check if we have the expected prefix */
- if (!RtlPrefixUnicodeString(&Prefix, ObjectAttributes->ObjectName, FALSE))
- {
- DPRINT1("WMI: Invalid prefix for guid object '%wZ'\n",
- ObjectAttributes->ObjectName);
- return STATUS_INVALID_PARAMETER;
- }
-
- /* Extract the GUID string */
- GuidString = *ObjectAttributes->ObjectName;
- GuidString.Buffer += Prefix.Length / sizeof(WCHAR);
- GuidString.Length -= Prefix.Length;
+ NTSTATUS Status;
/* Create the GUID object */
- Status = WmipCreateGuidObject(&GuidString, &GuidObject);
+ Status = WmipCreateGuidObject(Guid, &GuidObject);
if (!NT_SUCCESS(Status))
{
DPRINT1("Failed to create GUID object: 0x%lx\n", Status);
+ *OutGuidObject = NULL;
return Status;
}
@@ -266,6 +242,7 @@
{
DPRINT1("ObOpenObjectByPointer failed: 0x%lx\n", Status);
ObfDereferenceObject(GuidObject);
+ GuidObject = NULL;
}
*OutGuidObject = GuidObject;
@@ -273,3 +250,46 @@
return Status;
}
+NTSTATUS
+NTAPI
+WmipOpenGuidObjectByName(
+ _In_ POBJECT_ATTRIBUTES ObjectAttributes,
+ _In_ ACCESS_MASK DesiredAccess,
+ _In_ KPROCESSOR_MODE AccessMode,
+ _Out_ PHANDLE OutGuidObjectHandle,
+ _Outptr_ PVOID *OutGuidObject)
+{
+ static UNICODE_STRING Prefix = RTL_CONSTANT_STRING(L"\\WmiGuid\\");
+ UNICODE_STRING GuidString;
+ NTSTATUS Status;
+ GUID Guid;
+ PAGED_CODE();
+
+ /* Check if we have the expected prefix */
+ if (!RtlPrefixUnicodeString(&Prefix, ObjectAttributes->ObjectName, FALSE))
+ {
+ DPRINT1("WMI: Invalid prefix for guid object '%wZ'\n",
+ ObjectAttributes->ObjectName);
+ return STATUS_INVALID_PARAMETER;
+ }
+
+ /* Extract the GUID string */
+ GuidString = *ObjectAttributes->ObjectName;
+ GuidString.Buffer += Prefix.Length / sizeof(WCHAR);
+ GuidString.Length -= Prefix.Length;
+
+ /* Convert the string into a GUID structure */
+ Status = WmipGUIDFromString(&GuidString, &Guid);
+ if (!NT_SUCCESS(Status))
+ {
+ DPRINT1("WMI: Invalid uuid format for guid '%wZ'\n",
GuidString);
+ return Status;
+ }
+
+ return WmipOpenGuidObject(&Guid,
+ DesiredAccess,
+ AccessMode,
+ OutGuidObjectHandle,
+ OutGuidObject);
+}
+
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/wmi/wmi.c
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/wmi/wmi.c [iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/wmi/wmi.c [iso-8859-1] Thu Mar 19
23:51:20 2015
@@ -9,10 +9,44 @@
/* INCLUDES *****************************************************************/
#include <ntoskrnl.h>
+#define INITGUID
+#include <wmiguid.h>
+#include <wmidata.h>
+#include <wmistr.h>
+
+#include "wmip.h"
+
#define NDEBUG
#include <debug.h>
/* FUNCTIONS *****************************************************************/
+
+BOOLEAN
+NTAPI
+WmiInitialize(
+ VOID)
+{
+ UNICODE_STRING DriverName = RTL_CONSTANT_STRING(L"\\Driver\\WMIxWDM");
+ NTSTATUS Status;
+
+ /* Initialize the GUID object type */
+ Status = WmipInitializeGuidObjectType();
+ if (!NT_SUCCESS(Status))
+ {
+ DPRINT1("WmipInitializeGuidObjectType() failed: 0x%lx\n", Status);
+ return FALSE;
+ }
+
+ /* Create the WMI driver */
+ Status = IoCreateDriver(&DriverName, WmipDriverEntry);
+ if (!NT_SUCCESS(Status))
+ {
+ DPRINT1("Failed to create WMI driver: 0x%lx\n", Status);
+ return FALSE;
+ }
+
+ return TRUE;
+}
/*
* @unimplemented
@@ -77,25 +111,68 @@
*/
NTSTATUS
NTAPI
-IoWMIOpenBlock(IN GUID *DataBlockGuid,
- IN ULONG DesiredAccess,
- OUT PVOID *DataBlockObject)
-{
- UNIMPLEMENTED;
- return STATUS_NOT_IMPLEMENTED;
-}
-
-/*
- * @unimplemented
- */
-NTSTATUS
-NTAPI
-IoWMIQueryAllData(IN PVOID DataBlockObject,
- IN OUT ULONG *InOutBufferSize,
- OUT PVOID OutBuffer)
-{
- UNIMPLEMENTED;
- return STATUS_NOT_IMPLEMENTED;
+IoWMIOpenBlock(
+ _In_ LPCGUID DataBlockGuid,
+ _In_ ULONG DesiredAccess,
+ _Out_ PVOID *DataBlockObject)
+{
+ HANDLE GuidObjectHandle;
+ NTSTATUS Status;
+
+ /* Open the GIOD object */
+ Status = WmipOpenGuidObject(DataBlockGuid,
+ DesiredAccess,
+ KernelMode,
+ &GuidObjectHandle,
+ DataBlockObject);
+ if (!NT_SUCCESS(Status))
+ {
+ DPRINT1("WmipOpenGuidObject failed: 0x%lx\n", Status);
+ return Status;
+ }
+
+
+ return STATUS_SUCCESS;
+}
+
+/*
+ * @unimplemented
+ */
+NTSTATUS
+NTAPI
+IoWMIQueryAllData(
+ IN PVOID DataBlockObject,
+ IN OUT ULONG *InOutBufferSize,
+ OUT PVOID OutBuffer)
+{
+ PWMIP_GUID_OBJECT GuidObject;
+ NTSTATUS Status;
+
+
+ Status = ObReferenceObjectByPointer(DataBlockObject,
+ WMIGUID_QUERY,
+ WmipGuidObjectType,
+ KernelMode);
+ if (!NT_SUCCESS(Status))
+ {
+ return Status;
+ }
+
+ GuidObject = DataBlockObject;
+
+ /* Huge HACK! */
+ if (IsEqualGUID(&GuidObject->Guid, &MSSmBios_RawSMBiosTables_GUID))
+ {
+ Status = WmipQueryRawSMBiosTables(InOutBufferSize, OutBuffer);
+ }
+ else
+ {
+ Status = STATUS_NOT_SUPPORTED;
+ }
+
+ ObDereferenceObject(DataBlockObject);
+
+ return Status;
}
/*
Copied: branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/wmi/wmidrv.c (from r66800,
trunk/reactos/ntoskrnl/wmi/wmidrv.c)
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- trunk/reactos/ntoskrnl/wmi/wmidrv.c [iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/wmi/wmidrv.c [iso-8859-1] Thu Mar 19
23:51:20 2015
@@ -210,14 +210,14 @@
}
/* Open a new GUID object */
- Status = WmipOpenGuidObject(&LocalObjectAttributes,
- SPECIFIC_RIGHTS_ALL,
- PreviousMode,
- &GuidObjectHandle,
- &GuidObject);
- if (!NT_SUCCESS(Status))
- {
- DPRINT1("WmipOpenGuidObject failed: 0x%lx\n", Status);
+ Status = WmipOpenGuidObjectByName(&LocalObjectAttributes,
+ SPECIFIC_RIGHTS_ALL,
+ PreviousMode,
+ &GuidObjectHandle,
+ &GuidObject);
+ if (!NT_SUCCESS(Status))
+ {
+ DPRINT1("WmipOpenGuidObjectByName failed: 0x%lx\n", Status);
return Status;
}
@@ -409,14 +409,14 @@
}
/* Open a new GUID object */
- Status = WmipOpenGuidObject(&LocalObjectAttributes,
- OpenGuidForEvents->DesiredAccess,
- PreviousMode,
- &GuidObjectHandle,
- &GuidObject);
- if (!NT_SUCCESS(Status))
- {
- DPRINT1("WmipOpenGuidObject failed: 0x%lx\n", Status);
+ Status = WmipOpenGuidObjectByName(&LocalObjectAttributes,
+ OpenGuidForEvents->DesiredAccess,
+ PreviousMode,
+ &GuidObjectHandle,
+ &GuidObject);
+ if (!NT_SUCCESS(Status))
+ {
+ DPRINT1("WmipOpenGuidObjectByName failed: 0x%lx\n", Status);
return Status;
}
Copied: branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/wmi/wmip.h (from r66800,
trunk/reactos/ntoskrnl/wmi/wmip.h)
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- trunk/reactos/ntoskrnl/wmi/wmip.h [iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/wmi/wmip.h [iso-8859-1] Thu Mar 19
23:51:20 2015
@@ -1,5 +1,7 @@
#pragma once
+
+extern POBJECT_TYPE WmipGuidObjectType;
#define GUID_STRING_LENGTH 36
@@ -32,8 +34,24 @@
NTSTATUS
NTAPI
WmipOpenGuidObject(
- POBJECT_ATTRIBUTES ObjectAttributes,
- ACCESS_MASK DesiredAccess,
- KPROCESSOR_MODE AccessMode,
- PHANDLE OutGuidObjectHandle,
- PVOID *OutGuidObject);
+ _In_ LPCGUID Guid,
+ _In_ ACCESS_MASK DesiredAccess,
+ _In_ KPROCESSOR_MODE AccessMode,
+ _Out_ PHANDLE OutGuidObjectHandle,
+ _Outptr_ PVOID *OutGuidObject);
+
+NTSTATUS
+NTAPI
+WmipOpenGuidObjectByName(
+ _In_ POBJECT_ATTRIBUTES ObjectAttributes,
+ _In_ ACCESS_MASK DesiredAccess,
+ _In_ KPROCESSOR_MODE AccessMode,
+ _Out_ PHANDLE OutGuidObjectHandle,
+ _Outptr_ PVOID *OutGuidObject);
+
+NTSTATUS
+NTAPI
+WmipQueryRawSMBiosTables(
+ _Inout_ ULONG *InOutBufferSize,
+ _Out_opt_ PVOID OutBuffer);
+
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
---
branches/ReactOS-0.3.17-CLT2015/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt [iso-8859-1]
(original)
+++
branches/ReactOS-0.3.17-CLT2015/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt [iso-8859-1]
Thu Mar 19 23:51:20 2015
@@ -3,7 +3,7 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/fast486)
-spec2def(ntvdm.exe ntvdm.spec)
+spec2def(ntvdm.exe ntvdm.spec ADD_IMPORTLIB)
list(APPEND SOURCE
bios/bios32/bios32.c
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/subsystems/mvdm/ntvdm/memory.c
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- branches/ReactOS-0.3.17-CLT2015/reactos/subsystems/mvdm/ntvdm/memory.c [iso-8859-1]
(original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/subsystems/mvdm/ntvdm/memory.c [iso-8859-1]
Thu Mar 19 23:51:20 2015
@@ -321,6 +321,8 @@
return SEG_OFF_TO_PTR(Segment, Offset);
}
+#ifndef VdmFlushCache
+
BOOL
WINAPI
VdmFlushCache(IN USHORT Segment,
@@ -333,6 +335,10 @@
return TRUE;
}
+#endif
+
+#ifndef VdmUnmapFlat
+
BOOL
WINAPI
VdmUnmapFlat(IN USHORT Segment,
@@ -344,6 +350,8 @@
UNIMPLEMENTED;
return TRUE;
}
+
+#endif
BOOL
WINAPI
3473
days inactive
3473
days old
0 comments
1 participants
participants (1)
-
hbelusca＠svn.reactos.org