Ros-diffs December 2010

ros-diffs@reactos.org

20 participants
369 discussions

[jimtabor] 50218: [Win32k|User32] - Fix mdi class window function Id, now msi message tests do not assert.
by jimtabor＠svn.reactos.org 30 Dec '10

30 Dec '10

Author: jimtabor Date: Thu Dec 30 00:59:10 2010 New Revision: 50218 URL: http://svn.reactos.org/svn/reactos?rev=50218&view=rev Log: [Win32k|User32] - Fix mdi class window function Id, now msi message tests do not assert. Modified: trunk/reactos/dll/win32/user32/windows/mdi.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/mdi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/mdi.c [iso-8859-1] Thu Dec 30 00:59:10 2010 @@ -1111,6 +1111,7 @@ return FALSE; SetWindowLongPtrW( hwnd, 0, (LONG_PTR)ci ); ci->hBmpClose = 0; + NtUserSetWindowFNID( hwnd, FNID_MDICLIENT); // wine uses WIN_ISMDICLIENT #else WND *wndPtr = WIN_GetPtr( hwnd ); wndPtr->flags |= WIN_ISMDICLIENT; @@ -1160,6 +1161,7 @@ #ifdef __REACTOS__ HeapFree( GetProcessHeap(), 0, ci ); SetWindowLongPtrW( hwnd, 0, 0 ); + NtUserSetWindowFNID(hwnd, FNID_DESTROY); #endif return 0; } Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Thu Dec 30 00:59:10 2010 @@ -343,15 +343,12 @@ UINT id = 0; HWND top_child; PWND pWndParent; - PCLS pCls; pWndParent = ValidateHwnd(hWndParent); if (!pWndParent) return NULL; - pCls = DesktopPtrToUser(pWndParent->pcls); - - if (pCls->fnid != FNID_MDICLIENT) // wine uses WIN_ISMDICLIENT + if (pWndParent->fnid != FNID_MDICLIENT) // wine uses WIN_ISMDICLIENT { WARN("WS_EX_MDICHILD, but parent %p is not MDIClient\n", hWndParent); return NULL; @@ -469,15 +466,12 @@ UINT id = 0; HWND top_child; PWND pWndParent; - PCLS pCls; pWndParent = ValidateHwnd(hWndParent); if (!pWndParent) return NULL; - pCls = DesktopPtrToUser(pWndParent->pcls); - - if (pCls->fnid != FNID_MDICLIENT) + if (pWndParent->fnid != FNID_MDICLIENT) { WARN("WS_EX_MDICHILD, but parent %p is not MDIClient\n", hWndParent); return NULL; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Thu Dec 30 00:59:10 2010 @@ -3878,15 +3878,23 @@ RETURN( FALSE); } - if (Wnd->pcls) - { // From user land we only set these. - if ((fnID != FNID_DESTROY) || ((fnID < FNID_BUTTON) && (fnID > FNID_IME)) ) + if (Wnd->head.pti->ppi != PsGetCurrentProcessWin32Process()) + { + EngSetLastError(ERROR_ACCESS_DENIED); + RETURN( FALSE); + } + + // From user land we only set these. + if (fnID != FNID_DESTROY) + { + if ( ((fnID < FNID_BUTTON) && (fnID > FNID_IME)) || + Wnd->fnid != 0 ) { RETURN( FALSE); } - else - Wnd->pcls->fnid |= fnID; - } + } + + Wnd->fnid |= fnID; RETURN( TRUE); CLEANUP:

1 0

[tkreuzer] 50217: [CMAKE] LD is stupid and doesn't handle stdcall decoration as proper as dlltool does (after we provided a patch). Passing --kill-at, also kills C++ mangled names and exports with ...
by tkreuzer＠svn.reactos.org 29 Dec '10

29 Dec '10

