October 2010 - Wine-commits

Henri Verbeet : d3dcompiler: Merge asmutils.c into utils.c.
by Alexandre Julliard 18 Oct '10

18 Oct '10

Module: wine Branch: master Commit: a141ea49337cbdd1721e6cfdac7f9df7f9e60e39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a141ea49337cbdd1721e6cfda… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 18 13:05:50 2010 +0200 d3dcompiler: Merge asmutils.c into utils.c. --- dlls/d3dcompiler_43/Makefile.in | 1 - dlls/d3dcompiler_43/asmutils.c | 388 --------------------------------------- dlls/d3dcompiler_43/utils.c | 382 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 382 insertions(+), 389 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a141ea49337cbdd1721e6…

1 0

Henri Verbeet : d3dcompiler: Mark some internal symbols hidden.
by Alexandre Julliard 18 Oct '10

18 Oct '10

Module: wine Branch: master Commit: 1f437a93490afeb118f0d9fd7ef819a8b6e4af0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f437a93490afeb118f0d9fd7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 18 13:05:51 2010 +0200 d3dcompiler: Mark some internal symbols hidden. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 74 ++++++++++++++--------------- 1 files changed, 36 insertions(+), 38 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 24dee9e..a5af788 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -39,7 +39,7 @@ #define D3DERR_INVALIDCALL 0x8876086c /* TRACE helper functions */ -const char *debug_d3dcompiler_d3d_blob_part(D3D_BLOB_PART part); +const char *debug_d3dcompiler_d3d_blob_part(D3D_BLOB_PART part) DECLSPEC_HIDDEN; /* ID3DBlob */ struct d3dcompiler_blob @@ -211,16 +211,14 @@ struct asmparser_backend { const struct src_regs *srcs, int expectednsrcs); }; -struct instruction *alloc_instr(unsigned int srcs); -BOOL add_instruction(struct bwriter_shader *shader, struct instruction *instr); -BOOL add_constF(struct bwriter_shader *shader, DWORD reg, float x, float y, float z, float w); -BOOL add_constI(struct bwriter_shader *shader, DWORD reg, INT x, INT y, INT z, INT w); -BOOL add_constB(struct bwriter_shader *shader, DWORD reg, BOOL x); -BOOL record_declaration(struct bwriter_shader *shader, DWORD usage, - DWORD usage_idx, DWORD mod, BOOL output, - DWORD regnum, DWORD writemask, BOOL builtin); -BOOL record_sampler(struct bwriter_shader *shader, DWORD samptype, - DWORD mod, DWORD regnum); +struct instruction *alloc_instr(unsigned int srcs) DECLSPEC_HIDDEN; +BOOL add_instruction(struct bwriter_shader *shader, struct instruction *instr) DECLSPEC_HIDDEN; +BOOL add_constF(struct bwriter_shader *shader, DWORD reg, float x, float y, float z, float w) DECLSPEC_HIDDEN; +BOOL add_constI(struct bwriter_shader *shader, DWORD reg, INT x, INT y, INT z, INT w) DECLSPEC_HIDDEN; +BOOL add_constB(struct bwriter_shader *shader, DWORD reg, BOOL x) DECLSPEC_HIDDEN; +BOOL record_declaration(struct bwriter_shader *shader, DWORD usage, DWORD usage_idx, + DWORD mod, BOOL output, DWORD regnum, DWORD writemask, BOOL builtin) DECLSPEC_HIDDEN; +BOOL record_sampler(struct bwriter_shader *shader, DWORD samptype, DWORD mod, DWORD regnum) DECLSPEC_HIDDEN; #define MESSAGEBUFFER_INITIAL_SIZE 256 @@ -243,23 +241,23 @@ struct asm_parser { unsigned int line_no; }; -extern struct asm_parser asm_ctx; +extern struct asm_parser asm_ctx DECLSPEC_HIDDEN; -void create_vs10_parser(struct asm_parser *ret); -void create_vs11_parser(struct asm_parser *ret); -void create_vs20_parser(struct asm_parser *ret); -void create_vs2x_parser(struct asm_parser *ret); -void create_vs30_parser(struct asm_parser *ret); -void create_ps10_parser(struct asm_parser *ret); -void create_ps11_parser(struct asm_parser *ret); -void create_ps12_parser(struct asm_parser *ret); -void create_ps13_parser(struct asm_parser *ret); -void create_ps14_parser(struct asm_parser *ret); -void create_ps20_parser(struct asm_parser *ret); -void create_ps2x_parser(struct asm_parser *ret); -void create_ps30_parser(struct asm_parser *ret); +void create_vs10_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; +void create_vs11_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; +void create_vs20_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; +void create_vs2x_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; +void create_vs30_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; +void create_ps10_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; +void create_ps11_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; +void create_ps12_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; +void create_ps13_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; +void create_ps14_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; +void create_ps20_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; +void create_ps2x_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; +void create_ps30_parser(struct asm_parser *ret) DECLSPEC_HIDDEN; -struct bwriter_shader *parse_asm_shader(char **messages); +struct bwriter_shader *parse_asm_shader(char **messages) DECLSPEC_HIDDEN; #ifdef __GNUC__ #define PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) @@ -267,8 +265,8 @@ struct bwriter_shader *parse_asm_shader(char **messages); #define PRINTF_ATTR(fmt,args) #endif -void asmparser_message(struct asm_parser *ctx, const char *fmt, ...) PRINTF_ATTR(2,3); -void set_parse_status(struct asm_parser *ctx, enum parse_status status); +void asmparser_message(struct asm_parser *ctx, const char *fmt, ...) PRINTF_ATTR(2,3) DECLSPEC_HIDDEN; +void set_parse_status(struct asm_parser *ctx, enum parse_status status) DECLSPEC_HIDDEN; /* A reasonable value as initial size */ #define BYTECODEBUFFER_INITIAL_SIZE 32 @@ -330,13 +328,13 @@ struct bc_writer { }; /* Debug utility routines */ -const char *debug_print_srcmod(DWORD mod); -const char *debug_print_dstmod(DWORD mod); -const char *debug_print_shift(DWORD shift); -const char *debug_print_dstreg(const struct shader_reg *reg); -const char *debug_print_srcreg(const struct shader_reg *reg); -const char *debug_print_comp(DWORD comp); -const char *debug_print_opcode(DWORD opcode); +const char *debug_print_srcmod(DWORD mod) DECLSPEC_HIDDEN; +const char *debug_print_dstmod(DWORD mod) DECLSPEC_HIDDEN; +const char *debug_print_shift(DWORD shift) DECLSPEC_HIDDEN; +const char *debug_print_dstreg(const struct shader_reg *reg) DECLSPEC_HIDDEN; +const char *debug_print_srcreg(const struct shader_reg *reg) DECLSPEC_HIDDEN; +const char *debug_print_comp(DWORD comp) DECLSPEC_HIDDEN; +const char *debug_print_opcode(DWORD opcode) DECLSPEC_HIDDEN; /* Used to signal an incorrect swizzle/writemask */ #define SWIZZLE_ERR ~0U @@ -564,9 +562,9 @@ typedef enum _BWRITERDECLUSAGE { #define T2_REG 4 #define T3_REG 5 -struct bwriter_shader *SlAssembleShader(const char *text, char **messages); -DWORD SlWriteBytecode(const struct bwriter_shader *shader, int dxversion, DWORD **result); -void SlDeleteShader(struct bwriter_shader *shader); +struct bwriter_shader *SlAssembleShader(const char *text, char **messages) DECLSPEC_HIDDEN; +DWORD SlWriteBytecode(const struct bwriter_shader *shader, int dxversion, DWORD **result) DECLSPEC_HIDDEN; +void SlDeleteShader(struct bwriter_shader *shader) DECLSPEC_HIDDEN; #define MAKE_TAG(ch0, ch1, ch2, ch3) \ ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \

1 0

David Hedberg : ole32: OleLoad should not fail even if IOleObject:: GetMiscStatus fails.
by Alexandre Julliard 18 Oct '10

18 Oct '10

Module: wine Branch: master Commit: d95e2dbd62dad2a4446c4bff9e9dd7e63061703b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d95e2dbd62dad2a4446c4bff9… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Mon Oct 18 04:19:23 2010 +0200 ole32: OleLoad should not fail even if IOleObject::GetMiscStatus fails. --- dlls/ole32/ole2.c | 13 ++++++------- dlls/ole32/tests/ole2.c | 40 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 44 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 03cb7f0..ca4cd4c 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -1181,13 +1181,12 @@ HRESULT WINAPI OleLoad( } } - if (SUCCEEDED(hres)) - /* - * Initialize the object with it's IPersistStorage interface. - */ - hres = IOleObject_QueryInterface(pUnk, - &IID_IPersistStorage, - (void**)&persistStorage); + /* + * Initialize the object with its IPersistStorage interface. + */ + hres = IOleObject_QueryInterface(pUnk, + &IID_IPersistStorage, + (void**)&persistStorage); if (SUCCEEDED(hres)) { diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index cd83a3b..d8c2bab 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -57,6 +57,7 @@ static FORMATETC *g_expected_fetc = NULL; static BOOL g_showRunnable = TRUE; static BOOL g_isRunning = TRUE; +static BOOL g_failGetMiscStatus; #define CHECK_EXPECTED_METHOD(method_name) \ do { \ @@ -328,8 +329,16 @@ static HRESULT WINAPI OleObject_GetMiscStatus ) { CHECK_EXPECTED_METHOD("OleObject_GetMiscStatus"); - *pdwStatus = DVASPECT_CONTENT; - return S_OK; + if(!g_failGetMiscStatus) + { + *pdwStatus = OLEMISC_RECOMPOSEONRESIZE; + return S_OK; + } + else + { + *pdwStatus = 0x1234; + return E_FAIL; + } } static HRESULT WINAPI OleObject_SetColorScheme @@ -899,10 +908,32 @@ static void test_OleLoad(IStorage *pStorage) { "OleObject_SetClientSite", 0 }, { "OleObject_Release", 0 }, { "OleObject_QueryInterface", 0 }, + { "OleObject_GetMiscStatus", 0 }, { "OleObject_Release", 0 }, { NULL, 0 } }; + /* Test once with IOleObject_GetMiscStatus failing */ + expected_method_list = methods_oleload; + g_failGetMiscStatus = TRUE; + trace("OleLoad:\n"); + hr = OleLoad(pStorage, &IID_IOleObject, (IOleClientSite *)0xdeadbeef, (void **)&pObject); + ok(hr == S_OK || + broken(hr == E_INVALIDARG), /* win98 and win2k */ + "OleLoad failed with error 0x%08x\n", hr); + if(pObject) + { + DWORD dwStatus = 0xdeadbeef; + hr = IOleObject_GetMiscStatus(pObject, DVASPECT_CONTENT, &dwStatus); + ok(hr == E_FAIL, "Got 0x%08x\n", hr); + ok(dwStatus == 0x1234, "Got 0x%08x\n", dwStatus); + + IOleObject_Release(pObject); + CHECK_NO_EXTRA_METHODS(); + } + + /* Test again, let IOleObject_GetMiscStatus succeed. */ + g_failGetMiscStatus = FALSE; expected_method_list = methods_oleload; trace("OleLoad:\n"); hr = OleLoad(pStorage, &IID_IOleObject, (IOleClientSite *)0xdeadbeef, (void **)&pObject); @@ -911,6 +942,11 @@ static void test_OleLoad(IStorage *pStorage) "OleLoad failed with error 0x%08x\n", hr); if (pObject) { + DWORD dwStatus = 0xdeadbeef; + hr = IOleObject_GetMiscStatus(pObject, DVASPECT_CONTENT, &dwStatus); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(dwStatus == 1, "Got 0x%08x\n", dwStatus); + IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); }

1 0

Hwang YunSong : taskmgr: Update Korean resource.
by Alexandre Julliard 18 Oct '10

18 Oct '10

Module: wine Branch: master Commit: 20ad8ea37a9b004b3519da6a16ff8b8a207a590e URL: http://source.winehq.org/git/wine.git/?a=commit;h=20ad8ea37a9b004b3519da6a1… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Oct 18 11:02:18 2010 +0900 taskmgr: Update Korean resource. --- programs/taskmgr/Ko.rc | 494 ++++++++++++++++++++++++------------------------ 1 files changed, 248 insertions(+), 246 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=20ad8ea37a9b004b3519d…

1 0

Hwang YunSong : uninstaller: Update Korean resource.
by Alexandre Julliard 18 Oct '10

18 Oct '10

Module: wine Branch: master Commit: 41585ab42f1f67e9fb960e786da1ec3c2a46c546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41585ab42f1f67e9fb960e786… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Oct 18 11:07:14 2010 +0900 uninstaller: Update Korean resource. --- programs/uninstaller/Ko.rc | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/uninstaller/Ko.rc b/programs/uninstaller/Ko.rc index bfc6c98..438ad59 100644 --- a/programs/uninstaller/Ko.rc +++ b/programs/uninstaller/Ko.rc @@ -21,9 +21,11 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE { - IDS_APPNAME, "Wine Application ��ϱ�" - IDS_UNINSTALLFAILED, "��ν�� '%s' �� , �� ϴ�.\n�� Ʈ�� ν�� Ű�� ϰڽ��ϱ� ?" + IDS_APPNAME, "Wine Application 제거하기" + IDS_UNINSTALLFAILED, "언인스톨 명령 '%s' 실행 실패, 실행파일이 없는 것 같습니다.\n당신은 레지스트리에서 언인스톨 등록키를 제거하겠습니까 ?" }

1 0

Hwang YunSong : winhlp32: Update Korean resource.
by Alexandre Julliard 18 Oct '10

18 Oct '10

Module: wine Branch: master Commit: 6abd799861c14f4b20a56e7ecbf653cd6b149181 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6abd799861c14f4b20a56e7ec… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Oct 18 11:08:18 2010 +0900 winhlp32: Update Korean resource. --- programs/winhlp32/Ko.rc | 110 ++++++++++++++++++++++++----------------------- 1 files changed, 56 insertions(+), 54 deletions(-) diff --git a/programs/winhlp32/Ko.rc b/programs/winhlp32/Ko.rc index 32b32b2..1acc2db 100644 --- a/programs/winhlp32/Ko.rc +++ b/programs/winhlp32/Ko.rc @@ -21,49 +21,51 @@ #include "winhelp_res.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT /* Menu */ MAIN_MENU MENU { - POPUP "��(&F)" { - MENUITEM "��(&O)...", MNID_FILE_OPEN + POPUP "파일(&F)" { + MENUITEM "열기(&O)...", MNID_FILE_OPEN MENUITEM SEPARATOR - MENUITEM "�μ�(&P)", MNID_FILE_PRINT - MENUITEM "�� (&S)...", MNID_FILE_SETUP + MENUITEM "인쇄(&P)", MNID_FILE_PRINT + MENUITEM "프린터 설정(&S)...", MNID_FILE_SETUP MENUITEM SEPARATOR - MENUITEM "��(&E)", MNID_FILE_EXIT + MENUITEM "종료(&E)", MNID_FILE_EXIT } - POPUP "��(&E)" { - MENUITEM "��(&C)...", MNID_EDIT_COPYDLG + POPUP "편집(&E)" { + MENUITEM "복사(&C)...", MNID_EDIT_COPYDLG MENUITEM SEPARATOR - MENUITEM "�ּ�(&A)...", MNID_EDIT_ANNOTATE + MENUITEM "주석(&A)...", MNID_EDIT_ANNOTATE } - POPUP "å��(&B)" { - MENUITEM "��(&D)...", MNID_BKMK_DEFINE + POPUP "책갈피(&B)" { + MENUITEM "정의(&D)...", MNID_BKMK_DEFINE } - POPUP "�ɼ�(&O)" { - POPUP "�� ̱�" + POPUP "옵션(&O)" { + POPUP "가능한 도움말 보이기" BEGIN - MENUITEM "�⺻", MNID_OPTS_HELP_DEFAULT - MENUITEM "��̱�", MNID_OPTS_HELP_VISIBLE - MENUITEM "�� ʱ�", MNID_OPTS_HELP_NONVISIBLE + MENUITEM "기본", MNID_OPTS_HELP_DEFAULT + MENUITEM "보이기", MNID_OPTS_HELP_VISIBLE + MENUITEM "보여주지 않기", MNID_OPTS_HELP_NONVISIBLE END - MENUITEM "��", MNID_OPTS_HISTORY - POPUP "�۲�" + MENUITEM "기록", MNID_OPTS_HISTORY + POPUP "글꼴" BEGIN - MENUITEM "�۰�", MNID_OPTS_FONTS_SMALL - MENUITEM "��", MNID_OPTS_FONTS_NORMAL - MENUITEM "ũ��", MNID_OPTS_FONTS_LARGE + MENUITEM "작게", MNID_OPTS_FONTS_SMALL + MENUITEM "보통", MNID_OPTS_FONTS_NORMAL + MENUITEM "크게", MNID_OPTS_FONTS_LARGE END - MENUITEM "�ý�� ", MNID_OPTS_SYSTEM_COLORS + MENUITEM "시스템 색상 사용", MNID_OPTS_SYSTEM_COLORS } - POPUP "��(&H)" { - MENUITEM "�� (&O)", MNID_HELP_HELPON - MENUITEM "�׻� ��(&T)", MNID_HELP_HELPTOP + POPUP "도움말(&H)" { + MENUITEM "도움말 사용법(&O)", MNID_HELP_HELPON + MENUITEM "항상 위(&T)", MNID_HELP_HELPTOP MENUITEM SEPARATOR - MENUITEM "��(&I)...", MNID_HELP_ABOUT + MENUITEM "Wine 도움말 정보(&I)...", MNID_HELP_ABOUT } } @@ -71,7 +73,7 @@ MAIN_MENU MENU IDD_INDEX DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 9, "MS Shell Dlg" -CAPTION "�ε��" +CAPTION "인덱스" { LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } @@ -79,50 +81,50 @@ CAPTION " IDD_SEARCH DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 9, "MS Shell Dlg" -CAPTION "ã��" +CAPTION "찾기" { - LTEXT "�� ", -1, 10, 10, 180, 150 + LTEXT "아직 구현되지 않음", -1, 10, 10, 180, 150 } /* Strings */ STRINGTABLE { -STID_WINE_HELP, "Wine ��" -STID_WHERROR, "��" -STID_WARNING, "��" -STID_INFO, "��" -STID_NOT_IMPLEMENTED, "�� ʾ��" -STID_HLPFILE_ERROR_s, "�� `%s'�� д� �� ߻�" -STID_INDEX, "��(&C)" -STID_CONTENTS, "��" -STID_BACK, "�ڷ�(&B)" -STID_ALL_FILES, "�� (*.*)" -STID_HELP_FILES_HLP, "�� (*.hlp)" -STID_FILE_NOT_FOUND_s "%s�� ã�� ϴ�'. �� ã�ڽ��ϱ�?" -STID_NO_RICHEDIT "richedit �� ã�� ϴ�.. ��" -STID_PSH_INDEX, "�� : " +STID_WINE_HELP, "Wine 도움말" +STID_WHERROR, "에러" +STID_WARNING, "경고" +STID_INFO, "정보" +STID_NOT_IMPLEMENTED, "구현되지 않았음" +STID_HLPFILE_ERROR_s, "도움말 파일 `%s'를 읽는 도중 오류 발생" +STID_INDEX, "목차(&C)" +STID_CONTENTS, "요약" +STID_BACK, "뒤로(&B)" +STID_ALL_FILES, "모든 파일 (*.*)" +STID_HELP_FILES_HLP, "도움말 파일 (*.hlp)" +STID_FILE_NOT_FOUND_s "%s을 찾을 수 없습니다'. 이 파일을 직접 찾겠습니까?" +STID_NO_RICHEDIT "richedit 구현을 찾을수 업습니다.. 취소중" +STID_PSH_INDEX, "도움말 목차: " } CONTEXT_MENU MENU BEGIN POPUP "" BEGIN - MENUITEM "�ּ�...", MNID_CTXT_ANNOTATE - MENUITEM "��", MNID_CTXT_COPY - MENUITEM "�μ�...", MNID_CTXT_PRINT - POPUP "�۲�" + MENUITEM "주석...", MNID_CTXT_ANNOTATE + MENUITEM "복사", MNID_CTXT_COPY + MENUITEM "인쇄...", MNID_CTXT_PRINT + POPUP "글꼴" BEGIN - MENUITEM "��", MNID_CTXT_FONTS_SMALL - MENUITEM "��", MNID_CTXT_FONTS_NORMAL - MENUITEM "�а�", MNID_CTXT_FONTS_LARGE + MENUITEM "좁게", MNID_CTXT_FONTS_SMALL + MENUITEM "보통", MNID_CTXT_FONTS_NORMAL + MENUITEM "넓게", MNID_CTXT_FONTS_LARGE END - POPUP "�� ׻� ��̱�" + POPUP "도움말 항상 보이기" BEGIN - MENUITEM "�⺻", MNID_CTXT_HELP_DEFAULT - MENUITEM "��̱�", MNID_CTXT_HELP_VISIBLE - MENUITEM "�� ̱�", MNID_CTXT_HELP_NONVISIBLE + MENUITEM "기본", MNID_CTXT_HELP_DEFAULT + MENUITEM "보이기", MNID_CTXT_HELP_VISIBLE + MENUITEM "안 보이기", MNID_CTXT_HELP_NONVISIBLE END - MENUITEM "�ý�� ", MNID_CTXT_SYSTEM_COLORS + MENUITEM "시스템 색상 사용", MNID_CTXT_SYSTEM_COLORS END END

1 0

Igor Paliychuk : inetcpl.cpl: Updated Ukrainian translation.
by Alexandre Julliard 18 Oct '10

18 Oct '10

Module: wine Branch: master Commit: 716cbb84d784ea45b76b212776b48c721f286c68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=716cbb84d784ea45b76b21277… Author: Igor Paliychuk <igor-hkr(a)mail.ru> Date: Mon Oct 18 09:18:32 2010 +0300 inetcpl.cpl: Updated Ukrainian translation. --- dlls/inetcpl.cpl/cpl_Uk.rc | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_Uk.rc b/dlls/inetcpl.cpl/cpl_Uk.rc index e9bc576..2ee818f 100644 --- a/dlls/inetcpl.cpl/cpl_Uk.rc +++ b/dlls/inetcpl.cpl/cpl_Uk.rc @@ -32,3 +32,35 @@ BEGIN IDS_CPL_NAME "Налаштування Інтернету" IDS_CPL_INFO "Налаштувати Wine Internet Browser та пов'язані параметри" END + +/* "General" propsheet */ +IDD_GENERAL DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Загальні" +BEGIN + + GROUPBOX " Домашня сторінка ", IDC_STATIC, 4, 4, 312, 52 + LTEXT "Ви можете вказати адресу, що буде використана як домашня сторінка.", + IDC_STATIC, 58, 12, 252, 10 + EDITTEXT IDC_HOME_EDIT, 58, 22, 252, 12, WS_VISIBLE | ES_AUTOHSCROLL + PUSHBUTTON "&Поточна сторінка", IDC_HOME_CURRENT, 58, 36, 80, 14 + PUSHBUTTON "&За замовчуванням", IDC_HOME_DEFAULT, 144, 36, 80, 14 + PUSHBUTTON "По&рожня сторінка", IDC_HOME_BLANK, 230, 36, 80, 14 + +END + +/* "Content" propsheet */ +IDD_CONTENT DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Вміст" +BEGIN + + GROUPBOX " Сертифікати ", IDC_STATIC, 4, 4, 312, 50 + LTEXT "Сертифікати використовуються для вашої ідентифікації та для ідентифікації органів сертифікації та видавців.", + IDC_STATIC, 58, 14, 252, 18 + PUSHBUTTON "Сертифікати...", IDC_CERT, 146, 34, 80, 14 + PUSHBUTTON "Видавці...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 + +END

1 0

Igor Paliychuk : ipconfig: Updated Ukrainian translation.
by Alexandre Julliard 18 Oct '10

18 Oct '10

Module: wine Branch: master Commit: 2330b7ff65c10dd6625e8ec780a5f4ee58b2a634 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2330b7ff65c10dd6625e8ec78… Author: Igor Paliychuk <igor-hkr(a)mail.ru> Date: Mon Oct 18 09:19:11 2010 +0300 ipconfig: Updated Ukrainian translation. --- programs/ipconfig/Uk.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/Uk.rc b/programs/ipconfig/Uk.rc index 9f6d1b7..6db8ed4 100644 --- a/programs/ipconfig/Uk.rc +++ b/programs/ipconfig/Uk.rc @@ -48,4 +48,5 @@ STRINGTABLE STRING_DHCP_ENABLED, "DHCP ввімкнено" STRING_YES, "Так" STRING_NO, "Ні" + STRING_DEFAULT_GATEWAY, "Шлюз за замовчуванням" }

