Ros-diffs October 2010

ros-diffs@reactos.org

20 participants
435 discussions

[akhaldi] 49325: [CMAKE] - More work on the missing modules. By Alexey Komarov.
by akhaldi＠svn.reactos.org 28 Oct '10

28 Oct '10

Author: akhaldi Date: Thu Oct 28 11:33:02 2010 New Revision: 49325 URL: http://svn.reactos.org/svn/reactos?rev=49325&view=rev Log: [CMAKE] - More work on the missing modules. By Alexey Komarov. Added: branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/atl/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/iprtprio/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/mshtml/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/pstorec/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt (with props) Modified: branches/cmake-bringup/dll/directx/CMakeLists.txt branches/cmake-bringup/dll/win32/CMakeLists.txt branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt branches/cmake-bringup/dll/win32/itss/CMakeLists.txt branches/cmake-bringup/dll/win32/msxml3/CMakeLists.txt branches/cmake-bringup/dll/win32/shdocvw/En.rc branches/cmake-bringup/dll/win32/sti/CMakeLists.txt branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt branches/cmake-bringup/include/reactos/wine/CMakeLists.txt branches/cmake-bringup/lib/atl/CMakeLists.txt Modified: branches/cmake-bringup/dll/directx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/CMake… ============================================================================== --- branches/cmake-bringup/dll/directx/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -20,5 +20,5 @@ #add_subdirectory(msdvbnp) #add_subdirectory(msvidctl) add_subdirectory(qedit) -#add_subdirectory(quartz) #idl +add_subdirectory(quartz) #add_subdirectory(wine) Added: branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/quart… ============================================================================== --- branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -1,0 +1,72 @@ + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +add_definitions( + -D__WINESRC__ + -DENTRY_PREFIX=QUARTZ_ + -DREGISTER_PROXY_DLL + -DPROXY_DELEGATION + -D_DLL + -D__USE_CRTIMP) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(quartz ${CMAKE_CURRENT_SOURCE_DIR}/quartz.spec ${CMAKE_CURRENT_BINARY_DIR}/quartz.def) + +add_library(quartz SHARED + avidec.c + acmwrapper.c + waveparser.c + videorenderer.c + transform.c + systemclock.c + regsvr.c + pin.c + parser.c + nullrenderer.c + mpegsplit.c + memallocator.c + main.c + filtermapper.c + filtergraph.c + filesource.c + enumregfilters.c + enumpins.c + enummoniker.c + enumfilters.c + dsoundrender.c + enummedia.c + control.c + avisplit.c + version.rc) + +set_module_type(quartz win32dll) + +target_link_libraries(quartz + ${CMAKE_CURRENT_BINARY_DIR}/quartz.def + quartz_proxy + strmiids + uuid + wine + pseh) + +add_importlibs(quartz + msvcrt + advapi32 + dsound + ole32 + oleaut32 + shlwapi + user32 + gdi32 + advapi32 + msvfw32 + msacm32 + rpcrt4 + kernel32 + ntdll) + +add_dependencies(quartz quartz_def) +rpcproxy(quartz quartz_strmif.idl) +add_livecd_target(quartz reactos/system32) Propchange: branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -2,10 +2,10 @@ add_subdirectory(acledit) add_subdirectory(aclui) add_subdirectory(activeds) -#add_subdirectory(actxprxy) +add_subdirectory(actxprxy) add_subdirectory(advapi32) add_subdirectory(advpack) -#add_subdirectory(atl) +add_subdirectory(atl) add_subdirectory(authz) add_subdirectory(avicap32) add_subdirectory(avifil32) @@ -21,7 +21,7 @@ add_subdirectory(comctl32) add_subdirectory(comdlg32) add_subdirectory(compstui) -#add_subdirectory(credui)#FIXME: \\cryptui\\/cryptui_Fr.rc:432: syntax error +add_subdirectory(credui) add_subdirectory(crtdll) add_subdirectory(crypt32) add_subdirectory(cryptdlg) @@ -40,8 +40,8 @@ add_subdirectory(gdi32) add_subdirectory(gdiplus) add_subdirectory(getuname) -#add_subdirectory(glu32)# FIXME -#add_subdirectory(hhctrl.ocx) +#add_subdirectory(glu32)# FIXME: set_cpp()? +#add_subdirectory(hhctrl.ocx)#FIXME: regsvr.c.obj:regsvr.c:(.text+0x393): undefined reference to `RegDeleteTreeW' add_subdirectory(hid) add_subdirectory(hlink) add_subdirectory(hnetcfg) @@ -58,8 +58,8 @@ add_subdirectory(iphlpapi) #add_subdirectory(iprtprio) add_subdirectory(itircl) -#add_subdirectory(itss) -#add_subdirectory(jscript) +add_subdirectory(itss) +add_subdirectory(jscript) add_subdirectory(kernel32) add_subdirectory(loadperf) add_subdirectory(localspl) @@ -89,8 +89,8 @@ add_subdirectory(msg711.acm) add_subdirectory(msgina) add_subdirectory(msgsm32.acm) -#add_subdirectory(mshtml) -#add_subdirectory(mshtml.tlb) +add_subdirectory(mshtml) +add_subdirectory(mshtml.tlb) #add_subdirectory(msi) add_subdirectory(msimg32) add_subdirectory(msimtf) @@ -107,7 +107,7 @@ add_subdirectory(msvfw32) add_subdirectory(msvidc32) add_subdirectory(mswsock) -#add_subdirectory(msxml3) +add_subdirectory(msxml3) add_subdirectory(nddeapi) add_subdirectory(netapi32) add_subdirectory(netcfgx) @@ -136,7 +136,7 @@ add_subdirectory(powrprof) add_subdirectory(printui) add_subdirectory(psapi) -#add_subdirectory(pstorec) +add_subdirectory(pstorec) #add_subdirectory(qmgr) #add_subdirectory(qmgrprxy) add_subdirectory(query) @@ -162,7 +162,7 @@ add_subdirectory(sfc) add_subdirectory(sfc_os) add_subdirectory(shdoclc) -#add_subdirectory(shdocvw) +add_subdirectory(shdocvw) add_subdirectory(shell32) add_subdirectory(shfolder) add_subdirectory(shimgvw) @@ -174,9 +174,9 @@ add_subdirectory(softpub) add_subdirectory(spoolss) add_subdirectory(srclient) -#add_subdirectory(stdole2.tlb) -#add_subdirectory(stdole32.tlb) -#add_subdirectory(sti) +add_subdirectory(stdole2.tlb) +add_subdirectory(stdole32.tlb) +add_subdirectory(sti) add_subdirectory(sxs) add_subdirectory(syssetup) add_subdirectory(t2embed) @@ -199,7 +199,7 @@ add_subdirectory(version) add_subdirectory(wdmaud.drv) add_subdirectory(windowscodecs) -#add_subdirectory(winemp3.acm)# FIXME +#add_subdirectory(winemp3.acm)#FIXME: ertr000001.o:(.rdata+0x0): undefined reference to `_pei386_runtime_relocator)' add_subdirectory(winfax) add_subdirectory(wing32) add_subdirectory(winhttp) Added: branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/actxprx… ============================================================================== --- branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -1,0 +1,42 @@ + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(actxprxy ${CMAKE_CURRENT_SOURCE_DIR}/actxprxy.spec ${CMAKE_CURRENT_BINARY_DIR}/actxprxy.def) + +add_library(actxprxy SHARED usrmarshal.c) + +set_entrypoint(actxprxy 0) + +target_link_libraries(actxprxy + ${CMAKE_CURRENT_BINARY_DIR}/actxprxy.def + actxprxy_proxy + uuid + wine + pseh) + +add_importlibs(actxprxy + rpcrt4 + ole32 + oleaut32 + kernel32 + ntdll) + +add_dependencies(actxprxy actxprxy_def) + +add_definitions(-DREGISTER_PROXY_DLL -DPROXY_DELEGATION) + +rpcproxy(actxprxy + actxprxy_activscp.idl + actxprxy_comcat.idl + actxprxy_docobj.idl + actxprxy_hlink.idl + actxprxy_htiframe.idl + actxprxy_objsafe.idl + actxprxy_ocmm.idl + actxprxy_servprov.idl + actxprxy_shobjidl.idl + actxprxy_urlhist.idl) + +add_livecd_target(actxprxy reactos/system32) Propchange: branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/atl/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/atl/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/atl/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -1,0 +1,37 @@ + +ADD_INTERFACE_DEFINITIONS(atl_atliface_header atliface.idl) + +add_definitions(-D__WINESRC__) + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(atl ${CMAKE_CURRENT_SOURCE_DIR}/atl.spec ${CMAKE_CURRENT_BINARY_DIR}/atl.def) + +add_library(atl SHARED + atl_ax.c + atl_main.c + registrar.c + rsrc.rc) + +set_module_type(atl win32dll) + +target_link_libraries(atl + ${CMAKE_CURRENT_BINARY_DIR}/atl.def + uuid + wine) + +add_importlibs(atl + msvcrt + ole32 + oleaut32 + user32 + advapi32 + gdi32 + kernel32 + ntdll) + +add_dependencies(atl atl_atliface_header atl_def) +add_livecd_target(atl reactos/system32) Propchange: branches/cmake-bringup/dll/win32/atl/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/glu32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -12,7 +12,7 @@ spec2def(glu32 ${CMAKE_CURRENT_SOURCE_DIR}/glu32.spec ${CMAKE_CURRENT_BINARY_DIR}/glu32.def) -list(APPEND SOURCE +add_library(glu32 SHARED libnurbs/interface/bezierEval.cc libnurbs/interface/bezierPatch.cc libnurbs/interface/bezierPatchMesh.cc @@ -103,12 +103,11 @@ libutil/quad.c libutil/registry.c) -add_library(glu32 SHARED ${SOURCE}) - set_entrypoint(glu32 0) target_link_libraries(glu32 ${CMAKE_CURRENT_BINARY_DIR}/glu32.def) -add_importlibs(glu32 +add_importlibs( + glu32 gcc msvcrt opengl32 @@ -116,5 +115,5 @@ kernel32 ntdll) -add_dependencies(glu32 glu32_def psdk buildno_header) +add_dependencies(glu32 glu32_def) add_livecd_target(glu32 reactos/system32) Added: branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/hhctrl.… ============================================================================== --- branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -1,0 +1,37 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(hhctrl ${CMAKE_CURRENT_SOURCE_DIR}/hhctrl.ocx.spec ${CMAKE_CURRENT_BINARY_DIR}/hhctrl.def) + +add_library(hhctrl SHARED + chm.c + content.c + help.c + hhctrl.c + index.c + regsvr.c + search.c + stream.c + webbrowser.c + hhctrl.rc) + +set_module_type(hhctrl win32ocx) + +target_link_libraries(hhctrl + ${CMAKE_CURRENT_BINARY_DIR}/hhctrl.def + uuid + wine) + +add_importlibs(hhctrl + advapi32 + comctl32 + shlwapi + ole32 + oleaut32 + user32 + gdi32 + kernel32 + ntdll) + +add_dependencies(hhctrl hhctrl_def) Propchange: branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/iprtprio/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/iprtpri… ============================================================================== --- branches/cmake-bringup/dll/win32/iprtprio/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/iprtprio/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -1,0 +1,17 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(itircl ${CMAKE_CURRENT_SOURCE_DIR}/itircl.spec ${CMAKE_CURRENT_BINARY_DIR}/itircl.def) + +add_library(itircl SHARED itircl_main.c) + +set_module_type(itircl win32dll) + +target_link_libraries(itircl + ${CMAKE_CURRENT_BINARY_DIR}/itircl.def + wine) + +add_importlibs(itircl kernel32 ntdll) +add_dependencies(itircl itircl_def psdk) +add_livecd_target(itircl reactos/system32) Propchange: branches/cmake-bringup/dll/win32/iprtprio/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/itss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/itss/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/itss/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/itss/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -1,6 +1,5 @@ -add_definitions(-D__WINESRC__) -add_definitions(-D_DLL -D__USE_CRTIMP) +add_definitions(-D__WINESRC__ -D_DLL -D__USE_CRTIMP) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(itss ${CMAKE_CURRENT_SOURCE_DIR}/itss.spec ${CMAKE_CURRENT_BINARY_DIR}/itss.def) @@ -25,6 +24,7 @@ urlmon shlwapi ole32 + kernel32 ntdll) add_dependencies(itss itss_def wineheaders) Added: branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/jscript… ============================================================================== --- branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -1,0 +1,54 @@ + +ADD_TYPELIB(jsglobal jsglobal.idl) + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +add_definitions( + -D__WINESRC__ + -D_DLL + -D__USE_CRTIMP) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(jscript ${CMAKE_CURRENT_SOURCE_DIR}/jscript.spec ${CMAKE_CURRENT_BINARY_DIR}/jscript.def) + +add_library(jscript SHARED + activex.c + date.c + dispex.c + engine.c + error.c + jscript.c + jscript_main.c + jsutils.c + lex.c + parser.tab.c + math.c + number.c + object.c + regexp.c + string.c + array.c + bool.c + function.c + global.c + rsrc.rc) + +set_module_type(jscript win32dll) + +target_link_libraries(jscript + ${CMAKE_CURRENT_BINARY_DIR}/jscript.def + wine) + +add_importlibs(jscript + msvcrt + user32 + ole32 + oleaut32 + advapi32 + kernel32 + ntdll) + +add_dependencies(jscript jsglobal jscript_def) +add_livecd_target(jscript reactos/system32) Propchange: branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mshtml.… ============================================================================== --- branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -1,0 +1,24 @@ + +ADD_TYPELIB(mshtml_tlb mshtml_tlb.idl) +add_dependencies(mshtml_tlb stdole2) + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mshtml.tlb.def + COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/mshtml.tlb.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/mshtml.tlb.spec --filename mshtml.tlb + DEPENDS native-winebuild) +set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/mshtml.tlb.def PROPERTIES GENERATED TRUE) +add_custom_target(mshtml.tlb_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mshtml.tlb.def) + +add_library(mshtml.tlb SHARED rsrc.rc) + +set_entrypoint(mshtml.tlb 0) +set_target_properties(mshtml.tlb PROPERTIES SUFFIX "") + +target_link_libraries(mshtml.tlb ${CMAKE_CURRENT_BINARY_DIR}/mshtml.tlb.def) + +add_dependencies(mshtml.tlb mshtml_tlb mshtml.tlb_def) +add_livecd_target(mshtml.tlb reactos/system32) Propchange: branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/mshtml/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mshtml/… ============================================================================== --- branches/cmake-bringup/dll/win32/mshtml/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/mshtml/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -1,0 +1,103 @@ + +ADD_INTERFACE_DEFINITIONS(mshtml_nsiface_header nsiface.idl) + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +add_definitions( + -D__WINESRC__ + -D_DLL + -D__USE_CRTIMP) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(mshtml ${CMAKE_CURRENT_SOURCE_DIR}/mshtml.spec ${CMAKE_CURRENT_BINARY_DIR}/mshtml.def) + +add_library(mshtml SHARED + conpoint.c + dispex.c + editor.c + hlink.c + htmlanchor.c + htmlbody.c + htmlcomment.c + htmlcurstyle.c + htmldoc.c + htmldoc3.c + htmldoc5.c + htmlelem.c + htmlelem2.c + htmlelem3.c + htmlelemcol.c + htmlevent.c + htmlform.c + htmlframe.c + htmlframebase.c + htmlgeneric.c + htmliframe.c + htmlimg.c + htmlinput.c + htmllocation.c + htmlnode.c + htmloption.c + htmlscreen.c + htmlscript.c + htmlselect.c + htmlstyle.c + htmlstyle2.c + htmlstyle3.c + htmlstylesheet.c + htmltable.c + htmltablerow.c + htmltextarea.c + htmltextcont.c + htmltextnode.c + htmlwindow.c + install.c + loadopts.c + main.c + mutation.c + navigate.c + nsembed.c + nsevents.c + nsio.c + nsservice.c + olecmd.c + oleobj.c + olewnd.c + omnavigator.c + persist.c + protocol.c + script.c + secmgr.c + selection.c + service.c + task.c + txtrange.c + view.c + rsrc.rc) + +set_module_type(mshtml win32dll) + +target_link_libraries(mshtml + ${CMAKE_CURRENT_BINARY_DIR}/mshtml.def + uuid + wine + strmiids + oldnames) + +add_importlibs(mshtml +# msvcrt + urlmon + shlwapi + ole32 + oleaut32 + user32 + gdi32 + advapi32 + wininet + kernel32 + ntdll) + +add_dependencies(mshtml mshtml_nsiface_header mshtml_def) +add_livecd_target(mshtml reactos/system32) Propchange: branches/cmake-bringup/dll/win32/mshtml/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/msxml3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msxml3/… ============================================================================== --- branches/cmake-bringup/dll/win32/msxml3/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msxml3/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -1,26 +1,80 @@ + +ADD_TYPELIB(msxml3_v1 msxml3_v1.idl) +add_dependencies(msxml3_v1 stdole2) remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) +add_definitions(-D_WIN32_WINNT=0x601) -add_definitions(-D_DLL -D__USE_CRTIMP) +add_definitions( + -D__WINESRC__ + -D_WINE + -DLIBXML_STATIC + -D_DLL + -D__USE_CRTIMP) -spec2def(netcfgx ${CMAKE_CURRENT_SOURCE_DIR}/netcfgx.spec ${CMAKE_CURRENT_BINARY_DIR}/netcfgx.def) +if(MSVC) +add_definitions(/FIwine/typeof.h) +endif(MSVC) -add_library(netcfgx SHARED - netcfgx.c - classfactory.c - netcfg_iface.c - inetcfgcomp_iface.c - tcpipconf_notify.c - netcfgx.rc) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -set_module_type(netcfgx win32dll) +spec2def(msxml3 ${CMAKE_CURRENT_SOURCE_DIR}/msxml3.spec ${CMAKE_CURRENT_BINARY_DIR}/msxml3.def) -target_link_libraries(netcfgx - ${CMAKE_CURRENT_BINARY_DIR}/netcfgx.def +add_library(msxml3 SHARED + attribute.c + comment.c + domdoc.c + element.c + factory.c + main.c + httprequest.c + node.c + nodelist.c + nodemap.c + parseerror.c + pi.c + queryresult.c + regsvr.c + schema.c + text.c + uuid.c + xmldoc.c + xmlelem.c + saxreader.c + bsc.c + cdata.c + dispex.c + docfrag.c + domimpl.c + entityref.c + version.rc) + +set_module_type(msxml3 win32dll) + +target_link_libraries(msxml3 + ${CMAKE_CURRENT_BINARY_DIR}/msxml3.def + libxml2 uuid - wine) + wine + wineldr) -add_importlibs(netcfgx rpcrt4 setupapi advapi32 iphlpapi ole32 user32 comctl32 ws2_32 ntdll) -add_dependencies(netcfgx netcfgx_def) +add_importlibs(msxml3 + msvcrt + urlmon + wininet + ws2_32 + comctl32 + shell32 + shlwapi + cabinet + oleaut32 + ole32 + version + user32 + gdi32 + advapi32 + kernel32 + ntdll) + +add_dependencies(msxml3 msxml3_v1 msxml3_def) add_livecd_target(msxml3 reactos/system32) Added: branches/cmake-bringup/dll/win32/pstorec/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/pstorec… ============================================================================== --- branches/cmake-bringup/dll/win32/pstorec/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/pstorec/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -1,0 +1,21 @@ + +ADD_TYPELIB(pstorec_tlb pstorec_tlb.idl) +add_dependencies(pstorec_tlb stdole2) + +add_definitions(-D__WINESRC__) + +spec2def(pstorec ${CMAKE_CURRENT_SOURCE_DIR}/pstorec.spec ${CMAKE_CURRENT_BINARY_DIR}/pstorec.def) + +add_library(pstorec SHARED pstorec.c rsrc.rc) + +set_module_type(pstorec win32dll) + +target_link_libraries(pstorec + ${CMAKE_CURRENT_BINARY_DIR}/pstorec.def + uuid + wine) + +add_importlibs(pstorec msvcrt kernel32 ntdll) + +add_dependencies(pstorec pstorec_tlb pstorec_def) +add_livecd_target(pstorec reactos/system32) Propchange: branches/cmake-bringup/dll/win32/pstorec/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shdocvw… ============================================================================== --- branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -1,0 +1,53 @@ + +ADD_TYPELIB(shdocvw_v1 shdocvw_v1.idl) +add_dependencies(shdocvw_v1 stdole2) + +add_definitions(-D_SHDOCVW_) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(shdocvw ${CMAKE_CURRENT_SOURCE_DIR}/shdocvw.spec ${CMAKE_CURRENT_BINARY_DIR}/shdocvw.def) + +add_library(shdocvw SHARED + classinfo.c + client.c + dochost.c + events.c + factory.c + frame.c + ie.c + iexplore.c + intshcut.c + navigate.c + oleobject.c + persist.c + shdocvw_main.c + shlinstobj.c + taskbarlist.c + urlhist.c + view.c + webbrowser.c + shdocvw.rc) + +set_module_type(shdocvw win32dll) + +target_link_libraries(shdocvw + ${CMAKE_CURRENT_BINARY_DIR}/shdocvw.def + uuid + wine) + +add_importlibs(shdocvw + ole32 + oleaut32 + shlwapi + shell32 + user32 + advapi32 + gdi32 + version + urlmon + kernel32 + ntdll) + +add_dependencies(shdocvw shdocvw_v1 shdocvw_def) +add_livecd_target(shdocvw reactos/system32) Propchange: branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/shdocvw/En.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shdocvw… ============================================================================== --- branches/cmake-bringup/dll/win32/shdocvw/En.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shdocvw/En.rc [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -38,7 +38,7 @@ { POPUP "&New" { - MENUITEM "&Window" ID_BROWSE_NEW_WINDOW + MENUITEM "&Window", ID_BROWSE_NEW_WINDOW } MENUITEM "&Open...", ID_BROWSE_OPEN MENUITEM "&Save", ID_BROWSE_SAVE Added: branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/stdole2… ============================================================================== --- branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -1,0 +1,23 @@ + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +ADD_TYPELIB(std_ole_v2 std_ole_v2.idl) + +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/stdole2.tlb.def + COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/stdole2.tlb.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/stdole2.tlb.spec --filename stdole2.tlb + DEPENDS native-winebuild) +set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/stdole2.tlb.def PROPERTIES GENERATED TRUE) +add_custom_target(stdole2.tlb_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/stdole2.tlb.def) + +add_library(stdole2.tlb SHARED rsrc.rc) + +set_entrypoint(stdole2.tlb 0) +set_target_properties(stdole2.tlb PROPERTIES SUFFIX "") + +target_link_libraries(stdole2.tlb ${CMAKE_CURRENT_BINARY_DIR}/stdole2.tlb.def) + +add_dependencies(stdole2.tlb std_ole_v2 stdole2.tlb_def) +add_livecd_target(stdole2.tlb reactos/system32) Propchange: branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/stdole3… ============================================================================== --- branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -1,0 +1,23 @@ + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +ADD_TYPELIB(std_ole_v1 std_ole_v1.idl) + +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/stdole32.tlb.def + COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/stdole32.tlb.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/stdole32.tlb.spec --filename stdole32.tlb + DEPENDS native-winebuild) +set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/stdole32.tlb.def PROPERTIES GENERATED TRUE) +add_custom_target(stdole32.tlb_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/stdole32.tlb.def) + +add_library(stdole32.tlb SHARED rsrc.rc) + +set_entrypoint(stdole32.tlb 0) +set_target_properties(stdole32.tlb PROPERTIES SUFFIX "") + +target_link_libraries(stdole32.tlb ${CMAKE_CURRENT_BINARY_DIR}/stdole32.tlb.def) + +add_dependencies(stdole32.tlb std_ole_v1 stdole32.tlb_def) +add_livecd_target(stdole32.tlb reactos/system32) Propchange: branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/sti/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sti/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/sti/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sti/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -15,7 +15,8 @@ add_library(sti SHARED regsvr.c sti.c - sti_main.c) + sti_main.c + sti_wia.idl) set_entrypoint(sti 0) @@ -35,3 +36,6 @@ ntdll) add_dependencies(sti sti_def) + +rpcproxy(sti sti_wia.idl) +add_livecd_target(sti reactos/system32) Modified: branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winemp3… ============================================================================== --- branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -21,7 +21,13 @@ ${CMAKE_CURRENT_BINARY_DIR}/winemp3.acm.def mingw_common wine - mpg123) + libmpg123) -add_importlibs(winemp3.acm msvcrt winmm user32) +add_importlibs(winemp3.acm + msvcrt + winmm + user32 + kernel32 + ntdll) + add_dependencies(winemp3.acm winemp3.acm_def psdk) Modified: branches/cmake-bringup/include/reactos/wine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/w… ============================================================================== --- branches/cmake-bringup/include/reactos/wine/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/wine/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -1,3 +1,6 @@ + +ADD_INTERFACE_DEFINITIONS(wineheaders itss.idl wined3d.idl) + list(APPEND SOURCE epm.idl irot.idl) Modified: branches/cmake-bringup/lib/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/atl/CMakeList… ============================================================================== --- branches/cmake-bringup/lib/atl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/atl/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -1,7 +1,5 @@ - -file(GLOB_RECURSE SOURCE "*.cpp") add_definitions(-DUNICODE -D_UNICODE) add_definitions(-DROS_Headers) -add_library(atl ${SOURCE}) +add_library(atlnew atlbase.cpp atlcore.cpp)

