Ros-diffs October 2010

ros-diffs@reactos.org

20 participants
435 discussions

[jgardou] 49305: [CMAKE] - use baseaddresses for dlls

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Oct 27 14:00:51 2010 New Revision: 49305 URL: http://svn.reactos.org/svn/reactos?rev=49305&view=rev Log: [CMAKE] - use baseaddresses for dlls Added: branches/cmake-bringup/baseaddress.cmake (with props) Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/gcc.cmake Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Wed Oct 27 14:00:51 2010 @@ -139,6 +139,8 @@ add_custom_target(livecd DEPENDS ${REACTOS_BINARY_DIR}/livecd.iso) add_livecd(${REACTOS_SOURCE_DIR}/boot/bootdata/livecd.ini "" freeldr.ini) +include(baseaddress.cmake) + add_subdirectory(base) add_subdirectory(boot) add_subdirectory(dll) Added: branches/cmake-bringup/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/baseaddress.cmake… ============================================================================== --- branches/cmake-bringup/baseaddress.cmake (added) +++ branches/cmake-bringup/baseaddress.cmake [iso-8859-1] Wed Oct 27 14:00:51 2010 @@ -1,0 +1,260 @@ +set(baseaddress_regtests 0x07000000) +set(baseaddress_notifyhook 0x08000000) +set(baseaddress_faultrep 0x107a0000) +set(baseaddress_qmgrprxy 0x1f710000) +set(baseaddress_cryptdlg 0x209c0000) +set(baseaddress_comcat 0x20a50000) +set(baseaddress_windowscodecs 0x26c40000) +set(baseaddress_devenum 0x35670000) +set(baseaddress_rsabase 0x35700000) +set(baseaddress_rsaenh 0x35780000) +set(baseaddress_url 0x42ea0000) +set(baseaddress_wlanapi 0x470f0000) +set(baseaddress_pidgen 0x473e0000) +set(baseaddress_dwmapi 0x4a3f0000) +set(baseaddress_t2embed 0x4b310000) +set(baseaddress_msftedit 0x4b460000) +set(baseaddress_loadperf 0x4b920000) +set(baseaddress_mprapi 0x4c400000) +set(baseaddress_wuapi 0x506a0000) +set(baseaddress_srclient 0x512c0000) +set(baseaddress_pstorec 0x513d0000) +set(baseaddress_lpk 0x516c0000) +set(baseaddress_msgsm32acm 0x56db0000) +set(baseaddress_msdvbnp 0x58280000) +set(baseaddress_msg711acm 0x584f0000) +set(baseaddress_imaadp32acm 0x585e0000) +set(baseaddress_bdaplgin 0x58600000) +set(baseaddress_telephon 0x58750000) +set(baseaddress_pwrcfg 0x587e0000) +set(baseaddress_mmsys 0x588a0000) +set(baseaddress_joy 0x589b0000) +set(baseaddress_qmgr 0x59620000) +set(baseaddress_msvidctl 0x59660000) +set(baseaddress_uxtheme 0x5ad70000) +set(baseaddress_vdmdbg 0x5b0d0000) +set(baseaddress_untfs 0x5b340000) +set(baseaddress_objsel 0x5b400000) +set(baseaddress_ufat 0x5b570000) +set(baseaddress_tapiui 0x5b770000) +set(baseaddress_uext2 0x5b7a0000) +set(baseaddress_slayer 0x5c7e0000) +set(baseaddress_usrmgr 0x5c900000) +set(baseaddress_shimgvw 0x5cb00000) +set(baseaddress_commctrl 0x5d090000) +set(baseaddress_dplayx 0x5e080000) +set(baseaddress_input 0x5e400000) +set(baseaddress_ntlanman 0x5f380000) +set(baseaddress_dinput 0x5f580000) +set(baseaddress_netid 0x5f660000) +set(baseaddress_ntprint 0x5f6a0000) +set(baseaddress_mssip32 0x60430000) +set(baseaddress_msisip 0x60b10000) +set(baseaddress_inseng 0x61000000) +set(baseaddress_qedit 0x611c0000) +set(baseaddress_modemui 0x61650000) +set(baseaddress_mapi32 0x62250000) +set(baseaddress_mciwave 0x622a0000) +set(baseaddress_mciseq 0x622b0000) +set(baseaddress_mciqtz32 0x622c0000) +set(baseaddress_mcicda 0x622e0000) +set(baseaddress_localui 0x62f70000) +set(baseaddress_hdwwiz 0x64d40000) +set(baseaddress_timedate 0x64da0000) +set(baseaddress_sysdm 0x64dd0000) +set(baseaddress_ncpl 0x64ea0000) +set(baseaddress_main 0x64f40000) +set(baseaddress_intl 0x64fb0000) +set(baseaddress_desk 0x65080000) +set(baseaddress_appwiz 0x65100000) +set(baseaddress_mlang 0x65140000) +set(baseaddress_access 0x65180000) +set(baseaddress_itss 0x66370000) +set(baseaddress_itircl 0x663a0000) +set(baseaddress_inetmib1 0x666f0000) +set(baseaddress_initpki 0x66b00000) +set(baseaddress_wshtcpip 0x677b0000) +set(baseaddress_crypt32 0x67ab0000) +set(baseaddress_httpapi 0x67ae0000) +set(baseaddress_hid 0x688f0000) +set(baseaddress_psxdll 0x68eb0000) +set(baseaddress_psapi 0x68f70000) +set(baseaddress_ksproxy 0x68f90000) +set(baseaddress_getuname 0x69110000) +set(baseaddress_oleacc 0x69640000) +set(baseaddress_winmm 0x697d0000) +set(baseaddress_msimg32 0x69cc0000) +set(baseaddress_browseui 0x69cd0000) +set(baseaddress_netplwiz 0x6a240000) +set(baseaddress_shell32 0x6a360000) +set(baseaddress_unicode 0x6b200000) +set(baseaddress_advpack 0x6b300000) +set(baseaddress_control 0x6b310000) +set(baseaddress_ncpa 0x6b320000) +set(baseaddress_dbghelp 0x6b330000) +set(baseaddress_dinput8 0x6b340000) +set(baseaddress_dxdiagn 0x6b350000) +set(baseaddress_dsound 0x6b360000) +set(baseaddress_glu32 0x6b370000) +set(baseaddress_mesa32 0x6b380000) +set(baseaddress_opengl32 0x6b390000) +set(baseaddress_secur32 0x6b3a0000) +set(baseaddress_smdll 0x6b3b0000) +set(baseaddress_urlmon 0x6b3c0000) +set(baseaddress_serialui 0x6b3d0000) +set(baseaddress_hlink 0x6c6e0000) +set(baseaddress_deskmon 0x6d400000) +set(baseaddress_deskadp 0x6d410000) +set(baseaddress_wldap32 0x6e130000) +set(baseaddress_sxs 0x6e160000) +set(baseaddress_schannel 0x6e360000) +set(baseaddress_console 0x6e4d0000) +set(baseaddress_compstui 0x6ec10000) +set(baseaddress_hnetcfg 0x6edb0000) +set(baseaddress_clb 0x6f2b0000) +set(baseaddress_fontext 0x6f7b0000) +set(baseaddress_jscript 0x6fe80000) +set(baseaddress_cards 0x701a0000) +set(baseaddress_wininet 0x70200000) +set(baseaddress_winhttp 0x70c60000) +set(baseaddress_batt 0x70cb0000) +set(baseaddress_amstream 0x71030000) +set(baseaddress_aclui 0x71550000) +set(baseaddress_dhcpcsvc 0x71650000) +set(baseaddress_shdocvw 0x71700000) +set(baseaddress_actxprxy 0x71800000) +set(baseaddress_mswsock 0x71a30000) +set(baseaddress_wsock32 0x71ab0000) +set(baseaddress_acledit 0x71b70000) +set(baseaddress_netapi32 0x71c00000) +set(baseaddress_olesvr32 0x71dd0000) +set(baseaddress_olecli32 0x71df0000) +set(baseaddress_olethk32 0x71e10000) +set(baseaddress_netevent 0x71e70000) +set(baseaddress_dplay 0x71e80000) +set(baseaddress_security 0x71f10000) +set(baseaddress_mssign32 0x720c0000) +set(baseaddress_cryptui 0x720d0000) +set(baseaddress_winfax 0x722c0000) +set(baseaddress_winscard 0x723d0000) +set(baseaddress_devmgr 0x72a90000) +set(baseaddress_msadp32acm 0x72cb0000) +set(baseaddress_wdmaud.drv 0x72d20000) +set(baseaddress_winspool 0x72f50000) +set(baseaddress_softpub 0x73290000) +set(baseaddress_mscat32 0x732b0000) +set(baseaddress_mstask 0x73520000) +set(baseaddress_traffic 0x73550000) +set(baseaddress_mciavi32 0x73610000) +set(baseaddress_msvidc32 0x73650000) +set(baseaddress_msrle32 0x73660000) +set(baseaddress_msdmo 0x73670000) +set(baseaddress_avicap32 0x739e0000) +set(baseaddress_avifil32 0x73ac0000) +set(baseaddress_mscms 0x73af0000) +set(baseaddress_dciman32 0x73b10000) +set(baseaddress_sti 0x73b60000) +set(baseaddress_iccvid 0x73bc0000) +set(baseaddress_coredll 0x73d80000) +set(baseaddress_lz32 0x73d80000) +set(baseaddress_ksuser 0x73ea0000) +set(baseaddress_icmp 0x741f0000) +set(baseaddress_spoolss 0x742a0000) +set(baseaddress_msimtf 0x746b0000) +set(baseaddress_msctf 0x746e0000) +set(baseaddress_kbsdll 0x74720000) +set(baseaddress_quartz 0x747d0000) +set(baseaddress_userenv 0x74850000) +set(baseaddress_syssetup 0x74a10000) +set(baseaddress_ws2_32 0x74aa0000) +set(baseaddress_powrprof 0x74ad0000) +set(baseaddress_msxml3 0x74ae0000) +set(baseaddress_printui 0x74b40000) +set(baseaddress_sndblst 0x74c30000) +set(baseaddress_pdh 0x74c70000) +set(baseaddress_oledlg 0x74d00000) +set(baseaddress_samsrv 0x74f30000) +set(baseaddress_resutils 0x75070000) +set(baseaddress_samlib 0x750c0000) +set(baseaddress_cabinet 0x75120000) +set(baseaddress_netcfgx 0x755f0000) +set(baseaddress_iphlpapi 0x75700000) +set(baseaddress_nddeapi 0x75940000) +set(baseaddress_msgina 0x75970000) +set(baseaddress_localspl 0x75b80000) +set(baseaddress_cryptnet 0x75e60000) +set(baseaddress_rpcrt4 0x76000000) +set(baseaddress_shlwapi 0x76100000) +set(baseaddress_inetcomm 0x76140000) +set(baseaddress_comctl32 0x76170000) +set(baseaddress_comdlg32 0x76230000) +set(baseaddress_winsta 0x762f0000) +set(baseaddress_imm32 0x76320000) +set(baseaddress_d3d8thk 0x76340000) +set(baseaddress_riched32 0x76340000) +set(baseaddress_riched20 0x76360000) +set(baseaddress_odbccp32 0x76380000) +set(baseaddress_twain_32 0x76380000) +set(baseaddress_netshell 0x76390000) +set(baseaddress_lsasrv 0x76540000) +set(baseaddress_midimap 0x76600000) +set(baseaddress_wavemap 0x76610000) +set(baseaddress_mpr 0x76620000) +set(baseaddress_mshtml 0x76650000) +set(baseaddress_odbc32 0x76710000) +set(baseaddress_setupapi 0x76730000) +set(baseaddress_cryptdll 0x768f0000) +set(baseaddress_shfolder 0x76900000) +set(baseaddress_ntdsapi 0x76910000) +set(baseaddress_ntmarta 0x76920000) +set(baseaddress_rasdlg 0x76930000) +set(baseaddress_gdiplus 0x76a70000) +set(baseaddress_atl 0x76ac0000) +set(baseaddress_sfc 0x76b50000) +set(baseaddress_credui 0x76bf0000) +set(baseaddress_sfc_os 0x76c10000) +set(baseaddress_wintrust 0x76c30000) +set(baseaddress_imagehlp 0x76c90000) +set(baseaddress_clusapi 0x76d10000) +set(baseaddress_wmi 0x76d20000) +set(baseaddress_dhcpcsvc 0x76d80000) +set(baseaddress_fmifs 0x76df0000) +set(baseaddress_oleaut32 0x76e00000) +set(baseaddress_tapi32 0x76e60000) +set(baseaddress_rasman 0x76e90000) +set(baseaddress_rasapi32 0x76ee0000) +set(baseaddress_wtsapi32 0x76f50000) +set(baseaddress_msvfw32 0x76f60000) +set(baseaddress_msacm32 0x77400000) +set(baseaddress_crtdll 0x77630000) +set(baseaddress_authz 0x77690000) +set(baseaddress_cfgmgr32 0x77700000) +set(baseaddress_sensapi 0x77700000) +set(baseaddress_msafd 0x77780000) +set(baseaddress_packet 0x77780000) +set(baseaddress_msi 0x77790000) +set(baseaddress_snmpapi 0x777a0000) +set(baseaddress_usp10 0x777b0000) +set(baseaddress_iprtprio 0x777c0000) +set(baseaddress_ws2help 0x777e0000) +set(baseaddress_wshirda 0x777f0000) +set(baseaddress_version 0x77a40000) +set(baseaddress_ole32 0x77a50000) +set(baseaddress_olepro32 0x77b20000) +set(baseaddress_activeds 0x77cb0000) +set(baseaddress_advapi32 0x77dc0000) +set(baseaddress_user32 0x77e50000) +set(baseaddress_gdi32 0x77f70000) +set(baseaddress_dnsapi 0x77fb0000) +set(baseaddress_msvcrt 0x78000000) +set(baseaddress_msvcrt20 0x78500000) +set(baseaddress_msvcrt40 0x78700000) +set(baseaddress_mscoree 0x79000000) +set(baseaddress_fusion 0x79040000) +set(baseaddress_kernel32 0x7c700000) +set(baseaddress_ntdll 0x7c900000) +set(baseaddress_query 0x7d9a0000) +set(baseaddress_hhctrl 0x7e410000) +set(baseaddress_sxs 0x7e690000) +set(baseaddress_beepmidi 0x7ef00000) +set(baseaddress_freetype 0x7f000000) Propchange: branches/cmake-bringup/baseaddress.cmake ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=493… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Wed Oct 27 14:00:51 2010 @@ -105,6 +105,11 @@ endif() if(${TYPE} MATCHES win32dll) set_entrypoint(${MODULE} DllMain@12) + if(DEFINED baseaddress_${MODULE}) + set_image_base(${MODULE} ${baseaddress_${MODULE}}) + else() + message(WARNING "${MODULE} has no base address") + endif() endif() if(${TYPE} MATCHES win32ocx) set_entrypoint(${MODULE} DllMain@12)

