Ros-diffs February 2013

ros-diffs@reactos.org

11 participants
125 discussions

[jgardou] 58352: [NETEVENT] - This is a resource only DLL, so this is OK to not have an entry point
by jgardou＠svn.reactos.org 23 Feb '13

23 Feb '13

Author: jgardou Date: Sat Feb 23 16:51:48 2013 New Revision: 58352 URL: http://svn.reactos.org/svn/reactos?rev=58352&view=rev Log: [NETEVENT] - This is a resource only DLL, so this is OK to not have an entry point Modified: trunk/reactos/dll/win32/netevent/CMakeLists.txt Modified: trunk/reactos/dll/win32/netevent/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netevent/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/netevent/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netevent/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:51:48 2013 @@ -1,6 +1,6 @@ include_directories(${REACTOS_BINARY_DIR}/include/reactos) add_library(netevent SHARED netevt.rc) -set_module_type(netevent win32dll UNICODE) +set_module_type(netevent win32dll UNICODE ENTRYPOINT 0) add_dependencies(netevent neteventmsg) add_cd_file(TARGET netevent DESTINATION reactos/system32 FOR all)

1 0

[jgardou] 58351: [DLLs] - No explicit DllMain is not equivalent to no entrypoint at all
by jgardou＠svn.reactos.org 23 Feb '13

23 Feb '13

Author: jgardou Date: Sat Feb 23 16:45:48 2013 New Revision: 58351 URL: http://svn.reactos.org/svn/reactos?rev=58351&view=rev Log: [DLLs] - No explicit DllMain is not equivalent to no entrypoint at all Modified: trunk/reactos/dll/directx/dinput8/CMakeLists.txt trunk/reactos/dll/directx/dmusic/CMakeLists.txt trunk/reactos/dll/directx/dplay/CMakeLists.txt trunk/reactos/dll/directx/ksproxy/CMakeLists.txt trunk/reactos/dll/directx/msdmo/CMakeLists.txt trunk/reactos/dll/win32/beepmidi/CMakeLists.txt trunk/reactos/dll/win32/cabinet/CMakeLists.txt trunk/reactos/dll/win32/cfgmgr32/CMakeLists.txt trunk/reactos/dll/win32/comcat/CMakeLists.txt trunk/reactos/dll/win32/dnsapi/CMakeLists.txt trunk/reactos/dll/win32/imaadp32.acm/CMakeLists.txt trunk/reactos/dll/win32/lsasrv/CMakeLists.txt trunk/reactos/dll/win32/mcicda/CMakeLists.txt trunk/reactos/dll/win32/mciseq/CMakeLists.txt trunk/reactos/dll/win32/mciwave/CMakeLists.txt trunk/reactos/dll/win32/mmdrv/CMakeLists.txt trunk/reactos/dll/win32/msacm32/msacm32.drv/CMakeLists.txt trunk/reactos/dll/win32/msadp32.acm/CMakeLists.txt trunk/reactos/dll/win32/msg711.acm/CMakeLists.txt trunk/reactos/dll/win32/msgsm32.acm/CMakeLists.txt trunk/reactos/dll/win32/nddeapi/CMakeLists.txt trunk/reactos/dll/win32/netevent/CMakeLists.txt trunk/reactos/dll/win32/odbccp32/CMakeLists.txt trunk/reactos/dll/win32/olecli32/CMakeLists.txt trunk/reactos/dll/win32/olepro32/CMakeLists.txt trunk/reactos/dll/win32/olesvr32/CMakeLists.txt trunk/reactos/dll/win32/pdh/CMakeLists.txt trunk/reactos/dll/win32/rasapi32/CMakeLists.txt trunk/reactos/dll/win32/samsrv/CMakeLists.txt trunk/reactos/dll/win32/srclient/CMakeLists.txt trunk/reactos/dll/win32/sxs/CMakeLists.txt trunk/reactos/dll/win32/tapi32/CMakeLists.txt trunk/reactos/dll/win32/unicows/CMakeLists.txt trunk/reactos/dll/win32/updspapi/CMakeLists.txt trunk/reactos/dll/win32/version/CMakeLists.txt trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt trunk/reactos/dll/win32/winfax/CMakeLists.txt trunk/reactos/dll/win32/wing32/CMakeLists.txt trunk/reactos/dll/win32/winmm/midimap/CMakeLists.txt trunk/reactos/dll/win32/wlanapi/CMakeLists.txt trunk/reactos/dll/win32/wshtcpip/CMakeLists.txt Modified: trunk/reactos/dll/directx/dinput8/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput8/CMakeL… ============================================================================== --- trunk/reactos/dll/directx/dinput8/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dinput8/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -13,7 +13,7 @@ version.rc ${CMAKE_CURRENT_BINARY_DIR}/dinput8.def) -set_module_type(dinput8 win32dll UNICODE ENTRYPOINT 0) +set_module_type(dinput8 win32dll UNICODE) target_link_libraries(dinput8 dxguid Modified: trunk/reactos/dll/directx/dmusic/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dmusic/CMakeLi… ============================================================================== --- trunk/reactos/dll/directx/dmusic/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dmusic/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -23,7 +23,7 @@ version.rc ${CMAKE_CURRENT_BINARY_DIR}/dmusic.def) -set_module_type(dmusic win32dll UNICODE ENTRYPOINT 0) +set_module_type(dmusic win32dll UNICODE) target_link_libraries(dmusic dxguid Modified: trunk/reactos/dll/directx/dplay/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplay/CMakeLis… ============================================================================== --- trunk/reactos/dll/directx/dplay/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dplay/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -9,7 +9,7 @@ version.rc ${CMAKE_CURRENT_BINARY_DIR}/dplay.def) -set_module_type(dplay win32dll UNICODE ENTRYPOINT 0) +set_module_type(dplay win32dll UNICODE) target_link_libraries(dplay uuid Modified: trunk/reactos/dll/directx/ksproxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/CMakeL… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -27,7 +27,7 @@ ${SOURCE} ksproxy.rc) -set_module_type(ksproxy win32dll ENTRYPOINT 0) +set_module_type(ksproxy win32dll) set_target_properties(ksproxy PROPERTIES SUFFIX ".ax") if(MSVC) Modified: trunk/reactos/dll/directx/msdmo/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdmo/CMakeLis… ============================================================================== --- trunk/reactos/dll/directx/msdmo/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/msdmo/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -12,7 +12,7 @@ rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/msdmo.def) -set_module_type(msdmo win32dll ENTRYPOINT 0 UNICODE) +set_module_type(msdmo win32dll UNICODE) target_link_libraries(msdmo uuid wine mediaobj_guid) Modified: trunk/reactos/dll/win32/beepmidi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/beepmidi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/beepmidi/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -7,9 +7,9 @@ add_library(beepmidi SHARED ${SOURCE}) -set_module_type(beepmidi win32dll ENTRYPOINT 0 UNICODE) +set_module_type(beepmidi win32dll UNICODE) -add_importlibs(beepmidi winmm kernel32 ntdll msvcrt) +add_importlibs(beepmidi winmm msvcrt kernel32 ntdll) add_dependencies(beepmidi psdk) Modified: trunk/reactos/dll/win32/cabinet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/cabinet/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -19,7 +19,7 @@ add_library(cabinet SHARED ${SOURCE}) -set_module_type(cabinet win32dll ENTRYPOINT 0) +set_module_type(cabinet win32dll) target_link_libraries(cabinet wine zlib) add_importlibs(cabinet msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/cfgmgr32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cfgmgr32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/cfgmgr32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cfgmgr32/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -8,7 +8,7 @@ add_library(cfgmgr32 SHARED ${SOURCE}) -set_module_type(cfgmgr32 win32dll ENTRYPOINT 0 ) +set_module_type(cfgmgr32 win32dll) add_importlibs(cfgmgr32 setupapi kernel32 ntdll) add_dependencies(cfgmgr32 psdk) add_cd_file(TARGET cfgmgr32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/comcat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comcat/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/comcat/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comcat/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -15,7 +15,7 @@ add_library(comcat SHARED ${SOURCE}) -set_module_type(comcat win32dll ENTRYPOINT 0 ) +set_module_type(comcat win32dll) target_link_libraries(comcat uuid wine) Modified: trunk/reactos/dll/win32/dnsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -21,7 +21,7 @@ add_library(dnsapi SHARED ${SOURCE}) -set_module_type(dnsapi win32dll ENTRYPOINT 0 ) +set_module_type(dnsapi win32dll) target_link_libraries(dnsapi adns) add_importlibs(dnsapi user32 ws2_32 iphlpapi msvcrt kernel32 ntdll) add_pch(dnsapi dnsapi/precomp.h) Modified: trunk/reactos/dll/win32/imaadp32.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imaadp32.acm/CMa… ============================================================================== --- trunk/reactos/dll/win32/imaadp32.acm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imaadp32.acm/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -10,7 +10,7 @@ add_library(imaadp32.acm SHARED ${SOURCE}) -set_module_type(imaadp32.acm win32dll ENTRYPOINT 0 ) +set_module_type(imaadp32.acm win32dll) set_target_properties(imaadp32.acm PROPERTIES SUFFIX "") target_link_libraries(imaadp32.acm wine) add_importlibs(imaadp32.acm winmm user32 msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -23,7 +23,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/lsa_s.c) add_library(lsasrv SHARED ${SOURCE}) -set_module_type(lsasrv win32dll ENTRYPOINT 0 UNICODE) +set_module_type(lsasrv win32dll UNICODE) target_link_libraries(lsasrv wine ${PSEH_LIB}) add_importlibs(lsasrv samsrv rpcrt4 msvcrt kernel32 advapi32 ntdll) add_pch(lsasrv lsasrv.h) Modified: trunk/reactos/dll/win32/mcicda/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mcicda/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/mcicda/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mcicda/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -10,7 +10,7 @@ add_library(mcicda SHARED ${SOURCE}) -set_module_type(mcicda win32dll ENTRYPOINT 0 ) +set_module_type(mcicda win32dll) target_link_libraries(mcicda wine) add_importlibs(mcicda winmm user32 kernel32 ntdll) add_dependencies(mcicda psdk) Modified: trunk/reactos/dll/win32/mciseq/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciseq/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/mciseq/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciseq/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -10,10 +10,10 @@ add_library(mciseq SHARED ${SOURCE}) -set_module_type(mciseq win32dll ENTRYPOINT 0) +set_module_type(mciseq win32dll) target_link_libraries(mciseq wine) -add_importlibs(mciseq winmm user32 kernel32 ntdll msvcrt) +add_importlibs(mciseq msvcrt winmm user32 kernel32 ntdll) add_dependencies(mciseq psdk) add_cd_file(TARGET mciseq DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/mciwave/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciwave/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/mciwave/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciwave/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -13,7 +13,7 @@ add_library(mciwave SHARED ${SOURCE}) -set_module_type(mciwave win32dll ENTRYPOINT 0) +set_module_type(mciwave win32dll) target_link_libraries(mciwave wine) add_importlibs(mciwave user32 winmm msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/mmdrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -15,7 +15,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/mmdrv.def) add_library(mmdrv SHARED ${SOURCE}) -set_module_type(mmdrv win32dll ENTRYPOINT 0 UNICODE) +set_module_type(mmdrv win32dll UNICODE) add_importlibs(mmdrv winmm user32 kernel32 ntdll) add_dependencies(mmdrv psdk) Modified: trunk/reactos/dll/win32/msacm32/msacm32.drv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm32.… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm32.drv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm32.drv/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -7,7 +7,7 @@ add_library(msacm32.drv SHARED wavemap.c wavemap.rc ${CMAKE_CURRENT_BINARY_DIR}/msacm32.def) -set_module_type(msacm32.drv win32dll ENTRYPOINT 0 UNICODE) +set_module_type(msacm32.drv win32dll UNICODE) set_target_properties(msacm32.drv PROPERTIES SUFFIX "") Modified: trunk/reactos/dll/win32/msadp32.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msadp32.acm/CMak… ============================================================================== --- trunk/reactos/dll/win32/msadp32.acm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msadp32.acm/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -10,7 +10,7 @@ add_library(msadp32.acm SHARED ${SOURCE}) -set_module_type(msadp32.acm win32dll ENTRYPOINT 0 ) +set_module_type(msadp32.acm win32dll) set_target_properties(msadp32.acm PROPERTIES SUFFIX "") target_link_libraries(msadp32.acm wine) add_importlibs(msadp32.acm winmm user32 msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/msg711.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msg711.acm/CMake… ============================================================================== --- trunk/reactos/dll/win32/msg711.acm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msg711.acm/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -10,7 +10,7 @@ add_library(msg711.acm SHARED ${SOURCE}) -set_module_type(msg711.acm win32dll ENTRYPOINT 0 ) +set_module_type(msg711.acm win32dll) set_target_properties(msg711.acm PROPERTIES SUFFIX "") target_link_libraries(msg711.acm wine) add_importlibs(msg711.acm winmm user32 msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/msgsm32.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgsm32.acm/CMak… ============================================================================== --- trunk/reactos/dll/win32/msgsm32.acm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgsm32.acm/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -10,7 +10,7 @@ add_library(msgsm32.acm SHARED ${SOURCE}) -set_module_type(msgsm32.acm win32dll ENTRYPOINT 0 ) +set_module_type(msgsm32.acm win32dll) set_target_properties(msgsm32.acm PROPERTIES SUFFIX "") target_link_libraries(msgsm32.acm wine) add_importlibs(msgsm32.acm winmm user32 msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/nddeapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/nddeapi/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/nddeapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/nddeapi/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -10,7 +10,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/nddeapi.def) add_library(nddeapi SHARED ${SOURCE}) -set_module_type(nddeapi win32dll ENTRYPOINT 0 ) +set_module_type(nddeapi win32dll) target_link_libraries(nddeapi wine) Modified: trunk/reactos/dll/win32/netevent/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netevent/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/netevent/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netevent/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -1,6 +1,6 @@ include_directories(${REACTOS_BINARY_DIR}/include/reactos) add_library(netevent SHARED netevt.rc) -set_module_type(netevent win32dll ENTRYPOINT 0 UNICODE) +set_module_type(netevent win32dll UNICODE) add_dependencies(netevent neteventmsg) add_cd_file(TARGET netevent DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/odbccp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbccp32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/odbccp32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/odbccp32/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -11,7 +11,7 @@ add_library(odbccp32 SHARED ${SOURCE}) -set_module_type(odbccp32 win32dll ENTRYPOINT 0 ) +set_module_type(odbccp32 win32dll) target_link_libraries(odbccp32 uuid wine) add_importlibs(odbccp32 Modified: trunk/reactos/dll/win32/olecli32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olecli32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/olecli32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/olecli32/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -9,7 +9,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/olecli32.def) add_library(olecli32 SHARED ${SOURCE}) -set_module_type(olecli32 win32dll ENTRYPOINT 0 ) +set_module_type(olecli32 win32dll) target_link_libraries(olecli32 wine) add_importlibs(olecli32 ole32 gdi32 kernel32 ntdll) add_dependencies(olecli32 psdk) Modified: trunk/reactos/dll/win32/olepro32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olepro32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/olepro32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/olepro32/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -11,7 +11,7 @@ add_library(olepro32 SHARED ${SOURCE}) -set_module_type(olepro32 win32dll ENTRYPOINT 0 ) +set_module_type(olepro32 win32dll) target_link_libraries(olepro32 wine) Modified: trunk/reactos/dll/win32/olesvr32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olesvr32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/olesvr32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/olesvr32/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -11,7 +11,7 @@ add_library(olesvr32 SHARED ${SOURCE}) -set_module_type(olesvr32 win32dll ENTRYPOINT 0 ) +set_module_type(olesvr32 win32dll) target_link_libraries(olesvr32 wine) Modified: trunk/reactos/dll/win32/pdh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pdh/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/pdh/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/pdh/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -14,11 +14,11 @@ ${CMAKE_CURRENT_BINARY_DIR}/pdh.def) add_library(pdh SHARED ${SOURCE}) -set_module_type(pdh win32dll ENTRYPOINT 0 ) +set_module_type(pdh win32dll) target_link_libraries(pdh wine) -add_importlibs(pdh kernel32 ntdll msvcrt) +add_importlibs(pdh msvcrt kernel32 ntdll) add_cd_file(TARGET pdh DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/rasapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasapi32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/rasapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rasapi32/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -10,7 +10,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/rasapi32.def) add_library(rasapi32 SHARED ${SOURCE}) -set_module_type(rasapi32 win32dll ENTRYPOINT 0 ) +set_module_type(rasapi32 win32dll) target_link_libraries(rasapi32 wine) add_importlibs(rasapi32 kernel32 ntdll) add_dependencies(rasapi32 psdk) Modified: trunk/reactos/dll/win32/samsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -22,7 +22,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/sam_s.c) add_library(samsrv SHARED ${SOURCE}) -set_module_type(samsrv win32dll ENTRYPOINT 0 UNICODE) +set_module_type(samsrv win32dll UNICODE) target_link_libraries(samsrv wine ${PSEH_LIB}) add_importlibs(samsrv rpcrt4 advapi32 kernel32 ntdll) Modified: trunk/reactos/dll/win32/srclient/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/srclient/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/srclient/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/srclient/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -7,7 +7,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/srclient.def) add_library(srclient SHARED ${SOURCE}) -set_module_type(srclient win32dll ENTRYPOINT 0 ) +set_module_type(srclient win32dll) add_importlibs(srclient kernel32 ntdll) add_dependencies(srclient psdk) Modified: trunk/reactos/dll/win32/sxs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/sxs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sxs/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -12,7 +12,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/sxs.def) add_library(sxs SHARED ${SOURCE}) -set_module_type(sxs win32dll ENTRYPOINT 0 ) +set_module_type(sxs win32dll) target_link_libraries(sxs wine) add_importlibs(sxs oleaut32 ole32 kernel32 ntdll) add_dependencies(sxs psdk) Modified: trunk/reactos/dll/win32/tapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapi32/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/tapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapi32/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -14,7 +14,7 @@ add_library(tapi32 SHARED ${SOURCE}) -set_module_type(tapi32 win32dll ENTRYPOINT 0 ) +set_module_type(tapi32 win32dll) target_link_libraries(tapi32 wine) Modified: trunk/reactos/dll/win32/unicows/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/unicows/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/unicows/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/unicows/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -7,7 +7,7 @@ add_library(unicows SHARED ${SOURCE}) -set_module_type(unicows win32dll ENTRYPOINT 0 ) +set_module_type(unicows win32dll) add_importlibs(unicows avicap32 Modified: trunk/reactos/dll/win32/updspapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/updspapi/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/updspapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/updspapi/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -10,7 +10,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/updspapi.def) add_library(updspapi SHARED ${SOURCE}) -set_module_type(updspapi win32dll ENTRYPOINT 0 ) +set_module_type(updspapi win32dll) target_link_libraries(updspapi wine) Modified: trunk/reactos/dll/win32/version/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/version/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/version/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/version/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -13,7 +13,7 @@ add_library(version SHARED ${SOURCE}) -set_module_type(version win32dll ENTRYPOINT 0 ) +set_module_type(version win32dll) target_link_libraries(version wine) add_importlibs(version kernel32 ntdll) Modified: trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/CMak… ============================================================================== --- trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -13,7 +13,7 @@ mpegl3.c ${CMAKE_CURRENT_BINARY_DIR}/winemp3.def) -set_module_type(winemp3.acm win32dll ENTRYPOINT 0 ) +set_module_type(winemp3.acm win32dll) set_target_properties(winemp3.acm PROPERTIES SUFFIX "") target_link_libraries(winemp3.acm wine libmpg123 oldnames) Modified: trunk/reactos/dll/win32/winfax/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winfax/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/winfax/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winfax/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -8,7 +8,7 @@ add_library(winfax SHARED ${SOURCE}) -set_module_type(winfax win32dll ENTRYPOINT 0 ) +set_module_type(winfax win32dll) add_importlibs(winfax kernel32 ntdll) add_dependencies(winfax psdk) Modified: trunk/reactos/dll/win32/wing32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wing32/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/wing32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wing32/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -8,8 +8,8 @@ add_library(wing32 SHARED ${SOURCE}) -set_module_type(wing32 win32dll UNICODE ENTRYPOINT 0) +set_module_type(wing32 win32dll UNICODE) -add_importlibs(wing32 user32 gdi32 msvcrt) +add_importlibs(wing32 user32 gdi32 msvcrt kernel32) add_dependencies(wing32 psdk) add_cd_file(TARGET wing32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/winmm/midimap/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/midimap/CM… ============================================================================== --- trunk/reactos/dll/win32/winmm/midimap/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/midimap/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -1,5 +1,3 @@ - -add_definitions(-DUNICODE -D_UNICODE) spec2def(midimap.dll midimap.spec) @@ -8,7 +6,7 @@ midimap.rc ${CMAKE_CURRENT_BINARY_DIR}/midimap.def) -set_module_type(midimap win32dll ENTRYPOINT 0 ) +set_module_type(midimap win32dll UNICODE) target_link_libraries(midimap uuid wine) Modified: trunk/reactos/dll/win32/wlanapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -13,7 +13,7 @@ add_library(wlanapi SHARED ${SOURCE}) -set_module_type(wlanapi win32dll ENTRYPOINT 0 ) +set_module_type(wlanapi win32dll) target_link_libraries(wlanapi wine Modified: trunk/reactos/dll/win32/wshtcpip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshtcpip/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/wshtcpip/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshtcpip/CMakeLists.txt [iso-8859-1] Sat Feb 23 16:45:48 2013 @@ -11,7 +11,7 @@ add_library(wshtcpip SHARED ${SOURCE}) -set_module_type(wshtcpip win32dll UNICODE ENTRYPOINT 0) +set_module_type(wshtcpip win32dll UNICODE) target_link_libraries(wshtcpip tdilib) add_importlibs(wshtcpip ws2_32 kernel32 ntdll)

1 0

[akhaldi] 58350: [PSDK] * Annotate setupapi.h. * Add SetupDiGetHwProfileFriendlyNameExA and correct SetupDiGetWizardPage.
by akhaldi＠svn.reactos.org 23 Feb '13

23 Feb '13