1 0

[tkreuzer] 49324: [FORMATTING] - Replace big file header with small header - apply consistent indentation of 4 spaces
by tkreuzer＠svn.reactos.org 28 Oct '10

28 Oct '10

Author: tkreuzer Date: Thu Oct 28 08:15:41 2010 New Revision: 49324 URL: http://svn.reactos.org/svn/reactos?rev=49324&view=rev Log: [FORMATTING] - Replace big file header with small header - apply consistent indentation of 4 spaces Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Thu Oct 28 08:15:41 2010 @@ -1,23 +1,9 @@ /* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * Entry Point for win32k.sys + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Driver entry and initialization of win32k + * FILE: subsystems/win32/win32k/main/main.c + * PROGRAMER: */ #include <win32k.h> @@ -77,92 +63,92 @@ /* FIXME - unlock the process */ } - if (Create) - { - SIZE_T ViewSize = 0; - LARGE_INTEGER Offset; - PVOID UserBase = NULL; - NTSTATUS Status; - extern PSECTION_OBJECT GlobalUserHeapSection; - DPRINT("Creating W32 process PID:%d at IRQ level: %lu\n", Process->UniqueProcessId, KeGetCurrentIrql()); - - /* map the global heap into the process */ - Offset.QuadPart = 0; - Status = MmMapViewOfSection(GlobalUserHeapSection, - PsGetCurrentProcess(), - &UserBase, - 0, - 0, - &Offset, - &ViewSize, - ViewUnmap, - SEC_NO_CHANGE, - PAGE_EXECUTE_READ); /* would prefer PAGE_READONLY, but thanks to RTL heaps... */ - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to map the global heap! 0x%x\n", Status); - RETURN(Status); - } - Win32Process->HeapMappings.Next = NULL; - Win32Process->HeapMappings.KernelMapping = (PVOID)GlobalUserHeap; - Win32Process->HeapMappings.UserMapping = UserBase; - Win32Process->HeapMappings.Count = 1; - - InitializeListHead(&Win32Process->ClassList); - - InitializeListHead(&Win32Process->MenuListHead); - - InitializeListHead(&Win32Process->GDIBrushAttrFreeList); - InitializeListHead(&Win32Process->GDIDcAttrFreeList); - - InitializeListHead(&Win32Process->PrivateFontListHead); - ExInitializeFastMutex(&Win32Process->PrivateFontListLock); - - InitializeListHead(&Win32Process->DriverObjListHead); - ExInitializeFastMutex(&Win32Process->DriverObjListLock); - - Win32Process->KeyboardLayout = W32kGetDefaultKeyLayout(); - - if(Process->Peb != NULL) - { - /* map the gdi handle table to user land */ - Process->Peb->GdiSharedHandleTable = GDI_MapHandleTable(GdiTableSection, Process); - Process->Peb->GdiDCAttributeList = GDI_BATCH_LIMIT; - } - - Win32Process->peProcess = Process; - /* setup process flags */ - Win32Process->W32PF_flags = 0; - } - else - { - DPRINT("Destroying W32 process PID:%d at IRQ level: %lu\n", Process->UniqueProcessId, KeGetCurrentIrql()); - IntCleanupMenus(Process, Win32Process); - IntCleanupCurIcons(Process, Win32Process); - CleanupMonitorImpl(); - - /* no process windows should exist at this point, or the function will assert! */ - DestroyProcessClasses(Win32Process); - - GDI_CleanupForProcess(Process); - - co_IntGraphicsCheck(FALSE); - - /* - * Deregister logon application automatically - */ - if(LogonProcess == Win32Process) - { - LogonProcess = NULL; - } - } - - RETURN( STATUS_SUCCESS); + if (Create) + { + SIZE_T ViewSize = 0; + LARGE_INTEGER Offset; + PVOID UserBase = NULL; + NTSTATUS Status; + extern PSECTION_OBJECT GlobalUserHeapSection; + DPRINT("Creating W32 process PID:%d at IRQ level: %lu\n", Process->UniqueProcessId, KeGetCurrentIrql()); + + /* map the global heap into the process */ + Offset.QuadPart = 0; + Status = MmMapViewOfSection(GlobalUserHeapSection, + PsGetCurrentProcess(), + &UserBase, + 0, + 0, + &Offset, + &ViewSize, + ViewUnmap, + SEC_NO_CHANGE, + PAGE_EXECUTE_READ); /* would prefer PAGE_READONLY, but thanks to RTL heaps... */ + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to map the global heap! 0x%x\n", Status); + RETURN(Status); + } + Win32Process->HeapMappings.Next = NULL; + Win32Process->HeapMappings.KernelMapping = (PVOID)GlobalUserHeap; + Win32Process->HeapMappings.UserMapping = UserBase; + Win32Process->HeapMappings.Count = 1; + + InitializeListHead(&Win32Process->ClassList); + + InitializeListHead(&Win32Process->MenuListHead); + + InitializeListHead(&Win32Process->GDIBrushAttrFreeList); + InitializeListHead(&Win32Process->GDIDcAttrFreeList); + + InitializeListHead(&Win32Process->PrivateFontListHead); + ExInitializeFastMutex(&Win32Process->PrivateFontListLock); + + InitializeListHead(&Win32Process->DriverObjListHead); + ExInitializeFastMutex(&Win32Process->DriverObjListLock); + + Win32Process->KeyboardLayout = W32kGetDefaultKeyLayout(); + + if(Process->Peb != NULL) + { + /* map the gdi handle table to user land */ + Process->Peb->GdiSharedHandleTable = GDI_MapHandleTable(GdiTableSection, Process); + Process->Peb->GdiDCAttributeList = GDI_BATCH_LIMIT; + } + + Win32Process->peProcess = Process; + /* setup process flags */ + Win32Process->W32PF_flags = 0; + } + else + { + DPRINT("Destroying W32 process PID:%d at IRQ level: %lu\n", Process->UniqueProcessId, KeGetCurrentIrql()); + IntCleanupMenus(Process, Win32Process); + IntCleanupCurIcons(Process, Win32Process); + CleanupMonitorImpl(); + + /* no process windows should exist at this point, or the function will assert! */ + DestroyProcessClasses(Win32Process); + + GDI_CleanupForProcess(Process); + + co_IntGraphicsCheck(FALSE); + + /* + * Deregister logon application automatically + */ + if(LogonProcess == Win32Process) + { + LogonProcess = NULL; + } + } + + RETURN( STATUS_SUCCESS); CLEANUP: - UserLeave(); - DPRINT("Leave Win32kProcessCallback, ret=%i\n",_ret_); - END_CLEANUP; + UserLeave(); + DPRINT("Leave Win32kProcessCallback, ret=%i\n",_ret_); + END_CLEANUP; } @@ -199,134 +185,134 @@ PsSetThreadWin32Thread(Thread, Win32Thread); /* FIXME - unlock the process */ } - if (Type == PsW32ThreadCalloutInitialize) - { - HWINSTA hWinSta = NULL; - PTEB pTeb; - HDESK hDesk = NULL; - NTSTATUS Status; - PUNICODE_STRING DesktopPath; - PRTL_USER_PROCESS_PARAMETERS ProcessParams = (Process->Peb ? Process->Peb->ProcessParameters : NULL); - - DPRINT("Creating W32 thread TID:%d at IRQ level: %lu\n", Thread->Cid.UniqueThread, KeGetCurrentIrql()); - - InitializeListHead(&Win32Thread->WindowListHead); - InitializeListHead(&Win32Thread->W32CallbackListHead); - InitializeListHead(&Win32Thread->PtiLink); - for (i = 0; i < NB_HOOKS; i++) - { - InitializeListHead(&Win32Thread->aphkStart[i]); - } - - /* - * inherit the thread desktop and process window station (if not yet inherited) from the process startup - * info structure. See documentation of CreateProcess() - */ - DesktopPath = (ProcessParams ? ((ProcessParams->DesktopInfo.Length > 0) ? &ProcessParams->DesktopInfo : NULL) : NULL); - Status = IntParseDesktopPath(Process, - DesktopPath, - &hWinSta, - &hDesk); - if(NT_SUCCESS(Status)) - { - if(hWinSta != NULL) - { - if(Process != CsrProcess) - { - HWINSTA hProcessWinSta = (HWINSTA)InterlockedCompareExchangePointer((PVOID)&Process->Win32WindowStation, (PVOID)hWinSta, NULL); - if(hProcessWinSta != NULL) + if (Type == PsW32ThreadCalloutInitialize) + { + HWINSTA hWinSta = NULL; + PTEB pTeb; + HDESK hDesk = NULL; + NTSTATUS Status; + PUNICODE_STRING DesktopPath; + PRTL_USER_PROCESS_PARAMETERS ProcessParams = (Process->Peb ? Process->Peb->ProcessParameters : NULL); + + DPRINT("Creating W32 thread TID:%d at IRQ level: %lu\n", Thread->Cid.UniqueThread, KeGetCurrentIrql()); + + InitializeListHead(&Win32Thread->WindowListHead); + InitializeListHead(&Win32Thread->W32CallbackListHead); + InitializeListHead(&Win32Thread->PtiLink); + for (i = 0; i < NB_HOOKS; i++) + { + InitializeListHead(&Win32Thread->aphkStart[i]); + } + + /* + * inherit the thread desktop and process window station (if not yet inherited) from the process startup + * info structure. See documentation of CreateProcess() + */ + DesktopPath = (ProcessParams ? ((ProcessParams->DesktopInfo.Length > 0) ? &ProcessParams->DesktopInfo : NULL) : NULL); + Status = IntParseDesktopPath(Process, + DesktopPath, + &hWinSta, + &hDesk); + if(NT_SUCCESS(Status)) + { + if(hWinSta != NULL) { - /* our process is already assigned to a different window station, we don't need the handle anymore */ - NtClose(hWinSta); + if(Process != CsrProcess) + { + HWINSTA hProcessWinSta = (HWINSTA)InterlockedCompareExchangePointer((PVOID)&Process->Win32WindowStation, (PVOID)hWinSta, NULL); + if(hProcessWinSta != NULL) + { + /* our process is already assigned to a different window station, we don't need the handle anymore */ + NtClose(hWinSta); + } + } + else + { + NtClose(hWinSta); + } } - } - else - { - NtClose(hWinSta); - } - } - - if (hDesk != NULL) - { - PDESKTOP DesktopObject; - Win32Thread->rpdesk = NULL; - Status = ObReferenceObjectByHandle(hDesk, - 0, - ExDesktopObjectType, - KernelMode, - (PVOID*)&DesktopObject, - NULL); - NtClose(hDesk); - if(NT_SUCCESS(Status)) - { - if (!IntSetThreadDesktop(DesktopObject, - FALSE)) + + if (hDesk != NULL) { - DPRINT1("Unable to set thread desktop\n"); + PDESKTOP DesktopObject; + Win32Thread->rpdesk = NULL; + Status = ObReferenceObjectByHandle(hDesk, + 0, + ExDesktopObjectType, + KernelMode, + (PVOID*)&DesktopObject, + NULL); + NtClose(hDesk); + if(NT_SUCCESS(Status)) + { + if (!IntSetThreadDesktop(DesktopObject, + FALSE)) + { + DPRINT1("Unable to set thread desktop\n"); + } + } + else + { + DPRINT1("Unable to reference thread desktop handle 0x%x\n", hDesk); + } } - } - else - { - DPRINT1("Unable to reference thread desktop handle 0x%x\n", hDesk); - } - } - } - Win32Thread->TIF_flags &= ~TIF_INCLEANUP; - co_IntDestroyCaret(Win32Thread); - Win32Thread->ppi = PsGetCurrentProcessWin32Process(); - pTeb = NtCurrentTeb(); - if (pTeb) - { - Win32Thread->pClientInfo = (PCLIENTINFO)pTeb->Win32ClientInfo; - Win32Thread->pClientInfo->pClientThreadInfo = NULL; - } - Win32Thread->MessageQueue = MsqCreateMessageQueue(Thread); - Win32Thread->KeyboardLayout = W32kGetDefaultKeyLayout(); - Win32Thread->pEThread = Thread; - } - else - { - PSINGLE_LIST_ENTRY e; - - DPRINT("Destroying W32 thread TID:%d at IRQ level: %lu\n", Thread->Cid.UniqueThread, KeGetCurrentIrql()); - - Win32Thread->TIF_flags |= TIF_INCLEANUP; - DceFreeThreadDCE(Win32Thread); - HOOK_DestroyThreadHooks(Thread); - EVENT_DestroyThreadEvents(Thread); - /* Cleanup timers */ - DestroyTimersForThread(Win32Thread); - KeSetEvent(Win32Thread->MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); - UnregisterThreadHotKeys(Thread); - /* what if this co_ func crash in umode? what will clean us up then? */ - co_DestroyThreadWindows(Thread); - IntBlockInput(Win32Thread, FALSE); - MsqDestroyMessageQueue(Win32Thread->MessageQueue); - IntCleanupThreadCallbacks(Win32Thread); - - /* cleanup user object references stack */ - e = PopEntryList(&Win32Thread->ReferencesList); - while (e) - { - PUSER_REFERENCE_ENTRY ref = CONTAINING_RECORD(e, USER_REFERENCE_ENTRY, Entry); - DPRINT("thread clean: remove reference obj 0x%x\n",ref->obj); - UserDereferenceObject(ref->obj); - - e = PopEntryList(&Win32Thread->ReferencesList); - } - - IntSetThreadDesktop(NULL, - TRUE); - - PsSetThreadWin32Thread(Thread, NULL); - } - - RETURN( STATUS_SUCCESS); + } + Win32Thread->TIF_flags &= ~TIF_INCLEANUP; + co_IntDestroyCaret(Win32Thread); + Win32Thread->ppi = PsGetCurrentProcessWin32Process(); + pTeb = NtCurrentTeb(); + if (pTeb) + { + Win32Thread->pClientInfo = (PCLIENTINFO)pTeb->Win32ClientInfo; + Win32Thread->pClientInfo->pClientThreadInfo = NULL; + } + Win32Thread->MessageQueue = MsqCreateMessageQueue(Thread); + Win32Thread->KeyboardLayout = W32kGetDefaultKeyLayout(); + Win32Thread->pEThread = Thread; + } + else + { + PSINGLE_LIST_ENTRY e; + + DPRINT("Destroying W32 thread TID:%d at IRQ level: %lu\n", Thread->Cid.UniqueThread, KeGetCurrentIrql()); + + Win32Thread->TIF_flags |= TIF_INCLEANUP; + DceFreeThreadDCE(Win32Thread); + HOOK_DestroyThreadHooks(Thread); + EVENT_DestroyThreadEvents(Thread); + /* Cleanup timers */ + DestroyTimersForThread(Win32Thread); + KeSetEvent(Win32Thread->MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); + UnregisterThreadHotKeys(Thread); + /* what if this co_ func crash in umode? what will clean us up then? */ + co_DestroyThreadWindows(Thread); + IntBlockInput(Win32Thread, FALSE); + MsqDestroyMessageQueue(Win32Thread->MessageQueue); + IntCleanupThreadCallbacks(Win32Thread); + + /* cleanup user object references stack */ + e = PopEntryList(&Win32Thread->ReferencesList); + while (e) + { + PUSER_REFERENCE_ENTRY ref = CONTAINING_RECORD(e, USER_REFERENCE_ENTRY, Entry); + DPRINT("thread clean: remove reference obj 0x%x\n",ref->obj); + UserDereferenceObject(ref->obj); + + e = PopEntryList(&Win32Thread->ReferencesList); + } + + IntSetThreadDesktop(NULL, + TRUE); + + PsSetThreadWin32Thread(Thread, NULL); + } + + RETURN( STATUS_SUCCESS); CLEANUP: - UserLeave(); - DPRINT("Leave Win32kThreadCallback, ret=%i\n",_ret_); - END_CLEANUP; + UserLeave(); + DPRINT("Leave Win32kThreadCallback, ret=%i\n",_ret_); + END_CLEANUP; } /* Only used in ntuser/input.c KeyboardThreadMain(). If it's @@ -334,36 +320,36 @@ NTSTATUS Win32kInitWin32Thread(PETHREAD Thread) { - PEPROCESS Process; - - Process = Thread->ThreadsProcess; - - if (Process->Win32Process == NULL) - { - /* FIXME - lock the process */ - Process->Win32Process = ExAllocatePoolWithTag(NonPagedPool, sizeof(PROCESSINFO), USERTAG_PROCESSINFO); - - if (Process->Win32Process == NULL) - return STATUS_NO_MEMORY; - - RtlZeroMemory(Process->Win32Process, sizeof(PROCESSINFO)); - /* FIXME - unlock the process */ - - Win32kProcessCallback(Process, TRUE); - } - - if (Thread->Tcb.Win32Thread == NULL) - { - Thread->Tcb.Win32Thread = ExAllocatePoolWithTag(NonPagedPool, sizeof(THREADINFO), USERTAG_THREADINFO); - if (Thread->Tcb.Win32Thread == NULL) - return STATUS_NO_MEMORY; - - RtlZeroMemory(Thread->Tcb.Win32Thread, sizeof(THREADINFO)); - - Win32kThreadCallback(Thread, PsW32ThreadCalloutInitialize); - } - - return(STATUS_SUCCESS); + PEPROCESS Process; + + Process = Thread->ThreadsProcess; + + if (Process->Win32Process == NULL) + { + /* FIXME - lock the process */ + Process->Win32Process = ExAllocatePoolWithTag(NonPagedPool, sizeof(PROCESSINFO), USERTAG_PROCESSINFO); + + if (Process->Win32Process == NULL) + return STATUS_NO_MEMORY; + + RtlZeroMemory(Process->Win32Process, sizeof(PROCESSINFO)); + /* FIXME - unlock the process */ + + Win32kProcessCallback(Process, TRUE); + } + + if (Thread->Tcb.Win32Thread == NULL) + { + Thread->Tcb.Win32Thread = ExAllocatePoolWithTag(NonPagedPool, sizeof(THREADINFO), USERTAG_THREADINFO); + if (Thread->Tcb.Win32Thread == NULL) + return STATUS_NO_MEMORY; + + RtlZeroMemory(Thread->Tcb.Win32Thread, sizeof(THREADINFO)); + + Win32kThreadCallback(Thread, PsW32ThreadCalloutInitialize); + } + + return(STATUS_SUCCESS); } C_ASSERT(sizeof(SERVERINFO) <= PAGE_SIZE); @@ -373,34 +359,33 @@ */ NTSTATUS APIENTRY DriverEntry ( - IN PDRIVER_OBJECT DriverObject, - IN PUNICODE_STRING RegistryPath) + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath) { - NTSTATUS Status; - BOOLEAN Result; - WIN32_CALLOUTS_FPNS CalloutData = {0}; - PVOID GlobalUserHeapBase = NULL; - - /* - * Register user mode call interface - * (system service table index = 1) - */ - Result = KeAddSystemServiceTable (Win32kSSDT, - NULL, - Win32kNumberOfSysCalls, - Win32kSSPT, - 1); - if (Result == FALSE) - { - DPRINT1("Adding system services failed!\n"); - return STATUS_UNSUCCESSFUL; - } - - hModuleWin = MmPageEntireDriver(DriverEntry); - DPRINT("Win32k hInstance 0x%x!\n",hModuleWin); + NTSTATUS Status; + BOOLEAN Result; + WIN32_CALLOUTS_FPNS CalloutData = {0}; + PVOID GlobalUserHeapBase = NULL; + /* - * Register Object Manager Callbacks + * Register user mode call interface + * (system service table index = 1) */ + Result = KeAddSystemServiceTable(Win32kSSDT, + NULL, + Win32kNumberOfSysCalls, + Win32kSSPT, + 1); + if (Result == FALSE) + { + DPRINT1("Adding system services failed!\n"); + return STATUS_UNSUCCESSFUL; + } + + hModuleWin = MmPageEntireDriver(DriverEntry); + DPRINT("Win32k hInstance 0x%x!\n",hModuleWin); + + /* Register Object Manager Callbacks */ CalloutData.WindowStationParseProcedure = IntWinStaObjectParse; CalloutData.WindowStationDeleteProcedure = IntWinStaObjectDelete; CalloutData.DesktopDeleteProcedure = IntDesktopObjectDelete; @@ -408,11 +393,10 @@ CalloutData.ThreadCallout = Win32kThreadCallback; CalloutData.BatchFlushRoutine = NtGdiFlushUserBatch; - /* - * Register our per-process and per-thread structures. - */ + /* Register our per-process and per-thread structures. */ PsEstablishWin32Callouts((PWIN32_CALLOUTS_FPNS)&CalloutData); + /* Create the global USER heap */ GlobalUserHeap = UserCreateHeap(&GlobalUserHeapSection, &GlobalUserHeapBase, 1 * 1024 * 1024); /* FIXME - 1 MB for now... */ @@ -422,150 +406,152 @@ return STATUS_UNSUCCESSFUL; } - if (!gpsi) - { - gpsi = UserHeapAlloc(sizeof(SERVERINFO)); - if (gpsi) - { - RtlZeroMemory(gpsi, sizeof(SERVERINFO)); - DPRINT("Global Server Data -> %x\n", gpsi); - } - else - { - ASSERT(FALSE); - } - } - - if(!hsemDriverMgmt) hsemDriverMgmt = EngCreateSemaphore(); - - GdiHandleTable = GDIOBJ_iAllocHandleTable(&GdiTableSection); - if (GdiHandleTable == NULL) - { - DPRINT1("Failed to initialize the GDI handle table.\n"); - return STATUS_UNSUCCESSFUL; - } - - /* Initialize default palettes */ - PALETTE_Init(); - - /* Create stock objects, ie. precreated objects commonly - used by win32 applications */ - CreateStockObjects(); - CreateSysColorObjects(); - - InitXlateImpl(); - InitPDEVImpl(); - InitLDEVImpl(); - InitDeviceImpl(); - - Status = InitDcImpl(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to initialize Device context implementation!\n"); - return STATUS_UNSUCCESSFUL; - } - - Status = InitUserImpl(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to initialize user implementation!\n"); - return STATUS_UNSUCCESSFUL; - } - - Status = InitHotkeyImpl(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to initialize hotkey implementation!\n"); - return STATUS_UNSUCCESSFUL; - } - - Status = InitWindowStationImpl(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to initialize window station implementation!\n"); - return STATUS_UNSUCCESSFUL; - } - - Status = InitDesktopImpl(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to initialize desktop implementation!\n"); - return STATUS_UNSUCCESSFUL; - } - - Status = InitWindowImpl(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to initialize window implementation!\n"); - return STATUS_UNSUCCESSFUL; - } - - Status = InitMenuImpl(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to initialize menu implementation!\n"); - return STATUS_UNSUCCESSFUL; - } - - Status = InitInputImpl(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to initialize input implementation.\n"); - return(Status); - } - - Status = InitKeyboardImpl(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to initialize keyboard implementation.\n"); - return(Status); - } - - Status = InitMonitorImpl(); - if (!NT_SUCCESS(Status)) - { - DbgPrint("Failed to initialize monitor implementation!\n"); - return STATUS_UNSUCCESSFUL; - } - - Status = MsqInitializeImpl(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to initialize message queue implementation.\n"); - return(Status); - } - - Status = InitTimerImpl(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to initialize timer implementation.\n"); - return(Status); - } - - Status = InitAcceleratorImpl(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to initialize accelerator implementation.\n"); - return(Status); - } - - Status = InitGuiCheckImpl(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to initialize GUI check implementation.\n"); - return(Status); - } - - /* Initialize FreeType library */ - if (! InitFontSupport()) - { - DPRINT1("Unable to initialize font support\n"); - return STATUS_UNSUCCESSFUL; - } - - gusLanguageID = IntGdiGetLanguageID(); - - return STATUS_SUCCESS; + /* Allocate global server info structure */ + if (!gpsi) + { + gpsi = UserHeapAlloc(sizeof(SERVERINFO)); + if (gpsi) + { + RtlZeroMemory(gpsi, sizeof(SERVERINFO)); + DPRINT("Global Server Data -> %x\n", gpsi); + } + else + { + ASSERT(FALSE); + } + } + + if(!hsemDriverMgmt) hsemDriverMgmt = EngCreateSemaphore(); + + /* Create the GDI handle table */ + GdiHandleTable = GDIOBJ_iAllocHandleTable(&GdiTableSection); + if (GdiHandleTable == NULL) + { + DPRINT1("Failed to initialize the GDI handle table.\n"); + return STATUS_UNSUCCESSFUL; + } + + /* Initialize default palettes */ + PALETTE_Init(); + + /* Create stock objects, ie. precreated objects commonly + used by win32 applications */ + CreateStockObjects(); + CreateSysColorObjects(); + + InitXlateImpl(); + InitPDEVImpl(); + InitLDEVImpl(); + InitDeviceImpl(); + + Status = InitDcImpl(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to initialize Device context implementation!\n"); + return STATUS_UNSUCCESSFUL; + } + + Status = InitUserImpl(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to initialize user implementation!\n"); + return STATUS_UNSUCCESSFUL; + } + + Status = InitHotkeyImpl(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to initialize hotkey implementation!\n"); + return STATUS_UNSUCCESSFUL; + } + + Status = InitWindowStationImpl(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to initialize window station implementation!\n"); + return STATUS_UNSUCCESSFUL; + } + + Status = InitDesktopImpl(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to initialize desktop implementation!\n"); + return STATUS_UNSUCCESSFUL; + } + + Status = InitWindowImpl(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to initialize window implementation!\n"); + return STATUS_UNSUCCESSFUL; + } + + Status = InitMenuImpl(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to initialize menu implementation!\n"); + return STATUS_UNSUCCESSFUL; + } + + Status = InitInputImpl(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to initialize input implementation.\n"); + return(Status); + } + + Status = InitKeyboardImpl(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to initialize keyboard implementation.\n"); + return(Status); + } + + Status = InitMonitorImpl(); + if (!NT_SUCCESS(Status)) + { + DbgPrint("Failed to initialize monitor implementation!\n"); + return STATUS_UNSUCCESSFUL; + } + + Status = MsqInitializeImpl(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to initialize message queue implementation.\n"); + return(Status); + } + + Status = InitTimerImpl(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to initialize timer implementation.\n"); + return(Status); + } + + Status = InitAcceleratorImpl(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to initialize accelerator implementation.\n"); + return(Status); + } + + Status = InitGuiCheckImpl(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to initialize GUI check implementation.\n"); + return(Status); + } + + /* Initialize FreeType library */ + if (!InitFontSupport()) + { + DPRINT1("Unable to initialize font support\n"); + return STATUS_UNSUCCESSFUL; + } + + gusLanguageID = IntGdiGetLanguageID(); + + return STATUS_SUCCESS; } /* EOF */

