Ros-diffs September 2010

ros-diffs@reactos.org

18 participants
278 discussions

[tkreuzer] 48820: [CMAKE] Add RC compiler and Assembler to MSC toolchain

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Sep 19 18:53:55 2010 New Revision: 48820 URL: http://svn.reactos.org/svn/reactos?rev=48820&view=rev Log: [CMAKE] Add RC compiler and Assembler to MSC toolchain Modified: branches/cmake-bringup/toolchain-msvc.cmake Modified: branches/cmake-bringup/toolchain-msvc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-msvc.cm… ============================================================================== --- branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] Sun Sep 19 18:53:55 2010 @@ -10,6 +10,10 @@ # which compilers to use for C and C++ set(CMAKE_C_COMPILER cl) set(CMAKE_CXX_COMPILER cl) +SET(CMAKE_RC_COMPILER rc) +SET(CMAKE_ASM_COMPILER ml) + +SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <DEFINES> /I${REACTOS_SOURCE_DIR}/include/psdk /I${REACTOS_BINARY_DIR}/include/psdk /I${REACTOS_SOURCE_DIR}/include/ /I${REACTOS_SOURCE_DIR}/include/reactos /I${REACTOS_BINARY_DIR}/include/reactos /I${REACTOS_SOURCE_DIR}/include/reactos/wine /I${REACTOS_SOURCE_DIR}/include/crt /I${REACTOS_SOURCE_DIR}/include/crt/mingw32 /fo <OBJECT> <SOURCE>") set(CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W1 /Zm1000")

14 years, 3 months

[tkreuzer] 48819: [CMAKE] Add MSVC compatible MC command

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Sep 19 18:52:34 2010 New Revision: 48819 URL: http://svn.reactos.org/svn/reactos?rev=48819&view=rev Log: [CMAKE] Add MSVC compatible MC command Modified: branches/cmake-bringup/include/reactos/mc/CMakeLists.txt Modified: branches/cmake-bringup/include/reactos/mc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/m… ============================================================================== --- branches/cmake-bringup/include/reactos/mc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/mc/CMakeLists.txt [iso-8859-1] Sun Sep 19 18:52:34 2010 @@ -1,11 +1,23 @@ + +if(MSVC) +MACRO(MACRO_MC FILE) + set (COMMAND_MC mc -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos ${REACTOS_SOURCE_DIR}/include/reactos/mc/${FILE}.mc) +ENDMACRO() +else() +MACRO(MACRO_MC FILE) + set(COMMAND_MC ${MINGW_PREFIX}windmc -A -b ${REACTOS_SOURCE_DIR}/include/reactos/mc/${FILE}.mc -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos) +ENDMACRO() +endif() + MACRO (MACRO_ADD_MESSAGE_HEADERS) FOREACH(_in_FILE ${ARGN}) get_filename_component(FILE ${_in_FILE} NAME_WE) + MACRO_MC(${FILE}) add_custom_command( OUTPUT ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.rc ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h - COMMAND ${MINGW_PREFIX}windmc -A -b ${REACTOS_SOURCE_DIR}/include/reactos/mc/${FILE}.mc -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos + COMMAND ${COMMAND_MC} ) set_source_files_properties( ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.rc @@ -18,4 +30,4 @@ ENDMACRO (MACRO_ADD_MESSAGE_HEADERS) file(GLOB_RECURSE SOURCE "*.mc") -MACRO_ADD_MESSAGE_HEADERS(${SOURCE}) +MACRO_ADD_MESSAGE_HEADERS(${SOURCE})

14 years, 3 months

[tkreuzer] 48818: [MSVC] Don't pass gcc specific options to msvc

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Sep 19 17:39:09 2010 New Revision: 48818 URL: http://svn.reactos.org/svn/reactos?rev=48818&view=rev Log: [MSVC] Don't pass gcc specific options to msvc Modified: branches/cmake-bringup/lib/inflib/CMakeLists.txt branches/cmake-bringup/lib/newinflib/CMakeLists.txt Modified: branches/cmake-bringup/lib/inflib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/inflib/CMakeL… ============================================================================== --- branches/cmake-bringup/lib/inflib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/inflib/CMakeLists.txt [iso-8859-1] Sun Sep 19 17:39:09 2010 @@ -12,7 +12,9 @@ file(GLOB_RECURSE SOURCE "infhost*.c") add_definitions(-D__NO_CTYPE_INLINES -DINFLIB_HOST) +if(NOT MSVC) add_definitions(-Wpointer-arith -Wconversion -Wstrict-prototypes -Wmissing-prototypes) +endif() add_library(inflibhost ${GLOBAL_FILES} ${SOURCE}) endif() Modified: branches/cmake-bringup/lib/newinflib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/newinflib/CMa… ============================================================================== --- branches/cmake-bringup/lib/newinflib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/newinflib/CMakeLists.txt [iso-8859-1] Sun Sep 19 17:39:09 2010 @@ -12,7 +12,9 @@ file(GLOB_RECURSE SOURCE "infhost*.c") add_definitions(-DWINE_UNICODE_API= -D__NO_CTYPE_INLINES -DINFLIB_HOST -DUSE_HOST_WCSFUNCS) +if(NOT MSVC) add_definitions(-Wpointer-arith -Wwrite-strings) +endif() add_library(newinflibhost ${GLOBAL_FILES} ${SOURCE}) target_link_libraries(newinflibhost unicode)

14 years, 3 months

[tkreuzer] 48817: [MSVC] Don't add tool that we don't use for msvc builds

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Sep 19 17:36:10 2010 New Revision: 48817 URL: http://svn.reactos.org/svn/reactos?rev=48817&view=rev Log: [MSVC] Don't add tool that we don't use for msvc builds Modified: branches/cmake-bringup/tools/CMakeLists.txt Modified: branches/cmake-bringup/tools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/CMakeLists.… ============================================================================== --- branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] Sun Sep 19 17:36:10 2010 @@ -5,13 +5,16 @@ add_subdirectory(buildno) add_subdirectory(gendib) -#add_subdirectory(rsym) add_subdirectory(nci) add_subdirectory(winebuild) add_subdirectory(unicode) +add_subdirectory(cdmake) +if(NOT MSVC) +#add_subdirectory(rsym) add_subdirectory(wpp) #add_subdirectory(wmc) add_subdirectory(widl) #add_subdirectory(wrc) #add_subdirectory(log2lines) -add_subdirectory(cdmake) +endif() +

14 years, 3 months

[spetreolle] 48816: [CMAKE] Add ext2 to build.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun Sep 19 16:36:43 2010 New Revision: 48816 URL: http://svn.reactos.org/svn/reactos?rev=48816&view=rev Log: [CMAKE] Add ext2 to build. Added: branches/cmake-bringup/drivers/filesystems/ext2/CMakeLists.txt (with props) Modified: branches/cmake-bringup/drivers/filesystems/CMakeLists.txt Modified: branches/cmake-bringup/drivers/filesystems/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… ============================================================================== --- branches/cmake-bringup/drivers/filesystems/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/CMakeLists.txt [iso-8859-1] Sun Sep 19 16:36:43 2010 @@ -1,3 +1,4 @@ add_subdirectory(cdfs) +add_subdirectory(ext2) add_subdirectory(fastfat) Added: branches/cmake-bringup/drivers/filesystems/ext2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… ============================================================================== --- branches/cmake-bringup/drivers/filesystems/ext2/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/filesystems/ext2/CMakeLists.txt [iso-8859-1] Sun Sep 19 16:36:43 2010 @@ -1,0 +1,32 @@ +include_directories(inc) + +list(APPEND SOURCE + src/volinfo.c + src/create.c + src/write.c + src/metadata.c + src/fastio.c + src/dircntrl.c + src/DiskIO.c + src/fsctrl.c + src/devcntrl.c + src/flush.c + src/ext2init.c + src/io.c + src/close.c + src/fileinfo.c + src/read.c + src/cleanup.c + src/misc.c + src/shutdown.c) + +add_library(ext2fs SHARED ${SOURCE}) + +set_target_properties(ext2fs PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + + +target_link_libraries(ext2fs + -lntoskrnl + -lhal) + +add_dependencies(ext2fs psdk bugcodes) Propchange: branches/cmake-bringup/drivers/filesystems/ext2/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 3 months

[tkreuzer] 48815: [MSVC] remove intrinsics that don't exist

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Sep 19 16:27:13 2010 New Revision: 48815 URL: http://svn.reactos.org/svn/reactos?rev=48815&view=rev Log: [MSVC] remove intrinsics that don't exist Modified: branches/cmake-bringup/include/crt/msc/intrin.h Modified: branches/cmake-bringup/include/crt/msc/intrin.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/crt/msc/i… ============================================================================== --- branches/cmake-bringup/include/crt/msc/intrin.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/crt/msc/intrin.h [iso-8859-1] Sun Sep 19 16:27:13 2010 @@ -21,16 +21,10 @@ void _WriteBarrier(void); #pragma intrinsic(_WriteBarrier) -char _InterlockedCompareExchange8(volatile char * const Destination, const char Exchange, const char Comperand); -#pragma intrinsic(_InterlockedCompareExchange8) -short _InterlockedCompareExchange16(volatile short * const Destination, const short Exchange, const short Comperand); -#pragma intrinsic(_InterlockedCompareExchange16) long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand); #pragma intrinsic(_InterlockedCompareExchange) long _InterlockedExchange(volatile long * const Target, const long Value); #pragma intrinsic(_InterlockedExchange) -short _InterlockedExchangeAdd16(volatile short * const Addend, const short Value); -#pragma intrinsic(_InterlockedExchangeAdd16) long _InterlockedExchangeAdd(volatile long * const Addend, const long Value); #pragma intrinsic(_InterlockedExchangeAdd) char _InterlockedAnd8(volatile char * const value, const char mask);

14 years, 3 months

[spetreolle] 48814: [CMAKE] Fix minicd boot regression. Remove unneeded usetup link to msvcrt.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun Sep 19 16:16:01 2010 New Revision: 48814 URL: http://svn.reactos.org/svn/reactos?rev=48814&view=rev Log: [CMAKE] Fix minicd boot regression. Remove unneeded usetup link to msvcrt. Modified: branches/cmake-bringup/base/setup/usetup/CMakeLists.txt branches/cmake-bringup/toolchain-mingw32.cmake Modified: branches/cmake-bringup/base/setup/usetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/usetup… ============================================================================== --- branches/cmake-bringup/base/setup/usetup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/usetup/CMakeLists.txt [iso-8859-1] Sun Sep 19 16:16:01 2010 @@ -35,8 +35,7 @@ newinflib ext2lib vfatlib - mingw_common - -lmsvcrt) + mingw_common) set_target_properties(usetup PROPERTIES LINK_FLAGS "-Wl,-entry,_NtProcessStartup@4") Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32… ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Sun Sep 19 16:16:01 2010 @@ -31,8 +31,11 @@ # Use stdcall fixups, and don't link with anything by default unless we say so set(CMAKE_C_STANDARD_LIBRARIES -lgcc CACHE STRING "libgcc") # We should add the environment libgcc here -#-Wl,-T,${REACTOS_SOURCE_DIR}/global.lds +if(ARCH MATCHES i386) +set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds") +elseif(ARCH MATCHES amd64) set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at") +endif(ARCH MATCHES i386) # adjust the default behaviour of the FIND_XXX() commands: # search headers and libraries in the target environment, search

14 years, 3 months

