April 2011 - Wine-commits - list.winehq.org

André Hentschel : include: Add more cv_call types.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 14aefc1e4a59c75cf955833bee21f7fc29b1c620 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14aefc1e4a59c75cf955833be… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 15 19:19:29 2011 +0200 include: Add more cv_call types. --- include/cvconst.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/cvconst.h b/include/cvconst.h index 1599a26..d05c99b 100644 --- a/include/cvconst.h +++ b/include/cvconst.h @@ -559,5 +559,11 @@ typedef enum CV_call_e CV_CALL_GENERIC, CV_CALL_ALPHACALL, CV_CALL_PPCCALL, + CV_CALL_SHCALL, + CV_CALL_ARMCALL, + CV_CALL_AM33CALL, + CV_CALL_TRICALL, + CV_CALL_SH5CALL, + CV_CALL_M32RCALL, CV_CALL_RESERVED, } CV_call_e;

1 0

André Hentschel : winedbg: Add ARM string for minidump .
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 3c699c09581b9f38692698cf07618b2380628072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c699c09581b9f38692698cf0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 15 19:19:38 2011 +0200 winedbg: Add ARM string for minidump. --- programs/winedbg/tgt_minidump.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index c24fd8c..142d5ca 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -264,6 +264,9 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) case PROCESSOR_ARCHITECTURE_AMD64: str = "X86_64"; break; + case PROCESSOR_ARCHITECTURE_ARM: + str = "ARM"; + break; default: str = "???"; break;

1 0

André Hentschel : winedbg: Add more ARM registers to the map.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: be729282cea1fa75aeff4bf7136ffed1906140da URL: http://source.winehq.org/git/wine.git/?a=commit;h=be729282cea1fa75aeff4bf71… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 15 19:19:44 2011 +0200 winedbg: Add more ARM registers to the map. --- programs/winedbg/gdbproxy.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 3c86950..fae1582 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -441,6 +441,9 @@ static size_t cpu_register_map[] = { FIELD_OFFSET(CONTEXT, R10), FIELD_OFFSET(CONTEXT, Fp), FIELD_OFFSET(CONTEXT, Ip), + FIELD_OFFSET(CONTEXT, Sp), + FIELD_OFFSET(CONTEXT, Lr), + FIELD_OFFSET(CONTEXT, Pc), }; #else # error Define the registers map for your CPU

1 0

André Hentschel : ntdll: Fix setting the ExceptionAddress on ARM.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: a38f7e86be637d3eaf169b9bd0e7b664afbf963c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a38f7e86be637d3eaf169b9bd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 15 19:32:05 2011 +0200 ntdll: Fix setting the ExceptionAddress on ARM. --- dlls/ntdll/signal_arm.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 992b63c..0934164 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -493,7 +493,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) } rec.ExceptionFlags = EXCEPTION_CONTINUABLE; rec.ExceptionRecord = NULL; - /*rec.ExceptionAddress = (LPVOID)context.Iar;*/ + rec.ExceptionAddress = (LPVOID)context.Pc; rec.NumberParameters = 0; status = raise_exception( &rec, &context, TRUE ); if (status) raise_status( status, &rec ); @@ -519,7 +519,7 @@ static void int_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionCode = CONTROL_C_EXIT; rec.ExceptionFlags = EXCEPTION_CONTINUABLE; rec.ExceptionRecord = NULL; - /*rec.ExceptionAddress = (LPVOID)context.Iar;*/ + rec.ExceptionAddress = (LPVOID)context.Pc; rec.NumberParameters = 0; status = raise_exception( &rec, &context, TRUE ); if (status) raise_status( status, &rec ); @@ -543,7 +543,7 @@ static void abrt_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionCode = EXCEPTION_WINE_ASSERTION; rec.ExceptionFlags = EH_NONCONTINUABLE; rec.ExceptionRecord = NULL; - /*rec.ExceptionAddress = (LPVOID)context.Iar;*/ + rec.ExceptionAddress = (LPVOID)context.Pc; rec.NumberParameters = 0; status = raise_exception( &rec, &context, TRUE ); if (status) raise_status( status, &rec ); @@ -726,7 +726,7 @@ void WINAPI RtlRaiseException( EXCEPTION_RECORD *rec ) NTSTATUS status; RtlCaptureContext( &context ); - /*rec->ExceptionAddress = (void *)context.Iar;*/ + rec->ExceptionAddress = (LPVOID)context.Pc; status = raise_exception( rec, &context, TRUE ); if (status) raise_status( status, rec ); }

1 0

André Hentschel : dbghelp: Implement arm_map_dwarf_register.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 4055b7f2c31f10b67b19c3d54a4a659c7115cc4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4055b7f2c31f10b67b19c3d54… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 15 19:32:30 2011 +0200 dbghelp: Implement arm_map_dwarf_register. --- dlls/dbghelp/cpu_arm.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/cpu_arm.c b/dlls/dbghelp/cpu_arm.c index 4365828..2dd20a0 100644 --- a/dlls/dbghelp/cpu_arm.c +++ b/dlls/dbghelp/cpu_arm.c @@ -54,8 +54,11 @@ static BOOL arm_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CON static unsigned arm_map_dwarf_register(unsigned regno) { - FIXME("not done for ARM\n"); - return 0; + if (regno <= 15) return CV_ARM_R0 + regno; + if (regno == 128) return CV_ARM_CPSR; + + FIXME("Don't know how to map register %d\n", regno); + return CV_ARM_NOREG; } static void* arm_fetch_context_reg(CONTEXT* ctx, unsigned regno, unsigned* size)

1 0

André Hentschel : ntdll: Add implementation for RtlCaptureContext on ARM.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: c8c5b6e08fe784e9a56a13d59239f08e2b1e5c0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8c5b6e08fe784e9a56a13d59… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 15 19:32:55 2011 +0200 ntdll: Add implementation for RtlCaptureContext on ARM. --- dlls/ntdll/signal_arm.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 0934164..e92ebcc 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -160,11 +160,17 @@ static inline void restore_fpu( CONTEXT *context, const ucontext_t *sigcontext ) /*********************************************************************** * RtlCaptureContext (NTDLL.@) */ -void WINAPI RtlCaptureContext( CONTEXT *context ) -{ - FIXME("not implemented\n"); - memset( context, 0, sizeof(*context) ); -} +/* FIXME: Use the Stack instead of the actual register values */ +__ASM_STDCALL_FUNC( RtlCaptureContext, 4, + "stmfd SP!, {r1}\n\t" + "mov r1, #0x40\n\t" /* CONTEXT_ARM */ + "add r1, r1, #0x3\n\t" /* CONTEXT_FULL */ + "str r1, [r0]\n\t" /* context->ContextFlags */ + "ldmfd SP!, {r1}\n\t" + "stmib r0, {r0-pc}\n\t" /* Push registers to pointer */ + "mrs r1, CPSR\n\t" + "stmib r0, {r1}\n\t" /* context->Cpsr */ + ) /***********************************************************************

1 0

Hwang YunSong : cmdlgtst: Update Korean resource.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 7a5b50a81c0be6485faaabbcbe65090e2dd99090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a5b50a81c0be6485faaabbcb… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Fri Apr 15 17:05:25 2011 +0900 cmdlgtst: Update Korean resource. --- programs/cmdlgtst/Ko.rc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/cmdlgtst/Ko.rc b/programs/cmdlgtst/Ko.rc index 507886a..e659e06 100644 --- a/programs/cmdlgtst/Ko.rc +++ b/programs/cmdlgtst/Ko.rc @@ -64,7 +64,7 @@ CmdlgtstMenu MENU POPUP "도움말(&H)" { MENUITEM "사용법(&U)", CM_H_USAGE - MENUITEM "정보(&A)", CM_H_ABOUT + MENUITEM "공용 대화상자 테스트 정보(&A)", CM_H_ABOUT } } @@ -150,7 +150,7 @@ FONT 9, "MS Shell Dlg" CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 12, 168, 11, 13 CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 12, 180, 11, 13 CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 24, 228, 11, 13 - CONTROL "Marks flags that are set by the system and must be cleared by the user.", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 48, 228, 98, 36 + CONTROL "표시된 플래그는 시스템에 의해 설정되고 반드시 사용자에 위해 해제되어야 합니다.", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 48, 228, 98, 36 } Print_Flags_Dialog DIALOG 4, 17, 239, 287 @@ -247,8 +247,8 @@ CAPTION "정보" FONT 9, "MS Shell Dlg" { DEFPUSHBUTTON "확인", IDOK, 72, 96, 50, 14 - LTEXT "Common Dialog Test Jig Exerciser, version 1.20", -1, 13, 36, 168, 12 - LTEXT "(c) 1999-2000, Eric Williams. Rights are as granted under the WINE license. Don't hoard code... share it!", -1, 18, 60, 157, 24 + LTEXT "공통 대화상자 테스트 지그 액서사이저, 버젼 1.20", -1, 13, 36, 168, 12 + LTEXT "(c) 1999-2000, Eric Williams. Rights are as granted under the WINE license. 코드를 숨기기 않는다면... 나누자!", -1, 18, 60, 157, 24 ICON "AboutIcon", -1, 84, 12, 18, 20 } @@ -258,13 +258,13 @@ CAPTION "사용법" FONT 9, "MS Shell Dlg" { DEFPUSHBUTTON "확인", IDOK, 70, 276, 50, 14 - LTEXT "Common Dialog Test Jig Exerciser, version 1.20", -1, 13, 48, 168, 12 + LTEXT "공통 대화상자 테스트 지그 액서사이저, 버젼 1.20", -1, 13, 48, 168, 12 LTEXT "This tool tests COMMDLG for Wine.", -1, 12, 72, 168, 12 LTEXT "Flags are specified in the Flags menu.", -1, 12, 96, 168, 12 LTEXT "Color dialog changes background color.", -1, 12, 120, 168, 12 LTEXT "Font dialog changes all fonts, and font color if CF_EFFECTS is selected.", -1, 12, 144, 168, 24 LTEXT "Upper left hand corner indicate full pathname and title of the last successful Open or Save.", -1, 12, 180, 168, 24 - LTEXT "(c) 1999-2000, Eric Williams. Rights are as granted under the WINE license. Don't hoard code... share it!", -1, 12, 228, 168, 36 + LTEXT "(c) 1999-2000, Eric Williams. Rights are as granted under the WINE license. 코드를 숨기지 않는다면... 나누자!", -1, 12, 228, 168, 36 ICON "AboutIcon", -1, 86, 12, 18, 20 CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 12, 216, 168, 2 }

1 0

Hwang YunSong : inetcpl: Update Korean resource.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 8673fa90366f26772b0780e8f6c29ff1e16a35a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8673fa90366f26772b0780e8f… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Fri Apr 15 17:09:59 2011 +0900 inetcpl: Update Korean resource. --- dlls/inetcpl.cpl/cpl_Ko.rc | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_Ko.rc b/dlls/inetcpl.cpl/cpl_Ko.rc index 615fab5..401e227 100644 --- a/dlls/inetcpl.cpl/cpl_Ko.rc +++ b/dlls/inetcpl.cpl/cpl_Ko.rc @@ -70,6 +70,24 @@ BEGIN END +/* "Security" propsheet */ +IDD_SECURITY DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "보안" +BEGIN + + CONTROL "목록보기", IDC_SEC_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_VSCROLL, + 4, 4, 312, 58 + LTEXT "", IDC_SEC_ZONE_INFO, 4, 68, 312, 20 + GROUPBOX "", IDC_SEC_GROUP, 4, 88, 312, 126 + CONTROL "트랙바", IDC_SEC_TRACKBAR, "msctls_trackbar32", + TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_REVERSED, 8, 98, 32, 100 + LTEXT "", IDC_SEC_LEVEL, 48, 102, 180, 12 + LTEXT "", IDC_SEC_LEVEL_INFO, 48, 114, 260, 80 +END + /* "Content" propsheet */ IDD_CONTENT DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED

1 0

Frédéric Delanoy : inetcpl: Update French translation.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: b1ad8ecc84e48094f7341d076b5b7e6f41f4420b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1ad8ecc84e48094f7341d076… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Apr 16 12:04:41 2011 +0200 inetcpl: Update French translation. --- dlls/inetcpl.cpl/cpl_Fr.rc | 42 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 41 insertions(+), 1 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_Fr.rc b/dlls/inetcpl.cpl/cpl_Fr.rc index 1244ff6..6c55754 100644 --- a/dlls/inetcpl.cpl/cpl_Fr.rc +++ b/dlls/inetcpl.cpl/cpl_Fr.rc @@ -2,7 +2,7 @@ * Internet control panel applet * French language support * - * Copyright 2010 Frédéric Delanoy + * Copyright 2010-2011 Frédéric Delanoy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -49,6 +49,46 @@ BEGIN END +/* "Delete browsing history" dialog */ +IDD_DELETE_HISTORY DIALOG 0, 0, 250, 250 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Effacer l'historique de navigation" +BEGIN + + AUTOCHECKBOX "Fichiers internet temporaires\nCopies en cache de pages web, d'images et de certificats.", + IDC_DELETE_TEMP_FILES, 10, 8, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Cookies\nDonnées enregistrées sur votre ordinateur par des sites web, telles que préférences utilisateur et informations de connexion.", + IDC_DELETE_COOKIES, 10, 32, 230, 35, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Historique\nListe des sites web accédés.", + IDC_DELETE_HISTORY, 10, 73, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Données de formulaires\nNoms d'utilisateur et autres informations entrées dans des formulaires.", + IDC_DELETE_FORM_DATA, 10, 98, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Mots de passe\nMots de passe entrés dans des formulaires et sauvegardés.", + IDC_DELETE_PASSWORDS, 10, 128, 230, 30, BS_TOP | BS_MULTILINE + DEFPUSHBUTTON "Annuler", IDCANCEL, 185, 228, 60, 15, WS_GROUP + PUSHBUTTON "Effacer", IDOK, 120, 228, 60, 15, WS_GROUP + +END + +/* "Security" propsheet */ +IDD_SECURITY DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Sécurité" +BEGIN + + CONTROL "Listview", IDC_SEC_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_VSCROLL, + 4, 4, 312, 58 + LTEXT "", IDC_SEC_ZONE_INFO, 4, 68, 312, 20 + GROUPBOX "", IDC_SEC_GROUP, 4, 88, 312, 126 + CONTROL "trackbar", IDC_SEC_TRACKBAR, "msctls_trackbar32", + TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_REVERSED, 8, 98, 32, 100 + LTEXT "", IDC_SEC_LEVEL, 48, 102, 180, 12 + LTEXT "", IDC_SEC_LEVEL_INFO, 48, 114, 260, 80 +END + /* "Content" propsheet */ IDD_CONTENT DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED

1 0

Nikolay Sivov : inetcpl: Update Russian resource.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 08f767c0740ea45b225dfd9338c5968f75f10b6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=08f767c0740ea45b225dfd933… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 17 16:21:54 2011 +0400 inetcpl: Update Russian resource. --- dlls/inetcpl.cpl/cpl_Ru.rc | 49 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_Ru.rc b/dlls/inetcpl.cpl/cpl_Ru.rc index a497210..98b809d 100644 --- a/dlls/inetcpl.cpl/cpl_Ru.rc +++ b/dlls/inetcpl.cpl/cpl_Ru.rc @@ -40,11 +40,52 @@ BEGIN PUSHBUTTON "&Текущая страница", IDC_HOME_CURRENT, 58, 36, 80, 14 PUSHBUTTON "&По умолчанию", IDC_HOME_DEFAULT, 144, 36, 80, 14 PUSHBUTTON "Пу&стая страница", IDC_HOME_BLANK, 230, 36, 80, 14 - GROUPBOX " Browsing history ", IDC_STATIC, 4, 60, 312, 46 - LTEXT "You can delete cached pages, cookies and other data.", + GROUPBOX " История использования браузера ", IDC_STATIC, 4, 60, 312, 46 + LTEXT "Вы можете удалить кэшированные страницы, файлы cookies и другие данные.", IDC_STATIC, 58, 72, 252, 10 - PUSHBUTTON "Delete &files...", IDC_HISTORY_DELETE, 144, 86, 80, 14 - PUSHBUTTON "&Settings...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 + PUSHBUTTON "Удалить &файлы...", IDC_HISTORY_DELETE, 144, 86, 80, 14 + PUSHBUTTON "&Настройки...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 + +END + +/* "Delete browsing history" dialog */ +IDD_DELETE_HISTORY DIALOG 0, 0, 250, 250 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Очистка истории" +BEGIN + + AUTOCHECKBOX "Временные файлы\nКэшированные копии страниц, изображений и сертификатов.", + IDC_DELETE_TEMP_FILES, 10, 8, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Файлы cookies\nФайлы, сохранённые на вашем компьютере, могут содержать пользовательские настройки и информацию для авторизации.", + IDC_DELETE_COOKIES, 10, 38, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "История\nПеречень сайтов, к которым осуществлялся доступ.", + IDC_DELETE_HISTORY, 10, 68, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Данные веб-форм\nИмена пользователя и другая информация, которая использовалась при заполнении форм.", + IDC_DELETE_FORM_DATA, 10, 98, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Пароли\nСохранённые пароли, которые были указаны в веб-формах.", + IDC_DELETE_PASSWORDS, 10, 128, 230, 30, BS_TOP | BS_MULTILINE + DEFPUSHBUTTON "Отмена", IDCANCEL, 185, 230, 60, 15, WS_GROUP + PUSHBUTTON "Удалить", IDOK, 120, 230, 60, 15, WS_GROUP + +END + +/* "Security" propsheet */ +IDD_SECURITY DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Безопасность" +BEGIN + + CONTROL "Listview", IDC_SEC_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_VSCROLL, + 4, 4, 312, 58 + LTEXT "", IDC_SEC_ZONE_INFO, 4, 68, 312, 20 + GROUPBOX "", IDC_SEC_GROUP, 4, 88, 312, 126 + CONTROL "trackbar", IDC_SEC_TRACKBAR, "msctls_trackbar32", + TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_REVERSED, 8, 98, 32, 100 + LTEXT "", IDC_SEC_LEVEL, 48, 102, 180, 12 + LTEXT "", IDC_SEC_LEVEL_INFO, 48, 114, 260, 80 END

1 0