Author: akhaldi Date: Sat Feb 23 15:51:12 2013 New Revision: 58350 URL: http://svn.reactos.org/svn/reactos?rev=58350&view=rev Log: [PSDK] * Annotate setupapi.h. * Add SetupDiGetHwProfileFriendlyNameExA and correct SetupDiGetWizardPage. Modified: trunk/reactos/include/psdk/setupapi.h Modified: trunk/reactos/include/psdk/setupapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/setupapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/setupapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/setupapi.h [iso-8859-1] Sat Feb 23 15:51:12 2013 @@ -1133,296 +1133,1188 @@ WINSETUPAPI LONG WINAPI QueryRegistryValue(HKEY, PCWSTR, PBYTE*, PDWORD, PDWORD); WINSETUPAPI DWORD WINAPI RetreiveFileSecurity(PCWSTR, PSECURITY_DESCRIPTOR*); -WINSETUPAPI BOOL WINAPI SetupAddInstallSectionToDiskSpaceListA(HDSKSPC,HINF,HINF,PCSTR,PVOID,UINT); -WINSETUPAPI BOOL WINAPI SetupAddInstallSectionToDiskSpaceListW(HDSKSPC,HINF,HINF,PCWSTR,PVOID,UINT); -WINSETUPAPI BOOL WINAPI SetupAddSectionToDiskSpaceListA(HDSKSPC,HINF,HINF,PCSTR,UINT,PVOID,UINT); -WINSETUPAPI BOOL WINAPI SetupAddSectionToDiskSpaceListW(HDSKSPC,HINF,HINF,PCWSTR,UINT,PVOID,UINT); -WINSETUPAPI BOOL WINAPI SetupAddToDiskSpaceListA(HDSKSPC,PCSTR,LONGLONG,UINT,PVOID,UINT); -WINSETUPAPI BOOL WINAPI SetupAddToDiskSpaceListW(HDSKSPC,PCWSTR,LONGLONG,UINT,PVOID,UINT); -WINSETUPAPI BOOL WINAPI SetupAddToSourceListA(DWORD,PCSTR); -WINSETUPAPI BOOL WINAPI SetupAddToSourceListW(DWORD,PCWSTR); -WINSETUPAPI BOOL WINAPI SetupAdjustDiskSpaceListA(HDSKSPC,LPCSTR,LONGLONG,PVOID,UINT); -WINSETUPAPI BOOL WINAPI SetupAdjustDiskSpaceListW(HDSKSPC,LPCWSTR,LONGLONG,PVOID,UINT); -WINSETUPAPI UINT WINAPI SetupBackupErrorA(HWND,PCSTR,PCSTR,PCSTR,UINT,DWORD); -WINSETUPAPI UINT WINAPI SetupBackupErrorW(HWND,PCWSTR,PCWSTR,PCWSTR,UINT,DWORD); +WINSETUPAPI BOOL WINAPI SetupAddInstallSectionToDiskSpaceListA(_In_ HDSKSPC, _In_ HINF, _In_opt_ HINF, _In_ PCSTR, _Reserved_ PVOID, _Reserved_ UINT); +WINSETUPAPI BOOL WINAPI SetupAddInstallSectionToDiskSpaceListW(_In_ HDSKSPC, _In_ HINF, _In_opt_ HINF, _In_ PCWSTR, _Reserved_ PVOID, _Reserved_ UINT); +WINSETUPAPI BOOL WINAPI SetupAddSectionToDiskSpaceListA(_In_ HDSKSPC, _In_ HINF, _In_opt_ HINF, _In_ PCSTR, _In_ UINT, _Reserved_ PVOID, _Reserved_ UINT); +WINSETUPAPI BOOL WINAPI SetupAddSectionToDiskSpaceListW(_In_ HDSKSPC, _In_ HINF, _In_opt_ HINF, _In_ PCWSTR, _In_ UINT, _Reserved_ PVOID, _Reserved_ UINT); +WINSETUPAPI BOOL WINAPI SetupAddToDiskSpaceListA(_In_ HDSKSPC, _In_ PCSTR, _In_ LONGLONG, _In_ UINT, _Reserved_ PVOID, _Reserved_ UINT); +WINSETUPAPI BOOL WINAPI SetupAddToDiskSpaceListW(_In_ HDSKSPC, _In_ PCWSTR, _In_ LONGLONG, _In_ UINT, _Reserved_ PVOID, _Reserved_ UINT); +WINSETUPAPI BOOL WINAPI SetupAddToSourceListA(_In_ DWORD, _In_ PCSTR); +WINSETUPAPI BOOL WINAPI SetupAddToSourceListW(_In_ DWORD, _In_ PCWSTR); +WINSETUPAPI BOOL WINAPI SetupAdjustDiskSpaceListA(_In_ HDSKSPC, _In_ LPCSTR, _In_ LONGLONG, _Reserved_ PVOID, _Reserved_ UINT); +WINSETUPAPI BOOL WINAPI SetupAdjustDiskSpaceListW(_In_ HDSKSPC, _In_ LPCWSTR, _In_ LONGLONG, _Reserved_ PVOID, _Reserved_ UINT); +WINSETUPAPI UINT WINAPI SetupBackupErrorA(_In_ HWND, _In_opt_ PCSTR, _In_ PCSTR, _In_opt_ PCSTR, _In_ UINT, _In_ DWORD); +WINSETUPAPI UINT WINAPI SetupBackupErrorW(_In_ HWND, _In_opt_ PCWSTR, _In_ PCWSTR, _In_opt_ PCWSTR, _In_ UINT, _In_ DWORD); WINSETUPAPI BOOL WINAPI SetupCancelTemporary(VOID); -WINSETUPAPI BOOL WINAPI SetupCloseFileQueue(HSPFILEQ); -WINSETUPAPI VOID WINAPI SetupCloseInfFile(HINF); +WINSETUPAPI BOOL WINAPI SetupCloseFileQueue(_In_ HSPFILEQ); +WINSETUPAPI VOID WINAPI SetupCloseInfFile(_In_ HINF); WINSETUPAPI VOID WINAPI SetupCloseLog(VOID); -WINSETUPAPI BOOL WINAPI SetupCommitFileQueueA(HWND,HSPFILEQ,PSP_FILE_CALLBACK_A,PVOID); -WINSETUPAPI BOOL WINAPI SetupCommitFileQueueW(HWND,HSPFILEQ,PSP_FILE_CALLBACK_W,PVOID); -WINSETUPAPI UINT WINAPI SetupCopyErrorA(HWND,PCSTR,PCSTR,PCSTR,PCSTR,PCSTR,UINT,DWORD,PSTR,DWORD,PDWORD); -WINSETUPAPI UINT WINAPI SetupCopyErrorW(HWND,PCWSTR,PCWSTR,PCWSTR,PCWSTR,PCWSTR,UINT,DWORD,PWSTR,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupCopyOEMInfA(PCSTR,PCSTR,DWORD,DWORD,PSTR,DWORD,PDWORD,PSTR*); -WINSETUPAPI BOOL WINAPI SetupCopyOEMInfW(PCWSTR,PCWSTR,DWORD,DWORD,PWSTR,DWORD,PDWORD,PWSTR*); -WINSETUPAPI HDSKSPC WINAPI SetupCreateDiskSpaceListA(PVOID,DWORD,UINT); -WINSETUPAPI HDSKSPC WINAPI SetupCreateDiskSpaceListW(PVOID,DWORD,UINT); -WINSETUPAPI DWORD WINAPI SetupDecompressOrCopyFileA(PCSTR,PCSTR,PUINT); -WINSETUPAPI DWORD WINAPI SetupDecompressOrCopyFileW(PCWSTR,PCWSTR,PUINT); -WINSETUPAPI UINT WINAPI SetupDefaultQueueCallbackA(PVOID,UINT,UINT_PTR,UINT_PTR); -WINSETUPAPI UINT WINAPI SetupDefaultQueueCallbackW(PVOID,UINT,UINT_PTR,UINT_PTR); -WINSETUPAPI UINT WINAPI SetupDeleteErrorA(HWND,PCSTR,PCSTR,UINT,DWORD); -WINSETUPAPI UINT WINAPI SetupDeleteErrorW(HWND,PCWSTR,PCWSTR,UINT,DWORD); -WINSETUPAPI BOOL WINAPI SetupDestroyDiskSpaceList(HDSKSPC); -WINSETUPAPI BOOL WINAPI SetupDiAskForOEMDisk(HDEVINFO,PSP_DEVINFO_DATA); -WINSETUPAPI BOOL WINAPI SetupDiBuildClassInfoList(DWORD,LPGUID,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupDiBuildClassInfoListExA(DWORD,LPGUID,DWORD,PDWORD,PCSTR,PVOID); -WINSETUPAPI BOOL WINAPI SetupDiBuildClassInfoListExW(DWORD,LPGUID,DWORD,PDWORD,PCWSTR,PVOID); -WINSETUPAPI BOOL WINAPI SetupDiBuildDriverInfoList(HDEVINFO,PSP_DEVINFO_DATA,DWORD); -WINSETUPAPI BOOL WINAPI SetupDiCallClassInstaller(DI_FUNCTION,HDEVINFO,PSP_DEVINFO_DATA); -WINSETUPAPI BOOL WINAPI SetupDiCancelDriverInfoSearch(HDEVINFO); -WINSETUPAPI BOOL WINAPI SetupDiChangeState(HDEVINFO,PSP_DEVINFO_DATA); -WINSETUPAPI BOOL WINAPI SetupDiClassGuidsFromNameA(PCSTR,LPGUID,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupDiClassGuidsFromNameW(PCWSTR,LPGUID,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupDiClassGuidsFromNameExA(PCSTR,LPGUID,DWORD,PDWORD,PCSTR,PVOID); -WINSETUPAPI BOOL WINAPI SetupDiClassGuidsFromNameExW(PCWSTR,LPGUID,DWORD,PDWORD,PCWSTR,PVOID); -WINSETUPAPI BOOL WINAPI SetupDiClassNameFromGuidA(CONST GUID*,PSTR,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupDiClassNameFromGuidW(CONST GUID*,PWSTR,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupDiClassNameFromGuidExA(CONST GUID*,PSTR,DWORD,PDWORD,PCSTR,PVOID); -WINSETUPAPI BOOL WINAPI SetupDiClassNameFromGuidExW(CONST GUID*,PWSTR,DWORD,PDWORD,PCWSTR,PVOID); -WINSETUPAPI BOOL WINAPI SetupDiCreateDeviceInfoA(HDEVINFO,PCSTR,CONST GUID*,PCSTR,HWND,DWORD,PSP_DEVINFO_DATA); -WINSETUPAPI BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO,PCWSTR,CONST GUID*,PCWSTR,HWND,DWORD,PSP_DEVINFO_DATA); -WINSETUPAPI HDEVINFO WINAPI SetupDiCreateDeviceInfoList(CONST GUID*,HWND); -WINSETUPAPI HDEVINFO WINAPI SetupDiCreateDeviceInfoListExA(CONST GUID*,HWND,PCSTR,PVOID); -WINSETUPAPI HDEVINFO WINAPI SetupDiCreateDeviceInfoListExW(CONST GUID*,HWND,PCWSTR,PVOID); -WINSETUPAPI BOOL WINAPI SetupDiCreateDeviceInterfaceA(HDEVINFO,PSP_DEVINFO_DATA,CONST GUID*,PCSTR,DWORD,PSP_DEVICE_INTERFACE_DATA); -WINSETUPAPI BOOL WINAPI SetupDiCreateDeviceInterfaceW(HDEVINFO,PSP_DEVINFO_DATA,CONST GUID*,PCWSTR,DWORD,PSP_DEVICE_INTERFACE_DATA); -WINSETUPAPI HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyA(HDEVINFO,PSP_DEVICE_INTERFACE_DATA,DWORD,REGSAM,HINF,PCSTR); -WINSETUPAPI HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW(HDEVINFO,PSP_DEVICE_INTERFACE_DATA,DWORD,REGSAM,HINF,PCWSTR); -WINSETUPAPI HKEY WINAPI SetupDiCreateDevRegKeyA(HDEVINFO,PSP_DEVINFO_DATA,DWORD,DWORD,DWORD,HINF,PCSTR); -WINSETUPAPI HKEY WINAPI SetupDiCreateDevRegKeyW(HDEVINFO,PSP_DEVINFO_DATA,DWORD,DWORD,DWORD,HINF,PCWSTR); -WINSETUPAPI BOOL WINAPI SetupDiDeleteDeviceInfo(HDEVINFO,PSP_DEVINFO_DATA); -WINSETUPAPI BOOL WINAPI SetupDiDeleteDeviceInterfaceData(HDEVINFO,PSP_DEVICE_INTERFACE_DATA); -WINSETUPAPI BOOL WINAPI SetupDiDeleteDeviceInterfaceRegKey(HDEVINFO,PSP_DEVICE_INTERFACE_DATA,DWORD); -WINSETUPAPI BOOL WINAPI SetupDiDeleteDevRegKey(HDEVINFO,PSP_DEVINFO_DATA,DWORD,DWORD,DWORD); -WINSETUPAPI BOOL WINAPI SetupDiDestroyClassImageList(PSP_CLASSIMAGELIST_DATA); -WINSETUPAPI BOOL WINAPI SetupDiDestroyDeviceInfoList(HDEVINFO); -WINSETUPAPI BOOL WINAPI SetupDiDestroyDriverInfoList(HDEVINFO,PSP_DEVINFO_DATA,DWORD); -WINSETUPAPI INT WINAPI SetupDiDrawMiniIcon(HDC,RECT,INT,DWORD); -WINSETUPAPI BOOL WINAPI SetupDiEnumDeviceInfo(HDEVINFO,DWORD,PSP_DEVINFO_DATA); -WINSETUPAPI BOOL WINAPI SetupDiEnumDeviceInterfaces(HDEVINFO,PSP_DEVINFO_DATA,CONST GUID*,DWORD,PSP_DEVICE_INTERFACE_DATA); -WINSETUPAPI BOOL WINAPI SetupDiEnumDriverInfoA(HDEVINFO,PSP_DEVINFO_DATA,DWORD,DWORD,PSP_DRVINFO_DATA_A); -WINSETUPAPI BOOL WINAPI SetupDiEnumDriverInfoW(HDEVINFO,PSP_DEVINFO_DATA,DWORD,DWORD,PSP_DRVINFO_DATA_W); -WINSETUPAPI BOOL WINAPI SetupDiGetActualSectionToInstallA(HINF,PCSTR,PSTR,DWORD,PDWORD,PSTR*); -WINSETUPAPI BOOL WINAPI SetupDiGetActualSectionToInstallExA(HINF,PCSTR,PSP_ALTPLATFORM_INFO,PSTR,DWORD,PDWORD,PSTR*,PVOID); -WINSETUPAPI BOOL WINAPI SetupDiGetActualSectionToInstallExW(HINF,PCWSTR,PSP_ALTPLATFORM_INFO,PWSTR,DWORD,PDWORD,PWSTR*,PVOID); -WINSETUPAPI BOOL WINAPI SetupDiGetActualSectionToInstallW(HINF,PCWSTR,PWSTR,DWORD,PDWORD,PWSTR*); -WINSETUPAPI BOOL WINAPI SetupDiGetClassBitmapIndex(CONST GUID*,PINT); -WINSETUPAPI BOOL WINAPI SetupDiGetClassDescriptionA(CONST GUID*,PSTR,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupDiGetClassDescriptionW(CONST GUID*,PWSTR,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupDiGetClassDescriptionExA(CONST GUID*,PSTR,DWORD,PDWORD,PCSTR,PVOID); -WINSETUPAPI BOOL WINAPI SetupDiGetClassDescriptionExW(CONST GUID*,PWSTR,DWORD,PDWORD,PCWSTR,PVOID); -WINSETUPAPI BOOL WINAPI SetupDiGetClassDevPropertySheetsA(HDEVINFO,PSP_DEVINFO_DATA,LPPROPSHEETHEADERA,DWORD,PDWORD,DWORD); -WINSETUPAPI BOOL WINAPI SetupDiGetClassDevPropertySheetsW(HDEVINFO,PSP_DEVINFO_DATA,LPPROPSHEETHEADERW,DWORD,PDWORD,DWORD); -WINSETUPAPI HDEVINFO WINAPI SetupDiGetClassDevsA(CONST GUID*,PCSTR,HWND,DWORD); -WINSETUPAPI HDEVINFO WINAPI SetupDiGetClassDevsW(CONST GUID*,PCWSTR,HWND,DWORD); -WINSETUPAPI HDEVINFO WINAPI SetupDiGetClassDevsExA(CONST GUID*,PCSTR,HWND,DWORD,HDEVINFO,PCSTR,PVOID); -WINSETUPAPI HDEVINFO WINAPI SetupDiGetClassDevsExW(CONST GUID*,PCWSTR,HWND,DWORD,HDEVINFO,PCWSTR,PVOID); -WINSETUPAPI BOOL WINAPI SetupDiGetClassImageIndex(PSP_CLASSIMAGELIST_DATA,CONST GUID*,PINT); -WINSETUPAPI BOOL WINAPI SetupDiGetClassImageList(PSP_CLASSIMAGELIST_DATA); -WINSETUPAPI BOOL WINAPI SetupDiGetClassImageListExA(PSP_CLASSIMAGELIST_DATA,PCSTR,PVOID); -WINSETUPAPI BOOL WINAPI SetupDiGetClassImageListExW(PSP_CLASSIMAGELIST_DATA,PCWSTR,PVOID); -WINSETUPAPI BOOL WINAPI SetupDiGetClassInstallParamsA(HDEVINFO,PSP_DEVINFO_DATA,PSP_CLASSINSTALL_HEADER,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupDiGetClassInstallParamsW(HDEVINFO,PSP_DEVINFO_DATA,PSP_CLASSINSTALL_HEADER,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupDiGetClassRegistryPropertyA(LPGUID,DWORD,PDWORD,PBYTE,DWORD,PDWORD,PCSTR,PVOID); -WINSETUPAPI BOOL WINAPI SetupDiGetClassRegistryPropertyW(LPGUID,DWORD,PDWORD,PBYTE,DWORD,PDWORD,PCWSTR,PVOID); -WINSETUPAPI BOOL WINAPI SetupDiGetDeviceInfoListClass(HDEVINFO,LPGUID); -WINSETUPAPI BOOL WINAPI SetupDiGetDeviceInfoListDetailA(HDEVINFO,PSP_DEVINFO_LIST_DETAIL_DATA_A); -WINSETUPAPI BOOL WINAPI SetupDiGetDeviceInfoListDetailW(HDEVINFO,PSP_DEVINFO_LIST_DETAIL_DATA_W); -WINSETUPAPI BOOL WINAPI SetupDiGetDeviceInstallParamsA(HDEVINFO,PSP_DEVINFO_DATA,PSP_DEVINSTALL_PARAMS_A); -WINSETUPAPI BOOL WINAPI SetupDiGetDeviceInstallParamsW(HDEVINFO,PSP_DEVINFO_DATA,PSP_DEVINSTALL_PARAMS_W); -WINSETUPAPI BOOL WINAPI SetupDiGetDeviceInstanceIdA(HDEVINFO,PSP_DEVINFO_DATA,PSTR,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupDiGetDeviceInstanceIdW(HDEVINFO,PSP_DEVINFO_DATA,PWSTR,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupDiGetDeviceInterfaceAlias(HDEVINFO,PSP_DEVICE_INTERFACE_DATA,CONST GUID*,PSP_DEVICE_INTERFACE_DATA); -WINSETUPAPI BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(HDEVINFO,PSP_DEVICE_INTERFACE_DATA,PSP_DEVICE_INTERFACE_DETAIL_DATA_A,DWORD,PDWORD,PSP_DEVINFO_DATA); -WINSETUPAPI BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(HDEVINFO,PSP_DEVICE_INTERFACE_DATA,PSP_DEVICE_INTERFACE_DETAIL_DATA_W,DWORD,PDWORD,PSP_DEVINFO_DATA); -WINSETUPAPI BOOL WINAPI SetupDiGetDeviceRegistryPropertyA(HDEVINFO,PSP_DEVINFO_DATA,DWORD,PDWORD,PBYTE,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupDiGetDeviceRegistryPropertyW(HDEVINFO,PSP_DEVINFO_DATA,DWORD,PDWORD,PBYTE,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupDiGetDriverInfoDetailA(HDEVINFO,PSP_DEVINFO_DATA,PSP_DRVINFO_DATA_A,PSP_DRVINFO_DETAIL_DATA_A,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupDiGetDriverInfoDetailW(HDEVINFO,PSP_DEVINFO_DATA,PSP_DRVINFO_DATA_W,PSP_DRVINFO_DETAIL_DATA_W,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupDiGetDriverInstallParamsA(HDEVINFO,PSP_DEVINFO_DATA,PSP_DRVINFO_DATA_A,PSP_DRVINSTALL_PARAMS); -WINSETUPAPI BOOL WINAPI SetupDiGetDriverInstallParamsW(HDEVINFO,PSP_DEVINFO_DATA,PSP_DRVINFO_DATA_W,PSP_DRVINSTALL_PARAMS); -WINSETUPAPI BOOL WINAPI SetupDiGetHwProfileFriendlyNameA(DWORD,PSTR,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupDiGetHwProfileFriendlyNameExA(DWORD,PSTR,DWORD,PDWORD,PCSTR,PVOID); -WINSETUPAPI BOOL WINAPI SetupDiGetHwProfileFriendlyNameExW(DWORD,PWSTR,DWORD,PDWORD,PCWSTR,PVOID); +WINSETUPAPI BOOL WINAPI SetupCommitFileQueueA(_In_opt_ HWND, _In_ HSPFILEQ, _In_ PSP_FILE_CALLBACK_A, _In_ PVOID); +WINSETUPAPI BOOL WINAPI SetupCommitFileQueueW(_In_opt_ HWND, _In_ HSPFILEQ, _In_ PSP_FILE_CALLBACK_W, _In_ PVOID); + +WINSETUPAPI +UINT +WINAPI +SetupCopyErrorA( + _In_ HWND hwndParent, + _In_opt_ PCSTR DialogTitle, + _In_opt_ PCSTR DiskName, + _In_ PCSTR PathToSource, + _In_ PCSTR SourceFile, + _In_opt_ PCSTR TargetPathFile, + _In_ UINT Win32ErrorCode, + _In_ DWORD Style, + _Out_writes_opt_(PathBufferSize) PSTR PathBuffer, + _In_ DWORD PathBufferSize, + _Out_opt_ PDWORD PathRequiredSize); + +WINSETUPAPI +UINT +WINAPI +SetupCopyErrorW( + _In_ HWND hwndParent, + _In_opt_ PCWSTR DialogTitle, + _In_opt_ PCWSTR DiskName, + _In_ PCWSTR PathToSource, + _In_ PCWSTR SourceFile, + _In_opt_ PCWSTR TargetPathFile, + _In_ UINT Win32ErrorCode, + _In_ DWORD Style, + _Out_writes_opt_(PathBufferSize) PWSTR PathBuffer, + _In_ DWORD PathBufferSize, + _Out_opt_ PDWORD PathRequiredSize); + +WINSETUPAPI +BOOL +WINAPI +SetupCopyOEMInfA( + _In_ PCSTR SourceInfFileName, + _In_opt_ PCSTR OEMSourceMediaLocation, + _In_ DWORD OEMSourceMediaType, + _In_ DWORD CopyStyle, + _Out_writes_opt_(DestinationInfFileNameSize) PSTR DestinationInfFileName, + _In_ DWORD DestinationInfFileNameSize, + _Out_opt_ PDWORD RequiredSize, + _Out_opt_ PSTR *DestinationInfFileNameComponent); + +WINSETUPAPI +BOOL +WINAPI +SetupCopyOEMInfW( + _In_ PCWSTR SourceInfFileName, + _In_opt_ PCWSTR OEMSourceMediaLocation, + _In_ DWORD OEMSourceMediaType, + _In_ DWORD CopyStyle, + _Out_writes_opt_(DestinationInfFileNameSize) PWSTR DestinationInfFileName, + _In_ DWORD DestinationInfFileNameSize, + _Out_opt_ PDWORD RequiredSize, + _Out_opt_ PWSTR *DestinationInfFileNameComponent); + +WINSETUPAPI HDSKSPC WINAPI SetupCreateDiskSpaceListA(_Reserved_ PVOID, _Reserved_ DWORD, _In_ UINT); +WINSETUPAPI HDSKSPC WINAPI SetupCreateDiskSpaceListW(_Reserved_ PVOID, _Reserved_ DWORD, _In_ UINT); +WINSETUPAPI DWORD WINAPI SetupDecompressOrCopyFileA(_In_ PCSTR, _In_ PCSTR, _In_opt_ PUINT); +WINSETUPAPI DWORD WINAPI SetupDecompressOrCopyFileW(_In_ PCWSTR, _In_ PCWSTR, _In_opt_ PUINT); +WINSETUPAPI UINT WINAPI SetupDefaultQueueCallbackA(_In_ PVOID, _In_ UINT, _In_ UINT_PTR, _In_ UINT_PTR); +WINSETUPAPI UINT WINAPI SetupDefaultQueueCallbackW(_In_ PVOID, _In_ UINT, _In_ UINT_PTR, _In_ UINT_PTR); +WINSETUPAPI UINT WINAPI SetupDeleteErrorA(_In_ HWND, _In_opt_ PCSTR, _In_ PCSTR, _In_ UINT, _In_ DWORD); +WINSETUPAPI UINT WINAPI SetupDeleteErrorW(_In_ HWND, _In_opt_ PCWSTR, _In_ PCWSTR, _In_ UINT, _In_ DWORD); +WINSETUPAPI BOOL WINAPI SetupDestroyDiskSpaceList(_Inout_ HDSKSPC); +WINSETUPAPI BOOL WINAPI SetupDiAskForOEMDisk(_In_ HDEVINFO, _In_opt_ PSP_DEVINFO_DATA); + +_Success_(return != FALSE) +WINSETUPAPI +BOOL +WINAPI +SetupDiBuildClassInfoList( + _In_ DWORD Flags, + _Out_writes_to_opt_(ClassGuidListSize, *RequiredSize) LPGUID ClassGuidList, + _In_ DWORD ClassGuidListSize, + _Out_ PDWORD RequiredSize); + +_Success_(return != FALSE) +WINSETUPAPI +BOOL +WINAPI +SetupDiBuildClassInfoListExA( + _In_ DWORD Flags, + _Out_writes_to_opt_(ClassGuidListSize, *RequiredSize) LPGUID ClassGuidList, + _In_ DWORD ClassGuidListSize, + _Out_ PDWORD RequiredSize, + _In_opt_ PCSTR MachineName, + _Reserved_ PVOID Reserved); + +_Success_(return != FALSE) +WINSETUPAPI +BOOL +WINAPI +SetupDiBuildClassInfoListExW( + _In_ DWORD Flags, + _Out_writes_to_opt_(ClassGuidListSize, *RequiredSize) LPGUID ClassGuidList, + _In_ DWORD ClassGuidListSize, + _Out_ PDWORD RequiredSize, + _In_opt_ PCWSTR MachineName, + _Reserved_ PVOID Reserved); + +WINSETUPAPI BOOL WINAPI SetupDiBuildDriverInfoList(_In_ HDEVINFO, _Inout_opt_ PSP_DEVINFO_DATA, _In_ DWORD); +WINSETUPAPI BOOL WINAPI SetupDiCallClassInstaller(_In_ DI_FUNCTION, _In_ HDEVINFO, _In_opt_ PSP_DEVINFO_DATA); +WINSETUPAPI BOOL WINAPI SetupDiCancelDriverInfoSearch(_In_ HDEVINFO); +WINSETUPAPI BOOL WINAPI SetupDiChangeState(_In_ HDEVINFO, _Inout_ PSP_DEVINFO_DATA); + +_Success_(return != FALSE) +WINSETUPAPI +BOOL +WINAPI +SetupDiClassGuidsFromNameA( + _In_ PCSTR ClassName, + _Out_writes_to_(ClassGuidListSize, *RequiredSize) LPGUID ClassGuidList, + _In_ DWORD ClassGuidListSize, + _Out_ PDWORD RequiredSize); + +_Success_(return != FALSE) +WINSETUPAPI +BOOL +WINAPI +SetupDiClassGuidsFromNameW( + _In_ PCWSTR ClassName, + _Out_writes_to_(ClassGuidListSize, *RequiredSize) LPGUID ClassGuidList, + _In_ DWORD ClassGuidListSize, + _Out_ PDWORD RequiredSize); + +_Success_(return != FALSE) +WINSETUPAPI +BOOL +WINAPI +SetupDiClassGuidsFromNameExA( + _In_ PCSTR ClassName, + _Out_writes_to_(ClassGuidListSize, *RequiredSize) LPGUID ClassGuidList, + _In_ DWORD ClassGuidListSize, + _Out_ PDWORD RequiredSize, + _In_opt_ PCSTR MachineName, + _Reserved_ PVOID Reserved); + +_Success_(return != FALSE) +WINSETUPAPI +BOOL +WINAPI +SetupDiClassGuidsFromNameExW( + _In_ PCWSTR ClassName, + _Out_writes_to_(ClassGuidListSize, *RequiredSize) LPGUID ClassGuidList, + _In_ DWORD ClassGuidListSize, + _Out_ PDWORD RequiredSize, + _In_opt_ PCWSTR MachineName, + _Reserved_ PVOID Reserved); + +WINSETUPAPI +BOOL +WINAPI +SetupDiClassNameFromGuidA( + _In_ CONST GUID *ClassGuid, + _Out_writes_(ClassNameSize) PSTR ClassName, + _In_ DWORD ClassNameSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI +BOOL +WINAPI +SetupDiClassNameFromGuidW( + _In_ CONST GUID *ClassGuid, + _Out_writes_(ClassNameSize) PWSTR ClassName, + _In_ DWORD ClassNameSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI +BOOL +WINAPI +SetupDiClassNameFromGuidExA( + _In_ CONST GUID *ClassGuid, + _Out_writes_(ClassNameSize) PSTR ClassName, + _In_ DWORD ClassNameSize, + _Out_opt_ PDWORD RequiredSize, + _In_opt_ PCSTR MachineName, + _Reserved_ PVOID Reserved); + +WINSETUPAPI +BOOL +WINAPI +SetupDiClassNameFromGuidExW( + _In_ CONST GUID *ClassGuid, + _Out_writes_(ClassNameSize) PWSTR ClassName, + _In_ DWORD ClassNameSize, + _Out_opt_ PDWORD RequiredSize, + _In_opt_ PCWSTR MachineName, + _Reserved_ PVOID Reserved); + +WINSETUPAPI BOOL WINAPI SetupDiCreateDeviceInfoA(_In_ HDEVINFO, _In_ PCSTR, _In_ CONST GUID*, _In_opt_ PCSTR, _In_opt_ HWND, _In_ DWORD, _Out_opt_ PSP_DEVINFO_DATA); +WINSETUPAPI BOOL WINAPI SetupDiCreateDeviceInfoW(_In_ HDEVINFO, _In_ PCWSTR, _In_ CONST GUID*, _In_opt_ PCWSTR, _In_opt_ HWND, _In_ DWORD, _Out_opt_ PSP_DEVINFO_DATA); +_Check_return_ WINSETUPAPI HDEVINFO WINAPI SetupDiCreateDeviceInfoList(_In_opt_ CONST GUID*, _In_opt_ HWND); +_Check_return_ WINSETUPAPI HDEVINFO WINAPI SetupDiCreateDeviceInfoListExA(_In_opt_ CONST GUID*, _In_opt_ HWND, _In_opt_ PCSTR, _Reserved_ PVOID); +_Check_return_ WINSETUPAPI HDEVINFO WINAPI SetupDiCreateDeviceInfoListExW(_In_opt_ CONST GUID*, _In_opt_ HWND, _In_opt_ PCWSTR, _Reserved_ PVOID); +WINSETUPAPI BOOL WINAPI SetupDiCreateDeviceInterfaceA(_In_ HDEVINFO, _In_ PSP_DEVINFO_DATA, _In_ CONST GUID*, _In_opt_ PCSTR, _In_ DWORD, _Out_opt_ PSP_DEVICE_INTERFACE_DATA); +WINSETUPAPI BOOL WINAPI SetupDiCreateDeviceInterfaceW(_In_ HDEVINFO, _In_ PSP_DEVINFO_DATA, _In_ CONST GUID*, _In_opt_ PCWSTR, _In_ DWORD, _Out_opt_ PSP_DEVICE_INTERFACE_DATA); +_Check_return_ WINSETUPAPI HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyA(_In_ HDEVINFO, _In_ PSP_DEVICE_INTERFACE_DATA, _Reserved_ DWORD, _In_ REGSAM, _In_opt_ HINF, _In_opt_ PCSTR); +_Check_return_ WINSETUPAPI HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW(_In_ HDEVINFO, _In_ PSP_DEVICE_INTERFACE_DATA, _Reserved_ DWORD, _In_ REGSAM, _In_opt_ HINF, _In_opt_ PCWSTR); +_Check_return_ WINSETUPAPI HKEY WINAPI SetupDiCreateDevRegKeyA(_In_ HDEVINFO, _In_ PSP_DEVINFO_DATA, _In_ DWORD, _In_ DWORD, _In_ DWORD, _In_opt_ HINF, _In_opt_ PCSTR); +_Check_return_ WINSETUPAPI HKEY WINAPI SetupDiCreateDevRegKeyW(_In_ HDEVINFO, _In_ PSP_DEVINFO_DATA, _In_ DWORD, _In_ DWORD, _In_ DWORD, _In_opt_ HINF, _In_opt_ PCWSTR); +WINSETUPAPI BOOL WINAPI SetupDiDeleteDeviceInfo(_In_ HDEVINFO, _In_ PSP_DEVINFO_DATA); +WINSETUPAPI BOOL WINAPI SetupDiDeleteDeviceInterfaceData(_In_ HDEVINFO, _In_ PSP_DEVICE_INTERFACE_DATA); +WINSETUPAPI BOOL WINAPI SetupDiDeleteDeviceInterfaceRegKey(_In_ HDEVINFO, _In_ PSP_DEVICE_INTERFACE_DATA, _Reserved_ DWORD); +WINSETUPAPI BOOL WINAPI SetupDiDeleteDevRegKey(_In_ HDEVINFO, _In_ PSP_DEVINFO_DATA, _In_ DWORD, _In_ DWORD, _In_ DWORD); +WINSETUPAPI BOOL WINAPI SetupDiDestroyClassImageList(_In_ PSP_CLASSIMAGELIST_DATA); +WINSETUPAPI BOOL WINAPI SetupDiDestroyDeviceInfoList(_In_ HDEVINFO); +WINSETUPAPI BOOL WINAPI SetupDiDestroyDriverInfoList(_In_ HDEVINFO, _In_opt_ PSP_DEVINFO_DATA, _In_ DWORD); +WINSETUPAPI INT WINAPI SetupDiDrawMiniIcon(_In_ HDC, _In_ RECT, _In_ INT, _In_ DWORD); +WINSETUPAPI BOOL WINAPI SetupDiEnumDeviceInfo(_In_ HDEVINFO, _In_ DWORD, _Out_ PSP_DEVINFO_DATA); +WINSETUPAPI BOOL WINAPI SetupDiEnumDeviceInterfaces(_In_ HDEVINFO, _In_opt_ PSP_DEVINFO_DATA, _In_ CONST GUID*, _In_ DWORD, _Out_ PSP_DEVICE_INTERFACE_DATA); +WINSETUPAPI BOOL WINAPI SetupDiEnumDriverInfoA(_In_ HDEVINFO, _In_opt_ PSP_DEVINFO_DATA, _In_ DWORD, _In_ DWORD, _Out_ PSP_DRVINFO_DATA_A); +WINSETUPAPI BOOL WINAPI SetupDiEnumDriverInfoW(_In_ HDEVINFO, _In_opt_ PSP_DEVINFO_DATA, _In_ DWORD, _In_ DWORD, _Out_ PSP_DRVINFO_DATA_W); + +WINSETUPAPI +BOOL +WINAPI +SetupDiGetActualSectionToInstallA( + _In_ HINF InfHandle, + _In_ PCSTR InfSectionName, + _Out_writes_opt_(InfSectionWithExtSize) PSTR InfSectionWithExt, + _In_ DWORD InfSectionWithExtSize, + _Out_opt_ PDWORD RequiredSize, + _Out_opt_ PSTR *Extension); + +WINSETUPAPI +BOOL +WINAPI +SetupDiGetActualSectionToInstallW( + _In_ HINF InfHandle, + _In_ PCWSTR InfSectionName, + _Out_writes_opt_(InfSectionWithExtSize) PWSTR InfSectionWithExt, + _In_ DWORD InfSectionWithExtSize, + _Out_opt_ PDWORD RequiredSize, + _Out_opt_ PWSTR *Extension); + +WINSETUPAPI +BOOL +WINAPI +SetupDiGetActualSectionToInstallExA( + _In_ HINF InfHandle, + _In_ PCSTR InfSectionName, + _In_opt_ PSP_ALTPLATFORM_INFO AlternatePlatformInfo, + _Out_writes_opt_(InfSectionWithExtSize) PSTR InfSectionWithExt, + _In_ DWORD InfSectionWithExtSize, + _Out_opt_ PDWORD RequiredSize, + _Out_opt_ PSTR *Extension, + _Reserved_ PVOID Reserved); + +WINSETUPAPI +BOOL +WINAPI +SetupDiGetActualSectionToInstallExW( + _In_ HINF InfHandle, + _In_ PCWSTR InfSectionName, + _In_opt_ PSP_ALTPLATFORM_INFO AlternatePlatformInfo, + _Out_writes_opt_(InfSectionWithExtSize) PWSTR InfSectionWithExt, + _In_ DWORD InfSectionWithExtSize, + _Out_opt_ PDWORD RequiredSize, + _Out_opt_ PWSTR *Extension, + _Reserved_ PVOID Reserved); + +WINSETUPAPI BOOL WINAPI SetupDiGetClassBitmapIndex(_In_opt_ CONST GUID*, _Out_ PINT); + +WINSETUPAPI +BOOL +WINAPI +SetupDiGetClassDescriptionA( + _In_ CONST GUID *ClassGuid, + _Out_writes_(ClassDescriptionSize) PSTR ClassDescription, + _In_ DWORD ClassDescriptionSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI +BOOL +WINAPI +SetupDiGetClassDescriptionW( + _In_ CONST GUID *ClassGuid, + _Out_writes_(ClassDescriptionSize) PWSTR ClassDescription, + _In_ DWORD ClassDescriptionSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI +BOOL +WINAPI +SetupDiGetClassDescriptionExA( + _In_ CONST GUID *ClassGuid, + _Out_writes_(ClassDescriptionSize) PSTR ClassDescription, + _In_ DWORD ClassDescriptionSize, + _Out_opt_ PDWORD RequiredSize, + _In_opt_ PCSTR MachineName, + _Reserved_ PVOID Reserved); + +WINSETUPAPI +BOOL +WINAPI +SetupDiGetClassDescriptionExW( + _In_ CONST GUID *ClassGuid, + _Out_writes_(ClassDescriptionSize) PWSTR ClassDescription, + _In_ DWORD ClassDescriptionSize, + _Out_opt_ PDWORD RequiredSize, + _In_opt_ PCWSTR MachineName, + _Reserved_ PVOID Reserved); + +WINSETUPAPI BOOL WINAPI SetupDiGetClassDevPropertySheetsA(_In_ HDEVINFO, _In_opt_ PSP_DEVINFO_DATA, _In_ LPPROPSHEETHEADERA, _In_ DWORD, _Out_opt_ PDWORD, _In_ DWORD); +WINSETUPAPI BOOL WINAPI SetupDiGetClassDevPropertySheetsW(_In_ HDEVINFO, _In_opt_ PSP_DEVINFO_DATA, _In_ LPPROPSHEETHEADERW, _In_ DWORD, _Out_opt_ PDWORD, _In_ DWORD); +_Check_return_ WINSETUPAPI HDEVINFO WINAPI SetupDiGetClassDevsA(_In_opt_ CONST GUID*, _In_opt_ PCSTR, _In_opt_ HWND, _In_ DWORD); +_Check_return_ WINSETUPAPI HDEVINFO WINAPI SetupDiGetClassDevsW(_In_opt_ CONST GUID*, _In_opt_ PCWSTR, _In_opt_ HWND, _In_ DWORD); +_Check_return_ WINSETUPAPI HDEVINFO WINAPI SetupDiGetClassDevsExA(_In_opt_ CONST GUID*, _In_opt_ PCSTR, _In_opt_ HWND, _In_ DWORD, _In_opt_ HDEVINFO, _In_opt_ PCSTR, _Reserved_ PVOID); +_Check_return_ WINSETUPAPI HDEVINFO WINAPI SetupDiGetClassDevsExW(_In_opt_ CONST GUID*, _In_opt_ PCWSTR, _In_opt_ HWND, _In_ DWORD, _In_opt_ HDEVINFO, _In_opt_ PCWSTR, _Reserved_ PVOID); +WINSETUPAPI BOOL WINAPI SetupDiGetClassImageIndex(_In_ PSP_CLASSIMAGELIST_DATA, _In_ CONST GUID*, _Out_ PINT); +WINSETUPAPI BOOL WINAPI SetupDiGetClassImageList(_Out_ PSP_CLASSIMAGELIST_DATA); +WINSETUPAPI BOOL WINAPI SetupDiGetClassImageListExA(_Out_ PSP_CLASSIMAGELIST_DATA, _In_opt_ PCSTR, _Reserved_ PVOID); +WINSETUPAPI BOOL WINAPI SetupDiGetClassImageListExW(_Out_ PSP_CLASSIMAGELIST_DATA, _In_opt_ PCWSTR, _Reserved_ PVOID); + +_Success_(return != FALSE) +WINSETUPAPI +BOOL +WINAPI +SetupDiGetClassInstallParamsA( + _In_ HDEVINFO DeviceInfoSet, + _In_opt_ PSP_DEVINFO_DATA DeviceInfoData, + _Out_writes_bytes_to_opt_(ClassInstallParamsSize, *RequiredSize) PSP_CLASSINSTALL_HEADER ClassInstallParams, + _In_ DWORD ClassInstallParamsSize, + _Out_opt_ PDWORD RequiredSize); + +_Success_(return != FALSE) +WINSETUPAPI +BOOL +WINAPI +SetupDiGetClassInstallParamsW( + _In_ HDEVINFO DeviceInfoSet, + _In_opt_ PSP_DEVINFO_DATA DeviceInfoData, + _Out_writes_bytes_to_opt_(ClassInstallParamsSize, *RequiredSize) PSP_CLASSINSTALL_HEADER ClassInstallParams, + _In_ DWORD ClassInstallParamsSize, + _Out_opt_ PDWORD RequiredSize); + +_Success_(return != FALSE) +WINSETUPAPI +BOOL +WINAPI +SetupDiGetClassRegistryPropertyA( + _In_ CONST GUID *ClassGuid, + _In_ DWORD Property, + _Out_opt_ PDWORD PropertyRegDataType, + _Out_writes_bytes_to_(PropertyBufferSize, *RequiredSize) PBYTE PropertyBuffer, + _In_ DWORD PropertyBufferSize, + _Out_opt_ PDWORD RequiredSize, + _In_opt_ PCSTR MachineName, + _Reserved_ PVOID Reserved); + +_Success_(return != FALSE) +WINSETUPAPI +BOOL +WINAPI +SetupDiGetClassRegistryPropertyW( + _In_ CONST GUID *ClassGuid, + _In_ DWORD Property, + _Out_opt_ PDWORD PropertyRegDataType, + _Out_writes_bytes_to_(PropertyBufferSize, *RequiredSize) PBYTE PropertyBuffer, + _In_ DWORD PropertyBufferSize, + _Out_opt_ PDWORD RequiredSize, + _In_opt_ PCWSTR MachineName, + _Reserved_ PVOID Reserved); + +WINSETUPAPI BOOL WINAPI SetupDiGetDeviceInfoListClass(_In_ HDEVINFO, _Out_ LPGUID); +WINSETUPAPI BOOL WINAPI SetupDiGetDeviceInfoListDetailA(_In_ HDEVINFO, _Out_ PSP_DEVINFO_LIST_DETAIL_DATA_A); +WINSETUPAPI BOOL WINAPI SetupDiGetDeviceInfoListDetailW(_In_ HDEVINFO, _Out_ PSP_DEVINFO_LIST_DETAIL_DATA_W); +WINSETUPAPI BOOL WINAPI SetupDiGetDeviceInstallParamsA(_In_ HDEVINFO, _In_opt_ PSP_DEVINFO_DATA, _Out_ PSP_DEVINSTALL_PARAMS_A); +WINSETUPAPI BOOL WINAPI SetupDiGetDeviceInstallParamsW(_In_ HDEVINFO, _In_opt_ PSP_DEVINFO_DATA, _Out_ PSP_DEVINSTALL_PARAMS_W); + +WINSETUPAPI +BOOL +WINAPI +SetupDiGetDeviceInstanceIdA( + _In_ HDEVINFO DeviceInfoSet, + _In_ PSP_DEVINFO_DATA DeviceInfoData, + _Out_writes_opt_(DeviceInstanceIdSize) PSTR DeviceInstanceId, + _In_ DWORD DeviceInstanceIdSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI +BOOL +WINAPI +SetupDiGetDeviceInstanceIdW( + _In_ HDEVINFO DeviceInfoSet, + _In_ PSP_DEVINFO_DATA DeviceInfoData, + _Out_writes_opt_(DeviceInstanceIdSize) PWSTR DeviceInstanceId, + _In_ DWORD DeviceInstanceIdSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI BOOL WINAPI SetupDiGetDeviceInterfaceAlias(_In_ HDEVINFO, _In_ PSP_DEVICE_INTERFACE_DATA, _In_ CONST GUID*, _Out_ PSP_DEVICE_INTERFACE_DATA); + +_Success_(return != FALSE) +_At_((LPSTR)DeviceInterfaceDetailData->DevicePath, _Post_z_) +WINSETUPAPI +BOOL +WINAPI +SetupDiGetDeviceInterfaceDetailA( + _In_ HDEVINFO DeviceInfoSet, + _In_ PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData, + _Inout_updates_bytes_to_opt_(DeviceInterfaceDetailDataSize, *RequiredSize) PSP_DEVICE_INTERFACE_DETAIL_DATA_A DeviceInterfaceDetailData, + _In_ DWORD DeviceInterfaceDetailDataSize, + _Out_opt_ _Out_range_(>=, sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_A)) PDWORD RequiredSize, + _Out_opt_ PSP_DEVINFO_DATA DeviceInfoData); + +_Success_(return != FALSE) +_At_((LPWSTR)DeviceInterfaceDetailData->DevicePath, _Post_z_) +WINSETUPAPI +BOOL +WINAPI +SetupDiGetDeviceInterfaceDetailW( + _In_ HDEVINFO DeviceInfoSet, + _In_ PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData, + _Out_writes_bytes_to_opt_(DeviceInterfaceDetailDataSize, *RequiredSize) PSP_DEVICE_INTERFACE_DETAIL_DATA_W DeviceInterfaceDetailData, + _In_ DWORD DeviceInterfaceDetailDataSize, + _Out_opt_ _Out_range_(>=, sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W)) PDWORD RequiredSize, + _Out_opt_ PSP_DEVINFO_DATA DeviceInfoData); + +_Success_(return != FALSE) +_When_((*PropertyRegDataType == REG_SZ), _At_((PSTR) PropertyBuffer, _Post_valid_)) +_When_((*PropertyRegDataType == REG_MULTI_SZ), _At_((PZZSTR) PropertyBuffer, _Post_valid_)) +WINSETUPAPI +BOOL +WINAPI +SetupDiGetDeviceRegistryPropertyA( + _In_ HDEVINFO DeviceInfoSet, + _In_ PSP_DEVINFO_DATA DeviceInfoData, + _In_ DWORD Property, + _Out_opt_ PDWORD PropertyRegDataType, + _Out_writes_bytes_to_opt_(PropertyBufferSize, *RequiredSize) PBYTE PropertyBuffer, + _In_ DWORD PropertyBufferSize, + _Out_opt_ PDWORD RequiredSize); + +_Success_(return != FALSE) +_When_((*PropertyRegDataType == REG_SZ), _At_((PWSTR) PropertyBuffer, _Post_valid_)) +_When_((*PropertyRegDataType == REG_MULTI_SZ), _At_((PZZWSTR) PropertyBuffer, _Post_valid_)) +WINSETUPAPI +BOOL +WINAPI +SetupDiGetDeviceRegistryPropertyW( + _In_ HDEVINFO DeviceInfoSet, + _In_ PSP_DEVINFO_DATA DeviceInfoData, + _In_ DWORD Property, + _Out_opt_ PDWORD PropertyRegDataType, + _Out_writes_bytes_to_opt_(PropertyBufferSize, *RequiredSize) PBYTE PropertyBuffer, + _In_ DWORD PropertyBufferSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI +BOOL +WINAPI +SetupDiGetDriverInfoDetailA( + _In_ HDEVINFO DeviceInfoSet, + _In_opt_ PSP_DEVINFO_DATA DeviceInfoData, + _In_ PSP_DRVINFO_DATA_A DriverInfoData, + _Inout_updates_bytes_opt_(DriverInfoDetailDataSize) PSP_DRVINFO_DETAIL_DATA_A DriverInfoDetailData, + _In_ DWORD DriverInfoDetailDataSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI +BOOL +WINAPI +SetupDiGetDriverInfoDetailW( + _In_ HDEVINFO DeviceInfoSet, + _In_opt_ PSP_DEVINFO_DATA DeviceInfoData, + _In_ PSP_DRVINFO_DATA_W DriverInfoData, + _Inout_updates_bytes_opt_(DriverInfoDetailDataSize) PSP_DRVINFO_DETAIL_DATA_W DriverInfoDetailData, + _In_ DWORD DriverInfoDetailDataSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI BOOL WINAPI SetupDiGetDriverInstallParamsA(_In_ HDEVINFO, _In_opt_ PSP_DEVINFO_DATA, _In_ PSP_DRVINFO_DATA_A, _Out_ PSP_DRVINSTALL_PARAMS); +WINSETUPAPI BOOL WINAPI SetupDiGetDriverInstallParamsW(_In_ HDEVINFO, _In_opt_ PSP_DEVINFO_DATA, _In_ PSP_DRVINFO_DATA_W, _Out_ PSP_DRVINSTALL_PARAMS); + +WINSETUPAPI +BOOL +WINAPI +SetupDiGetHwProfileFriendlyNameA( + _In_ DWORD HwProfile, + _Out_writes_(FriendlyNameSize) PSTR FriendlyName, + _In_ DWORD FriendlyNameSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI +BOOL +WINAPI +SetupDiGetHwProfileFriendlyNameW( + _In_ DWORD HwProfile, + _Out_writes_(FriendlyNameSize) PWSTR FriendlyName, + _In_ DWORD FriendlyNameSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI +BOOL +WINAPI +SetupDiGetHwProfileFriendlyNameExA( + _In_ DWORD HwProfile, + _Out_writes_(FriendlyNameSize) PSTR FriendlyName, + _In_ DWORD FriendlyNameSize, + _Out_opt_ PDWORD RequiredSize, + _In_opt_ PCSTR MachineName, + _Reserved_ PVOID Reserved); + +WINSETUPAPI +BOOL +WINAPI +SetupDiGetHwProfileFriendlyNameExW( + _In_ DWORD HwProfile, + _Out_writes_(FriendlyNameSize) PWSTR FriendlyName, + _In_ DWORD FriendlyNameSize, + _Out_opt_ PDWORD RequiredSize, + _In_opt_ PCWSTR MachineName, + _Reserved_ PVOID Reserved); + WINSETUPAPI BOOL WINAPI SetupDiGetHwProfileFriendlyNameW(DWORD,PWSTR,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupDiGetHwProfileList(PDWORD,DWORD,PDWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupDiGetHwProfileListExA(PDWORD,DWORD,PDWORD,PDWORD,PCSTR,PVOID); -WINSETUPAPI BOOL WINAPI SetupDiGetHwProfileListExW(PDWORD,DWORD,PDWORD,PDWORD,PCWSTR,PVOID); -WINSETUPAPI BOOL WINAPI SetupDiGetINFClassA(PCSTR,LPGUID,PSTR,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupDiGetINFClassW(PCWSTR,LPGUID,PWSTR,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupDiGetSelectedDevice(HDEVINFO,PSP_DEVINFO_DATA); -WINSETUPAPI BOOL WINAPI SetupDiGetSelectedDriverA(HDEVINFO,PSP_DEVINFO_DATA,PSP_DRVINFO_DATA_A); -WINSETUPAPI BOOL WINAPI SetupDiGetSelectedDriverW(HDEVINFO,PSP_DEVINFO_DATA,PSP_DRVINFO_DATA_W); -WINSETUPAPI HPROPSHEETPAGE WINAPI SetupDiGetWizardage(HDEVINFO,PSP_DEVINFO_DATA,PSP_INSTALLWIZARD_DATA,DWORD,DWORD); -WINSETUPAPI BOOL WINAPI SetupDiInstallClassA(HWND,PCSTR,DWORD,HSPFILEQ); -WINSETUPAPI BOOL WINAPI SetupDiInstallClassW(HWND,PCWSTR,DWORD,HSPFILEQ); -WINSETUPAPI BOOL WINAPI SetupDiInstallClassExA(HWND,PCSTR,DWORD,HSPFILEQ,CONST GUID*,PVOID,PVOID); -WINSETUPAPI BOOL WINAPI SetupDiInstallClassExW(HWND,PCWSTR,DWORD,HSPFILEQ,CONST GUID*,PVOID,PVOID); -WINSETUPAPI BOOL WINAPI SetupDiInstallDevice(HDEVINFO,PSP_DEVINFO_DATA); -WINSETUPAPI BOOL WINAPI SetupDiInstallDeviceInterfaces(HDEVINFO,PSP_DEVINFO_DATA); -WINSETUPAPI BOOL WINAPI SetupDiInstallDriverFiles(HDEVINFO,PSP_DEVINFO_DATA); -WINSETUPAPI BOOL WINAPI SetupDiLoadClassIcon(CONST GUID*,HICON*,PINT); + +_Success_(return != FALSE) +WINSETUPAPI +BOOL +WINAPI +SetupDiGetHwProfileList( + _Out_writes_to_(HwProfileListSize, *RequiredSize) PDWORD HwProfileList, + _In_ DWORD HwProfileListSize, + _Out_ PDWORD RequiredSize, + _Out_opt_ PDWORD CurrentlyActiveIndex); + +_Success_(return != FALSE) +WINSETUPAPI +BOOL +WINAPI +SetupDiGetHwProfileListExA( + _Out_writes_to_(HwProfileListSize, *RequiredSize) PDWORD HwProfileList, + _In_ DWORD HwProfileListSize, + _Out_ PDWORD RequiredSize, + _Out_opt_ PDWORD CurrentlyActiveIndex, + _In_opt_ PCSTR MachineName, + _Reserved_ PVOID Reserved); + +_Success_(return != FALSE) +WINSETUPAPI +BOOL +WINAPI +SetupDiGetHwProfileListExW( + _Out_writes_to_(HwProfileListSize, *RequiredSize) PDWORD HwProfileList, + _In_ DWORD HwProfileListSize, + _Out_ PDWORD RequiredSize, + _Out_opt_ PDWORD CurrentlyActiveIndex, + _In_opt_ PCWSTR MachineName, + _Reserved_ PVOID Reserved); + +WINSETUPAPI +BOOL +WINAPI +SetupDiGetINFClassA( + _In_ PCSTR InfName, + _Out_ LPGUID ClassGuid, + _Out_writes_(ClassNameSize) PSTR ClassName, + _In_ DWORD ClassNameSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI +BOOL +WINAPI +SetupDiGetINFClassW( + _In_ PCWSTR InfName, + _Out_ LPGUID ClassGuid, + _Out_writes_(ClassNameSize) PWSTR ClassName, + _In_ DWORD ClassNameSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI BOOL WINAPI SetupDiGetSelectedDevice(_In_ HDEVINFO, _Out_ PSP_DEVINFO_DATA); +WINSETUPAPI BOOL WINAPI SetupDiGetSelectedDriverA(_In_ HDEVINFO, _In_opt_ PSP_DEVINFO_DATA, _Out_ PSP_DRVINFO_DATA_A); +WINSETUPAPI BOOL WINAPI SetupDiGetSelectedDriverW(_In_ HDEVINFO, _In_opt_ PSP_DEVINFO_DATA, _Out_ PSP_DRVINFO_DATA_W); +WINSETUPAPI HPROPSHEETPAGE WINAPI SetupDiGetWizardPage(_In_ HDEVINFO, _In_opt_ PSP_DEVINFO_DATA, _In_ PSP_INSTALLWIZARD_DATA, _In_ DWORD, _In_ DWORD); +WINSETUPAPI BOOL WINAPI SetupDiInstallClassA(_In_opt_ HWND, _In_ PCSTR, _In_ DWORD, _In_opt_ HSPFILEQ); +WINSETUPAPI BOOL WINAPI SetupDiInstallClassW(_In_opt_ HWND, _In_ PCWSTR, _In_ DWORD, _In_opt_ HSPFILEQ); +WINSETUPAPI BOOL WINAPI SetupDiInstallClassExA(_In_opt_ HWND, _In_opt_ PCSTR, _In_ DWORD, _In_opt_ HSPFILEQ, _In_opt_ CONST GUID*, _Reserved_ PVOID, _Reserved_ PVOID); +WINSETUPAPI BOOL WINAPI SetupDiInstallClassExW(_In_opt_ HWND, _In_opt_ PCWSTR, _In_ DWORD, _In_opt_ HSPFILEQ, _In_opt_ CONST GUID*, _Reserved_ PVOID, _Reserved_ PVOID); +WINSETUPAPI BOOL WINAPI SetupDiInstallDevice(_In_ HDEVINFO, _Inout_ PSP_DEVINFO_DATA); +WINSETUPAPI BOOL WINAPI SetupDiInstallDeviceInterfaces(_In_ HDEVINFO, _In_ PSP_DEVINFO_DATA); +WINSETUPAPI BOOL WINAPI SetupDiInstallDriverFiles(_In_ HDEVINFO, _In_ PSP_DEVINFO_DATA); +WINSETUPAPI BOOL WINAPI SetupDiLoadClassIcon(_In_ CONST GUID*, _Out_opt_ HICON*, _Out_opt_ PINT); WINSETUPAPI BOOL WINAPI SetupDiMoveDuplicateDevice(HDEVINFO,PSP_DEVINFO_DATA); -WINSETUPAPI HKEY WINAPI SetupDiOpenClassRegKey(CONST GUID*,REGSAM); -WINSETUPAPI HKEY WINAPI SetupDiOpenClassRegKeyExA(CONST GUID*,REGSAM,DWORD,PCSTR,PVOID); -WINSETUPAPI HKEY WINAPI SetupDiOpenClassRegKeyExW(CONST GUID*,REGSAM,DWORD,PCWSTR,PVOID); -WINSETUPAPI BOOL WINAPI SetupDiOpenDeviceInfoA(HDEVINFO,PCSTR,HWND,DWORD,PSP_DEVINFO_DATA); -WINSETUPAPI BOOL WINAPI SetupDiOpenDeviceInfoW(HDEVINFO,PCWSTR,HWND,DWORD,PSP_DEVINFO_DATA); -WINSETUPAPI BOOL WINAPI SetupDiOpenDeviceInterfaceA(HDEVINFO,PCSTR,DWORD,PSP_DEVICE_INTERFACE_DATA); -WINSETUPAPI BOOL WINAPI SetupDiOpenDeviceInterfaceW(HDEVINFO,PCWSTR,DWORD,PSP_DEVICE_INTERFACE_DATA); -WINSETUPAPI HKEY WINAPI SetupDiOpenDeviceInterfaceRegKey(HDEVINFO,PSP_DEVICE_INTERFACE_DATA,DWORD,REGSAM); -WINSETUPAPI HKEY WINAPI SetupDiOpenDevRegKey(HDEVINFO,PSP_DEVINFO_DATA,DWORD,DWORD,DWORD,REGSAM); -WINSETUPAPI BOOL WINAPI SetupDiRegisterCoDeviceInstallers(HDEVINFO,PSP_DEVINFO_DATA); -WINSETUPAPI BOOL WINAPI SetupDiRegisterDeviceInfo(HDEVINFO,PSP_DEVINFO_DATA,DWORD,PSP_DETSIG_CMPPROC,PVOID,PSP_DEVINFO_DATA); -WINSETUPAPI BOOL WINAPI SetupDiRemoveDevice(HDEVINFO,PSP_DEVINFO_DATA); -WINSETUPAPI BOOL WINAPI SetupDiRemoveDeviceInterface(HDEVINFO,PSP_DEVICE_INTERFACE_DATA); -WINSETUPAPI BOOL WINAPI SetupDiSelectBestCompatDrv(HDEVINFO,PSP_DEVINFO_DATA); -WINSETUPAPI BOOL WINAPI SetupDiSelectDevice(HDEVINFO,PSP_DEVINFO_DATA); -WINSETUPAPI BOOL WINAPI SetupDiSelectOEMDrv(HWND,HDEVINFO,PSP_DEVINFO_DATA); -WINSETUPAPI BOOL WINAPI SetupDiSetClassInstallParamsA(HDEVINFO,PSP_DEVINFO_DATA,PSP_CLASSINSTALL_HEADER,DWORD); -WINSETUPAPI BOOL WINAPI SetupDiSetClassInstallParamsW(HDEVINFO,PSP_DEVINFO_DATA,PSP_CLASSINSTALL_HEADER,DWORD); -WINSETUPAPI BOOL WINAPI SetupDiSetClassRegistryPropertyA(LPGUID,DWORD,CONST BYTE*,DWORD,PCSTR,PVOID); -WINSETUPAPI BOOL WINAPI SetupDiSetClassRegistryPropertyW(LPGUID,DWORD,CONST BYTE*,DWORD,PCWSTR,PVOID); -WINSETUPAPI BOOL WINAPI SetupDiSetDeviceInstallParamsA(HDEVINFO,PSP_DEVINFO_DATA,PSP_DEVINSTALL_PARAMS_A); -WINSETUPAPI BOOL WINAPI SetupDiSetDeviceInstallParamsW(HDEVINFO,PSP_DEVINFO_DATA,PSP_DEVINSTALL_PARAMS_W); -WINSETUPAPI BOOL WINAPI SetupDiSetDeviceRegistryPropertyA(HDEVINFO,PSP_DEVINFO_DATA,DWORD,CONST BYTE*,DWORD); -WINSETUPAPI BOOL WINAPI SetupDiSetDeviceRegistryPropertyW(HDEVINFO,PSP_DEVINFO_DATA,DWORD,CONST BYTE*,DWORD); -WINSETUPAPI BOOL WINAPI SetupDiSetDriverInstallParamsA(HDEVINFO,PSP_DEVINFO_DATA,PSP_DRVINFO_DATA_A,PSP_DRVINSTALL_PARAMS); -WINSETUPAPI BOOL WINAPI SetupDiSetDriverInstallParamsW(HDEVINFO,PSP_DEVINFO_DATA,PSP_DRVINFO_DATA_W,PSP_DRVINSTALL_PARAMS); -WINSETUPAPI BOOL WINAPI SetupDiSetSelectedDevice(HDEVINFO,PSP_DEVINFO_DATA); -WINSETUPAPI BOOL WINAPI SetupDiSetSelectedDriverA(HDEVINFO,PSP_DEVINFO_DATA,PSP_DRVINFO_DATA_A); -WINSETUPAPI BOOL WINAPI SetupDiSetSelectedDriverW(HDEVINFO,PSP_DEVINFO_DATA,PSP_DRVINFO_DATA_W); -WINSETUPAPI BOOL WINAPI SetupDiUnremoveDevice(HDEVINFO,PSP_DEVINFO_DATA); -WINSETUPAPI HDSKSPC WINAPI SetupDuplicateDiskSpaceListA(HDSKSPC,PVOID,DWORD,UINT); -WINSETUPAPI HDSKSPC WINAPI SetupDuplicateDiskSpaceListW(HDSKSPC,PVOID,DWORD,UINT); -WINSETUPAPI BOOL WINAPI SetupFindFirstLineA(HINF,PCSTR,PCSTR,PINFCONTEXT); -WINSETUPAPI BOOL WINAPI SetupFindFirstLineW(HINF,PCWSTR,PCWSTR,PINFCONTEXT); -WINSETUPAPI BOOL WINAPI SetupFindNextLine(PINFCONTEXT,PINFCONTEXT); -WINSETUPAPI BOOL WINAPI SetupFindNextMatchLineA(PINFCONTEXT,PCSTR,PINFCONTEXT); -WINSETUPAPI BOOL WINAPI SetupFindNextMatchLineW(PINFCONTEXT,PCWSTR,PINFCONTEXT); +_Check_return_ WINSETUPAPI HKEY WINAPI SetupDiOpenClassRegKey(_In_opt_ CONST GUID*, _In_ REGSAM); +_Check_return_ WINSETUPAPI HKEY WINAPI SetupDiOpenClassRegKeyExA(_In_opt_ CONST GUID*, _In_ REGSAM, _In_ DWORD, _In_opt_ PCSTR, _Reserved_ PVOID); +_Check_return_ WINSETUPAPI HKEY WINAPI SetupDiOpenClassRegKeyExW(_In_opt_ CONST GUID*, _In_ REGSAM, _In_ DWORD, _In_opt_ PCWSTR, _Reserved_ PVOID); +WINSETUPAPI BOOL WINAPI SetupDiOpenDeviceInfoA(_In_ HDEVINFO, _In_ PCSTR, _In_opt_ HWND, _In_ DWORD, _Out_opt_ PSP_DEVINFO_DATA); +WINSETUPAPI BOOL WINAPI SetupDiOpenDeviceInfoW(_In_ HDEVINFO, _In_ PCWSTR, _In_opt_ HWND, _In_ DWORD, _Out_opt_ PSP_DEVINFO_DATA); +WINSETUPAPI BOOL WINAPI SetupDiOpenDeviceInterfaceA(_In_ HDEVINFO, _In_ PCSTR, _In_ DWORD, _Out_opt_ PSP_DEVICE_INTERFACE_DATA); +WINSETUPAPI BOOL WINAPI SetupDiOpenDeviceInterfaceW(_In_ HDEVINFO, _In_ PCWSTR, _In_ DWORD, _Out_opt_ PSP_DEVICE_INTERFACE_DATA); +_Check_return_ WINSETUPAPI HKEY WINAPI SetupDiOpenDeviceInterfaceRegKey(_In_ HDEVINFO, _In_ PSP_DEVICE_INTERFACE_DATA, _Reserved_ DWORD, _In_ REGSAM); +_Check_return_ WINSETUPAPI HKEY WINAPI SetupDiOpenDevRegKey(_In_ HDEVINFO, _In_ PSP_DEVINFO_DATA, _In_ DWORD, _In_ DWORD, _In_ DWORD, _In_ REGSAM); +WINSETUPAPI BOOL WINAPI SetupDiRegisterCoDeviceInstallers(_In_ HDEVINFO, _In_ PSP_DEVINFO_DATA); +WINSETUPAPI BOOL WINAPI SetupDiRegisterDeviceInfo(_In_ HDEVINFO, _Inout_ PSP_DEVINFO_DATA, _In_ DWORD, _In_opt_ PSP_DETSIG_CMPPROC, _In_opt_ PVOID, _Out_opt_ PSP_DEVINFO_DATA); +WINSETUPAPI BOOL WINAPI SetupDiRemoveDevice(_In_ HDEVINFO, _Inout_ PSP_DEVINFO_DATA); +WINSETUPAPI BOOL WINAPI SetupDiRemoveDeviceInterface(_In_ HDEVINFO, _Inout_ PSP_DEVICE_INTERFACE_DATA); +WINSETUPAPI BOOL WINAPI SetupDiSelectBestCompatDrv(_In_ HDEVINFO, _Inout_opt_ PSP_DEVINFO_DATA); +WINSETUPAPI BOOL WINAPI SetupDiSelectDevice(_In_ HDEVINFO, _Inout_opt_ PSP_DEVINFO_DATA); +WINSETUPAPI BOOL WINAPI SetupDiSelectOEMDrv(_In_opt_ HWND, _In_ HDEVINFO, _In_opt_ PSP_DEVINFO_DATA); + +WINSETUPAPI +BOOL +WINAPI +SetupDiSetClassInstallParamsA( + _In_ HDEVINFO DeviceInfoSet, + _In_opt_ PSP_DEVINFO_DATA DeviceInfoData, + _In_reads_bytes_opt_(ClassInstallParamsSize) PSP_CLASSINSTALL_HEADER ClassInstallParams, + _In_ DWORD ClassInstallParamsSize); + +WINSETUPAPI +BOOL +WINAPI +SetupDiSetClassInstallParamsW( + _In_ HDEVINFO DeviceInfoSet, + _In_opt_ PSP_DEVINFO_DATA DeviceInfoData, + _In_reads_bytes_opt_(ClassInstallParamsSize) PSP_CLASSINSTALL_HEADER ClassInstallParams, + _In_ DWORD ClassInstallParamsSize); + +WINSETUPAPI +BOOL +WINAPI +SetupDiSetClassRegistryPropertyA( + _In_ CONST GUID *ClassGuid, + _In_ DWORD Property, + _In_reads_bytes_opt_(PropertyBufferSize) CONST BYTE *PropertyBuffer, + _In_ DWORD PropertyBufferSize, + _In_opt_ PCSTR MachineName, + _Reserved_ PVOID Reserved); + +WINSETUPAPI +BOOL +WINAPI +SetupDiSetClassRegistryPropertyW( + _In_ CONST GUID *ClassGuid, + _In_ DWORD Property, + _In_reads_bytes_opt_(PropertyBufferSize) CONST BYTE *PropertyBuffer, + _In_ DWORD PropertyBufferSize, + _In_opt_ PCWSTR MachineName, + _Reserved_ PVOID Reserved); + +WINSETUPAPI BOOL WINAPI SetupDiSetDeviceInstallParamsA(_In_ HDEVINFO, _In_opt_ PSP_DEVINFO_DATA, _In_ PSP_DEVINSTALL_PARAMS_A); +WINSETUPAPI BOOL WINAPI SetupDiSetDeviceInstallParamsW(_In_ HDEVINFO, _In_opt_ PSP_DEVINFO_DATA, _In_ PSP_DEVINSTALL_PARAMS_W); + +WINSETUPAPI +BOOL +WINAPI +SetupDiSetDeviceRegistryPropertyA( + _In_ HDEVINFO DeviceInfoSet, + _Inout_ PSP_DEVINFO_DATA DeviceInfoData, + _In_ DWORD Property, + _In_reads_bytes_opt_(PropertyBufferSize) CONST BYTE *PropertyBuffer, + _In_ DWORD PropertyBufferSize); + +WINSETUPAPI +BOOL +WINAPI +SetupDiSetDeviceRegistryPropertyW( + _In_ HDEVINFO DeviceInfoSet, + _Inout_ PSP_DEVINFO_DATA DeviceInfoData, + _In_ DWORD Property, + _In_reads_bytes_opt_(PropertyBufferSize) CONST BYTE *PropertyBuffer, + _In_ DWORD PropertyBufferSize); + +WINSETUPAPI BOOL WINAPI SetupDiSetDriverInstallParamsA(_In_ HDEVINFO, _In_opt_ PSP_DEVINFO_DATA, _In_ PSP_DRVINFO_DATA_A, _In_ PSP_DRVINSTALL_PARAMS); +WINSETUPAPI BOOL WINAPI SetupDiSetDriverInstallParamsW(_In_ HDEVINFO, _In_opt_ PSP_DEVINFO_DATA, _In_ PSP_DRVINFO_DATA_W, _In_ PSP_DRVINSTALL_PARAMS); +WINSETUPAPI BOOL WINAPI SetupDiSetSelectedDevice(_In_ HDEVINFO, _In_ PSP_DEVINFO_DATA); +WINSETUPAPI BOOL WINAPI SetupDiSetSelectedDriverA(_In_ HDEVINFO, _Inout_opt_ PSP_DEVINFO_DATA, _Inout_opt_ PSP_DRVINFO_DATA_A); +WINSETUPAPI BOOL WINAPI SetupDiSetSelectedDriverW(_In_ HDEVINFO, _Inout_opt_ PSP_DEVINFO_DATA, _Inout_opt_ PSP_DRVINFO_DATA_W); +WINSETUPAPI BOOL WINAPI SetupDiUnremoveDevice(_In_ HDEVINFO, _Inout_ PSP_DEVINFO_DATA); +WINSETUPAPI HDSKSPC WINAPI SetupDuplicateDiskSpaceListA(_In_ HDSKSPC, _Reserved_ PVOID, _Reserved_ DWORD, _In_ UINT); +WINSETUPAPI HDSKSPC WINAPI SetupDuplicateDiskSpaceListW(_In_ HDSKSPC, _Reserved_ PVOID, _Reserved_ DWORD, _In_ UINT); +WINSETUPAPI BOOL WINAPI SetupFindFirstLineA(_In_ HINF, _In_ PCSTR, _In_opt_ PCSTR, _Out_ PINFCONTEXT); +WINSETUPAPI BOOL WINAPI SetupFindFirstLineW(_In_ HINF, _In_ PCWSTR, _In_opt_ PCWSTR, _Out_ PINFCONTEXT); +WINSETUPAPI BOOL WINAPI SetupFindNextLine(_In_ PINFCONTEXT, _Out_ PINFCONTEXT); +WINSETUPAPI BOOL WINAPI SetupFindNextMatchLineA(_In_ PINFCONTEXT, _In_opt_ PCSTR, _Out_ PINFCONTEXT); +WINSETUPAPI BOOL WINAPI SetupFindNextMatchLineW(_In_ PINFCONTEXT, _In_opt_ PCWSTR, _Out_ PINFCONTEXT); WINSETUPAPI BOOL WINAPI SetupFreeA(PCSTR**,UINT); WINSETUPAPI BOOL WINAPI SetupFreeW(PCWSTR**,UINT); -WINSETUPAPI BOOL WINAPI SetupGetBackupInformationA(HSPFILEQ,PSP_BACKUP_QUEUE_PARAMS_A); -WINSETUPAPI BOOL WINAPI SetupGetBackupInformationW(HSPFILEQ,PSP_BACKUP_QUEUE_PARAMS_W); -WINSETUPAPI BOOL WINAPI SetupGetBinaryField(PINFCONTEXT,DWORD,PBYTE,DWORD,LPDWORD); -WINSETUPAPI DWORD WINAPI SetupGetFieldCount(PINFCONTEXT); -WINSETUPAPI DWORD WINAPI SetupGetFileCompressionInfoA(PCSTR,PSTR*,PDWORD,PDWORD,PUINT); -WINSETUPAPI DWORD WINAPI SetupGetFileCompressionInfoW(PCWSTR,PWSTR*,PDWORD,PDWORD,PUINT); -WINSETUPAPI BOOL WINAPI SetupGetFileCompressionInfoExA(PCSTR,PSTR,DWORD,PDWORD,PDWORD,PDWORD,PUINT); -WINSETUPAPI BOOL WINAPI SetupGetFileCompressionInfoExW(PCWSTR,PWSTR,DWORD,PDWORD,PDWORD,PDWORD,PUINT); -WINSETUPAPI BOOL WINAPI SetupGetInfFileListA(PCSTR,DWORD,PSTR,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupGetInfFileListW(PCWSTR,DWORD,PWSTR,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupGetInfInformationA(LPCVOID,DWORD,PSP_INF_INFORMATION,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupGetInfInformationW(LPCVOID,DWORD,PSP_INF_INFORMATION,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupGetIntField(PINFCONTEXT,DWORD,PINT); -WINSETUPAPI BOOL WINAPI SetupGetLineByIndexA(HINF,PCSTR,DWORD,PINFCONTEXT); -WINSETUPAPI BOOL WINAPI SetupGetLineByIndexW(HINF,PCWSTR,DWORD,PINFCONTEXT); -WINSETUPAPI LONG WINAPI SetupGetLineCountA(HINF,PCSTR); -WINSETUPAPI LONG WINAPI SetupGetLineCountW(HINF,PCWSTR); -WINSETUPAPI BOOL WINAPI SetupGetLineTextA(PINFCONTEXT,HINF,PCSTR,PCSTR,PSTR,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupGetLineTextW(PINFCONTEXT,HINF,PCWSTR,PCWSTR,PWSTR,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupGetMultiSzFieldA(PINFCONTEXT,DWORD,PSTR,DWORD,LPDWORD); -WINSETUPAPI BOOL WINAPI SetupGetMultiSzFieldW(PINFCONTEXT,DWORD,PWSTR,DWORD,LPDWORD); -WINSETUPAPI BOOL WINAPI SetupGetSourceFileLocationA(HINF,PINFCONTEXT,PCSTR,PUINT,PSTR,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupGetSourceFileLocationW(HINF,PINFCONTEXT,PCWSTR,PUINT,PWSTR,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupGetSourceFileSizeA(HINF,PINFCONTEXT,PCSTR,PCSTR,PDWORD,UINT); -WINSETUPAPI BOOL WINAPI SetupGetSourceFileSizeW(HINF,PINFCONTEXT,PCWSTR,PCWSTR,PDWORD,UINT); -WINSETUPAPI BOOL WINAPI SetupGetSourceInfoA(HINF,UINT,UINT,PSTR,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupGetSourceInfoW(HINF,UINT,UINT,PWSTR,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupGetStringFieldA(PINFCONTEXT,DWORD,PSTR,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupGetStringFieldW(PINFCONTEXT,DWORD,PWSTR,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupGetTargetPathA(HINF,PINFCONTEXT,PCSTR,PSTR,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupGetTargetPathW(HINF,PINFCONTEXT,PCWSTR,PWSTR,DWORD,PDWORD); -WINSETUPAPI PVOID WINAPI SetupInitDefaultQueueCallback(HWND); -WINSETUPAPI PVOID WINAPI SetupInitDefaultQueueCallbackEx(HWND,HWND,UINT,DWORD,PVOID); -WINSETUPAPI HSPFILELOG WINAPI SetupInitializeFileLogA(PCSTR,DWORD); -WINSETUPAPI HSPFILELOG WINAPI SetupInitializeFileLogW(PCWSTR,DWORD); -WINSETUPAPI BOOL WINAPI SetupInstallFileA(HINF,PINFCONTEXT,PCSTR,PCSTR,PCSTR,DWORD,PSP_FILE_CALLBACK_A,PVOID); -WINSETUPAPI BOOL WINAPI SetupInstallFileW(HINF,PINFCONTEXT,PCWSTR,PCWSTR,PCWSTR,DWORD,PSP_FILE_CALLBACK_W,PVOID); -WINSETUPAPI BOOL WINAPI SetupInstallFileExA(HINF,PINFCONTEXT,PCSTR,PCSTR,PCSTR,DWORD,PSP_FILE_CALLBACK_A,PVOID,PBOOL); -WINSETUPAPI BOOL WINAPI SetupInstallFileExW(HINF,PINFCONTEXT,PCWSTR,PCWSTR,PCWSTR,DWORD,PSP_FILE_CALLBACK_W,PVOID,PBOOL); -WINSETUPAPI BOOL WINAPI SetupInstallFilesFromInfSectionA(HINF,HINF,HSPFILEQ,PCSTR,PCSTR,UINT); -WINSETUPAPI BOOL WINAPI SetupInstallFilesFromInfSectionW(HINF,HINF,HSPFILEQ,PCWSTR,PCWSTR,UINT); -WINSETUPAPI BOOL WINAPI SetupInstallFromInfSectionA(HWND,HINF,PCSTR,UINT,HKEY,PCSTR,UINT,PSP_FILE_CALLBACK_A,PVOID,HDEVINFO,PSP_DEVINFO_DATA); -WINSETUPAPI BOOL WINAPI SetupInstallFromInfSectionW(HWND,HINF,PCWSTR,UINT,HKEY,PCWSTR,UINT,PSP_FILE_CALLBACK_W,PVOID,HDEVINFO,PSP_DEVINFO_DATA); -WINSETUPAPI BOOL WINAPI SetupInstallServicesFromInfSectionA(HINF,PCSTR,DWORD); -WINSETUPAPI BOOL WINAPI SetupInstallServicesFromInfSectionW(HINF,PCWSTR,DWORD); -WINSETUPAPI BOOL WINAPI SetupInstallServicesFromInfSectionExA(HINF,PCSTR,DWORD,HDEVINFO,PSP_DEVINFO_DATA,PVOID,PVOID); -WINSETUPAPI BOOL WINAPI SetupInstallServicesFromInfSectionExW(HINF,PCWSTR,DWORD,HDEVINFO,PSP_DEVINFO_DATA,PVOID,PVOID); -WINSETUPAPI BOOL WINAPI SetupIterateCabinetA(PCSTR,DWORD,PSP_FILE_CALLBACK_A,PVOID); -WINSETUPAPI BOOL WINAPI SetupIterateCabinetW(PCWSTR,DWORD,PSP_FILE_CALLBACK_W,PVOID); -WINSETUPAPI BOOL WINAPI SetupLogErrorA(LPCSTR,LogSeverity); -WINSETUPAPI BOOL WINAPI SetupLogErrorW(LPCWSTR,LogSeverity); -WINSETUPAPI BOOL WINAPI SetupLogFileA(HSPFILELOG,PCSTR,PCSTR,PCSTR,DWORD,PCSTR,PCSTR,PCSTR,DWORD); -WINSETUPAPI BOOL WINAPI SetupLogFileW(HSPFILELOG,PCWSTR,PCWSTR,PCWSTR,DWORD,PCWSTR,PCWSTR,PCWSTR,DWORD); -WINSETUPAPI BOOL WINAPI SetupOpenAppendInfFileA(PCSTR,HINF,PUINT); -WINSETUPAPI BOOL WINAPI SetupOpenAppendInfFileW(PCWSTR,HINF,PUINT); +WINSETUPAPI BOOL WINAPI SetupGetBackupInformationA(_In_ HSPFILEQ, _Inout_ PSP_BACKUP_QUEUE_PARAMS_A); +WINSETUPAPI BOOL WINAPI SetupGetBackupInformationW(_In_ HSPFILEQ, _Inout_ PSP_BACKUP_QUEUE_PARAMS_W); + +_Success_(return != FALSE) +WINSETUPAPI +BOOL +WINAPI +SetupGetBinaryField( + _In_ PINFCONTEXT Context, + _In_ DWORD FieldIndex, + _Out_writes_bytes_to_opt_(ReturnBufferSize, *RequiredSize) PBYTE ReturnBuffer, + _In_ DWORD ReturnBufferSize, + _Out_opt_ LPDWORD RequiredSize); + +WINSETUPAPI DWORD WINAPI SetupGetFieldCount(_In_ PINFCONTEXT); +WINSETUPAPI DWORD WINAPI SetupGetFileCompressionInfoA(_In_ PCSTR, _Out_ PSTR*, _Out_ PDWORD, _Out_ PDWORD, _Out_ PUINT); +WINSETUPAPI DWORD WINAPI SetupGetFileCompressionInfoW(_In_ PCWSTR, _Out_ PWSTR*, _Out_ PDWORD, _Out_ PDWORD, _Out_ PUINT); + +WINSETUPAPI +BOOL +WINAPI +SetupGetFileCompressionInfoExA( + _In_ PCSTR SourceFileName, + _In_reads_opt_(ActualSourceFileNameBufferLen) PSTR ActualSourceFileNameBuffer, + _In_ DWORD ActualSourceFileNameBufferLen, + _Out_opt_ PDWORD RequiredBufferLen, + _Out_ PDWORD SourceFileSize, + _Out_ PDWORD TargetFileSize, + _Out_ PUINT CompressionType); + +WINSETUPAPI +BOOL +WINAPI +SetupGetFileCompressionInfoExW( + _In_ PCWSTR SourceFileName, + _In_reads_opt_(ActualSourceFileNameBufferLen) PWSTR ActualSourceFileNameBuffer, + _In_ DWORD ActualSourceFileNameBufferLen, + _Out_opt_ PDWORD RequiredBufferLen, + _Out_ PDWORD SourceFileSize, + _Out_ PDWORD TargetFileSize, + _Out_ PUINT CompressionType); + +WINSETUPAPI +BOOL +WINAPI +SetupGetInfFileListA( + _In_opt_ PCSTR DirectoryPath, + _In_ DWORD InfStyle, + _Out_writes_opt_(ReturnBufferSize) PSTR ReturnBuffer, + _In_ DWORD ReturnBufferSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI +BOOL +WINAPI +SetupGetInfFileListW( + _In_opt_ PCWSTR DirectoryPath, + _In_ DWORD InfStyle, + _Out_writes_(ReturnBufferSize) PWSTR ReturnBuffer, + _In_ DWORD ReturnBufferSize, + _Out_opt_ PDWORD RequiredSize); + +_Success_(return != FALSE) +WINSETUPAPI +BOOL +WINAPI +SetupGetInfInformationA( + _In_ LPCVOID InfSpec, + _In_ DWORD SearchControl, + _Out_writes_bytes_to_opt_(ReturnBufferSize, *RequiredSize) PSP_INF_INFORMATION ReturnBuffer, + _In_ DWORD ReturnBufferSize, + _Out_opt_ PDWORD RequiredSize); + +_Success_(return != FALSE) +WINSETUPAPI +BOOL +WINAPI +SetupGetInfInformationW( + _In_ LPCVOID InfSpec, + _In_ DWORD SearchControl, + _Out_writes_bytes_to_opt_(ReturnBufferSize, *RequiredSize) PSP_INF_INFORMATION ReturnBuffer, + _In_ DWORD ReturnBufferSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI BOOL WINAPI SetupGetIntField(_In_ PINFCONTEXT, _In_ DWORD, _Out_ PINT); +WINSETUPAPI BOOL WINAPI SetupGetLineByIndexA(_In_ HINF, _In_ PCSTR, _In_ DWORD, _Out_ PINFCONTEXT); +WINSETUPAPI BOOL WINAPI SetupGetLineByIndexW(_In_ HINF, _In_ PCWSTR, _In_ DWORD, _Out_ PINFCONTEXT); +WINSETUPAPI LONG WINAPI SetupGetLineCountA(_In_ HINF, _In_ PCSTR); +WINSETUPAPI LONG WINAPI SetupGetLineCountW(_In_ HINF, _In_ PCWSTR); + +WINSETUPAPI +BOOL +WINAPI +SetupGetLineTextA( + _In_opt_ PINFCONTEXT Context, + _In_opt_ HINF InfHandle, + _In_opt_ PCSTR Section, + _In_opt_ PCSTR Key, + _Out_writes_opt_(ReturnBufferSize) PSTR ReturnBuffer, + _In_ DWORD ReturnBufferSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI +BOOL +WINAPI +SetupGetLineTextW( + _In_opt_ PINFCONTEXT Context, + _In_opt_ HINF InfHandle, + _In_opt_ PCWSTR Section, + _In_opt_ PCWSTR Key, + _Out_writes_opt_(ReturnBufferSize) PWSTR ReturnBuffer, + _In_ DWORD ReturnBufferSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI +BOOL +WINAPI +SetupGetMultiSzFieldA( + _In_ PINFCONTEXT Context, + _In_ DWORD FieldIndex, + _Out_writes_opt_(ReturnBufferSize) PSTR ReturnBuffer, + _In_ DWORD ReturnBufferSize, + _Out_opt_ LPDWORD RequiredSize); + +WINSETUPAPI +BOOL +WINAPI +SetupGetMultiSzFieldW( + _In_ PINFCONTEXT Context, + _In_ DWORD FieldIndex, + _Out_writes_opt_(ReturnBufferSize) PWSTR ReturnBuffer, + _In_ DWORD ReturnBufferSize, + _Out_opt_ LPDWORD RequiredSize); + +WINSETUPAPI +BOOL +WINAPI +SetupGetSourceFileLocationA( + _In_ HINF InfHandle, + _In_opt_ PINFCONTEXT InfContext, + _In_opt_ PCSTR FileName, + _Out_ PUINT SourceId, + _Out_writes_opt_(ReturnBufferSize) PSTR ReturnBuffer, + _In_ DWORD ReturnBufferSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI +BOOL +WINAPI +SetupGetSourceFileLocationW( + _In_ HINF InfHandle, + _In_opt_ PINFCONTEXT InfContext, + _In_opt_ PCWSTR FileName, + _Out_ PUINT SourceId, + _Out_writes_opt_(ReturnBufferSize) PWSTR ReturnBuffer, + _In_ DWORD ReturnBufferSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI BOOL WINAPI SetupGetSourceFileSizeA(_In_ HINF, _In_opt_ PINFCONTEXT, _In_opt_ PCSTR, _In_opt_ PCSTR, _Out_ PDWORD, _In_ UINT); +WINSETUPAPI BOOL WINAPI SetupGetSourceFileSizeW(_In_ HINF, _In_opt_ PINFCONTEXT, _In_opt_ PCWSTR, _In_opt_ PCWSTR, _Out_ PDWORD, _In_ UINT); + +WINSETUPAPI +BOOL +WINAPI +SetupGetSourceInfoA( + _In_ HINF InfHandle, + _In_ UINT SourceId, + _In_ UINT InfoDesired, + _Out_writes_opt_(ReturnBufferSize) PSTR ReturnBuffer, + _In_ DWORD ReturnBufferSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI +BOOL +WINAPI +SetupGetSourceInfoW( + _In_ HINF InfHandle, + _In_ UINT SourceId, + _In_ UINT InfoDesired, + _Out_writes_opt_(ReturnBufferSize) PWSTR ReturnBuffer, + _In_ DWORD ReturnBufferSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI +BOOL +WINAPI +SetupGetStringFieldA( + _In_ PINFCONTEXT Context, + _In_ DWORD FieldIndex, + _Out_writes_opt_(ReturnBufferSize) PSTR ReturnBuffer, + _In_ DWORD ReturnBufferSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI +BOOL +WINAPI +SetupGetStringFieldW( + _In_ PINFCONTEXT Context, + _In_ DWORD FieldIndex, + _Out_writes_opt_(ReturnBufferSize) PWSTR ReturnBuffer, + _In_ DWORD ReturnBufferSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI +BOOL +WINAPI +SetupGetTargetPathA( + _In_ HINF InfHandle, + _In_opt_ PINFCONTEXT InfContext, + _In_opt_ PCSTR Section, + _Out_writes_opt_(ReturnBufferSize) PSTR ReturnBuffer, + _In_ DWORD ReturnBufferSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI +BOOL +WINAPI +SetupGetTargetPathW( + _In_ HINF InfHandle, + _In_opt_ PINFCONTEXT InfContext, + _In_opt_ PCWSTR Section, + _Out_writes_opt_(ReturnBufferSize) PWSTR ReturnBuffer, + _In_ DWORD ReturnBufferSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI PVOID WINAPI SetupInitDefaultQueueCallback(_In_opt_ HWND); +WINSETUPAPI PVOID WINAPI SetupInitDefaultQueueCallbackEx(_In_opt_ HWND, _In_opt_ HWND, _In_ UINT, _Reserved_ DWORD, _Reserved_ PVOID); +WINSETUPAPI HSPFILELOG WINAPI SetupInitializeFileLogA(_In_opt_ PCSTR, _In_ DWORD); +WINSETUPAPI HSPFILELOG WINAPI SetupInitializeFileLogW(_In_opt_ PCWSTR, _In_ DWORD); +WINSETUPAPI BOOL WINAPI SetupInstallFileA(_In_opt_ HINF, _In_opt_ PINFCONTEXT, _In_opt_ PCSTR, _In_opt_ PCSTR, _In_opt_ PCSTR, _In_ DWORD, _In_opt_ PSP_FILE_CALLBACK_A, _In_opt_ PVOID); +WINSETUPAPI BOOL WINAPI SetupInstallFileW(_In_opt_ HINF, _In_opt_ PINFCONTEXT, _In_opt_ PCWSTR, _In_opt_ PCWSTR, _In_opt_ PCWSTR, _In_ DWORD, _In_opt_ PSP_FILE_CALLBACK_W, _In_opt_ PVOID); +WINSETUPAPI BOOL WINAPI SetupInstallFileExA(_In_opt_ HINF, _In_opt_ PINFCONTEXT, _In_opt_ PCSTR, _In_opt_ PCSTR, _In_opt_ PCSTR, _In_ DWORD, _In_opt_ PSP_FILE_CALLBACK_A, _In_opt_ PVOID, _Out_ PBOOL); +WINSETUPAPI BOOL WINAPI SetupInstallFileExW(_In_opt_ HINF, _In_opt_ PINFCONTEXT, _In_opt_ PCWSTR, _In_opt_ PCWSTR, _In_opt_ PCWSTR, _In_ DWORD, _In_opt_ PSP_FILE_CALLBACK_W, _In_opt_ PVOID, _Out_ PBOOL); +WINSETUPAPI BOOL WINAPI SetupInstallFilesFromInfSectionA(_In_ HINF, _In_opt_ HINF, _In_ HSPFILEQ, _In_ PCSTR, _In_opt_ PCSTR, _In_ UINT); +WINSETUPAPI BOOL WINAPI SetupInstallFilesFromInfSectionW(_In_ HINF, _In_opt_ HINF, _In_ HSPFILEQ, _In_ PCWSTR, _In_opt_ PCWSTR, _In_ UINT); +WINSETUPAPI BOOL WINAPI SetupInstallFromInfSectionA(_In_opt_ HWND, _In_ HINF, _In_ PCSTR, _In_ UINT, _In_opt_ HKEY, _In_opt_ PCSTR, _In_ UINT, _In_opt_ PSP_FILE_CALLBACK_A, _In_opt_ PVOID, _In_opt_ HDEVINFO, _In_opt_ PSP_DEVINFO_DATA); +WINSETUPAPI BOOL WINAPI SetupInstallFromInfSectionW(_In_opt_ HWND, _In_ HINF, _In_ PCWSTR, _In_ UINT, _In_opt_ HKEY, _In_opt_ PCWSTR, _In_ UINT, _In_opt_ PSP_FILE_CALLBACK_W, _In_opt_ PVOID, _In_opt_ HDEVINFO, _In_opt_ PSP_DEVINFO_DATA); +WINSETUPAPI BOOL WINAPI SetupInstallServicesFromInfSectionA(_In_ HINF, _In_ PCSTR, _In_ DWORD); +WINSETUPAPI BOOL WINAPI SetupInstallServicesFromInfSectionW(_In_ HINF, _In_ PCWSTR, _In_ DWORD); +WINSETUPAPI BOOL WINAPI SetupInstallServicesFromInfSectionExA(_In_ HINF, _In_ PCSTR, _In_ DWORD, _In_opt_ HDEVINFO, _In_opt_ PSP_DEVINFO_DATA, _Reserved_ PVOID, _Reserved_ PVOID); +WINSETUPAPI BOOL WINAPI SetupInstallServicesFromInfSectionExW(_In_ HINF, _In_ PCWSTR, _In_ DWORD, _In_opt_ HDEVINFO, _In_opt_ PSP_DEVINFO_DATA, _Reserved_ PVOID, _Reserved_ PVOID); +WINSETUPAPI BOOL WINAPI SetupIterateCabinetA(_In_ PCSTR, _Reserved_ DWORD, _In_ PSP_FILE_CALLBACK_A, _In_ PVOID); +WINSETUPAPI BOOL WINAPI SetupIterateCabinetW(_In_ PCWSTR, _Reserved_ DWORD, _In_ PSP_FILE_CALLBACK_W, _In_ PVOID); +WINSETUPAPI BOOL WINAPI SetupLogErrorA(_In_ LPCSTR, _In_ LogSeverity); +WINSETUPAPI BOOL WINAPI SetupLogErrorW(_In_ LPCWSTR, _In_ LogSeverity); +WINSETUPAPI BOOL WINAPI SetupLogFileA(_In_ HSPFILELOG, _In_opt_ PCSTR, _In_ PCSTR, _In_ PCSTR, _In_ DWORD, _In_opt_ PCSTR, _In_opt_ PCSTR, _In_opt_ PCSTR, _In_ DWORD); +WINSETUPAPI BOOL WINAPI SetupLogFileW(_In_ HSPFILELOG, _In_opt_ PCWSTR, _In_ PCWSTR, _In_ PCWSTR, _In_ DWORD, _In_opt_ PCWSTR, _In_opt_ PCWSTR, _In_opt_ PCWSTR, _In_ DWORD); + +WINSETUPAPI +BOOL +WINAPI +SetupOpenAppendInfFileA( + _In_opt_ PCSTR FileName, + _In_ HINF InfHandle, + _Out_opt_ PUINT ErrorLine); + +WINSETUPAPI +BOOL +WINAPI +SetupOpenAppendInfFileW( + _In_opt_ PCWSTR FileName, + _In_ HINF InfHandle, + _Out_opt_ PUINT ErrorLine); + WINSETUPAPI HSPFILEQ WINAPI SetupOpenFileQueue(VOID); -WINSETUPAPI HINF WINAPI SetupOpenInfFileA(PCSTR,PCSTR,DWORD,PUINT); -WINSETUPAPI HINF WINAPI SetupOpenInfFileW(PCWSTR,PCWSTR,DWORD,PUINT); -WINSETUPAPI BOOL WINAPI SetupOpenLog(BOOL); + +WINSETUPAPI +HINF +WINAPI +SetupOpenInfFileA( + _In_ PCSTR FileName, + _In_opt_ PCSTR InfClass, + _In_ DWORD InfStyle, + _Out_opt_ PUINT ErrorLine); + +WINSETUPAPI +HINF +WINAPI +SetupOpenInfFileW( + _In_ PCWSTR FileName, + _In_opt_ PCWSTR InfClass, + _In_ DWORD InfStyle, + _Out_opt_ PUINT ErrorLine); + +WINSETUPAPI BOOL WINAPI SetupOpenLog(_In_ BOOL); WINSETUPAPI HINF WINAPI SetupOpenMasterInf(VOID); -WINSETUPAPI UINT WINAPI SetupPromptForDiskA(HWND,PCSTR,PCSTR,PCSTR,PCSTR,PCSTR,DWORD,PSTR,DWORD,PDWORD); -WINSETUPAPI UINT WINAPI SetupPromptForDiskW(HWND,PCWSTR,PCWSTR,PCWSTR,PCWSTR,PCWSTR,DWORD,PWSTR,DWORD,PDWORD); -WINSETUPAPI INT WINAPI SetupPromptReboot(HSPFILEQ,HWND,BOOL); + +WINSETUPAPI +UINT +WINAPI +SetupPromptForDiskA( + _In_ HWND hwndParent, + _In_opt_ PCSTR DialogTitle, + _In_opt_ PCSTR DiskName, + _In_opt_ PCSTR PathToSource, + _In_ PCSTR FileSought, + _In_opt_ PCSTR TagFile, + _In_ DWORD DiskPromptStyle, + _Out_writes_opt_(PathBufferSize) PSTR PathBuffer, + _In_ DWORD PathBufferSize, + _Out_opt_ PDWORD PathRequiredSize); + +WINSETUPAPI +UINT +WINAPI +SetupPromptForDiskW( + _In_ HWND hwndParent, + _In_opt_ PCWSTR DialogTitle, + _In_opt_ PCWSTR DiskName, + _In_opt_ PCWSTR PathToSource, + _In_ PCWSTR FileSought, + _In_opt_ PCWSTR TagFile, + _In_ DWORD DiskPromptStyle, + _Out_writes_opt_(PathBufferSize) PWSTR PathBuffer, + _In_ DWORD PathBufferSize, + _Out_opt_ PDWORD PathRequiredSize); + +WINSETUPAPI INT WINAPI SetupPromptReboot(_In_opt_ HSPFILEQ, _In_opt_ HWND, _In_ BOOL); WINSETUPAPI BOOL WINAPI SetupQueryA(DWORD,PCSTR**,PUINT); WINSETUPAPI BOOL WINAPI SetupQueryW(DWORD,PCWSTR**,PUINT); -WINSETUPAPI BOOL WINAPI SetupQueryDrivesInDiskSpaceListA(HDSKSPC,PSTR,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupQueryDrivesInDiskSpaceListW(HDSKSPC,PWSTR,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupQueryFileLogA(HSPFILELOG,PCSTR,PCSTR,SetupFileLogInfo,PSTR,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupQueryFileLogW(HSPFILELOG,PCWSTR,PCWSTR,SetupFileLogInfo,PWSTR,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupQueryInfFileInformationA(PSP_INF_INFORMATION,UINT,PSTR,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupQueryInfFileInformationW(PSP_INF_INFORMATION,UINT,PWSTR,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupQueryInfOriginalFileInformationA(PSP_INF_INFORMATION,UINT,PSP_ALTPLATFORM_INFO,PSP_ORIGINAL_FILE_INFO_A); -WINSETUPAPI BOOL WINAPI SetupQueryInfOriginalFileInformationW(PSP_INF_INFORMATION,UINT,PSP_ALTPLATFORM_INFO,PSP_ORIGINAL_FILE_INFO_W); -WINSETUPAPI BOOL WINAPI SetupQueryInfVersionInformationA(PSP_INF_INFORMATION,UINT,PSTR,PSTR,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupQueryInfVersionInformationW(PSP_INF_INFORMATION,UINT,PCWSTR,PWSTR,DWORD,PDWORD); -WINSETUPAPI BOOL WINAPI SetupQuerySpaceRequiredOnDriveA(HDSKSPC,PCSTR,LONGLONG*,PVOID,UINT); -WINSETUPAPI BOOL WINAPI SetupQuerySpaceRequiredOnDriveW(HDSKSPC,PCWSTR,LONGLONG*,PVOID,UINT); -WINSETUPAPI BOOL WINAPI SetupQueueCopyA(HSPFILEQ,PCSTR,PCSTR,PCSTR,PCSTR,PCSTR,PCSTR,PCSTR,DWORD); -WINSETUPAPI BOOL WINAPI SetupQueueCopyW(HSPFILEQ,PCWSTR,PCWSTR,PCWSTR,PCWSTR,PCWSTR,PCWSTR,PCWSTR,DWORD); -WINSETUPAPI BOOL WINAPI SetupQueueCopyIndirectA(PSP_FILE_COPY_PARAMS_A); -WINSETUPAPI BOOL WINAPI SetupQueueCopyIndirectW(PSP_FILE_COPY_PARAMS_W); -WINSETUPAPI BOOL WINAPI SetupQueueCopySectionA(HSPFILEQ,PCSTR,HINF,HINF,PCSTR,DWORD); -WINSETUPAPI BOOL WINAPI SetupQueueCopySectionW(HSPFILEQ,PCWSTR,HINF,HINF,PCWSTR,DWORD); -WINSETUPAPI BOOL WINAPI SetupQueueDefaultCopyA(HSPFILEQ,HINF,PCSTR,PCSTR,PCSTR,DWORD); -WINSETUPAPI BOOL WINAPI SetupQueueDefaultCopyW(HSPFILEQ,HINF,PCWSTR,PCWSTR,PCWSTR,DWORD); -WINSETUPAPI BOOL WINAPI SetupQueueDeleteA(HSPFILEQ,PCSTR,PCSTR); -WINSETUPAPI BOOL WINAPI SetupQueueDeleteW(HSPFILEQ,PCWSTR,PCWSTR); -WINSETUPAPI BOOL WINAPI SetupQueueDeleteSectionA(HSPFILEQ,HINF,HINF,PCSTR); -WINSETUPAPI BOOL WINAPI SetupQueueDeleteSectionW(HSPFILEQ,HINF,HINF,PCWSTR); -WINSETUPAPI BOOL WINAPI SetupQueueRenameA(HSPFILEQ,PCSTR,PCSTR,PCSTR,PCSTR); -WINSETUPAPI BOOL WINAPI SetupQueueRenameW(HSPFILEQ,PCWSTR,PCWSTR,PCWSTR,PCWSTR); -WINSETUPAPI BOOL WINAPI SetupQueueRenameSectionA(HSPFILEQ,HINF,HINF,PCSTR); -WINSETUPAPI BOOL WINAPI SetupQueueRenameSectionW(HSPFILEQ,HINF,HINF,PCWSTR); -WINSETUPAPI BOOL WINAPI SetupRemoveFileLogEntryA(HSPFILELOG,PCSTR,PCSTR); -WINSETUPAPI BOOL WINAPI SetupRemoveFileLogEntryW(HSPFILELOG,PCWSTR,PCWSTR); -WINSETUPAPI BOOL WINAPI SetupRemoveFromDiskSpaceListA(HDSKSPC,PCSTR,UINT,PVOID,UINT); -WINSETUPAPI BOOL WINAPI SetupRemoveFromDiskSpaceListW(HDSKSPC,PCWSTR,UINT,PVOID,UINT); -WINSETUPAPI BOOL WINAPI SetupRemoveFromSourceListA(DWORD,PCSTR); -WINSETUPAPI BOOL WINAPI SetupRemoveFromSourceListW(DWORD,PCWSTR); -WINSETUPAPI BOOL WINAPI SetupRemoveInstallSectionFromDiskSpaceListA(HDSKSPC,HINF,HINF,PCSTR,PVOID,UINT); -WINSETUPAPI BOOL WINAPI SetupRemoveInstallSectionFromDiskSpaceListW(HDSKSPC,HINF,HINF,PCWSTR,PVOID,UINT); -WINSETUPAPI BOOL WINAPI SetupRemoveSectionFromDiskSpaceListA(HDSKSPC,HINF,HINF,PCSTR,UINT,PVOID,UINT); -WINSETUPAPI BOOL WINAPI SetupRemoveSectionFromDiskSpaceListW(HDSKSPC,HINF,HINF,PCWSTR,UINT,PVOID,UINT); -WINSETUPAPI UINT WINAPI SetupRenameErrorA(HWND,PCSTR,PCSTR,PCSTR,UINT,DWORD); -WINSETUPAPI UINT WINAPI SetupRenameErrorW(HWND,PCWSTR,PCWSTR,PCWSTR,UINT,DWORD); -WINSETUPAPI BOOL WINAPI SetupScanFileQueueA(HSPFILEQ,DWORD,HWND,PSP_FILE_CALLBACK_A,PVOID,PDWORD); -WINSETUPAPI BOOL WINAPI SetupScanFileQueueW(HSPFILEQ,DWORD,HWND,PSP_FILE_CALLBACK_W,PVOID,PDWORD); -WINSETUPAPI BOOL WINAPI SetupSetDirectoryIdA(HINF,DWORD,PCSTR); -WINSETUPAPI BOOL WINAPI SetupSetDirectoryIdW(HINF,DWORD,PCWSTR); -WINSETUPAPI BOOL WINAPI SetupSetDirectoryIdExA(HINF,DWORD,PCSTR,DWORD,DWORD,PVOID); -WINSETUPAPI BOOL WINAPI SetupSetDirectoryIdExW(HINF,DWORD,PCWSTR,DWORD,DWORD,PVOID); -WINSETUPAPI BOOL WINAPI SetupSetFileQueueAlternatePlatformA(HSPFILEQ,PSP_ALTPLATFORM_INFO,PCSTR); -WINSETUPAPI BOOL WINAPI SetupSetFileQueueAlternatePlatformW(HSPFILEQ,PSP_ALTPLATFORM_INFO,PCWSTR); -WINSETUPAPI BOOL WINAPI SetupSetNonInteractiveMode(BOOL); -WINSETUPAPI BOOL WINAPI SetupSetPlatformPathOverrideA(PCSTR); -WINSETUPAPI BOOL WINAPI SetupSetPlatformPathOverrideW(PCWSTR); -WINSETUPAPI BOOL WINAPI SetupSetSourceListA(DWORD,PCSTR*,UINT); -WINSETUPAPI BOOL WINAPI SetupSetSourceListW(DWORD,PCWSTR*,UINT); -WINSETUPAPI VOID WINAPI SetupTermDefaultQueueCallback(PVOID); -WINSETUPAPI BOOL WINAPI SetupTerminateFileLog(HSPFILELOG); + +WINSETUPAPI +BOOL +WINAPI +SetupQueryDrivesInDiskSpaceListA( + _In_ HDSKSPC DiskSpace, + _Out_writes_opt_(ReturnBufferSize) PSTR ReturnBuffer, + _In_ DWORD ReturnBufferSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI +BOOL +WINAPI +SetupQueryDrivesInDiskSpaceListW( + _In_ HDSKSPC DiskSpace, + _Out_writes_opt_(ReturnBufferSize) PWSTR ReturnBuffer, + _In_ DWORD ReturnBufferSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI +BOOL +WINAPI +SetupQueryFileLogA( + _In_ HSPFILELOG FileLogHandle, + _In_opt_ PCSTR LogSectionName, + _In_ PCSTR TargetFilename, + _In_ SetupFileLogInfo DesiredInfo, + _Out_writes_opt_(ReturnBufferSize) PSTR DataOut, + _In_ DWORD ReturnBufferSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI +BOOL +WINAPI +SetupQueryFileLogW( + _In_ HSPFILELOG FileLogHandle, + _In_opt_ PCWSTR LogSectionName, + _In_ PCWSTR TargetFilename, + _In_ SetupFileLogInfo DesiredInfo, + _Out_writes_opt_(ReturnBufferSize) PWSTR DataOut, + _In_ DWORD ReturnBufferSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI +BOOL +WINAPI +SetupQueryInfFileInformationA( + _In_ PSP_INF_INFORMATION InfInformation, + _In_ UINT InfIndex, + _Out_writes_opt_(ReturnBufferSize) PSTR ReturnBuffer, + _In_ DWORD ReturnBufferSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI +BOOL +WINAPI +SetupQueryInfFileInformationW( + _In_ PSP_INF_INFORMATION InfInformation, + _In_ UINT InfIndex, + _Out_writes_opt_(ReturnBufferSize) PWSTR ReturnBuffer, + _In_ DWORD ReturnBufferSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI +BOOL +WINAPI +SetupQueryInfOriginalFileInformationA( + _In_ PSP_INF_INFORMATION InfInformation, + _In_ UINT InfIndex, + _In_opt_ PSP_ALTPLATFORM_INFO AlternatePlatformInfo, + _Out_ PSP_ORIGINAL_FILE_INFO_A OriginalFileInfo); + +WINSETUPAPI +BOOL +WINAPI +SetupQueryInfOriginalFileInformationW( + _In_ PSP_INF_INFORMATION InfInformation, + _In_ UINT InfIndex, + _In_opt_ PSP_ALTPLATFORM_INFO AlternatePlatformInfo, + _Out_ PSP_ORIGINAL_FILE_INFO_W OriginalFileInfo); + +WINSETUPAPI +BOOL +WINAPI +SetupQueryInfVersionInformationA( + _In_ PSP_INF_INFORMATION InfInformation, + _In_ UINT InfIndex, + _In_opt_ PCSTR Key, + _Out_writes_opt_(ReturnBufferSize) PSTR ReturnBuffer, + _In_ DWORD ReturnBufferSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI +BOOL +WINAPI +SetupQueryInfVersionInformationW( + _In_ PSP_INF_INFORMATION InfInformation, + _In_ UINT InfIndex, + _In_opt_ PCWSTR Key, + _Out_writes_opt_(ReturnBufferSize) PWSTR ReturnBuffer, + _In_ DWORD ReturnBufferSize, + _Out_opt_ PDWORD RequiredSize); + +WINSETUPAPI BOOL WINAPI SetupQuerySpaceRequiredOnDriveA(_In_ HDSKSPC, _In_ PCSTR, _Out_ LONGLONG*, _Reserved_ PVOID, _Reserved_ UINT); +WINSETUPAPI BOOL WINAPI SetupQuerySpaceRequiredOnDriveW(_In_ HDSKSPC, _In_ PCWSTR, _Out_ LONGLONG*, _Reserved_ PVOID, _Reserved_ UINT); +WINSETUPAPI BOOL WINAPI SetupQueueCopyA(_In_ HSPFILEQ, _In_opt_ PCSTR, _In_opt_ PCSTR, _In_ PCSTR, _In_opt_ PCSTR, _In_opt_ PCSTR, _In_ PCSTR, _In_opt_ PCSTR, _In_ DWORD); +WINSETUPAPI BOOL WINAPI SetupQueueCopyW(_In_ HSPFILEQ, _In_opt_ PCWSTR, _In_opt_ PCWSTR, _In_ PCWSTR, _In_opt_ PCWSTR, _In_opt_ PCWSTR, _In_ PCWSTR, _In_opt_ PCWSTR, _In_ DWORD); +WINSETUPAPI BOOL WINAPI SetupQueueCopyIndirectA(_In_ PSP_FILE_COPY_PARAMS_A); +WINSETUPAPI BOOL WINAPI SetupQueueCopyIndirectW(_In_ PSP_FILE_COPY_PARAMS_W); +WINSETUPAPI BOOL WINAPI SetupQueueCopySectionA(_In_ HSPFILEQ, _In_opt_ PCSTR, _In_ HINF, _In_opt_ HINF, _In_ PCSTR, _In_ DWORD); +WINSETUPAPI BOOL WINAPI SetupQueueCopySectionW(_In_ HSPFILEQ, _In_opt_ PCWSTR, _In_ HINF, _In_opt_ HINF, _In_ PCWSTR, _In_ DWORD); +WINSETUPAPI BOOL WINAPI SetupQueueDefaultCopyA(_In_ HSPFILEQ, _In_ HINF, _In_opt_ PCSTR, _In_ PCSTR, _In_opt_ PCSTR, _In_ DWORD); +WINSETUPAPI BOOL WINAPI SetupQueueDefaultCopyW(_In_ HSPFILEQ, _In_ HINF, _In_opt_ PCWSTR, _In_ PCWSTR, _In_opt_ PCWSTR, _In_ DWORD); +WINSETUPAPI BOOL WINAPI SetupQueueDeleteA(_In_ HSPFILEQ, _In_ PCSTR, _In_opt_ PCSTR); +WINSETUPAPI BOOL WINAPI SetupQueueDeleteW(_In_ HSPFILEQ, _In_ PCWSTR, _In_opt_ PCWSTR); +WINSETUPAPI BOOL WINAPI SetupQueueDeleteSectionA(_In_ HSPFILEQ, _In_ HINF, _In_opt_ HINF, _In_ PCSTR); +WINSETUPAPI BOOL WINAPI SetupQueueDeleteSectionW(_In_ HSPFILEQ, _In_ HINF, _In_opt_ HINF, _In_ PCWSTR); +WINSETUPAPI BOOL WINAPI SetupQueueRenameA(_In_ HSPFILEQ, _In_ PCSTR, _In_opt_ PCSTR, _In_opt_ PCSTR, _In_ PCSTR); +WINSETUPAPI BOOL WINAPI SetupQueueRenameW(_In_ HSPFILEQ, _In_ PCWSTR, _In_opt_ PCWSTR, _In_opt_ PCWSTR, _In_ PCWSTR); +WINSETUPAPI BOOL WINAPI SetupQueueRenameSectionA(_In_ HSPFILEQ, _In_ HINF, _In_opt_ HINF, _In_ PCSTR); +WINSETUPAPI BOOL WINAPI SetupQueueRenameSectionW(_In_ HSPFILEQ, _In_ HINF, _In_opt_ HINF, _In_ PCWSTR); +WINSETUPAPI BOOL WINAPI SetupRemoveFileLogEntryA(_In_ HSPFILELOG, _In_opt_ PCSTR, _In_opt_ PCSTR); +WINSETUPAPI BOOL WINAPI SetupRemoveFileLogEntryW(_In_ HSPFILELOG, _In_opt_ PCWSTR, _In_opt_ PCWSTR); +WINSETUPAPI BOOL WINAPI SetupRemoveFromDiskSpaceListA(_In_ HDSKSPC, _In_ PCSTR, _In_ UINT, _Reserved_ PVOID, _Reserved_ UINT); +WINSETUPAPI BOOL WINAPI SetupRemoveFromDiskSpaceListW(_In_ HDSKSPC, _In_ PCWSTR, _In_ UINT, _Reserved_ PVOID, _Reserved_ UINT); +WINSETUPAPI BOOL WINAPI SetupRemoveFromSourceListA(_In_ DWORD, _In_ PCSTR); +WINSETUPAPI BOOL WINAPI SetupRemoveFromSourceListW(_In_ DWORD, _In_ PCWSTR); +WINSETUPAPI BOOL WINAPI SetupRemoveInstallSectionFromDiskSpaceListA(_In_ HDSKSPC, _In_ HINF, _In_opt_ HINF, _In_ PCSTR, _Reserved_ PVOID, _Reserved_ UINT); +WINSETUPAPI BOOL WINAPI SetupRemoveInstallSectionFromDiskSpaceListW(_In_ HDSKSPC, _In_ HINF, _In_opt_ HINF, _In_ PCWSTR, _Reserved_ PVOID, _Reserved_ UINT); +WINSETUPAPI BOOL WINAPI SetupRemoveSectionFromDiskSpaceListA(_In_ HDSKSPC, _In_ HINF, _In_opt_ HINF, _In_ PCSTR, _In_ UINT, _Reserved_ PVOID, _Reserved_ UINT); +WINSETUPAPI BOOL WINAPI SetupRemoveSectionFromDiskSpaceListW(_In_ HDSKSPC, _In_ HINF, _In_opt_ HINF, _In_ PCWSTR, _In_ UINT, _Reserved_ PVOID, _Reserved_ UINT); +WINSETUPAPI UINT WINAPI SetupRenameErrorA(_In_ HWND, _In_opt_ PCSTR, _In_ PCSTR, _In_ PCSTR, _In_ UINT, _In_ DWORD); +WINSETUPAPI UINT WINAPI SetupRenameErrorW(_In_ HWND, _In_opt_ PCWSTR, _In_ PCWSTR, _In_ PCWSTR, _In_ UINT, _In_ DWORD); +WINSETUPAPI BOOL WINAPI SetupScanFileQueueA(_In_ HSPFILEQ, _In_ DWORD, _In_opt_ HWND, _In_opt_ PSP_FILE_CALLBACK_A, _In_opt_ PVOID, _Out_ PDWORD); +WINSETUPAPI BOOL WINAPI SetupScanFileQueueW(_In_ HSPFILEQ, _In_ DWORD, _In_opt_ HWND, _In_opt_ PSP_FILE_CALLBACK_W, _In_opt_ PVOID, _Out_ PDWORD); +WINSETUPAPI BOOL WINAPI SetupSetDirectoryIdA(_In_ HINF, _In_ DWORD, _In_opt_ PCSTR); +WINSETUPAPI BOOL WINAPI SetupSetDirectoryIdW(_In_ HINF, _In_ DWORD, _In_opt_ PCWSTR); +WINSETUPAPI BOOL WINAPI SetupSetDirectoryIdExA(_In_ HINF, _In_ DWORD, _In_opt_ PCSTR, _In_ DWORD, _Reserved_ DWORD, _Reserved_ PVOID); +WINSETUPAPI BOOL WINAPI SetupSetDirectoryIdExW(_In_ HINF, _In_ DWORD, _In_opt_ PCWSTR, _In_ DWORD, _Reserved_ DWORD, _Reserved_ PVOID); +WINSETUPAPI BOOL WINAPI SetupSetFileQueueAlternatePlatformA(_In_ HSPFILEQ, _In_opt_ PSP_ALTPLATFORM_INFO, _In_opt_ PCSTR); +WINSETUPAPI BOOL WINAPI SetupSetFileQueueAlternatePlatformW(_In_ HSPFILEQ, _In_opt_ PSP_ALTPLATFORM_INFO, _In_opt_ PCWSTR); +WINSETUPAPI BOOL WINAPI SetupSetNonInteractiveMode(_In_ BOOL); +WINSETUPAPI BOOL WINAPI SetupSetPlatformPathOverrideA(_In_opt_ PCSTR); +WINSETUPAPI BOOL WINAPI SetupSetPlatformPathOverrideW(_In_opt_ PCWSTR); + +WINSETUPAPI +BOOL +WINAPI +SetupSetSourceListA( + _In_ DWORD Flags, + _In_reads_(SourceCount) PCSTR *SourceList, + _In_ UINT SourceCount); + +WINSETUPAPI +BOOL +WINAPI +SetupSetSourceListW( + _In_ DWORD Flags, + _In_reads_(SourceCount) PCWSTR *SourceList, + _In_ UINT SourceCount); + +WINSETUPAPI VOID WINAPI SetupTermDefaultQueueCallback(_In_ PVOID); +WINSETUPAPI BOOL WINAPI SetupTerminateFileLog(_In_ HSPFILELOG); WINSETUPAPI DWORD WINAPI StampFileSecurity(PCWSTR, PSECURITY_DESCRIPTOR);

