Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [KMTESTS:FLTMGR] Hide FltMgrLoad and FltMgrReg
by Serge Gautherie 07 Sep '18

07 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e95aebfda83e3847297e… commit 7e95aebfda83e3847297ee649022be094cf693b2 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Sep 1 17:50:23 2018 +0200 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Fri Sep 7 08:45:50 2018 +0100 [KMTESTS:FLTMGR] Hide FltMgrLoad and FltMgrReg And add "// TODO: WIP/untested/crashes." ROSTESTS-299 --- modules/rostests/kmtests/kmtest/testlist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/kmtests/kmtest/testlist.c b/modules/rostests/kmtests/kmtest/testlist.c index 7b4930f659..a0ede71368 100644 --- a/modules/rostests/kmtests/kmtest/testlist.c +++ b/modules/rostests/kmtests/kmtest/testlist.c @@ -42,8 +42,8 @@ const KMT_TEST TestList[] = { "-Example", Test_Example }, { "FileAttributes", Test_FileAttributes }, { "FindFile", Test_FindFile }, - { "FltMgrLoad", Test_FltMgrLoad }, - { "FltMgrReg", Test_FltMgrReg }, + { "-FltMgrLoad", Test_FltMgrLoad }, // TODO: WIP/untested/crashes. + { "-FltMgrReg", Test_FltMgrReg }, // TODO: WIP/untested/crashes. { "HidPDescription", Test_HidPDescription }, { "IoCreateFile", Test_IoCreateFile }, { "IoDeviceObject", Test_IoDeviceObject },

1 0