[ekohl] 48813: [USETUP] Add Brazilian portuguese USETUP localization patch by Edison Henrique Andreassy. See issue #5313 for more details.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Sep 19 12:46:54 2010 New Revision: 48813 URL: http://svn.reactos.org/svn/reactos?rev=48813&view=rev Log: [USETUP] Add Brazilian portuguese USETUP localization patch by Edison Henrique Andreassy. See issue #5313 for more details. Modified: trunk/reactos/base/setup/usetup/lang/pt-BR.h trunk/reactos/base/setup/usetup/muilanguages.h Modified: trunk/reactos/base/setup/usetup/lang/pt-BR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] Sun Sep 19 12:46:54 2010 @@ -6,3 +6,1738 @@ { L"0409", L"00000409" }, { NULL, NULL } }; + +static MUI_ENTRY ptBRLanguagePageEntries[] = +{ + { + 4, + 3, + " Instalação do ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Seleção do idioma", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 Por favor, selecione o idioma a ser utilizado durante a instalação.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " Então pressione ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 O idioma selecionado também será o idioma padrão do sistema.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continuar F3=Sair", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ptBRWelcomePageEntries[] = +{ + { + 4, + 3, + " Instalação do ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Bem-vindo à instalação do ReactOS.", + TEXT_STYLE_HIGHLIGHT + }, + { + 6, + 11, + "Esta parte da instalação prepara o ReactOS para ser", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "executado em seu computador.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "\x07 Para instalar o ReactOS agora, pressione ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Para reparar uma instalação do ReactOS, pressione R.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Para ver os termos e condições da licença, pressione L.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Para sair sem instalar o ReactOS, pressione F3.", + TEXT_STYLE_NORMAL + }, + { + 6, + 23, + "Para maiores informações sobre o ReactOS, visite o sítio:", + TEXT_STYLE_NORMAL + }, + { + 6, + 24, + "http://www.reactos.org", + TEXT_STYLE_HIGHLIGHT + }, + { + 0, + 0, + "ENTER=Continuar R=Reparar L=Licença F3=Sair", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ptBRIntroPageEntries[] = +{ + { + 4, + 3, + " Instalação do ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "O instalador do ReactOS está em fase inicial de desenvolvimento e", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "ainda não suporta todas as funções de instalação.", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "As seguintes limitações se aplicam:", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "- O instalador não suporta mais de uma partição primária por disco.", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + "- O instalador não pode excluir uma partição primária de um disco", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + " se houverem partições estendidas no mesmo disco.", + TEXT_STYLE_NORMAL + }, + { + 8, + 16, + "- O instalador não pode remover a primeira partição estendida de um", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + " disco se existirem outras partições estendidas no mesmo disco.", + TEXT_STYLE_NORMAL + }, + { + 8, + 18, + "- O instalador suporta somente o sistema de arquivos FAT.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "- O verificador de integridade de sistema de arquivos ainda não está", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + " implementado.", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + "\x07 Para continuar a instalação do ReactOS, pressione ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 27, + "\x07 Para sair sem instalar o ReactOS, pressione F3.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continuar F3=Sair", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ptBRLicensePageEntries[] = +{ + { + 4, + 3, + " Instalação do ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 6, + "Licença:", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 8, + "O ReactOS está licenciado sob os termos da licença", + TEXT_STYLE_NORMAL + }, + { + 8, + 9, + "GNU GPL contendo partes de código licenciados sob outras", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "licenças compatíveis, como X11 ou BSD e GNU LGPL.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + "Todo o software que faz parte do ReactOS é portanto, liberado", + TEXT_STYLE_NORMAL + }, + { + 8, + 12, + "sob a licença GNU GPL, bem como a manutenção da licença", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "original.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "Este software vem sem NENHUMA GARANTIA ou restrição de uso", + TEXT_STYLE_NORMAL + }, + { + 8, + 16, + "exceto onde leis locais e internacionais são aplicaveis. A licença", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "do ReactOS abrange apenas a distribuição a terceiros.", + TEXT_STYLE_NORMAL + }, + { + 8, + 18, + "Se por alguma razão você não recebeu uma cópia da licença", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "GNU General Public License com o ReactOS por favor visite", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "http://www.gnu.org/licenses/licenses.html", + TEXT_STYLE_HIGHLIGHT + }, + { + 6, + 22, + "Garantia:", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 24, + "Este é um software livre; veja o código fonte para condições de cópia.", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + "NÃO há garantia; nem mesmo para COMERCIALIZAÇÃO ou", + TEXT_STYLE_NORMAL + }, + { + 8, + 26, + "ADEQUAÇÃO PARA UM PROPÓSITO PARTICULAR", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Voltar", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ptBRDevicePageEntries[] = +{ + { + 4, + 3, + " Instalação do ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "A lista a seguir mostra as configurações de dispositivos atual.", + TEXT_STYLE_NORMAL + }, + { + 24, + 11, + "Computador:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, + 12, + "Vídeo:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, + 13, + "Teclado:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, + 14, + "Leiaute teclado:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, + 16, + "Aceitar:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 25, + 16, "Aceitar essas configurações de dispositivo", + TEXT_STYLE_NORMAL + }, + { + 6, + 19, + "Use as teclas SETA PARA CIMA e SETA PARA BAIXO para mudar de opção.", + TEXT_STYLE_NORMAL + }, + { + 6, + 20, + "Para escolher uma configuração alternativa, pressione ENTER.", + TEXT_STYLE_NORMAL + }, + { + 6, + 22, + "Quanto finalizar os ajustes, selecione \"Aceitar essas configurações", + TEXT_STYLE_NORMAL + }, + { + 6, + 23, + "de dispositivo\" e pressione ENTER.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continuar F3=Sair", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ptBRRepairPageEntries[] = +{ + { + 4, + 3, + " Instalação do ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "O instalador do ReactOS está em fase inicial de desenvolvimento e", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "ainda não suporta todas as funções de instalação.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "As funções reparação ainda não foram implementadas.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "\x07 Para atualizar o sistema operacional, pressione U.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Para abrir o console de recuperação, pressione R.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Para voltar a página principal, pressione ESC.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Para reiniciar o computador, pressione ENTER.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ESC=Página principal U=Atualizar R=Recuperar ENTER=Reiniciar", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; +static MUI_ENTRY ptBRComputerPageEntries[] = +{ + { + 4, + 3, + " Instalação do ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "A lista a seguir mostra os tipos de computadores disponíveis", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "para instalação.", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "Use as teclas SETA PARA CIMA e SETA PARA BAIXO para selecionar", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "um item na lista.", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + "\x07 Para escolher o item selecionado, pressione ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 16, + "\x07 Para cancelar a alteração, pressione ESC.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continuar ESC=Cancelar F3=Sair", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ptBRFlushPageEntries[] = +{ + { + 4, + 3, + " Instalação do ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 10, + 6, + "O sistema está agora certificando que todos os dados estejam sendo", + TEXT_STYLE_NORMAL + }, + { + 10, + 7, + "armazenados corretamente no disco.", + TEXT_STYLE_NORMAL + }, + { + 10, + 8, + "Esta operação pode demorar um minuto.", + TEXT_STYLE_NORMAL + }, + { + 10, + 9, + "Quando terminar, o computador será reiniciado automaticamente.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Esvaziando o cache", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ptBRQuitPageEntries[] = +{ + { + 4, + 3, + " Instalação do ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 10, + 6, + "O ReactOS não foi totalmente instalado neste computador.", + TEXT_STYLE_NORMAL + }, + { + 10, + 8, + "Se houver algum disquete na unidade A: ou disco nas unidades", + TEXT_STYLE_NORMAL + }, + { + 10, + 9, + "de CD-ROM, remova-os.", + TEXT_STYLE_NORMAL + }, + { + 10, + 11, + "Para reiniciar o computador, pressione ENTER.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Por favor, aguarde...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ptBRDisplayPageEntries[] = +{ + { + 4, + 3, + " Instalação do ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "A lista a seguir mostra os tipos de vídeo disponíveis para instalação.", + TEXT_STYLE_NORMAL + }, + { 6, + 10, + "Use as teclas SETA PARA CIMA e SETA PARA BAIXO para selecionar", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "um item na lista.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Para escolher o item selecionado, pressione ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "\x07 Para cancelar a alteração, pressione ESC.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continuar ESC=Cancelar F3=Sair", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ptBRSuccessPageEntries[] = +{ + { + 4, + 3, + " Instalação do ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 10, + 6, + "Os componentes básicos do ReactOS foram instalados com sucesso.", + TEXT_STYLE_NORMAL + }, + { + 10, + 8, + "Se houver algum disquete na unidade A: ou disco nas unidades", + TEXT_STYLE_NORMAL + }, + { + 10, + 9, + "de CD-ROM, remova-os.", + TEXT_STYLE_NORMAL + }, + { + 10, + 11, + "Para reiniciar o computador, pressione ENTER.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Reiniciar", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ptBRBootPageEntries[] = +{ + { + 4, + 3, + " Instalação do ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "O instalador não pôde instalar o gerênciador de inicialização no disco", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "rígido do computador.", + TEXT_STYLE_NORMAL + }, + { + 6, + 13, + "Por favor insira um disquete formatado na unidade A: e", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "pressione ENTER.", + TEXT_STYLE_NORMAL, + }, + { + 0, + 0, + "ENTER=Continuar F3=Sair", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } + +}; + +static MUI_ENTRY ptBRSelectPartitionEntries[] = +{ + { + 4, + 3, + " Instalação do ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 7, + "A lista a seguir mostra as partições existentes e os espaços", + TEXT_STYLE_NORMAL + }, + { + 6, + 8, + "não-particionados neste computador.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "Use as teclas SETA PARA CIMA e SETA PARA BAIXO para selecionar", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "um item na lista.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Para configurar o ReactOS no item selecionado, pressione ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "\x07 Para criar uma partição no espaço não particionado, pressione C.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Para excluir a partição selecionada, pressione D.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Por favor, aguarde...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ptBRFormatPartitionEntries[] = +{ + { + 4, + 3, + " Instalação do ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Formatar partição", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "O instalador irá formatar a partição. Para continuar, pressione ENTER.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continuar F3=Sair", + TEXT_TYPE_STATUS + }, + { + 0, + 0, + NULL, + TEXT_STYLE_NORMAL + } +}; + +static MUI_ENTRY ptBRInstallDirectoryEntries[] = +{ + { + 4, + 3, + " Instalação do ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "O instalador irá copiar os arquivos para a partição selecionada.", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "Selecione um diretório onde deseja que o ReactOS seja instalado:", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Para mudar o diretório sugerido, pressione a tecla BACKSPACE para apagar", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "o texto e escreva o nome do diretório onde deseja que o ReactOS", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "seja instalado.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continuar F3 = Sair", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ptBRFileCopyEntries[] = +{ + { + 4, + 3, + " Instalação do ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 0, + 12, + "Por favor aguarde enquanto o instalador copia os", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 13, + "arquivos do ReactOS para a pasta de instalação.", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 14, + "Esta operação pode demorar alguns minutos.", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 50, + 0, + "\xB3 Por favor, aguarde...", + TEXT_TYPE_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ptBRBootLoaderEntries[] = +{ + { + 4, + 3, + " Instalação do ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "O instalador irá configurar o gerênciador de inicialização", + TEXT_STYLE_NORMAL + }, + { + 8, + 12, + "Instalar o gerênciador de inic. no disco rígido (MBR e VBR)", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "Instalar o gerênciador de inic. no disco rígido (apenas VBR)", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + "Instalar o gerênciador de inicialização em um disquete", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "Pular a instalação do gerênciador de inicialização", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continuar F3=Sair", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ptBRKeyboardSettingsEntries[] = +{ + { + 4, + 3, + " Instalação do ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "A lista a seguir mostra os tipos de teclados disponíveis para instalação.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "Use as teclas SETA PARA CIMA e SETA PARA BAIXO para selecionar", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "um item na lista.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Para escolher o item selecionado, pressione ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "\x07 Para cancelar a alteração, pressione ESC.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continuar ESC=Cancelar F3=Sair", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ptBRLayoutSettingsEntries[] = +{ + { + 4, + 3, + " Instalação do ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "A lista a seguir mostra os tipos de leiautes de teclado disponíveis", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "para instalação.", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "Use as teclas SETA PARA CIMA e SETA PARA BAIXO para selecionar", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "um item na lista.", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + "\x07 Para escolher o item selecionado, pressione ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 16, + "\x07 Para cancelar a alteração, pressione ESC.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER=Continuar ESC=Cancelar F3=Sair", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY ptBRPrepareCopyEntries[] = +{ + { + 4, + 3, + " Instalação do ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "O instalador está preparando o computador para copiar os arquivos", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "do ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Montando a lista de arquivos a serem copiados...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY ptBRSelectFSEntries[] = +{ + { + 4, + 3, + " Instalação do ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 16, + "Selecione um sistema de arquivos para a nova partição na lista abaixo.", + 0 + }, + { + 6, + 17, + "Use as teclas SETA PARA CIMA e SETA PARA BAIXO para selecionar o", + 0 + }, + { + 6, + 18, + "sistema de arquivos de arquivos desejado e pressione ENTER.", + 0 + }, + { + 8, + 20, + "Se desejar selecionar uma partição diferente, pressione ESC.", + 0 + }, + { + 0, + 0, + "ENTER=Continuar ESC=Cancelar F3=Sair", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ptBRDeletePartitionEntries[] = +{ + { + 4, + 3, + " Instalação do ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Você solicitou a exclusão da partição", + TEXT_STYLE_NORMAL + }, + { + 8, + 18, + "\x07 Para excluir esta partição, pressione D", + TEXT_STYLE_NORMAL + }, + { + 11, + 19, + "CUIDADO: todos os dados da partição serão perdidos!", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Para retornar à tela anterior sem excluir", + TEXT_STYLE_NORMAL + }, + { + 11, + 22, + "a partição, pressione ESC.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "D=Excluir ESC=Cancelar F3=Sair", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ptBRRegistryEntries[] = +{ + { + 4, + 3, + " Instalação do ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "O instalador está atualizando a configuração do sistema.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Criando a estrutura de registro...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +MUI_ERROR ptBRErrorEntries[] = +{ + { + //ERROR_NOT_INSTALLED + "O ReactOS não está completamente instalado no computador.\n" + "Se você sair da instalação agora, precisará executa-la\n" + "novamente para instalar o ReactOS.\n" + "\n" + " \x07 Para continuar a instalação, pressione ENTER.\n" + " \x07 Para sair da instalação, pressione F3.", + "F3=Sair ENTER=Continuar" + }, + { + //ERROR_NO_HDD + "Não foi possível localizar um disco rídigo.\n", + "ENTER=Reiniciar" + }, + { + //ERROR_NO_SOURCE_DRIVE + "Não foi possível localizar a unidade de origem.\n", + "ENTER=Reiniciar" + }, + { + //ERROR_LOAD_TXTSETUPSIF + "Não foi possível carregar o arquivo TXTSETUP.SIF.\n", + "ENTER=Reiniciar" + }, + { + //ERROR_CORRUPT_TXTSETUPSIF + "O arquivos TXTSETUP.SIF está corrompido.\n", + "ENTER=Reiniciar" + }, + { + //ERROR_SIGNATURE_TXTSETUPSIF, + "O arquivo TXTSETUP.SIF está com a assinatura incorreta.\n", + "ENTER=Reiniciar" + }, + { + //ERROR_DRIVE_INFORMATION + "Não foi possível obter as informações sobre o disco do sistema.\n", + "ENTER=Reiniciar" + }, + { + //ERROR_WRITE_BOOT, + "Erro ao escrever o código de inicialização na partição do sistema.\n", + "ENTER=Reiniciar" + }, + { + //ERROR_LOAD_COMPUTER, + "Não foi possível carregar a lista de tipos de computadores.\n", + "ENTER=Reiniciar" + }, + { + //ERROR_LOAD_DISPLAY, + "Não foi possível carregar a lista de tipos de vídeo.\n", + "ENTER=Reiniciar" + }, + { + //ERROR_LOAD_KEYBOARD, + "Não foi possível carregar a lista de tipos de teclado.\n", + "ENTER=Reiniciar" + }, + { + //ERROR_LOAD_KBLAYOUT, + "Não foi possível carregar a lista de leiautes de teclado.\n", + "ENTER=Reiniciar" + }, + { + //ERROR_WARN_PARTITION, + "O instalador encontrou uma tabela de partição incompatível\n" + "que não pode ser utilizada corretamente!\n" + "\n" + "Criar ou excluir partições pode destruir a tabela de partição.\n" + "\n" + " \x07 Para sair da instalação, pressione F3.\n" + " \x07 Para continuar, pressione ENTER.", + "F3=Sair ENTER=Continuar" + }, + { + //ERROR_NEW_PARTITION, + "Você não pode criar uma partição dentro de\n" + "outra partição já existente!\n" + "\n" + " * Pressione qualquer tecla para continuar.", + NULL + }, + { + //ERROR_DELETE_SPACE, + "Você não pode excluir um espaço não-particionado!\n" + "\n" + " * Pressione qualquer tecla para continuar.", + NULL + }, + { + //ERROR_INSTALL_BOOTCODE, + "Erro ao instalar o código de inicialização na partição do sistema.", + "ENTER=Reiniciar" + }, + { + //ERROR_NO_FLOPPY, + "Não há disco na unidade A:.", + "ENTER=Continuar" + }, + { + //ERROR_UPDATE_KBSETTINGS, + "Não foi possível atualizar a configuração de leiaute de teclado.", + "ENTER=Reiniciar" + }, + { + //ERROR_UPDATE_DISPLAY_SETTINGS, + "Não foi possível atualizar a configuração de vídeo.", + "ENTER=Reiniciar" + }, + { + //ERROR_IMPORT_HIVE, + "Não foi possível importar o arquivo de estrutura.", + "ENTER=Reiniciar" + }, + { + //ERROR_FIND_REGISTRY + "Não foi possível encontrar os arquivos do registro.", + "ENTER=Reiniciar" + }, + { + //ERROR_CREATE_HIVE, + "Não foi possível criar as estruturas do registro.", + "ENTER=Reiniciar" + }, + { + //ERROR_INITIALIZE_REGISTRY, + "Não foi possível inicializar o registro.", + "ENTER=Reiniciar" + }, + { + //ERROR_INVALID_CABINET_INF, + "O arquivo cab não contém um arquivo inf válido.\n", + "ENTER=Reiniciar" + }, + { + //ERROR_CABINET_MISSING, + "Não foi possível econtrar o arquivo cab.\n", + "ENTER=Reiniciar" + }, + { + //ERROR_CABINET_SCRIPT, + "O arquivo cab não contém um script de instalação.\n", + "ENTER=Reiniciar" + }, + { + //ERROR_COPY_QUEUE, + "Não foi possível abrir a lista de arquivos para cópia.\n", + "ENTER=Reiniciar" + }, + { + //ERROR_CREATE_DIR, + "Não foi possível criar os diretórios de instalação.", + "ENTER=Reiniciar" + }, + { + //ERROR_TXTSETUP_SECTION, + "Não foi possível encontrar a seção 'Directories' no\n" + "arquivo TXTSETUP.SIF.\n", + "ENTER=Reiniciar" + }, + { + //ERROR_CABINET_SECTION, + "Não foi possível encontrar a seção 'Directories' no\n" + "arquivo cab.\n", + "ENTER=Reiniciar" + }, + { + //ERROR_CREATE_INSTALL_DIR + "Não foi possível criar o diretório de instalação.", + "ENTER=Reiniciar" + }, + { + //ERROR_FIND_SETUPDATA, + "Não foi possível encontrar a seção 'SetupData' no\n" + "arquivo TXTSETUP.SIF.\n", + "ENTER=Reiniciar" + }, + { + //ERROR_WRITE_PTABLE, + "Não foi possível escrever a tabela de partições.\n" + "ENTER=Reiniciar" + }, + { + //ERROR_ADDING_CODEPAGE, + "Não foi possível adicionar o código de localidade no registro.\n" + "ENTER=Reiniciar" + }, + { + //ERROR_UPDATE_LOCALESETTINGS, + "Não foi possível configurar o idioma do sistema.\n" + "ENTER=Reiniciar" + }, + { + //ERROR_ADDING_KBLAYOUTS, + "Não foi possível adicionar o leiaute do teclado no registro.\n" + "ENTER=Reiniciar" + }, + { + //ERROR_UPDATE_GEOID, + "Não foi possível configurar a identificação geográfica.\n" + "ENTER=Reiniciar" + }, + { + //ERROR_INSUFFICIENT_DISKSPACE, + "Não há espaço suficiente na partição selecionada.\n" + " * Pressione qualquer tecla para continuar.", + NULL + }, + { + NULL, + NULL + } +}; + +MUI_PAGE ptBRPages[] = +{ + { + LANGUAGE_PAGE, + ptBRLanguagePageEntries + }, + { + START_PAGE, + ptBRWelcomePageEntries + }, + { + INSTALL_INTRO_PAGE, + ptBRIntroPageEntries + }, + { + LICENSE_PAGE, + ptBRLicensePageEntries + }, + { + DEVICE_SETTINGS_PAGE, + ptBRDevicePageEntries + }, + { + REPAIR_INTRO_PAGE, + ptBRRepairPageEntries + }, + { + COMPUTER_SETTINGS_PAGE, + ptBRComputerPageEntries + }, + { + DISPLAY_SETTINGS_PAGE, + ptBRDisplayPageEntries + }, + { + FLUSH_PAGE, + ptBRFlushPageEntries + }, + { + SELECT_PARTITION_PAGE, + ptBRSelectPartitionEntries + }, + { + SELECT_FILE_SYSTEM_PAGE, + ptBRSelectFSEntries + }, + { + FORMAT_PARTITION_PAGE, + ptBRFormatPartitionEntries + }, + { + DELETE_PARTITION_PAGE, + ptBRDeletePartitionEntries + }, + { + INSTALL_DIRECTORY_PAGE, + ptBRInstallDirectoryEntries + }, + { + PREPARE_COPY_PAGE, + ptBRPrepareCopyEntries + }, + { + FILE_COPY_PAGE, + ptBRFileCopyEntries + }, + { + KEYBOARD_SETTINGS_PAGE, + ptBRKeyboardSettingsEntries + }, + { + BOOT_LOADER_PAGE, + ptBRBootLoaderEntries + }, + { + LAYOUT_SETTINGS_PAGE, + ptBRLayoutSettingsEntries + }, + { + QUIT_PAGE, + ptBRQuitPageEntries + }, + { + SUCCESS_PAGE, + ptBRSuccessPageEntries + }, + { + BOOT_LOADER_FLOPPY_PAGE, + ptBRBootPageEntries + }, + { + REGISTRY_PAGE, + ptBRRegistryEntries + }, + { + -1, + NULL + } +}; + +MUI_STRING ptBRStrings[] = +{ + {STRING_PLEASEWAIT, + " Por favor, aguarde..."}, + {STRING_INSTALLCREATEPARTITION, + " ENTER=Instalar C=Criar partição F3=Sair"}, + {STRING_INSTALLDELETEPARTITION, + " ENTER=Instalar D=Apagar partição F3=Sair"}, + {STRING_PARTITIONSIZE, + "Tamanho da nova partição:"}, + {STRING_CHOOSENEWPARTITION, + "Você solicitou a criação de uma nova partição em"}, + {STRING_HDDSIZE, + "Por favor, insira o tamanho da nova partição em megabytes (MB)."}, + {STRING_CREATEPARTITION, + " ENTER=Criar partição ESC=Cancelar F3=Sair"}, + {STRING_PARTFORMAT, + "Esta partição será formatada logo em seguida."}, + {STRING_NONFORMATTEDPART, + "Você solicitou instalar o ReactOS em uma partição nova ou sem formato."}, + {STRING_INSTALLONPART, + "O instalador instala o ReactOS na partição"}, + {STRING_CHECKINGPART, + "O instalador está verificando a partição selecionada."}, + {STRING_QUITCONTINUE, + "F3=Sair ENTER=Continuar"}, + {STRING_REBOOTCOMPUTER, + "ENTER=Reiniciar"}, + {STRING_TXTSETUPFAILED, + "Não foi possível econtrar a seção '%S' no\narquivo TXTSETUP.SIF.\n"}, + {STRING_COPYING, + " Copiando arquivo: %S"}, + {STRING_SETUPCOPYINGFILES, + "O instalador está copiando os arquivos..."}, + {STRING_REGHIVEUPDATE, + " Atualizando a estrutura do registro..."}, + {STRING_IMPORTFILE, + " Importando %S..."}, + {STRING_DISPLAYETTINGSUPDATE, + " Atualizando as configurações de vídeo..."}, + {STRING_LOCALESETTINGSUPDATE, + " Atualizando as configurações regionais..."}, + {STRING_KEYBOARDSETTINGSUPDATE, + " Atualizando as configurações de leiaute do teclado..."}, + {STRING_CODEPAGEINFOUPDATE, + " Adicionando as informações de localidade no registro..."}, + {STRING_DONE, + " Pronto..."}, + {STRING_REBOOTCOMPUTER2, + " ENTER=Reiniciar"}, + {STRING_CONSOLEFAIL1, + "Não foi possível abrir o console\n\n"}, + {STRING_CONSOLEFAIL2, + "A causa mais comúm é a utilização de um teclado USB\n"}, + {STRING_CONSOLEFAIL3, + "Os teclados USB ainda não são completamente suportados\n"}, + {STRING_FORMATTINGDISK, + "O instalador está formatando o disco"}, + {STRING_CHECKINGDISK, + "O instalador está verificando o disco"}, + {STRING_FORMATDISK1, + " Formatar a partição utilizando o sistema de arquivos %S (Rápido) "}, + {STRING_FORMATDISK2, + " Formatar a partição utilizando o sistema de arquivos %S "}, + {STRING_KEEPFORMAT, + " Manter o sistema de arquivos atual (sem alterações) "}, + {STRING_HDINFOPARTCREATE, + "%I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) em %wZ."}, + {STRING_HDDINFOUNK1, + "%I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu)."}, + {STRING_HDDINFOUNK2, + " %c%c Tipo %lu %I64u %s"}, + {STRING_HDINFOPARTDELETE, + "em %I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) em %wZ."}, + {STRING_HDDINFOUNK3, + "em %I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu)."}, + {STRING_HDINFOPARTZEROED, + "Disco %lu (%I64u %s), Porta=%hu, Barramento=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFOUNK4, + "%c%c Tipo %lu %I64u %s"}, + {STRING_HDINFOPARTEXISTS, + "em Disco %lu (%I64u %s), Porta=%hu, Barramento=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFOUNK5, + "%c%c Tipo %-3u %6lu %s"}, + {STRING_HDINFOPARTSELECT, + "%6lu %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) em %S"}, + {STRING_HDDINFOUNK6, + "%6lu %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "O instalador criou uma nova partição em"}, + {STRING_UNPSPACE, + " Espaço não particionado %6lu %s"}, + {STRING_MAXSIZE, + "MB (max. %lu MB)"}, + {STRING_UNFORMATTED, + "Novo (sem formato)"}, + {STRING_FORMATUNUSED, + "Livre"}, + {STRING_FORMATUNKNOWN, + "desconhecido"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, + {STRING_ADDKBLAYOUTS, + "Adicionando leiautes de teclado"}, + {0, 0} +}; Modified: trunk/reactos/base/setup/usetup/muilanguages.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muilangu… ============================================================================== --- trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] Sun Sep 19 12:46:54 2010 @@ -232,7 +232,7 @@ {L"00000814", L"1252", L"850", L"10000", L"Norwegian (Nynorsk)", L"47", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, nnNOLayouts }, {L"00000415", L"1250", L"852", L"10029", L"Polish", L"48", plPLPages, plPLErrorEntries, plPLStrings, LatinFonts, plPLLayouts }, {L"00000816", L"1252", L"850", L"10000", L"Portuguese (Portugal)", L"351", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, ptPTLayouts }, - {L"00000416", L"1252", L"850", L"10000", L"Portuguese (Brazil)", L"55", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, ptBRLayouts }, + {L"00000416", L"1252", L"850", L"10000", L"Portuguese (Brazil)", L"55", ptBRPages, ptBRErrorEntries, ptBRStrings, LatinFonts, ptBRLayouts }, {L"00000446", L"0", L"1", L"2", L"Punjabi (India)", L"91", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, paINLayouts }, {L"00000418", L"1250", L"852", L"10029", L"Romanian", L"40", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, roROLayouts }, {L"00000417", L"1252", L"850", L"10000", L"Romansh", L"41", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, rmCHLayouts },