1 0

[tkreuzer] 58349: [HAL] Add more missing asm dependencies
by tkreuzer＠svn.reactos.org 22 Feb '13

22 Feb '13

Author: tkreuzer Date: Fri Feb 22 13:41:29 2013 New Revision: 58349 URL: http://svn.reactos.org/svn/reactos?rev=58349&view=rev Log: [HAL] Add more missing asm dependencies Modified: trunk/reactos/hal/halx86/CMakeLists.txt Modified: trunk/reactos/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/CMakeLists.txt?… ============================================================================== --- trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] Fri Feb 22 13:41:29 2013 @@ -125,6 +125,7 @@ if(NOT MSVC AND (CMAKE_VERSION VERSION_GREATER 2.8.7)) add_library(lib_hal_pic OBJECT ${HAL_PIC_SOURCE} ${HAL_PIC_ASM_SOURCE}) + add_dependencies(lib_hal_pic asm) endif() list(APPEND MINI_HAL_SOURCE @@ -183,7 +184,7 @@ target_link_libraries(hal libcntpr) add_importlibs(hal ntoskrnl) #add_pch(hal include/hal.h) - add_dependencies(hal psdk bugcodes) + add_dependencies(hal psdk bugcodes asm) set_entrypoint(hal HalInitSystem 8) set_subsystem(hal native) set_image_base(hal 0x00010000)