Author: tkreuzer Date: Wed Dec 29 23:58:17 2010 New Revision: 50217 URL: http://svn.reactos.org/svn/reactos?rev=50217&view=rev Log: [CMAKE] LD is stupid and doesn't handle stdcall decoration as proper as dlltool does (after we provided a patch). Passing --kill-at, also kills C++ mangled names and exports with stdcall decoration are imposible. In trunk we use dlltool to generate an exp file that we link with LD, but in the cmake branch we pass the def file to LD directly. Luckily we have a tool called spec2def that can handle these things. We now generate 2 different .def files, one for LD, containing the undecorated export name forwarded to the decorated symbol name (FooFunc=FooFunc@12), while the 2nd def file which is passed to dlltool for exportlib generation has full stdcall decorations. --kill-at is now passed to dlltool only. This commit might break msvc, but should be pretty easy to fix. Modified: branches/cmake-bringup/gcc.cmake branches/cmake-bringup/toolchain-mingw32.cmake branches/cmake-bringup/tools/spec2def/spec2def.c Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=502… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Wed Dec 29 23:58:17 2010 @@ -9,7 +9,7 @@ link_directories("${REACTOS_SOURCE_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw) set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") -set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,--disable-auto-import") +set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--disable-auto-import") # -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS_INIT} -Wl,--disable-stdcall-fixup") @@ -242,8 +242,8 @@ add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a - COMMAND native-spec2def ${DLLNAME_OPTION} ${DECO_OPTION} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} - COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}.def --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a + COMMAND native-spec2def ${DLLNAME_OPTION} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} + COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}) elseif(${_extension} STREQUAL ".def") @@ -265,7 +265,7 @@ get_filename_component(_file ${_spec_file} NAME_WE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c - COMMAND native-spec2def -n=${_dllname} ${DECO_OPTION} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} + COMMAND native-spec2def -n=${_dllname} --kill-at -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE) Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32… ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Wed Dec 29 23:58:17 2010 @@ -49,14 +49,14 @@ set(CMAKE_CXX_STANDARD_LIBRARIES "" CACHE STRING "Standard C++ Libraries") if(ARCH MATCHES i386) - set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,--disable-auto-import") + set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--disable-auto-import") #-Wl,-T,${REACTOS_SOURCE_DIR}/global.lds elseif(ARCH MATCHES amd64) - set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,--disable-auto-import") + set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--disable-auto-import") endif() # adjust the default behaviour of the FIND_XXX() commands: -# search headers and libraries in the target environment, search +# search headers and libraries in the target environment, search # programs in the host environment set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) Modified: branches/cmake-bringup/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/spec2def/sp… ============================================================================== --- branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] Wed Dec 29 23:58:17 2010 @@ -2,10 +2,6 @@ #include <stdlib.h> #include <ctype.h> #include <string.h> - -#ifndef _WIN32 -#define _stricmp strcasecmp -#endif typedef struct { @@ -22,7 +18,8 @@ } EXPORT; typedef int (*PFNOUTLINE)(FILE *, EXPORT *); -int no_decoration = 0; +int gbKillAt = 0; +int gbUseDeco = 0; int no_redirections = 0; char *pszArchString = "i386"; char *pszArchString2; @@ -182,8 +179,8 @@ case ARG_PTR: fprintf(file, "0x%%p"); break; case ARG_STR: fprintf(file, "'%%s'"); break; case ARG_WSTR: fprintf(file, "'%%ws'"); break; - case ARG_DBL: fprintf(file, "%%\"PRix64\""); break; - case ARG_INT64: fprintf(file, "0x%%ll"); break; + case ARG_DBL: fprintf(file, "%%f"); break; + case ARG_INT64: fprintf(file, "%%\"PRix64\""); break; } } fprintf(file, ")\\n\""); @@ -197,7 +194,7 @@ case ARG_PTR: fprintf(file, "(void*)a%d", i); break; case ARG_STR: fprintf(file, "(char*)a%d", i); break; case ARG_WSTR: fprintf(file, "(wchar_t*)a%d", i); break; - case ARG_DBL: fprintf(file, "(__int64)a%d", i); break; + case ARG_DBL: fprintf(file, "(double)a%d", i); break; case ARG_INT64: fprintf(file, "(__int64)a%d", i); break; } } @@ -268,6 +265,22 @@ libname); } +void +PrintName(FILE *fileDest, EXPORT *pexp, int fRedir, int fDeco) +{ + char *pcName = fRedir ? pexp->pcRedirection : pexp->pcName; + int nNameLength = fRedir ? pexp->nRedirectionLength : pexp->nNameLength; + + if (fDeco && pexp->nCallingConvention == CC_FASTCALL) + fprintf(fileDest, "@"); + fprintf(fileDest, "%.*s", nNameLength, pcName); + if ((pexp->nCallingConvention == CC_STDCALL || + pexp->nCallingConvention == CC_FASTCALL) && fDeco) + { + fprintf(fileDest, "@%d", pexp->nStackBytes); + } +} + int OutputLine_def(FILE *fileDest, EXPORT *pexp) { @@ -280,42 +293,22 @@ } else { - if (pexp->nCallingConvention == CC_FASTCALL && !no_decoration) - { - fprintf(fileDest, "@"); - } - - fprintf(fileDest, "%.*s", pexp->nNameLength, pexp->pcName); - - if ((pexp->nCallingConvention == CC_STDCALL || - pexp->nCallingConvention == CC_FASTCALL) && !no_decoration) - { - fprintf(fileDest, "@%d", pexp->nStackBytes); - } + PrintName(fileDest, pexp, 0, gbUseDeco && !gbKillAt); } if (pexp->pcRedirection && !no_redirections) { - int bAddDecorations = 1; + int fDeco = (gbUseDeco && !ScanToken(pexp->pcRedirection, '.')); fprintf(fileDest, "="); - - /* No decorations, if switch was passed or this is an external */ - if (no_decoration || ScanToken(pexp->pcRedirection, '.')) - { - bAddDecorations = 0; - } - - if (pexp->nCallingConvention == CC_FASTCALL && bAddDecorations) - { - fprintf(fileDest, "@"); - } - fprintf(fileDest, "%.*s", pexp->nRedirectionLength, pexp->pcRedirection); - if ((pexp->nCallingConvention == CC_STDCALL || - pexp->nCallingConvention == CC_FASTCALL) && bAddDecorations) - { - fprintf(fileDest, "@%d", pexp->nStackBytes); - } + PrintName(fileDest, pexp, 1, fDeco); + } + else if (gbUseDeco && gbKillAt && + (pexp->nCallingConvention == CC_STDCALL || + pexp->nCallingConvention == CC_FASTCALL)) + { + fprintf(fileDest, "="); + PrintName(fileDest, pexp, 0, 1); } if (pexp->nOrdinal != -1) @@ -452,7 +445,7 @@ } else if (CompareToken(pc, "-i386")) { - if (_stricmp(pszArchString, "i386") != 0) included = 0; + if (strcasecmp(pszArchString, "i386") != 0) included = 0; } else if (CompareToken(pc, "-private")) { @@ -628,7 +621,7 @@ " -d=<file> generates a def file\n" " -s=<file> generates a stub file\n" " -n=<name> name of the dll\n" - " -@ removes @xx decorations from def file\n" + " --kill-at removes @xx decorations from exports\n" " -r removes redirections from def file\n" " -a=<arch> Set architecture to <arch>. (i386, x86_64, arm)\n"); } @@ -650,8 +643,8 @@ /* Read options */ for (i = 1; i < argc && *argv[i] == '-'; i++) { - if ((_stricmp(argv[i], "--help") == 0) || - (_stricmp(argv[i], "-h") == 0)) + if ((strcasecmp(argv[i], "--help") == 0) || + (strcasecmp(argv[i], "-h") == 0)) { usage(); return 0; @@ -672,11 +665,11 @@ { pszDllName = argv[i] + 3; } - else if ((_stricmp(argv[i], "-@") == 0)) - { - no_decoration = 1; - } - else if ((_stricmp(argv[i], "-r") == 0)) + else if ((strcasecmp(argv[i], "--kill-at") == 0)) + { + gbKillAt = 1; + } + else if ((strcasecmp(argv[i], "-r") == 0)) { no_redirections = 1; } @@ -691,13 +684,18 @@ } } - if ((_stricmp(pszArchString, "x86_64") == 0) || - (_stricmp(pszArchString, "ia64") == 0)) + if ((strcasecmp(pszArchString, "x86_64") == 0) || + (strcasecmp(pszArchString, "ia64") == 0)) { pszArchString2 = "win64"; } else pszArchString2 = "win32"; + + if (strcasecmp(pszArchString, "i386") == 0) + { + gbUseDeco = 1; + } /* Set a default dll name */ if (!pszDllName)

1 0

[akhaldi] 50216: [CMAKE] - Remove an unintended change.
by akhaldi＠svn.reactos.org 29 Dec '10

29 Dec '10

Author: akhaldi Date: Wed Dec 29 19:11:17 2010 New Revision: 50216 URL: http://svn.reactos.org/svn/reactos?rev=50216&view=rev Log: [CMAKE] - Remove an unintended change. Modified: branches/cmake-bringup/toolchain-mingw32.cmake Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32… ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Wed Dec 29 19:11:17 2010 @@ -42,8 +42,6 @@ set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> <CMAKE_C_LINK_FLAGS> <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos -I${REACTOS_SOURCE_DIR}/include/reactos/wine -I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -O coff -o <OBJECT> ") -set(CMAKE_C_CREATE_STATIC_LIBRARY "${MINGW_PREFIX}ar crs <TARGET> <LINK_FLAGS> <OBJECTS>") - # Use stdcall fixups, and don't link with anything by default unless we say so set(CMAKE_C_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C Libraries")

1 0

[jgardou] 50215: [CMAKE] Improve rpcproxy macro split boot/CMakeLists.txt into smaller and clearer CMakeLists.txt
by jgardou＠svn.reactos.org 29 Dec '10

29 Dec '10

Author: jgardou Date: Wed Dec 29 18:28:34 2010 New Revision: 50215 URL: http://svn.reactos.org/svn/reactos?rev=50215&view=rev Log: [CMAKE] Improve rpcproxy macro split boot/CMakeLists.txt into smaller and clearer CMakeLists.txt Added: branches/cmake-bringup/boot/freeldr/CMakeLists.txt (with props) branches/cmake-bringup/boot/freeldr/bootsect/CMakeLists.txt (with props) branches/cmake-bringup/boot/freeldr/freeldr/CMakeLists.txt (with props) Modified: branches/cmake-bringup/CMakeMacros.cmake branches/cmake-bringup/boot/CMakeLists.txt branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt branches/cmake-bringup/dll/win32/qmgrprxy/CMakeLists.txt branches/cmake-bringup/dll/win32/sti/CMakeLists.txt branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt Modified: branches/cmake-bringup/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeMacros.cmake… ============================================================================== --- branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] Wed Dec 29 18:28:34 2010 @@ -181,10 +181,6 @@ PROPERTIES GENERATED TRUE) list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c) list(APPEND IDLS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl) - list(APPEND PROXY_DEPENDS ${TARGET}_${FILE}_p) - add_custom_target(${TARGET}_${FILE}_p - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c) - #add_dependencies(${TARGET}_proxy ${TARGET}_${FILE}_p) endforeach() add_custom_command( @@ -194,9 +190,6 @@ set_source_files_properties( ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c PROPERTIES GENERATED TRUE) - - add_library(${TARGET}_proxy ${SOURCE}) - add_dependencies(${TARGET}_proxy psdk ${PROXY_DEPENDS}) endmacro() macro(idl_files) Modified: branches/cmake-bringup/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/CMakeLists.t… ============================================================================== --- branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] Wed Dec 29 18:28:34 2010 @@ -1,249 +1,6 @@ -CreateBootSectorTarget(dosmbr ${CMAKE_CURRENT_SOURCE_DIR}/freeldr/bootsect/dosmbr.asm ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/dosmbr.bin) -CreateBootSectorTarget(ext2 ${CMAKE_CURRENT_SOURCE_DIR}/freeldr/bootsect/ext2.asm ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/ext2.bin) -CreateBootSectorTarget(fat32 ${CMAKE_CURRENT_SOURCE_DIR}/freeldr/bootsect/fat32.asm ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/fat32.bin) -CreateBootSectorTarget(fat ${CMAKE_CURRENT_SOURCE_DIR}/freeldr/bootsect/fat.asm ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/fat.bin) -CreateBootSectorTarget(isoboot ${CMAKE_CURRENT_SOURCE_DIR}/freeldr/bootsect/isoboot.asm ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isoboot.bin) -CreateBootSectorTarget(isobtrt ${CMAKE_CURRENT_SOURCE_DIR}/freeldr/bootsect/isobtrt.asm ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isobtrt.bin) +add_subdirectory(freeldr) -include_directories(BEFORE freeldr/freeldr/include) -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -if(ARCH MATCHES arm) - if(SARCH MATCHES omap-zoom2) - add_definitions(-D_ZOOM2_) - endif() -endif() - -if(ARCH MATCHES i386) -if(MSVC) -list(APPEND FREELDR_BASE64K_SOURCE - freeldr/freeldr/arch/i386/realmode.S) -else() -list(APPEND FREELDR_STARTUP_SOURCE - freeldr/freeldr/arch/i386/fathelp.S - freeldr/freeldr/arch/i386/arch.S) -endif() -elseif(ARCH MATCHES amd64) -list(APPEND FREELDR_STARTUP_SOURCE - freeldr/freeldr/arch/i386/fathelp.S - freeldr/freeldr/arch/amd64/arch.S) -endif(ARCH MATCHES i386) - -if(ARCH MATCHES i386) -if(NOT MSVC) -list(APPEND FREELDR_BASE64K_SOURCE - freeldr/freeldr/arch/i386/boot.S - freeldr/freeldr/arch/i386/drvmap.S - freeldr/freeldr/arch/i386/i386cpu.S - freeldr/freeldr/arch/i386/i386idt.S - freeldr/freeldr/arch/i386/i386pnp.S - freeldr/freeldr/arch/i386/i386trap.S - freeldr/freeldr/arch/i386/int386.S - freeldr/freeldr/arch/i386/linux.S - freeldr/freeldr/arch/i386/mb.S - freeldr/freeldr/arch/i386/i386bug.c) -endif() -elseif(ARCH MATCHES amd64) -list(APPEND FREELDR_BASE64K_SOURCE - freeldr/freeldr/arch/i386/drvmap.S - freeldr/freeldr/arch/i386/i386cpu.S - freeldr/freeldr/arch/i386/i386idt.S - freeldr/freeldr/arch/i386/i386trap.S - freeldr/freeldr/arch/amd64/mb.S) -endif(ARCH MATCHES i386) - -set_source_files_properties(${FREELDR_BASE64K_SOURCE} PROPERTIES COMPILE_DEFINITIONS "_NTHAL_") - -include_directories(${REACTOS_SOURCE_DIR}/lib/cmlib) - -list(APPEND FREELDR_BASE_SOURCE - freeldr/freeldr/arcemul/mm.c - freeldr/freeldr/arcemul/time.c - freeldr/freeldr/cache/blocklist.c - freeldr/freeldr/cache/cache.c - freeldr/freeldr/comm/rs232.c - freeldr/freeldr/disk/disk.c - freeldr/freeldr/disk/partition.c - freeldr/freeldr/disk/ramdisk.c - freeldr/freeldr/disk/scsiport.c - freeldr/freeldr/fs/ext2.c - freeldr/freeldr/fs/fat.c - freeldr/freeldr/fs/fs.c - freeldr/freeldr/fs/iso.c - freeldr/freeldr/fs/ntfs.c - freeldr/freeldr/inifile/ini_init.c - freeldr/freeldr/inifile/inifile.c - freeldr/freeldr/inifile/parse.c - freeldr/freeldr/mm/meminit.c - freeldr/freeldr/mm/mm.c - freeldr/freeldr/reactos/registry.c - freeldr/freeldr/reactos/arcname.c - freeldr/freeldr/reactos/archwsup.c - freeldr/freeldr/reactos/binhive.c - freeldr/freeldr/reactos/reactos.c - freeldr/freeldr/reactos/imageldr.c - freeldr/freeldr/rtl/bget.c - freeldr/freeldr/rtl/libsupp.c - freeldr/freeldr/ui/directui.c - freeldr/freeldr/ui/gui.c - freeldr/freeldr/ui/minitui.c - freeldr/freeldr/ui/noui.c - freeldr/freeldr/ui/tui.c - freeldr/freeldr/ui/tuimenu.c - freeldr/freeldr/ui/ui.c - freeldr/freeldr/video/fade.c - freeldr/freeldr/video/palette.c - freeldr/freeldr/video/video.c - freeldr/freeldr/windows/conversion.c - freeldr/freeldr/windows/peloader.c - freeldr/freeldr/windows/winldr.c - freeldr/freeldr/windows/wlmemory.c - freeldr/freeldr/windows/wlregistry.c - freeldr/freeldr/freeldr.c - freeldr/freeldr/debug.c - freeldr/freeldr/version.c - freeldr/freeldr/cmdline.c - freeldr/freeldr/machine.c - freeldr/freeldr/options.c - freeldr/freeldr/linuxboot.c - freeldr/freeldr/oslist.c) - -if(ARCH MATCHES i386) -list(APPEND FREELDR_BASE_SOURCE - freeldr/freeldr/windows/headless.c - freeldr/freeldr/disk/scsiport.c) -endif(ARCH MATCHES i386) - -set_source_files_properties(${FREELDR_BASE_SOURCE} PROPERTIES COMPILE_DEFINITIONS "_NTHAL_;_BLDR_;_NTSYSTEM_") - -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/elf) - -if(ARCH MATCHES i386) -list(APPEND FREELDR_ARCH_SOURCE - freeldr/freeldr/arch/i386/archmach.c - freeldr/freeldr/arch/i386/custom.c - freeldr/freeldr/arch/i386/drivemap.c - freeldr/freeldr/arch/i386/halstub.c - freeldr/freeldr/arch/i386/hardware.c - freeldr/freeldr/arch/i386/hwacpi.c - freeldr/freeldr/arch/i386/hwapm.c - freeldr/freeldr/arch/i386/hwpci.c - freeldr/freeldr/arch/i386/i386disk.c - freeldr/freeldr/arch/i386/i386rtl.c - freeldr/freeldr/arch/i386/i386vid.c - freeldr/freeldr/arch/i386/loader.c - freeldr/freeldr/arch/i386/machpc.c - freeldr/freeldr/arch/i386/miscboot.c - freeldr/freeldr/arch/i386/ntoskrnl.c - freeldr/freeldr/arch/i386/pccons.c - freeldr/freeldr/arch/i386/pcdisk.c - freeldr/freeldr/arch/i386/pcmem.c - freeldr/freeldr/arch/i386/pcrtc.c - freeldr/freeldr/arch/i386/pcvideo.c - freeldr/freeldr/arch/i386/machxbox.c - freeldr/freeldr/arch/i386/xboxcons.c - freeldr/freeldr/arch/i386/xboxdisk.c - freeldr/freeldr/arch/i386/xboxfont.c - freeldr/freeldr/arch/i386/xboxhw.c - freeldr/freeldr/arch/i386/xboxi2c.c - freeldr/freeldr/arch/i386/xboxmem.c - freeldr/freeldr/arch/i386/xboxrtc.c - freeldr/freeldr/arch/i386/xboxvideo.c - freeldr/freeldr/windows/i386/ntsetup.c - freeldr/freeldr/windows/i386/wlmemory.c) -else() -#TBD -endif(ARCH MATCHES i386) - -set_source_files_properties(${FREELDR_ARCH_SOURCE} PROPERTIES COMPILE_DEFINITIONS "_NTHAL_;_BLDR_;_NTSYSTEM_") - -list(APPEND SETUPLDR_MAIN_SOURCE - freeldr/freeldr/bootmgr.c - freeldr/freeldr/inffile/inffile.c - freeldr/freeldr/reactos/setupldr.c) - -if(ARCH MATCHES i386) -list(APPEND SETUPLDR_MAIN_SOURCE freeldr/freeldr/windows/setupldr2.c) -elseif(ARCH MATCHES amd64) -list(APPEND SETUPLDR_MAIN_SOURCE freeldr/freeldr/windows/setupldr2.c) -endif(ARCH MATCHES i386) - -set_source_files_properties(${SETUPLDR_MAIN_SOURCE} PROPERTIES COMPILE_FLAGS "-ffreestanding -fno-builtin -fno-inline -fno-zero-initialized-in-bss") - - - -list(APPEND FREELDR_SOURCE - freeldr/freeldr/bootmgr.c - ${FREELDR_STARTUP_SOURCE} - ${FREELDR_BASE64K_SOURCE} - ${FREELDR_BASE_SOURCE} - ${FREELDR_ARCH_SOURCE}) - -add_library(freeldr SHARED - ${CMAKE_CURRENT_BINARY_DIR}/freeldr_freeldr.h.gch - ${FREELDR_SOURCE}) - -if(NOT MSVC) -set_target_properties(freeldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr/freeldr/freeldr_i386.lnk" SUFFIX ".sys") -set_image_base(freeldr 0x8000) -else() -set_target_properties(freeldr PROPERTIES LINK_FLAGS "/DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text /SUBSYSTEM:BOOT_APPLICATION" SUFFIX ".sys") -set_image_base(freeldr 0x10000) -endif() - -set_subsystem(freeldr native) -set_entrypoint(freeldr mainCRTStartup) - -if(ARCH MATCHES i386) -target_link_libraries(freeldr mini_hal) -endif(ARCH MATCHES i386) - -target_link_libraries(freeldr - cportlib - rossym - cmlib - rtl - libcntpr) -add_pch(freeldr ${CMAKE_CURRENT_SOURCE_DIR}/freeldr/freeldr/include/freeldr.h ${FREELDR_SOURCE}) -add_dependencies(freeldr asm) - -list(APPEND SETUPLDR_SOURCE - ${FREELDR_STARTUP_SOURCE} - ${FREELDR_BASE64K_SOURCE} - ${FREELDR_BASE_SOURCE} - ${FREELDR_ARCH_SOURCE} - ${SETUPLDR_MAIN_SOURCE}) - -add_library(setupldr SHARED ${SETUPLDR_SOURCE}) - -if(NOT MSVC) -set_target_properties(setupldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr/freeldr/freeldr_i386.lnk" SUFFIX ".sys" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") -set_image_base(setupldr 0x8000) -else() -set_target_properties(setupldr PROPERTIES LINK_FLAGS "/DRIVER /SECTION:.text,ERWP,ALIGN=0x1000" SUFFIX ".sys" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") -endif() - -set_subsystem(setupldr native) -set_entrypoint(setupldr mainCRTStartup) - -if(ARCH MATCHES i386) -target_link_libraries(setupldr mini_hal) -endif(ARCH MATCHES i386) - -target_link_libraries(setupldr - cportlib - rossym - cmlib - rtl - libcntpr) - -add_dependencies(setupldr asm) - -# Bootcd files -add_minicd_target(setupldr loader setupldr.sys) -add_minicd_target(freeldr loader freeldr.sys) add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/txtsetup.sif reactos txtsetup.sif) add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/bootcd.ini "" freeldr.ini) add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/hivecls_${ARCH}.inf reactos hivecls.inf) @@ -265,7 +22,6 @@ add_custom_target(livecd_hives DEPENDS ${LIVECD_DIR}/reactos/system32/config/sam) -add_livecd_target(setupldr loader) add_livecd(${REACTOS_SOURCE_DIR}/boot/bootdata/livecd.ini "" freeldr.ini) #regtest Added: branches/cmake-bringup/boot/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/CMak… ============================================================================== --- branches/cmake-bringup/boot/freeldr/CMakeLists.txt (added) +++ branches/cmake-bringup/boot/freeldr/CMakeLists.txt [iso-8859-1] Wed Dec 29 18:28:34 2010 @@ -1,0 +1,3 @@ + +add_subdirectory(bootsect) +add_subdirectory(freeldr) Propchange: branches/cmake-bringup/boot/freeldr/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/boot/freeldr/bootsect/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/boot… ============================================================================== --- branches/cmake-bringup/boot/freeldr/bootsect/CMakeLists.txt (added) +++ branches/cmake-bringup/boot/freeldr/bootsect/CMakeLists.txt [iso-8859-1] Wed Dec 29 18:28:34 2010 @@ -1,0 +1,7 @@ + +CreateBootSectorTarget(dosmbr ${CMAKE_CURRENT_SOURCE_DIR}/dosmbr.asm ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin) +CreateBootSectorTarget(ext2 ${CMAKE_CURRENT_SOURCE_DIR}/ext2.asm ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin) +CreateBootSectorTarget(fat32 ${CMAKE_CURRENT_SOURCE_DIR}/fat32.asm ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin) +CreateBootSectorTarget(fat ${CMAKE_CURRENT_SOURCE_DIR}/fat.asm ${CMAKE_CURRENT_BINARY_DIR}/fat.bin) +CreateBootSectorTarget(isoboot ${CMAKE_CURRENT_SOURCE_DIR}/isoboot.asm ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin) +CreateBootSectorTarget(isobtrt ${CMAKE_CURRENT_SOURCE_DIR}/isobtrt.asm ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin) Propchange: branches/cmake-bringup/boot/freeldr/bootsect/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/CMakeLists.txt (added) +++ branches/cmake-bringup/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Wed Dec 29 18:28:34 2010 @@ -1,0 +1,242 @@ + +include_directories(BEFORE include) +include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) + +if(ARCH MATCHES arm) + if(SARCH MATCHES omap-zoom2) + add_definitions(-D_ZOOM2_) + endif() +endif() + +if(ARCH MATCHES i386) +if(MSVC) +list(APPEND FREELDR_BASE64K_SOURCE + arch/i386/realmode.S) +else() +list(APPEND FREELDR_STARTUP_SOURCE + arch/i386/fathelp.S + arch/i386/arch.S) +endif() +elseif(ARCH MATCHES amd64) +list(APPEND FREELDR_STARTUP_SOURCE + arch/i386/fathelp.S + arch/amd64/arch.S) +endif(ARCH MATCHES i386) + +if(ARCH MATCHES i386) +if(NOT MSVC) +list(APPEND FREELDR_BASE64K_SOURCE + arch/i386/boot.S + arch/i386/drvmap.S + arch/i386/i386cpu.S + arch/i386/i386idt.S + arch/i386/i386pnp.S + arch/i386/i386trap.S + arch/i386/int386.S + arch/i386/linux.S + arch/i386/mb.S + arch/i386/i386bug.c) +endif() +elseif(ARCH MATCHES amd64) +list(APPEND FREELDR_BASE64K_SOURCE + arch/i386/drvmap.S + arch/i386/i386cpu.S + arch/i386/i386idt.S + arch/i386/i386trap.S + arch/amd64/mb.S) +endif(ARCH MATCHES i386) + + + +set_source_files_properties(${FREELDR_BASE64K_SOURCE} PROPERTIES COMPILE_DEFINITIONS "_NTHAL_") + +include_directories(${REACTOS_SOURCE_DIR}/lib/cmlib) + +list(APPEND FREELDR_BASE_SOURCE + arcemul/mm.c + arcemul/time.c + cache/blocklist.c + cache/cache.c + comm/rs232.c + disk/disk.c + disk/partition.c + disk/ramdisk.c + disk/scsiport.c + fs/ext2.c + fs/fat.c + fs/fs.c + fs/iso.c + fs/ntfs.c + inifile/ini_init.c + inifile/inifile.c + inifile/parse.c + mm/meminit.c + mm/mm.c + reactos/registry.c + reactos/arcname.c + reactos/archwsup.c + reactos/binhive.c + reactos/reactos.c + reactos/imageldr.c + rtl/bget.c + rtl/libsupp.c + ui/directui.c + ui/gui.c + ui/minitui.c + ui/noui.c + ui/tui.c + ui/tuimenu.c + ui/ui.c + video/fade.c + video/palette.c + video/video.c + windows/conversion.c + windows/peloader.c + windows/winldr.c + windows/wlmemory.c + windows/wlregistry.c + freeldr.c + debug.c + version.c + cmdline.c + machine.c + options.c + linuxboot.c + oslist.c) + +if(ARCH MATCHES i386) +list(APPEND FREELDR_BASE_SOURCE + windows/headless.c + disk/scsiport.c) +endif(ARCH MATCHES i386) + +set_source_files_properties(${FREELDR_BASE_SOURCE} PROPERTIES COMPILE_DEFINITIONS "_NTHAL_;_BLDR_;_NTSYSTEM_") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/elf) + +if(ARCH MATCHES i386) +list(APPEND FREELDR_ARCH_SOURCE + arch/i386/archmach.c + arch/i386/custom.c + arch/i386/drivemap.c + arch/i386/halstub.c + arch/i386/hardware.c + arch/i386/hwacpi.c + arch/i386/hwapm.c + arch/i386/hwpci.c + arch/i386/i386disk.c + arch/i386/i386rtl.c + arch/i386/i386vid.c + arch/i386/loader.c + arch/i386/machpc.c + arch/i386/miscboot.c + arch/i386/ntoskrnl.c + arch/i386/pccons.c + arch/i386/pcdisk.c + arch/i386/pcmem.c + arch/i386/pcrtc.c + arch/i386/pcvideo.c + arch/i386/machxbox.c + arch/i386/xboxcons.c + arch/i386/xboxdisk.c + arch/i386/xboxfont.c + arch/i386/xboxhw.c + arch/i386/xboxi2c.c + arch/i386/xboxmem.c + arch/i386/xboxrtc.c + arch/i386/xboxvideo.c + windows/i386/ntsetup.c + windows/i386/wlmemory.c) +else() +#TBD +endif(ARCH MATCHES i386) + +set_source_files_properties(${FREELDR_ARCH_SOURCE} PROPERTIES COMPILE_DEFINITIONS "_NTHAL_;_BLDR_;_NTSYSTEM_") + +list(APPEND SETUPLDR_MAIN_SOURCE + bootmgr.c + inffile/inffile.c + reactos/setupldr.c) + +if(ARCH MATCHES i386) +list(APPEND SETUPLDR_MAIN_SOURCE windows/setupldr2.c) +elseif(ARCH MATCHES amd64) +list(APPEND SETUPLDR_MAIN_SOURCE windows/setupldr2.c) +endif(ARCH MATCHES i386) + +set_source_files_properties(${SETUPLDR_MAIN_SOURCE} PROPERTIES COMPILE_FLAGS "-ffreestanding -fno-builtin -fno-inline -fno-zero-initialized-in-bss") + + + +list(APPEND FREELDR_SOURCE + bootmgr.c + ${FREELDR_STARTUP_SOURCE} + ${FREELDR_BASE64K_SOURCE} + ${FREELDR_BASE_SOURCE} + ${FREELDR_ARCH_SOURCE}) + +add_library(freeldr SHARED + ${CMAKE_CURRENT_BINARY_DIR}/freeldr_freeldr.h.gch + ${FREELDR_SOURCE}) + +if(NOT MSVC) +set_target_properties(freeldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk" SUFFIX ".sys") +set_image_base(freeldr 0x8000) +else() +set_target_properties(freeldr PROPERTIES LINK_FLAGS "/DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text /SUBSYSTEM:BOOT_APPLICATION" SUFFIX ".sys") +set_image_base(freeldr 0x10000) +endif() + +set_subsystem(freeldr native) +set_entrypoint(freeldr mainCRTStartup) + +if(ARCH MATCHES i386) +target_link_libraries(freeldr mini_hal) +endif(ARCH MATCHES i386) + +target_link_libraries(freeldr + cportlib + rossym + cmlib + rtl + libcntpr) +add_pch(freeldr ${CMAKE_CURRENT_SOURCE_DIR}/include/freeldr.h ${FREELDR_SOURCE}) +add_dependencies(freeldr asm) + +list(APPEND SETUPLDR_SOURCE + ${FREELDR_STARTUP_SOURCE} + ${FREELDR_BASE64K_SOURCE} + ${FREELDR_BASE_SOURCE} + ${FREELDR_ARCH_SOURCE} + ${SETUPLDR_MAIN_SOURCE}) + +add_library(setupldr SHARED ${SETUPLDR_SOURCE}) + +if(NOT MSVC) +set_target_properties(setupldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk" SUFFIX ".sys" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") +set_image_base(setupldr 0x8000) +else() +set_target_properties(setupldr PROPERTIES LINK_FLAGS "/DRIVER /SECTION:.text,ERWP,ALIGN=0x1000" SUFFIX ".sys" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") +endif() + +set_subsystem(setupldr native) +set_entrypoint(setupldr mainCRTStartup) + +if(ARCH MATCHES i386) +target_link_libraries(setupldr mini_hal) +endif(ARCH MATCHES i386) + +target_link_libraries(setupldr + cportlib + rossym + cmlib + rtl + libcntpr) + +add_dependencies(setupldr asm) + +# Bootcd files +add_minicd_target(setupldr loader setupldr.sys) +add_minicd_target(freeldr loader freeldr.sys) +add_livecd_target(setupldr loader) Propchange: branches/cmake-bringup/boot/freeldr/freeldr/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt [iso-8859-1] Wed Dec 29 18:28:34 2010 @@ -14,7 +14,9 @@ spec2def(quartz.dll quartz.spec) -add_library(quartz SHARED +rpcproxy(quartz quartz_strmif.idl) + +list(APPEND SOURCE avidec.c acmwrapper.c waveparser.c @@ -42,10 +44,11 @@ version.rc ${CMAKE_CURRENT_BINARY_DIR}/quartz.def) +add_library(quartz SHARED ${SOURCE}) + set_module_type(quartz win32dll) target_link_libraries(quartz - quartz_proxy strmiids uuid wine @@ -67,6 +70,4 @@ kernel32 ntdll) - -rpcproxy(quartz quartz_strmif.idl) add_cab_target(quartz 1) Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] Wed Dec 29 18:28:34 2010 @@ -3,6 +3,18 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(actxprxy.dll actxprxy.spec) + +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) list(APPEND SOURCE usrmarshal.c @@ -13,7 +25,6 @@ set_entrypoint(actxprxy 0) target_link_libraries(actxprxy - actxprxy_proxy uuid wine ${PSEH_LIB}) @@ -27,16 +38,4 @@ 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_cab_target(actxprxy 1) Modified: branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ole32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt [iso-8859-1] Wed Dec 29 18:28:34 2010 @@ -71,7 +71,6 @@ target_link_libraries(ole32 wine irot_client - ole32_proxy uuid ${PSEH_LIB}) Modified: branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/oleaut3… ============================================================================== --- branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] Wed Dec 29 18:28:34 2010 @@ -48,12 +48,13 @@ spec2def(oleaut32.dll oleaut32.spec) +rpcproxy(oleaut32 oleaut32_oaidl.idl oleaut32_ocidl.idl) + add_library(oleaut32 SHARED ${SOURCE}) set_module_type(oleaut32 win32dll) target_link_libraries(oleaut32 - oleaut32_proxy wine wineldr uuid @@ -61,7 +62,5 @@ add_importlibs(oleaut32 windowscodecs ole32 rpcrt4 user32 gdi32 advapi32 comctl32 urlmon msvcrt kernel32 ntdll) -rpcproxy(oleaut32 oleaut32_oaidl.idl oleaut32_ocidl.idl) - add_cab_target(oleaut32 1) add_importlib_target(oleaut32.spec) Modified: branches/cmake-bringup/dll/win32/qmgrprxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/qmgrprx… ============================================================================== --- branches/cmake-bringup/dll/win32/qmgrprxy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/qmgrprxy/CMakeLists.txt [iso-8859-1] Wed Dec 29 18:28:34 2010 @@ -14,11 +14,11 @@ ${CMAKE_CURRENT_BINARY_DIR}/qmgrprxy_i.c ${CMAKE_CURRENT_BINARY_DIR}/qmgrprxy.def) +rpcproxy(qmgrprxy qmgrprxy.idl) + add_library(qmgrprxy SHARED ${SOURCE}) -rpcproxy(qmgrprxy qmgrprxy.idl) - set_module_type(qmgrprxy win32dll) -target_link_libraries(qmgrprxy qmgrprxy_proxy ${PSEH_LIB} wine) +target_link_libraries(qmgrprxy ${PSEH_LIB} wine) add_importlibs(qmgrprxy rpcrt4 msvcrt kernel32 ntdll) add_cab_target(qmgrprxy 1) 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] Wed Dec 29 18:28:34 2010 @@ -18,12 +18,13 @@ sti_main.c ${CMAKE_CURRENT_BINARY_DIR}/sti.def) +rpcproxy(sti sti_wia.idl) + add_library(sti SHARED ${SOURCE}) set_entrypoint(sti 0) target_link_libraries(sti - sti_proxy wine uuid ${PSEH_LIB}) @@ -36,5 +37,4 @@ kernel32 ntdll) -rpcproxy(sti sti_wia.idl) add_cab_target(sti 1) Modified: branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/urlmon/… ============================================================================== --- branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] Wed Dec 29 18:28:34 2010 @@ -8,7 +8,9 @@ spec2def(urlmon.dll urlmon.spec) -add_library(urlmon SHARED +rpcproxy(urlmon urlmon_urlmon.idl) + +list(APPEND SOURCE bindctx.c binding.c bindprot.c @@ -34,10 +36,12 @@ rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/urlmon.def) +add_library(urlmon SHARED ${SOURCE}) + + set_module_type(urlmon win32dll) target_link_libraries(urlmon - urlmon_proxy uuid wine ${PSEH_LIB}) @@ -66,6 +70,5 @@ add_definitions(-DPROXY_CLSID_IS={0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}) #add_definitions(-DPROXY_CLSID_IS="{0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}") -rpcproxy(urlmon urlmon_urlmon.idl) add_cab_target(urlmon 1) add_importlib_target(urlmon.spec)

