Ros-diffs December 2012

ros-diffs@reactos.org

12 participants
287 discussions

[tkreuzer] 57992: [REACTOS] Add simplified Chinese language resource. Patch by BinSys (binsys@163.com) CORE-6823 #resolve
by tkreuzer＠svn.reactos.org 24 Dec '12

24 Dec '12

Author: tkreuzer Date: Mon Dec 24 12:43:15 2012 New Revision: 57992 URL: http://svn.reactos.org/svn/reactos?rev=57992&view=rev Log: [REACTOS] Add simplified Chinese language resource. Patch by BinSys (binsys(a)163.com) CORE-6823 #resolve Added: trunk/reactos/base/setup/reactos/lang/zh-CN.rc (with props) Modified: trunk/reactos/base/setup/reactos/rsrc.rc Added: trunk/reactos/base/setup/reactos/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/zh… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/zh-CN.rc (added) +++ trunk/reactos/base/setup/reactos/lang/zh-CN.rc [iso-8859-1] Mon Dec 24 12:43:15 2012 @@ -1,0 +1,153 @@ +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +IDD_STARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS å®è£" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "æ¬¢è¿ä½¿ç¨ ReactOS å®è£åå¯¼ã", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "æ¨ä¸è½ç´æ¥ä»æ¤CDå®è£ ReactOSï¼ è¯·éæ°å¯å¨å¹¶ä»CDå¼å¯¼æ¨ççµèä»¥ä¾¿å®è£ ReactOSã", IDC_STATIC, 115, 40, 195, 100 + LTEXT "ç¹å»å®æéåºå®è£ã", IDC_STATIC, 115, 169, 195, 17 +END + +IDD_LANGSELPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS å®è£" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + CONTROL "å®è£è¯è¨:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11 + CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142 + CONTROL "é®çæè¾å¥æ³:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11 + CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81 + LTEXT "ç¹å»ä¸ä¸æ¥éæ©å®è£ç±»åã", IDC_STATIC, 10, 180 ,297, 10 +END + +IDD_TYPEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS å®è£" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "å®è£ç±»å", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + CONTROL "å®è£ ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10 + CONTROL "ä¿®å¤ææ´æ°å·²å®è£ç ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 + LTEXT "ç¹å»ä¸ä¸æ¥å®è£è®¾å¤ã", IDC_STATIC, 10, 180 ,297, 10 +END + +IDD_DEVICEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS å®è£" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "è®¾å¤è®¾ç½®", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "è®¡ç®æº:", IDC_STATIC, 20,15, 80, 10 + CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 15, 180, 80 + LTEXT "æ¾ç¤º:", IDC_STATIC, 20,35, 80, 10 + CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 180, 80 + LTEXT "é®ç:", IDC_STATIC, 20,55, 80, 10 + CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 180, 80 + LTEXT "ç¹å»ä¸ä¸æ¥è®¾ç½®å®è£é©±å¨å¨ã", IDC_STATIC, 10, 180 ,277, 20 +END + +IDD_DRIVEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS å®è£" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "ReactOS å®è£ååº", IDC_STATIC, "Button", BS_GROUPBOX, 10,1,298,176 + LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL + PUSHBUTTON "å»ºç«(&C)", IDC_PARTCREATE, 20,155,50,15 + PUSHBUTTON "å é¤(&D)", IDC_PARTDELETE, 76,155,50,15 + PUSHBUTTON "é©±å¨å¨(&r)", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED + PUSHBUTTON "é«çº§éé¡¹(&A)...", IDC_PARTMOREOPTS, 218,155,80,15 + LTEXT "ç¹å»ä¸ä¸æ¥æ£æ¥å®è£æ¦è¦ã", IDC_STATIC, 10, 180 ,277, 20 +END + +IDD_PARTITION DIALOGEX DISCARDABLE 0, 0, 145, 90 +STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME +CAPTION "å»ºç«ååº" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",IDC_UPDOWN1,"msctls_updown32", WS_VISIBLE,104,22,9,13 + CONTROL "å»ºç«å¹¶æ ¼å¼åååº",IDC_STATIC,"Button",BS_GROUPBOX,7,5,129,57 + LTEXT "å¤§å°:",IDC_STATIC, 13,24,27,9 + EDITTEXT IDC_PARTSIZE,52,23,53,13, WS_VISIBLE|WS_TABSTOP + LTEXT "GB",IDC_UNIT, 117,24,14,9 + LTEXT "æä»¶ç³»ç»:",IDC_STATIC,13,46,35,9 + CONTROL "",IDC_FSTYPE,"ComboBox",WS_VISIBLE|WS_TABSTOP|CBS_DROPDOWNLIST,52,42,79,50 + PUSHBUTTON "ç¡®å®(&O)",IDOK,35,68,47,15, WS_VISIBLE|WS_TABSTOP + PUSHBUTTON "åæ¶(&C)",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP +END + +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 +STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME +CAPTION "é«çº§ååºè®¾ç½®" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "å®è£æä»¶å¤¹", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 + EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE + + CONTROL "å¼å¯¼å¨ç¨åºå®è£", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 + + CONTROL "å®è£å¼å¯¼ç¨åºå°ç¡¬ç (MBR å VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "å®è£å¼å¯¼ç¨åºå°ç¡¬ç (ä» VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 + CONTROL "ä¸å®è£å¼å¯¼ç¨åº", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 + PUSHBUTTON "ç¡®å®(&O)", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "åæ¶(&C)", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE +END + +IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS å®è£" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "å®è£æ¦è¦", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "ç¹å»ä¸ä¸æ¥å¼å§å®è£è¿ç¨ã", IDC_STATIC, 10, 180 ,277, 20 +END + +IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS å®è£" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "å®è£å¨ä½", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "å®è£æä»¶...", IDC_ACTIVITY, 20, 50, 277, 10 + LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", + PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 +END + +IDD_RESTARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS å®è£å®æ" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "ReactOS ç¬¬ä¸é¶æ®µå®è£å®æ", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "æ¨æåå®æ ReactOS ç¬¬ä¸é¶æ®µå®è£è¿ç¨ã", IDC_STATIC, 20, 50, 277, 10 + + LTEXT "ç¹å»å®æåï¼æ¨ççµèå°ä¼éæ°å¯å¨ã", IDC_STATIC, 20, 80, 277, 10 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 + LTEXT "è¯·ä»åçé©±å¨å¨ååºä»»ä½åçãç¶åï¼ç¹å»å®æéå¯æ¨ççµèã", IDC_STATIC, 10, 180, 297, 20 +END + +STRINGTABLE +BEGIN + IDS_LANGTITLE "è¯è¨éæ©" + IDS_LANGSUBTITLE "éæ©å®è£è¿ç¨ä¸åæç»ç³»ç»æä½¿ç¨çè¯è¨" + IDS_TYPETITLE "ReactOS å®è£" + IDS_TYPESUBTITLE "éæ©å®è£ç±»åã" + IDS_DEVICETITLE "è®¾ç½®åºæ¬è®¾å¤ã" + IDS_DEVICESUBTITLE "æå®æ¾ç¤ºåé®çè®¾ç½®ã" + IDS_DRIVETITLE "è®¾ç½®å®è£ååºåç³»ç»æä»¶å¤¹" + IDS_DRIVESUBTITLE "è®¾ç½®å®è£ååºï¼ç³»ç»æä»¶å¤¹åå¼å¯¼ç¨åºã" + IDS_PROCESSTITLE "è®¾ç½®ååºï¼å¤å¶æä»¶å¹¶å®è£ç³»ç»" + IDS_PROCESSSUBTITLE "å»ºç«å¹¶æ ¼å¼åååºï¼å¤å¶æä»¶ï¼å®è£å¹¶è®¾ç½®å¼å¯¼ç¨åº" + IDS_RESTARTTITLE "ç¬¬ä¸é¶æ®µå®è£å®æ" + IDS_RESTARTSUBTITLE "ç¬¬ä¸é¶æ®µå®è£å·²ç»å®æï¼éæ°å¯å¨è¿è¡ç¬¬äºé¶æ®µå®è£" + IDS_SUMMARYTITLE "å®è£æ¦è¦" + IDS_SUMMARYSUBTITLE "æ£æ¯å®è£åååºå®è£å±æ§ä»¥ä¾æ£æ¥" + IDS_ABORTSETUP "ReactOS æªå¨æ¨ççµèä¸å®è£å®æãå¦ææ¨ç°å¨éåºå®è£ç¨åºï¼æ¨éè¦å¨ä¸æ¬¡è¿è¡å®è£ç¨åºæ¥å®è£ Reactosã ç¡®å®éåºï¼" + IDS_ABORTSETUP2 "ç»æ¢å®è£ï¼" +END + +/* EOF */ Propchange: trunk/reactos/base/setup/reactos/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/setup/reactos/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/rsrc.rc… ============================================================================== --- trunk/reactos/base/setup/reactos/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/rsrc.rc [iso-8859-1] Mon Dec 24 12:43:15 2012 @@ -61,4 +61,7 @@ #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif

1 0

[ekohl] 57991: [SAMLIB] Implement SamGetCompatibilityMode.
by ekohl＠svn.reactos.org 24 Dec '12

24 Dec '12

Author: ekohl Date: Mon Dec 24 11:50:59 2012 New Revision: 57991 URL: http://svn.reactos.org/svn/reactos?rev=57991&view=rev Log: [SAMLIB] Implement SamGetCompatibilityMode. Modified: trunk/reactos/dll/win32/samlib/samlib.c trunk/reactos/dll/win32/samlib/samlib.spec Modified: trunk/reactos/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.c?… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] Mon Dec 24 11:50:59 2012 @@ -723,6 +723,22 @@ NTSTATUS NTAPI +SamGetCompatibilityMode(IN SAM_HANDLE ObjectHandle, + OUT PULONG Mode) +{ + TRACE("(%p %p)\n", ObjectHandle, Mode); + + if (Mode == NULL) + return STATUS_INVALID_PARAMETER; + + *Mode = SAM_SID_COMPATIBILITY_ALL; + + return STATUS_SUCCESS; +} + + +NTSTATUS +NTAPI SamGetGroupsForUser(IN SAM_HANDLE UserHandle, OUT PGROUP_MEMBERSHIP *Groups, OUT PULONG MembershipCount) Modified: trunk/reactos/dll/win32/samlib/samlib.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.sp… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] Mon Dec 24 11:50:59 2012 @@ -20,7 +20,7 @@ @ stdcall SamEnumerateUsersInDomain(ptr ptr long ptr long ptr) @ stdcall SamFreeMemory(ptr) @ stdcall SamGetAliasMembership(ptr long ptr ptr ptr) -@ stub SamGetCompatibilityMode +@ stdcall SamGetCompatibilityMode(ptr ptr) @ stub SamGetDisplayEnumerationIndex @ stdcall SamGetGroupsForUser(ptr ptr ptr) @ stdcall SamGetMembersInAlias(ptr ptr ptr)

1 0

[akhaldi] 57990: [CMAKE] * Add basic support for the new MSVC build handling that comes with the upcoming RosBE 2.1. * This needs to be inspected further to make sure it matches our current setup.
by akhaldi＠svn.reactos.org 24 Dec '12

24 Dec '12

