December 2010 - Wine-Commits

Eric Pouech : urlmon: Fixed traces on 64bit systems.
by Alexandre Julliard Dec. 27, 2010

Dec. 27, 2010

Module: wine Branch: master Commit: 495e55c07d10cb6d1bf18b29da4e9e234ed6afc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=495e55c07d10cb6d1bf18b29d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Dec 26 18:00:14 2010 +0100 urlmon: Fixed traces on 64bit systems. --- dlls/urlmon/uri.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 681327f..825c6c5 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -1818,7 +1818,7 @@ static BOOL parse_ipv6address(const WCHAR **ptr, parse_data *data, DWORD flags) TRACE("(%p %p %x): Found valid IPv6 literal %s len=%d\n", ptr, data, flags, debugstr_wn(start, *ptr-start), - *ptr-start); + (int)(*ptr-start)); return TRUE; } @@ -1860,7 +1860,7 @@ static BOOL parse_ipvfuture(const WCHAR **ptr, parse_data *data, DWORD flags) { data->host_type = Uri_HOST_UNKNOWN; TRACE("(%p %p %x): Parsed IPvFuture address %s len=%d\n", ptr, data, flags, - debugstr_wn(start, *ptr-start), *ptr-start); + debugstr_wn(start, *ptr-start), (int)(*ptr-start)); return TRUE; }

1 0

Eric Pouech : winedbg: Don't print extra \n in print_basic.
by Alexandre Julliard Dec. 27, 2010

Dec. 27, 2010

Module: wine Branch: master Commit: dc6b9c2a58c504e8bf54e34dcbe181e0a7137988 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc6b9c2a58c504e8bf54e34dc… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Dec 26 15:21:05 2010 +0100 winedbg: Don't print extra \n in print_basic. --- programs/winedbg/memory.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 1c8388c..de7bef9 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -546,7 +546,6 @@ void print_basic(const struct dbg_lvalue* lvalue, char format) case 'd': dbg_print_longlong(res, TRUE); - dbg_printf("\n"); return; case 'c': @@ -570,7 +569,6 @@ void print_basic(const struct dbg_lvalue* lvalue, char format) if (lvalue->type.id == dbg_itype_segptr) { dbg_print_longlong(types_extract_as_longlong(lvalue, NULL), TRUE); - dbg_printf("\n"); } else print_typed_basic(lvalue); }

1 0

Eric Pouech : msvcr90: Fix an integer overflow on 64 bit system for qsort_s tests.
by Alexandre Julliard Dec. 27, 2010

Dec. 27, 2010

Module: wine Branch: master Commit: cecddb321628e80d416b40a2f2eac2fded9dcb31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cecddb321628e80d416b40a2f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Dec 26 18:00:20 2010 +0100 msvcr90: Fix an integer overflow on 64 bit system for qsort_s tests. --- dlls/msvcr90/tests/msvcr90.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 449c0bc..24a6517 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -509,7 +509,7 @@ static void test_qsort_s(void) /* overflow without side effects, other overflow values crash */ g_qsort_s_context_counter = 0; - p_qsort_s((void*)arr2, (1 << (8*sizeof(size_t) - 1)) + 1, sizeof(int), intcomparefunc, &g_qsort_s_context_counter); + p_qsort_s((void*)arr2, (((size_t)1) << (8*sizeof(size_t) - 1)) + 1, sizeof(int), intcomparefunc, &g_qsort_s_context_counter); ok(g_qsort_s_context_counter == 0, "callback shouldn't have been called\n"); ok(arr2[0] == 23, "should remain unsorted, arr2[0] is %d\n", arr2[0]); ok(arr2[1] == 42, "should remain unsorted, arr2[1] is %d\n", arr2[1]);

1 0

Nikolay Sivov : oleaut32: Add a helper to return INVOKEKIND flags value.
by Alexandre Julliard Dec. 27, 2010

Dec. 27, 2010