1 0

[spetreolle] 50214: [CMAKE] Fix rpcrt4_winetest build.
by spetreolle＠svn.reactos.org 29 Dec '10

29 Dec '10

Author: spetreolle Date: Wed Dec 29 16:12:56 2010 New Revision: 50214 URL: http://svn.reactos.org/svn/reactos?rev=50214&view=rev Log: [CMAKE] Fix rpcrt4_winetest build. Modified: trunk/rostests/winetests/rpcrt4/CMakeLists.txt Modified: trunk/rostests/winetests/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/CMakeLis… ============================================================================== --- trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] Wed Dec 29 16:12:56 2010 @@ -6,7 +6,7 @@ -D__ROS_LONG64__ -D_DLL -D__USE_CRTIMP) -MACRO_IDL_FILES(server.idl) +idl_files(server.idl) list(APPEND SOURCE cstub.c

1 0

[tkreuzer] 50213: [STLPORT] - Only use #pragma intrinsics on MSVC - Don't add function prototypes for _InterlockedXxx
by tkreuzer＠svn.reactos.org 29 Dec '10

29 Dec '10

Author: tkreuzer Date: Wed Dec 29 13:35:40 2010 New Revision: 50213 URL: http://svn.reactos.org/svn/reactos?rev=50213&view=rev Log: [STLPORT] - Only use #pragma intrinsics on MSVC - Don't add function prototypes for _InterlockedXxx Modified: branches/cmake-bringup/include/c++/stlport/stl/config/_windows.h Modified: branches/cmake-bringup/include/c++/stlport/stl/config/_windows.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/c%2B%2B/s… ============================================================================== --- branches/cmake-bringup/include/c++/stlport/stl/config/_windows.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/c++/stlport/stl/config/_windows.h [iso-8859-1] Wed Dec 29 13:35:40 2010 @@ -96,10 +96,12 @@ # if defined (_STLP_NEW_PLATFORM_SDK) && !defined(_WDMDDK_) # include <windef.h> +#ifndef InterlockedIncrement _STLP_IMPORT_DECLSPEC LONG _STLP_STDCALL InterlockedIncrement(IN OUT LONG volatile *); _STLP_IMPORT_DECLSPEC LONG _STLP_STDCALL InterlockedDecrement(IN OUT LONG volatile *); _STLP_IMPORT_DECLSPEC LONG _STLP_STDCALL InterlockedExchange(IN OUT LONG volatile *, LONG); _STLP_IMPORT_DECLSPEC void _STLP_STDCALL Sleep(DWORD); +#endif # if defined (_WIN64) _STLP_IMPORT_DECLSPEC void* _STLP_STDCALL _InterlockedExchangePointer(void* volatile *, void*); # endif @@ -180,7 +182,7 @@ _STLP_IMPORT_DECLSPEC void _STLP_STDCALL OutputDebugStringA(const char* lpOutputString); # endif -# if defined (InterlockedIncrement) +# if defined (InterlockedIncrement) && defined(_MSC_VER) # pragma intrinsic(_InterlockedIncrement) # pragma intrinsic(_InterlockedDecrement) # pragma intrinsic(_InterlockedExchange)