Author: akhaldi Date: Mon Dec 24 11:21:54 2012 New Revision: 57990 URL: http://svn.reactos.org/svn/reactos?rev=57990&view=rev Log: [CMAKE] * Add basic support for the new MSVC build handling that comes with the upcoming RosBE 2.1. * This needs to be inspected further to make sure it matches our current setup. Added: trunk/reactos/cmake/Platform/Windows-MSVC.cmake (with props) Added: 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 (added) +++ trunk/reactos/cmake/Platform/Windows-MSVC.cmake [iso-8859-1] Mon Dec 24 11:21:54 2012 @@ -1,0 +1,239 @@ + +#============================================================================= +# Copyright 2001-2012 Kitware, Inc. +# +# Distributed under the OSI-approved BSD License (the "License"); +# see accompanying file Copyright.txt for details. +# +# This software is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the License for more information. +#============================================================================= +# (To distribute this file outside of CMake, substitute the full +# License text for the above reference.) + +# This module is shared by multiple languages; use include blocker. +if(__WINDOWS_MSVC) + return() +endif() +set(__WINDOWS_MSVC 1) + +set(CMAKE_LIBRARY_PATH_FLAG "-LIBPATH:") +set(CMAKE_LINK_LIBRARY_FLAG "") +set(MSVC 1) + +# 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 +if(NOT DEFINED CMAKE_LINKER) + set(CMAKE_LINKER link) +endif() + +if(CMAKE_VERBOSE_MAKEFILE) + set(CMAKE_CL_NOLOGO) +else() + set(CMAKE_CL_NOLOGO "/nologo") +endif() + +set(WIN32 1) + +if(CMAKE_SYSTEM_NAME MATCHES "WindowsCE") + set(CMAKE_CREATE_WIN32_EXE "/subsystem:windowsce /entry:WinMainCRTStartup") + set(CMAKE_CREATE_CONSOLE_EXE "/subsystem:windowsce /entry:mainACRTStartup") +else() + set(CMAKE_CREATE_WIN32_EXE "/subsystem:windows") + set(CMAKE_CREATE_CONSOLE_EXE "/subsystem:console") +endif() + +if(CMAKE_GENERATOR MATCHES "Visual Studio 6") + set (CMAKE_NO_BUILD_TYPE 1) +endif() +if(NOT CMAKE_NO_BUILD_TYPE AND CMAKE_GENERATOR MATCHES "Visual Studio") + set (CMAKE_NO_BUILD_TYPE 1) + set (CMAKE_CONFIGURATION_TYPES "Debug;Release;MinSizeRel;RelWithDebInfo" CACHE STRING + "Semicolon separated list of supported configuration types, only supports Debug, Release, MinSizeRel, and RelWithDebInfo, anything else will be ignored.") + mark_as_advanced(CMAKE_CONFIGURATION_TYPES) +endif() + +# make sure to enable languages after setting configuration types +enable_language(RC) +set(CMAKE_COMPILE_RESOURCE "rc <FLAGS> /fo<OBJECT> <SOURCE>") + +if("${CMAKE_GENERATOR}" MATCHES "Visual Studio") + set(MSVC_IDE 1) +else() + set(MSVC_IDE 0) +endif() + +if(NOT MSVC_VERSION) + if(CMAKE_C_COMPILER_VERSION) + set(_compiler_version ${CMAKE_C_COMPILER_VERSION}) + else() + set(_compiler_version ${CMAKE_CXX_COMPILER_VERSION}) + endif() + if("${_compiler_version}" MATCHES "^([0-9]+)\\.([0-9]+)") + math(EXPR MSVC_VERSION "${CMAKE_MATCH_1}*100 + ${CMAKE_MATCH_2}") + else() + message(FATAL_ERROR "MSVC compiler version not detected properly: ${_compiler_version}") + endif() + + set(MSVC10) + set(MSVC11) + set(MSVC60) + set(MSVC70) + set(MSVC71) + set(MSVC80) + set(MSVC90) + set(CMAKE_COMPILER_2005) + set(CMAKE_COMPILER_SUPPORTS_PDBTYPE) + if(NOT "${_compiler_version}" VERSION_LESS 17) + set(MSVC11 1) + elseif(NOT "${_compiler_version}" VERSION_LESS 16) + set(MSVC10 1) + elseif(NOT "${_compiler_version}" VERSION_LESS 15) + set(MSVC90 1) + elseif(NOT "${_compiler_version}" VERSION_LESS 14) + set(MSVC80 1) + set(CMAKE_COMPILER_2005 1) + elseif(NOT "${_compiler_version}" VERSION_LESS 13.10) + set(MSVC71 1) + elseif(NOT "${_compiler_version}" VERSION_LESS 13) + set(MSVC70 1) + else() + set(MSVC60 1) + set(CMAKE_COMPILER_SUPPORTS_PDBTYPE 1) + endif() +endif() + +if(MSVC_C_ARCHITECTURE_ID MATCHES 64) + set(CMAKE_CL_64 1) +else() + set(CMAKE_CL_64 0) +endif() +if(CMAKE_FORCE_WIN64 OR CMAKE_FORCE_IA64) + set(CMAKE_CL_64 1) +endif() + +if("${MSVC_VERSION}" GREATER 1599) + set(MSVC_INCREMENTAL_DEFAULT ON) +endif() + +# default to Debug builds +set(CMAKE_BUILD_TYPE_INIT Debug) + +if(CMAKE_SYSTEM_NAME MATCHES "WindowsCE") + string(TOUPPER "${MSVC_C_ARCHITECTURE_ID}" _MSVC_C_ARCHITECTURE_ID_UPPER) + string(TOUPPER "${MSVC_CXX_ARCHITECTURE_ID}" _MSVC_CXX_ARCHITECTURE_ID_UPPER) + + if("${CMAKE_SYSTEM_VERSION}" MATCHES "^([0-9]+)\\.([0-9]+)") + math(EXPR _CE_VERSION "${CMAKE_MATCH_1}*100 + ${CMAKE_MATCH_2}") + elseif("${CMAKE_SYSTEM_VERSION}" STREQUAL "") + set(_CE_VERSION "500") + else() + message(FATAL_ERROR "Invalid Windows CE version: ${CMAKE_SYSTEM_VERSION}") + endif() + + set(_PLATFORM_DEFINES "/D_WIN32_WCE=0x${_CE_VERSION} /DUNDER_CE") + set(_PLATFORM_DEFINES_C " /D${MSVC_C_ARCHITECTURE_ID} /D_${_MSVC_C_ARCHITECTURE_ID_UPPER}_") + set(_PLATFORM_DEFINES_CXX " /D${MSVC_CXX_ARCHITECTURE_ID} /D_${_MSVC_CXX_ARCHITECTURE_ID_UPPER}_") + + set(_RTC1 "") + set(_FLAGS_CXX " /GR /EHsc") + set(CMAKE_C_STANDARD_LIBRARIES_INIT "coredll.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib") + set(CMAKE_EXE_LINKER_FLAGS_INIT "${CMAKE_EXE_LINKER_FLAGS_INIT} /NODEFAULTLIB:libc.lib /NODEFAULTLIB:oldnames.lib") +else() + set(_PLATFORM_DEFINES "/DWIN32") + + if(MSVC_VERSION GREATER 1310) + set(_RTC1 "/RTC1") + set(_FLAGS_CXX " /GR /EHsc") + set(CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib") + else() + set(_RTC1 "/GZ") + set(_FLAGS_CXX " /GR /GX") + set(CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib") + endif() +endif() + +set(CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}") + +# executable linker flags +set (CMAKE_LINK_DEF_FILE_FLAG "/DEF:") +# set the stack size and the machine type +set(_MACHINE_ARCH_FLAG ${MSVC_C_ARCHITECTURE_ID}) +if(NOT _MACHINE_ARCH_FLAG) + set(_MACHINE_ARCH_FLAG ${MSVC_CXX_ARCHITECTURE_ID}) +endif() +if(CMAKE_SYSTEM_NAME MATCHES "WindowsCE") + if(_MACHINE_ARCH_FLAG MATCHES "ARM") + set(_MACHINE_ARCH_FLAG "THUMB") + elseif(_MACHINE_ARCH_FLAG MATCHES "SH") + set(_MACHINE_ARCH_FLAG "SH4") + endif() +endif() +set (CMAKE_EXE_LINKER_FLAGS_INIT + "${CMAKE_EXE_LINKER_FLAGS_INIT} /STACK:10000000 /machine:${_MACHINE_ARCH_FLAG}") + +# add /debug and /INCREMENTAL:YES to DEBUG and RELWITHDEBINFO also add pdbtype +# on versions that support it +set( MSVC_INCREMENTAL_YES_FLAG "") +if(NOT MSVC_INCREMENTAL_DEFAULT) + set( MSVC_INCREMENTAL_YES_FLAG "/INCREMENTAL:YES") +else() + set( MSVC_INCREMENTAL_YES_FLAG "/INCREMENTAL" ) +endif() + +if (CMAKE_COMPILER_SUPPORTS_PDBTYPE) + set (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug /pdbtype:sept") + set (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug /pdbtype:sept ${MSVC_INCREMENTAL_YES_FLAG}") +else () + set (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug") + set (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug ${MSVC_INCREMENTAL_YES_FLAG}") +endif () +# for release and minsize release default to no incremental linking +set(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT "/INCREMENTAL:NO") +set(CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT "/INCREMENTAL:NO") + +# copy the EXE_LINKER flags to SHARED and MODULE linker flags +# shared linker flags +set (CMAKE_SHARED_LINKER_FLAGS_INIT ${CMAKE_EXE_LINKER_FLAGS_INIT}) +set (CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT ${CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT}) +set (CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT}) +set (CMAKE_SHARED_LINKER_FLAGS_RELEASE_INIT ${CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT}) +set (CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL_INIT ${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT}) +# module linker flags +set (CMAKE_MODULE_LINKER_FLAGS_INIT ${CMAKE_SHARED_LINKER_FLAGS_INIT}) +set (CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT ${CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT}) +set (CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT}) +set (CMAKE_MODULE_LINKER_FLAGS_RELEASE_INIT ${CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT}) +set (CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL_INIT ${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT}) + +macro(__windows_compiler_msvc lang) + if(NOT "${CMAKE_${lang}_COMPILER_VERSION}" VERSION_LESS 14) + # for 2005 make sure the manifest is put in the dll with mt + set(_CMAKE_VS_LINK_DLL "<CMAKE_COMMAND> -E vs_link_dll ") + set(_CMAKE_VS_LINK_EXE "<CMAKE_COMMAND> -E vs_link_exe ") + endif() + set(CMAKE_${lang}_CREATE_SHARED_LIBRARY "<CMAKE_LINKER> ${CMAKE_CL_NOLOGO} <OBJECTS> ${CMAKE_START_TEMP_FILE} /out:<TARGET> /implib:<TARGET_IMPLIB> /pdb:<TARGET_PDB> /dll /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR> <LINK_FLAGS> <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}") + + set(CMAKE_${lang}_CREATE_SHARED_MODULE ${CMAKE_${lang}_CREATE_SHARED_LIBRARY}) + set(CMAKE_${lang}_CREATE_STATIC_LIBRARY "<CMAKE_LINKER> /lib ${CMAKE_CL_NOLOGO} <LINK_FLAGS> /out:<TARGET> <OBJECTS> ") + + set(CMAKE_${lang}_COMPILE_OBJECT + "<CMAKE_${lang}_COMPILER> ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO}${_COMPILE_${lang}} <FLAGS> <DEFINES> /Fo<OBJECT> /Fd<TARGET_PDB> -c <SOURCE>${CMAKE_END_TEMP_FILE}") + set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE + "<CMAKE_${lang}_COMPILER> > <PREPROCESSED_SOURCE> ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO}${_COMPILE_${lang}} <FLAGS> <DEFINES> -E <SOURCE>${CMAKE_END_TEMP_FILE}") + set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE + "<CMAKE_${lang}_COMPILER> ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO}${_COMPILE_${lang}} <FLAGS> <DEFINES> /FoNUL /FAs /Fa<ASSEMBLY_SOURCE> /c <SOURCE>${CMAKE_END_TEMP_FILE}") + + set(CMAKE_${lang}_COMPILER_LINKER_OPTION_FLAG_EXECUTABLE "/link") + set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_OBJECTS 1) + set(CMAKE_${lang}_LINK_EXECUTABLE "<CMAKE_${lang}_COMPILER> ${CMAKE_CL_NOLOGO} ${CMAKE_START_TEMP_FILE} <FLAGS> /Fe<TARGET> /Fd<TARGET_PDB> <OBJECTS> /link /implib:<TARGET_IMPLIB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR> <CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}") + + set(CMAKE_${lang}_FLAGS_INIT "") + set(CMAKE_${lang}_FLAGS_DEBUG_INIT "") + set(CMAKE_${lang}_FLAGS_RELEASE_INIT "/MD /O2 /Ob2 /D NDEBUG") + set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "/MD /Zi /O2 /Ob1 /D NDEBUG") + set(CMAKE_${lang}_FLAGS_MINSIZEREL_INIT "/MD /O1 /Ob1 /D NDEBUG") +endmacro() Propchange: trunk/reactos/cmake/Platform/Windows-MSVC.cmake ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 57989: [TASKMGR] 1) Use of CheckDlgButton() and IsDlgButtonChecked() rather than SendMessage, it will improve code readability. 2)Removes an useless initialization into perfpage.c 3) Get...
by tkreuzer＠svn.reactos.org 24 Dec '12