01/01: [CPL][DESK] Update monitor resource (#816)
by Abdulganiev Rafael 07 Sep '18

07 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=25f4ed75a01844f0e991b… commit 25f4ed75a01844f0e991bc22c821e5153aa952b3 Author: Abdulganiev Rafael <40519766+A-Rafael(a)users.noreply.github.com> AuthorDate: Fri Sep 7 11:43:36 2018 +0400 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Fri Sep 7 08:43:36 2018 +0100 [CPL][DESK] Update monitor resource (#816) [DESK.CPL] Update monitor resource --- dll/cpl/desk/resources/monitor.bmp | Bin 31722 -> 31722 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/dll/cpl/desk/resources/monitor.bmp b/dll/cpl/desk/resources/monitor.bmp index 7e632ef14c..e81c7b5b19 100644 Binary files a/dll/cpl/desk/resources/monitor.bmp and b/dll/cpl/desk/resources/monitor.bmp differ

1 0

03/03: [LIBTIRPC] Fix CVE-2018-14622 by backporting its fix
by Pierre Schweitzer 05 Sep '18

05 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=000bbe074ed29d1efe39d… commit 000bbe074ed29d1efe39d4d65c81d1c1ead07c93 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Sep 5 21:44:47 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Sep 5 22:06:30 2018 +0200 [LIBTIRPC] Fix CVE-2018-14622 by backporting its fix CORE-15005 --- dll/3rdparty/libtirpc/src/svc_vc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/3rdparty/libtirpc/src/svc_vc.c b/dll/3rdparty/libtirpc/src/svc_vc.c index 4d7e1f1fd2..2ccbe0e340 100644 --- a/dll/3rdparty/libtirpc/src/svc_vc.c +++ b/dll/3rdparty/libtirpc/src/svc_vc.c @@ -340,6 +340,10 @@ again: */ newxprt = makefd_xprt(sock, r->sendsize, r->recvsize); +#ifdef __REACTOS__ // CVE-2018-14622 + if (!newxprt) + return (FALSE); +#endif if (!__rpc_set_netbuf(&newxprt->xp_rtaddr, &addr, len)) return (FALSE);

1 0

02/03: [NTOSKRNL] Don't raise a status when parameters are invalid on file mapping
by Pierre Schweitzer 05 Sep '18

05 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3dabca398f547304724f9… commit 3dabca398f547304724f9388fec19a0184444482 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Sep 3 08:12:58 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Sep 5 22:06:29 2018 +0200 [NTOSKRNL] Don't raise a status when parameters are invalid on file mapping --- ntoskrnl/cc/pin.c | 1 - 1 file changed, 1 deletion(-) diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index 07044e23e7..d96c64bc2f 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -83,7 +83,6 @@ CcMapData ( { CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%p Length=%lu Flags=0x%lx -> FALSE\n", FileObject, FileOffset, Length, Flags); - ExRaiseStatus(STATUS_INVALID_PARAMETER); return FALSE; }

1 0

01/03: [NTOSKRNL] When allocating a new BCB, save it in a list
by Pierre Schweitzer 05 Sep '18

05 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e17f61138c60a09969f37… commit e17f61138c60a09969f37a4022eb315ea19a1828 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Sep 2 14:37:47 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Sep 5 22:06:25 2018 +0200 [NTOSKRNL] When allocating a new BCB, save it in a list This list is stored in the shared map. Later, this will allow reusing BCB when appropriate --- ntoskrnl/cc/pin.c | 22 +++++++++++++++++++++- ntoskrnl/cc/view.c | 1 + ntoskrnl/include/internal/cc.h | 3 +++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index aba97049f1..07044e23e7 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -51,6 +51,7 @@ CcMapData ( NTSTATUS Status; PINTERNAL_BCB iBcb; LONGLONG ROffset; + KIRQL OldIrql; DPRINT("CcMapData(FileObject 0x%p, FileOffset %I64x, Length %lu, Flags 0x%lx," " pBcb 0x%p, pBuffer 0x%p)\n", FileObject, FileOffset->QuadPart, @@ -156,6 +157,10 @@ CcMapData ( ExInitializeResourceLite(&iBcb->Lock); *pBcb = (PVOID)iBcb; + KeAcquireSpinLock(&SharedCacheMap->BcbSpinLock, &OldIrql); + InsertTailList(&SharedCacheMap->BcbList, &iBcb->BcbEntry); + KeReleaseSpinLock(&SharedCacheMap->BcbSpinLock, OldIrql); + CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%p Length=%lu Flags=0x%lx -> TRUE Bcb=%p\n", FileObject, FileOffset, Length, Flags, iBcb); return TRUE; @@ -340,12 +345,20 @@ CcUnpinDataForThread ( if (--iBcb->RefCount == 0) { - CcRosReleaseVacb(iBcb->Vacb->SharedCacheMap, + KIRQL OldIrql; + PROS_SHARED_CACHE_MAP SharedCacheMap; + + SharedCacheMap = iBcb->Vacb->SharedCacheMap; + CcRosReleaseVacb(SharedCacheMap, iBcb->Vacb, TRUE, iBcb->Dirty, FALSE); + KeAcquireSpinLock(&SharedCacheMap->BcbSpinLock, &OldIrql); + RemoveEntryList(&iBcb->BcbEntry); + KeReleaseSpinLock(&SharedCacheMap->BcbSpinLock, OldIrql); + ExDeleteResourceLite(&iBcb->Lock); ExFreeToNPagedLookasideList(&iBcbLookasideList, iBcb); } @@ -377,6 +390,8 @@ CcUnpinRepinnedBcb ( IN PIO_STATUS_BLOCK IoStatus) { PINTERNAL_BCB iBcb = Bcb; + KIRQL OldIrql; + PROS_SHARED_CACHE_MAP SharedCacheMap; CCTRACE(CC_API_DEBUG, "Bcb=%p WriteThrough=%d\n", Bcb, WriteThrough); @@ -408,12 +423,17 @@ CcUnpinRepinnedBcb ( ASSERT(iBcb->Vacb->PinCount == 0); } + SharedCacheMap = iBcb->Vacb->SharedCacheMap; CcRosReleaseVacb(iBcb->Vacb->SharedCacheMap, iBcb->Vacb, TRUE, iBcb->Dirty, FALSE); + KeAcquireSpinLock(&SharedCacheMap->BcbSpinLock, &OldIrql); + RemoveEntryList(&iBcb->BcbEntry); + KeReleaseSpinLock(&SharedCacheMap->BcbSpinLock, OldIrql); + ExDeleteResourceLite(&iBcb->Lock); ExFreeToNPagedLookasideList(&iBcbLookasideList, iBcb); } diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 6a087e6531..e3c8285254 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -1417,6 +1417,7 @@ CcRosInitializeFileCache ( InitializeListHead(&SharedCacheMap->PrivateList); KeInitializeSpinLock(&SharedCacheMap->CacheMapLock); InitializeListHead(&SharedCacheMap->CacheMapVacbListHead); + InitializeListHead(&SharedCacheMap->BcbList); } KeAcquireGuardedMutex(&ViewLock); diff --git a/ntoskrnl/include/internal/cc.h b/ntoskrnl/include/internal/cc.h index 0dcea16f43..0c12004326 100644 --- a/ntoskrnl/include/internal/cc.h +++ b/ntoskrnl/include/internal/cc.h @@ -172,6 +172,7 @@ typedef struct _ROS_SHARED_CACHE_MAP CSHORT NodeByteSize; ULONG OpenCount; LARGE_INTEGER FileSize; + LIST_ENTRY BcbList; LARGE_INTEGER SectionSize; PFILE_OBJECT FileObject; ULONG DirtyPages; @@ -181,6 +182,7 @@ typedef struct _ROS_SHARED_CACHE_MAP PVOID LazyWriteContext; LIST_ENTRY PrivateList; ULONG DirtyPageThreshold; + KSPIN_LOCK BcbSpinLock; PRIVATE_CACHE_MAP PrivateCacheMap; /* ROS specific */ @@ -235,6 +237,7 @@ typedef struct _INTERNAL_BCB BOOLEAN Dirty; BOOLEAN Pinned; CSHORT RefCount; /* (At offset 0x34 on WinNT4) */ + LIST_ENTRY BcbEntry; } INTERNAL_BCB, *PINTERNAL_BCB; typedef struct _LAZY_WRITER

1 0

01/01: [SDK] Generate msvc baseaddresses from an RTC build
by Mark Jansen 05 Sep '18

05 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea5912e4d12f8b12e0de0… commit ea5912e4d12f8b12e0de0694b5d53e32191f46fc Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Sep 5 21:38:26 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Sep 5 21:38:26 2018 +0200 [SDK] Generate msvc baseaddresses from an RTC build --- sdk/cmake/baseaddress_msvc.cmake | 748 +++++++++++++++++++-------------------- 1 file changed, 374 insertions(+), 374 deletions(-) diff --git a/sdk/cmake/baseaddress_msvc.cmake b/sdk/cmake/baseaddress_msvc.cmake index 1d57a99126..0ad6c7367d 100644 --- a/sdk/cmake/baseaddress_msvc.cmake +++ b/sdk/cmake/baseaddress_msvc.cmake @@ -1,377 +1,377 @@ -# Generated from f:\reactos\build\vs14-x86-ninja-apps-tests +# Generated from R:\build\master\msvc # Generated by sdk/tools/gen_baseaddress.py set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 -set(baseaddress_kernel32 0x7c6b0000) -set(baseaddress_msvcrt 0x7c640000) -set(baseaddress_advapi32 0x7c5d0000) -set(baseaddress_gdi32 0x7c570000) +set(baseaddress_kernel32 0x7c690000) +set(baseaddress_msvcrt 0x7c610000) +set(baseaddress_advapi32 0x7c580000) +set(baseaddress_gdi32 0x7c520000) set(baseaddress_user32 0x77a20000) # reserved -set(baseaddress_dhcpcsvc 0x7c530000) -set(baseaddress_dnsapi 0x7c4f0000) -set(baseaddress_icmp 0x7c4d0000) -set(baseaddress_iphlpapi 0x7c4a0000) -set(baseaddress_ws2_32 0x7c470000) -set(baseaddress_ws2help 0x7c450000) -set(baseaddress_shlwapi 0x7c3e0000) -set(baseaddress_rpcrt4 0x7c350000) -set(baseaddress_comctl32 0x7c220000) -set(baseaddress_ole32 0x7c110000) -set(baseaddress_winspool 0x7c0d0000) -set(baseaddress_winmm 0x7c030000) -set(baseaddress_comdlg32 0x7bf60000) -set(baseaddress_shell32 0x7b7b0000) -set(baseaddress_lz32 0x7b790000) -set(baseaddress_version 0x7b770000) -set(baseaddress_oleaut32 0x7b660000) -set(baseaddress_setupapi 0x7b540000) -set(baseaddress_mpr 0x7b510000) -set(baseaddress_crypt32 0x7b450000) -set(baseaddress_wininet 0x7b3d0000) -set(baseaddress_urlmon 0x7b330000) -set(baseaddress_psapi 0x7b310000) -set(baseaddress_imm32 0x7b2e0000) -set(baseaddress_msvfw32 0x7b2b0000) -set(baseaddress_dbghelp 0x7b240000) -set(baseaddress_devmgr 0x7b1a0000) -set(baseaddress_msacm32 0x7b170000) -set(baseaddress_netapi32 0x7b110000) -set(baseaddress_powrprof 0x7b0f0000) -set(baseaddress_secur32 0x7b0b0000) -set(baseaddress_wintrust 0x7b070000) -set(baseaddress_avicap32 0x7b050000) -set(baseaddress_cabinet 0x7b010000) -set(baseaddress_dsound 0x7afb0000) -set(baseaddress_glu32 0x7af30000) -set(baseaddress_opengl32 0x7ada0000) -set(baseaddress_riched20 0x7ad10000) -set(baseaddress_smdll 0x7acf0000) -set(baseaddress_userenv 0x7acb0000) -set(baseaddress_uxtheme 0x7ac70000) -set(baseaddress_cryptui 0x7abe0000) -set(baseaddress_csrsrv 0x7abb0000) -set(baseaddress_basesrv 0x7ab90000) -set(baseaddress_winsrv 0x7ab20000) -set(baseaddress_dplayx 0x7aad0000) -set(baseaddress_gdiplus 0x7aa40000) -set(baseaddress_msimg32 0x7aa20000) -set(baseaddress_mswsock 0x7aa00000) -set(baseaddress_oledlg 0x7a9c0000) -set(baseaddress_rasapi32 0x7a9a0000) -set(baseaddress_rsaenh 0x7a950000) -set(baseaddress_samlib 0x7a920000) -set(baseaddress_sensapi 0x7a900000) -set(baseaddress_sfc_os 0x7a8e0000) -set(baseaddress_snmpapi 0x7a8c0000) -set(baseaddress_spoolss 0x7a890000) -set(baseaddress_usp10 0x7a830000) -set(baseaddress_access 0x7a7b0000) -set(baseaddress_acgenral 0x7a790000) -set(baseaddress_aclayers 0x7a770000) -set(baseaddress_acledit 0x7a750000) -set(baseaddress_aclui 0x7a720000) -set(baseaddress_acppage 0x7a6e0000) -set(baseaddress_activeds 0x7a6c0000) -set(baseaddress_actxprxy 0x7a5b0000) -set(baseaddress_advapi32_vista 0x7a590000) -set(baseaddress_advpack 0x7a560000) -set(baseaddress_amstream 0x7a530000) -set(baseaddress_apphelp 0x7a500000) -set(baseaddress_appwiz 0x7a490000) -set(baseaddress_atl 0x7a460000) -set(baseaddress_atl100 0x7a430000) -set(baseaddress_atl80 0x7a400000) -set(baseaddress_authz 0x7a3e0000) -set(baseaddress_avifil32 0x7a390000) -set(baseaddress_batt 0x7a370000) -set(baseaddress_bcrypt 0x7a350000) -set(baseaddress_beepmidi 0x7a330000) -set(baseaddress_browseui 0x7a240000) -set(baseaddress_cards 0x7a180000) -set(baseaddress_cfgmgr32 0x7a160000) -set(baseaddress_clusapi 0x7a140000) -set(baseaddress_cmicpl 0x7a110000) -set(baseaddress_comcat 0x7a0f0000) -set(baseaddress_compstui 0x7a0d0000) -set(baseaddress_console 0x7a080000) -set(baseaddress_credui 0x7a040000) -set(baseaddress_crtdll 0x7a000000) -set(baseaddress_cryptdlg 0x79fd0000) -set(baseaddress_cryptdll 0x79fb0000) -set(baseaddress_cryptnet 0x79f90000) -set(baseaddress_custom 0x79f70000) -set(baseaddress_d3d8 0x79f30000) -set(baseaddress_d3d8thk 0x79f10000) -set(baseaddress_d3d9 0x79ec0000) -set(baseaddress_d3dcompiler_43 0x79e30000) -set(baseaddress_d3drm 0x79dc0000) -set(baseaddress_d3dwine 0x79c30000) -set(baseaddress_d3dx9_24 0x79c10000) -set(baseaddress_d3dx9_25 0x79be0000) -set(baseaddress_d3dx9_26 0x79bc0000) -set(baseaddress_d3dx9_27 0x79ba0000) -set(baseaddress_d3dx9_28 0x79b80000) -set(baseaddress_d3dx9_29 0x79b60000) -set(baseaddress_d3dx9_30 0x79b40000) -set(baseaddress_d3dx9_31 0x79b20000) -set(baseaddress_d3dx9_32 0x79b00000) -set(baseaddress_d3dx9_33 0x79ae0000) -set(baseaddress_d3dx9_34 0x79ac0000) -set(baseaddress_d3dx9_35 0x79aa0000) -set(baseaddress_d3dx9_36 0x799f0000) -set(baseaddress_d3dx9_37 0x799d0000) -set(baseaddress_d3dx9_38 0x799b0000) -set(baseaddress_d3dx9_39 0x79990000) -set(baseaddress_d3dx9_40 0x79970000) -set(baseaddress_d3dx9_41 0x79950000) -set(baseaddress_d3dx9_42 0x79930000) -set(baseaddress_d3dx9_43 0x79910000) -set(baseaddress_d3dxof 0x798e0000) -set(baseaddress_dciman32 0x798c0000) -set(baseaddress_ddraw 0x79840000) -set(baseaddress_desk 0x797c0000) -set(baseaddress_deskadp 0x79790000) -set(baseaddress_deskmon 0x79770000) -set(baseaddress_devcpux 0x79750000) -set(baseaddress_devenum 0x79720000) -set(baseaddress_dinput 0x796e0000) -set(baseaddress_dinput8 0x796c0000) -set(baseaddress_dmusic 0x79690000) -set(baseaddress_dplay 0x79670000) -set(baseaddress_dxdiagn 0x79640000) -set(baseaddress_dxtn 0x79620000) -set(baseaddress_esent 0x79600000) -set(baseaddress_faultrep 0x795e0000) -set(baseaddress_fltlib 0x795c0000) -set(baseaddress_fmifs 0x795a0000) -set(baseaddress_fontext 0x79580000) -set(baseaddress_fontsub 0x79560000) -set(baseaddress_framebuf 0x79540000) -set(baseaddress_framebuf_new 0x79520000) -set(baseaddress_framedyn 0x79500000) -set(baseaddress_genincdata 0x794d0000) -set(baseaddress_getuname 0x78bd0000) -set(baseaddress_hdwwiz 0x78b60000) -set(baseaddress_hhctrl 0x78b20000) -set(baseaddress_hid 0x78b00000) -set(baseaddress_hlink 0x78ad0000) -set(baseaddress_hnetcfg 0x78aa0000) -set(baseaddress_httpapi 0x78a80000) -set(baseaddress_iccvid 0x78a60000) -set(baseaddress_ieframe 0x789e0000) -set(baseaddress_iernonce 0x789b0000) -set(baseaddress_imaadp32.acm 0x78990000) -set(baseaddress_imagehlp 0x78970000) -set(baseaddress_inetcomm 0x78920000) -set(baseaddress_inetcpl 0x788d0000) -set(baseaddress_inetmib1 0x788b0000) -set(baseaddress_initpki 0x78890000) -set(baseaddress_input 0x78830000) -set(baseaddress_inseng 0x78800000) -set(baseaddress_intl 0x787a0000) -set(baseaddress_iologmsg 0x78780000) -set(baseaddress_itircl 0x78760000) -set(baseaddress_itss 0x78730000) -set(baseaddress_joy 0x78700000) -set(baseaddress_jscript 0x78660000) -set(baseaddress_jsproxy 0x78640000) -set(baseaddress_kbdeo 0x78620000) -set(baseaddress_kbsdll 0x78600000) -set(baseaddress_kernel32_vista 0x785e0000) -set(baseaddress_ksuser 0x785c0000) -set(baseaddress_libjpeg 0x78560000) -set(baseaddress_libpng 0x78500000) -set(baseaddress_libtiff 0x78470000) -set(baseaddress_libtirpc 0x78440000) -set(baseaddress_libxslt 0x78320000) -set(baseaddress_load_notifications 0x78300000) -set(baseaddress_loadperf 0x782e0000) -set(baseaddress_localmon 0x782c0000) -set(baseaddress_localspl 0x78290000) -set(baseaddress_localspl_apitest 0x78270000) -set(baseaddress_localui 0x78240000) -set(baseaddress_lpk 0x78210000) -set(baseaddress_lsasrv 0x781c0000) -set(baseaddress_main 0x78140000) -set(baseaddress_mapi32 0x78110000) -set(baseaddress_mbedtls 0x780b0000) -set(baseaddress_mciavi32 0x78080000) -set(baseaddress_mcicda 0x78060000) -set(baseaddress_mciqtz32 0x78030000) -set(baseaddress_mciseq 0x78000000) -set(baseaddress_mciwave 0x77fd0000) -set(baseaddress_mgmtapi 0x77fb0000) -set(baseaddress_midimap 0x77f90000) -set(baseaddress_mlang 0x77f60000) -set(baseaddress_mmdrv 0x77f40000) -set(baseaddress_mmsys 0x77e70000) -set(baseaddress_modemui 0x77e00000) -set(baseaddress_mprapi 0x77dd0000) -set(baseaddress_msacm32.drv 0x77da0000) -set(baseaddress_msadp32.acm 0x77d80000) -set(baseaddress_msafd 0x77d50000) -set(baseaddress_mscat32 0x77d30000) -set(baseaddress_mscms 0x77d10000) -set(baseaddress_mscoree 0x77cd0000) -set(baseaddress_msctf 0x77c90000) -set(baseaddress_msdmo 0x77c70000) -set(baseaddress_msftedit 0x77c50000) -set(baseaddress_msg711.acm 0x77c30000) -set(baseaddress_msgina 0x77bb0000) -set(baseaddress_msgsm32.acm 0x77b90000) -set(baseaddress_mshtml 0x778b0000) -set(baseaddress_msi 0x77790000) -set(baseaddress_msimtf 0x77770000) -set(baseaddress_msisip 0x77750000) -set(baseaddress_msisys 0x77730000) -set(baseaddress_mspatcha 0x77710000) -set(baseaddress_msports 0x776e0000) -set(baseaddress_msrle32 0x776b0000) -set(baseaddress_mssign32 0x77690000) -set(baseaddress_mssip32 0x77670000) -set(baseaddress_mstask 0x77640000) -set(baseaddress_msv1_0 0x77620000) -set(baseaddress_msvcrt20 0x775a0000) -set(baseaddress_msvcrt40 0x77520000) -set(baseaddress_msvcrt_crt_dll_startup 0x77500000) -set(baseaddress_msvidc32 0x774e0000) -set(baseaddress_msxml 0x774b0000) -set(baseaddress_msxml2 0x77480000) -set(baseaddress_msxml3 0x772a0000) -set(baseaddress_msxml4 0x77260000) -set(baseaddress_msxml6 0x77220000) -set(baseaddress_mycomput 0x77200000) -set(baseaddress_ncpa 0x771e0000) -set(baseaddress_nddeapi 0x771c0000) -set(baseaddress_netcfgx 0x77150000) -set(baseaddress_netevent 0x77120000) -set(baseaddress_netid 0x770e0000) -set(baseaddress_netshell 0x77070000) -set(baseaddress_newdev 0x77020000) -set(baseaddress_nfs41_np 0x77000000) -set(baseaddress_normaliz 0x76fe0000) -set(baseaddress_notifyhook 0x76fc0000) -set(baseaddress_npptools 0x76fa0000) -set(baseaddress_ntdll_vista 0x76f80000) -set(baseaddress_ntdsapi 0x76f60000) -set(baseaddress_ntlanman 0x76f40000) -set(baseaddress_ntmarta 0x76f20000) -set(baseaddress_ntobjshex 0x76ec0000) -set(baseaddress_objsel 0x76ea0000) -set(baseaddress_odbc32 0x76e70000) -set(baseaddress_odbccp32 0x76e50000) -set(baseaddress_odbccp32i 0x76e30000) -set(baseaddress_oleacc 0x76de0000) -set(baseaddress_olecli32 0x76dc0000) -set(baseaddress_olepro32 0x76da0000) -set(baseaddress_olesvr32 0x76d80000) -set(baseaddress_olethk32 0x76d60000) -set(baseaddress_openglcfg 0x76d30000) -set(baseaddress_pdh 0x76d00000) -set(baseaddress_pidgen 0x76ce0000) -set(baseaddress_pifmgr 0x76c70000) -set(baseaddress_powercfg 0x76c10000) -set(baseaddress_printui 0x76bf0000) -set(baseaddress_propsys 0x76bc0000) -set(baseaddress_pstorec 0x76ba0000) -set(baseaddress_qedit 0x76b70000) -set(baseaddress_qmgr 0x76b40000) -set(baseaddress_qmgrprxy 0x76b00000) -set(baseaddress_quartz 0x76a20000) -set(baseaddress_query 0x76a00000) -set(baseaddress_rasadhlp 0x769e0000) -set(baseaddress_rasdlg 0x76820000) -set(baseaddress_rasman 0x767f0000) -set(baseaddress_redirtest1 0x767d0000) -set(baseaddress_redirtest2 0x767b0000) -set(baseaddress_resutils 0x76790000) -set(baseaddress_riched32 0x76770000) -set(baseaddress_rsabase 0x76750000) -set(baseaddress_rshell 0x766f0000) -set(baseaddress_samsrv 0x76690000) -set(baseaddress_sccbase 0x76670000) -set(baseaddress_schannel 0x76640000) -set(baseaddress_schedsvc 0x76620000) -set(baseaddress_scrrun 0x765e0000) -set(baseaddress_security 0x765c0000) -set(baseaddress_serialui 0x765a0000) -set(baseaddress_sfc 0x76580000) -set(baseaddress_shdoclc 0x76540000) -set(baseaddress_shdocvw 0x76510000) -set(baseaddress_shellbtrfs 0x76490000) -set(baseaddress_shfolder 0x76470000) -set(baseaddress_shimgvw 0x76430000) -set(baseaddress_shsvcs 0x76410000) -set(baseaddress_slbcsp 0x763f0000) -set(baseaddress_sndblst 0x763d0000) -set(baseaddress_softpub 0x763b0000) -set(baseaddress_srclient 0x76390000) -set(baseaddress_srvsvc 0x76370000) -set(baseaddress_sti 0x76340000) -set(baseaddress_stobject 0x762e0000) -set(baseaddress_streamci 0x762c0000) -set(baseaddress_sxs 0x762a0000) -set(baseaddress_sysdm 0x761d0000) -set(baseaddress_syssetup 0x760f0000) -set(baseaddress_t2embed 0x760d0000) -set(baseaddress_tapi32 0x760a0000) -set(baseaddress_tapiui 0x76020000) -set(baseaddress_telephon 0x76000000) -set(baseaddress_testvdd 0x75fe0000) -set(baseaddress_themeui 0x75fc0000) -set(baseaddress_timedate 0x75f50000) -set(baseaddress_traffic 0x75f30000) -set(baseaddress_twain_32 0x75f10000) -set(baseaddress_ubtrfs 0x75ef0000) -set(baseaddress_ucdfs 0x75ed0000) -set(baseaddress_uext2 0x75ea0000) -set(baseaddress_ufat 0x75e70000) -set(baseaddress_ufatx 0x75e50000) -set(baseaddress_uffs 0x75e30000) -set(baseaddress_umpnpmgr 0x75e00000) -set(baseaddress_untfs 0x75de0000) -set(baseaddress_updspapi 0x75dc0000) -set(baseaddress_ureiserfs 0x75da0000) -set(baseaddress_url 0x75d80000) -set(baseaddress_usrmgr 0x75d40000) -set(baseaddress_vbscript 0x75ce0000) -set(baseaddress_vdmdbg 0x75cc0000) -set(baseaddress_verifier 0x75ca0000) -set(baseaddress_vfd 0x75c70000) -set(baseaddress_vssapi 0x75c50000) -set(baseaddress_wbemdisp 0x75c20000) -set(baseaddress_wbemprox 0x75be0000) -set(baseaddress_wdmaud.drv 0x75a50000) -set(baseaddress_win32u 0x75a30000) -set(baseaddress_win32u_2k3sp2 0x75a10000) -set(baseaddress_win32u_xpsp2 0x759f0000) -set(baseaddress_windowscodecs 0x75940000) -set(baseaddress_windowscodecsext 0x75920000) -set(baseaddress_wined3dcfg 0x758f0000) -set(baseaddress_winemp3.acm 0x75880000) -set(baseaddress_winfax 0x75860000) -set(baseaddress_wing32 0x75840000) -set(baseaddress_winhttp 0x75800000) -set(baseaddress_winprint 0x757e0000) -set(baseaddress_winscard 0x757c0000) -set(baseaddress_winsta 0x75790000) -set(baseaddress_wkssvc 0x75770000) -set(baseaddress_wlanapi 0x75750000) -set(baseaddress_wldap32 0x75720000) -set(baseaddress_wlnotify 0x756f0000) -set(baseaddress_wmi 0x756d0000) -set(baseaddress_wmisvc 0x756b0000) -set(baseaddress_wmiutils 0x75680000) -set(baseaddress_wmvcore 0x75650000) -set(baseaddress_wshirda 0x75630000) -set(baseaddress_wshom 0x75600000) -set(baseaddress_wshtcpip 0x755e0000) -set(baseaddress_wsock32 0x755c0000) -set(baseaddress_wtsapi32 0x755a0000) -set(baseaddress_wuapi 0x75570000) -set(baseaddress_wuauserv 0x75550000) -set(baseaddress_xinput1_1 0x75530000) -set(baseaddress_xinput1_2 0x75510000) -set(baseaddress_xinput1_3 0x754f0000) -set(baseaddress_xinput9_1_0 0x754d0000) -set(baseaddress_xmllite 0x754a0000) -set(baseaddress_zipfldr 0x75450000) +set(baseaddress_dhcpcsvc 0x7c4e0000) +set(baseaddress_dnsapi 0x7c4a0000) +set(baseaddress_icmp 0x7c480000) +set(baseaddress_iphlpapi 0x7c440000) +set(baseaddress_ws2_32 0x7c410000) +set(baseaddress_ws2help 0x7c3f0000) +set(baseaddress_shlwapi 0x7c370000) +set(baseaddress_rpcrt4 0x7c2d0000) +set(baseaddress_comctl32 0x7c170000) +set(baseaddress_ole32 0x7c020000) +set(baseaddress_winspool 0x7bfe0000) +set(baseaddress_winmm 0x7bf40000) +set(baseaddress_comdlg32 0x7be60000) +set(baseaddress_shell32 0x7b680000) +set(baseaddress_lz32 0x7b660000) +set(baseaddress_version 0x7b630000) +set(baseaddress_oleaut32 0x7b4e0000) +set(baseaddress_setupapi 0x7b3a0000) +set(baseaddress_mpr 0x7b370000) +set(baseaddress_crypt32 0x7b290000) +set(baseaddress_wininet 0x7b200000) +set(baseaddress_urlmon 0x7b140000) +set(baseaddress_psapi 0x7b120000) +set(baseaddress_imm32 0x7b0f0000) +set(baseaddress_msvfw32 0x7b0b0000) +set(baseaddress_dbghelp 0x7b030000) +set(baseaddress_devmgr 0x7af80000) +set(baseaddress_msacm32 0x7af40000) +set(baseaddress_netapi32 0x7aed0000) +set(baseaddress_powrprof 0x7aeb0000) +set(baseaddress_secur32 0x7ae70000) +set(baseaddress_wintrust 0x7ae30000) +set(baseaddress_avicap32 0x7ae10000) +set(baseaddress_cabinet 0x7add0000) +set(baseaddress_dsound 0x7ad70000) +set(baseaddress_glu32 0x7acf0000) +set(baseaddress_opengl32 0x7ab40000) +set(baseaddress_riched20 0x7aab0000) +set(baseaddress_smdll 0x7aa90000) +set(baseaddress_userenv 0x7aa50000) +set(baseaddress_uxtheme 0x7aa00000) +set(baseaddress_cryptui 0x7a970000) +set(baseaddress_csrsrv 0x7a940000) +set(baseaddress_basesrv 0x7a910000) +set(baseaddress_winsrv 0x7a8a0000) +set(baseaddress_dplayx 0x7a850000) +set(baseaddress_gdiplus 0x7a7b0000) +set(baseaddress_msimg32 0x7a790000) +set(baseaddress_mswsock 0x7a770000) +set(baseaddress_oledlg 0x7a730000) +set(baseaddress_rasapi32 0x7a700000) +set(baseaddress_rsaenh 0x7a6b0000) +set(baseaddress_samlib 0x7a680000) +set(baseaddress_sensapi 0x7a660000) +set(baseaddress_sfc_os 0x7a640000) +set(baseaddress_snmpapi 0x7a620000) +set(baseaddress_spoolss 0x7a5f0000) +set(baseaddress_usp10 0x7a590000) +set(baseaddress_access 0x7a510000) +set(baseaddress_acgenral 0x7a4f0000) +set(baseaddress_aclayers 0x7a4d0000) +set(baseaddress_acledit 0x7a4b0000) +set(baseaddress_aclui 0x7a480000) +set(baseaddress_acppage 0x7a440000) +set(baseaddress_activeds 0x7a420000) +set(baseaddress_actxprxy 0x7a2a0000) +set(baseaddress_advapi32_vista 0x7a280000) +set(baseaddress_advpack 0x7a250000) +set(baseaddress_amstream 0x7a210000) +set(baseaddress_apphelp 0x7a1d0000) +set(baseaddress_appwiz 0x7a160000) +set(baseaddress_atl 0x7a130000) +set(baseaddress_atl100 0x7a100000) +set(baseaddress_atl80 0x7a0d0000) +set(baseaddress_authz 0x7a0b0000) +set(baseaddress_avifil32 0x7a050000) +set(baseaddress_batt 0x7a030000) +set(baseaddress_bcrypt 0x7a000000) +set(baseaddress_beepmidi 0x79fe0000) +set(baseaddress_browseui 0x79ee0000) +set(baseaddress_cards 0x79e20000) +set(baseaddress_cfgmgr32 0x79e00000) +set(baseaddress_clusapi 0x79dd0000) +set(baseaddress_cmicpl 0x79da0000) +set(baseaddress_comcat 0x79d80000) +set(baseaddress_compstui 0x79d60000) +set(baseaddress_console 0x79d10000) +set(baseaddress_credui 0x79cd0000) +set(baseaddress_crtdll 0x79c90000) +set(baseaddress_cryptdlg 0x79c60000) +set(baseaddress_cryptdll 0x79c40000) +set(baseaddress_cryptnet 0x79c10000) +set(baseaddress_custom 0x79bf0000) +set(baseaddress_d3d8 0x79ba0000) +set(baseaddress_d3d8thk 0x79b80000) +set(baseaddress_d3d9 0x79b30000) +set(baseaddress_d3dcompiler_43 0x79a90000) +set(baseaddress_d3drm 0x79a10000) +set(baseaddress_d3dwine 0x79850000) +set(baseaddress_d3dx9_24 0x79830000) +set(baseaddress_d3dx9_25 0x79800000) +set(baseaddress_d3dx9_26 0x797e0000) +set(baseaddress_d3dx9_27 0x797c0000) +set(baseaddress_d3dx9_28 0x797a0000) +set(baseaddress_d3dx9_29 0x79780000) +set(baseaddress_d3dx9_30 0x79750000) +set(baseaddress_d3dx9_31 0x79730000) +set(baseaddress_d3dx9_32 0x79710000) +set(baseaddress_d3dx9_33 0x796f0000) +set(baseaddress_d3dx9_34 0x796d0000) +set(baseaddress_d3dx9_35 0x796b0000) +set(baseaddress_d3dx9_36 0x795e0000) +set(baseaddress_d3dx9_37 0x795c0000) +set(baseaddress_d3dx9_38 0x795a0000) +set(baseaddress_d3dx9_39 0x79580000) +set(baseaddress_d3dx9_40 0x79560000) +set(baseaddress_d3dx9_41 0x79540000) +set(baseaddress_d3dx9_42 0x79520000) +set(baseaddress_d3dx9_43 0x79500000) +set(baseaddress_d3dxof 0x794d0000) +set(baseaddress_dciman32 0x794b0000) +set(baseaddress_ddraw 0x79420000) +set(baseaddress_desk 0x79390000) +set(baseaddress_deskadp 0x79360000) +set(baseaddress_deskmon 0x79340000) +set(baseaddress_devcpux 0x79320000) +set(baseaddress_devenum 0x792f0000) +set(baseaddress_dinput 0x792b0000) +set(baseaddress_dinput8 0x79290000) +set(baseaddress_dmusic 0x79250000) +set(baseaddress_dplay 0x79230000) +set(baseaddress_dxdiagn 0x79200000) +set(baseaddress_dxtn 0x791e0000) +set(baseaddress_esent 0x791b0000) +set(baseaddress_faultrep 0x79190000) +set(baseaddress_fltlib 0x79170000) +set(baseaddress_fmifs 0x79150000) +set(baseaddress_fontext 0x79130000) +set(baseaddress_fontsub 0x79110000) +set(baseaddress_framebuf 0x790f0000) +set(baseaddress_framebuf_new 0x790d0000) +set(baseaddress_framedyn 0x790b0000) +set(baseaddress_genincdata 0x79080000) +set(baseaddress_getuname 0x78780000) +set(baseaddress_hdwwiz 0x78710000) +set(baseaddress_hhctrl 0x786d0000) +set(baseaddress_hid 0x786b0000) +set(baseaddress_hlink 0x78680000) +set(baseaddress_hnetcfg 0x78650000) +set(baseaddress_httpapi 0x78630000) +set(baseaddress_iccvid 0x78610000) +set(baseaddress_ieframe 0x78580000) +set(baseaddress_iernonce 0x78550000) +set(baseaddress_imaadp32.acm 0x78530000) +set(baseaddress_imagehlp 0x78500000) +set(baseaddress_inetcomm 0x784b0000) +set(baseaddress_inetcpl 0x78460000) +set(baseaddress_inetmib1 0x78440000) +set(baseaddress_initpki 0x78420000) +set(baseaddress_input 0x783c0000) +set(baseaddress_inseng 0x78390000) +set(baseaddress_intl 0x78330000) +set(baseaddress_iologmsg 0x78310000) +set(baseaddress_itircl 0x782f0000) +set(baseaddress_itss 0x782c0000) +set(baseaddress_joy 0x78280000) +set(baseaddress_jscript 0x781d0000) +set(baseaddress_jsproxy 0x781b0000) +set(baseaddress_kbdeo 0x78190000) +set(baseaddress_kbsdll 0x78170000) +set(baseaddress_kernel32_vista 0x78150000) +set(baseaddress_ksuser 0x78130000) +set(baseaddress_libjpeg 0x780d0000) +set(baseaddress_libpng 0x78070000) +set(baseaddress_libtiff 0x77fd0000) +set(baseaddress_libtirpc 0x77f90000) +set(baseaddress_libxslt 0x77e50000) +set(baseaddress_load_notifications 0x77e30000) +set(baseaddress_loadperf 0x77e10000) +set(baseaddress_localmon 0x77de0000) +set(baseaddress_localspl 0x77da0000) +set(baseaddress_localspl_apitest 0x77d80000) +set(baseaddress_localui 0x77d50000) +set(baseaddress_lpk 0x77d20000) +set(baseaddress_lsasrv 0x77cc0000) +set(baseaddress_main 0x77c40000) +set(baseaddress_mapi32 0x77c10000) +set(baseaddress_mbedtls 0x77ba0000) +set(baseaddress_mciavi32 0x77b70000) +set(baseaddress_mcicda 0x77b40000) +set(baseaddress_mciqtz32 0x779f0000) +set(baseaddress_mciseq 0x779c0000) +set(baseaddress_mciwave 0x77990000) +set(baseaddress_mgmtapi 0x77970000) +set(baseaddress_midimap 0x77950000) +set(baseaddress_mlang 0x77920000) +set(baseaddress_mmdrv 0x77900000) +set(baseaddress_mmsys 0x77830000) +set(baseaddress_modemui 0x777c0000) +set(baseaddress_mprapi 0x77790000) +set(baseaddress_msacm32.drv 0x77760000) +set(baseaddress_msadp32.acm 0x77740000) +set(baseaddress_msafd 0x77710000) +set(baseaddress_mscat32 0x776f0000) +set(baseaddress_mscms 0x776c0000) +set(baseaddress_mscoree 0x77680000) +set(baseaddress_msctf 0x77640000) +set(baseaddress_msdmo 0x77620000) +set(baseaddress_msftedit 0x77600000) +set(baseaddress_msg711.acm 0x775e0000) +set(baseaddress_msgina 0x77560000) +set(baseaddress_msgsm32.acm 0x77540000) +set(baseaddress_mshtml 0x77380000) +set(baseaddress_msi 0x77240000) +set(baseaddress_msimtf 0x77220000) +set(baseaddress_msisip 0x77200000) +set(baseaddress_msisys 0x771e0000) +set(baseaddress_mspatcha 0x771c0000) +set(baseaddress_msports 0x77190000) +set(baseaddress_msrle32 0x77160000) +set(baseaddress_mssign32 0x77140000) +set(baseaddress_mssip32 0x77120000) +set(baseaddress_mstask 0x770f0000) +set(baseaddress_msv1_0 0x770d0000) +set(baseaddress_msvcrt20 0x77040000) +set(baseaddress_msvcrt40 0x76fb0000) +set(baseaddress_msvcrt_crt_dll_startup 0x76f90000) +set(baseaddress_msvidc32 0x76f70000) +set(baseaddress_msxml 0x76f40000) +set(baseaddress_msxml2 0x76f10000) +set(baseaddress_msxml3 0x76d10000) +set(baseaddress_msxml4 0x76cd0000) +set(baseaddress_msxml6 0x76c90000) +set(baseaddress_mycomput 0x76c70000) +set(baseaddress_ncpa 0x76c50000) +set(baseaddress_nddeapi 0x76c30000) +set(baseaddress_netcfgx 0x76bc0000) +set(baseaddress_netevent 0x76b90000) +set(baseaddress_netid 0x76b50000) +set(baseaddress_netshell 0x76ad0000) +set(baseaddress_newdev 0x76a80000) +set(baseaddress_nfs41_np 0x76a60000) +set(baseaddress_normaliz 0x76a40000) +set(baseaddress_notifyhook 0x76a20000) +set(baseaddress_npptools 0x76a00000) +set(baseaddress_ntdll_vista 0x769e0000) +set(baseaddress_ntdsapi 0x769b0000) +set(baseaddress_ntlanman 0x76990000) +set(baseaddress_ntmarta 0x76970000) +set(baseaddress_ntobjshex 0x76910000) +set(baseaddress_objsel 0x768f0000) +set(baseaddress_odbc32 0x768b0000) +set(baseaddress_odbccp32 0x76880000) +set(baseaddress_odbccp32i 0x76860000) +set(baseaddress_oleacc 0x76810000) +set(baseaddress_olecli32 0x767f0000) +set(baseaddress_olepro32 0x767d0000) +set(baseaddress_olesvr32 0x767b0000) +set(baseaddress_olethk32 0x76790000) +set(baseaddress_openglcfg 0x76760000) +set(baseaddress_pdh 0x76730000) +set(baseaddress_pidgen 0x76710000) +set(baseaddress_pifmgr 0x766a0000) +set(baseaddress_powercfg 0x76640000) +set(baseaddress_printui 0x76620000) +set(baseaddress_propsys 0x765f0000) +set(baseaddress_pstorec 0x765d0000) +set(baseaddress_qedit 0x765a0000) +set(baseaddress_qmgr 0x76570000) +set(baseaddress_qmgrprxy 0x76520000) +set(baseaddress_quartz 0x76400000) +set(baseaddress_query 0x763e0000) +set(baseaddress_rasadhlp 0x763c0000) +set(baseaddress_rasdlg 0x76200000) +set(baseaddress_rasman 0x761d0000) +set(baseaddress_redirtest1 0x761b0000) +set(baseaddress_redirtest2 0x76190000) +set(baseaddress_resutils 0x76170000) +set(baseaddress_riched32 0x76150000) +set(baseaddress_rsabase 0x76130000) +set(baseaddress_rshell 0x760d0000) +set(baseaddress_samsrv 0x76070000) +set(baseaddress_sccbase 0x76050000) +set(baseaddress_schannel 0x76020000) +set(baseaddress_schedsvc 0x76000000) +set(baseaddress_scrrun 0x75fc0000) +set(baseaddress_security 0x75fa0000) +set(baseaddress_serialui 0x75f80000) +set(baseaddress_sfc 0x75f60000) +set(baseaddress_shdoclc 0x75f20000) +set(baseaddress_shdocvw 0x75ee0000) +set(baseaddress_shellbtrfs 0x75e50000) +set(baseaddress_shfolder 0x75e30000) +set(baseaddress_shimgvw 0x75df0000) +set(baseaddress_shsvcs 0x75dd0000) +set(baseaddress_slbcsp 0x75db0000) +set(baseaddress_sndblst 0x75d80000) +set(baseaddress_softpub 0x75d60000) +set(baseaddress_srclient 0x75d40000) +set(baseaddress_srvsvc 0x75d10000) +set(baseaddress_sti 0x75ce0000) +set(baseaddress_stobject 0x75c80000) +set(baseaddress_streamci 0x75c60000) +set(baseaddress_sxs 0x75c40000) +set(baseaddress_sysdm 0x75b70000) +set(baseaddress_syssetup 0x75a90000) +set(baseaddress_t2embed 0x75a70000) +set(baseaddress_tapi32 0x75a40000) +set(baseaddress_tapiui 0x759c0000) +set(baseaddress_telephon 0x759a0000) +set(baseaddress_testvdd 0x75980000) +set(baseaddress_themeui 0x75960000) +set(baseaddress_timedate 0x758f0000) +set(baseaddress_traffic 0x758d0000) +set(baseaddress_twain_32 0x758b0000) +set(baseaddress_ubtrfs 0x75890000) +set(baseaddress_ucdfs 0x75870000) +set(baseaddress_uext2 0x75840000) +set(baseaddress_ufat 0x75810000) +set(baseaddress_ufatx 0x757f0000) +set(baseaddress_uffs 0x757d0000) +set(baseaddress_umpnpmgr 0x757a0000) +set(baseaddress_untfs 0x75780000) +set(baseaddress_updspapi 0x75760000) +set(baseaddress_ureiserfs 0x75740000) +set(baseaddress_url 0x75720000) +set(baseaddress_usrmgr 0x756d0000) +set(baseaddress_vbscript 0x75660000) +set(baseaddress_vdmdbg 0x75640000) +set(baseaddress_verifier 0x75620000) +set(baseaddress_vfd 0x755e0000) +set(baseaddress_vssapi 0x755b0000) +set(baseaddress_wbemdisp 0x75570000) +set(baseaddress_wbemprox 0x75530000) +set(baseaddress_wdmaud.drv 0x753a0000) +set(baseaddress_win32u 0x75380000) +set(baseaddress_win32u_2k3sp2 0x75360000) +set(baseaddress_win32u_xpsp2 0x75340000) +set(baseaddress_windowscodecs 0x75260000) +set(baseaddress_windowscodecsext 0x75240000) +set(baseaddress_wined3dcfg 0x75210000) +set(baseaddress_winemp3.acm 0x751a0000) +set(baseaddress_winfax 0x75180000) +set(baseaddress_wing32 0x75160000) +set(baseaddress_winhttp 0x75110000) +set(baseaddress_winprint 0x750f0000) +set(baseaddress_winscard 0x750d0000) +set(baseaddress_winsta 0x750a0000) +set(baseaddress_wkssvc 0x75080000) +set(baseaddress_wlanapi 0x75060000) +set(baseaddress_wldap32 0x75030000) +set(baseaddress_wlnotify 0x75000000) +set(baseaddress_wmi 0x74fe0000) +set(baseaddress_wmisvc 0x74fc0000) +set(baseaddress_wmiutils 0x74f90000) +set(baseaddress_wmvcore 0x74f60000) +set(baseaddress_wshirda 0x74f40000) +set(baseaddress_wshom 0x74f10000) +set(baseaddress_wshtcpip 0x74ef0000) +set(baseaddress_wsock32 0x74ed0000) +set(baseaddress_wtsapi32 0x74eb0000) +set(baseaddress_wuapi 0x74e80000) +set(baseaddress_wuauserv 0x74e60000) +set(baseaddress_xinput1_1 0x74e40000) +set(baseaddress_xinput1_2 0x74e20000) +set(baseaddress_xinput1_3 0x74e00000) +set(baseaddress_xinput9_1_0 0x74de0000) +set(baseaddress_xmllite 0x74db0000) +set(baseaddress_zipfldr 0x74d60000)

1 0

01/01: [CMLIB] Fix compiling as NT6+ (#840)
by Serge Gautherie 05 Sep '18

05 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb072fd0fe1a240014864… commit cb072fd0fe1a24001486405fe550dd27c1debd6b Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Wed Sep 5 20:18:14 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Sep 5 20:18:14 2018 +0200 [CMLIB] Fix compiling as NT6+ (#840) Addendum to r70582 (734bc291). CORE-12596 --- sdk/lib/cmlib/hiveinit.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk/lib/cmlib/hiveinit.c b/sdk/lib/cmlib/hiveinit.c index ba4e784fbc..1ad182cd38 100644 --- a/sdk/lib/cmlib/hiveinit.c +++ b/sdk/lib/cmlib/hiveinit.c @@ -556,7 +556,9 @@ HvInitialize( Hive->BaseBlockAlloc = sizeof(HBASE_BLOCK); // == HBLOCK_SIZE Hive->Version = HSYS_MINOR; +#if (NTDDI_VERSION < NTDDI_VISTA) Hive->Log = (FileType == HFILE_TYPE_LOG); +#endif Hive->HiveFlags = HiveFlags & ~HIVE_NOLAZYFLUSH; switch (OperationType)

1 0

01/01: [MSV1_0] LsaApLogonUser: Update the logon time/count and bad password time/count
by Eric Kohl 04 Sep '18

04 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=df053b7d16d1bba091123… commit df053b7d16d1bba091123690eed674f58e353089 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Wed Sep 5 00:10:54 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Wed Sep 5 00:10:54 2018 +0200 [MSV1_0] LsaApLogonUser: Update the logon time/count and bad password time/count --- dll/win32/msv1_0/msv1_0.c | 18 ++++++++++++++++++ dll/win32/msv1_0/msv1_0.h | 20 ++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/dll/win32/msv1_0/msv1_0.c b/dll/win32/msv1_0/msv1_0.c index ce47f0819f..1bb944e744 100644 --- a/dll/win32/msv1_0/msv1_0.c +++ b/dll/win32/msv1_0/msv1_0.c @@ -1339,6 +1339,24 @@ LsaApLogonUser(IN PLSA_CLIENT_REQUEST ClientRequest, } done: + /* Update the logon time/count or the bad password time/count */ + if ((UserHandle != NULL) && + (Status == STATUS_SUCCESS || Status == STATUS_WRONG_PASSWORD)) + { + SAMPR_USER_INFO_BUFFER InternalInfo; + + RtlZeroMemory(&InternalInfo, sizeof(InternalInfo)); + + if (Status == STATUS_SUCCESS) + InternalInfo.Internal2.Flags = USER_LOGON_SUCCESS; + else + InternalInfo.Internal2.Flags = USER_LOGON_BAD_PASSWORD; + + SamrSetInformationUser(UserHandle, + UserInternal2Information, + &InternalInfo); + } + /* Return the account name */ *AccountName = DispatchTable.AllocateLsaHeap(sizeof(UNICODE_STRING)); if (*AccountName != NULL) diff --git a/dll/win32/msv1_0/msv1_0.h b/dll/win32/msv1_0/msv1_0.h index efbc90a0f3..773702fdec 100644 --- a/dll/win32/msv1_0/msv1_0.h +++ b/dll/win32/msv1_0/msv1_0.h @@ -94,6 +94,18 @@ typedef struct _SAMPR_LOGON_HOURS unsigned char *LogonHours; } SAMPR_LOGON_HOURS, *PSAMPR_LOGON_HOURS; +#define USER_LOGON_BAD_PASSWORD 0x08000000 +#define USER_LOGON_SUCCESS 0x10000000 + +typedef struct _SAMPR_USER_INTERNAL2_INFORMATION +{ + unsigned long Flags; + OLD_LARGE_INTEGER LastLogon; + OLD_LARGE_INTEGER LastLogoff; + unsigned short BadPasswordCount; + unsigned short LogonCount; +} SAMPR_USER_INTERNAL2_INFORMATION, *PSAMPR_USER_INTERNAL2_INFORMATION; + typedef struct _SAMPR_USER_ALL_INFORMATION { OLD_LARGE_INTEGER LastLogon; @@ -152,6 +164,9 @@ typedef union _SAMPR_USER_INFO_BUFFER USER_CONTROL_INFORMATION Control; USER_EXPIRES_INFORMATION Expires; SAMPR_USER_INTERNAL1_INFORMATION Internal1; +#endif + SAMPR_USER_INTERNAL2_INFORMATION Internal2; +#if 0 SAMPR_USER_PARAMETERS_INFORMATION Parameters; #endif SAMPR_USER_ALL_INFORMATION All; @@ -236,6 +251,11 @@ SamrQueryInformationUser(IN SAMPR_HANDLE UserHandle, IN USER_INFORMATION_CLASS UserInformationClass, OUT PSAMPR_USER_INFO_BUFFER *Buffer); +NTSTATUS +NTAPI +SamrSetInformationUser(IN SAMPR_HANDLE UserHandle, + IN USER_INFORMATION_CLASS UserInformationClass, + IN PSAMPR_USER_INFO_BUFFER Buffer); typedef PVOID LSAPR_HANDLE;

1 0

01/01: [MSV1_0] Use the account expiration time and check account expiration on logon
by Eric Kohl 04 Sep '18

04 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=97382dee461e4174fcc51… commit 97382dee461e4174fcc517d090fad9727ac41d6d Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Sep 4 23:15:15 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Sep 4 23:15:15 2018 +0200 [MSV1_0] Use the account expiration time and check account expiration on logon --- dll/win32/msv1_0/msv1_0.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/dll/win32/msv1_0/msv1_0.c b/dll/win32/msv1_0/msv1_0.c index 8c9a1b617b..ce47f0819f 100644 --- a/dll/win32/msv1_0/msv1_0.c +++ b/dll/win32/msv1_0/msv1_0.c @@ -143,11 +143,11 @@ BuildInteractiveProfileBuffer(IN PLSA_CLIENT_REQUEST ClientRequest, LocalBuffer->LogonTime.LowPart = UserInfo->All.LastLogon.LowPart; LocalBuffer->LogonTime.HighPart = UserInfo->All.LastLogon.HighPart; -// LocalBuffer->LogoffTime.LowPart = -// LocalBuffer->LogoffTime.HighPart = + LocalBuffer->LogoffTime.LowPart = UserInfo->All.AccountExpires.LowPart; + LocalBuffer->LogoffTime.HighPart = UserInfo->All.AccountExpires.HighPart; -// LocalBuffer->KickOffTime.LowPart = -// LocalBuffer->KickOffTime.HighPart = + LocalBuffer->KickOffTime.LowPart = UserInfo->All.AccountExpires.LowPart; + LocalBuffer->KickOffTime.HighPart = UserInfo->All.AccountExpires.HighPart; LocalBuffer->PasswordLastSet.LowPart = UserInfo->All.PasswordLastSet.LowPart; LocalBuffer->PasswordLastSet.HighPart = UserInfo->All.PasswordLastSet.HighPart; @@ -267,6 +267,7 @@ AppendRidToSid(PSID SrcSid, return DstSid; } + static NTSTATUS BuildTokenUser(OUT PTOKEN_USER User, @@ -415,32 +416,41 @@ BuildTokenInformationBuffer(PLSA_TOKEN_INFORMATION_V1 *TokenInformation, Buffer = DispatchTable.AllocateLsaHeap(sizeof(LSA_TOKEN_INFORMATION_V1)); if (Buffer == NULL) { - TRACE("Failed to allocate the local buffer!\n"); + WARN("Failed to allocate the local buffer!\n"); Status = STATUS_INSUFFICIENT_RESOURCES; goto done; } - /* FIXME: */ - Buffer->ExpirationTime.QuadPart = -1; + Buffer->ExpirationTime.LowPart = UserInfo->All.AccountExpires.LowPart; + Buffer->ExpirationTime.HighPart = UserInfo->All.AccountExpires.HighPart; Status = BuildTokenUser(&Buffer->User, (PSID)AccountDomainSid, UserInfo->All.UserId); if (!NT_SUCCESS(Status)) + { + WARN("BuildTokenUser() failed (Status 0x%08lx)\n", Status); goto done; + } Status = BuildTokenPrimaryGroup(&Buffer->PrimaryGroup, (PSID)AccountDomainSid, UserInfo->All.PrimaryGroupId); if (!NT_SUCCESS(Status)) + { + WARN("BuildTokenPrimaryGroup() failed (Status 0x%08lx)\n", Status); goto done; + } Status = BuildTokenGroups(&Buffer->Groups, (PSID)AccountDomainSid, UserInfo->All.UserId, SpecialAccount); if (!NT_SUCCESS(Status)) + { + WARN("BuildTokenGroups() failed (Status 0x%08lx)\n", Status); goto done; + } *TokenInformation = Buffer; @@ -1029,7 +1039,7 @@ LsaApLogonUser(IN PLSA_CLIENT_REQUEST ClientRequest, UNICODE_STRING LogonServer; BOOLEAN SessionCreated = FALSE; LARGE_INTEGER LogonTime; -// LARGE_INTEGER AccountExpires; + LARGE_INTEGER AccountExpires; LARGE_INTEGER PasswordMustChange; LARGE_INTEGER PasswordLastSet; BOOL SpecialAccount = FALSE; @@ -1247,20 +1257,16 @@ LsaApLogonUser(IN PLSA_CLIENT_REQUEST ClientRequest, goto done; } -#if 0 /* Check if the account expired */ AccountExpires.LowPart = UserInfo->All.AccountExpires.LowPart; AccountExpires.HighPart = UserInfo->All.AccountExpires.HighPart; - - if (AccountExpires.QuadPart != 0 && - LogonTime.QuadPart >= AccountExpires.QuadPart) + if (LogonTime.QuadPart >= AccountExpires.QuadPart) { ERR("Account expired!\n"); *SubStatus = STATUS_ACCOUNT_EXPIRED; Status = STATUS_ACCOUNT_RESTRICTION; goto done; } -#endif /* Check if the password expired */ PasswordMustChange.LowPart = UserInfo->All.PasswordMustChange.LowPart;

1 0

02/02: [IDL] Implement parts of SamrSetInformationUser.UserInternal2Information
by Eric Kohl 04 Sep '18

04 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e25cbeba2f4664360374e… commit e25cbeba2f4664360374eee78e49871f0e53191e Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Sep 4 22:42:07 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Sep 4 22:42:49 2018 +0200 [IDL] Implement parts of SamrSetInformationUser.UserInternal2Information --- dll/win32/samsrv/samrpc.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dll/win32/samsrv/samrpc.c b/dll/win32/samsrv/samrpc.c index 114532cdb6..45c550c499 100644 --- a/dll/win32/samsrv/samrpc.c +++ b/dll/win32/samsrv/samrpc.c @@ -7810,6 +7810,59 @@ done: } +static NTSTATUS +SampSetUserInternal2(PSAM_DB_OBJECT UserObject, + PSAMPR_USER_INFO_BUFFER Buffer) +{ + SAM_USER_FIXED_DATA FixedData; + ULONG Length = 0; + NTSTATUS Status = STATUS_SUCCESS; + + /* Get the fixed user attributes */ + Length = sizeof(SAM_USER_FIXED_DATA); + Status = SampGetObjectAttribute(UserObject, + L"F", + NULL, + (PVOID)&FixedData, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + if ((Buffer->Internal2.Flags & USER_LOGON_SUCCESS) && + ((Buffer->Internal2.Flags & ~USER_LOGON_SUCCESS) == 0)) + { + /* Update the LastLogon time */ + Status = NtQuerySystemTime(&FixedData.LastLogon); + if (!NT_SUCCESS(Status)) + goto done; + + FixedData.LogonCount++; + FixedData.BadPasswordCount = 0; + } + + if ((Buffer->Internal2.Flags & USER_LOGON_BAD_PASSWORD) && + ((Buffer->Internal2.Flags & ~USER_LOGON_BAD_PASSWORD) == 0)) + { + /* Update the LastBadPasswordTime */ + Status = NtQuerySystemTime(&FixedData.LastBadPasswordTime); + if (!NT_SUCCESS(Status)) + goto done; + + FixedData.BadPasswordCount++; + } + + /* Set the fixed user attributes */ + Status = SampSetObjectAttribute(UserObject, + L"F", + REG_BINARY, + &FixedData, + Length); + +done: + return Status; +} + + static NTSTATUS SampSetUserAll(PSAM_DB_OBJECT UserObject, PSAMPR_USER_INFO_BUFFER Buffer) @@ -8095,6 +8148,7 @@ SamrSetInformationUser(IN SAMPR_HANDLE UserHandle, break; case UserAllInformation: + case UserInternal2Information: DesiredAccess = 0; /* FIXME */ break; @@ -8220,6 +8274,11 @@ SamrSetInformationUser(IN SAMPR_HANDLE UserHandle, Buffer); break; + case UserInternal2Information: + Status = SampSetUserInternal2(UserObject, + Buffer); + break; + case UserParametersInformation: Status = SampSetObjectAttributeString(UserObject, L"Parameters",

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs