Ros-diffs March 2014

ros-diffs@reactos.org

14 participants
233 discussions

[hbelusca] 62565: [CMAKE] Improve comparison. Needs to be send upstream, AmineKhaldi :)

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Mar 26 00:49:41 2014 New Revision: 62565 URL: http://svn.reactos.org/svn/reactos?rev=62565&view=rev Log: [CMAKE] Improve comparison. Needs to be send upstream, AmineKhaldi :) Modified: trunk/reactos/cmake/Platform/Windows-MSVC.cmake Modified: trunk/reactos/cmake/Platform/Windows-MSVC.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/Platform/Windows-MSV… ============================================================================== --- trunk/reactos/cmake/Platform/Windows-MSVC.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/Platform/Windows-MSVC.cmake [iso-8859-1] Wed Mar 26 00:49:41 2014 @@ -119,7 +119,7 @@ set(CMAKE_CL_64 1) endif() -if("${MSVC_VERSION}" GREATER 1599) +if(MSVC_VERSION GREATER 1599) set(MSVC_INCREMENTAL_DEFAULT ON) endif()

10 years, 9 months

[hbelusca] 62564: [EXT2]: Revert the change of rev 62562 before finding a better fix...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Mar 25 23:16:02 2014 New Revision: 62564 URL: http://svn.reactos.org/svn/reactos?rev=62564&view=rev Log: [EXT2]: Revert the change of rev 62562 before finding a better fix... Modified: trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h Modified: trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h [iso-8859-1] Tue Mar 25 23:16:02 2014 @@ -60,7 +60,6 @@ extern Ext2Data Ext2GlobalData; // try-finally simulation -#define try_return() { goto try_exit; } #define try_return(S) { S; goto try_exit; } #define try_return1(S) { S; goto try_exit1; } #define try_return2(S) { S; goto try_exit2; }

10 years, 9 months

[hbelusca] 62563: [USP10]: Wine sync. SHA-1: 8fb52c7c5d711918fadf2590061d668093d14708 * usp10: Avoid non-standard array initialization. Fix this bug introduced in revision 62535. CORE-8029 #resolve...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Mar 25 19:49:35 2014 New Revision: 62563 URL: http://svn.reactos.org/svn/reactos?rev=62563&view=rev Log: [USP10]: Wine sync. SHA-1: 8fb52c7c5d711918fadf2590061d668093d14708 * usp10: Avoid non-standard array initialization. Fix this bug introduced in revision 62535. CORE-8029 #resolve #comment Fixed in revision 62563. Modified: trunk/reactos/dll/win32/usp10/bidi.c Modified: trunk/reactos/dll/win32/usp10/bidi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/bidi.c?rev… ============================================================================== --- trunk/reactos/dll/win32/usp10/bidi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/bidi.c [iso-8859-1] Tue Mar 25 19:49:35 2014 @@ -819,9 +819,12 @@ static void computeIsolatingRunsSet(unsigned baselevel, WORD *pcls, WORD *pLevel, int uCount, struct list *set) { int run_start, run_end, i; - Run runs[uCount]; int run_count = 0; + Run *runs; IsolatedRun *current_isolated; + + runs = HeapAlloc(GetProcessHeap(), 0, uCount * sizeof(Run)); + if (!runs) return; list_init(set); @@ -849,6 +852,7 @@ int type_fence, real_end; int j; current_isolated = HeapAlloc(GetProcessHeap(), 0, sizeof(IsolatedRun) + sizeof(WORD*)*uCount); + if (!current_isolated) break; run_start = runs[k].start; current_isolated->e = runs[k].e; @@ -936,6 +940,8 @@ } i++; } + + HeapFree(GetProcessHeap(), 0, runs); } /*************************************************************

10 years, 9 months

[hbelusca] 62562: [EXT2] try_return() == try_return(S) with nothing in S . The code sometimes use it. Shut up MSVC warning C4003: not enough actual parameters for macro 'try_return'.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Mar 24 22:20:52 2014 New Revision: 62562 URL: http://svn.reactos.org/svn/reactos?rev=62562&view=rev Log: [EXT2] try_return() == try_return(S) with nothing in S . The code sometimes use it. Shut up MSVC warning C4003: not enough actual parameters for macro 'try_return'. Modified: trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h Modified: trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h [iso-8859-1] Mon Mar 24 22:20:52 2014 @@ -60,6 +60,7 @@ extern Ext2Data Ext2GlobalData; // try-finally simulation +#define try_return() { goto try_exit; } #define try_return(S) { S; goto try_exit; } #define try_return1(S) { S; goto try_exit1; } #define try_return2(S) { S; goto try_exit2; }

10 years, 9 months

[hbelusca] 62561: [PSDK] Revert unwanted changes from revision 62555.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Mar 24 21:45:04 2014 New Revision: 62561 URL: http://svn.reactos.org/svn/reactos?rev=62561&view=rev Log: [PSDK] Revert unwanted changes from revision 62555. Modified: trunk/reactos/include/psdk/metahost.idl Modified: trunk/reactos/include/psdk/metahost.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/metahost.idl?… ============================================================================== --- trunk/reactos/include/psdk/metahost.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/metahost.idl [iso-8859-1] Mon Mar 24 21:45:04 2014 @@ -24,30 +24,6 @@ cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") cpp_quote("#undef LoadLibrary") cpp_quote("#endif") - -typedef enum -{ - METAHOST_POLICY_HIGHCOMPAT = 0, - METAHOST_POLICY_APPLY_UPGRADE_POLICY = 0x08, - METAHOST_POLICY_EMULATE_EXE_LAUNCH = 0x10, - METAHOST_POLICY_SHOW_ERROR_DIALOG = 0x20, - METAHOST_POLICY_USE_PROCESS_IMAGE_PATH = 0x40, - METAHOST_POLICY_ENSURE_SKU_SUPPORTED = 0x80 -} METAHOST_POLICY_FLAGS; - -typedef enum -{ - CLR_DEBUGGING_MANAGED_EVENT_PENDING = 1 -} CLR_DEBUGGING_PROCESS_FLAGS; - -typedef struct _CLR_DEBUGGING_VERSION -{ - WORD wStructVersion; - WORD wMajor; - WORD wMinor; - WORD wBuild; - WORD wRevision; -} CLR_DEBUGGING_VERSION; [ object, @@ -152,55 +128,4 @@ [in] INT32 iExitCode); }; -[ - object, - local, - uuid(e2190695-77b2-492e-8e14-c4b3a7fdd593) -] -interface ICLRMetaHostPolicy : IUnknown -{ - HRESULT GetRequestedRuntime([in] METAHOST_POLICY_FLAGS dwPolicyFlags, - [in] LPCWSTR pwzBinary, [in] IStream *pCfgStream, - [in, out] LPWSTR pwzVersion, [in, out] DWORD *pcchVersion, - [out] LPWSTR pwzImageVersion, [out, in] DWORD *pcchImageVersion, - [out] DWORD *pdwConfigFlags, [in] REFIID riid, [retval, out] LPVOID *ppRuntime); -} - -[ - uuid(2ebcd49a-1b47-4a61-b13a-4a03701e594b) -] -coclass CLRMetaHostPolicy -{ - [default] interface ICLRMetaHostPolicy; -} - -[ - object, - local, - uuid(3151c08d-4d09-4f9b-8838-2880bf18fe51) -] -interface ICLRDebuggingLibraryProvider : IUnknown -{ - HRESULT ProvideLibrary([in] const WCHAR *pwszFileName, - [in] DWORD dwTimestamp, [in] DWORD dwSizeOfImage, - [out] HMODULE *phModule); -} - -[ - object, - local, - uuid(d28f3c5a-9634-4206-a509-477552eefb10) -] -interface ICLRDebugging : IUnknown -{ - HRESULT OpenVirtualProcess([in] ULONG64 moduleBaseAddress, - [in] IUnknown *pDataTarget, [in] ICLRDebuggingLibraryProvider *pLibraryProvider, - [in] CLR_DEBUGGING_VERSION *pMaxDebuggerSupportedVersion, - [in] REFIID riidProcess, [out] IUnknown **ppProcess, - [out, in] CLR_DEBUGGING_VERSION *pVersion, - [out] CLR_DEBUGGING_PROCESS_FLAGS *pdwFlags); - - HRESULT CanUnloadNow(HMODULE hModule); -} - cpp_quote("HRESULT WINAPI CLRCreateInstance(REFCLSID clsid, REFIID riid, LPVOID *ppInterface);")