1 0

[tkreuzer] 58348: [PSDK] Add some more annotations to driverspecs.h
by tkreuzer＠svn.reactos.org 22 Feb '13

22 Feb '13

Author: tkreuzer Date: Fri Feb 22 12:58:06 2013 New Revision: 58348 URL: http://svn.reactos.org/svn/reactos?rev=58348&view=rev Log: [PSDK] Add some more annotations to driverspecs.h Modified: trunk/reactos/include/psdk/driverspecs.h trunk/reactos/include/psdk/sal.h Modified: trunk/reactos/include/psdk/driverspecs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/driverspecs.h… ============================================================================== --- trunk/reactos/include/psdk/driverspecs.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/driverspecs.h [iso-8859-1] Fri Feb 22 12:58:06 2013 @@ -34,7 +34,7 @@ #define _IRQL_uses_cancel_ #define __drv_setsIRQL(irql) -#define _Dispatch_type_ _Function_class_ +#define _Dispatch_type_ _Function_class_ #define _Kernel_clear_do_init_(yesNo) _Post_ _SA_annotes1(SAL_clearDoInit,yesNo) #define _Kernel_float_restored_ _Post_ _SA_annotes0(SAL_floatRestored) #define _Kernel_float_saved_ _Post_ _SA_annotes0(SAL_floatSaved) @@ -45,44 +45,44 @@ #define _Kernel_requires_resource_not_held_(kind) _Pre_ _SA_annotes1(SAL_neverHold, #kind) #define _Kernel_acquires_resource_(kind) _Post_ _SA_annotes1(SAL_acquire, #kind) -#define __drv_acquiresCancelSpinLock -#define __drv_acquiresCriticalRegion -#define __drv_acquiresExclusiveResource(kind) -#define __drv_acquiresExclusiveResourceGlobal(kind,param) -#define __drv_acquiresPriorityRegion -#define __drv_acquiresResource(kind) -#define __drv_acquiresResourceGlobal(kind,param) -#define __drv_aliasesMem _Post_ _SA_annotes0(SAL_IsAliased) -#define __drv_allocatesMem(kind) _Post_ _SA_annotes1(SAL_NeedsRelease,__yes) -#define __drv_arg(expr,annotes) _At_(expr,annotes) -#define __drv_at(expr,annotes) _At_(expr,annotes) -#define __drv_callbackType(kind) _SA_annotes1(SAL_callbackType, #kind) -#define __drv_clearDoInit -#define __drv_completionType(kindlist) -#define __drv_constant -#define __drv_defined(x) -#define __drv_deref(annotes) -#define __drv_dispatchType_other -#define __drv_dispatchType(x) -#define __drv_floatRestored -#define __drv_floatSaved -#define __drv_floatUsed -#define __drv_formatString(kind) -#define __drv_freesMem(kind) _Post_ _SA_annotes1(SAL_NeedsRelease,__no) -#define __drv_fun(annotes) -#define __drv_functionClass -#define __drv_holdsCancelSpinLock() _Holds_resource_global_("CancelSpinLock",) -#define __drv_holdsCriticalRegion() _Holds_resource_global_("CriticalRegion",) -#define __drv_holdsPriorityRegion() _Holds_resource_global_("PriorityRegion",) -#define __drv_in_deref(annotes) -#define __drv_in(annotes) -#define __drv_innerAcquiresGlobal(kind,param) +#define __drv_acquiresCancelSpinLock _Acquires_nonreentrant_lock_(_Global_cancel_spin_lock_) +#define __drv_acquiresCriticalRegion _Acquires_lock_(_Global_critical_region_) +#define __drv_acquiresExclusiveResource(kind) _Acquires_nonreentrant_lock_(_Curr_) +#define __drv_acquiresExclusiveResourceGlobal(kind,param) _Acquires_nonreentrant_lock_(param) +#define __drv_acquiresPriorityRegion _Acquires_lock_(_Global_priority_region_) +#define __drv_acquiresResource(kind) _Acquires_lock_(_Curr_) +#define __drv_acquiresResourceGlobal(kind,param) _Acquires_lock_(param) +#define __drv_aliasesMem _Post_ _SA_annotes0(SAL_IsAliased) +#define __drv_allocatesMem(kind) _Post_ _SA_annotes1(SAL_NeedsRelease,__yes) +#define __drv_arg(expr,annotes) _At_(expr,annotes) +#define __drv_at(expr,annotes) _At_(expr,annotes) +#define __drv_callbackType(kind) _SA_annotes1(SAL_callbackType, #kind) +#define __drv_clearDoInit _Kernel_clear_do_init_ +#define __drv_completionType(kindlist) _SA_annotes1(SAL_completionType, #kindlist) +#define __drv_constant _Literal_ +#define __drv_defined(x) _Macro_defined_(#x) +#define __drv_deref(annotes) __deref _Group_(annotes) +#define __drv_dispatchType_other _Dispatch_type_(IRP_MJ_OTHER) +#define __drv_dispatchType(x) _Dispatch_type_(x) +#define __drv_floatRestored _Kernel_float_restored_ +#define __drv_floatSaved _Kernel_float_saved_ +#define __drv_floatUsed _Kernel_float_used_ +#define __drv_formatString(kind) _SA_annotes1(SAL_IsFormatString, #kind) +#define __drv_freesMem(kind) _Post_ _SA_annotes1(SAL_NeedsRelease,__no) +#define __drv_fun(annotes) _At_(return, annotes) +#define __drv_functionClass _Function_class_ +#define __drv_holdsCancelSpinLock() _Holds_resource_global_("CancelSpinLock",) +#define __drv_holdsCriticalRegion() _Holds_resource_global_("CriticalRegion",) +#define __drv_holdsPriorityRegion() _Holds_resource_global_("PriorityRegion",) +#define __drv_in_deref(annotes) _Pre_ __deref _Group_(annotes) +#define __drv_in(annotes) _Pre_ _Group_(annotes) +#define __drv_innerAcquiresGlobal(kind,param) _Post_ _SA_annotes2(SAL_acquireGlobal, #kind, param\t) #define __drv_innerMustHoldGlobal(kind,param) #define __drv_innerNeverHoldGlobal(kind,param) #define __drv_innerReleasesGlobal(kind,param) #define __drv_interlocked #define __drv_IoGetDmaAdapter -#define __drv_isCancelIRQL _IRQL_is_cancel_ +#define __drv_isCancelIRQL _IRQL_is_cancel_ #define __drv_isObjectPointer #define __drv_KMDF #define __drv_maxFunctionIRQL Modified: trunk/reactos/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal.h?rev=583… ============================================================================== --- trunk/reactos/include/psdk/sal.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sal.h [iso-8859-1] Fri Feb 22 12:58:06 2013 @@ -35,7 +35,7 @@ #endif // ] /* Check for deprecated use of declspecs for sal */ -#if _USE_DECLSPECS_FOR_SAL // [ +#if defined(_USE_DECLSPECS_FOR_SAL) && _USE_DECLSPECS_FOR_SAL // [ #pragma message("declspecs for sal are deprecated.") #ifdef _PREFAST_ // [ #error Support for _USE_DECLSPECS_FOR_SAL is dropped