1 0

[tkreuzer] 50212: [STLPORT] - Fix compilation with 64 bit gcc
by tkreuzer＠svn.reactos.org 29 Dec '10

29 Dec '10

Author: tkreuzer Date: Wed Dec 29 11:45:57 2010 New Revision: 50212 URL: http://svn.reactos.org/svn/reactos?rev=50212&view=rev Log: [STLPORT] - Fix compilation with 64 bit gcc Modified: branches/cmake-bringup/include/c++/stlport/stl/_num_put.c Modified: branches/cmake-bringup/include/c++/stlport/stl/_num_put.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/c%2B%2B/s… ============================================================================== --- branches/cmake-bringup/include/c++/stlport/stl/_num_put.c [iso-8859-1] (original) +++ branches/cmake-bringup/include/c++/stlport/stl/_num_put.c [iso-8859-1] Wed Dec 29 11:45:57 2010 @@ -497,6 +497,9 @@ # pragma warning (disable : 4311) //pointer truncation from 'const void*' to 'unsigned long' #endif _OutputIter result = +#ifdef _WIN64 // ReactOS, compilation with 64 bit gcc +_STLP_PRIV __do_put_integer(__s, __f, __c_type.widen('0'), __REINTERPRET_CAST(unsigned _STLP_LONG_LONG,__val)); +#else #ifdef _STLP_LONG_LONG ( sizeof(void*) == sizeof(unsigned long) ) ? #endif @@ -506,6 +509,7 @@ _STLP_PRIV __do_put_integer(__s, __f, __c_type.widen('0'), __REINTERPRET_CAST(unsigned _STLP_LONG_LONG,__val)) #endif ; +#endif #if defined (_STLP_MSVC) # pragma warning (pop) #endif