14 years, 1 month

[fireball] 49304: - Undef NB_HOOKS to fix compilation with latest trunk. - Check if Process is not NULL in get_process_idle_event request, fixes a crash.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Oct 27 12:56:36 2010 New Revision: 49304 URL: http://svn.reactos.org/svn/reactos?rev=49304&view=rev Log: - Undef NB_HOOKS to fix compilation with latest trunk. - Check if Process is not NULL in get_process_idle_event request, fixes a crash. Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c branches/arwinss/reactos/subsystems/win32/win32k/wine/process.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c [iso-8859-1] Wed Oct 27 12:56:36 2010 @@ -28,6 +28,8 @@ #define NDEBUG #include <debug.h> +#undef NB_HOOKS + struct hook_table; struct hook Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/process.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/process.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/process.c [iso-8859-1] Wed Oct 27 12:56:36 2010 @@ -50,7 +50,7 @@ { Process = PsGetProcessWin32Process(ProcessObject); - if (Process->idle_event && ProcessObject != PsGetCurrentProcess()) + if (Process && Process->idle_event && ProcessObject != PsGetCurrentProcess()) { /* Get a handle to the idle event (in another process) */ Status = ObOpenObjectByPointer(Process->idle_event,

14 years, 1 month

[tkreuzer] 49303: [WIN32K] Fix possible NULL pointer dereference. Spotted by Amine Khaldi.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Oct 27 12:51:32 2010 New Revision: 49303 URL: http://svn.reactos.org/svn/reactos?rev=49303&view=rev Log: [WIN32K] Fix possible NULL pointer dereference. Spotted by Amine Khaldi. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] Wed Oct 27 12:51:32 2010 @@ -299,17 +299,21 @@ UserEnterExclusive(); /* Validate input */ - if (hWnd && (hWnd != INVALID_HANDLE_VALUE) && !(Window = UserGetWindowObject(hWnd))) - { - UserLeave(); - return; + if (hWnd && (hWnd != INVALID_HANDLE_VALUE)) + { + Window = UserGetWindowObject(hWnd); + if (!Window) + { + UserLeave(); + return; + } } if (gpsi->dwInstalledEventHooks & GetMaskFromEvent(Event)) { - UserRefObjectCo(Window, &Ref); + if (Window) UserRefObjectCo(Window, &Ref); IntNotifyWinEvent( Event, Window, idObject, idChild, WEF_SETBYWNDPTI); - UserDerefObjectCo(Window); + if (Window) UserDerefObjectCo(Window); } UserLeave(); }