1 0

[jgardou] 49323: sync with trunk r49322
by jgardou＠svn.reactos.org 27 Oct '10

27 Oct '10

Author: jgardou Date: Wed Oct 27 23:45:28 2010 New Revision: 49323 URL: http://svn.reactos.org/svn/reactos?rev=49323&view=rev Log: sync with trunk r49322 Added: branches/cmake-bringup/drivers/storage/classpnp/class.spec - copied unchanged from r49322, trunk/reactos/drivers/storage/classpnp/class.spec Removed: branches/cmake-bringup/drivers/storage/classpnp/class.def Modified: branches/cmake-bringup/ (props changed) branches/cmake-bringup/include/psdk/basetsd.h branches/cmake-bringup/lib/drivers/sound/mmixer/sup.c branches/cmake-bringup/lib/drivers/sound/mmixer/topology.c branches/cmake-bringup/ntoskrnl/io/iomgr/device.c branches/cmake-bringup/ntoskrnl/io/iomgr/irp.c branches/cmake-bringup/ntoskrnl/mm/ARM3/i386/init.c branches/cmake-bringup/ntoskrnl/mm/amd64/page.c branches/cmake-bringup/ntoskrnl/ntoskrnl.pspec branches/cmake-bringup/subsystems/win32/win32k/ntuser/keyboard.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/message.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/monitor.c [This mail would be too long, it was shortened to contain the URLs only.] Removed: branches/cmake-bringup/drivers/storage/classpnp/class.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… Modified: branches/cmake-bringup/include/psdk/basetsd.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/base… Modified: branches/cmake-bringup/lib/drivers/sound/mmixer/sup.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… Modified: branches/cmake-bringup/lib/drivers/sound/mmixer/topology.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… Modified: branches/cmake-bringup/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/io/iomgr… Modified: branches/cmake-bringup/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/io/iomgr… Modified: branches/cmake-bringup/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/ARM3/… Modified: branches/cmake-bringup/ntoskrnl/mm/amd64/page.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/amd64… Modified: branches/cmake-bringup/ntoskrnl/ntoskrnl.pspec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ntoskrnl… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/…