1 0

[dgorbachev] 58347: [TRANSLATION] Update/add Hebrew translations. Baruch Rutman (peterooch~AT~gmail~DOT~com).
by dgorbachev＠svn.reactos.org 21 Feb '13

21 Feb '13

Author: dgorbachev Date: Thu Feb 21 17:36:53 2013 New Revision: 58347 URL: http://svn.reactos.org/svn/reactos?rev=58347&view=rev Log: [TRANSLATION] Update/add Hebrew translations. Baruch Rutman (peterooch~AT~gmail~DOT~com). Added: trunk/reactos/base/shell/explorer/explorer-he.rc (with props) trunk/reactos/dll/win32/oledlg/oledlg_He.rc (with props) trunk/reactos/dll/win32/rasdlg/lang/he-IL.rc (with props) trunk/reactos/dll/win32/serialui/lang/he-IL.rc (with props) trunk/reactos/dll/win32/setupapi/lang/he-IL.rc (with props) trunk/reactos/dll/win32/shdoclc/He.rc (with props) trunk/reactos/dll/win32/shell32/lang/he-IL.rc (with props) trunk/reactos/dll/win32/shimgvw/lang/he-IL.rc (with props) trunk/reactos/dll/win32/shlwapi/shlwapi_He.rc (with props) trunk/reactos/dll/win32/syssetup/lang/he-IL.rc (with props) trunk/reactos/dll/win32/tapiui/lang/he-IL.rc (with props) trunk/reactos/dll/win32/userenv/lang/he-IL.rc (with props) trunk/reactos/dll/win32/wldap32/wldap32_He.rc (with props) trunk/reactos/win32ss/user/user32/lang/he-IL.rc (with props) trunk/reactos/win32ss/user/win32csr/lang/he-IL.rc (with props) Modified: trunk/reactos/base/applications/calc/lang/he-IL.rc trunk/reactos/base/applications/games/solitaire/lang/he-IL.rc trunk/reactos/base/applications/games/winmine/lang/he-IL.rc trunk/reactos/base/applications/msconfig/lang/he-IL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc trunk/reactos/base/applications/mscutils/servman/lang/he-IL.rc trunk/reactos/base/applications/mspaint/lang/he-IL.rc trunk/reactos/base/applications/mstsc/lang/en-US.rc trunk/reactos/base/applications/mstsc/lang/he-IL.rc trunk/reactos/base/applications/notepad/lang/he-IL.rc trunk/reactos/base/applications/rapps/lang/he-IL.rc trunk/reactos/base/applications/regedit/lang/he-IL.rc trunk/reactos/base/applications/screensavers/3dtext/lang/he-IL.rc trunk/reactos/base/applications/shutdown/lang/he-IL.rc trunk/reactos/base/applications/sndvol32/lang/en-US.rc trunk/reactos/base/applications/sndvol32/lang/he-IL.rc trunk/reactos/base/applications/taskmgr/lang/he-IL.rc trunk/reactos/base/applications/wordpad/He.rc trunk/reactos/base/setup/reactos/lang/en-US.rc trunk/reactos/base/setup/reactos/lang/he-IL.rc trunk/reactos/base/setup/usetup/lang/he-IL.h trunk/reactos/base/setup/vmwinst/lang/he-IL.rc trunk/reactos/base/shell/explorer-new/lang/he-IL.rc trunk/reactos/base/shell/explorer/explorer_intres.rc trunk/reactos/base/system/winlogon/lang/he-IL.rc trunk/reactos/dll/cpl/console/lang/he-IL.rc trunk/reactos/dll/cpl/desk/lang/he-IL.rc trunk/reactos/dll/cpl/joy/rsrc.rc trunk/reactos/dll/cpl/main/rsrc.rc trunk/reactos/dll/cpl/powercfg/rsrc.rc trunk/reactos/dll/cpl/usrmgr/rsrc.rc trunk/reactos/dll/keyboard/kbdheb/kbdheb.c trunk/reactos/dll/shellext/deskadp/lang/he-IL.rc trunk/reactos/dll/win32/browseui/browseui.rc trunk/reactos/dll/win32/browseui/lang/he-IL.rc trunk/reactos/dll/win32/comctl32/comctl_He.rc trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc trunk/reactos/dll/win32/cryptui/cryptui.rc trunk/reactos/dll/win32/msgina/lang/he-IL.rc trunk/reactos/dll/win32/oledlg/rsrc.rc trunk/reactos/dll/win32/rasdlg/rasdlg.rc trunk/reactos/dll/win32/serialui/serialui.rc trunk/reactos/dll/win32/setupapi/setupapi.rc trunk/reactos/dll/win32/shdoclc/rsrc.rc trunk/reactos/dll/win32/shell32/shell32.rc trunk/reactos/dll/win32/shimgvw/rsrc.rc trunk/reactos/dll/win32/shlwapi/shlwapi.rc trunk/reactos/dll/win32/syssetup/syssetup.rc trunk/reactos/dll/win32/tapiui/tapiui.rc trunk/reactos/dll/win32/userenv/userenv.rc trunk/reactos/dll/win32/wldap32/wldap32.rc trunk/reactos/win32ss/user/user32/user32.rc trunk/reactos/win32ss/user/win32csr/rsrc.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/calc/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/games/solitaire/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/winmine/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/msconfig/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mspaint/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mstsc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… Modified: trunk/reactos/base/applications/mstsc/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… Modified: trunk/reactos/base/applications/notepad/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/rapps/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/regedit/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/screensavers/3dtext/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/shutdown/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… Modified: trunk/reactos/base/applications/sndvol32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/taskmgr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/wordpad/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/setup/reactos/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/en… Modified: trunk/reactos/base/setup/reactos/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/he… Modified: trunk/reactos/base/setup/usetup/lang/he-IL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/he-… Modified: trunk/reactos/base/setup/vmwinst/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/he… Modified: trunk/reactos/base/shell/explorer-new/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… Added: trunk/reactos/base/shell/explorer/explorer-he.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… Modified: trunk/reactos/base/shell/explorer/explorer_intres.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… Modified: trunk/reactos/base/system/winlogon/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… Modified: trunk/reactos/dll/cpl/console/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/he-IL… Modified: trunk/reactos/dll/cpl/desk/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/he-IL.rc… Modified: trunk/reactos/dll/cpl/joy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/rsrc.rc?rev=58… Modified: trunk/reactos/dll/cpl/main/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/rsrc.rc?rev=5… Modified: trunk/reactos/dll/cpl/powercfg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/rsrc.rc?r… Modified: trunk/reactos/dll/cpl/usrmgr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/rsrc.rc?rev… Modified: trunk/reactos/dll/keyboard/kbdheb/kbdheb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdheb/kbdheb… Modified: trunk/reactos/dll/shellext/deskadp/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… Modified: trunk/reactos/dll/win32/browseui/browseui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… Modified: trunk/reactos/dll/win32/browseui/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/he… Modified: trunk/reactos/dll/win32/comctl32/comctl_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… Modified: trunk/reactos/dll/win32/cryptui/cryptui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… Modified: trunk/reactos/dll/win32/msgina/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/he-I… Added: trunk/reactos/dll/win32/oledlg/oledlg_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_He… Modified: trunk/reactos/dll/win32/oledlg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/rsrc.rc?r… Added: trunk/reactos/dll/win32/rasdlg/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/he-I… Modified: trunk/reactos/dll/win32/rasdlg/rasdlg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/rasdlg.rc… Added: trunk/reactos/dll/win32/serialui/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/lang/he… Modified: trunk/reactos/dll/win32/serialui/serialui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/serialu… Added: trunk/reactos/dll/win32/setupapi/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/he… Modified: trunk/reactos/dll/win32/setupapi/setupapi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… Added: trunk/reactos/dll/win32/shdoclc/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/He.rc?re… Modified: trunk/reactos/dll/win32/shdoclc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/rsrc.rc?… Added: trunk/reactos/dll/win32/shell32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/he-… Modified: trunk/reactos/dll/win32/shell32/shell32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… Added: trunk/reactos/dll/win32/shimgvw/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/he-… Modified: trunk/reactos/dll/win32/shimgvw/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/rsrc.rc?… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.… Added: trunk/reactos/dll/win32/shlwapi/shlwapi_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Added: trunk/reactos/dll/win32/syssetup/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/he… Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… Added: trunk/reactos/dll/win32/tapiui/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/he-I… Modified: trunk/reactos/dll/win32/tapiui/tapiui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/tapiui.rc… Added: trunk/reactos/dll/win32/userenv/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/he-… Modified: trunk/reactos/dll/win32/userenv/userenv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/userenv.… Modified: trunk/reactos/dll/win32/wldap32/wldap32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32.… Added: trunk/reactos/dll/win32/wldap32/wldap32_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_… Added: trunk/reactos/win32ss/user/user32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/h… Modified: trunk/reactos/win32ss/user/user32/user32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/user32… Added: trunk/reactos/win32ss/user/win32csr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/win32csr/lang… Modified: trunk/reactos/win32ss/user/win32csr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/win32csr/rsrc…