24 Dec '12

Author: tkreuzer Date: Mon Dec 24 10:51:02 2012 New Revision: 57989 URL: http://svn.reactos.org/svn/reactos?rev=57989&view=rev Log: [TASKMGR] 1) Use of CheckDlgButton() and IsDlgButtonChecked() rather than SendMessage, it will improve code readability. 2)Removes an useless initialization into perfpage.c 3) GetWindowLong/SetWindowLong were replaced with GetWindowLongPtr/SetWindowLongPtr, but GWL_WNDPROC and GWL_ID were not with GWLP_WNDPROC and GWLP_ID. 4) Corrected some comment texts. Patch by Carlo Bramini CORE-6367 #resolve Modified: trunk/reactos/base/applications/taskmgr/affinity.c trunk/reactos/base/applications/taskmgr/column.c trunk/reactos/base/applications/taskmgr/graph.c trunk/reactos/base/applications/taskmgr/graphctl.c trunk/reactos/base/applications/taskmgr/perfpage.c trunk/reactos/base/applications/taskmgr/procpage.c Modified: trunk/reactos/base/applications/taskmgr/affinity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/affinity.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/affinity.c [iso-8859-1] Mon Dec 24 10:51:02 2012 @@ -97,7 +97,7 @@ * has affinity with */ if (dwProcessAffinityMask & (1 << nCpu)) - SendMessageW(GetDlgItem(hDlg, dwCpuTable[nCpu]), BM_SETCHECK, BST_CHECKED, 0); + CheckDlgButton(hDlg, dwCpuTable[nCpu], BST_CHECKED); } return TRUE; @@ -123,7 +123,7 @@ * First we have to create a mask out of each * checkbox that the user checked. */ - if (SendMessageW(GetDlgItem(hDlg, dwCpuTable[nCpu]), BM_GETCHECK, 0, 0)) + if (IsDlgButtonChecked(hDlg, dwCpuTable[nCpu])) dwProcessAffinityMask |= (1 << nCpu); } Modified: trunk/reactos/base/applications/taskmgr/column.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/column.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/column.c [iso-8859-1] Mon Dec 24 10:51:02 2012 @@ -172,7 +172,7 @@ for (i=0; i<COLUMN_NMAX; i++) { if (TaskManagerSettings.Columns[i]) - SendMessageW(GetDlgItem(hDlg, ColumnPresets[i].dwIdcCtrl), BM_SETCHECK, BST_CHECKED, 0); + CheckDlgButton(hDlg, ColumnPresets[i].dwIdcCtrl, BST_CHECKED); } return TRUE; @@ -187,7 +187,7 @@ if (LOWORD(wParam) == IDOK) { for (i=0; i<COLUMN_NMAX; i++) - TaskManagerSettings.Columns[i] = (BOOL) SendMessageW(GetDlgItem(hDlg, ColumnPresets[i].dwIdcCtrl), BM_GETCHECK, 0, 0); + TaskManagerSettings.Columns[i] = (BOOL)IsDlgButtonChecked(hDlg, ColumnPresets[i].dwIdcCtrl); EndDialog(hDlg, LOWORD(wParam)); return TRUE; Modified: trunk/reactos/base/applications/taskmgr/graph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/graph.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/graph.c [iso-8859-1] Mon Dec 24 10:51:02 2012 @@ -102,7 +102,7 @@ hdc = BeginPaint(hWnd, &ps); - WindowId = GetWindowLongPtrW(hWnd, GWL_ID); + WindowId = GetWindowLongPtrW(hWnd, GWLP_ID); switch (WindowId) { Modified: trunk/reactos/base/applications/taskmgr/graphctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/graphctl.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/graphctl.c [iso-8859-1] Mon Dec 24 10:51:02 2012 @@ -59,7 +59,7 @@ this->m_nYDecimals = 3; /* set some initial values for the scaling until "SetRange" is called. - * these are protected varaibles and must be set with SetRange + * these are protected variables and must be set with SetRange * in order to ensure that m_dRange is updated accordingly */ /* m_dLowerLimit = -10.0; */ @@ -322,8 +322,8 @@ (m_rectPlot.bottom+m_rectPlot.top)/2, m_strYUnitsString, wcslen(m_strYUnitsString)); SelectObject(m_dcGrid, oldFont); #endif - /* at this point we are done filling the the grid bitmap, */ - /* no more drawing to this bitmap is needed until the setting are changed */ + /* at this point we are done filling the grid bitmap, */ + /* no more drawing to this bitmap is needed until the settings are changed */ /* if we don't have one yet, set up a memory dc for the plot */ if (this->m_dcPlot == NULL) @@ -441,7 +441,7 @@ /* fill the cleanup area with the background */ FillRect(this->m_dcPlot, &rectCleanUp, this->m_brushBack); - /* draw the next line segement */ + /* draw the next line segment */ for (i = 0; i < MAX_PLOTS; i++) { /* grab the plotting pen */ Modified: trunk/reactos/base/applications/taskmgr/perfpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/perfpage.c [iso-8859-1] Mon Dec 24 10:51:02 2012 @@ -91,7 +91,6 @@ } else { cx = rc.left + nXDifference; cy = rc.top + nYDifference; - sx = sy = 0; SetWindowPos(hCntrl, NULL, cx, cy, 0, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER); } InvalidateRect(hCntrl, NULL, TRUE); @@ -198,10 +197,10 @@ /* * Subclass graph buttons */ - OldGraphWndProc = (WNDPROC)(LONG_PTR) SetWindowLongPtrW(hPerformancePageCpuUsageGraph, GWL_WNDPROC, (LONG_PTR)Graph_WndProc); - SetWindowLongPtrW(hPerformancePageMemUsageGraph, GWL_WNDPROC, (LONG_PTR)Graph_WndProc); - OldGraphCtrlWndProc = (WNDPROC)(LONG_PTR) SetWindowLongPtrW(hPerformancePageMemUsageHistoryGraph, GWL_WNDPROC, (LONG_PTR)GraphCtrl_WndProc); - SetWindowLongPtrW(hPerformancePageCpuUsageHistoryGraph, GWL_WNDPROC, (LONG_PTR)GraphCtrl_WndProc); + OldGraphWndProc = (WNDPROC)(LONG_PTR) SetWindowLongPtrW(hPerformancePageCpuUsageGraph, GWLP_WNDPROC, (LONG_PTR)Graph_WndProc); + SetWindowLongPtrW(hPerformancePageMemUsageGraph, GWLP_WNDPROC, (LONG_PTR)Graph_WndProc); + OldGraphCtrlWndProc = (WNDPROC)(LONG_PTR) SetWindowLongPtrW(hPerformancePageMemUsageHistoryGraph, GWLP_WNDPROC, (LONG_PTR)GraphCtrl_WndProc); + SetWindowLongPtrW(hPerformancePageCpuUsageHistoryGraph, GWLP_WNDPROC, (LONG_PTR)GraphCtrl_WndProc); return TRUE; case WM_COMMAND: Modified: trunk/reactos/base/applications/taskmgr/procpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] Mon Dec 24 10:51:02 2012 @@ -139,7 +139,7 @@ /* * Subclass the process list control so we can intercept WM_ERASEBKGND */ - OldProcessListWndProc = (WNDPROC)(LONG_PTR) SetWindowLongPtrW(hProcessPageListCtrl, GWL_WNDPROC, (LONG_PTR)ProcessListWndProc); + OldProcessListWndProc = (WNDPROC)(LONG_PTR) SetWindowLongPtrW(hProcessPageListCtrl, GWLP_WNDPROC, (LONG_PTR)ProcessListWndProc); #ifdef RUN_PROC_PAGE /* Start our refresh thread */