1 0

[tkreuzer] 49322: [NTOSKRNL] - Add IoWMIDeviceObjectToProviderId and IoIs32bitProcess stubs for 64bit builds - Comment out some deprecated amd64 code - Add MmProtectToValue - Fix a typo
by tkreuzer＠svn.reactos.org 27 Oct '10

27 Oct '10

Author: tkreuzer Date: Wed Oct 27 22:58:23 2010 New Revision: 49322 URL: http://svn.reactos.org/svn/reactos?rev=49322&view=rev Log: [NTOSKRNL] - Add IoWMIDeviceObjectToProviderId and IoIs32bitProcess stubs for 64bit builds - Comment out some deprecated amd64 code - Add MmProtectToValue - Fix a typo Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c trunk/reactos/ntoskrnl/io/iomgr/irp.c trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/amd64/page.c trunk/reactos/ntoskrnl/ntoskrnl.pspec Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Wed Oct 27 22:58:23 2010 @@ -1731,4 +1731,15 @@ KeLowerIrql(OldIrql); } +#if defined (_WIN64) +ULONG +NTAPI +IoWMIDeviceObjectToProviderId( + IN PDEVICE_OBJECT DeviceObject) +{ + UNIMPLEMENTED; + return 0; +} +#endif + /* EOF */ Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Wed Oct 27 22:58:23 2010 @@ -1816,3 +1816,14 @@ /* Set the IRP */ PsGetCurrentThread()->TopLevelIrp = (ULONG_PTR)Irp; } + +#if defined (_WIN64) +BOOLEAN +NTAPI +IoIs32bitProcess( + IN PIRP Irp OPTIONAL) +{ +#pragma message IoIs32bitProcess is hardcoded to FALSE + return FALSE; +} +#endif Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Wed Oct 27 22:58:23 2010 @@ -571,7 +571,7 @@ if (KiI386PentiumLockErrataPresent) { /* Mark the 1st IDT page as Write-Through to prevent a lockup - on a FOOF instruction. + on a F00F instruction. See http://www.rcollins.org/Errata/Dec97/F00FBug.html */ PointerPte = MiAddressToPte(KeGetPcr()->IDT); PointerPte->u.Hard.WriteThrough = 1; Modified: trunk/reactos/ntoskrnl/mm/amd64/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/amd64/page.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] Wed Oct 27 22:58:23 2010 @@ -77,6 +77,43 @@ PTE_EXECUTE_WRITECOPY | PTE_WRITECOMBINED_CACHE, }; +const +ULONG MmProtectToValue[32] = +{ + PAGE_NOACCESS, + PAGE_READONLY, + PAGE_EXECUTE, + PAGE_EXECUTE_READ, + PAGE_READWRITE, + PAGE_WRITECOPY, + PAGE_EXECUTE_READWRITE, + PAGE_EXECUTE_WRITECOPY, + PAGE_NOACCESS, + PAGE_NOCACHE | PAGE_READONLY, + PAGE_NOCACHE | PAGE_EXECUTE, + PAGE_NOCACHE | PAGE_EXECUTE_READ, + PAGE_NOCACHE | PAGE_READWRITE, + PAGE_NOCACHE | PAGE_WRITECOPY, + PAGE_NOCACHE | PAGE_EXECUTE_READWRITE, + PAGE_NOCACHE | PAGE_EXECUTE_WRITECOPY, + PAGE_NOACCESS, + PAGE_GUARD | PAGE_READONLY, + PAGE_GUARD | PAGE_EXECUTE, + PAGE_GUARD | PAGE_EXECUTE_READ, + PAGE_GUARD | PAGE_READWRITE, + PAGE_GUARD | PAGE_WRITECOPY, + PAGE_GUARD | PAGE_EXECUTE_READWRITE, + PAGE_GUARD | PAGE_EXECUTE_WRITECOPY, + PAGE_NOACCESS, + PAGE_WRITECOMBINE | PAGE_READONLY, + PAGE_WRITECOMBINE | PAGE_EXECUTE, + PAGE_WRITECOMBINE | PAGE_EXECUTE_READ, + PAGE_WRITECOMBINE | PAGE_READWRITE, + PAGE_WRITECOMBINE | PAGE_WRITECOPY, + PAGE_WRITECOMBINE | PAGE_EXECUTE_READWRITE, + PAGE_WRITECOMBINE | PAGE_EXECUTE_WRITECOPY +}; + /* PRIVATE FUNCTIONS *******************************************************/ BOOLEAN @@ -418,8 +455,8 @@ { Pfn = OldPte.u.Hard.PageFrameNumber; - if (FreePage) - MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn); + //if (FreePage) + //MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn); } else Pfn = 0; Modified: trunk/reactos/ntoskrnl/ntoskrnl.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.pspec?re… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] Wed Oct 27 22:58:23 2010 @@ -454,6 +454,7 @@ @ stdcall IoInitializeTimer(ptr ptr ptr) @ stdcall IoInvalidateDeviceRelations(ptr long) @ stdcall IoInvalidateDeviceState(ptr) +@ stdcall -arch=x86_64 IoIs32bitProcess(ptr) @ stdcall IoIsFileOriginRemote(ptr) @ stdcall IoIsOperationSynchronous(ptr) @ stdcall IoIsSystemThread(ptr) @@ -533,6 +534,7 @@ @ stdcall IoVolumeDeviceToDosName(ptr ptr) @ stdcall IoWMIAllocateInstanceIds(ptr long ptr) @ stdcall IoWMIDeviceObjectToInstanceName(ptr ptr ptr) +@ stdcall -arch=x86_64 IoWMIDeviceObjectToProviderId(ptr) @ stdcall IoWMIExecuteMethod(ptr ptr long long ptr ptr) @ stdcall IoWMIHandleToInstanceName(ptr ptr ptr) @ stdcall IoWMIOpenBlock(ptr long ptr)