1 0

Igor Paliychuk : taskkill: Updated Ukrainian translation.
by Alexandre Julliard 18 Oct '10

18 Oct '10

Module: wine Branch: master Commit: 169bdd7a8c82d8d8c40a7d2a9f7f05d7ae691888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=169bdd7a8c82d8d8c40a7d2a9… Author: Igor Paliychuk <igor-hkr(a)mail.ru> Date: Mon Oct 18 09:19:35 2010 +0300 taskkill: Updated Ukrainian translation. --- programs/taskkill/Uk.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/taskkill/Uk.rc b/programs/taskkill/Uk.rc index fe07a1e..d36abf8 100644 --- a/programs/taskkill/Uk.rc +++ b/programs/taskkill/Uk.rc @@ -42,4 +42,5 @@ STRINGTABLE STRING_SEARCH_FAILED, "Помилка: Не вдалось знайти процес \"%s\".\n" STRING_ENUM_FAILED, "Помилка: Неможливо перелічити список процесів.\n" STRING_TERMINATE_FAILED, "Помилка: Не вдається завершити процес \"%s\".\n" + STRING_SELF_TERMINATION, "Помилка: Самоприпинення процесу не дозволене.\n" }

1 0

Louis Lenders : kernel32/tests: Add some more tests for GetTempFileName.
by Alexandre Julliard 18 Oct '10