1 0

[janderwald] 57988: [USBCCGP] - Fix bug when enumerating composite usb devices with IADs
by janderwald＠svn.reactos.org 24 Dec '12

24 Dec '12

Author: janderwald Date: Mon Dec 24 09:56:28 2012 New Revision: 57988 URL: http://svn.reactos.org/svn/reactos?rev=57988&view=rev Log: [USBCCGP] - Fix bug when enumerating composite usb devices with IADs Modified: trunk/reactos/drivers/usb/usbccgp/function.c Modified: trunk/reactos/drivers/usb/usbccgp/function.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/functi… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/function.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/function.c [iso-8859-1] Mon Dec 24 09:56:28 2012 @@ -465,7 +465,7 @@ // allocate function descriptor array // FDODeviceExtension->FunctionDescriptor = AllocateItem(NonPagedPool, sizeof(USBC_FUNCTION_DESCRIPTOR) * DescriptorCount); - if (!FDODeviceExtension->FunctionDescriptorCount) + if (!FDODeviceExtension->FunctionDescriptor) { // // no memory

1 0

[hbelusca] 57987: [SYSSETUP] I forgot that previously.
by hbelusca＠svn.reactos.org 23 Dec '12

23 Dec '12

Author: hbelusca Date: Sun Dec 23 23:22:10 2012 New Revision: 57987 URL: http://svn.reactos.org/svn/reactos?rev=57987&view=rev Log: [SYSSETUP] I forgot that previously. Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Sun Dec 23 23:22:10 2012 @@ -55,10 +55,11 @@ PROCESS_INFORMATION ProcInfo; MSG msg; DWORD ret; - STARTUPINFOW si = {0}; + STARTUPINFOW si; WCHAR InstallName[] = L"vmwinst.exe"; - si.cb = sizeof(STARTUPINFO); + ZeroMemory(&si, sizeof(si)); + si.cb = sizeof(si); if(CreateProcessW(NULL, InstallName, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL, &si, &ProcInfo)) @@ -795,7 +796,7 @@ WCHAR CmdLine[MAX_PATH] = L"rundll32.exe shell32.dll,Control_RunDLL "; ZeroMemory(&StartupInfo, sizeof(StartupInfo)); - StartupInfo.cb = sizeof(STARTUPINFOW); + StartupInfo.cb = sizeof(StartupInfo); ASSERT(_countof(CmdLine) > wcslen(CmdLine) + wcslen(pwszCPLParameters)); wcscat(CmdLine, pwszCPLParameters);