14 years, 1 month

[fireball] 49302: [NTOS/MM] - Don't access pfn database directly, there is a function for this. Thanks sir_richard.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Oct 27 09:58:18 2010 New Revision: 49302 URL: http://svn.reactos.org/svn/reactos?rev=49302&view=rev Log: [NTOS/MM] - Don't access pfn database directly, there is a function for this. Thanks sir_richard. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Wed Oct 27 09:58:18 2010 @@ -1075,7 +1075,7 @@ if (!TempPte.u.Hard.Valid) return MmProtectToValue[TempPte.u.Soft.Protection]; /* If we get here, the PTE is valid, so look up the page in PFN database */ - Pfn = &MmPfnDatabase[TempPte.u.Hard.PageFrameNumber]; + Pfn = MiGetPfnEntry(TempPte.u.Hard.PageFrameNumber); if (!Pfn->u3.e1.PrototypePte) {

14 years, 1 month

[jimtabor] 49301: [Win32k|User32] - Fix for DosBOX. See bug 5670 for more details. Added more data copies in user32 hook.c.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Oct 27 01:56:56 2010 New Revision: 49301 URL: http://svn.reactos.org/svn/reactos?rev=49301&view=rev Log: [Win32k|User32] - Fix for DosBOX. See bug 5670 for more details. Added more data copies in user32 hook.c. Modified: trunk/reactos/dll/win32/user32/windows/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/dll/win32/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/h… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] Wed Oct 27 01:56:56 2010 @@ -452,12 +452,12 @@ CREATESTRUCTW Csw; CBT_CREATEWNDW CbtCreatewndw; PHOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS CbtCreatewndExtra = NULL; - PKBDLLHOOKSTRUCT pKeyboardLlData; - PMSLLHOOKSTRUCT pMouseLlData; - PMSG pMsg; + KBDLLHOOKSTRUCT KeyboardLlData, *pKeyboardLlData; + MSLLHOOKSTRUCT MouseLlData, *pMouseLlData; + MSG Msg, *pMsg; PMOUSEHOOKSTRUCT pMHook; - PCWPSTRUCT pCWP; - PCWPRETSTRUCT pCWPR; + CWPSTRUCT CWP, *pCWP; + CWPRETSTRUCT CWPR, *pCWPR; PRECTL prl; LPCBTACTIVATESTRUCT pcbtas; WPARAM wParam = 0; @@ -541,11 +541,13 @@ case WH_KEYBOARD_LL: ERR("WH_KEYBOARD_LL: Code %d, wParam %d\n",Common->Code,Common->wParam); pKeyboardLlData = (PKBDLLHOOKSTRUCT)((PCHAR) Common + Common->lParam); - Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) pKeyboardLlData); + RtlCopyMemory(&KeyboardLlData, pKeyboardLlData, sizeof(KBDLLHOOKSTRUCT)); + Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) &KeyboardLlData); break; case WH_MOUSE_LL: pMouseLlData = (PMSLLHOOKSTRUCT)((PCHAR) Common + Common->lParam); - Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) pMouseLlData); + RtlCopyMemory(&MouseLlData, pMouseLlData, sizeof(MSLLHOOKSTRUCT)); + Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) &MouseLlData); break; case WH_MOUSE: /* SEH support */ pMHook = (PMOUSEHOOKSTRUCT)((PCHAR) Common + Common->lParam); @@ -560,26 +562,33 @@ _SEH2_END; break; case WH_CALLWNDPROC: + ERR("WH_CALLWNDPROC: Code %d, wParam %d\n",Common->Code,Common->wParam); pCWP = (PCWPSTRUCT)((PCHAR) Common + Common->lParam); - Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) pCWP); + RtlCopyMemory(&CWP, pCWP, sizeof(CWPSTRUCT)); + Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) &CWP); break; case WH_CALLWNDPROCRET: pCWPR = (PCWPRETSTRUCT)((PCHAR) Common + Common->lParam); - Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) pCWPR); + RtlCopyMemory(&CWPR, pCWPR, sizeof(CWPRETSTRUCT)); + Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) &CWPR); break; case WH_MSGFILTER: /* All SEH support */ + ERR("WH_MSGFILTER: Code %d, wParam %d\n",Common->Code,Common->wParam); case WH_SYSMSGFILTER: case WH_GETMESSAGE: pMsg = (PMSG)((PCHAR) Common + Common->lParam); + RtlCopyMemory(&Msg, pMsg, sizeof(MSG)); _SEH2_TRY { - Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) pMsg); + Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) &Msg); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Hit = TRUE; } _SEH2_END; + if (!Hit && Common->HookId == WH_GETMESSAGE) + RtlCopyMemory(pMsg, &Msg, sizeof(MSG)); break; case WH_FOREGROUNDIDLE: /* <-- SEH support */ case WH_KEYBOARD: Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Wed Oct 27 01:56:56 2010 @@ -726,7 +726,7 @@ pti = PsGetCurrentThreadWin32Thread(); Elem = Hook->Chain.Flink; - if (Elem != &pti->pDeskInfo->aphkStart[HOOKID_TO_INDEX(HookId)]) + if (Elem != &pti->rpdesk->pDeskInfo->aphkStart[HOOKID_TO_INDEX(HookId)]) return CONTAINING_RECORD(Elem, HOOK, Chain); } return NULL; @@ -785,10 +785,11 @@ pti = PsGetCurrentThreadWin32Thread(); - if ( pti->pDeskInfo && - IsListEmpty(&pti->pDeskInfo->aphkStart[HOOKID_TO_INDEX(HookId)]) ) - { - pti->pDeskInfo->fsHooks &= ~HOOKID_TO_FLAG(HookId); + if ( pti->rpdesk && + pti->rpdesk->pDeskInfo && + IsListEmpty(&pti->rpdesk->pDeskInfo->aphkStart[HOOKID_TO_INDEX(HookId)]) ) + { + pti->rpdesk->pDeskInfo->fsHooks &= ~HOOKID_TO_FLAG(HookId); return TRUE; } } @@ -830,7 +831,7 @@ pti->fsHooks = 0; } // Global search based on Thread and cleanup. - if (pti->pDeskInfo->fsHooks) + if (pti->rpdesk->pDeskInfo->fsHooks) { for (HookId = WH_MINHOOK; HookId <= WH_MAXHOOK; HookId++) { @@ -876,7 +877,7 @@ ASSERT(WH_MINHOOK <= HookId && HookId <= WH_MAXHOOK); pti = PsGetCurrentThreadWin32Thread(); - if (!pti || !pti->pDeskInfo) + if (!pti || !pti->rpdesk || !pti->rpdesk->pDeskInfo) goto Exit; // Must have a desktop running for hooks. if ( pti->TIF_flags & TIF_INCLEANUP) @@ -888,7 +889,7 @@ Local = TRUE; } - if ( pti->pDeskInfo->fsHooks & HOOKID_TO_FLAG(HookId) ) + if ( pti->rpdesk->pDeskInfo->fsHooks & HOOKID_TO_FLAG(HookId) ) { DPRINT("Global Hooker %d\n", HookId); Global = TRUE; @@ -897,7 +898,7 @@ if ( !Local && !Global ) goto Exit; // No work! pLLE = &pti->aphkStart[HOOKID_TO_INDEX(HookId)]; - pGLE = &pti->pDeskInfo->aphkStart[HOOKID_TO_INDEX(HookId)]; + pGLE = &pti->rpdesk->pDeskInfo->aphkStart[HOOKID_TO_INDEX(HookId)]; Hook = NULL; /* SetWindowHookEx sorts out the Thread issue by placing the Hook to @@ -987,14 +988,12 @@ ObReferenceObject(ptiHook->pEThread); if (ptiHook != pti ) { - if (HookId == WH_KEYBOARD_LL){ - DPRINT1("\nGlobal Hook posting to another Thread! %d\n",HookId );} + DPRINT("\nGlobal Hook posting to another Thread! %d\n",HookId ); Result = IntCallLowLevelHook(Hook, Code, wParam, lParam); } else { /* Make the direct call. */ - if (HookId == WH_KEYBOARD_LL){ - DPRINT1("\nLocal Hook calling to Thread! %d\n",HookId );} + DPRINT("\nLocal Hook calling to Thread! %d\n",HookId ); Result = co_IntCallHookProc( HookId, Code, wParam, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Wed Oct 27 01:56:56 2010 @@ -798,7 +798,7 @@ KbdHookData.dwExtraInfo = 0; if (co_HOOK_CallHooks(WH_KEYBOARD_LL, HC_ACTION, Msg.message, (LPARAM) &KbdHookData)) { - DPRINT("Kbd msg %d wParam %d lParam 0x%08x dropped by WH_KEYBOARD_LL hook\n", + DPRINT1("Kbd msg %d wParam %d lParam 0x%08x dropped by WH_KEYBOARD_LL hook\n", Msg.message, Msg.wParam, Msg.lParam); if (Entered) UserLeave(); return;

14 years, 1 month

[jimtabor] 49300: [User32] - Fix an over site and copy the return data back to the kernel.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Oct 27 00:03:41 2010 New Revision: 49300 URL: http://svn.reactos.org/svn/reactos?rev=49300&view=rev Log: [User32] - Fix an over site and copy the return data back to the kernel. Modified: trunk/reactos/dll/win32/user32/windows/hook.c Modified: trunk/reactos/dll/win32/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/h… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] Wed Oct 27 00:03:41 2010 @@ -449,12 +449,9 @@ User32CallHookProcFromKernel(PVOID Arguments, ULONG ArgumentLength) { PHOOKPROC_CALLBACK_ARGUMENTS Common; - LRESULT Result; CREATESTRUCTW Csw; CBT_CREATEWNDW CbtCreatewndw; PHOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS CbtCreatewndExtra = NULL; - WPARAM wParam = 0; - LPARAM lParam = 0; PKBDLLHOOKSTRUCT pKeyboardLlData; PMSLLHOOKSTRUCT pMouseLlData; PMSG pMsg; @@ -463,6 +460,9 @@ PCWPRETSTRUCT pCWPR; PRECTL prl; LPCBTACTIVATESTRUCT pcbtas; + WPARAM wParam = 0; + LPARAM lParam = 0; + LRESULT Result = 0; BOOL Hit = FALSE; Common = (PHOOKPROC_CALLBACK_ARGUMENTS) Arguments; @@ -530,6 +530,10 @@ { case HCBT_CREATEWND: CbtCreatewndExtra->WndInsertAfter = CbtCreatewndw.hwndInsertAfter; + CbtCreatewndExtra->Cs.x = CbtCreatewndw.lpcs->x; + CbtCreatewndExtra->Cs.y = CbtCreatewndw.lpcs->y; + CbtCreatewndExtra->Cs.cx = CbtCreatewndw.lpcs->cx; + CbtCreatewndExtra->Cs.cy = CbtCreatewndw.lpcs->cy; break; } break;

14 years, 1 month

[jgardou] 49299: [CMAKE] - remove unnecessary linkage

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Oct 26 23:38:28 2010 New Revision: 49299 URL: http://svn.reactos.org/svn/reactos?rev=49299&view=rev Log: [CMAKE] - remove unnecessary linkage Modified: branches/cmake-bringup/base/shell/explorer/CMakeLists.txt Modified: branches/cmake-bringup/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… ============================================================================== --- branches/cmake-bringup/base/shell/explorer/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/explorer/CMakeLists.txt [iso-8859-1] Tue Oct 26 23:38:28 2010 @@ -60,7 +60,6 @@ -lsupc++ -lstdc++ -lgcc - -lmingw32 -lmingwex wine mingw_wmain @@ -79,6 +78,8 @@ -lmsvcrt -lkernel32 -lntdll) + +set_image_base(explorer 0x00400000) add_dependencies(explorer psdk buildno_header) add_livecd_target(explorer reactos)

14 years, 1 month

[jgardou] 49298: [RPCRT4] - Fix build

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Oct 26 22:07:36 2010 New Revision: 49298 URL: http://svn.reactos.org/svn/reactos?rev=49298&view=rev Log: [RPCRT4] - Fix build Modified: branches/cmake-bringup/dll/win32/rpcrt4/cproxy.c branches/cmake-bringup/dll/win32/rpcrt4/ndr_stubless.c Modified: branches/cmake-bringup/dll/win32/rpcrt4/cproxy.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rpcrt4/… ============================================================================== --- branches/cmake-bringup/dll/win32/rpcrt4/cproxy.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rpcrt4/cproxy.c [iso-8859-1] Tue Oct 26 22:07:36 2010 @@ -96,7 +96,7 @@ args[0] = *(const WORD*)(fs + 8); TRACE("(%p)->(%d)([%d bytes]) ret=%08x\n", iface, index, args[0], args[1]); - return NdrClientCall2(stubless->pStubDesc, fs, args + 2); + return NdrClientCall2(stubless->pStubDesc, fs, args + 2).Simple; } #define BLOCK_SIZE 1024 Modified: branches/cmake-bringup/dll/win32/rpcrt4/ndr_stubless.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rpcrt4/… ============================================================================== --- branches/cmake-bringup/dll/win32/rpcrt4/ndr_stubless.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rpcrt4/ndr_stubless.c [iso-8859-1] Tue Oct 26 22:07:36 2010 @@ -548,10 +548,7 @@ } } -/* the return type should be CLIENT_CALL_RETURN, but this is incompatible - * with the way gcc returns structures. "void *" should be the largest type - * that MIDL should allow you to return anyway */ -LONG_PTR WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, ...) +CLIENT_CALL_RETURN WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, ...) { /* pointer to start of stack where arguments start */ RPC_MESSAGE rpcMsg; @@ -574,7 +571,7 @@ /* -Oif or -Oicf generated format */ BOOL bV2Format = FALSE; /* the value to return to the client from the remote procedure */ - LONG_PTR RetVal = 0; + CLIENT_CALL_RETURN RetVal = {0}; /* the pointer to the object when in OLE mode */ void * This = NULL; PFORMAT_STRING pHandleFormat; @@ -630,7 +627,7 @@ if (!(pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT)) { pFormat = client_get_handle(&stubMsg, pProcHeader, pHandleFormat, &hBinding); - if (!pFormat) return 0; + if (!pFormat) return RetVal; } bV2Format = (pStubDesc->Version >= 0x20000); @@ -729,7 +726,7 @@ } __EXCEPT_ALL { - RetVal = NdrProxyErrorHandler(GetExceptionCode()); + RetVal.Simple = NdrProxyErrorHandler(GetExceptionCode()); } __ENDTRY }

14 years, 1 month

[jgardou] 49297: [PSDK] - remove GCC special flag, as it has no reason to exist. Thanks go to Timo for having tested this.

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Oct 26 21:57:12 2010 New Revision: 49297 URL: http://svn.reactos.org/svn/reactos?rev=49297&view=rev Log: [PSDK] - remove GCC special flag, as it has no reason to exist. Thanks go to Timo for having tested this. Modified: branches/cmake-bringup/include/psdk/rpcndr.h Modified: branches/cmake-bringup/include/psdk/rpcndr.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/rpcn… ============================================================================== --- branches/cmake-bringup/include/psdk/rpcndr.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/rpcndr.h [iso-8859-1] Tue Oct 26 21:57:12 2010 @@ -204,7 +204,7 @@ ULONG_PTR MaxCount; ULONG Offset; ULONG ActualCount; - void * (__WINE_ALLOC_SIZE(1) __RPC_API *pfnAllocate)(SIZE_T); + void * (__WINE_ALLOC_SIZE(1) __RPC_API *pfnAllocate)(size_t); void (__RPC_API *pfnFree)(void *); unsigned char *StackTop; unsigned char *pPresentedType; @@ -486,7 +486,7 @@ { void *Buffer; ULONG BufferSize; - void * (__WINE_ALLOC_SIZE(1) __RPC_API *pfnAllocate)(SIZE_T); + void * (__WINE_ALLOC_SIZE(1) __RPC_API *pfnAllocate)(size_t); void (__RPC_API *pfnFree)(void *); struct IRpcChannelBuffer *pRpcChannelBuffer; ULONG_PTR Reserved[5]; @@ -652,24 +652,14 @@ RPCRTAPI unsigned char* RPC_ENTRY NdrUserMarshalSimpleTypeConvert( ULONG *pFlags, unsigned char *pBuffer, unsigned char FormatChar ); -#ifdef __GCC__ -/* Note: this should return a CLIENT_CALL_RETURN, but calling convention for - * returning structures/unions is different between Windows and gcc on i386. */ -LONG_PTR RPC_VAR_ENTRY +CLIENT_CALL_RETURN RPC_VAR_ENTRY NdrClientCall2( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); -LONG_PTR RPC_VAR_ENTRY +CLIENT_CALL_RETURN RPC_VAR_ENTRY NdrClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); -LONG_PTR RPC_VAR_ENTRY +CLIENT_CALL_RETURN RPC_VAR_ENTRY NdrAsyncClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); -LONG_PTR RPC_VAR_ENTRY +CLIENT_CALL_RETURN RPC_VAR_ENTRY NdrDcomAsyncClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); -#else -CLIENT_CALL_RETURN RPC_VAR_ENTRY NdrClientCall2( - PMIDL_STUB_DESC pStubDescriptor, - PFORMAT_STRING pFormat, - ... -); -#endif RPCRTAPI void RPC_ENTRY NdrServerCall2( PRPC_MESSAGE pRpcMsg );

14 years, 1 month

[fireball] 49296: [NTOS/MM] - Don't lie about page protection in MiQueryAddressState. Fixes PDFCreator-alike bugs. See issue #5627 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Oct 26 21:34:52 2010 New Revision: 49296 URL: http://svn.reactos.org/svn/reactos?rev=49296&view=rev Log: [NTOS/MM] - Don't lie about page protection in MiQueryAddressState. Fixes PDFCreator-alike bugs. See issue #5627 for more details. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Tue Oct 26 21:34:52 2010 @@ -1050,6 +1050,48 @@ ULONG NTAPI +MiGetPageProtection(IN PMMPTE PointerPte) +{ + MMPTE TempPte; + PMMPFN Pfn; + PAGED_CODE(); + + /* Copy this PTE's contents */ + TempPte = *PointerPte; + + /* Assure it's not totally zero */ + ASSERT(TempPte.u.Long); + + /* Check for a special prototype format */ + if (TempPte.u.Soft.Valid == 0 && + TempPte.u.Soft.Prototype == 1) + { + /* Unsupported now */ + UNIMPLEMENTED; + ASSERT(FALSE); + } + + /* In the easy case of transition or demand zero PTE just return its protection */ + if (!TempPte.u.Hard.Valid) return MmProtectToValue[TempPte.u.Soft.Protection]; + + /* If we get here, the PTE is valid, so look up the page in PFN database */ + Pfn = &MmPfnDatabase[TempPte.u.Hard.PageFrameNumber]; + + if (!Pfn->u3.e1.PrototypePte) + { + /* Return protection of the original pte */ + return MmProtectToValue[Pfn->OriginalPte.u.Soft.Protection]; + } + + /* This is hardware PTE */ + UNIMPLEMENTED; + ASSERT(FALSE); + + return PAGE_NOACCESS; +} + +ULONG +NTAPI MiQueryAddressState(IN PVOID Va, IN PMMVAD Vad, IN PEPROCESS TargetProcess, @@ -1119,9 +1161,9 @@ { /* This means it's committed */ State = MEM_COMMIT; - - /* For now, we lie about the protection */ - Protect = PAGE_EXECUTE_READWRITE; + + /* Get protection state of this page */ + Protect = MiGetPageProtection(PointerPte); } else {

14 years, 1 month

← Newer
1
...
6
7
8
9
10
11
12
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2010