1 0

[gadamopoulos] 58346: [win32k] - Implement NtUserLockWorkStation [winlogon] - Handle LN_LOCK_WORKSTATION case of the WM_LOGONNOTIFY message
by gadamopoulos＠svn.reactos.org 21 Feb '13

21 Feb '13

Author: gadamopoulos Date: Thu Feb 21 17:27:08 2013 New Revision: 58346 URL: http://svn.reactos.org/svn/reactos?rev=58346&view=rev Log: [win32k] - Implement NtUserLockWorkStation [winlogon] - Handle LN_LOCK_WORKSTATION case of the WM_LOGONNOTIFY message Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/win32ss/user/ntuser/ntstubs.c trunk/reactos/win32ss/user/ntuser/winsta.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Thu Feb 21 17:27:08 2013 @@ -1174,6 +1174,11 @@ inScrn = FALSE; break; } + case LN_LOCK_WORKSTATION: + { + DoGenericAction(Session, WLX_SAS_ACTION_LOCK_WKSTA); + break; + } default: { ERR("WM_LOGONNOTIFY case %d is unimplemented\n", wParam); Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Thu Feb 21 17:27:08 2013 @@ -301,15 +301,6 @@ DWORD Unknown9, DWORD Unknown10, DWORD Unknown11) -{ - STUB - - return 0; -} - -BOOL -APIENTRY -NtUserLockWorkStation(VOID) { STUB Modified: trunk/reactos/win32ss/user/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] Thu Feb 21 17:27:08 2013 @@ -1320,4 +1320,27 @@ return TRUE; } +BOOL +APIENTRY +NtUserLockWorkStation(VOID) +{ + BOOL ret; + PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); + + UserEnterExclusive(); + + if (pti->rpdesk == IntGetActiveDesktop()) + { + ret = UserPostMessage(hwndSAS, WM_LOGONNOTIFY, LN_LOCK_WORKSTATION, 0); + } + else + { + ret = FALSE; + } + + UserLeave(); + + return ret; +} + /* EOF */