1 0

[hbelusca] 57986: [WRITE/SETUP/RUNONCE/SERVICES/MMSYS/MSGINA/SYSSETUP] - Use in some places ZeroMemory instead of memset(..., 0, ...). - Fix way of initializing the STARTUPINFO structure before cal...
by hbelusca＠svn.reactos.org 23 Dec '12

23 Dec '12

Author: hbelusca Date: Sun Dec 23 23:17:10 2012 New Revision: 57986 URL: http://svn.reactos.org/svn/reactos?rev=57986&view=rev Log: [WRITE/SETUP/RUNONCE/SERVICES/MMSYS/MSGINA/SYSSETUP] - Use in some places ZeroMemory instead of memset(..., 0, ...). - Fix way of initializing the STARTUPINFO structure before call to CreateProcess: in particular, when using the wShowWindow field, also use the STARTF_USESHOWWINDOW flag. [USERINIT] - Fix way of initializing the STARTUPINFO structure before call to CreateProcess: in particular, when using the wShowWindow field, also use the STARTF_USESHOWWINDOW flag. - This fixes CORE-5735. CORE-5735 #resolve #comment Command-line launching fixed in revision r57986. Modified: trunk/reactos/base/applications/rapps/loaddlg.c trunk/reactos/base/applications/rapps/misc.c trunk/reactos/base/applications/write/write.c trunk/reactos/base/setup/welcome/welcome.c trunk/reactos/base/system/runonce/runonce.c trunk/reactos/base/system/services/database.c trunk/reactos/base/system/userinit/userinit.c trunk/reactos/dll/cpl/mmsys/audio.c trunk/reactos/dll/win32/msgina/msgina.c trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/base/applications/rapps/loaddlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lo… ============================================================================== --- trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] Sun Dec 23 23:17:10 2012 @@ -260,7 +260,7 @@ ShowWindow(Dlg, SW_HIDE); /* run it */ - memset(&si, 0, sizeof(si)); + ZeroMemory(&si, sizeof(si)); si.cb = sizeof(si); r = CreateProcessW(path, NULL, NULL, NULL, 0, 0, NULL, NULL, &si, &pi); if (0 == r) goto end; Modified: trunk/reactos/base/applications/rapps/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/mi… ============================================================================== --- trunk/reactos/base/applications/rapps/misc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/misc.c [iso-8859-1] Sun Dec 23 23:17:10 2012 @@ -168,6 +168,7 @@ ZeroMemory(&si, sizeof(si)); si.cb = sizeof(si); + si.dwFlags = STARTF_USESHOWWINDOW; si.wShowWindow = SW_SHOW; if (!CreateProcessW(NULL, lpPath, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) Modified: trunk/reactos/base/applications/write/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/wr… ============================================================================== --- trunk/reactos/base/applications/write/write.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/write/write.c [iso-8859-1] Sun Dec 23 23:17:10 2012 @@ -35,16 +35,20 @@ PROCESS_INFORMATION info; if (!GetSystemDirectoryW(path, MAX_PATH - 1 - lstrlenW(SZ_WORDPAD))) - goto failed; + goto failed; + if (path[lstrlenW(path) - 1] != '\\') - lstrcatW(path, SZ_BACKSLASH); + lstrcatW(path, SZ_BACKSLASH); + lstrcatW(path, SZ_WORDPAD); - stinf.cb = sizeof(STARTUPINFOW); + ZeroMemory(&stinf, sizeof(stinf)); + stinf.cb = sizeof(stinf); GetStartupInfoW(&stinf); if (!CreateProcessW(path, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &stinf, &info)) - goto failed; + goto failed; + CloseHandle(info.hProcess); CloseHandle(info.hThread); return 0; Modified: trunk/reactos/base/setup/welcome/welcome.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome… ============================================================================== --- trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] Sun Dec 23 23:17:10 2012 @@ -261,8 +261,8 @@ _tcscat(AppName, CurrentDir); } - memset(&StartupInfo, 0, sizeof(STARTUPINFO)); - StartupInfo.cb = sizeof(STARTUPINFO); + ZeroMemory(&StartupInfo, sizeof(StartupInfo)); + StartupInfo.cb = sizeof(StartupInfo); StartupInfo.lpTitle = TEXT("Test"); StartupInfo.dwFlags = STARTF_USESHOWWINDOW; StartupInfo.wShowWindow = SW_SHOWNORMAL; Modified: trunk/reactos/base/system/runonce/runonce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/runonc… ============================================================================== --- trunk/reactos/base/system/runonce/runonce.c [iso-8859-1] (original) +++ trunk/reactos/base/system/runonce/runonce.c [iso-8859-1] Sun Dec 23 23:17:10 2012 @@ -25,6 +25,7 @@ ZeroMemory(&si, sizeof(si)); si.cb = sizeof(si); + si.dwFlags = STARTF_USESHOWWINDOW; si.wShowWindow = SW_SHOW; if (!CreateProcess(NULL, szData, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) @@ -156,6 +157,7 @@ ZeroMemory(&si, sizeof(si)); si.cb = sizeof(si); + si.dwFlags = STARTF_USESHOWWINDOW; si.wShowWindow = SW_SHOW; if (!CreateProcess(NULL, szData, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Sun Dec 23 23:17:10 2012 @@ -1512,13 +1512,9 @@ return ScmSendStartCommand(Service, argc, argv); } + ZeroMemory(&StartupInfo, sizeof(StartupInfo)); StartupInfo.cb = sizeof(StartupInfo); - StartupInfo.lpReserved = NULL; - StartupInfo.lpDesktop = NULL; - StartupInfo.lpTitle = NULL; - StartupInfo.dwFlags = 0; - StartupInfo.cbReserved2 = 0; - StartupInfo.lpReserved2 = 0; + ZeroMemory(&ProcessInformation, sizeof(ProcessInformation)); Result = CreateProcessW(NULL, Service->lpImage->szImagePath, Modified: trunk/reactos/base/system/userinit/userinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… ============================================================================== --- trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] Sun Dec 23 23:17:10 2012 @@ -241,9 +241,11 @@ TRACE("(%s)\n", debugstr_w(Shell)); - ZeroMemory(&si, sizeof(STARTUPINFO)); - si.cb = sizeof(STARTUPINFO); - ZeroMemory(&pi, sizeof(PROCESS_INFORMATION)); + ZeroMemory(&si, sizeof(si)); + si.cb = sizeof(si); + si.dwFlags = STARTF_USESHOWWINDOW; + si.wShowWindow = SW_SHOWNORMAL; + ZeroMemory(&pi, sizeof(pi)); ExpandEnvironmentStrings(Shell, ExpandedShell, MAX_PATH); Modified: trunk/reactos/dll/cpl/mmsys/audio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/audio.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/audio.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/audio.c [iso-8859-1] Sun Dec 23 23:17:10 2012 @@ -204,6 +204,7 @@ ZeroMemory(&si, sizeof(si)); si.cb = sizeof(si); + si.dwFlags = STARTF_USESHOWWINDOW; si.wShowWindow = SW_SHOW; CreateProcess(NULL, szPath, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); @@ -223,6 +224,7 @@ ZeroMemory(&si, sizeof(si)); si.cb = sizeof(si); + si.dwFlags = STARTF_USESHOWWINDOW; si.wShowWindow = SW_SHOW; CreateProcess(NULL, szPath, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); @@ -242,6 +244,7 @@ ZeroMemory(&si, sizeof(si)); si.cb = sizeof(si); + si.dwFlags = STARTF_USESHOWWINDOW; si.wShowWindow = SW_SHOW; CreateProcess(NULL, szPath, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Sun Dec 23 23:17:10 2012 @@ -218,12 +218,11 @@ return FALSE; } - ZeroMemory(&StartupInfo, sizeof(STARTUPINFOW)); - ZeroMemory(&ProcessInformation, sizeof(PROCESS_INFORMATION)); - StartupInfo.cb = sizeof(STARTUPINFOW); + ZeroMemory(&StartupInfo, sizeof(StartupInfo)); + ZeroMemory(&ProcessInformation, sizeof(ProcessInformation)); + StartupInfo.cb = sizeof(StartupInfo); StartupInfo.lpTitle = pszCmdLine; - StartupInfo.dwX = StartupInfo.dwY = StartupInfo.dwXSize = StartupInfo.dwYSize = 0L; - StartupInfo.dwFlags = 0; + StartupInfo.dwFlags = STARTF_USESHOWWINDOW; StartupInfo.wShowWindow = SW_SHOW; StartupInfo.lpDesktop = pszDesktopName; Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Sun Dec 23 23:17:10 2012 @@ -678,13 +678,8 @@ SetupCloseInfFile(hSysSetupInf); /* Run the shell */ - StartupInfo.cb = sizeof(STARTUPINFOW); - StartupInfo.lpReserved = NULL; - StartupInfo.lpDesktop = NULL; - StartupInfo.lpTitle = NULL; - StartupInfo.dwFlags = 0; - StartupInfo.cbReserved2 = 0; - StartupInfo.lpReserved2 = 0; + ZeroMemory(&StartupInfo, sizeof(StartupInfo)); + StartupInfo.cb = sizeof(StartupInfo); bRes = CreateProcessW( L"userinit.exe", NULL, Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Sun Dec 23 23:17:10 2012 @@ -794,7 +794,7 @@ PROCESS_INFORMATION ProcessInformation; WCHAR CmdLine[MAX_PATH] = L"rundll32.exe shell32.dll,Control_RunDLL "; - ZeroMemory(&StartupInfo, sizeof(STARTUPINFOW)); + ZeroMemory(&StartupInfo, sizeof(StartupInfo)); StartupInfo.cb = sizeof(STARTUPINFOW); ASSERT(_countof(CmdLine) > wcslen(CmdLine) + wcslen(pwszCPLParameters));

1 0

[tkreuzer] 57985: [KS] - Mark a variable that is assigned inside an SEH block as _SEH2_VOLATILE. - Silence some MSVC warnings
by tkreuzer＠svn.reactos.org 23 Dec '12

23 Dec '12

Author: tkreuzer Date: Sun Dec 23 22:53:41 2012 New Revision: 57985 URL: http://svn.reactos.org/svn/reactos?rev=57985&view=rev Log: [KS] - Mark a variable that is assigned inside an SEH block as _SEH2_VOLATILE. - Silence some MSVC warnings Modified: trunk/reactos/drivers/ksfilter/ks/image.c trunk/reactos/drivers/ksfilter/ks/ks.spec trunk/reactos/drivers/ksfilter/ks/swenum.c Modified: trunk/reactos/drivers/ksfilter/ks/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/image.… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/image.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/image.c [iso-8859-1] Sun Dec 23 22:53:41 2012 @@ -27,7 +27,7 @@ PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry; PVOID Data; ULONG Size; - PVOID Result = NULL; + PVOID _SEH2_VOLATILE Result = NULL; /* set up resource info */ ResourceInfo.Type = ResourceType; @@ -131,7 +131,7 @@ } /* allocate image name buffer */ - ImageName->MaximumLength = sizeof(ImagePath) + ImageLength; + ImageName->MaximumLength = (USHORT)(sizeof(ImagePath) + ImageLength); ImageName->Buffer = AllocateItem(PagedPool, ImageName->MaximumLength); /* check for success */ @@ -145,7 +145,11 @@ RtlCopyMemory(ImageName->Buffer, ImagePath, sizeof(ImagePath)); /* retrieve image name */ - Status = KspQueryRegValue(RegKey, L"Image", &ImageName->Buffer[sizeof(ImagePath) / sizeof(WCHAR)], &ImageLength, NULL); + Status = KspQueryRegValue(RegKey, + L"Image", + &ImageName->Buffer[sizeof(ImagePath) / sizeof(WCHAR)], + &ImageLength, + NULL); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/drivers/ksfilter/ks/ks.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ks.spe… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ks.spec [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ks.spec [iso-8859-1] Sun Dec 23 22:53:41 2012 @@ -9,7 +9,7 @@ @ stdcall -i386 ?NonDelegatedQueryInterface@CBaseUnknown@@UAGJABU_GUID@@PAPAX@Z(ptr ptr ptr) INonDelegatedUnknown_fnQueryInterface @ stdcall ?NonDelegatedRelease@CBaseUnknown@@UAGKXZ(ptr) IIndirectedUnknown_fnRelease -@ stdcall DllInitialize(ptr) +@ stdcall -private DllInitialize(ptr) @ stdcall KoCreateInstance(ptr ptr long ptr ptr) @ stdcall KoDeviceInitialize(ptr) @ stdcall KoDriverInitialize(ptr ptr ptr) Modified: trunk/reactos/drivers/ksfilter/ks/swenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/swenum… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/swenum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/swenum.c [iso-8859-1] Sun Dec 23 22:53:41 2012 @@ -678,7 +678,7 @@ Length += wcslen(DeviceEntry->Instance); /* zero byte and '\\' */ - Length += 2; + Length += 2; /* allocate buffer */ Buffer = AllocateItem(NonPagedPool, Length * sizeof(WCHAR)); @@ -1532,7 +1532,7 @@ } BusDeviceExtension->ServicePath.Length = 0; - BusDeviceExtension->ServicePath.MaximumLength = Length; + BusDeviceExtension->ServicePath.MaximumLength = (USHORT)Length; BusDeviceExtension->ServicePath.Buffer = AllocateItem(NonPagedPool, Length); if (!BusDeviceExtension->ServicePath.Buffer) @@ -2120,7 +2120,7 @@ /* @implemented */ -KSDDKAPI +KSDDKAPI NTSTATUS NTAPI KsRemoveBusEnumInterface(

