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

Igor Paliychuk : shlwapi: Convert Ukrainian resources into utf-8.
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: 86dd44341591310ca2fd53a7506aeb426c478611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86dd44341591310ca2fd53a75… Author: Igor Paliychuk <mansonigor(a)gmail.com> Date: Fri Jun 17 22:20:26 2011 +0300 shlwapi: Convert Ukrainian resources into utf-8. --- dlls/shlwapi/shlwapi_Uk.rc | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/shlwapi/shlwapi_Uk.rc b/dlls/shlwapi/shlwapi_Uk.rc index b773e9b..e2fd38e 100644 --- a/dlls/shlwapi/shlwapi_Uk.rc +++ b/dlls/shlwapi/shlwapi_Uk.rc @@ -20,18 +20,21 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "��!" +CAPTION "Помилка!" FONT 8, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 - CHECKBOX "&�� ", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Більше не показувати це повідомлення", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON "&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&��", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&��", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&ͳ", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Скасувати", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Так", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Ні", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP }

1 0

Igor Paliychuk : wininet: Convert Ukrainian resources into utf-8.
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: 64d668a2bc8cfefaf2f30f8bc4ad826ac7204279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64d668a2bc8cfefaf2f30f8bc… Author: Igor Paliychuk <mansonigor(a)gmail.com> Date: Fri Jun 17 22:20:26 2011 +0300 wininet: Convert Ukrainian resources into utf-8. --- dlls/wininet/wininet_Uk.rc | 35 +++++++++++++++++++---------------- 1 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/wininet_Uk.rc b/dlls/wininet/wininet_Uk.rc index 7a7f766..3ab0ec3 100644 --- a/dlls/wininet/wininet_Uk.rc +++ b/dlls/wininet/wininet_Uk.rc @@ -21,44 +21,47 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT IDD_PROXYDLG DIALOG 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "�� " +CAPTION "Введіть Мережний Пароль" FONT 8, "MS Shell Dlg" { - LTEXT "�� , �� '� �� :", -1, 40, 6, 150, 15 - LTEXT "��", -1, 40, 26, 50, 10 - LTEXT "��", -1, 40, 46, 50, 10 - LTEXT "��", -1, 40, 66, 50, 10 - LTEXT "��", -1, 40, 86, 50, 10 + LTEXT "Будь ласка, введіть Ваші ім'я та пароль:", -1, 40, 6, 150, 15 + LTEXT "Проксі", -1, 40, 26, 50, 10 + LTEXT "Область", -1, 40, 46, 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 "&�� (��)", IDC_SAVEPASSWORD, + CHECKBOX "&Зберегти цей пароль (небезпечно)", IDC_SAVEPASSWORD, 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "��", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Скасувати", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } IDD_AUTHDLG DIALOG 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "�� " +CAPTION "Необхідна авторизація" FONT 8, "MS Shell Dlg" { - LTEXT "�� , �� '� �� :", -1, 40, 6, 150, 15 - LTEXT "��", -1, 40, 26, 50, 10 - LTEXT "��", -1, 40, 46, 50, 10 - LTEXT "��", -1, 40, 66, 50, 10 - LTEXT "��", -1, 40, 86, 50, 10 + LTEXT "Будь ласка, введіть Ваші ім'я та пароль:", -1, 40, 6, 150, 15 + LTEXT "Сервер", -1, 40, 26, 50, 10 + LTEXT "Область", -1, 40, 46, 50, 10 + LTEXT "Користувач", -1, 40, 66, 50, 10 + LTEXT "Пароль", -1, 40, 86, 50, 10 LTEXT "", IDC_SERVER, 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 "&�� (��)", IDC_SAVEPASSWORD, + CHECKBOX "&Зберегти цей пароль (небезпечно)", IDC_SAVEPASSWORD, 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "��", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Скасувати", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP }

1 0

Igor Paliychuk : po: Update Ukrainian translation.
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: a57f2b2d8a5e5b2eec2533a22eda5069e21fedb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a57f2b2d8a5e5b2eec2533a22… Author: Igor Paliychuk <mansonigor(a)gmail.com> Date: Fri Jun 17 23:38:48 2011 +0300 po: Update Ukrainian translation. --- documentation/README.uk | 2 +- po/uk.po | 255 +++++++++++++++++++---------------------------- 2 files changed, 104 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a57f2b2d8a5e5b2eec253…

1 0