Module: wine Branch: master Commit: b6313c702e6c7b43d58a47c9f2f2bcf7d6d9e57d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6313c702e6c7b43d58a47c9f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 25 04:25:09 2010 +0300 oleaut32: Add a helper to return INVOKEKIND flags value. --- dlls/oleaut32/typelib2.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 9b3015b..78192b1 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -240,6 +240,13 @@ static inline UINT cti2_get_func_count(const MSFT_TypeInfoBase *typeinfo) return typeinfo->cElement & 0xFFFF; } +/* NOTE: entry always assumed to be a function */ +static inline INVOKEKIND ctl2_get_invokekind(const CyclicList *func) +{ + /* INVOKEKIND uses bit flags up to 8 */ + return (func->u.data[4] >> 3) & 0xF; +} + /**************************************************************************** * ctl2_init_header * @@ -2348,17 +2355,19 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncAndParamNames( break; /* cNames == cParams for put or putref accessor, cParams+1 otherwise */ - if(cNames != iter->u.data[5] + ((iter->u.data[4]>>3)&(INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF) ? 0 : 1)) + if(cNames != iter->u.data[5] + (ctl2_get_invokekind(iter) & (INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF) ? 0 : 1)) return TYPE_E_ELEMENTNOTFOUND; + TRACE("function name %s\n", debugstr_w(names[0])); len = ctl2_encode_name(This->typelib, names[0], &namedata); for(iter2=This->typedata->next->next; iter2!=This->typedata->next; iter2=iter2->next) { if(iter2->name!=-1 && !memcmp(namedata, This->typelib->typelib_segment_data[MSFT_SEG_NAME]+iter2->name+8, len)) { /* getters/setters can have a same name */ if (iter2->type == CyclicListFunc) { - INT inv1 = iter2->u.data[4] >> 3; - INT inv2 = iter->u.data[4] >> 3; + INVOKEKIND inv1 = ctl2_get_invokekind(iter2); + INVOKEKIND inv2 = ctl2_get_invokekind(iter); + if (((inv1&(INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF)) && (inv2&INVOKE_PROPERTYGET)) || ((inv2&(INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF)) && (inv1&INVOKE_PROPERTYGET))) continue; @@ -2801,13 +2810,12 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut( for(i=0; i< cti2_get_func_count(This->typeinfo); i++) { if(typedata[i]->u.data[4]>>16 > i) { - int inv; + INVOKEKIND inv = ctl2_get_invokekind(typedata[i]); - inv = (typedata[i]->u.data[4]>>3) & 0xf; i = typedata[i]->u.data[4] >> 16; while(i > typedata[i]->u.data[4]>>16) { - int invkind = (typedata[i]->u.data[4]>>3) & 0xf; + INVOKEKIND invkind = ctl2_get_invokekind(typedata[i]); if(inv & invkind) { HeapFree(GetProcessHeap(), 0, typedata);

1 0

Sven Baars : wininet: Update the Dutch translation.
by Alexandre Julliard Dec. 27, 2010

Dec. 27, 2010

Module: wine Branch: master Commit: a529c4a83555b8b3d554518cdd4298ee7bb2ef2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a529c4a83555b8b3d554518cd… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Dec 25 14:35:19 2010 +0100 wininet: Update the Dutch translation. --- dlls/wininet/wininet_Nl.rc | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/wininet_Nl.rc b/dlls/wininet/wininet_Nl.rc index 1925c65..31f75cc 100644 --- a/dlls/wininet/wininet_Nl.rc +++ b/dlls/wininet/wininet_Nl.rc @@ -22,6 +22,8 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +#pragma code_page(65001) + IDD_PROXYDLG DIALOG 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Netwerkwachtwoord invoeren" @@ -62,7 +64,23 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Annuleren", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_INVCERTDLG DIALOG 3, 24, 250, 86 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Veiligheidswaarschuwing" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Er is een probleem met het certificaat voor deze site.", -1, 40, 6, 200, 20 + LTEXT "", IDC_CERT_ERROR, 40, 26, 200, 20 + LTEXT "Wilt u toch doorgaan?", -1, 40, 46, 200, 20 + PUSHBUTTON "Ja", IDOK, 40, 66, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Nee", IDCANCEL, 100, 66, 56, 14, WS_GROUP | WS_TABSTOP +} + STRINGTABLE { IDS_LANCONNECTION "LAN Verbinding" + IDS_CERT_CA_INVALID "Het certificaat is uitgegeven door een onbekende on onbetrouwbare uitgever." + IDS_CERT_DATE_INVALID "De datum op het certificaat is ongeldig." + IDS_CERT_CN_INVALID "De naam op het certificaat komt niet overeen met de site." + IDS_CERT_ERRORS "Er is tenminste één ongespecificeerd veiligheidsprobleem met dit certificaat." }

1 0

Aurimas Fišeras : cmd: Update Lithuanian translation.
by Alexandre Julliard Dec. 27, 2010

Dec. 27, 2010

Module: wine Branch: master Commit: 2af275cedfb39e05a94f92743e3a5b43ba764f4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2af275cedfb39e05a94f92743… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Dec 23 18:52:45 2010 +0000 cmd: Update Lithuanian translation. --- programs/cmd/Lt.rc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/programs/cmd/Lt.rc b/programs/cmd/Lt.rc index 27a04fc..17062a2 100644 --- a/programs/cmd/Lt.rc +++ b/programs/cmd/Lt.rc @@ -208,6 +208,10 @@ o po to pakeičia dabartinį katalogą į nurodytą.\n" WCMD_MORE, "MORE parodo failo išvedimą ar kanalo įvedimą puslapiais.\n" + WCMD_CHOICE, "CHOICE parodo tekstą ir laukia, kol naudotojas\n\ +paspaus leidžiamą klavišą iš pasirinkimų sąrašo.\n\ +CHOICE dažniausiai naudojama pasirinkimo meniu konstravimui komandų faile.\n" + WCMD_EXIT, "EXIT baigia dabartinį komandų seansą ir grįžta į operacinę sistemą\n\ ar apvalkalą iš kur CMD buvo iškviestas.\n" @@ -216,6 +220,7 @@ ar apvalkalą iš kur CMD buvo iškviestas.\n" ATTRIB\t\tRodyti ar keisti DOS failo požymius\n\ CALL\t\tKviesti komandų failą iš kito komandų failo\n\ CD (CHDIR)\tPakeisti dabartinį numatytą katalogą\n\ +CHOICE\t\tLaukti klavišo paspaudimo iš pasirinkimų sąrašo\n\ CLS\t\tIšvalyti pulto ekraną\n\ COPY\t\tKopijuoti failą\n\ CTTY\t\tPakeisti įvedimo/išvedimo įrenginį\n\

1 0

Hwang YunSong : msacm32: Update Korean resource.
by Alexandre Julliard Dec. 27, 2010

Dec. 27, 2010

Module: wine Branch: master Commit: 6835fba305f9797add88374008cf2068fe860fd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6835fba305f9797add8837400… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sat Dec 25 16:45:34 2010 +0900 msacm32: Update Korean resource. --- dlls/msacm32/msacm_Ko.rc | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/msacm32/msacm_Ko.rc b/dlls/msacm32/msacm_Ko.rc index dad8a47..3a96e9d 100644 --- a/dlls/msacm32/msacm_Ko.rc +++ b/dlls/msacm32/msacm_Ko.rc @@ -1,7 +1,7 @@ /* * Korean resource file for MS ACM * - * Copyright 2005,2007 YunSong Hwang + * Copyright 2005,2007,2010 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,34 +20,36 @@ #include "wineacm.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "�� " +CAPTION "사운드 선택" FONT 9, "MS Shell Dlg" BEGIN - LTEXT "�̸�(&N):", -1, 5, 5, 115, 8, NOT WS_GROUP + LTEXT "이름(&N):", -1, 5, 5, 115, 8, NOT WS_GROUP COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 97, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "�ٸ� �̸�� (&S)...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 103, 14, 70, 14 - PUSHBUTTON "��(&R)", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "다른 이름 저장(&S)...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 103, 14, 70, 14 + PUSHBUTTON "제거(&R)", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - LTEXT "��(&F):", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "형식(&F):", -1, 5, 41, 44, 8, NOT WS_GROUP COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "�Ӽ�(&A):", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "속성(&A):", -1, 5, 59, 44, 8, NOT WS_GROUP COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "Ȯ��", IDOK, 48, 80, 40, 14 - PUSHBUTTON "��", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "��(&H)", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + DEFPUSHBUTTON "확인", IDOK, 48, 80, 40, 14 + PUSHBUTTON "취소", IDCANCEL, 92, 80, 40, 14 + PUSHBUTTON "도움말(&H)", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 END

1 0

Jacek Caban : urlmon: Fixed a race in tests causing unexpected Switch call failures.
by Alexandre Julliard Dec. 27, 2010

Dec. 27, 2010

Module: wine Branch: master Commit: 87f0ba49e06719751f00ffed363e157509bb33ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=87f0ba49e06719751f00ffed3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Dec 25 21:32:11 2010 +0100 urlmon: Fixed a race in tests causing unexpected Switch call failures. --- dlls/urlmon/tests/protocol.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index e463737..dd8cbf9 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -41,7 +41,6 @@ static HRESULT (WINAPI *pCreateUri)(LPCWSTR, DWORD, DWORD_PTR, IUri**); #define CHECK_EXPECT2(func) \ do { \ - trace(#func "\n"); /* temporary debug traces */ \ ok(expect_ ##func, "unexpected call " #func "\n"); \ called_ ## func = TRUE; \ }while(0) @@ -864,12 +863,16 @@ static HRESULT WINAPI ProtocolSink_ReportData(IInternetProtocolSink *iface, DWOR else SET_EXPECT(ReportData2); SET_EXPECT(ReportResult); + if(!emulate_prot) + SET_EXPECT(Switch); hres = IInternetProtocol_Read(binding_test ? binding_protocol : async_protocol, expect_pv = buf, sizeof(buf), &read); + ok(hres == E_PENDING || hres == S_FALSE || hres == S_OK, "Read failed: %08x\n", hres); if(hres == S_OK) ok(read, "read == 0\n"); - if(reported_all_data) { + if(reported_all_data) ok(hres == S_FALSE, "Read failed: %08x, expected S_FALSE\n", hres); - } + if(!emulate_prot && hres != E_PENDING) + CHECK_NOT_CALLED(Switch); /* otherwise checked in wait_for_switch loop */ if(emulate_prot) CHECK_CALLED(Read); if(!reported_all_data && called_ReportData2) { @@ -2763,10 +2766,10 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym expect_hrResult = test_abort ? E_ABORT : S_OK; if(direct_read) { + SET_EXPECT(Switch); while(wait_for_switch) { - SET_EXPECT(Switch); WaitForSingleObject(event_continue, INFINITE); - CHECK_CALLED(Switch); + CHECK_CALLED(Switch); /* Set in ReportData */ call_continue(&continue_protdata); SetEvent(event_continue_done); }

1 0

Aurimas Fišeras : wininet: Update Lithuanian translation.
by Alexandre Julliard Dec. 27, 2010

Dec. 27, 2010

Module: wine Branch: master Commit: 088fffec944004d41675bb32ec33151945b6d6b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=088fffec944004d41675bb32e… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Dec 23 18:42:22 2010 +0000 wininet: Update Lithuanian translation. --- dlls/wininet/wininet_Lt.rc | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/wininet_Lt.rc b/dlls/wininet/wininet_Lt.rc index 77bb966..bc0749a 100644 --- a/dlls/wininet/wininet_Lt.rc +++ b/dlls/wininet/wininet_Lt.rc @@ -1,5 +1,5 @@ /* - * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * Copyright 2009-2010 Aurimas Fišeras <aurimas(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -63,7 +63,23 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Atsisakyti", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_INVCERTDLG DIALOG 3, 24, 250, 86 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Įspėjimas apie saugumą" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Yra nesklandumų su šios svetainės liudijimu.", -1, 40, 6, 200, 20 + LTEXT "", IDC_CERT_ERROR, 40, 26, 200, 20 + LTEXT "Ar vistiek norite tęsti?", -1, 40, 46, 200, 20 + PUSHBUTTON "Taip", IDOK, 40, 66, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Ne", IDCANCEL, 100, 66, 56, 14, WS_GROUP | WS_TABSTOP +} + STRINGTABLE { IDS_LANCONNECTION "Vietinio tinklo ryšys" + IDS_CERT_CA_INVALID "Liudijimas yra išduotas nežinomo arba nepatikimo leidėjo." + IDS_CERT_DATE_INVALID "Liudijimo data yra neteisinga." + IDS_CERT_CN_INVALID "Liudijimo pavadinimas neatitinka svetainės." + IDS_CERT_ERRORS "Yra mažiausiai viena nenustatyta saugumo problema su šiuo liudijimu." }

1 0

Hwang YunSong : mpr: Update Korean resource.
by Alexandre Julliard Dec. 27, 2010

Dec. 27, 2010

Module: wine Branch: master Commit: ebea4cbc38673d4cfe1901c68164920d700d8222 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebea4cbc38673d4cfe1901c68… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sat Dec 25 16:44:07 2010 +0900 mpr: Update Korean resource. --- dlls/mpr/mpr_Ko.rc | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/mpr/mpr_Ko.rc b/dlls/mpr/mpr_Ko.rc index 13bc0b8..43eab87 100644 --- a/dlls/mpr/mpr_Ko.rc +++ b/dlls/mpr/mpr_Ko.rc @@ -2,7 +2,7 @@ * MPR dll resources * * Copyright (C) 2004 Juan Lang - * Copyright 2005,2007 YunSong Hwang + * Copyright 2005,2007.2010 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,29 +21,31 @@ #include "mprres.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE { - IDS_ENTIRENETWORK "��ü ��Ʈ��ũ" + IDS_ENTIRENETWORK "전체 네트워크" } IDD_PROXYDLG DIALOG 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "��Ʈ��ũ ��ȣ �Է�" +CAPTION "네트워크 암호 입력" FONT 9, "MS Shell Dlg" { - LTEXT "�� ̸�� ȣ�� Է��Ͻÿ�:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "��Ͻ�", -1, 40, 26, 50, 10 + LTEXT "당신의 사용자이름과 암호를 입력하시오:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "프록시", -1, 40, 26, 50, 10 /* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "��", -1, 40, 66, 50, 10 - LTEXT "��ȣ", -1, 40, 86, 50, 10 + LTEXT "사용자", -1, 40, 66, 50, 10 + LTEXT "암호", -1, 40, 86, 50, 10 LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "��ȣ ��(&S) (��ȿ� ��)", IDC_SAVEPASSWORD, + CHECKBOX "암호 저장(&S) (보안에 주의)", IDC_SAVEPASSWORD, 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Ȯ��", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "��", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "확인", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "취소", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP }

1 0