1 0

[tkreuzer] 57984: [PORTCLS] Make DllInitialize extern "C", otherwise it would be imported from ks.sys.
by tkreuzer＠svn.reactos.org 23 Dec '12

23 Dec '12

Author: tkreuzer Date: Sun Dec 23 21:59:45 2012 New Revision: 57984 URL: http://svn.reactos.org/svn/reactos?rev=57984&view=rev Log: [PORTCLS] Make DllInitialize extern "C", otherwise it would be imported from ks.sys. Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dll.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dll.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/dll.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/dll.cpp [iso-8859-1] Sun Dec 23 21:59:45 2012 @@ -9,6 +9,8 @@ #include "private.hpp" +extern +"C" ULONG NTAPI DllInitialize(ULONG Unknown)

1 0

[tkreuzer] 57983: [PSEH] Add missing definition of _SEH2_VOLATILE.
by tkreuzer＠svn.reactos.org 23 Dec '12

23 Dec '12

Author: tkreuzer Date: Sun Dec 23 21:42:55 2012 New Revision: 57983 URL: http://svn.reactos.org/svn/reactos?rev=57983&view=rev Log: [PSEH] Add missing definition of _SEH2_VOLATILE. Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Sun Dec 23 21:42:55 2012 @@ -413,6 +413,7 @@ __SEH_END_SCOPE_CHAIN; +#define _SEH2_VOLATILE volatile #else #error no PSEH support

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
29
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 2012