1 0

[tkreuzer] 50211: [STLPORT] - Add some additional definitions for amd64 compilation with gcc
by tkreuzer＠svn.reactos.org 29 Dec '10

29 Dec '10

Author: tkreuzer Date: Wed Dec 29 11:42:10 2010 New Revision: 50211 URL: http://svn.reactos.org/svn/reactos?rev=50211&view=rev Log: [STLPORT] - Add some additional definitions for amd64 compilation with gcc Modified: branches/cmake-bringup/include/c++/stlport/stl/config/_reactos.h Modified: branches/cmake-bringup/include/c++/stlport/stl/config/_reactos.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/c%2B%2B/s… ============================================================================== --- branches/cmake-bringup/include/c++/stlport/stl/config/_reactos.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/c++/stlport/stl/config/_reactos.h [iso-8859-1] Wed Dec 29 11:42:10 2010 @@ -305,4 +305,21 @@ // Include stlport windows specifics #include "_windows.h" -#endif +#ifdef _M_AMD64 +#ifdef __cplusplus +extern "C" { +#endif + _STLP_IMPORT_DECLSPEC void* InterlockedFlushSList(void*); + _STLP_IMPORT_DECLSPEC void* InterlockedPopEntrySList(void*); + _STLP_IMPORT_DECLSPEC void* InterlockedPushEntrySList(void*, void*); +#ifdef __cplusplus +} +#endif +#define InterlockedPopEntrySList(list) reinterpret_cast<_STLP_atomic_freelist::item*>(InterlockedPopEntrySList(list)) +#define InterlockedFlushSList(list) reinterpret_cast<_STLP_atomic_freelist::item*>(InterlockedFlushSList(list)) + +#undef __cdecl__ +#define __cdecl__ +#endif + +#endif