10 years, 9 months

[hbelusca] 62560: [CMAKE] - Partly update/sync Windows-MSVC.cmake with RosBE 2.1.1 : few flags "fixes". Amine, can you please check whether there are other things to sync too (maybe those WinCE thi...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Mar 24 21:40:16 2014 New Revision: 62560 URL: http://svn.reactos.org/svn/reactos?rev=62560&view=rev Log: [CMAKE] - Partly update/sync Windows-MSVC.cmake with RosBE 2.1.1 : few flags "fixes". Amine, can you please check whether there are other things to sync too (maybe those WinCE things, even if it's unuseful for ROS itself, and maybe some other vs. MSVC_C_ARCHITECTURE_ID _MSVC_C_ARCHITECTURE_FAMILY flags, and so on... and with syncs of other .cmake files??) - Remove unneeded manually setting of stack size, it is done automatically by the compiler. - Add a "/MANIFEST:NO" switch to the linker so that (unuseful) manifest files are not automatically created and added to the host-tools, especially, because that causes some concurrent accesses failures on MSVC 2005/2008... CORE-8023 Modified: trunk/reactos/cmake/Platform/Windows-MSVC.cmake Modified: trunk/reactos/cmake/Platform/Windows-MSVC.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/Platform/Windows-MSV… ============================================================================== --- trunk/reactos/cmake/Platform/Windows-MSVC.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/Platform/Windows-MSVC.cmake [iso-8859-1] Mon Mar 24 21:40:16 2014 @@ -22,7 +22,7 @@ set(CMAKE_LINK_LIBRARY_FLAG "") set(MSVC 1) -# hack: if a new cmake (which uses CMAKE__LINKER) runs on an old build tree +# hack: if a new cmake (which uses CMAKE_LINKER) runs on an old build tree # (where link was hardcoded) and where CMAKE_LINKER isn't in the cache # and still cmake didn't fail in CMakeFindBinUtils.cmake (because it isn't rerun) # hardcode CMAKE_LINKER here to link, so it behaves as it did before, Alex @@ -41,6 +41,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "WindowsCE") set(CMAKE_CREATE_WIN32_EXE "/subsystem:windowsce /entry:WinMainCRTStartup") set(CMAKE_CREATE_CONSOLE_EXE "/subsystem:windowsce /entry:mainACRTStartup") + set(WINCE 1) else() set(CMAKE_CREATE_WIN32_EXE "/subsystem:windows") set(CMAKE_CREATE_CONSOLE_EXE "/subsystem:console") @@ -80,6 +81,7 @@ set(MSVC10) set(MSVC11) + set(MSVC12) set(MSVC60) set(MSVC70) set(MSVC71) @@ -87,7 +89,9 @@ set(MSVC90) set(CMAKE_COMPILER_2005) set(CMAKE_COMPILER_SUPPORTS_PDBTYPE) - if(NOT "${_compiler_version}" VERSION_LESS 17) + if(NOT "${_compiler_version}" VERSION_LESS 18) + set(MSVC12 1) + elseif(NOT "${_compiler_version}" VERSION_LESS 17) set(MSVC11 1) elseif(NOT "${_compiler_version}" VERSION_LESS 16) set(MSVC10 1) @@ -106,7 +110,7 @@ endif() endif() -if(MSVC_C_ARCHITECTURE_ID MATCHES 64) +if(MSVC_C_ARCHITECTURE_ID MATCHES 64 OR MSVC_CXX_ARCHITECTURE_ID MATCHES 64) set(CMAKE_CL_64 1) else() set(CMAKE_CL_64 0) @@ -160,7 +164,7 @@ # executable linker flags set (CMAKE_LINK_DEF_FILE_FLAG "/DEF:") -# set the stack size and the machine type +# set the machine type set(_MACHINE_ARCH_FLAG ${MSVC_C_ARCHITECTURE_ID}) if(NOT _MACHINE_ARCH_FLAG) set(_MACHINE_ARCH_FLAG ${MSVC_CXX_ARCHITECTURE_ID}) @@ -173,7 +177,7 @@ endif() endif() set (CMAKE_EXE_LINKER_FLAGS_INIT - "${CMAKE_EXE_LINKER_FLAGS_INIT} /STACK:10000000 /machine:${_MACHINE_ARCH_FLAG}") + "${CMAKE_EXE_LINKER_FLAGS_INIT} /machine:${_MACHINE_ARCH_FLAG} /MANIFEST:NO") # add /debug and /INCREMENTAL:YES to DEBUG and RELWITHDEBINFO also add pdbtype # on versions that support it

10 years, 9 months

[hbelusca] 62559: [CMAKE] - GCC: Cosmetic changes only. - MSVC: * Cosmetic changes (the same as in GCC). * Only VS 10+ resource compiler supports /nologo , therefore define a rc_nologo_flag that se...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Mar 24 20:54:01 2014 New Revision: 62559 URL: http://svn.reactos.org/svn/reactos?rev=62559&view=rev Log: [CMAKE] - GCC: Cosmetic changes only. - MSVC: * Cosmetic changes (the same as in GCC). * Only VS 10+ resource compiler supports /nologo , therefore define a rc_nologo_flag that sets /nologo for VS 10+ rc.exe, and nothing for VS < 10. CORE-6997 #comment Only VS10+ rc.exe supports /nologo, modify the fix in revision 62559. CORE-8023 Modified: trunk/reactos/cmake/gcc.cmake trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=62559&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Mon Mar 24 20:54:01 2014 @@ -139,7 +139,7 @@ add_definitions(-D_inline=__inline) -# alternative arch name +# Alternative arch name if(ARCH STREQUAL "amd64") set(ARCH2 x86_64) else() @@ -268,18 +268,18 @@ endif() function(generate_import_lib _libname _dllname _spec_file) - # generate the def for the import lib + # Generate the def for the import lib add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def COMMAND native-spec2def -n=${_dllname} -a=${ARCH2} --implib -d=${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def PROPERTIES EXTERNAL_OBJECT TRUE) - #create normal importlib + # Create normal importlib _add_library(${_libname} STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def) set_target_properties(${_libname} PROPERTIES LINKER_LANGUAGE "IMPLIB" PREFIX "") - #create delayed importlib + # Create delayed importlib _add_library(${_libname}_delayed STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def) set_target_properties(${_libname}_delayed PROPERTIES LINKER_LANGUAGE "IMPLIB_DELAYED" PREFIX "") endfunction() @@ -288,7 +288,7 @@ set(CMAKE_IMPLIB_CREATE_STATIC_LIBRARY "${CMAKE_DLLTOOL} --def <OBJECTS> --kill-at --output-lib=<TARGET>") set(CMAKE_IMPLIB_DELAYED_CREATE_STATIC_LIBRARY "${CMAKE_DLLTOOL} --def <OBJECTS> --kill-at --output-delaylib=<TARGET>") function(spec2def _dllname _spec_file) - # do we also want to add importlib targets? + # Do we also want to add importlib targets? if(${ARGC} GREATER 2) if(${ARGN} STREQUAL "ADD_IMPORTLIB") set(__add_importlib TRUE) @@ -297,15 +297,15 @@ endif() endif() - # get library basename + # Get library basename get_filename_component(_file ${_dllname} NAME_WE) - # error out on anything else than spec + # Error out on anything else than spec if(NOT ${_spec_file} MATCHES ".*\\.spec") message(FATAL_ERROR "spec2def only takes spec files as input.") endif() - # generate exports def and stubs C file for the module + # Generate exports def and C stubs file for the DLL add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c COMMAND native-spec2def -n=${_dllname} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} @@ -320,7 +320,7 @@ set(COMMAND_MC ${CMAKE_MC_COMPILER} ${FLAG} -b ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos) endmacro() -#pseh lib, needed with mingw +# PSEH lib, needed with mingw set(PSEH_LIB "pseh") # Macros @@ -388,4 +388,3 @@ macro(add_asm_files _target) list(APPEND ${_target} ${ARGN}) endmacro() - Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=62559… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Mon Mar 24 20:54:01 2014 @@ -92,10 +92,16 @@ endif() if(MSVC_IDE AND (CMAKE_VERSION MATCHES "ReactOS")) - # for VS builds we'll only have en-US in resource files + # For VS builds we'll only have en-US in resource files add_definitions(/DLANGUAGE_EN_US) else() - set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> /nologo <FLAGS> <DEFINES> ${I18N_DEFS} /fo<OBJECT> <SOURCE>") + # Only VS 10+ resource compiler supports /nologo + if(MSVC_VERSION GREATER 1599) + set(rc_nologo_flag "/nologo") + else() + set(rc_nologo_flag) + endif() + set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${rc_nologo_flag} <FLAGS> <DEFINES> ${I18N_DEFS} /fo<OBJECT> <SOURCE>") set(CMAKE_ASM_COMPILE_OBJECT "cl ${cl_includes_flag} /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp") @@ -213,7 +219,7 @@ endif() endfunction() -#define those for having real libraries +# Define those for having real libraries set(CMAKE_IMPLIB_CREATE_STATIC_LIBRARY "LINK /LIB /NOLOGO <LINK_FLAGS> /OUT:<TARGET> <OBJECTS>") set(CMAKE_STUB_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <SOURCE>") function(add_delay_importlibs _module) @@ -246,12 +252,12 @@ COMMAND ${CMAKE_ASM_COMPILER} /Cp /Fo${_asm_stubs_file}.obj /c /Ta ${_asm_stubs_file} DEPENDS ${_asm_stubs_file}) else() - # be clear about the "language" + # Be clear about the "language" # Thanks MS for creating a stupid linker set_source_files_properties(${_asm_stubs_file} PROPERTIES LANGUAGE "STUB_ASM") endif() - # add our library + # Add our library if(MSVC_IDE) add_library(${_libname} STATIC EXCLUDE_FROM_ALL ${_asm_stubs_file}.obj) set_source_files_properties(${_asm_stubs_file}.obj PROPERTIES EXTERNAL_OBJECT 1) @@ -273,7 +279,7 @@ set(SPEC2DEF_ARCH i386) endif() function(spec2def _dllname _spec_file) - # do we also want to add importlib targets? + # Do we also want to add importlib targets? if(${ARGC} GREATER 2) if(${ARGN} STREQUAL "ADD_IMPORTLIB") set(__add_importlib TRUE) @@ -282,15 +288,15 @@ endif() endif() - # get library basename + # Get library basename get_filename_component(_file ${_dllname} NAME_WE) - # error out on anything else than spec + # Error out on anything else than spec if(NOT ${_spec_file} MATCHES ".*\\.spec") message(FATAL_ERROR "spec2def only takes spec files as input.") endif() - #generate def for the DLL and C stubs file + # Generate exports def and C stubs file for the DLL add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c COMMAND native-spec2def --ms -a=${SPEC2DEF_ARCH} -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} @@ -305,7 +311,7 @@ set(COMMAND_MC ${CMAKE_MC_COMPILER} ${FLAG} -b ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos) endmacro() -#pseh workaround +# PSEH workaround set(PSEH_LIB "pseh") # Use a full path for the x86 version of ml when using x64 VS.

10 years, 9 months

[hbelusca] 62558: [USER32]: Fix MSVC compilation.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Mar 24 17:29:40 2014 New Revision: 62558 URL: http://svn.reactos.org/svn/reactos?rev=62558&view=rev Log: [USER32]: Fix MSVC compilation. Modified: trunk/reactos/win32ss/user/user32/windows/menu.c Modified: trunk/reactos/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] Mon Mar 24 17:29:40 2014 @@ -2545,9 +2545,8 @@ } else { - BOOL ret; ROSMENUINFO topmenuI; - ret = MenuGetRosMenuInfo(&topmenuI, Mt->TopMenu); + BOOL ret = MenuGetRosMenuInfo(&topmenuI, Mt->TopMenu); DWORD dwStyle = MenuInfo->dwStyle | (ret ? topmenuI.dwStyle : 0); if (dwStyle & MNS_NOTIFYBYPOS)

10 years, 9 months

[hbelusca] 62557: [BOOTDATA] Set PROMPT to $P$G$I instead of $I$P$G, so that the dumb Win cmd.exe can parse "completely" the prompt string (and succeeds in displaying the $p$g part) before failing ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Mar 24 17:06:05 2014 New Revision: 62557 URL: http://svn.reactos.org/svn/reactos?rev=62557&view=rev Log: [BOOTDATA] Set PROMPT to $P$G$I instead of $I$P$G, so that the dumb Win cmd.exe can parse "completely" the prompt string (and succeeds in displaying the $p$g part) before failing on the $i part... See rev.59837 and CORE-7634 #comment A better fix was committed in revision 62557. Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Mon Mar 24 17:06:05 2014 @@ -1214,7 +1214,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ComSpec",0x00020000,"%SystemRoot%\system32\cmd.exe" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","PATHEXT",0x00000000,".COM;.EXE;.BAT;.CMD" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","PROMPT",0x00000000,"$I$P$G" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","PROMPT",0x00000000,"$P$G$I" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x00020000,"%SystemDrive%\TEMP" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x00020000,"%SystemDrive%\TEMP" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x00020000,"%SystemRoot%"

10 years, 9 months

[jimtabor] 62556: - Fix CORE-7791.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Mar 24 03:28:07 2014 New Revision: 62556 URL: http://svn.reactos.org/svn/reactos?rev=62556&view=rev Log: - Fix CORE-7791. Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Mon Mar 24 03:28:07 2014 @@ -155,8 +155,26 @@ IN DWORD crBackColor, IN FLONG fl) { + DWORD dwTRop; + + if (ROP & CAPTUREBLT) + return NtGdiStretchBlt(hDCDest, + XDest, + YDest, + Width, + Height, + hDCSrc, + XSrc, + YSrc, + Width, + Height, + ROP, + crBackColor); + + dwTRop = ROP & ~(NOMIRRORBITMAP|CAPTUREBLT); + /* Forward to NtGdiMaskBlt */ - // TODO: What's fl for? + // TODO: What's fl for? LOL not to send this to MaskBit! return NtGdiMaskBlt(hDCDest, XDest, YDest, @@ -168,7 +186,7 @@ NULL, 0, 0, - ROP, + dwTRop, crBackColor); } @@ -712,6 +730,8 @@ DWORD ROP, IN DWORD dwBackColor) { + DWORD dwTRop = ROP & ~(NOMIRRORBITMAP|CAPTUREBLT); + return GreStretchBltMask( hDCDest, XOriginDest, @@ -723,7 +743,7 @@ YOriginSrc, WidthSrc, HeightSrc, - ROP, + dwTRop, dwBackColor, NULL, 0,

10 years, 9 months

← Newer
1
2
3
4
5
6
7
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2014