1 0

[spetreolle] 49321: [CMAKE] Export cabman as native tool.
by spetreolle＠svn.reactos.org 27 Oct '10

27 Oct '10

Author: spetreolle Date: Wed Oct 27 22:43:04 2010 New Revision: 49321 URL: http://svn.reactos.org/svn/reactos?rev=49321&view=rev Log: [CMAKE] Export cabman as native tool. Modified: branches/cmake-bringup/CMakeLists.txt 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 22:43:04 2010 @@ -40,9 +40,9 @@ add_subdirectory(lib) if(NOT MSVC) -export(TARGETS widl winebuild nci buildno gendib cdmake mkhive FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) -else() -export(TARGETS winebuild nci buildno gendib cdmake mkhive FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) +export(TARGETS widl winebuild nci buildno gendib cabman cdmake mkhive FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) +else() +export(TARGETS winebuild nci buildno gendib cabman cdmake mkhive FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) endif() else()

1 0

[spetreolle] 49320: [CMAKE] Add cabman to build.
by spetreolle＠svn.reactos.org 27 Oct '10

27 Oct '10

Author: spetreolle Date: Wed Oct 27 22:41:00 2010 New Revision: 49320 URL: http://svn.reactos.org/svn/reactos?rev=49320&view=rev Log: [CMAKE] Add cabman to build. Added: branches/cmake-bringup/tools/cabman/CMakeLists.txt (with props) Modified: branches/cmake-bringup/tools/CMakeLists.txt Modified: branches/cmake-bringup/tools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/CMakeLists.… ============================================================================== --- branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] Wed Oct 27 22:41:00 2010 @@ -4,6 +4,7 @@ #add_executable(pefixup pefixup.c) add_subdirectory(buildno) +add_subdirectory(cabman) add_subdirectory(cdmake) add_subdirectory(gendib) add_subdirectory(mkhive) Added: branches/cmake-bringup/tools/cabman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/cabman/CMak… ============================================================================== --- branches/cmake-bringup/tools/cabman/CMakeLists.txt (added) +++ branches/cmake-bringup/tools/cabman/CMakeLists.txt [iso-8859-1] Wed Oct 27 22:41:00 2010 @@ -1,0 +1,12 @@ +list(APPEND SOURCE + cabinet.cxx + dfp.cxx + main.cxx + mszip.cxx + raw.cxx) + +include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/zlib) + +add_executable(cabman ${SOURCE}) + +target_link_libraries(cabman zlibhost) Propchange: branches/cmake-bringup/tools/cabman/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[jgardou] 49319: [CMAKE] - qedit depends on dxsdk
by jgardou＠svn.reactos.org 27 Oct '10