1 0

[fireball] 50210: [NTOS] - Greatly simplify and fix the incorrect and overcomplicated if condition in IoIsOperationSynchronous(), based on MSDN description. Bug spotted, fix tested by Pierre.
by fireball＠svn.reactos.org 29 Dec '10

29 Dec '10

Author: fireball Date: Wed Dec 29 11:12:17 2010 New Revision: 50210 URL: http://svn.reactos.org/svn/reactos?rev=50210&view=rev Log: [NTOS] - Greatly simplify and fix the incorrect and overcomplicated if condition in IoIsOperationSynchronous(), based on MSDN description. Bug spotted, fix tested by Pierre. Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c 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 Dec 29 11:12:17 2010 @@ -1704,12 +1704,21 @@ NTAPI IoIsOperationSynchronous(IN PIRP Irp) { + BOOLEAN SynchIO; + BOOLEAN ForceAsync; + + /* If the IRP requests synchronous paging I/O, if the file object was opened + for synchronous I/O, if the IRP_SYNCHRONOUS_API flag is set in the IRP + the operation is synchronous */ + SynchIO = (IoGetCurrentIrpStackLocation(Irp)->FileObject->Flags & FO_SYNCHRONOUS_IO) || + (Irp->Flags & IRP_SYNCHRONOUS_API) || (Irp->Flags & IRP_SYNCHRONOUS_PAGING_IO); + + /* If the IRP requests asynchronous paging I/O, the operation is asynchronous, + even if one of the above conditions is true */ + ForceAsync = (Irp->Flags & IRP_PAGING_IO) && !(Irp->Flags & IRP_SYNCHRONOUS_PAGING_IO); + /* Check the flags */ - if (!(Irp->Flags & (IRP_PAGING_IO | IRP_SYNCHRONOUS_PAGING_IO)) && - ((Irp->Flags & IRP_SYNCHRONOUS_PAGING_IO) || - (Irp->Flags & IRP_SYNCHRONOUS_API) || - (IoGetCurrentIrpStackLocation(Irp)->FileObject->Flags & - FO_SYNCHRONOUS_IO))) + if (SynchIO && !ForceAsync) { /* Synch API or Paging I/O is OK, as is Sync File I/O */ return TRUE;

1 0