Alexandre Julliard : widl: Use NdrPointerFree instead of freeing by hand where possible.
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: 809810eb28739307a53915325eb23d76f4483eb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=809810eb28739307a53915325… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 20 13:51:27 2011 +0200 widl: Use NdrPointerFree instead of freeing by hand where possible. --- tools/widl/typegen.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 0096c32..847e10b 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4189,19 +4189,18 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const if (phase == PHASE_FREE || pass == PASS_RETURN || pointer_type != RPC_FC_RP) { - if (pointer_type == RPC_FC_RP && phase == PHASE_FREE && + /* strings returned are assumed to be global and hence don't + * need freeing */ + if (is_declptr(type) && !(phase == PHASE_FREE && pass == PASS_RETURN)) + print_phase_function(file, indent, "Pointer", local_var_prefix, + phase, var, start_offset); + else if (pointer_type == RPC_FC_RP && phase == PHASE_FREE && !in_attr && is_conformant_array(type)) { print_file(file, indent, "if (%s%s)\n", local_var_prefix, var->name); indent++; print_file(file, indent, "__frame->_StubMsg.pfnFree(%s%s);\n", local_var_prefix, var->name); } - /* strings returned are assumed to be global and hence don't - * need freeing */ - else if (is_declptr(type) && - !(phase == PHASE_FREE && pass == PASS_RETURN)) - print_phase_function(file, indent, "Pointer", local_var_prefix, - phase, var, start_offset); } else { @@ -4257,7 +4256,7 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const } if (pointer_type != RPC_FC_RP) array_type = "Pointer"; - print_phase_function(file, indent, array_type, local_var_prefix, phase, var, start_offset); + if (phase == PHASE_FREE && pointer_type == RPC_FC_RP) { /* these are all unmarshalled by allocating memory */ @@ -4266,11 +4265,20 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const ((tc == RPC_FC_SMVARRAY || tc == RPC_FC_LGVARRAY) && in_attr) || (tc == RPC_FC_CARRAY && !in_attr)) { + if (type_array_is_decl_as_ptr(type) && type->details.array.ptr_tfsoff) + { + print_phase_function(file, indent, "Pointer", local_var_prefix, phase, var, + type->details.array.ptr_tfsoff); + break; + } + print_phase_function(file, indent, array_type, local_var_prefix, phase, var, start_offset); print_file(file, indent, "if (%s%s)\n", local_var_prefix, var->name); indent++; print_file(file, indent, "__frame->_StubMsg.pfnFree(%s%s);\n", local_var_prefix, var->name); + break; } } + print_phase_function(file, indent, array_type, local_var_prefix, phase, var, start_offset); break; } case TGT_BASIC:

1 0

Alexandre Julliard : rpcrt4: Make sure we don't try to free a pointer twice .
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: 781ff545cfbdcfd5e91a9308ef6dc7fde8ac032a URL: http://source.winehq.org/git/wine.git/?a=commit;h=781ff545cfbdcfd5e91a9308e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 20 14:07:59 2011 +0200 rpcrt4: Make sure we don't try to free a pointer twice. --- dlls/rpcrt4/ndr_stubless.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index bbc9c19..c5f3074 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1241,18 +1241,18 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, else call_freer(pStubMsg, *(unsigned char **)pArg, pTypeFormat); } - - if (pParam->param_attributes.IsOut && - !pParam->param_attributes.IsIn && - !pParam->param_attributes.IsByValue && - !pParam->param_attributes.ServerAllocSize) + else if (pParam->param_attributes.ServerAllocSize) + { + HeapFree(GetProcessHeap(), 0, *(void **)pArg); + } + else if (pParam->param_attributes.IsOut && + !pParam->param_attributes.IsIn && + !pParam->param_attributes.IsByValue) { if (*pTypeFormat != RPC_FC_BIND_CONTEXT) pStubMsg->pfnFree(*(void **)pArg); } - if (pParam->param_attributes.ServerAllocSize) - HeapFree(GetProcessHeap(), 0, *(void **)pArg); break; case STUBLESS_INITOUT: if (!pParam->param_attributes.IsIn &&

1 0