14 years, 3 months

[fireball] 48812: [DESK.CPL] Katayama Hirofumi <katayama.hirofumi.mz@gmail.com> - Renamed GLOBAL_DATA structures to DATA. - Added real GLOBAL_DATA in background.c, that manages the background color...

by fireball＠svn.reactos.org

Author: fireball Date: Sun Sep 19 11:54:33 2010 New Revision: 48812 URL: http://svn.reactos.org/svn/reactos?rev=48812&view=rev Log: [DESK.CPL] Katayama Hirofumi <katayama.hirofumi.mz(a)gmail.com> - Renamed GLOBAL_DATA structures to DATA. - Added real GLOBAL_DATA in background.c, that manages the background color. - Resolved conflict of background colors in background.c and appearance.c. - Fixed drawing the menu in draw.c. See issue #5620 for more details. Modified: trunk/reactos/dll/cpl/desk/appearance.c trunk/reactos/dll/cpl/desk/background.c trunk/reactos/dll/cpl/desk/desk.c trunk/reactos/dll/cpl/desk/desk.h trunk/reactos/dll/cpl/desk/draw.c trunk/reactos/dll/cpl/desk/preview.c trunk/reactos/dll/cpl/desk/screensaver.c trunk/reactos/dll/cpl/desk/settings.c Modified: trunk/reactos/dll/cpl/desk/appearance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] Sun Sep 19 11:54:33 2010 @@ -5,7 +5,7 @@ * PURPOSE: Appearance property page * * PROGRAMMERS: Trevor McCort (lycan359(a)gmail.com) - * Timo Kreuzer (timo[dot]kreuzer[at]web[dot]de + * Timo Kreuzer (timo[dot]kreuzer[at]web[dot]de) */ #include "desk.h" @@ -115,6 +115,7 @@ { PropSheet_Changed(GetParent(hwndDlg), hwndDlg); g->Theme = g->ThemeAdv; + g_GlobalData.desktop_color = g->Theme.crColor[COLOR_DESKTOP]; g->bHasChanged = TRUE; g->ThemeId = -1; /* Customized */ SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_COLORSCHEME, CB_SETCURSEL, (WPARAM)-1, 0); @@ -160,6 +161,14 @@ case PSN_KILLACTIVE: SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, (LONG_PTR)FALSE); return TRUE; + + case PSN_SETACTIVE: + if (g->Theme.crColor[COLOR_DESKTOP] != g_GlobalData.desktop_color) + { + g->Theme.crColor[COLOR_DESKTOP] = g_GlobalData.desktop_color; + SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_UPDATETHEME, 0, (LPARAM)&g->Theme); + } + break; } break; } Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] Sun Sep 19 11:54:33 2010 @@ -26,7 +26,7 @@ } BackgroundItem; -typedef struct _GLOBAL_DATA +typedef struct _DATA { BackgroundItem backgroundItems[MAX_BACKGROUNDS]; @@ -35,7 +35,6 @@ int placementSelection; int backgroundSelection; - COLORREF backgroundDesktopColor; COLORREF custom_colors[16]; int listViewItemCount; @@ -43,13 +42,14 @@ HBITMAP hBitmap; int cxSource; int cySource; -} GLOBAL_DATA, *PGLOBAL_DATA; - +} DATA, *PDATA; + +GLOBAL_DATA g_GlobalData; /* Add the images in the C:\ReactOS directory and the current wallpaper if any */ static VOID -AddListViewItems(HWND hwndDlg, PGLOBAL_DATA pGlobalData) +AddListViewItems(HWND hwndDlg, PDATA pData) { WIN32_FIND_DATA fd; HANDLE hFind; @@ -85,7 +85,7 @@ (void)ListView_InsertColumn(hwndBackgroundList, 0, &dummy); /* Add the "None" item */ - backgroundItem = &pGlobalData->backgroundItems[pGlobalData->listViewItemCount]; + backgroundItem = &pData->backgroundItems[pData->listViewItemCount]; backgroundItem->bWallpaper = FALSE; LoadString(hApplet, IDS_NONE, @@ -97,16 +97,16 @@ listItem.state = 0; listItem.pszText = backgroundItem->szDisplayName; listItem.iImage = -1; - listItem.iItem = pGlobalData->listViewItemCount; - listItem.lParam = pGlobalData->listViewItemCount; + listItem.iItem = pData->listViewItemCount; + listItem.lParam = pData->listViewItemCount; (void)ListView_InsertItem(hwndBackgroundList, &listItem); ListView_SetItemState(hwndBackgroundList, - pGlobalData->listViewItemCount, + pData->listViewItemCount, LVIS_SELECTED, LVIS_SELECTED); - pGlobalData->listViewItemCount++; + pData->listViewItemCount++; /* Add current wallpaper if any */ RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, KEY_ALL_ACCESS, &regKey); @@ -134,7 +134,7 @@ (void)ListView_SetImageList(hwndBackgroundList, himl, LVSIL_SMALL); } - backgroundItem = &pGlobalData->backgroundItems[pGlobalData->listViewItemCount]; + backgroundItem = &pData->backgroundItems[pData->listViewItemCount]; backgroundItem->bWallpaper = TRUE; @@ -149,16 +149,16 @@ listItem.state = 0; listItem.pszText = backgroundItem->szDisplayName; listItem.iImage = sfi.iIcon; - listItem.iItem = pGlobalData->listViewItemCount; - listItem.lParam = pGlobalData->listViewItemCount; + listItem.iItem = pData->listViewItemCount; + listItem.lParam = pData->listViewItemCount; (void)ListView_InsertItem(hwndBackgroundList, &listItem); ListView_SetItemState(hwndBackgroundList, - pGlobalData->listViewItemCount, + pData->listViewItemCount, LVIS_SELECTED, LVIS_SELECTED); - pGlobalData->listViewItemCount++; + pData->listViewItemCount++; } } @@ -203,7 +203,7 @@ (void)ListView_SetImageList(hwndBackgroundList, himl, LVSIL_SMALL); } - backgroundItem = &pGlobalData->backgroundItems[pGlobalData->listViewItemCount]; + backgroundItem = &pData->backgroundItems[pData->listViewItemCount]; backgroundItem->bWallpaper = TRUE; @@ -218,12 +218,12 @@ listItem.pszText = backgroundItem->szDisplayName; listItem.state = 0; listItem.iImage = sfi.iIcon; - listItem.iItem = pGlobalData->listViewItemCount; - listItem.lParam = pGlobalData->listViewItemCount; + listItem.iItem = pData->listViewItemCount; + listItem.lParam = pData->listViewItemCount; (void)ListView_InsertItem(hwndBackgroundList, &listItem); - pGlobalData->listViewItemCount++; + pData->listViewItemCount++; } if(!FindNextFile(hFind, &fd)) @@ -236,7 +236,7 @@ static VOID -InitBackgroundDialog(HWND hwndDlg, PGLOBAL_DATA pGlobalData) +InitBackgroundDialog(HWND hwndDlg, PDATA pData) { TCHAR szString[256]; HKEY regKey; @@ -246,9 +246,7 @@ LONG result; BITMAP bitmap; - pGlobalData->backgroundDesktopColor = GetSysColor(COLOR_BACKGROUND); - - AddListViewItems(hwndDlg, pGlobalData); + AddListViewItems(hwndDlg, pData); LoadString(hApplet, IDS_CENTER, szString, sizeof(szString) / sizeof(TCHAR)); SendDlgItemMessage(hwndDlg, IDC_PLACEMENT_COMBO, CB_INSERTSTRING, PLACEMENT_CENTER, (LPARAM)szString); @@ -278,19 +276,19 @@ if (_ttoi(szBuffer) == 0) { SendDlgItemMessage(hwndDlg, IDC_PLACEMENT_COMBO, CB_SETCURSEL, PLACEMENT_CENTER, 0); - pGlobalData->placementSelection = PLACEMENT_CENTER; + pData->placementSelection = PLACEMENT_CENTER; } if (_ttoi(szBuffer) == 2) { SendDlgItemMessage(hwndDlg, IDC_PLACEMENT_COMBO, CB_SETCURSEL, PLACEMENT_STRETCH, 0); - pGlobalData->placementSelection = PLACEMENT_STRETCH; + pData->placementSelection = PLACEMENT_STRETCH; } } else { SendDlgItemMessage(hwndDlg, IDC_PLACEMENT_COMBO, CB_SETCURSEL, PLACEMENT_CENTER, 0); - pGlobalData->placementSelection = PLACEMENT_CENTER; + pData->placementSelection = PLACEMENT_CENTER; } result = RegQueryValueEx(regKey, TEXT("TileWallpaper"), 0, &varType, (LPBYTE)szBuffer, &bufferSize); @@ -299,25 +297,25 @@ if (_ttoi(szBuffer) == 1) { SendDlgItemMessage(hwndDlg, IDC_PLACEMENT_COMBO, CB_SETCURSEL, PLACEMENT_TILE, 0); - pGlobalData->placementSelection = PLACEMENT_TILE; + pData->placementSelection = PLACEMENT_TILE; } } RegCloseKey(regKey); - pGlobalData->hBitmap = (HBITMAP) LoadImage(hApplet, MAKEINTRESOURCE(IDC_MONITOR), IMAGE_BITMAP, 0, 0, LR_LOADTRANSPARENT); - if (pGlobalData->hBitmap != NULL) - { - GetObject(pGlobalData->hBitmap, sizeof(BITMAP), &bitmap); - - pGlobalData->cxSource = bitmap.bmWidth; - pGlobalData->cySource = bitmap.bmHeight; + pData->hBitmap = (HBITMAP) LoadImage(hApplet, MAKEINTRESOURCE(IDC_MONITOR), IMAGE_BITMAP, 0, 0, LR_LOADTRANSPARENT); + if (pData->hBitmap != NULL) + { + GetObject(pData->hBitmap, sizeof(BITMAP), &bitmap); + + pData->cxSource = bitmap.bmWidth; + pData->cySource = bitmap.bmHeight; } } static VOID -OnColorButton(HWND hwndDlg, PGLOBAL_DATA pGlobalData) +OnColorButton(HWND hwndDlg, PDATA pData) { /* Load custom colors from Registry */ HKEY hKey = NULL; @@ -331,9 +329,9 @@ { /* Key opened */ DWORD dwType = REG_BINARY; - DWORD cbData = sizeof(pGlobalData->custom_colors); + DWORD cbData = sizeof(pData->custom_colors); res = RegQueryValueEx(hKey, TEXT("CustomColors"), NULL, &dwType, - (LPBYTE)pGlobalData->custom_colors, &cbData); + (LPBYTE)pData->custom_colors, &cbData); RegCloseKey(hKey); hKey = NULL; } @@ -343,8 +341,8 @@ cc.lStructSize = sizeof(CHOOSECOLOR); cc.hwndOwner = hwndDlg; cc.hInstance = NULL; - cc.rgbResult = pGlobalData->backgroundDesktopColor; - cc.lpCustColors = pGlobalData->custom_colors; + cc.rgbResult = g_GlobalData.desktop_color; + cc.lpCustColors = pData->custom_colors; cc.Flags = CC_ANYCOLOR | /* Causes the dialog box to display all available colors in the set of basic colors. */ CC_FULLOPEN | /* opens dialog in full size */ CC_RGBINIT ; /* init chosen color by rgbResult value */ @@ -354,7 +352,7 @@ if (ChooseColor(&cc)) { /* Save selected color to var */ - pGlobalData->backgroundDesktopColor = cc.rgbResult; + g_GlobalData.desktop_color = cc.rgbResult; /* Apply button will be activated */ PropSheet_Changed(GetParent(hwndDlg), hwndDlg); @@ -369,7 +367,7 @@ { /* Key opened */ RegSetValueEx(hKey, TEXT("CustomColors"), 0, REG_BINARY, - (const BYTE *)pGlobalData->custom_colors, sizeof(pGlobalData->custom_colors)); + (const BYTE *)pData->custom_colors, sizeof(pData->custom_colors)); RegCloseKey(hKey); hKey = NULL; } @@ -400,7 +398,7 @@ static VOID -OnBrowseButton(HWND hwndDlg, PGLOBAL_DATA pGlobalData) +OnBrowseButton(HWND hwndDlg, PDATA pData) { OPENFILENAME ofn; TCHAR filename[MAX_PATH]; @@ -439,7 +437,7 @@ if (CheckListViewFilenameExists(hwndBackgroundList, ofn.lpstrFileTitle) == TRUE) return; - if (pGlobalData->listViewItemCount > (MAX_BACKGROUNDS - 1)) + if (pData->listViewItemCount > (MAX_BACKGROUNDS - 1)) return; SHGetFileInfo(filename, @@ -448,7 +446,7 @@ sizeof(sfi), SHGFI_SYSICONINDEX | SHGFI_SMALLICON | SHGFI_DISPLAYNAME); - backgroundItem = &pGlobalData->backgroundItems[pGlobalData->listViewItemCount]; + backgroundItem = &pData->backgroundItems[pData->listViewItemCount]; backgroundItem->bWallpaper = TRUE; @@ -463,40 +461,40 @@ listItem.state = 0; listItem.pszText = backgroundItem->szDisplayName; listItem.iImage = sfi.iIcon; - listItem.iItem = pGlobalData->listViewItemCount; - listItem.lParam = pGlobalData->listViewItemCount; + listItem.iItem = pData->listViewItemCount; + listItem.lParam = pData->listViewItemCount; (void)ListView_InsertItem(hwndBackgroundList, &listItem); ListView_SetItemState(hwndBackgroundList, - pGlobalData->listViewItemCount, + pData->listViewItemCount, LVIS_SELECTED, LVIS_SELECTED); SendMessage(hwndBackgroundList, WM_VSCROLL, SB_BOTTOM, 0); - pGlobalData->listViewItemCount++; + pData->listViewItemCount++; } } static VOID -ListViewItemChanged(HWND hwndDlg, PGLOBAL_DATA pGlobalData, int itemIndex) +ListViewItemChanged(HWND hwndDlg, PDATA pData, int itemIndex) { BackgroundItem *backgroundItem = NULL; - pGlobalData->backgroundSelection = itemIndex; - backgroundItem = &pGlobalData->backgroundItems[pGlobalData->backgroundSelection]; - - if (pGlobalData->pWallpaperBitmap != NULL) - { - DibFreeImage(pGlobalData->pWallpaperBitmap); - pGlobalData->pWallpaperBitmap = NULL; + pData->backgroundSelection = itemIndex; + backgroundItem = &pData->backgroundItems[pData->backgroundSelection]; + + if (pData->pWallpaperBitmap != NULL) + { + DibFreeImage(pData->pWallpaperBitmap); + pData->pWallpaperBitmap = NULL; } if (backgroundItem->bWallpaper == TRUE) { - pGlobalData->pWallpaperBitmap = DibLoadImage(backgroundItem->szFilename); - - if (pGlobalData->pWallpaperBitmap == NULL) + pData->pWallpaperBitmap = DibLoadImage(backgroundItem->szFilename); + + if (pData->pWallpaperBitmap == NULL) return; } @@ -511,7 +509,7 @@ static VOID -DrawBackgroundPreview(LPDRAWITEMSTRUCT draw, PGLOBAL_DATA pGlobalData) +DrawBackgroundPreview(LPDRAWITEMSTRUCT draw, PDATA pData) { float scaleX; float scaleY; @@ -523,23 +521,23 @@ int x; int y; - if (pGlobalData->backgroundItems[pGlobalData->backgroundSelection].bWallpaper == FALSE) + if (pData->backgroundItems[pData->backgroundSelection].bWallpaper == FALSE) { /* update desktop background color image */ - hBrush = CreateSolidBrush(pGlobalData->backgroundDesktopColor); + hBrush = CreateSolidBrush(g_GlobalData.desktop_color); FillRect(draw->hDC, &draw->rcItem, hBrush); DeleteObject(hBrush); return; } - if (pGlobalData->pWallpaperBitmap == NULL) + if (pData->pWallpaperBitmap == NULL) return; scaleX = ((float)GetSystemMetrics(SM_CXSCREEN) - 1) / (float)draw->rcItem.right; scaleY = ((float)GetSystemMetrics(SM_CYSCREEN) - 1) / (float)draw->rcItem.bottom; - scaledWidth = pGlobalData->pWallpaperBitmap->width / scaleX; - scaledHeight = pGlobalData->pWallpaperBitmap->height / scaleY; + scaledWidth = pData->pWallpaperBitmap->width / scaleX; + scaledHeight = pData->pWallpaperBitmap->height / scaleY; posX = (draw->rcItem.right / 2) - (scaledWidth / 2); posY = (draw->rcItem.bottom / 2) - (scaledHeight / 2); @@ -548,7 +546,7 @@ SetStretchBltMode(draw->hDC, COLORONCOLOR); - switch (pGlobalData->placementSelection) + switch (pData->placementSelection) { case PLACEMENT_CENTER: StretchDIBits(draw->hDC, @@ -558,10 +556,10 @@ scaledHeight, 0, 0, - pGlobalData->pWallpaperBitmap->width, - pGlobalData->pWallpaperBitmap->height, - pGlobalData->pWallpaperBitmap->bits, - pGlobalData->pWallpaperBitmap->info, + pData->pWallpaperBitmap->width, + pData->pWallpaperBitmap->height, + pData->pWallpaperBitmap->bits, + pData->pWallpaperBitmap->info, DIB_RGB_COLORS, SRCCOPY); break; @@ -574,10 +572,10 @@ draw->rcItem.bottom, 0, 0, - pGlobalData->pWallpaperBitmap->width, - pGlobalData->pWallpaperBitmap->height, - pGlobalData->pWallpaperBitmap->bits, - pGlobalData->pWallpaperBitmap->info, + pData->pWallpaperBitmap->width, + pData->pWallpaperBitmap->height, + pData->pWallpaperBitmap->bits, + pData->pWallpaperBitmap->info, DIB_RGB_COLORS, SRCCOPY); break; @@ -594,10 +592,10 @@ scaledHeight, 0, 0, - pGlobalData->pWallpaperBitmap->width, - pGlobalData->pWallpaperBitmap->height, - pGlobalData->pWallpaperBitmap->bits, - pGlobalData->pWallpaperBitmap->info, + pData->pWallpaperBitmap->width, + pData->pWallpaperBitmap->height, + pData->pWallpaperBitmap->bits, + pData->pWallpaperBitmap->info, DIB_RGB_COLORS, SRCCOPY); } @@ -608,25 +606,25 @@ static VOID -SetWallpaper(PGLOBAL_DATA pGlobalData) +SetWallpaper(PDATA pData) { HKEY regKey; RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, KEY_ALL_ACCESS, &regKey); - if (pGlobalData->placementSelection == PLACEMENT_TILE) + if (pData->placementSelection == PLACEMENT_TILE) { RegSetValueEx(regKey, TEXT("TileWallpaper"), 0, REG_SZ, (BYTE *)TEXT("1"), sizeof(TCHAR) * 2); RegSetValueEx(regKey, TEXT("WallpaperStyle"), 0, REG_SZ, (BYTE *)TEXT("0"), sizeof(TCHAR) * 2); } - if (pGlobalData->placementSelection == PLACEMENT_CENTER) + if (pData->placementSelection == PLACEMENT_CENTER) { RegSetValueEx(regKey, TEXT("TileWallpaper"), 0, REG_SZ, (BYTE *)TEXT("0"), sizeof(TCHAR) * 2); RegSetValueEx(regKey, TEXT("WallpaperStyle"), 0, REG_SZ, (BYTE *)TEXT("0"), sizeof(TCHAR) * 2); } - if (pGlobalData->placementSelection == PLACEMENT_STRETCH) + if (pData->placementSelection == PLACEMENT_STRETCH) { RegSetValueEx(regKey, TEXT("TileWallpaper"), 0, REG_SZ, (BYTE *)TEXT("0"), sizeof(TCHAR) * 2); RegSetValueEx(regKey, TEXT("WallpaperStyle"), 0, REG_SZ, (BYTE *)TEXT("2"), sizeof(TCHAR) * 2); @@ -634,11 +632,11 @@ RegCloseKey(regKey); - if (pGlobalData->backgroundItems[pGlobalData->backgroundSelection].bWallpaper == TRUE) + if (pData->backgroundItems[pData->backgroundSelection].bWallpaper == TRUE) { SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, - pGlobalData->backgroundItems[pGlobalData->backgroundSelection].szFilename, + pData->backgroundItems[pData->backgroundSelection].szFilename, SPIF_UPDATEINIFILE); } else @@ -650,38 +648,33 @@ /* Change system color */ static VOID -SetDesktopBackColor(HWND hwndDlg, PGLOBAL_DATA pGlobalData) +SetDesktopBackColor(HWND hwndDlg, DATA *pData) { INT iElement = COLOR_BACKGROUND; HKEY hKey; LONG result; TCHAR clText[16]; - DWORD red, green, blue; - - if( !SetSysColors( 1, &iElement, &pGlobalData->backgroundDesktopColor ) ) + BYTE red, green, blue; + DWORD dwDispostion; + + if( !SetSysColors( 1, &iElement, &g_GlobalData.desktop_color ) ) MessageBox(hwndDlg, TEXT("SetSysColor() failed!"), /* these error texts can need internationalization? */ TEXT("Error!"), MB_ICONSTOP ); - /* Write color to registry key: HKEY_CURRENT_USER\Control Panel\Colors\Background */ - hKey = NULL; - result = ERROR_SUCCESS; - result = RegOpenKeyEx( HKEY_CURRENT_USER, TEXT("Control Panel\\Colors"), 0, KEY_WRITE, &hKey ); - if( result != ERROR_SUCCESS ) - { - /* Key open failed; maybe it does not exist? create it! */ - result = RegCreateKeyEx( HKEY_CURRENT_USER, TEXT("Control Panel\\Colors"), 0, NULL, 0, - KEY_ALL_ACCESS, NULL, &hKey, NULL ); - /* Now key must be created and opened and hKey must point at newly created key */ - /* On error result will not contain ERROR_SUCCESS. I don't know how to handle */ - /* this case :( */ - } - red = GetRValue(pGlobalData->backgroundDesktopColor); - green = GetGValue(pGlobalData->backgroundDesktopColor); - blue = GetBValue(pGlobalData->backgroundDesktopColor); - _stprintf(clText, TEXT("%d %d %d"), red, green, blue ); /* format string to be set to registry */ - RegSetValueEx(hKey, TEXT("Background"), 0, REG_SZ, (BYTE *)clText, lstrlen( clText )*sizeof(TCHAR) + sizeof(TCHAR) ); - RegCloseKey(hKey); -} - + + result = RegCreateKeyEx( HKEY_CURRENT_USER, TEXT("Control Panel\\Colors"), 0, NULL, 0, + KEY_ALL_ACCESS, NULL, &hKey, &dwDispostion ); + if (result != ERROR_SUCCESS) + { + red = GetRValue(g_GlobalData.desktop_color); + green = GetGValue(g_GlobalData.desktop_color); + blue = GetBValue(g_GlobalData.desktop_color); + /* format string to be set to registry */ + wsprintf(clText, TEXT("%d %d %d"), red, green, blue); + RegSetValueEx(hKey, TEXT("Background"), 0, REG_SZ, (BYTE *)clText, + (lstrlen(clText) + 1) * sizeof(TCHAR)); + RegCloseKey(hKey); + } +} INT_PTR CALLBACK BackgroundPageProc(HWND hwndDlg, @@ -689,16 +682,16 @@ WPARAM wParam, LPARAM lParam) { - PGLOBAL_DATA pGlobalData; - - pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + PDATA pData; + + pData = (PDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); switch (uMsg) { case WM_INITDIALOG: - pGlobalData = (GLOBAL_DATA*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBAL_DATA)); - SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); - InitBackgroundDialog(hwndDlg, pGlobalData); + pData = (DATA*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DATA)); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pData); + InitBackgroundDialog(hwndDlg, pData); break; case WM_COMMAND: @@ -710,18 +703,18 @@ { case IDC_COLOR_BUTTON: if (command == BN_CLICKED) - OnColorButton(hwndDlg, pGlobalData); + OnColorButton(hwndDlg, pData); break; case IDC_BROWSE_BUTTON: if (command == BN_CLICKED) - OnBrowseButton(hwndDlg, pGlobalData); + OnBrowseButton(hwndDlg, pData); break; case IDC_PLACEMENT_COMBO: if (command == CBN_SELCHANGE) { - pGlobalData->placementSelection = (int)SendDlgItemMessage(hwndDlg, IDC_PLACEMENT_COMBO, CB_GETCURSEL, 0, 0); + pData->placementSelection = (int)SendDlgItemMessage(hwndDlg, IDC_PLACEMENT_COMBO, CB_GETCURSEL, 0, 0); InvalidateRect(GetDlgItem(hwndDlg, IDC_BACKGROUND_PREVIEW), NULL, TRUE); @@ -739,11 +732,11 @@ hdc = BeginPaint(hwndDlg, &ps); hdcMem = CreateCompatibleDC(hdc); - SelectObject(hdcMem, pGlobalData->hBitmap); + SelectObject(hdcMem, pData->hBitmap); /* TransparentBlt(hdc, 98, 0, - pGlobalData->cxSource, pGlobalData->cySource, hdcMem, 0, 0, - pGlobalData->cxSource, pGlobalData->cySource, 0xFF80FF); + pData->cxSource, pData->cySource, hdcMem, 0, 0, + pData->cxSource, pData->cySource, 0xFF80FF); */ DeleteDC(hdcMem); EndPaint(hwndDlg, &ps); @@ -757,7 +750,7 @@ if (drawItem->CtlID == IDC_BACKGROUND_PREVIEW) { - DrawBackgroundPreview(drawItem, pGlobalData); + DrawBackgroundPreview(drawItem, pData); } } @@ -770,8 +763,8 @@ switch(lpnm->code) { case PSN_APPLY: - SetWallpaper(pGlobalData); - SetDesktopBackColor(hwndDlg, pGlobalData); + SetWallpaper(pData); + SetDesktopBackColor(hwndDlg, pData); return TRUE; case LVN_ITEMCHANGED: @@ -781,23 +774,21 @@ if ((nm->uNewState & LVIS_SELECTED) == 0) return FALSE; - ListViewItemChanged(hwndDlg, pGlobalData, nm->iItem); - - } break; + ListViewItemChanged(hwndDlg, pData, nm->iItem); + } + break; } } break; case WM_DESTROY: - if (pGlobalData->pWallpaperBitmap != NULL) - DibFreeImage(pGlobalData->pWallpaperBitmap); - - DeleteObject(pGlobalData->hBitmap); - HeapFree(GetProcessHeap(), 0, pGlobalData); + if (pData->pWallpaperBitmap != NULL) + DibFreeImage(pData->pWallpaperBitmap); + + DeleteObject(pData->hBitmap); + HeapFree(GetProcessHeap(), 0, pData); break; } return FALSE; } - - Modified: trunk/reactos/dll/cpl/desk/desk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.c?rev=48… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/desk.c [iso-8859-1] Sun Sep 19 11:54:33 2010 @@ -131,6 +131,8 @@ UNREFERENCED_PARAMETER(wParam); UNREFERENCED_PARAMETER(uMsg); UNREFERENCED_PARAMETER(hwnd); + + g_GlobalData.desktop_color = GetSysColor(COLOR_DESKTOP); LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); Modified: trunk/reactos/dll/cpl/desk/desk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.h?rev=48… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/desk.h [iso-8859-1] Sun Sep 19 11:54:33 2010 @@ -85,6 +85,13 @@ SETTINGS_ENTRY InitialSettings; } DISPLAY_DEVICE_ENTRY, *PDISPLAY_DEVICE_ENTRY; +typedef struct _GLOBAL_DATA +{ + COLORREF desktop_color; +} GLOBAL_DATA, *PGLOBAL_DATA; + +extern GLOBAL_DATA g_GlobalData; + BOOL DisplayAdvancedSettings(HWND hWndParent, PDISPLAY_DEVICE_ENTRY DisplayDevice); Modified: trunk/reactos/dll/cpl/desk/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/draw.c?rev=48… ============================================================================== --- trunk/reactos/dll/cpl/desk/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/draw.c [iso-8859-1] Sun Sep 19 11:54:33 2010 @@ -541,11 +541,11 @@ { GetMenuStringW(Menu, i, Text, 128, MF_BYPOSITION); - rect.left = x; + rect.left = rect.right = x; rect.top = Rect->top; + rect.bottom = Rect->bottom; DrawTextW(DC, Text, -1, &rect, DT_SINGLELINE | DT_CALCRECT); - - rect.bottom = Rect->bottom; + rect.bottom = Rect->bottom; rect.right += MENU_BAR_ITEMS_SPACE; x += rect.right - rect.left; Modified: trunk/reactos/dll/cpl/desk/preview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/preview.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/preview.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/preview.c [iso-8859-1] Sun Sep 19 11:54:33 2010 @@ -77,6 +77,7 @@ pPreviewData->hbrScrollbar = CreateSolidBrush(theme->crColor[COLOR_SCROLLBAR]); if (pPreviewData->hbrDesktop != NULL) DeleteObject(pPreviewData->hbrDesktop); + pPreviewData->hbrDesktop = CreateSolidBrush(theme->crColor[COLOR_DESKTOP]); if (pPreviewData->hbrWindow != NULL) DeleteObject(pPreviewData->hbrWindow); Modified: trunk/reactos/dll/cpl/desk/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/screensaver.c… ============================================================================== --- trunk/reactos/dll/cpl/desk/screensaver.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/screensaver.c [iso-8859-1] Sun Sep 19 11:54:33 2010 @@ -20,12 +20,12 @@ } ScreenSaverItem; -typedef struct _GLOBAL_DATA +typedef struct _DATA { ScreenSaverItem ScreenSaverItems[MAX_SCREENSAVERS]; PROCESS_INFORMATION PrevWindowPi; int Selection; -} GLOBAL_DATA, *PGLOBAL_DATA; +} DATA, *PDATA; static LPTSTR @@ -75,7 +75,7 @@ static VOID -SelectionChanged(HWND hwndDlg, PGLOBAL_DATA pGlobalData) +SelectionChanged(HWND hwndDlg, PDATA pData) { HWND hwndCombo; BOOL bEnable; @@ -86,7 +86,7 @@ i = (INT)SendMessage(hwndCombo, CB_GETCURSEL, 0, 0); i = (INT)SendMessage(hwndCombo, CB_GETITEMDATA, i, 0); - pGlobalData->Selection = i; + pData->Selection = i; bEnable = (i != 0); @@ -101,31 +101,31 @@ static VOID -SetScreenSaverPreviewBox(HWND hwndDlg, PGLOBAL_DATA pGlobalData) +SetScreenSaverPreviewBox(HWND hwndDlg, PDATA pData) { HWND hPreview = GetDlgItem(hwndDlg, IDC_SCREENS_PREVIEW); STARTUPINFO si; TCHAR szCmdline[2048]; /* kill off the previous preview process*/ - if (pGlobalData->PrevWindowPi.hProcess) - { - TerminateProcess(pGlobalData->PrevWindowPi.hProcess, 0); - CloseHandle(pGlobalData->PrevWindowPi.hProcess); - CloseHandle(pGlobalData->PrevWindowPi.hThread); - pGlobalData->PrevWindowPi.hThread = pGlobalData->PrevWindowPi.hProcess = NULL; - } - - if (pGlobalData->Selection > 0) + if (pData->PrevWindowPi.hProcess) + { + TerminateProcess(pData->PrevWindowPi.hProcess, 0); + CloseHandle(pData->PrevWindowPi.hProcess); + CloseHandle(pData->PrevWindowPi.hThread); + pData->PrevWindowPi.hThread = pData->PrevWindowPi.hProcess = NULL; + } + + if (pData->Selection > 0) { _stprintf(szCmdline, _T("%s /p %u"), - pGlobalData->ScreenSaverItems[pGlobalData->Selection].szFilename, + pData->ScreenSaverItems[pData->Selection].szFilename, hPreview); ZeroMemory(&si, sizeof(si)); si.cb = sizeof(si); - ZeroMemory(&pGlobalData->PrevWindowPi, sizeof(pGlobalData->PrevWindowPi)); + ZeroMemory(&pData->PrevWindowPi, sizeof(pData->PrevWindowPi)); if (!CreateProcess(NULL, szCmdline, @@ -136,9 +136,9 @@ NULL, NULL, &si, - &pGlobalData->PrevWindowPi)) - { - pGlobalData->PrevWindowPi.hThread = pGlobalData->PrevWindowPi.hProcess = NULL; + &pData->PrevWindowPi)) + { + pData->PrevWindowPi.hThread = pData->PrevWindowPi.hProcess = NULL; } } } @@ -181,7 +181,7 @@ static VOID -ScreensaverConfig(HWND hwndDlg, PGLOBAL_DATA pGlobalData) +ScreensaverConfig(HWND hwndDlg, PDATA pData) { /* /c:<hwnd> Run configuration, hwnd is handle of calling window @@ -191,12 +191,12 @@ STARTUPINFO si; PROCESS_INFORMATION pi; - if (pGlobalData->Selection < 1) + if (pData->Selection < 1) return; _stprintf(szCmdline, _T("%s /c:%u"), - pGlobalData->ScreenSaverItems[pGlobalData->Selection].szFilename, + pData->ScreenSaverItems[pData->Selection].szFilename, hwndDlg); ZeroMemory(&si, sizeof(si)); @@ -214,22 +214,22 @@ &pi)) { /* kill off the previous preview process */ - if (pGlobalData->PrevWindowPi.hProcess) - { - TerminateProcess(pGlobalData->PrevWindowPi.hProcess, 0); - CloseHandle(pGlobalData->PrevWindowPi.hProcess); - CloseHandle(pGlobalData->PrevWindowPi.hThread); - pGlobalData->PrevWindowPi.hThread = pGlobalData->PrevWindowPi.hProcess = NULL; + if (pData->PrevWindowPi.hProcess) + { + TerminateProcess(pData->PrevWindowPi.hProcess, 0); + CloseHandle(pData->PrevWindowPi.hProcess); + CloseHandle(pData->PrevWindowPi.hThread); + pData->PrevWindowPi.hThread = pData->PrevWindowPi.hProcess = NULL; } if (WaitForSettingsDialog(hwndDlg, pi.hProcess)) - SetScreenSaverPreviewBox(hwndDlg, pGlobalData); + SetScreenSaverPreviewBox(hwndDlg, pData); } } static VOID -ScreensaverPreview(HWND hwndDlg, PGLOBAL_DATA pGlobalData) +ScreensaverPreview(HWND hwndDlg, PDATA pData) { /* /s Run normal @@ -239,21 +239,21 @@ STARTUPINFO si; PROCESS_INFORMATION pi; - if (pGlobalData->Selection < 1) + if (pData->Selection < 1) return; /* kill off the previous preview process*/ - if (pGlobalData->PrevWindowPi.hProcess) - { - TerminateProcess(pGlobalData->PrevWindowPi.hProcess, 0); - CloseHandle(pGlobalData->PrevWindowPi.hProcess); - CloseHandle(pGlobalData->PrevWindowPi.hThread); - pGlobalData->PrevWindowPi.hThread = pGlobalData->PrevWindowPi.hProcess = NULL; + if (pData->PrevWindowPi.hProcess) + { + TerminateProcess(pData->PrevWindowPi.hProcess, 0); + CloseHandle(pData->PrevWindowPi.hProcess); + CloseHandle(pData->PrevWindowPi.hThread); + pData->PrevWindowPi.hThread = pData->PrevWindowPi.hProcess = NULL; } _stprintf(szCmdline, _T("%s /s"), - pGlobalData->ScreenSaverItems[pGlobalData->Selection].szFilename); + pData->ScreenSaverItems[pData->Selection].szFilename); ZeroMemory(&si, sizeof(si)); si.cb = sizeof(si); @@ -322,7 +322,7 @@ static VOID -AddScreenSavers(HWND hwndDlg, PGLOBAL_DATA pGlobalData) +AddScreenSavers(HWND hwndDlg, PDATA pData) { HWND hwndScreenSavers = GetDlgItem(hwndDlg, IDC_SCREENS_LIST); WIN32_FIND_DATA fd; @@ -334,7 +334,7 @@ HANDLE hModule = NULL; /* Add the "None" item */ - ScreenSaverItem = &pGlobalData->ScreenSaverItems[ScreenSaverCount]; + ScreenSaverItem = &pData->ScreenSaverItems[ScreenSaverCount]; ScreenSaverItem->bIsScreenSaver = FALSE; @@ -374,7 +374,7 @@ _tcscat(filename, TEXT("\\")); _tcscat(filename, fd.cFileName); - ScreenSaverItem = &pGlobalData->ScreenSaverItems[ScreenSaverCount]; + ScreenSaverItem = &pData->ScreenSaverItems[ScreenSaverCount]; ScreenSaverItem->bIsScreenSaver = TRUE; @@ -416,7 +416,7 @@ static VOID -SetScreenSaver(HWND hwndDlg, PGLOBAL_DATA pGlobalData) +SetScreenSaver(HWND hwndDlg, PDATA pData) { HKEY regKey; @@ -432,14 +432,14 @@ UINT Ret; /* set the screensaver */ - if (pGlobalData->ScreenSaverItems[pGlobalData->Selection].bIsScreenSaver) + if (pData->ScreenSaverItems[pData->Selection].bIsScreenSaver) { RegSetValueEx(regKey, _T("SCRNSAVE.EXE"), 0, REG_SZ, - (PBYTE)pGlobalData->ScreenSaverItems[pGlobalData->Selection].szFilename, - _tcslen(pGlobalData->ScreenSaverItems[pGlobalData->Selection].szFilename) * sizeof(TCHAR)); + (PBYTE)pData->ScreenSaverItems[pData->Selection].szFilename, + _tcslen(pData->ScreenSaverItems[pData->Selection].szFilename) * sizeof(TCHAR)); } else { @@ -485,16 +485,16 @@ static BOOL -OnInitDialog(HWND hwndDlg, PGLOBAL_DATA pGlobalData) +OnInitDialog(HWND hwndDlg, PDATA pData) { LPTSTR lpCurSs; HWND hwndSSCombo = GetDlgItem(hwndDlg, IDC_SCREENS_LIST); INT Num; - pGlobalData = HeapAlloc(GetProcessHeap(), + pData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(GLOBAL_DATA)); - if (!pGlobalData) + sizeof(DATA)); + if (!pData) { EndDialog(hwndDlg, -1); return FALSE; @@ -502,9 +502,9 @@ SetWindowLongPtr(hwndDlg, DWLP_USER, - (LONG_PTR)pGlobalData); - - pGlobalData->Selection = -1; + (LONG_PTR)pData); + + pData->Selection = -1; SendDlgItemMessage(hwndDlg, IDC_SCREENS_TIME, @@ -514,7 +514,7 @@ ((short) 240, (short) 1)); AddScreenSavers(hwndDlg, - pGlobalData); + pData); CheckRegScreenSaverIsSecure(hwndDlg); @@ -527,7 +527,7 @@ for (i = 0; i < MAX_SCREENSAVERS; i++) { - if (!_tcscmp(lpCurSs, pGlobalData->ScreenSaverItems[i].szFilename)) + if (!_tcscmp(lpCurSs, pData->ScreenSaverItems[i].szFilename)) { bFound = TRUE; break; @@ -539,7 +539,7 @@ Num = SendMessage(hwndSSCombo, CB_FINDSTRINGEXACT, -1, - (LPARAM)pGlobalData->ScreenSaverItems[i].szDisplayName); + (LPARAM)pData->ScreenSaverItems[i].szDisplayName); if (Num != CB_ERR) SendMessage(hwndSSCombo, CB_SETCURSEL, @@ -588,7 +588,7 @@ } SelectionChanged(hwndDlg, - pGlobalData); + pData); return TRUE; } @@ -600,36 +600,36 @@ WPARAM wParam, LPARAM lParam) { - PGLOBAL_DATA pGlobalData; - - pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + PDATA pData; + + pData = (PDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); switch (uMsg) { case WM_INITDIALOG: { - OnInitDialog(hwndDlg, pGlobalData); + OnInitDialog(hwndDlg, pData); break; } case WM_DESTROY: { - if (pGlobalData->PrevWindowPi.hProcess) + if (pData->PrevWindowPi.hProcess) { - TerminateProcess(pGlobalData->PrevWindowPi.hProcess, 0); - CloseHandle(pGlobalData->PrevWindowPi.hProcess); - CloseHandle(pGlobalData->PrevWindowPi.hThread); + TerminateProcess(pData->PrevWindowPi.hProcess, 0); + CloseHandle(pData->PrevWindowPi.hProcess); + CloseHandle(pData->PrevWindowPi.hThread); } HeapFree(GetProcessHeap(), 0, - pGlobalData); + pData); break; } case WM_ENDSESSION: { SetScreenSaverPreviewBox(hwndDlg, - pGlobalData); + pData); break; } @@ -644,8 +644,8 @@ { if (HIWORD(wParam) == CBN_SELCHANGE) { - SelectionChanged(hwndDlg, pGlobalData); - SetScreenSaverPreviewBox(hwndDlg, pGlobalData); + SelectionChanged(hwndDlg, pData); + SetScreenSaverPreviewBox(hwndDlg, pData); PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } break; @@ -668,8 +668,8 @@ { if(command == BN_CLICKED) { - ScreensaverPreview(hwndDlg, pGlobalData); - SetScreenSaverPreviewBox(hwndDlg, pGlobalData); + ScreensaverPreview(hwndDlg, pData); + SetScreenSaverPreviewBox(hwndDlg, pData); } break; } @@ -677,7 +677,7 @@ case IDC_SCREENS_SETTINGS: // Screensaver Settings { if (command == BN_CLICKED) - ScreensaverConfig(hwndDlg, pGlobalData); + ScreensaverConfig(hwndDlg, pData); break; } @@ -702,7 +702,7 @@ { case PSN_APPLY: { - SetScreenSaver(hwndDlg, pGlobalData); + SetScreenSaver(hwndDlg, pData); return TRUE; } @@ -710,7 +710,7 @@ { /* activate screen saver support */ SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, TRUE, 0, SPIF_SENDCHANGE); - SetScreenSaverPreviewBox(hwndDlg, pGlobalData); + SetScreenSaverPreviewBox(hwndDlg, pData); break; } @@ -718,12 +718,12 @@ { /* Disable screensaver support */ SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, FALSE, 0, SPIF_SENDCHANGE); - if (pGlobalData->PrevWindowPi.hProcess) + if (pData->PrevWindowPi.hProcess) { - TerminateProcess(pGlobalData->PrevWindowPi.hProcess, 0); - CloseHandle(pGlobalData->PrevWindowPi.hProcess); - CloseHandle(pGlobalData->PrevWindowPi.hThread); - pGlobalData->PrevWindowPi.hThread = pGlobalData->PrevWindowPi.hProcess = NULL; + TerminateProcess(pData->PrevWindowPi.hProcess, 0); + CloseHandle(pData->PrevWindowPi.hProcess); + CloseHandle(pData->PrevWindowPi.hThread); + pData->PrevWindowPi.hThread = pData->PrevWindowPi.hProcess = NULL; } break; } Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/settings.c [iso-8859-1] Sun Sep 19 11:54:33 2010 @@ -11,38 +11,38 @@ #include "desk.h" #include "monslctl.h" -typedef struct _GLOBAL_DATA +typedef struct _DATA { PDISPLAY_DEVICE_ENTRY DisplayDeviceList; PDISPLAY_DEVICE_ENTRY CurrentDisplayDevice; HBITMAP hSpectrumBitmaps[NUM_SPECTRUM_BITMAPS]; int cxSource[NUM_SPECTRUM_BITMAPS]; int cySource[NUM_SPECTRUM_BITMAPS]; -} GLOBAL_DATA, *PGLOBAL_DATA; +} DATA, *PDATA; static VOID -UpdateDisplay(IN HWND hwndDlg, PGLOBAL_DATA pGlobalData, IN BOOL bUpdateThumb) +UpdateDisplay(IN HWND hwndDlg, PDATA pData, IN BOOL bUpdateThumb) { TCHAR Buffer[64]; TCHAR Pixel[64]; DWORD index; LoadString(hApplet, IDS_PIXEL, Pixel, sizeof(Pixel) / sizeof(TCHAR)); - _stprintf(Buffer, Pixel, pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth, pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight, Pixel); + _stprintf(Buffer, Pixel, pData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth, pData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight, Pixel); SendDlgItemMessage(hwndDlg, IDC_SETTINGS_RESOLUTION_TEXT, WM_SETTEXT, 0, (LPARAM)Buffer); - for (index = 0; index < pGlobalData->CurrentDisplayDevice->ResolutionsCount; index++) - { - if (pGlobalData->CurrentDisplayDevice->Resolutions[index].dmPelsWidth == pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth && - pGlobalData->CurrentDisplayDevice->Resolutions[index].dmPelsHeight == pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight) + for (index = 0; index < pData->CurrentDisplayDevice->ResolutionsCount; index++) + { + if (pData->CurrentDisplayDevice->Resolutions[index].dmPelsWidth == pData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth && + pData->CurrentDisplayDevice->Resolutions[index].dmPelsHeight == pData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight) { if (bUpdateThumb) SendDlgItemMessage(hwndDlg, IDC_SETTINGS_RESOLUTION, TBM_SETPOS, TRUE, index); break; } } - if (LoadString(hApplet, (2900 + pGlobalData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel), Buffer, sizeof(Buffer) / sizeof(TCHAR))) + if (LoadString(hApplet, (2900 + pData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel), Buffer, sizeof(Buffer) / sizeof(TCHAR))) SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_SELECTSTRING, (WPARAM)-1, (LPARAM)Buffer); } @@ -140,7 +140,7 @@ } static BOOL -AddDisplayDevice(IN PGLOBAL_DATA pGlobalData, IN const DISPLAY_DEVICE *DisplayDevice) +AddDisplayDevice(IN PDATA pData, IN const DISPLAY_DEVICE *DisplayDevice) { PDISPLAY_DEVICE_ENTRY newEntry = NULL; LPTSTR description = NULL; @@ -216,8 +216,8 @@ newEntry->DeviceKey = key; newEntry->DeviceID = devid; newEntry->DeviceStateFlags = DisplayDevice->StateFlags; - newEntry->Flink = pGlobalData->DisplayDeviceList; - pGlobalData->DisplayDeviceList = newEntry; + newEntry->Flink = pData->DisplayDeviceList; + pData->DisplayDeviceList = newEntry; return TRUE; ByeBye: @@ -247,12 +247,12 @@ } static VOID -OnDisplayDeviceChanged(IN HWND hwndDlg, IN PGLOBAL_DATA pGlobalData, IN PDISPLAY_DEVICE_ENTRY pDeviceEntry) +OnDisplayDeviceChanged(IN HWND hwndDlg, IN PDATA pData, IN PDISPLAY_DEVICE_ENTRY pDeviceEntry) { PSETTINGS_ENTRY Current; DWORD index; - pGlobalData->CurrentDisplayDevice = pDeviceEntry; /* Update global variable */ + pData->CurrentDisplayDevice = pDeviceEntry; /* Update variable */ /* Fill color depths combo box */ SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_RESETCONTENT, 0, 0); @@ -274,7 +274,7 @@ SendDlgItemMessage(hwndDlg, IDC_SETTINGS_RESOLUTION, TBM_CLEARTICS, TRUE, 0); SendDlgItemMessage(hwndDlg, IDC_SETTINGS_RESOLUTION, TBM_SETRANGE, TRUE, MAKELONG(0, pDeviceEntry->ResolutionsCount - 1)); - UpdateDisplay(hwndDlg, pGlobalData, TRUE); + UpdateDisplay(hwndDlg, pData, TRUE); } static VOID @@ -285,22 +285,22 @@ DWORD iDevNum = 0; DWORD i; DISPLAY_DEVICE displayDevice; - PGLOBAL_DATA pGlobalData; - - pGlobalData = HeapAlloc(GetProcessHeap(), 0, sizeof(GLOBAL_DATA)); - if (pGlobalData == NULL) + PDATA pData; + + pData = HeapAlloc(GetProcessHeap(), 0, sizeof(DATA)); + if (pData == NULL) return; - SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pData); /* Get video cards list */ - pGlobalData->DisplayDeviceList = NULL; + pData->DisplayDeviceList = NULL; displayDevice.cb = (DWORD)sizeof(DISPLAY_DEVICE); while (EnumDisplayDevices(NULL, iDevNum, &displayDevice, 0x1)) { if ((displayDevice.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) != 0) { - if (AddDisplayDevice(pGlobalData, &displayDevice)) + if (AddDisplayDevice(pData, &displayDevice)) Result++; } iDevNum++; @@ -316,7 +316,7 @@ ShowWindow(GetDlgItem(hwndDlg, IDC_SETTINGS_SPECTRUM), SW_HIDE); /* Do not initialize the color spectrum bitmaps */ - memset(pGlobalData->hSpectrumBitmaps, 0, sizeof(pGlobalData->hSpectrumBitmaps)); + memset(pData->hSpectrumBitmaps, 0, sizeof(pData->hSpectrumBitmaps)); return; } else if (Result == 1) @@ -324,12 +324,12 @@ MONSL_MONINFO monitors; /* Single video adapter */ - SendDlgItemMessage(hwndDlg, IDC_SETTINGS_DEVICE, WM_SETTEXT, 0, (LPARAM)pGlobalData->DisplayDeviceList->DeviceDescription); - OnDisplayDeviceChanged(hwndDlg, pGlobalData, pGlobalData->DisplayDeviceList); + SendDlgItemMessage(hwndDlg, IDC_SETTINGS_DEVICE, WM_SETTEXT, 0, (LPARAM)pData->DisplayDeviceList->DeviceDescription); + OnDisplayDeviceChanged(hwndDlg, pData, pData->DisplayDeviceList); monitors.Position.x = monitors.Position.y = 0; - monitors.Size.cx = pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth; - monitors.Size.cy = pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight; + monitors.Size.cx = pData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth; + monitors.Size.cy = pData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight; monitors.Flags = 0; SendDlgItemMessage(hwndDlg, IDC_SETTINGS_MONSEL, @@ -342,8 +342,8 @@ PMONSL_MONINFO pMonitors; DWORD i; - SendDlgItemMessage(hwndDlg, IDC_SETTINGS_DEVICE, WM_SETTEXT, 0, (LPARAM)pGlobalData->DisplayDeviceList->DeviceDescription); - OnDisplayDeviceChanged(hwndDlg, pGlobalData, pGlobalData->DisplayDeviceList); + SendDlgItemMessage(hwndDlg, IDC_SETTINGS_DEVICE, WM_SETTEXT, 0, (LPARAM)pData->DisplayDeviceList->DeviceDescription); + OnDisplayDeviceChanged(hwndDlg, pData, pData->DisplayDeviceList); pMonitors = (PMONSL_MONINFO)HeapAlloc(GetProcessHeap(), 0, sizeof(MONSL_MONINFO) * Result); if (pMonitors) @@ -353,8 +353,8 @@ { pMonitors[i].Position.x = hack * i; pMonitors[i].Position.y = 0; - pMonitors[i].Size.cx = pGlobalData->DisplayDeviceList->CurrentSettings->dmPelsWidth; - pMonitors[i].Size.cy = pGlobalData->DisplayDeviceList->CurrentSettings->dmPelsHeight; + pMonitors[i].Size.cx = pData->DisplayDeviceList->CurrentSettings->dmPelsWidth; + pMonitors[i].Size.cy = pData->DisplayDeviceList->CurrentSettings->dmPelsHeight; pMonitors[i].Flags = 0; } @@ -371,27 +371,27 @@ /* Initialize the color spectrum bitmaps */ for(i = 0; i < NUM_SPECTRUM_BITMAPS; i++) { - pGlobalData->hSpectrumBitmaps[i] = LoadImageW(hApplet, MAKEINTRESOURCEW(IDB_SPECTRUM_4 + i), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); - - if (pGlobalData->hSpectrumBitmaps[i] != NULL) - { - if (GetObjectW(pGlobalData->hSpectrumBitmaps[i], sizeof(BITMAP), &bitmap) != 0) - { - pGlobalData->cxSource[i] = bitmap.bmWidth; - pGlobalData->cySource[i] = bitmap.bmHeight; + pData->hSpectrumBitmaps[i] = LoadImageW(hApplet, MAKEINTRESOURCEW(IDB_SPECTRUM_4 + i), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + + if (pData->hSpectrumBitmaps[i] != NULL) + { + if (GetObjectW(pData->hSpectrumBitmaps[i], sizeof(BITMAP), &bitmap) != 0) + { + pData->cxSource[i] = bitmap.bmWidth; + pData->cySource[i] = bitmap.bmHeight; } else { - pGlobalData->cxSource[i] = 0; - pGlobalData->cySource[i] = 0; - } - } - } -} - -/* Get the ID for GLOBAL_DATA::hSpectrumBitmaps */ + pData->cxSource[i] = 0; + pData->cySource[i] = 0; + } + } + } +} + +/* Get the ID for DATA::hSpectrumBitmaps */ static VOID -ShowColorSpectrum(IN HDC hDC, IN LPRECT client, IN DWORD BitsPerPel, IN PGLOBAL_DATA pGlobalData) +ShowColorSpectrum(IN HDC hDC, IN LPRECT client, IN DWORD BitsPerPel, IN PDATA pData) { HDC hdcMem; INT iBitmap; @@ -408,22 +408,22 @@ default: iBitmap = 2; } - if (SelectObject(hdcMem, pGlobalData->hSpectrumBitmaps[iBitmap])) + if (SelectObject(hdcMem, pData->hSpectrumBitmaps[iBitmap])) { StretchBlt(hDC, client->left, client->top, client->right - client->left, client->bottom - client->top, hdcMem, 0, 0, - pGlobalData->cxSource[iBitmap], - pGlobalData->cySource[iBitmap], SRCCOPY); + pData->cxSource[iBitmap], + pData->cySource[iBitmap], SRCCOPY); } DeleteDC(hdcMem); } static VOID -OnBPPChanged(IN HWND hwndDlg, IN PGLOBAL_DATA pGlobalData) +OnBPPChanged(IN HWND hwndDlg, IN PDATA pData) { /* if new BPP is not compatible with resolution: * 1) try to find the nearest smaller matching resolution @@ -443,10 +443,10 @@ hSpectrumControl = GetDlgItem(hwndDlg, IDC_SETTINGS_SPECTRUM); hSpectrumDC = GetDC(hSpectrumControl); GetClientRect(hSpectrumControl, &client); - ShowColorSpectrum(hSpectrumDC, &client, dmNewBitsPerPel, pGlobalData); + ShowColorSpectrum(hSpectrumDC, &client, dmNewBitsPerPel, pData); /* find if new parameters are valid */ - Current = pGlobalData->CurrentDisplayDevice->CurrentSettings; + Current = pData->CurrentDisplayDevice->CurrentSettings; if (dmNewBitsPerPel == Current->dmBitsPerPel) { /* no change */ @@ -461,11 +461,11 @@ while (Current != NULL) { if (Current->dmBitsPerPel == dmNewBitsPerPel - && Current->dmPelsHeight == pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight - && Current->dmPelsWidth == pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth) - { - pGlobalData->CurrentDisplayDevice->CurrentSettings = Current; - UpdateDisplay(hwndDlg, pGlobalData, TRUE); + && Current->dmPelsHeight == pData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight + && Current->dmPelsWidth == pData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth) + { + pData->CurrentDisplayDevice->CurrentSettings = Current; + UpdateDisplay(hwndDlg, pData, TRUE); return; } Current = Current->Blink; @@ -477,11 +477,11 @@ while (Current != NULL) { if (Current->dmBitsPerPel == dmNewBitsPerPel - && Current->dmPelsHeight == pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight - && Current->dmPelsWidth == pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth) - { - pGlobalData->CurrentDisplayDevice->CurrentSettings = Current; - UpdateDisplay(hwndDlg, pGlobalData, TRUE); + && Current->dmPelsHeight == pData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight + && Current->dmPelsWidth == pData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth) + { + pData->CurrentDisplayDevice->CurrentSettings = Current; + UpdateDisplay(hwndDlg, pData, TRUE); return; } Current = Current->Flink; @@ -489,26 +489,26 @@ } /* search smaller resolution compatible with current color depth */ - Current = pGlobalData->CurrentDisplayDevice->CurrentSettings->Blink; + Current = pData->CurrentDisplayDevice->CurrentSettings->Blink; while (Current != NULL) { if (Current->dmBitsPerPel == dmNewBitsPerPel) { - pGlobalData->CurrentDisplayDevice->CurrentSettings = Current; - UpdateDisplay(hwndDlg, pGlobalData, TRUE); + pData->CurrentDisplayDevice->CurrentSettings = Current; + UpdateDisplay(hwndDlg, pData, TRUE); return; } Current = Current->Blink; } /* search bigger resolution compatible with current color depth */ - Current = pGlobalData->CurrentDisplayDevice->CurrentSettings->Flink; + Current = pData->CurrentDisplayDevice->CurrentSettings->Flink; while (Current != NULL) { if (Current->dmBitsPerPel == dmNewBitsPerPel) { - pGlobalData->CurrentDisplayDevice->CurrentSettings = Current; - UpdateDisplay(hwndDlg, pGlobalData, TRUE); + pData->CurrentDisplayDevice->CurrentSettings = Current; + UpdateDisplay(hwndDlg, pData, TRUE); return; } Current = Current->Flink; @@ -518,7 +518,7 @@ } static VOID -OnResolutionChanged(IN HWND hwndDlg, IN PGLOBAL_DATA pGlobalData, IN DWORD NewPosition, +OnResolutionChanged(IN HWND hwndDlg, IN PDATA pData, IN DWORD NewPosition, IN BOOL bUpdateThumb) { /* if new resolution is not compatible with color depth: @@ -526,11 +526,11 @@ * 2) otherwise, get the nearest smaller color depth */ PSETTINGS_ENTRY Current; - DWORD dmNewPelsHeight = pGlobalData->CurrentDisplayDevice->Resolutions[NewPosition].dmPelsHeight; - DWORD dmNewPelsWidth = pGlobalData->CurrentDisplayDevice->Resolutions[NewPosition].dmPelsWidth; + DWORD dmNewPelsHeight = pData->CurrentDisplayDevice->Resolutions[NewPosition].dmPelsHeight; + DWORD dmNewPelsWidth = pData->CurrentDisplayDevice->Resolutions[NewPosition].dmPelsWidth; /* find if new parameters are valid */ - Current = pGlobalData->CurrentDisplayDevice->CurrentSettings; + Current = pData->CurrentDisplayDevice->CurrentSettings; if (dmNewPelsHeight == Current->dmPelsHeight && dmNewPelsWidth == Current->dmPelsWidth) { /* no change */ @@ -546,10 +546,10 @@ { if (Current->dmPelsHeight == dmNewPelsHeight && Current->dmPelsWidth == dmNewPelsWidth - && Current->dmBitsPerPel == pGlobalData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel) - { - pGlobalData->CurrentDisplayDevice->CurrentSettings = Current; - UpdateDisplay(hwndDlg, pGlobalData, bUpdateThumb); + && Current->dmBitsPerPel == pData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel) + { + pData->CurrentDisplayDevice->CurrentSettings = Current; + UpdateDisplay(hwndDlg, pData, bUpdateThumb); return; } Current = Current->Blink; @@ -562,10 +562,10 @@ { if (Current->dmPelsHeight == dmNewPelsHeight && Current->dmPelsWidth == dmNewPelsWidth - && Current->dmBitsPerPel == pGlobalData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel) - { - pGlobalData->CurrentDisplayDevice->CurrentSettings = Current; - UpdateDisplay(hwndDlg, pGlobalData, bUpdateThumb); + && Current->dmBitsPerPel == pData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel) + { + pData->CurrentDisplayDevice->CurrentSettings = Current; + UpdateDisplay(hwndDlg, pData, bUpdateThumb); return; } Current = Current->Flink; @@ -573,26 +573,26 @@ } /* search bigger color depth compatible with current resolution */ - Current = pGlobalData->CurrentDisplayDevice->CurrentSettings->Flink; + Current = pData->CurrentDisplayDevice->CurrentSettings->Flink; while (Current != NULL) { if (dmNewPelsHeight == Current->dmPelsHeight && dmNewPelsWidth == Current->dmPelsWidth) { - pGlobalData->CurrentDisplayDevice->CurrentSettings = Current; - UpdateDisplay(hwndDlg, pGlobalData, bUpdateThumb); + pData->CurrentDisplayDevice->CurrentSettings = Current; + UpdateDisplay(hwndDlg, pData, bUpdateThumb); return; } Current = Current->Flink; } /* search smaller color depth compatible with current resolution */ - Current = pGlobalData->CurrentDisplayDevice->CurrentSettings->Blink; + Current = pData->CurrentDisplayDevice->CurrentSettings->Blink; while (Current != NULL) { if (dmNewPelsHeight == Current->dmPelsHeight && dmNewPelsWidth == Current->dmPelsWidth) { - pGlobalData->CurrentDisplayDevice->CurrentSettings = Current; - UpdateDisplay(hwndDlg, pGlobalData, bUpdateThumb); + pData->CurrentDisplayDevice->CurrentSettings = Current; + UpdateDisplay(hwndDlg, pData, bUpdateThumb); return; } Current = Current->Blink; @@ -625,10 +625,10 @@ INT_PTR CALLBACK SettingsPageProc(IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lParam) { - PGLOBAL_DATA pGlobalData; + PDATA pData; TCHAR Message[1024], Title[256]; - pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + pData = (PDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); switch(uMsg) { @@ -643,7 +643,7 @@ lpDrawItem = (LPDRAWITEMSTRUCT) lParam; if (lpDrawItem->CtlID == IDC_SETTINGS_SPECTRUM) - ShowColorSpectrum(lpDrawItem->hDC, &lpDrawItem->rcItem, pGlobalData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel, pGlobalData); + ShowColorSpectrum(lpDrawItem->hDC, &lpDrawItem->rcItem, pData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel, pData); break; } case WM_COMMAND: @@ -652,9 +652,9 @@ DWORD command = HIWORD(wParam); if (controlId == IDC_SETTINGS_ADVANCED && command == BN_CLICKED) - DisplayAdvancedSettings(hwndDlg, pGlobalData->CurrentDisplayDevice); + DisplayAdvancedSettings(hwndDlg, pData->CurrentDisplayDevice); else if (controlId == IDC_SETTINGS_BPP && command == CBN_SELCHANGE) - OnBPPChanged(hwndDlg, pGlobalData); + OnBPPChanged(hwndDlg, pData); break; } case WM_HSCROLL: @@ -670,12 +670,12 @@ case TB_ENDTRACK: { DWORD newPosition = (DWORD) SendDlgItemMessage(hwndDlg, IDC_SETTINGS_RESOLUTION, TBM_GETPOS, 0, 0); - OnResolutionChanged(hwndDlg, pGlobalData, newPosition, TRUE); + OnResolutionChanged(hwndDlg, pData, newPosition, TRUE); break; } case TB_THUMBTRACK: - OnResolutionChanged(hwndDlg, pGlobalData, HIWORD(wParam), FALSE); + OnResolutionChanged(hwndDlg, pData, HIWORD(wParam), FALSE); break; } break; @@ -685,9 +685,9 @@ LPNMHDR lpnm = (LPNMHDR)lParam; if (lpnm->code == (UINT)PSN_APPLY) { - if (pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth != pGlobalData->CurrentDisplayDevice->InitialSettings.dmPelsWidth - || pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight != pGlobalData->CurrentDisplayDevice->InitialSettings.dmPelsHeight - || pGlobalData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel != pGlobalData->CurrentDisplayDevice->InitialSettings.dmBitsPerPel) + if (pData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth != pData->CurrentDisplayDevice->InitialSettings.dmPelsWidth + || pData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight != pData->CurrentDisplayDevice->InitialSettings.dmPelsHeight + || pData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel != pData->CurrentDisplayDevice->InitialSettings.dmBitsPerPel) { /* FIXME: Need to test changes */ /* Apply new settings */ @@ -695,13 +695,13 @@ DEVMODE devmode; RtlZeroMemory(&devmode, sizeof(DEVMODE)); devmode.dmSize = (WORD)sizeof(DEVMODE); - devmode.dmPelsWidth = pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth; - devmode.dmPelsHeight = pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight; - devmode.dmBitsPerPel = pGlobalData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel; - devmode.dmDisplayFrequency = pGlobalData->CurrentDisplayDevice->CurrentSettings->dmDisplayFrequency; + devmode.dmPelsWidth = pData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth; + devmode.dmPelsHeight = pData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight; + devmode.dmBitsPerPel = pData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel; + devmode.dmDisplayFrequency = pData->CurrentDisplayDevice->CurrentSettings->dmDisplayFrequency; devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFREQUENCY; rc = ChangeDisplaySettingsEx( - pGlobalData->CurrentDisplayDevice->DeviceName, + pData->CurrentDisplayDevice->DeviceName, &devmode, NULL, CDS_UPDATEREGISTRY, @@ -709,9 +709,9 @@ switch (rc) { case DISP_CHANGE_SUCCESSFUL: - pGlobalData->CurrentDisplayDevice->InitialSettings.dmPelsWidth = pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth; - pGlobalData->CurrentDisplayDevice->InitialSettings.dmPelsHeight = pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight; - pGlobalData->CurrentDisplayDevice->InitialSettings.dmBitsPerPel = pGlobalData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel; + pData->CurrentDisplayDevice->InitialSettings.dmPelsWidth = pData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth; + pData->CurrentDisplayDevice->InitialSettings.dmPelsHeight = pData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight; + pData->CurrentDisplayDevice->InitialSettings.dmBitsPerPel = pData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel; break; case DISP_CHANGE_RESTART: LoadString(hApplet, IDS_DISPLAY_SETTINGS, Title, sizeof(Title) / sizeof(TCHAR)); @@ -833,7 +833,7 @@ case WM_DESTROY: { DWORD i; - PDISPLAY_DEVICE_ENTRY Current = pGlobalData->DisplayDeviceList; + PDISPLAY_DEVICE_ENTRY Current = pData->DisplayDeviceList; while (Current != NULL) { @@ -851,11 +851,11 @@ for (i = 0; i < NUM_SPECTRUM_BITMAPS; i++) { - if (pGlobalData->hSpectrumBitmaps[i]) - DeleteObject(pGlobalData->hSpectrumBitmaps[i]); - } - - HeapFree(GetProcessHeap(), 0, pGlobalData); + if (pData->hSpectrumBitmaps[i]) + DeleteObject(pData->hSpectrumBitmaps[i]); + } + + HeapFree(GetProcessHeap(), 0, pData); } } return FALSE;