[tkreuzer] 50209: [NTOSKRNL] - Add MiPdeToAddress and MI_IS_PAGE_LARGE for amd64 - Fix a pragma message - Add some missing globals for amd64
by tkreuzer＠svn.reactos.org 29 Dec '10

29 Dec '10

Author: tkreuzer Date: Wed Dec 29 10:20:39 2010 New Revision: 50209 URL: http://svn.reactos.org/svn/reactos?rev=50209&view=rev Log: [NTOSKRNL] - Add MiPdeToAddress and MI_IS_PAGE_LARGE for amd64 - Fix a pragma message - Add some missing globals for amd64 Modified: branches/cmake-bringup/ntoskrnl/include/internal/amd64/mm.h branches/cmake-bringup/ntoskrnl/io/iomgr/irp.c branches/cmake-bringup/ntoskrnl/mm/amd64/init.c Modified: branches/cmake-bringup/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… ============================================================================== --- branches/cmake-bringup/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Wed Dec 29 10:20:39 2010 @@ -131,6 +131,7 @@ Temp >>= 16; return (PVOID)Temp; } +#define MiPdeToAddress MiPteToAddress BOOLEAN FORCEINLINE @@ -199,6 +200,7 @@ #define MI_PAGE_DISABLE_CACHE(x) ((x)->u.Hard.CacheDisable = 1) #define MI_PAGE_WRITE_THROUGH(x) ((x)->u.Hard.WriteThrough = 1) #define MI_PAGE_WRITE_COMBINED(x) ((x)->u.Hard.WriteThrough = 0) +#define MI_IS_PAGE_LARGE(x) ((x)->u.Hard.LargePage == 1) #if !defined(CONFIG_SMP) #define MI_IS_PAGE_WRITEABLE(x) ((x)->u.Hard.Write == 1) #else Modified: branches/cmake-bringup/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/io/iomgr… ============================================================================== --- branches/cmake-bringup/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Wed Dec 29 10:20:39 2010 @@ -549,7 +549,7 @@ if (ChargeQuota) Flags |= IRP_QUOTA_CHARGED; /* FIXME: Implement Lookaside Floats */ - + /* Figure out which Lookaside List to use */ if ((StackSize <= 8) && (ChargeQuota == FALSE)) { @@ -1823,7 +1823,7 @@ IoIs32bitProcess( IN PIRP Irp OPTIONAL) { -#pragma message IoIs32bitProcess is hardcoded to FALSE +#pragma message "IoIs32bitProcess is hardcoded to FALSE" return FALSE; } #endif Modified: branches/cmake-bringup/ntoskrnl/mm/amd64/init.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/amd64… ============================================================================== --- branches/cmake-bringup/ntoskrnl/mm/amd64/init.c [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/mm/amd64/init.c [iso-8859-1] Wed Dec 29 10:20:39 2010 @@ -27,10 +27,16 @@ /* GLOBALS *****************************************************************/ /* Template PTE and PDE for a kernel page */ -MMPTE ValidKernelPde = {.u.Hard.Valid = 1, .u.Hard.Write = 1, .u.Hard.Dirty = 1, .u.Hard.Accessed = 1}; -MMPTE ValidKernelPte = {.u.Hard.Valid = 1, .u.Hard.Write = 1, .u.Hard.Dirty = 1, .u.Hard.Accessed = 1}; -MMPDE DemandZeroPde = {.u.Long = (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS)}; -MMPTE PrototypePte = {.u.Long = (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS) | PTE_PROTOTYPE | 0xFFFFF000}; +MMPTE ValidKernelPde = {{PTE_VALID|PTE_READWRITE|PTE_DIRTY|PTE_ACCESSED}}; +MMPTE ValidKernelPte = {{PTE_VALID|PTE_READWRITE|PTE_DIRTY|PTE_ACCESSED}}; + +/* Template PDE for a demand-zero page */ +MMPDE DemandZeroPde = {{MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS}}; +MMPTE DemandZeroPte = {{MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS}}; + +/* Template PTE for prototype page */ +MMPTE PrototypePte = {{(MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS) | + PTE_PROTOTYPE | (MI_PTE_LOOKUP_NEEDED << PAGE_SHIFT)}}; /* Sizes */ ///SIZE_T MmSessionSize = MI_SESSION_SIZE; @@ -413,7 +419,7 @@ TmplPte.u.Flush.Write = 1; HyperTemplatePte = TmplPte; - /* Create PDPTs (72 KB) for shared system address space, + /* Create PDPTs (72 KB) for shared system address space, * skip page tables and hyperspace */ /* Loop the PXEs */ @@ -492,7 +498,7 @@ /* Page-align the nonpaged pool size */ MmSizeOfNonPagedPoolInBytes &= ~(PAGE_SIZE - 1); - + /* Now, check if there was a registry size for the maximum size */ if (!MmMaximumNonPagedPoolInBytes) { @@ -501,7 +507,7 @@ MmMaximumNonPagedPoolInBytes += (MmNumberOfPhysicalPages - 1024) / 256 * MmMaxAdditionNonPagedPoolPerMb; } - + /* Don't let the maximum go too high */ if (MmMaximumNonPagedPoolInBytes > MI_MAX_NONPAGED_POOL_SIZE) { @@ -517,7 +523,7 @@ { /* Put non paged pool after the PFN database */ MmNonPagedPoolStart = (PCHAR)MmPfnDatabase + MxPfnSizeInBytes; - MmMaximumNonPagedPoolInBytes = (ULONG64)MmNonPagedPoolEnd - + MmMaximumNonPagedPoolInBytes = (ULONG64)MmNonPagedPoolEnd - (ULONG64)MmNonPagedPoolStart; } @@ -688,7 +694,7 @@ PMMPTE Pte; MMPTE TmplPte; ULONG Size, BitMapSize; - + /* Default size for paged pool is 4 times non paged pool */ MmSizeOfPagedPoolInBytes = 4 * MmMaximumNonPagedPoolInBytes; @@ -767,7 +773,7 @@ // Allocate the allocation bitmap, which tells us which regions have not yet // been mapped into memory - MmPagedPoolInfo.PagedPoolAllocationMap = + MmPagedPoolInfo.PagedPoolAllocationMap = ExAllocatePoolWithTag(NonPagedPool, Size, ' mM'); ASSERT(MmPagedPoolInfo.PagedPoolAllocationMap); @@ -783,7 +789,7 @@ // Given the allocation bitmap and a base address, we can therefore figure // out which page is the last page of that allocation, and thus how big the // entire allocation is. - MmPagedPoolInfo.EndOfPagedPoolBitmap = + MmPagedPoolInfo.EndOfPagedPoolBitmap = ExAllocatePoolWithTag(NonPagedPool, Size, ' mM'); ASSERT(MmPagedPoolInfo.EndOfPagedPoolBitmap); @@ -859,7 +865,7 @@ //MmPagedPoolSize = MM_PAGED_POOL_SIZE; //ASSERT((PCHAR)MmPagedPoolBase + MmPagedPoolSize < (PCHAR)MmNonPagedSystemStart); - + HalInitializeBios(0, LoaderBlock); } @@ -871,7 +877,7 @@ MiSyncARM3WithROS(IN PVOID AddressStart, IN PVOID AddressEnd) { - + } NTSTATUS

1 0

← Newer
1
2
3
4
5
6
7
...
37
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 December 2010