27 Oct '10

Author: jgardou Date: Wed Oct 27 22:39:48 2010 New Revision: 49319 URL: http://svn.reactos.org/svn/reactos?rev=49319&view=rev Log: [CMAKE] - qedit depends on dxsdk Modified: branches/cmake-bringup/dll/directx/qedit/CMakeLists.txt Modified: branches/cmake-bringup/dll/directx/qedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/qedit… ============================================================================== --- branches/cmake-bringup/dll/directx/qedit/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/qedit/CMakeLists.txt [iso-8859-1] Wed Oct 27 22:39:48 2010 @@ -31,5 +31,5 @@ kernel32 ntdll) -add_dependencies(qedit qedit_def) +add_dependencies(qedit qedit_def dxsdk) add_livecd_target(qedit reactos/system32)

1 0

[akhaldi] 49318: [CMAKE] - Improve win32k
by akhaldi＠svn.reactos.org 27 Oct '10

27 Oct '10

Author: akhaldi Date: Wed Oct 27 22:27:16 2010 New Revision: 49318 URL: http://svn.reactos.org/svn/reactos?rev=49318&view=rev Log: [CMAKE] - Improve win32k Modified: branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt Modified: branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… ============================================================================== --- branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] Wed Oct 27 22:27:16 2010 @@ -1,12 +1,11 @@ - - -include_directories(.) -include_directories(include) -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) -include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/include) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers) +include_directories( + . + include + ${REACTOS_SOURCE_DIR}/ntoskrnl/include + ${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/include + ${REACTOS_SOURCE_DIR}/include/reactos/subsys + ${REACTOS_SOURCE_DIR}/include/reactos/drivers) add_definitions(-DLANGPACK) add_definitions(-D_WIN32K_) @@ -178,17 +177,15 @@ ${CMAKE_CURRENT_BINARY_DIR}/win32k_pch.h.gch ${SOURCE}) -set_target_properties(win32k PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(win32k kernelmodedriver) target_link_libraries(win32k ${CMAKE_CURRENT_SOURCE_DIR}/win32k_i386.def pseh - -lntoskrnl - -lhal - -lftfd dxguid libcntpr) +add_importlibs(win32k ntoskrnl hal ftfd) add_pch(win32k ${CMAKE_CURRENT_SOURCE_DIR}/pch.h ${SOURCE}) -add_dependencies(win32k psdk gendib_generated bugcodes subsystem_napi buildno_header) +add_dependencies(win32k gendib_generated subsystem_napi) add_livecd_target(win32k reactos/system32)