14 years, 3 months

[akhaldi] 48811: [CMAKE] - Add network drivers (afd, ne2000, pcnet, ndis, tcpip and tdi) to build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 19 11:19:16 2010 New Revision: 48811 URL: http://svn.reactos.org/svn/reactos?rev=48811&view=rev Log: [CMAKE] - Add network drivers (afd, ne2000, pcnet, ndis, tcpip and tdi) to build. Added: branches/cmake-bringup/drivers/network/CMakeLists.txt (with props) branches/cmake-bringup/drivers/network/afd/CMakeLists.txt (with props) branches/cmake-bringup/drivers/network/dd/CMakeLists.txt (with props) branches/cmake-bringup/drivers/network/dd/ne2000/CMakeLists.txt (with props) branches/cmake-bringup/drivers/network/dd/pcnet/CMakeLists.txt (with props) branches/cmake-bringup/drivers/network/ndis/CMakeLists.txt (with props) branches/cmake-bringup/drivers/network/tcpip/CMakeLists.txt (with props) branches/cmake-bringup/drivers/network/tdi/CMakeLists.txt (with props) Modified: branches/cmake-bringup/drivers/CMakeLists.txt Modified: branches/cmake-bringup/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/CMakeList… ============================================================================== --- branches/cmake-bringup/drivers/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/CMakeLists.txt [iso-8859-1] Sun Sep 19 11:19:16 2010 @@ -4,6 +4,7 @@ add_subdirectory(bus) add_subdirectory(filesystems) add_subdirectory(input) +add_subdirectory(network) add_subdirectory(setup) add_subdirectory(storage) add_subdirectory(video) Added: branches/cmake-bringup/drivers/network/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/C… ============================================================================== --- branches/cmake-bringup/drivers/network/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/network/CMakeLists.txt [iso-8859-1] Sun Sep 19 11:19:16 2010 @@ -1,0 +1,6 @@ + +add_subdirectory(afd) +add_subdirectory(dd) +add_subdirectory(ndis) +add_subdirectory(tcpip) +add_subdirectory(tdi) Propchange: branches/cmake-bringup/drivers/network/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/network/afd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/a… ============================================================================== --- branches/cmake-bringup/drivers/network/afd/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/network/afd/CMakeLists.txt [iso-8859-1] Sun Sep 19 11:19:16 2010 @@ -1,0 +1,30 @@ + +include_directories(BEFORE include) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers) + +list(APPEND SOURCE + afd/bind.c + afd/connect.c + afd/context.c + afd/info.c + afd/listen.c + afd/lock.c + afd/main.c + afd/read.c + afd/select.c + afd/tdi.c + afd/tdiconn.c + afd/write.c + afd.rc) + +add_library(afd SHARED ${CMAKE_CURRENT_BINARY_DIR}/afd_afd.h.gch ${SOURCE}) + +set_target_properties(afd PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(afd + pseh + -lntoskrnl + -lhal) + +add_pch(afd ${CMAKE_CURRENT_SOURCE_DIR}/include/afd.h ${SOURCE}) +add_dependencies(afd psdk bugcodes buildno_header) Propchange: branches/cmake-bringup/drivers/network/afd/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/network/dd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/d… ============================================================================== --- branches/cmake-bringup/drivers/network/dd/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/network/dd/CMakeLists.txt [iso-8859-1] Sun Sep 19 11:19:16 2010 @@ -1,0 +1,3 @@ + +add_subdirectory(ne2000) +add_subdirectory(pcnet) Propchange: branches/cmake-bringup/drivers/network/dd/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/network/dd/ne2000/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/d… ============================================================================== --- branches/cmake-bringup/drivers/network/dd/ne2000/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/network/dd/ne2000/CMakeLists.txt [iso-8859-1] Sun Sep 19 11:19:16 2010 @@ -1,0 +1,18 @@ + +include_directories(BEFORE include) + +list(APPEND SOURCE + ne2000/8390.c + ne2000/main.c + ne2000.rc) + +add_library(ne2000 SHARED ${SOURCE}) + +set_target_properties(ne2000 PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(ne2000 + -lndis + -lntoskrnl + -lhal) + +add_dependencies(ne2000 psdk bugcodes buildno_header) Propchange: branches/cmake-bringup/drivers/network/dd/ne2000/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/network/dd/pcnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/d… ============================================================================== --- branches/cmake-bringup/drivers/network/dd/pcnet/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/network/dd/pcnet/CMakeLists.txt [iso-8859-1] Sun Sep 19 11:19:16 2010 @@ -1,0 +1,21 @@ + +add_definitions(-DNDIS50_MINIPORT) +add_definitions(-DNDIS_MINIPORT_DRIVER) +add_definitions(-DNDIS_LEGACY_MINIPORT) +add_definitions(-DNDIS51_MINIPORT) + +list(APPEND SOURCE + pcnet.c + requests.c + pcnet.rc) + +add_library(pcnet SHARED ${SOURCE}) + +set_target_properties(pcnet PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(pcnet + -lndis + -lntoskrnl + -lhal) + +add_dependencies(pcnet psdk bugcodes buildno_header) Propchange: branches/cmake-bringup/drivers/network/dd/pcnet/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/network/ndis/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/n… ============================================================================== --- branches/cmake-bringup/drivers/network/ndis/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/network/ndis/CMakeLists.txt [iso-8859-1] Sun Sep 19 11:19:16 2010 @@ -1,0 +1,46 @@ + +include_directories(BEFORE include) + +add_definitions(-DNDIS_WRAPPER) +add_definitions(-DNDIS51) +add_definitions(-DNDIS51_MINIPORT) +add_definitions(-DNDIS_LEGACY_DRIVER) +add_definitions(-DNDIS_LEGACY_MINIPORT) +add_definitions(-DNDIS_LEGACY_PROTOCOL) +add_definitions(-DNDIS_MINIPORT_DRIVER) + +spec2def(ndis ${CMAKE_CURRENT_SOURCE_DIR}/ndis.spec ${CMAKE_CURRENT_BINARY_DIR}/ndis.def) + +list(APPEND SOURCE + ndis/30stubs.c + ndis/40stubs.c + ndis/50stubs.c + ndis/buffer.c + ndis/cl.c + ndis/cm.c + ndis/co.c + ndis/config.c + ndis/control.c + ndis/efilter.c + ndis/hardware.c + ndis/io.c + ndis/main.c + ndis/memory.c + ndis/miniport.c + ndis/misc.c + ndis/protocol.c + ndis/string.c + ndis/time.c + ndis.rc) + +add_library(ndis SHARED ${CMAKE_CURRENT_BINARY_DIR}/ndis_ndissys.h.gch ${SOURCE}) + +set_target_properties(ndis PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(ndis + ${CMAKE_CURRENT_BINARY_DIR}/ndis.def + -lntoskrnl + -lhal) + +add_pch(ndis ${CMAKE_CURRENT_SOURCE_DIR}/include/ndissys.h ${SOURCE}) +add_dependencies(ndis ndis_def psdk bugcodes buildno_header) Propchange: branches/cmake-bringup/drivers/network/ndis/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/network/tcpip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/t… ============================================================================== --- branches/cmake-bringup/drivers/network/tcpip/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/network/tcpip/CMakeLists.txt [iso-8859-1] Sun Sep 19 11:19:16 2010 @@ -1,0 +1,41 @@ + +include_directories(BEFORE include) +include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/oskittcp/include) + +add_definitions(-DNDIS40) +add_definitions(-D_NTDRIVER_) + +spec2def(tcpip ${CMAKE_CURRENT_SOURCE_DIR}/tcpip.spec ${CMAKE_CURRENT_BINARY_DIR}/tcpip.def) + +list(APPEND SOURCE + datalink/lan.c + tcpip/ainfo.c + tcpip/buffer.c + tcpip/dispatch.c + tcpip/fileobjs.c + tcpip/iinfo.c + tcpip/info.c + tcpip/lock.c + tcpip/main.c + tcpip/ninfo.c + tcpip/proto.c + tcpip/tinfo.c + tcpip/wait.c + tcpip.rc) + +add_library(tcpip SHARED ${CMAKE_CURRENT_BINARY_DIR}/tcpip_precomp.h.gch ${SOURCE}) + +set_target_properties(tcpip PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(tcpip + ${CMAKE_CURRENT_BINARY_DIR}/tcpip.def + ip + oskittcp + pseh + chew + -lndis + -lntoskrnl + -lhal) + +add_pch(tcpip ${CMAKE_CURRENT_SOURCE_DIR}/include/precomp.h ${SOURCE}) +add_dependencies(tcpip tcpip_def psdk bugcodes buildno_header) Propchange: branches/cmake-bringup/drivers/network/tcpip/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/network/tdi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/t… ============================================================================== --- branches/cmake-bringup/drivers/network/tdi/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/network/tdi/CMakeLists.txt [iso-8859-1] Sun Sep 19 11:19:16 2010 @@ -1,0 +1,29 @@ + +include_directories(BEFORE include) +include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/oskittcp/include) + +add_definitions(-DNDIS40) +add_definitions(-D_NTDRIVER_) + +spec2def(tdi ${CMAKE_CURRENT_SOURCE_DIR}/misc/tdi.spec ${CMAKE_CURRENT_BINARY_DIR}/tdi.def) + +list(APPEND SOURCE + cte/string.c + cte/stubs.c + misc/main.c + misc/tdi.rc + tdi/dereg.c + tdi/handler.c + tdi/obsolete.c + tdi/stubs.c) + +add_library(tdi SHARED ${SOURCE}) + +set_target_properties(tdi PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(tdi + ${CMAKE_CURRENT_BINARY_DIR}/tdi.def + -lntoskrnl + -lhal) + +add_dependencies(tdi tdi_def psdk bugcodes buildno_header) Propchange: branches/cmake-bringup/drivers/network/tdi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 3 months

← Newer
1
...
11
12
13
14
15
16
17
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2010