Aurimas Fišeras : shell32: Update Lithuanian translation.
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: 2e5c9b4d26d18152398e6d56094544339a81aa81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e5c9b4d26d18152398e6d560… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sat Jun 18 15:13:36 2011 +0300 shell32: Update Lithuanian translation. --- dlls/shell32/shell32_Lt.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shell32_Lt.rc b/dlls/shell32/shell32_Lt.rc index 4553103..1b4b3f66 100644 --- a/dlls/shell32/shell32_Lt.rc +++ b/dlls/shell32/shell32_Lt.rc @@ -1,5 +1,5 @@ /* - * Copyright 2009-2010 Aurimas Fišeras <aurimas(a)gmail.com> + * Copyright 2009-2011 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 @@ -75,7 +75,7 @@ CAPTION "Apie %s" FONT 10, "MS Shell Dlg" { DEFPUSHBUTTON "Gerai", IDOK, 153, 133, 60, 12, WS_TABSTOP - PUSHBUTTON "Wine &licencija...", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP + PUSHBUTTON "Wine &licencija", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER ICON "", stc1, 10, 10, 30, 30 LTEXT "", IDC_ABOUT_STATIC_TEXT1, 42, 10, 170, 10

1 0

Aurimas Fišeras : cmdlgtst: Update Lithuanian translation.
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: 8d834b4168f39ac6303747df5271f00dcb1e837a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d834b4168f39ac6303747df5… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sat Jun 18 15:11:51 2011 +0300 cmdlgtst: Update Lithuanian translation. --- programs/cmdlgtst/Lt.rc | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/programs/cmdlgtst/Lt.rc b/programs/cmdlgtst/Lt.rc index 45088a6..501485a 100644 --- a/programs/cmdlgtst/Lt.rc +++ b/programs/cmdlgtst/Lt.rc @@ -2,7 +2,7 @@ * Common Dialog Test Jig Exerciser * Lithuanian Language Support * - * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * Copyright 2009-2011 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 @@ -35,30 +35,30 @@ CmdlgtstMenu MENU POPUP "&Commdlg" { - MENUITEM "&Atverti", CM_U_OPEN - MENUITEM "&Išsaugoti", CM_U_SAVE + MENUITEM "&Atverti...", CM_U_OPEN + MENUITEM "&Išsaugoti kaip...", CM_U_SAVE MENUITEM SEPARATOR - MENUITEM "&Spalva", CM_U_COLOR - MENUITEM "&Šriftas", CM_U_FONT + MENUITEM "&Spalva...", CM_U_COLOR + MENUITEM "&Šriftas...", CM_U_FONT MENUITEM SEPARATOR - MENUITEM "Ieškoti &teksto", CM_U_FIND - MENUITEM "Pa&keisti tekstą", CM_U_REPLACE + MENUITEM "Ieškoti &teksto...", CM_U_FIND + MENUITEM "Pa&keisti tekstą...", CM_U_REPLACE MENUITEM SEPARATOR - MENUITEM "S&pausdinti", CM_U_PRINT - MENUITEM "Puslapio &nuostatos", CM_U_PAGESETUP + MENUITEM "S&pausdinti...", CM_U_PRINT + MENUITEM "Puslapio &nuostatos...", CM_U_PAGESETUP } POPUP "Ž&ymos bitai" { - MENUITEM "&Failas", CM_F_FILE + MENUITEM "&Failas...", CM_F_FILE MENUITEM SEPARATOR - MENUITEM "&Spalva", CM_F_COLOR - MENUITEM "&Šriftas", CM_F_FONT + MENUITEM "&Spalva...", CM_F_COLOR + MENUITEM "&Šriftas...", CM_F_FONT MENUITEM SEPARATOR - MENUITEM "&Ieškoti/pakeisti", CM_F_FINDREPLACE + MENUITEM "&Ieškoti/pakeisti...", CM_F_FINDREPLACE MENUITEM SEPARATOR - MENUITEM "S&pausdinti", CM_F_PRINT - MENUITEM "Puslapio &nuostatos", CM_F_PAGESETUP + MENUITEM "S&pausdinti...", CM_F_PRINT + MENUITEM "Puslapio &nuostatos...", CM_F_PAGESETUP } POPUP "&Žinynas"

1 0

Igor Paliychuk : avifil32: Convert Ukrainian resources into utf-8.
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: e5b6f5b4ad40a6af116bdbfa8d0c3156684f1d03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5b6f5b4ad40a6af116bdbfa8… Author: Igor Paliychuk <mansonigor(a)gmail.com> Date: Fri Jun 17 22:20:26 2011 +0300 avifil32: Convert Ukrainian resources into utf-8. --- dlls/avifil32/avifile_Uk.rc | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/avifil32/avifile_Uk.rc b/dlls/avifil32/avifile_Uk.rc index a6cb2e8..24b8015 100644 --- a/dlls/avifil32/avifile_Uk.rc +++ b/dlls/avifil32/avifile_Uk.rc @@ -18,22 +18,25 @@ #include "avifile_private.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT IDD_SAVEOPTIONS DIALOG 43, 37, 196, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "�� " +CAPTION "Параметри стиснення" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&�� :",-1,2,5,114,10 + LTEXT "&Оберіть потік:",-1,2,5,114,10 COMBOBOX IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "�&��...",IDC_OPTIONS,145,17,45,14 - AUTOCHECKBOX "&�� ",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP + PUSHBUTTON "П&араметри...",IDC_OPTIONS,145,17,45,14 + AUTOCHECKBOX "&Інтервал чергування",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP EDITTEXT IDC_INTERLEAVEEVERY,66,41,32,12,ES_AUTOHSCROLL - LTEXT "��",-1,104,43,36,9 - LTEXT "�� :",-1,3,56,53,9 - LTEXT "�� ",IDC_FORMATTEXT,55,56,90,26 + LTEXT "кадрів",-1,104,43,36,9 + LTEXT "Поточний формат:",-1,3,56,53,9 + LTEXT "Це місце здається в оренду",IDC_FORMATTEXT,55,56,90,26 DEFPUSHBUTTON "OK",IDOK,145,42,45,14 - PUSHBUTTON "��",IDCANCEL,145,61,45,14 + PUSHBUTTON "Скасувати",IDCANCEL,145,61,45,14 END

1 0

Igor Paliychuk : comctl32: Convert Ukrainian resources into utf-8.
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: 5b19087c439d1b0de41d296c2edf0692e095ab7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b19087c439d1b0de41d296c2… Author: Igor Paliychuk <mansonigor(a)gmail.com> Date: Fri Jun 17 22:20:26 2011 +0300 comctl32: Convert Ukrainian resources into utf-8. --- dlls/comctl32/comctl_Uk.rc | 43 +++++++++++++++++++++++-------------------- 1 files changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/comctl32/comctl_Uk.rc b/dlls/comctl32/comctl_Uk.rc index dde83f4..bd6eac2 100644 --- a/dlls/comctl32/comctl_Uk.rc +++ b/dlls/comctl32/comctl_Uk.rc @@ -22,31 +22,34 @@ #include "comctl32.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "�� %s" +CAPTION "Властивості для %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "&��", IDCANCEL,58,122,50,14 - PUSHBUTTON "&��", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED - PUSHBUTTON "&��", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + PUSHBUTTON "&Скасувати", IDCANCEL,58,122,50,14 + PUSHBUTTON "&Застосувати", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "&Довідка", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 END IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "��" +CAPTION "Майстер" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "< &��", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "&�� >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "&��", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "&��", IDCANCEL,178,138,50,14 - PUSHBUTTON "&��", IDHELP,235,138,50,14,WS_GROUP + PUSHBUTTON "< &Назад", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "&Далі >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "&Завершити", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "&Скасувати", IDCANCEL,178,138,50,14 + PUSHBUTTON "&Довідка", IDHELP,235,138,50,14,WS_GROUP LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE @@ -55,18 +58,18 @@ END IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "�� " +CAPTION "Настройка панелі інструментів" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "&��", IDCANCEL,308,6,44,14 - PUSHBUTTON "&��", IDC_RESET_BTN,308,23,44,14 - PUSHBUTTON "&��", IDC_HELP_BTN,308,40,44,14 - PUSHBUTTON "�� &��", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "�� &��", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "��&�� :", -1,4,5,84,10 + DEFPUSHBUTTON "&Закрити", IDCANCEL,308,6,44,14 + PUSHBUTTON "&Скинути", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&Довідка", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "Пересунути в&гору", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "Пересунути до&низу", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "На&явні кнопки:", -1,4,5,84,10 LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "&�� ->", IDOK, 131, 42, 44, 14 - PUSHBUTTON "<- &��", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "&�� :", -1,182,5,78,10 + PUSHBUTTON "&Додати ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- &Прибрати", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "&Кнопки панелі інструментів:", -1,182,5,78,10 LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP END

1 0

Jerome Leclanche : winhttp: Fix a warning when compiling --without-openssl.
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: 66b075a0c9e968565c53ed2586bdd1c9ffe8d513 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66b075a0c9e968565c53ed258… Author: Jerome Leclanche <adys.wh(a)gmail.com> Date: Mon Jun 20 07:01:47 2011 +0100 winhttp: Fix a warning when compiling --without-openssl. --- dlls/winhttp/net.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 02ba1af..ecaba3d 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -735,8 +735,6 @@ BOOL netconn_send( netconn_t *conn, const void *msg, size_t len, int flags, int BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd ) { - int ret; - *recvd = 0; if (!netconn_connected( conn )) return FALSE; if (!len) return TRUE; @@ -744,6 +742,8 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd if (conn->secure) { #ifdef SONAME_LIBSSL + int ret; + if (flags & ~(MSG_PEEK | MSG_WAITALL)) FIXME("SSL_read does not support the following flags: %08x\n", flags);

1 0