1 0

[jgardou] 49317: [CMAKE] - Downgrade a warning to a status, so this is not too intrusive
by jgardou＠svn.reactos.org 27 Oct '10

27 Oct '10

Author: jgardou Date: Wed Oct 27 22:25:35 2010 New Revision: 49317 URL: http://svn.reactos.org/svn/reactos?rev=49317&view=rev Log: [CMAKE] - Downgrade a warning to a status, so this is not too intrusive Modified: branches/cmake-bringup/gcc.cmake 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 22:25:35 2010 @@ -108,7 +108,7 @@ if(DEFINED baseaddress_${MODULE}) set_image_base(${MODULE} ${baseaddress_${MODULE}}) else() - message(WARNING "${MODULE} has no base address") + message(STATUS "${MODULE} has no base address") endif() endif() if(${TYPE} MATCHES win32ocx)

1 0

[janderwald] 49316: - remove debug prints - dedicated to christoph
by janderwald＠svn.reactos.org 27 Oct '10

27 Oct '10

Author: janderwald Date: Wed Oct 27 21:12:44 2010 New Revision: 49316 URL: http://svn.reactos.org/svn/reactos?rev=49316&view=rev Log: - remove debug prints - dedicated to christoph Modified: trunk/reactos/lib/drivers/sound/mmixer/sup.c trunk/reactos/lib/drivers/sound/mmixer/topology.c Modified: trunk/reactos/lib/drivers/sound/mmixer/sup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/s… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/sup.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/sup.c [iso-8859-1] Wed Oct 27 21:12:44 2010 @@ -340,7 +340,6 @@ if (Index >= VolumeData->ValuesCount) { DPRINT1("Index %u out of bounds %u \n", Index, VolumeData->ValuesCount); - DbgBreakPoint(); return MM_STATUS_INVALID_PARAMETER; } Modified: trunk/reactos/lib/drivers/sound/mmixer/topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/t… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/topology.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/topology.c [iso-8859-1] Wed Oct 27 21:12:44 2010 @@ -14,23 +14,23 @@ { ULONG Index, SubIndex; - DPRINT1("Num Pins %lu NumNodes %lu\n", Topology->TopologyPinsCount, Topology->TopologyNodesCount); + DPRINT("Num Pins %lu NumNodes %lu\n", Topology->TopologyPinsCount, Topology->TopologyNodesCount); for(Index = 0; Index < Topology->TopologyPinsCount; Index++) { - DPRINT1("PinId %lu NodesConnectedFromCount %lu NodesConnectedToCount %lu Visited %lu\n", Topology->TopologyPins[Index].PinId, + DPRINT("PinId %lu NodesConnectedFromCount %lu NodesConnectedToCount %lu Visited %lu\n", Topology->TopologyPins[Index].PinId, Topology->TopologyPins[Index].NodesConnectedFromCount, Topology->TopologyPins[Index].NodesConnectedToCount, Topology->TopologyPins[Index].Visited); for(SubIndex = 0; SubIndex < Topology->TopologyPins[Index].NodesConnectedFromCount; SubIndex++) - DPRINT1("NodesConnectedFrom Index %lu NodeId %lu\n", SubIndex, Topology->TopologyPins[Index].NodesConnectedFrom[SubIndex]->NodeIndex); + DPRINT("NodesConnectedFrom Index %lu NodeId %lu\n", SubIndex, Topology->TopologyPins[Index].NodesConnectedFrom[SubIndex]->NodeIndex); for(SubIndex = 0; SubIndex < Topology->TopologyPins[Index].NodesConnectedToCount; SubIndex++) - DPRINT1("NodesConnectedTo Index %lu NodeId %lu\n", SubIndex, Topology->TopologyPins[Index].NodesConnectedTo[SubIndex]->NodeIndex); + DPRINT("NodesConnectedTo Index %lu NodeId %lu\n", SubIndex, Topology->TopologyPins[Index].NodesConnectedTo[SubIndex]->NodeIndex); } for(Index = 0; Index < Topology->TopologyNodesCount; Index++) { - DPRINT1("NodeId %lu NodesConnectedFromCount %lu NodesConnectedToCount %lu Visited %lu PinConnectedFromCount %lu PinConnectedToCount %lu\n", Topology->TopologyNodes[Index].NodeIndex, + DPRINT("NodeId %lu NodesConnectedFromCount %lu NodesConnectedToCount %lu Visited %lu PinConnectedFromCount %lu PinConnectedToCount %lu\n", Topology->TopologyNodes[Index].NodeIndex, Topology->TopologyNodes[Index].NodeConnectedFromCount, Topology->TopologyNodes[Index].NodeConnectedToCount, Topology->TopologyNodes[Index].Visited, Topology->TopologyNodes[Index].PinConnectedFromCount, Topology->TopologyNodes[Index].PinConnectedToCount); }

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
44
Older →

Jump to page:

2025

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