18 Oct '10

Module: wine Branch: master Commit: 933bcb92b0822acb31ad59c9370f8f33f377d416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=933bcb92b0822acb31ad59c93… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Oct 17 01:51:54 2010 +0200 kernel32/tests: Add some more tests for GetTempFileName. --- dlls/kernel32/tests/path.c | 29 +++++++++++++++++++++++------ 1 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index e6d7e56..0200fc4 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -310,11 +310,14 @@ static void test_InitPathA(CHAR *newdir, CHAR *curDrive, CHAR *otherDrive) { CHAR tmppath[MAX_PATH], /*path to TEMP */ tmpstr[MAX_PATH], - tmpstr1[MAX_PATH]; + tmpstr1[MAX_PATH], + invalid_dir[MAX_PATH]; + DWORD len,len1,drives; INT id; HANDLE hndl; BOOL bRes; + UINT unique; *curDrive = *otherDrive = NOT_A_VALID_DRIVE; @@ -334,11 +337,7 @@ static void test_InitPathA(CHAR *newdir, CHAR *curDrive, CHAR *otherDrive) ok(len1==len+1 || broken(len1 == len), /* WinME */ "GetTempPathA should return string length %d instead of %d\n",len+1,len1); -/* Test GetTmpFileNameA - The only test we do here is whether GetTempFileNameA passes or not. - We do not thoroughly test this function yet (specifically, whether - it behaves correctly when 'unique' is non zero) -*/ +/* Test GetTmpFileNameA */ ok((id=GetTempFileNameA(tmppath,"path",0,newdir)),"GetTempFileNameA failed\n"); sprintf(tmpstr,"pat%.4x.tmp",id & 0xffff); sprintf(tmpstr1,"pat%x.tmp",id & 0xffff); @@ -361,6 +360,24 @@ static void test_InitPathA(CHAR *newdir, CHAR *curDrive, CHAR *otherDrive) ok(DeleteFileA(newdir),"Couldn't delete the temporary file we just created\n"); } + for(unique=0;unique<3;unique++) { + /* Non-existent path */ + sprintf(invalid_dir, "%s\%s",tmppath,"non_existent_dir_1jwj3y32nb3"); + SetLastError(0xdeadbeef); + todo_wine + ok(!GetTempFileNameA(invalid_dir,"tfn",unique,newdir),"GetTempFileNameA should have failed\n"); + todo_wine + ok(GetLastError()==ERROR_DIRECTORY || broken(GetLastError()==ERROR_PATH_NOT_FOUND)/*win98*/, + "got %d, expected ERROR_DIRECTORY\n", GetLastError()); + + /* Check return value for unique !=0 */ + if(unique) { + ok((GetTempFileNameA(tmppath,"tfn",unique,newdir) == unique),"GetTempFileNameA unexpectedly failed\n"); + /* if unique != 0, the actual temp files are not created: */ + ok(!DeleteFileA(newdir) && GetLastError() == ERROR_FILE_NOT_FOUND,"Deleted a file that shouldn't exist!\n"); + } + } + /* Find first valid drive letter that is neither newdir[0] nor curDrive */ drives = GetLogicalDrives() & ~(1<<(newdir[0]-'A')); if( *curDrive != NOT_A_VALID_DRIVE)

1 0