1 0

[hbelusca] 58345: [PSDK] - Add ENABLE_INSERT_MODE, ENABLE_QUICK_EDIT_MODE and ENABLE_EXTENDED_FLAGS flags. - Add GetConsoleAliasExesA/W and GetConsoleAliasExesLengthA/W api definitions. [DOSKEY] Re...
by hbelusca＠svn.reactos.org 20 Feb '13

20 Feb '13

Author: hbelusca Date: Wed Feb 20 22:28:14 2013 New Revision: 58345 URL: http://svn.reactos.org/svn/reactos?rev=58345&view=rev Log: [PSDK] - Add ENABLE_INSERT_MODE, ENABLE_QUICK_EDIT_MODE and ENABLE_EXTENDED_FLAGS flags. - Add GetConsoleAliasExesA/W and GetConsoleAliasExesLengthA/W api definitions. [DOSKEY] Remove unneeded definitions since now these are declared in the psdk. Modified: branches/ros-csrss/base/applications/cmdutils/doskey/doskey.h branches/ros-csrss/include/psdk/wincon.h Modified: branches/ros-csrss/base/applications/cmdutils/doskey/doskey.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/cmd… ============================================================================== --- branches/ros-csrss/base/applications/cmdutils/doskey/doskey.h [iso-8859-1] (original) +++ branches/ros-csrss/base/applications/cmdutils/doskey/doskey.h [iso-8859-1] Wed Feb 20 22:28:14 2013 @@ -2,48 +2,3 @@ #define IDS_HELP 0 #define IDS_INVALID_MACRO_DEF 1 - -#ifndef RC_INVOKED - -#ifdef UNICODE -#define TNAME(x) x##W -#else -#define TNAME(x) x##A -#endif - -/* Missing from include/psdk/wincon.h */ -#ifndef ENABLE_INSERT_MODE -#define ENABLE_INSERT_MODE 0x20 -#endif -#ifndef ENABLE_EXTENDED_FLAGS -#define ENABLE_EXTENDED_FLAGS 0x80 -#endif - -/* Undocumented APIs */ -#ifndef AddConsoleAlias -BOOL WINAPI AddConsoleAliasA(LPSTR, LPSTR, LPSTR); -BOOL WINAPI AddConsoleAliasW(LPWSTR, LPWSTR, LPWSTR); -#define AddConsoleAlias TNAME(AddConsoleAlias) -#endif -#ifndef GetConsoleAliases -DWORD WINAPI GetConsoleAliasesA(LPSTR, DWORD, LPSTR); -DWORD WINAPI GetConsoleAliasesW(LPWSTR, DWORD, LPWSTR); -#define GetConsoleAliases TNAME(GetConsoleAliases) -#endif -#ifndef GetConsoleAliasesLength -DWORD WINAPI GetConsoleAliasesLengthA(LPSTR); -DWORD WINAPI GetConsoleAliasesLengthW(LPWSTR); -#define GetConsoleAliasesLength TNAME(GetConsoleAliasesLength) -#endif -#ifndef GetConsoleAliasExes -DWORD WINAPI GetConsoleAliasExesA(LPSTR, DWORD); -DWORD WINAPI GetConsoleAliasExesW(LPWSTR, DWORD); -#define GetConsoleAliasExes TNAME(GetConsoleAliasExes) -#endif -#ifndef GetConsoleAliasExesLength -DWORD WINAPI GetConsoleAliasExesLengthA(VOID); -DWORD WINAPI GetConsoleAliasExesLengthW(VOID); -#define GetConsoleAliasExesLength TNAME(GetConsoleAliasExesLength) -#endif - -#endif /* RC_INVOKED */ Modified: branches/ros-csrss/include/psdk/wincon.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/wincon.h… ============================================================================== --- branches/ros-csrss/include/psdk/wincon.h [iso-8859-1] (original) +++ branches/ros-csrss/include/psdk/wincon.h [iso-8859-1] Wed Feb 20 22:28:14 2013 @@ -14,26 +14,45 @@ #pragma warning(disable:4820) #endif -#define FOREGROUND_BLUE 1 -#define FOREGROUND_GREEN 2 -#define FOREGROUND_RED 4 -#define FOREGROUND_INTENSITY 8 -#define BACKGROUND_BLUE 16 -#define BACKGROUND_GREEN 32 -#define BACKGROUND_RED 64 -#define BACKGROUND_INTENSITY 128 -#define CTRL_C_EVENT 0 -#define CTRL_BREAK_EVENT 1 -#define CTRL_CLOSE_EVENT 2 -#define CTRL_LOGOFF_EVENT 5 +/* + * Color attributes for text and screen background + */ +#define FOREGROUND_BLUE 0x0001 +#define FOREGROUND_GREEN 0x0002 +#define FOREGROUND_RED 0x0004 +#define FOREGROUND_INTENSITY 0x0008 +#define BACKGROUND_BLUE 0x0010 +#define BACKGROUND_GREEN 0x0020 +#define BACKGROUND_RED 0x0040 +#define BACKGROUND_INTENSITY 0x0080 + +/* + * Control handler codes + */ +#define CTRL_C_EVENT 0 +#define CTRL_BREAK_EVENT 1 +#define CTRL_CLOSE_EVENT 2 +#define CTRL_LOGOFF_EVENT 5 #define CTRL_SHUTDOWN_EVENT 6 -#define ENABLE_LINE_INPUT 2 -#define ENABLE_ECHO_INPUT 4 -#define ENABLE_PROCESSED_INPUT 1 -#define ENABLE_WINDOW_INPUT 8 -#define ENABLE_MOUSE_INPUT 16 -#define ENABLE_PROCESSED_OUTPUT 1 -#define ENABLE_WRAP_AT_EOL_OUTPUT 2 + +/* + * Input mode flags + */ +#define ENABLE_PROCESSED_INPUT 0x0001 +#define ENABLE_LINE_INPUT 0x0002 +#define ENABLE_ECHO_INPUT 0x0004 +#define ENABLE_WINDOW_INPUT 0x0008 +#define ENABLE_MOUSE_INPUT 0x0010 +#define ENABLE_INSERT_MODE 0x0020 +#define ENABLE_QUICK_EDIT_MODE 0x0040 +#define ENABLE_EXTENDED_FLAGS 0x0080 + +/* + * Output mode flags + */ +#define ENABLE_PROCESSED_OUTPUT 0x0001 +#define ENABLE_WRAP_AT_EOL_OUTPUT 0x0002 + #define KEY_EVENT 1 #define MOUSE_EVENT 2 #define WINDOW_BUFFER_SIZE_EVENT 4 @@ -172,10 +191,12 @@ #endif #endif -BOOL WINAPI AllocConsole(void); +BOOL WINAPI AllocConsole(VOID); + #if (_WIN32_WINNT >= 0x0501) #define ATTACH_PARENT_PROCESS (DWORD)-1 BOOL WINAPI AttachConsole(_In_ DWORD); + BOOL WINAPI AddConsoleAliasA(_In_ LPCSTR, _In_ LPCSTR, _In_ LPCSTR); BOOL WINAPI AddConsoleAliasW(_In_ LPCWSTR, _In_ LPCWSTR, _In_ LPCWSTR); @@ -209,20 +230,36 @@ _In_ DWORD AliasBufferLength, _In_ LPWSTR ExeName); -DWORD WINAPI GetConsoleAliasesLengthA(_In_ LPSTR); -DWORD WINAPI GetConsoleAliasesLengthW(_In_ LPWSTR); -#endif +DWORD WINAPI GetConsoleAliasesLengthA(_In_ LPSTR ExeName); +DWORD WINAPI GetConsoleAliasesLengthW(_In_ LPWSTR ExeName); + +DWORD +WINAPI +GetConsoleAliasExesA( + _Out_writes_(ExeNameBufferLength) LPSTR ExeNameBuffer, + _In_ DWORD ExeNameBufferLength); + +DWORD +WINAPI +GetConsoleAliasExesW( + _Out_writes_(ExeNameBufferLength) LPWSTR ExeNameBuffer, + _In_ DWORD ExeNameBufferLength); + +DWORD WINAPI GetConsoleAliasExesLengthA(VOID); +DWORD WINAPI GetConsoleAliasExesLengthW(VOID); +#endif + HANDLE WINAPI CreateConsoleScreenBuffer(_In_ DWORD, _In_ DWORD, _In_opt_ CONST SECURITY_ATTRIBUTES*, _In_ DWORD, _Reserved_ LPVOID); BOOL WINAPI FillConsoleOutputAttribute(_In_ HANDLE, _In_ WORD, _In_ DWORD, _In_ COORD, _Out_ PDWORD); BOOL WINAPI FillConsoleOutputCharacterA(_In_ HANDLE, _In_ CHAR, _In_ DWORD, _In_ COORD, _Out_ PDWORD); BOOL WINAPI FillConsoleOutputCharacterW(_In_ HANDLE, _In_ WCHAR, _In_ DWORD, _In_ COORD, _Out_ PDWORD); BOOL WINAPI FlushConsoleInputBuffer(_In_ HANDLE); -BOOL WINAPI FreeConsole(void); +BOOL WINAPI FreeConsole(VOID); BOOL WINAPI GenerateConsoleCtrlEvent(_In_ DWORD, _In_ DWORD); -UINT WINAPI GetConsoleCP(void); +UINT WINAPI GetConsoleCP(VOID); BOOL WINAPI GetConsoleCursorInfo(_In_ HANDLE, _Out_ PCONSOLE_CURSOR_INFO); BOOL WINAPI GetConsoleMode(HANDLE,PDWORD); -UINT WINAPI GetConsoleOutputCP(void); +UINT WINAPI GetConsoleOutputCP(VOID); BOOL WINAPI GetConsoleScreenBufferInfo(_In_ HANDLE, _Out_ PCONSOLE_SCREEN_BUFFER_INFO); DWORD @@ -238,7 +275,7 @@ _In_ DWORD nSize); #if (_WIN32_WINNT >= 0x0500) -HWND WINAPI GetConsoleWindow(void); +HWND WINAPI GetConsoleWindow(VOID); WINBASEAPI BOOL APIENTRY GetConsoleDisplayMode(_Out_ LPDWORD lpModeFlags); BOOL APIENTRY SetConsoleDisplayMode(_In_ HANDLE hConsoleOutput, _In_ DWORD dwFlags, _Out_opt_ PCOORD lpNewScreenBufferDimensions); #endif @@ -389,11 +426,12 @@ #define CONSOLE_WINDOWED_MODE 2 #ifdef UNICODE -#define FillConsoleOutputCharacter FillConsoleOutputCharacterW #define AddConsoleAlias AddConsoleAliasW #define GetConsoleAlias GetConsoleAliasW #define GetConsoleAliases GetConsoleAliasesW #define GetConsoleAliasesLength GetConsoleAliasesLengthW +#define GetConsoleAliasExes GetConsoleAliasExesW +#define GetConsoleAliasExesLength GetConsoleAliasExesLengthW #define GetConsoleTitle GetConsoleTitleW #define PeekConsoleInput PeekConsoleInputW #define ReadConsole ReadConsoleW @@ -405,13 +443,15 @@ #define WriteConsole WriteConsoleW #define WriteConsoleInput WriteConsoleInputW #define WriteConsoleOutput WriteConsoleOutputW +#define FillConsoleOutputCharacter FillConsoleOutputCharacterW #define WriteConsoleOutputCharacter WriteConsoleOutputCharacterW #else #define AddConsoleAlias AddConsoleAliasA -#define FillConsoleOutputCharacter FillConsoleOutputCharacterA #define GetConsoleAlias GetConsoleAliasA #define GetConsoleAliases GetConsoleAliasesA #define GetConsoleAliasesLength GetConsoleAliasesLengthA +#define GetConsoleAliasExes GetConsoleAliasExesA +#define GetConsoleAliasExesLength GetConsoleAliasExesLengthA #define GetConsoleTitle GetConsoleTitleA #define PeekConsoleInput PeekConsoleInputA #define ReadConsole ReadConsoleA @@ -423,6 +463,7 @@ #define WriteConsole WriteConsoleA #define WriteConsoleInput WriteConsoleInputA #define WriteConsoleOutput WriteConsoleOutputA +#define FillConsoleOutputCharacter FillConsoleOutputCharacterA #define WriteConsoleOutputCharacter WriteConsoleOutputCharacterA #endif

1 0

[tfaber] 58344: [NTOSKRNL:MM] - Do not assume all zeroes in PE sections that contain uninitialized data. Such sections can have other contents as well, and MiReadPage already provides zeroes for ou...
by tfaber＠svn.reactos.org 20 Feb '13

20 Feb '13

Author: tfaber Date: Wed Feb 20 21:48:05 2013 New Revision: 58344 URL: http://svn.reactos.org/svn/reactos?rev=58344&view=rev Log: [NTOSKRNL:MM] - Do not assume all zeroes in PE sections that contain uninitialized data. Such sections can have other contents as well, and MiReadPage already provides zeroes for outside-of-file data anyway CORE-6958 #resolve Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Wed Feb 20 21:48:05 2013 @@ -677,6 +677,7 @@ pssSegments[i].Length.QuadPart = pishSectionHeaders[i].Misc.VirtualSize; pssSegments[i].Length.LowPart = ALIGN_UP_BY(pssSegments[i].Length.LowPart, nSectionAlignment); + /* FIXME: always false */ if (pssSegments[i].Length.QuadPart < pssSegments[i].Length.QuadPart) DIE(("Cannot align the virtual size of section %u\n", i)); @@ -1394,52 +1395,6 @@ } /* - * Map anonymous memory for BSS sections - */ - if (Segment->Image.Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA) - { - /* We'll be unlocking the address space below. Prevent us from being preempted - * in faulting in the page. */ - MmCreatePageFileMapping(Process, Address, MM_WAIT_ENTRY); - MmUnlockSectionSegment(Segment); - MI_SET_USAGE(MI_USAGE_SECTION); - if (Process) MI_SET_PROCESS2(Process->ImageFileName); - if (!Process) MI_SET_PROCESS2("Kernel Section"); - Status = MmRequestPageMemoryConsumer(MC_USER, FALSE, &Page); - if (!NT_SUCCESS(Status)) - { - MmUnlockAddressSpace(AddressSpace); - Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); - MmLockAddressSpace(AddressSpace); - } - if (!NT_SUCCESS(Status)) - { - KeBugCheck(MEMORY_MANAGEMENT); - } - /* Remove the wait entry we placed, so that we can map the page */ - MmDeletePageFileMapping(Process, PAddress, &SwapEntry); - Status = MmCreateVirtualMapping(Process, - PAddress, - Region->Protect, - &Page, - 1); - if (!NT_SUCCESS(Status)) - { - DPRINT("MmCreateVirtualMapping failed, not out of memory\n"); - KeBugCheck(MEMORY_MANAGEMENT); - return(Status); - } - MmInsertRmap(Page, Process, Address); - - /* - * Cleanup and release locks - */ - MiSetPageEvent(Process, Address); - DPRINT("Address 0x%.8X\n", Address); - return(STATUS_SUCCESS); - } - - /* * Get the entry corresponding to the offset within the section */ Entry = MmGetPageEntrySectionSegment(Segment, &Offset); @@ -1508,7 +1463,7 @@ MmUnlockSectionSegment(Segment); MmDeletePageFileMapping(Process, PAddress, &FakeSwapEntry); - DPRINT("CreateVirtualMapping Page %x Process %p PAddress %p Attributes %x\n", + DPRINT("CreateVirtualMapping Page %x Process %p PAddress %p Attributes %x\n", Page, Process, PAddress, Attributes); Status = MmCreateVirtualMapping(Process, PAddress, @@ -2058,7 +2013,7 @@ Address); KeBugCheckEx(MEMORY_MANAGEMENT, SwapEntry, Page, (ULONG_PTR)Process, (ULONG_PTR)Address); } - MmReleasePageMemoryConsumer(MC_USER, Page); + MmReleasePageMemoryConsumer(MC_USER, Page); MiSetPageEvent(NULL, NULL); return(STATUS_SUCCESS); }

1 0

[hbelusca] 58343: [CONSOLE.DLL] - Add an icon. - Fix some labels in the property box and the disposition of controls in english and french resources (not in all because positions change between lan...
by hbelusca＠svn.reactos.org 19 Feb '13

19 Feb '13

Author: hbelusca Date: Tue Feb 19 00:18:37 2013 New Revision: 58343 URL: http://svn.reactos.org/svn/reactos?rev=58343&view=rev Log: [CONSOLE.DLL] - Add an icon. - Fix some labels in the property box and the disposition of controls in english and french resources (not in all because positions change between languages and I've no time synchronizing by hand all the resource files, removing the differences). Added: branches/ros-csrss/dll/cpl/console/res/ - copied from r58258, branches/ros-csrss/win32ss/user/consrv/res/ Modified: branches/ros-csrss/dll/cpl/console/console.rc branches/ros-csrss/dll/cpl/console/lang/bg-BG.rc branches/ros-csrss/dll/cpl/console/lang/cs-CZ.rc branches/ros-csrss/dll/cpl/console/lang/de-DE.rc branches/ros-csrss/dll/cpl/console/lang/en-US.rc branches/ros-csrss/dll/cpl/console/lang/es-ES.rc branches/ros-csrss/dll/cpl/console/lang/fr-FR.rc branches/ros-csrss/dll/cpl/console/lang/he-IL.rc branches/ros-csrss/dll/cpl/console/lang/id-ID.rc branches/ros-csrss/dll/cpl/console/lang/it-IT.rc branches/ros-csrss/dll/cpl/console/lang/no-NO.rc branches/ros-csrss/dll/cpl/console/lang/pl-PL.rc branches/ros-csrss/dll/cpl/console/lang/ro-RO.rc branches/ros-csrss/dll/cpl/console/lang/ru-RU.rc branches/ros-csrss/dll/cpl/console/lang/sk-SK.rc branches/ros-csrss/dll/cpl/console/lang/uk-UA.rc branches/ros-csrss/dll/cpl/console/lang/zh-CN.rc branches/ros-csrss/dll/cpl/console/resource.h Modified: branches/ros-csrss/dll/cpl/console/console.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/conso… ============================================================================== --- branches/ros-csrss/dll/cpl/console/console.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/console.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -17,4 +17,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "console.dll\0" #include <reactos/version.rc> +IDC_CPLICON ICON DISCARDABLE "res/terminal.ico" + #include "rsrc.rc" Modified: branches/ros-csrss/dll/cpl/console/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/bg-BG.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/bg-BG.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -22,7 +22,7 @@ GROUPBOX "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð½Ð° ÐµÐºÑÐ°Ð½Ð°", -1, 143, 7, 130, 70, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "&ÐÑÐ¾Ð·Ð¾ÑÐµÑ", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 152, 20, 70, 10 CONTROL "&Ð¦ÑÐ» ÐµÐºÑÐ°Ð½", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 152, 40, 70, 10 - GROUPBOX "ÐÐ½ÐµÐ²Ð½Ð¸Ðº Ð½Ð° Ð·Ð°Ð¿Ð¾Ð²ÐµÐ´Ð¸ÑÐµ", -1, 7, 84, 130, 77, WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "ÐÐ½ÐµÐ²Ð½Ð¸Ðº Ð½Ð° Ð·Ð°Ð¿Ð¾Ð²ÐµÐ´Ð¸ÑÐµ", -1, 7, 85, 130, 77, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "Ð Ð°Ð·Ð¼ÐµÑ Ð½Ð° &Ð±ÑÑÐµÑÐ°", -1, 14, 101, 70, 12 EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15 @@ -95,7 +95,7 @@ CONTROL "ÐÐºÑÐ°Ð½Ð½Ð° Ð¿Ð¾Ð´&ÑÐ²ÐµÑÐºÐ°", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10 CONTROL "ÐÐ·&ÑÐºÐ°ÑÐ°Ñ ÑÐµÐºÑÑ", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10 CONTROL "ÐÐ·ÑÐºÐ°ÑÐ°ÑÐ° Ð¿Ð¾Ð´&ÑÐ²ÐµÑÐºÐ°", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10 - GROUPBOX "ÐÐ·Ð±ÑÐ°Ð½Ð¸ ÑÐ²ÐµÑÐ¾Ð²Ð¸ ÑÑÐ¾Ð¹Ð½Ð¾ÑÑÐ¸", -1, 129, 7, 118, 73 + GROUPBOX "Selected Color Components", -1, 129, 7, 118, 73 LTEXT "&Ð§ÐµÑÐ²ÐµÐ½Ð¾:", -1, 140, 25, 48, 10 EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 22, 12, 14 @@ -121,9 +121,9 @@ CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 199, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 213, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 227, 90, 12, 12 - GROUPBOX "ÐÐ·Ð±ÑÐ°Ð½Ð¸ ÐµÐºÑÐ°Ð½Ð½Ð¸ ÑÐ²ÐµÑÐ¾Ð²Ðµ:", -1, 7, 111, 240, 40 + GROUPBOX "Preview (Screen)", -1, 7, 111, 240, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20 - GROUPBOX "ÐÐ·Ð±ÑÐ°Ð½Ð¸ Ð¸Ð·ÑÐºÐ°ÑÐ°ÑÐ¸ ÑÐ²ÐµÑÐ¾Ð²Ðµ:", -1, 7, 162, 240, 40 + GROUPBOX "Preview (Popup)", -1, 7, 162, 240, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20 END Modified: branches/ros-csrss/dll/cpl/console/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/cs-CZ.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/cs-CZ.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -20,7 +20,7 @@ GROUPBOX "MoÅ¾nosti zobrazenÃ", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "&Okno", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 CONTROL "&CelÃ¡ obrazovka", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 - GROUPBOX "Historie pÅÃkazÅ¯", -1, 7, 84, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "Historie pÅÃkazÅ¯", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "Velikost v&yrovnÃ¡vacÃ pamÄti:", -1, 14, 101, 70, 12 EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15 @@ -93,7 +93,7 @@ CONTROL "PozadÃ zo&brazenÃ", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10 CONTROL "Text &vÃ½bÄru", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10 CONTROL "PozadÃ vÃ½&bÄru", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10 - GROUPBOX "ZvolenÃ© barevnÃ© hodnoty", -1, 129, 7, 118, 73 + GROUPBOX "Selected Color Components", -1, 129, 7, 118, 73 LTEXT "Äe&rvenÃ¡:", -1, 140, 25, 48, 10 EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 22, 12, 14 @@ -119,9 +119,9 @@ CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 199, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 213, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 227, 90, 12, 12 - GROUPBOX "ZvolenÃ© barvy zobrazenÃ", -1, 7, 111, 240, 40 + GROUPBOX "Preview (Screen)", -1, 7, 111, 240, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20 - GROUPBOX "ZvolenÃ© barvy vÃ½bÄru", -1, 7, 162, 240, 40 + GROUPBOX "Preview (Popup)", -1, 7, 162, 240, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20 END Modified: branches/ros-csrss/dll/cpl/console/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/de-DE.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/de-DE.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -95,7 +95,7 @@ CONTROL "Fenster&hintergrund", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 25, 90, 10 CONTROL "&Popuptext", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 90, 10 CONTROL "Pop&uphintergrund", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 45, 90, 10 - GROUPBOX "AusgewÃ¤hlte Farbwerte", -1, 120, 15, 90, 45 + GROUPBOX "Selected Color Components", -1, 120, 15, 90, 45 LTEXT "&Rot:", -1, 125, 25, 30, 10 EDITTEXT IDC_EDIT_COLOR_RED, 150, 25, 30, 10, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 165, 25, 30, 10 @@ -121,9 +121,9 @@ CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 171, 90, 10, 10 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 183, 90, 10, 10 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 195, 90, 10, 10 - GROUPBOX "AusgewÃ¤hlte Fensterfarben", -1, 10, 110, 200, 40 + GROUPBOX "Fenstervorschau", -1, 10, 110, 200, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 120, 180, 20 - GROUPBOX "AusgewÃ¤hlte Popupfarben", -1, 10, 155, 200, 40 + GROUPBOX "Popupvorschau", -1, 10, 155, 200, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 180, 20 END Modified: branches/ros-csrss/dll/cpl/console/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/en-US.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/en-US.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -22,7 +22,7 @@ GROUPBOX "Display Options", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "&Window", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 CONTROL "F&ull Screen", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 - GROUPBOX "Command History", -1, 7, 84, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "Command History", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "&Buffer Size:", -1, 14, 101, 70, 12 EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15 @@ -91,40 +91,40 @@ CAPTION "Colors" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Screen &Text", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 112, 10 - CONTROL "Screen &Background", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10 - CONTROL "&Popup Text", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10 - CONTROL "Pop&up Background", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10 - GROUPBOX "Selected Color Values", -1, 129, 7, 118, 73 - LTEXT "&Red:", -1, 140, 25, 48, 10 - EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 22, 12, 14 - LTEXT "&Green:", -1, 140, 42, 48, 10 - EDITTEXT IDC_EDIT_COLOR_GREEN, 210, 39, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 39, 12, 14 - LTEXT "&Blue:", -1, 140, 60, 48, 10 - EDITTEXT IDC_EDIT_COLOR_BLUE, 210, 56, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 56, 12, 14 - CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 17, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR2, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 31, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR3, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 45, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR4, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 59, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR5, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 73, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR6, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 87, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR7, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 101, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR8, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 115, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR9, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 129, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR10, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 143, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR11, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 157, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR12, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 171, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR13, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 185, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 199, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 213, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 227, 90, 12, 12 - GROUPBOX "Selected Screen Colors", -1, 7, 111, 240, 40 - CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20 - GROUPBOX "Selected Popup Colors", -1, 7, 162, 240, 40 - CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20 + CONTROL "Screen &Text", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 90, 10 + CONTROL "Screen &Background", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 24, 90, 10 + CONTROL "&Popup Text", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 36, 90, 10 + CONTROL "Pop&up Background", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 90, 10 + GROUPBOX "Selected Color Components", -1, 105, 6, 140, 60 + LTEXT "&Red:", -1, 135, 18, 30, 10 + EDITTEXT IDC_EDIT_COLOR_RED, 175, 16, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 16, 10, 14 + LTEXT "&Green:", -1, 135, 34, 30, 10 + EDITTEXT IDC_EDIT_COLOR_GREEN, 175, 32, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 32, 10, 14 + LTEXT "&Blue:", -1, 135, 50, 30, 10 + EDITTEXT IDC_EDIT_COLOR_BLUE, 175, 48, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 48, 10, 14 + CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 23, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR2, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 36, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR3, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 49, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR4, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 62, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR5, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 75, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR6, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 88, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR7, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 101, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR8, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 114, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR9, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 127, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR10, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 140, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR11, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 153, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR12, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 166, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR13, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 179, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 192, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 205, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 218, 80, 12, 12 + GROUPBOX "Preview (Screen)", -1, 8, 100, 237, 55 + CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 110, 227, 40 + GROUPBOX "Preview (Popup)", -1, 8, 160, 237, 55 + CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 170, 227, 40 END IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79 Modified: branches/ros-csrss/dll/cpl/console/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/es-ES.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/es-ES.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -92,7 +92,7 @@ CONTROL "&Fondo Pantalla", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 25, 90, 10 CONTROL "Texto &Emergente", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 90, 10 CONTROL "Fondo E&mergente", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 45, 90, 10 - GROUPBOX "Valores de Color Seleccionados", -1, 120, 15, 90, 45 + GROUPBOX "Componentes de Color Seleccionados", -1, 120, 15, 90, 45 LTEXT "&Rojo:", -1, 125, 25, 30, 10 EDITTEXT IDC_EDIT_COLOR_RED, 150, 25, 30, 10, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 165, 25, 30, 10 @@ -118,9 +118,9 @@ CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 171, 90, 10, 10 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 183, 90, 10, 10 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 195, 90, 10, 10 - GROUPBOX "Colores de Pantalla Seleccionados", -1, 10, 110, 200, 40 + GROUPBOX "PrevisualizaciÃ³n (Pantalla)", -1, 10, 110, 200, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 120, 180, 20 - GROUPBOX "Colores Emergentes Seleccionados", -1, 10, 155, 200, 40 + GROUPBOX "PrevisualizaciÃ³n (Emergente)", -1, 10, 155, 200, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 180, 20 END Modified: branches/ros-csrss/dll/cpl/console/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/fr-FR.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -22,14 +22,14 @@ GROUPBOX "Options d'affichage", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "&FenÃªtre", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 CONTROL "P&lein Ã©cran", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 - GROUPBOX "Historique des commandes", -1, 7, 84, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "Historique des commandes", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "Taille du &buffer :", -1, 14, 101, 70, 12 EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15 LTEXT "&Nombre de buffers :", -1, 14, 124, 70, 12 EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 120, 12, 15 - CHECKBOX "&Se dÃ©barrasser des vielles copies", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15 + CHECKBOX "&Supprimer les doublons", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15 GROUPBOX "Options d'Ã©dition", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP CHECKBOX "M&ode d'Ã©dition rapide", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP CHECKBOX "Mode &insertion", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP @@ -83,7 +83,7 @@ CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 128, 13, 14 EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 146, 13, 14 - CHECKBOX "Laisser le systÃ¨me &positionner la fenÃªtre", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10 + CHECKBOX "&PositionnÃ©e par le systÃ¨me", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10 END IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220 @@ -91,40 +91,40 @@ CAPTION "Couleurs" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "&Texte Ã l'Ã©cran", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 112, 10 - CONTROL "Fond de l'&Ã©cran", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10 - CONTROL "Texte du &popup", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10 - CONTROL "Fond du Pop&up", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10 - GROUPBOX "Valeurs de couleur sÃ©lÃ©ctionnÃ©es", -1, 129, 7, 118, 73 - LTEXT "&Rouge :", -1, 140, 25, 48, 10 - EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 22, 12, 14 - LTEXT "&Vert :", -1, 140, 42, 48, 10 - EDITTEXT IDC_EDIT_COLOR_GREEN, 210, 39, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 39, 12, 14 - LTEXT "&Bleu :", -1, 140, 60, 48, 10 - EDITTEXT IDC_EDIT_COLOR_BLUE, 210, 56, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 56, 12, 14 - CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 17, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR2, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 31, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR3, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 45, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR4, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 59, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR5, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 73, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR6, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 87, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR7, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 101, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR8, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 115, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR9, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 129, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR10, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 143, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR11, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 157, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR12, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 171, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR13, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 185, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 199, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 213, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 227, 90, 12, 12 - GROUPBOX "Couleurs de l'Ã©cran sÃ©lectionneÃ©s", -1, 7, 111, 240, 40 - CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20 - GROUPBOX "Couleurs du popup sÃ©lectionneÃ©s", -1, 7, 162, 240, 40 - CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20 + CONTROL "&Texte (Ãcran)", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 90, 10 + CONTROL "Arr&iÃ¨re-plan (Ãcran)", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 24, 90, 10 + CONTROL "T&exte (Popup)", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 36, 90, 10 + CONTROL "ArriÃ¨re-pla&n (Popup)", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 90, 10 + GROUPBOX "Composantes de la couleur sÃ©lectionnÃ©e", -1, 105, 6, 140, 60 + LTEXT "&Rouge :", -1, 135, 18, 30, 10 + EDITTEXT IDC_EDIT_COLOR_RED, 175, 16, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 16, 10, 14 + LTEXT "&Vert :", -1, 135, 34, 30, 10 + EDITTEXT IDC_EDIT_COLOR_GREEN, 175, 32, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 32, 10, 14 + LTEXT "&Bleu :", -1, 135, 50, 30, 10 + EDITTEXT IDC_EDIT_COLOR_BLUE, 175, 48, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 48, 10, 14 + CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 23, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR2, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 36, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR3, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 49, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR4, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 62, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR5, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 75, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR6, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 88, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR7, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 101, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR8, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 114, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR9, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 127, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR10, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 140, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR11, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 153, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR12, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 166, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR13, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 179, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 192, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 205, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 218, 80, 12, 12 + GROUPBOX "AperÃ§u (Ãcran)", -1, 8, 100, 237, 55 + CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 110, 227, 40 + GROUPBOX "AperÃ§u (Popup)", -1, 8, 160, 237, 55 + CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 170, 227, 40 END IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79 Modified: branches/ros-csrss/dll/cpl/console/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/he-IL.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/he-IL.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -23,7 +23,7 @@ GROUPBOX "××¤×©×¨××××ª ×ª×¦×××", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "××××", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 CONTROL "××¡× ×××", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 - GROUPBOX "×××¡×××¨×××ª ×¤×§××××ª:", -1, 7, 84, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "×××¡×××¨×××ª ×¤×§××××ª:", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "×××× ××ª×××:", -1, 14, 101, 70, 12 EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15 @@ -92,11 +92,11 @@ CAPTION "×¦××¢××" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "××§×¡× ×©× ×××¡×", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 112, 10 - CONTROL "×¨×§×¢ ××¡×", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10 - CONTROL "××§×¡× ×©× ×××× ×§××¤×¥", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10 - CONTROL "×¨×§×¢ ×©× ×××× ×§××¤×¥", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10 - GROUPBOX "×¢×¨×× ××¦××¢×× ×× ×××¨××", -1, 129, 7, 118, 73 + CONTROL "Screen &Text", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 112, 10 + CONTROL "Screen &Background", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10 + CONTROL "&Popup Text", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10 + CONTROL "Pop&up Background", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10 + GROUPBOX "Selected Color Components", -1, 129, 7, 118, 73 LTEXT "××××:", -1, 140, 25, 48, 10 EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 22, 12, 14 @@ -122,9 +122,9 @@ CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 199, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 213, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 227, 90, 12, 12 - GROUPBOX "×¦××¢× ××¡× × ×××¨××", -1, 7, 111, 240, 40 + GROUPBOX "Preview (Screen)", -1, 7, 111, 240, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20 - GROUPBOX "×¦××¢× ×××× ××ª ×§××¤×¦×× × ×××¨××", -1, 7, 162, 240, 40 + GROUPBOX "Preview (Popup)", -1, 7, 162, 240, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20 END Modified: branches/ros-csrss/dll/cpl/console/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/id-ID.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/id-ID.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -91,11 +91,11 @@ CAPTION "Warna" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "&Teks Layar", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 15, 90, 10 - CONTROL "Latar &Belakang Layar", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 25, 90, 10 - CONTROL "Teks &Popup", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 90, 10 - CONTROL "Latar Belakang Pop&up", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 45, 90, 10 - GROUPBOX "Nilai Warna Dipilih", -1, 120, 15, 90, 45 + CONTROL "Screen &Text", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 15, 90, 10 + CONTROL "Screen &Background", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 25, 90, 10 + CONTROL "&Popup Text", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 90, 10 + CONTROL "Pop&up Background", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 45, 90, 10 + GROUPBOX "Selected Color Components", -1, 120, 15, 90, 45 LTEXT "&Merah:", -1, 125, 25, 30, 10 EDITTEXT IDC_EDIT_COLOR_RED, 150, 25, 30, 10, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 165, 25, 30, 10 @@ -121,9 +121,9 @@ CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 171, 90, 10, 10 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 183, 90, 10, 10 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 195, 90, 10, 10 - GROUPBOX "Warna Layar Dipilih", -1, 10, 110, 200, 40 + GROUPBOX "Preview (Screen)", -1, 10, 110, 200, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 120, 180, 20 - GROUPBOX "Warna Popup Dipilih", -1, 10, 155, 200, 40 + GROUPBOX "Preview (Popup)", -1, 10, 155, 200, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 180, 20 END Modified: branches/ros-csrss/dll/cpl/console/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/it-IT.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/it-IT.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -91,11 +91,11 @@ CAPTION "Colori" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "&Text", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 15, 90, 10 - CONTROL "&Sfondo", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 25, 90, 10 - CONTROL "&Testo Popup", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 90, 10 - CONTROL "Sfondo Popup", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 45, 90, 10 - GROUPBOX "Valori dei colori", -1, 120, 15, 90, 45 + CONTROL "&Testo Schermo", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 15, 90, 10 + CONTROL "&Sfondo Schermo", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 25, 90, 10 + CONTROL "T&esto Popup", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 90, 10 + CONTROL "S&fondo Popup", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 45, 90, 10 + GROUPBOX "Componenti dei colori", -1, 120, 15, 90, 45 LTEXT "&Rosso:", -1, 125, 25, 30, 10 EDITTEXT IDC_EDIT_COLOR_RED, 150, 25, 30, 10, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 165, 25, 30, 10 @@ -121,9 +121,9 @@ CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 171, 90, 10, 10 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 183, 90, 10, 10 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 195, 90, 10, 10 - GROUPBOX "Colori selezionati", -1, 10, 110, 200, 40 + GROUPBOX "Anteprima (Schermo)", -1, 10, 110, 200, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 120, 180, 20 - GROUPBOX "Colori selezionati Popup", -1, 10, 155, 200, 40 + GROUPBOX "Anteprima (Popup)", -1, 10, 155, 200, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 180, 20 END Modified: branches/ros-csrss/dll/cpl/console/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/no-NO.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/no-NO.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -22,7 +22,7 @@ GROUPBOX "Skjerminnstillinger", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "&Vindu", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 CONTROL "F&ull skjerm", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 - GROUPBOX "Kommando historie", -1, 7, 84, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "Kommando historie", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "&BufferstÃ¸rrelse:", -1, 14, 101, 70, 12 EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15 @@ -95,7 +95,7 @@ CONTROL "Skjerm &bakgrunn", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10 CONTROL "&Hurtigmenytekst", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10 CONTROL "Hurtig&menybakgrunn", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10 - GROUPBOX "Valgte fargeverdier", -1, 129, 7, 118, 73 + GROUPBOX "Selected Color Components", -1, 129, 7, 118, 73 LTEXT "&RÃ¸d:", -1, 140, 25, 48, 10 EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 22, 12, 14 @@ -121,9 +121,9 @@ CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 199, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 213, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 227, 90, 12, 12 - GROUPBOX "Valgte skjermfarger", -1, 7, 111, 240, 40 + GROUPBOX "Preview (Screen)", -1, 7, 111, 240, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20 - GROUPBOX "Valgte hurtigmenyfarger", -1, 7, 162, 240, 40 + GROUPBOX "Preview (Popup)", -1, 7, 162, 240, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20 END Modified: branches/ros-csrss/dll/cpl/console/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/pl-PL.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -94,7 +94,7 @@ CONTROL "Ekran &tÅo", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 25, 90, 10 CONTROL "&Popup tekst", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 90, 10 CONTROL "Pop&up tÅo", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 45, 90, 10 - GROUPBOX "Wybrane wartoÅci koloru", -1, 120, 15, 90, 45 + GROUPBOX "Selected Color Components", -1, 120, 15, 90, 45 LTEXT "&Czerowny:", -1, 125, 25, 30, 10 EDITTEXT IDC_EDIT_COLOR_RED, 150, 25, 30, 10, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 165, 25, 30, 10 @@ -120,9 +120,9 @@ CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 171, 90, 10, 10 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 183, 90, 10, 10 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 195, 90, 10, 10 - GROUPBOX "Wybrane kolory ekranu", -1, 10, 110, 200, 40 + GROUPBOX "Preview (Screen)", -1, 10, 110, 200, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 120, 180, 20 - GROUPBOX "Wybrane kolory Popup", -1, 10, 155, 200, 40 + GROUPBOX "Preview (Popup)", -1, 10, 155, 200, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 180, 20 END Modified: branches/ros-csrss/dll/cpl/console/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/ro-RO.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -23,7 +23,7 @@ GROUPBOX "Mod de afiÈare", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "Ãn fe&reastrÄ", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 CONTROL "Pe &tot ecranul", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 - GROUPBOX "Istoric pentru comenzi", -1, 7, 84, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "Istoric pentru comenzi", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "N&umÄr de Ã®nregistrÄri:", -1, 14, 101, 70, 12 EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15 @@ -122,9 +122,9 @@ CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 199, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 213, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 227, 90, 12, 12 - GROUPBOX "Previzionarea culorilor alese pentru ecran", -1, 7, 111, 240, 40 + GROUPBOX "Previzionare (ecran)", -1, 7, 111, 240, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20 - GROUPBOX "Previzionarea culorilor alese pentru ferestre intempestive", -1, 7, 162, 240, 40 + GROUPBOX "Previzionare (ferestre intempestive)", -1, 7, 162, 240, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20 END Modified: branches/ros-csrss/dll/cpl/console/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/ru-RU.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -16,7 +16,7 @@ GROUPBOX "ÐÐºÑÐ°Ð½", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "&ÐÐºÐ½Ð¾", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 CONTROL "&ÐÐ¾Ð»Ð½ÑÐ¹ ÑÐºÑÐ°Ð½", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 - GROUPBOX "ÐÑÑÐ¾ÑÐ¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´", -1, 7, 84, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "ÐÑÑÐ¾ÑÐ¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "&Ð Ð°Ð·Ð¼ÐµÑ Ð±ÑÑÐµÑÐ°:", -1, 14, 101, 60, 12 EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15 @@ -89,7 +89,7 @@ CONTROL "&Ð¤Ð¾Ð½ ÑÐºÑÐ°Ð½Ð°", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10 CONTROL "&ÐÑÐ¿Ð»ÑÐ²Ð°ÑÑÐ¸Ð¹ ÑÐµÐºÑÑ", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10 CONTROL "Ð&ÑÐ¿Ð»ÑÐ²Ð°ÑÑÐ¸Ð¹ ÑÐ¾Ð½", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10 - GROUPBOX "ÐÑÐ±Ð¾Ñ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ð¹ ÑÐ²ÐµÑÐ¾Ð²", -1, 129, 7, 118, 73 + GROUPBOX "Selected Color Components", -1, 129, 7, 118, 73 LTEXT "&ÐÑÐ°ÑÐ½ÑÐ¹:", -1, 140, 25, 48, 10 EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 22, 12, 14 @@ -115,9 +115,9 @@ CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 199, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 213, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 227, 90, 12, 12 - GROUPBOX "ÐÑÐ±ÑÐ°Ð½Ð½ÑÐ¹ ÑÐ²ÐµÑ ÑÐºÑÐ°Ð½Ð°", -1, 7, 111, 240, 40 + GROUPBOX "Preview (Screen)", -1, 7, 111, 240, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20 - GROUPBOX "ÐÑÐ±ÑÐ°Ð½Ð½ÑÐµ Ð²ÑÐ¿Ð»ÑÐ²Ð°ÑÑÐ¸Ðµ ÑÐ²ÐµÑÐ°", -1, 7, 162, 240, 40 + GROUPBOX "Preview (Popup)", -1, 7, 162, 240, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20 END Modified: branches/ros-csrss/dll/cpl/console/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/sk-SK.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/sk-SK.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -18,7 +18,7 @@ GROUPBOX "Display Options", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "&Window", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 CONTROL "F&ull Screen", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 - GROUPBOX "HistÃ³ria prÃkazov", -1, 7, 84, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "HistÃ³ria prÃkazov", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "&Buffer Size:", -1, 14, 101, 70, 12 EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15 @@ -91,7 +91,7 @@ CONTROL "Screen &Background", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10 CONTROL "&Popup Text", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10 CONTROL "Pop&up Background", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10 - GROUPBOX "Selected Color Values", -1, 129, 7, 118, 73 + GROUPBOX "Selected Color Components", -1, 129, 7, 118, 73 LTEXT "&Red:", -1, 140, 25, 48, 10 EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 22, 12, 14 @@ -117,9 +117,9 @@ CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 199, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 213, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 227, 90, 12, 12 - GROUPBOX "Selected Screen Colors", -1, 7, 111, 240, 40 + GROUPBOX "Preview (Screen)", -1, 7, 111, 240, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20 - GROUPBOX "Selected Popup Colors", -1, 7, 162, 240, 40 + GROUPBOX "Preview (Popup)", -1, 7, 162, 240, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20 END Modified: branches/ros-csrss/dll/cpl/console/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/uk-UA.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -23,7 +23,7 @@ GROUPBOX "ÐÐ°ÑÐ°Ð¼ÐµÑÑÐ¸ Ð²ÑÐ´Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð½Ñ", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "Ð&ÑÐºÐ½Ð¾", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 CONTROL "&ÐÐ° Ð²ÐµÑÑ ÐµÐºÑÐ°Ð½", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 - GROUPBOX "ÐÑÑÐ½Ð°Ð» ÐºÐ¾Ð¼Ð°Ð½Ð´", -1, 7, 84, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "ÐÑÑÐ½Ð°Ð» ÐºÐ¾Ð¼Ð°Ð½Ð´", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "&Ð Ð¾Ð·Ð¼ÑÑ Ð±ÑÑÐµÑÐ°:", -1, 14, 101, 70, 12 EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15 @@ -96,7 +96,7 @@ CONTROL "&Ð¢Ð»Ð¾ ÐµÐºÑÐ°Ð½Ð°", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10 CONTROL "Ð¢Ðµ&ÐºÑÑ ÑÐ¿Ð»Ð¸Ð²Ð½Ð¾Ð³Ð¾ Ð²ÑÐºÐ½Ð°", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10 CONTROL "Ð¢&Ð»Ð¾ ÑÐ¿Ð»Ð¸Ð²Ð½Ð¾Ð³Ð¾ Ð²ÑÐºÐ½Ð°", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10 - GROUPBOX "ÐÐ½Ð°ÑÐµÐ½Ð½Ñ Ð²Ð¸Ð±ÑÐ°Ð½Ð¸Ñ ÐºÐ¾Ð»ÑÐ¾ÑÑÐ²", -1, 129, 7, 118, 73 + GROUPBOX "Selected Color Components", -1, 129, 7, 118, 73 LTEXT "&Ð§ÐµÑÐ²Ð¾Ð½Ð¸Ð¹:", -1, 140, 25, 48, 10 EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 22, 12, 14 @@ -122,9 +122,9 @@ CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 199, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 213, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 227, 90, 12, 12 - GROUPBOX "ÐÐ¸Ð±ÑÐ°Ð½Ñ ÐºÐ¾Ð»ÑÐ¾ÑÐ¸ ÐµÐºÑÐ°Ð½Ð°", -1, 7, 111, 240, 40 + GROUPBOX "Preview (Screen)", -1, 7, 111, 240, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20 - GROUPBOX "ÐÐ¸Ð±ÑÐ°Ð½Ñ ÑÐ¿Ð»Ð¸Ð²Ð½Ñ ÐºÐ¾Ð»ÑÐ¾ÑÐ¸", -1, 7, 162, 240, 40 + GROUPBOX "Preview (Popup)", -1, 7, 162, 240, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20 END Modified: branches/ros-csrss/dll/cpl/console/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/zh-CN.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/zh-CN.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -21,7 +21,7 @@ GROUPBOX "æ¾ç¤ºéé¡¹", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "çªå£(&W)", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 CONTROL "å¨å±æ¾ç¤º(&F)", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 - GROUPBOX "å½ä»¤è®°å½", -1, 7, 84, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "å½ä»¤è®°å½", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "ç¼å²åºå¤§å°(&B):", -1, 14, 101, 70, 12 EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15 @@ -94,7 +94,7 @@ CONTROL "å±å¹èæ¯(&B)", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10 CONTROL "å¼¹åºçªå£æå(&P)", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10 CONTROL "å¼¹åºçªå£èæ¯(&U)", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10 - GROUPBOX "éå®çé¢è²å¼", -1, 129, 7, 118, 73 + GROUPBOX "Selected Color Components", -1, 129, 7, 118, 73 LTEXT "çº¢(&R)ï¼", -1, 140, 25, 48, 10 EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 22, 12, 14 @@ -120,9 +120,9 @@ CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 199, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 213, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 227, 90, 12, 12 - GROUPBOX "éå®çå±å¹é¢è²", -1, 7, 111, 240, 40 + GROUPBOX "Preview (Screen)", -1, 7, 111, 240, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20 - GROUPBOX "éå®çå¼¹åºçªå£é¢è²", -1, 7, 162, 240, 40 + GROUPBOX "Preview (Popup)", -1, 7, 162, 240, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20 END Modified: branches/ros-csrss/dll/cpl/console/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/resou… ============================================================================== --- branches/ros-csrss/dll/cpl/console/resource.h [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/resource.h [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -3,7 +3,7 @@ #define IDC_CPLICON 40 #define IDS_CPLNAME 41 #define IDS_CPLDESCRIPTION 42 -#define IDS_APPLY_SHORTCUT_ALL 43 +#define IDS_APPLY_SHORTCUT_ALL 43 #define IDD_PROPPAGEOPTIONS 100 #define IDD_PROPPAGEFONT 101

1 0

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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2013