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

Hwang YunSong : xcopy: Update Korean resource.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: 098e6e7f8a19e846f93f3f4a14cc66a1db402e3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=098e6e7f8a19e846f93f3f4a1… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Jun 28 10:21:37 2010 +0900 xcopy: Update Korean resource. --- programs/xcopy/Ko.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/xcopy/Ko.rc b/programs/xcopy/Ko.rc index 6a5071c..2d32095 100644 --- a/programs/xcopy/Ko.rc +++ b/programs/xcopy/Ko.rc @@ -3,7 +3,7 @@ * Korean language support * * Copyright (C) 2007 J. Edmeades - * Copyright (C) 2007 YunSong Hwang(hys545(a)dreamwiz.com) + * Copyright (C) 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 @@ -54,8 +54,8 @@ XCOPY \n\ Where:\n\ \n\ -[/I] Assume directory if destination does not exist and copying 2 or\n\ -\tmore files\n\ +[/I] �� ʴ� �� 丮�� ϰ� �ΰ�� \n\ +\ ��\n\ [/S] ��丮�ϰ� �� 丮 ��\n\ [/E] �� 丮�� ؼ� ��丮�� 丮 ��\n\ [/Q] ��ϰ� ��Ǵ� ��̳� ��丮�� ǥ�� ʰ� ��.\n\ @@ -73,7 +73,7 @@ Where:\n\ [/C] ��ϴ� ��ȿ� �� ߻��ص� �� \n\ [/A] �� Ӽ�� Ǿ��ִ� ��ϸ� ��\n\ [/M] �� Ӽ�� ϸ鼭 �� Ӽ�� Ǿ��ִ�\n\ -\��ϸ� ��\n\ +\ ��ϸ� ��\n\ [/D | /D:m-d-y] �� ¥ �Ŀ� ��ǰų� ��ο� �� .\n\ \t\tI�� �� ¥�� ,�� \n\ \t\t�� ͸� ��\n\n"

1 0

Jacek Caban : mshtml: Store client site in HTMLDocumentObj as soon as possible in SetClientSite.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: 95a53a9ff61c3aa5f74a3dd4560bba9da804fd8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=95a53a9ff61c3aa5f74a3dd45… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 28 12:51:11 2010 +0200 mshtml: Store client site in HTMLDocumentObj as soon as possible in SetClientSite. --- dlls/mshtml/oleobj.c | 26 ++++---- dlls/mshtml/tests/htmldoc.c | 150 +++++++++++++++++++++++------------------- 2 files changed, 95 insertions(+), 81 deletions(-) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index a33f479..eab76bf 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -96,8 +96,10 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite HTMLDocument *This = OLEOBJ_THIS(iface); IDocHostUIHandler *pDocHostUIHandler = NULL; IOleCommandTarget *cmdtrg = NULL; + IOleWindow *ole_window; BOOL hostui_setup; VARIANT silent; + HWND hwnd; HRESULT hres; TRACE("(%p)->(%p)\n", This, pClientSite); @@ -121,6 +123,9 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite if(!pClientSite) return S_OK; + IOleClientSite_AddRef(pClientSite); + This->doc_obj->client = pClientSite; + hostui_setup = This->doc_obj->hostui_setup; hres = IOleObject_QueryInterface(pClientSite, &IID_IDocHostUIHandler, (void**)&pDocHostUIHandler); @@ -129,6 +134,8 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite LPOLESTR key_path = NULL, override_key_path = NULL; IDocHostUIHandler2 *pDocHostUIHandler2; + This->doc_obj->hostui = pDocHostUIHandler; + memset(&hostinfo, 0, sizeof(DOCHOSTUIINFO)); hostinfo.cbSize = sizeof(DOCHOSTUIINFO); hres = IDocHostUIHandler_GetHostInfo(pDocHostUIHandler, &hostinfo); @@ -166,19 +173,16 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite This->doc_obj->hostui_setup = TRUE; } + }else { + This->doc_obj->hostui = NULL; } /* Native calls here GetWindow. What is it for? * We don't have anything to do with it here (yet). */ - if(pClientSite) { - IOleWindow *pOleWindow = NULL; - HWND hwnd; - - hres = IOleClientSite_QueryInterface(pClientSite, &IID_IOleWindow, (void**)&pOleWindow); - if(SUCCEEDED(hres)) { - IOleWindow_GetWindow(pOleWindow, &hwnd); - IOleWindow_Release(pOleWindow); - } + hres = IOleClientSite_QueryInterface(pClientSite, &IID_IOleWindow, (void**)&ole_window); + if(SUCCEEDED(hres)) { + IOleWindow_GetWindow(ole_window, &hwnd); + IOleWindow_Release(ole_window); } hres = IOleClientSite_QueryInterface(pClientSite, &IID_IOleCommandTarget, (void**)&cmdtrg); @@ -204,10 +208,6 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite IOleCommandTarget_Release(cmdtrg); } - IOleClientSite_AddRef(pClientSite); - This->doc_obj->client = pClientSite; - This->doc_obj->hostui = pDocHostUIHandler; - if(This->doc_obj->usermode == UNKNOWN_USERMODE) IOleControl_OnAmbientPropertyChange(CONTROL(This), DISPID_AMBIENT_USERMODE); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 2d51262..65451b1 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -1368,6 +1368,74 @@ static const IOleContainerVtbl OleContainerVtbl = { static IOleContainer OleContainer = { &OleContainerVtbl }; +static HRESULT WINAPI ClientSite_QueryInterface(IOleClientSite *iface, REFIID riid, void **ppv) +{ + return QueryInterface(riid, ppv); +} + +static ULONG WINAPI ClientSite_AddRef(IOleClientSite *iface) +{ + return 2; +} + +static ULONG WINAPI ClientSite_Release(IOleClientSite *iface) +{ + return 1; +} + +static HRESULT WINAPI ClientSite_SaveObject(IOleClientSite *iface) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ClientSite_GetMoniker(IOleClientSite *iface, DWORD dwAssign, DWORD dwWhichMoniker, + IMoniker **ppmon) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ClientSite_GetContainer(IOleClientSite *iface, IOleContainer **ppContainer) +{ + CHECK_EXPECT(GetContainer); + ok(ppContainer != NULL, "ppContainer = NULL\n"); + *ppContainer = &OleContainer; + return S_OK; +} + +static HRESULT WINAPI ClientSite_ShowObject(IOleClientSite *iface) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ClientSite_OnShowWindow(IOleClientSite *iface, BOOL fShow) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ClientSite_RequestNewObjectLayout(IOleClientSite *iface) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IOleClientSiteVtbl ClientSiteVtbl = { + ClientSite_QueryInterface, + ClientSite_AddRef, + ClientSite_Release, + ClientSite_SaveObject, + ClientSite_GetMoniker, + ClientSite_GetContainer, + ClientSite_ShowObject, + ClientSite_OnShowWindow, + ClientSite_RequestNewObjectLayout +}; + +static IOleClientSite ClientSite = { &ClientSiteVtbl }; + static HRESULT WINAPI InPlaceFrame_QueryInterface(IOleInPlaceFrame *iface, REFIID riid, void **ppv) { static const GUID undocumented_frame_iid = {0xfbece6c9,0x48d7,0x4a37,{0x8f,0xe3,0x6a,0xd4,0x27,0x2f,0xdd,0xac}}; @@ -1558,9 +1626,23 @@ static ULONG WINAPI InPlaceSiteWindowless_Release(IOleInPlaceSiteWindowless *ifa static HRESULT WINAPI InPlaceSiteWindowless_GetWindow( IOleInPlaceSiteWindowless *iface, HWND *phwnd) { + IOleClientSite *client_site; + IOleObject *ole_obj; + HRESULT hres; + CHECK_EXPECT2(GetWindow); ok(phwnd != NULL, "phwnd = NULL\n"); *phwnd = container_hwnd; + + hres = IUnknown_QueryInterface(doc_unk, &IID_IOleObject, (void**)&ole_obj); + ok(hres == S_OK, "Could not get IOleObject: %08x\n", hres); + + hres = IOleObject_GetClientSite(ole_obj, &client_site); + IOleObject_Release(ole_obj); + ok(hres == S_OK, "GetClientSite failed: %08x\n", hres); + ok(client_site == &ClientSite, "client_site != ClientSite\n"); + IOleClientSite_Release(client_site); + return S_OK; } @@ -1821,74 +1903,6 @@ static const IOleInPlaceSiteWindowlessVtbl InPlaceSiteWindowlessVtbl = { static IOleInPlaceSiteWindowless InPlaceSiteWindowless = { &InPlaceSiteWindowlessVtbl }; -static HRESULT WINAPI ClientSite_QueryInterface(IOleClientSite *iface, REFIID riid, void **ppv) -{ - return QueryInterface(riid, ppv); -} - -static ULONG WINAPI ClientSite_AddRef(IOleClientSite *iface) -{ - return 2; -} - -static ULONG WINAPI ClientSite_Release(IOleClientSite *iface) -{ - return 1; -} - -static HRESULT WINAPI ClientSite_SaveObject(IOleClientSite *iface) -{ - ok(0, "unexpected call\n"); - return E_NOTIMPL; -} - -static HRESULT WINAPI ClientSite_GetMoniker(IOleClientSite *iface, DWORD dwAssign, DWORD dwWhichMoniker, - IMoniker **ppmon) -{ - ok(0, "unexpected call\n"); - return E_NOTIMPL; -} - -static HRESULT WINAPI ClientSite_GetContainer(IOleClientSite *iface, IOleContainer **ppContainer) -{ - CHECK_EXPECT(GetContainer); - ok(ppContainer != NULL, "ppContainer = NULL\n"); - *ppContainer = &OleContainer; - return S_OK; -} - -static HRESULT WINAPI ClientSite_ShowObject(IOleClientSite *iface) -{ - ok(0, "unexpected call\n"); - return E_NOTIMPL; -} - -static HRESULT WINAPI ClientSite_OnShowWindow(IOleClientSite *iface, BOOL fShow) -{ - ok(0, "unexpected call\n"); - return E_NOTIMPL; -} - -static HRESULT WINAPI ClientSite_RequestNewObjectLayout(IOleClientSite *iface) -{ - ok(0, "unexpected call\n"); - return E_NOTIMPL; -} - -static const IOleClientSiteVtbl ClientSiteVtbl = { - ClientSite_QueryInterface, - ClientSite_AddRef, - ClientSite_Release, - ClientSite_SaveObject, - ClientSite_GetMoniker, - ClientSite_GetContainer, - ClientSite_ShowObject, - ClientSite_OnShowWindow, - ClientSite_RequestNewObjectLayout -}; - -static IOleClientSite ClientSite = { &ClientSiteVtbl }; - static HRESULT WINAPI DocumentSite_QueryInterface(IOleDocumentSite *iface, REFIID riid, void **ppv) { return QueryInterface(riid, ppv);

1 0

Tim Cadogan-Cowper : winmm: Correctly calculate dwFileSize for apps installing their own IOproc.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: d65031666179bba2f3bcacbd031ab153e4c7e1a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d65031666179bba2f3bcacbd0… Author: Tim Cadogan-Cowper <tccowper(a)yahoo.com.au> Date: Sun Jun 27 04:20:04 2010 -0700 winmm: Correctly calculate dwFileSize for apps installing their own IOproc. --- dlls/winmm/mmio.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index f13e090..a6e06b5 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -667,16 +667,11 @@ static HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo, DWORD dwOpenFlags, (LPARAM)szFileName, 0, FALSE); /* grab file size, when possible */ - /* FIXME: the code around dwFileSize is: - * - probably broken - * - needs to be tested when the app installs its own IOproc - * - likely to be removed - * So, restrict dwFileSize usage to DOS ioprocs - */ - if (wm->info.fccIOProc == FOURCC_DOS && (pos = _llseek((HFILE)wm->info.adwInfo[0], 0, SEEK_CUR)) != -1) - { - wm->dwFileSize = _llseek((HFILE)wm->info.adwInfo[0], 0, SEEK_END); - _llseek((HFILE)wm->info.adwInfo[0], pos, SEEK_SET); + if (wm->info.fccIOProc != FOURCC_MEM && (send_message(wm->ioProc, &wm->info, MMIOM_SEEK, 0, SEEK_CUR, FALSE)) != -1) { + pos = wm->info.lDiskOffset; + send_message(wm->ioProc, &wm->info, MMIOM_SEEK, 0, SEEK_END, FALSE); + wm->dwFileSize = wm->info.lDiskOffset; + send_message(wm->ioProc, &wm->info, MMIOM_SEEK, pos, SEEK_SET, FALSE); } else wm->dwFileSize = 0;

1 0

Eric Pouech : winmm: Added a couple of tests for structure alignment.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: e9e6845d66645daff6ffcfe599e03849e6ba9d32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9e6845d66645daff6ffcfe59… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Jun 25 22:06:07 2010 +0200 winmm: Added a couple of tests for structure alignment. --- dlls/winmm/tests/Makefile.in | 1 + dlls/winmm/tests/generated.c | 3504 ++++++++++++++++++++++++++++++++++++++++++ tools/winapi/tests.dat | 122 ++ 3 files changed, 3627 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e9e6845d66645daff6ffc…

1 0

Eric Pouech : dbghelp: Set the correct word size when unwinding stacks with Dwarf debug info.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: b38cddf4845da65a0b5567aa9fb3e9ecac964766 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b38cddf4845da65a0b5567aa9… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jun 27 18:55:09 2010 +0200 dbghelp: Set the correct word size when unwinding stacks with Dwarf debug info. --- dlls/dbghelp/dwarf.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 4d7ec0d..274410e 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2756,7 +2756,8 @@ static void copy_context_reg(CONTEXT *dstcontext, ULONG_PTR dwregdst, CONTEXT* s memcpy(ptrdst, ptrsrc, szdst); } -static ULONG_PTR eval_expression(struct cpu_stack_walk* csw, const unsigned char* zp, CONTEXT *context) +static ULONG_PTR eval_expression(struct module* module, struct cpu_stack_walk* csw, + const unsigned char* zp, CONTEXT *context) { dwarf2_traverse_context_t ctx; ULONG_PTR reg, sz, tmp, stack[64]; @@ -2767,7 +2768,7 @@ static ULONG_PTR eval_expression(struct cpu_stack_walk* csw, const unsigned char ctx.end_data = zp + 4; len = dwarf2_leb128_as_unsigned(&ctx); ctx.end_data = ctx.data + len; - ctx.word_size = 8; /* FIXME: wordsize!! */ + ctx.word_size = module->format_info[DFI_DWARF]->u.dwarf2_info->word_size; while (ctx.data < ctx.end_data) { @@ -2866,7 +2867,8 @@ static ULONG_PTR eval_expression(struct cpu_stack_walk* csw, const unsigned char return stack[sp]; } -static void apply_frame_info(struct cpu_stack_walk* csw, CONTEXT *context, struct frame_info *info, ULONG_PTR* cfa) +static void apply_frame_info(struct module* module, struct cpu_stack_walk* csw, + CONTEXT *context, struct frame_info *info, ULONG_PTR* cfa) { unsigned int i; ULONG_PTR value; @@ -2875,10 +2877,10 @@ static void apply_frame_info(struct cpu_stack_walk* csw, CONTEXT *context, struc switch (info->cfa_rule) { case RULE_EXPRESSION: - *cfa = *(ULONG_PTR*)eval_expression(csw, (const unsigned char*)info->cfa_offset, context); + *cfa = *(ULONG_PTR*)eval_expression(module, csw, (const unsigned char*)info->cfa_offset, context); break; case RULE_VAL_EXPRESSION: - *cfa = eval_expression(csw, (const unsigned char*)info->cfa_offset, context); + *cfa = eval_expression(module, csw, (const unsigned char*)info->cfa_offset, context); break; default: *cfa = get_context_reg(context, info->cfa_reg) + info->cfa_offset; @@ -2901,11 +2903,11 @@ static void apply_frame_info(struct cpu_stack_walk* csw, CONTEXT *context, struc copy_context_reg(&new_context, i, context, info->regs[i]); break; case RULE_EXPRESSION: - value = eval_expression(csw, (const unsigned char*)info->regs[i], context); + value = eval_expression(module, csw, (const unsigned char*)info->regs[i], context); set_context_reg(csw, &new_context, i, value, TRUE); break; case RULE_VAL_EXPRESSION: - value = eval_expression(csw, (const unsigned char*)info->regs[i], context); + value = eval_expression(module, csw, (const unsigned char*)info->regs[i], context); set_context_reg(csw, &new_context, i, value, FALSE); break; } @@ -2973,7 +2975,7 @@ BOOL dwarf2_virtual_unwind(struct cpu_stack_walk* csw, ULONG_PTR ip, CONTEXT* co if (end) fde_ctx.data = end; execute_cfa_instructions(&fde_ctx, ip, &info); - apply_frame_info(csw, context, &info, cfa); + apply_frame_info(pair.effective, csw, context, &info, cfa); return TRUE; }

1 0

Eric Pouech : dbghelp: Correctly handle the RULE_EXPRESSION when computing CFA in dwarf debug info .
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: 1c037bf5641d6dab556439882c1dc26d11a96b68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c037bf5641d6dab556439882… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jun 27 18:55:15 2010 +0200 dbghelp: Correctly handle the RULE_EXPRESSION when computing CFA in dwarf debug info. --- dlls/dbghelp/dwarf.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 274410e..413ae44 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2877,7 +2877,12 @@ static void apply_frame_info(struct module* module, struct cpu_stack_walk* csw, switch (info->cfa_rule) { case RULE_EXPRESSION: - *cfa = *(ULONG_PTR*)eval_expression(module, csw, (const unsigned char*)info->cfa_offset, context); + *cfa = eval_expression(module, csw, (const unsigned char*)info->cfa_offset, context); + if (!sw_read_mem(csw, *cfa, cfa, sizeof(*cfa))) + { + WARN("Couldn't read memory at %p\n", (void*)*cfa); + return; + } break; case RULE_VAL_EXPRESSION: *cfa = eval_expression(module, csw, (const unsigned char*)info->cfa_offset, context);

1 0

Eric Pouech : dbghelp: When unwinding i386 stacks, update CONTEXT with sp/ bp/ip.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: b6c8b8959be4d69db5448281cbddd64b43db228b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6c8b8959be4d69db5448281c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jun 27 18:55:21 2010 +0200 dbghelp: When unwinding i386 stacks, update CONTEXT with sp/bp/ip. --- dlls/dbghelp/cpu_i386.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index dc00410..a88b00f 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -410,8 +410,23 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO sw_read_mem(csw, frame->AddrFrame.Offset + 2 * sizeof(DWORD), frame->Params, sizeof(frame->Params)); } - goto done_pep; /* just to ensure done_pep label is referenced */ +#ifdef __i386__ + if (context) + { +#define SET(field, seg, reg) \ + switch (frame->field.Mode) \ + { \ + case AddrModeFlat: context->reg = frame->field.Offset; break; \ + case AddrMode1616: context->seg = frame->field.Segment; context->reg = frame->field.Offset; break; \ + default: assert(0); \ + } + SET(AddrStack, SegSs, Esp); + SET(AddrFrame, SegSs, Ebp); + SET(AddrReturn, SegCs, Eip); +#undef SET + } done_pep: +#endif frame->Far = TRUE; frame->Virtual = TRUE;

1 0

Igor Paliychuk : mshtml: Ukrainian translation update.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: 181d70ed4f927e5cc314b230d8132be4fafea6a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=181d70ed4f927e5cc314b230d… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Sun Jun 27 21:21:42 2010 +0300 mshtml: Ukrainian translation update. --- dlls/mshtml/Uk.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/Uk.rc b/dlls/mshtml/Uk.rc index 5e11b4d..ef3a8fb 100644 --- a/dlls/mshtml/Uk.rc +++ b/dlls/mshtml/Uk.rc @@ -26,7 +26,7 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - IDS_HTMLDISABLED "HTML rendering is currently disabled." + IDS_HTMLDISABLED "В даний момент відображення HTML вимкнено." IDS_HTMLDOCUMENT "Документ HTML" IDS_DOWNLOADING "Завантаження..." IDS_INSTALLING "Встановлення..." @@ -34,11 +34,11 @@ STRINGTABLE DISCARDABLE ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 95 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Wine Gecko Installer" +CAPTION "Встановлювач Wine Gecko" FONT 8, "MS Shell Dlg" { - LTEXT "Wine не може знайти пакунок Gecko, який потрібний для додатків embedding HTML " \ - "для коректної роботи. Wine може автоматично завантажити та встановити його для Вас.\n\n" \ + LTEXT "Wine не може знайти пакунок Gecko, який потрібний для коректної роботи додатків " \ + "з підтримкою HTML. Wine може автоматично завантажити та встановити його для Вас.\n\n" \ "Зауважте: Рекомендується використати пакет з вашого дистрибутиву. Детальніше читайте http://wiki.winehq.org/Gecko.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Прогрес", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12

1 0

Igor Paliychuk : crypt32: Ukrainian translation update.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: e9c90a6fee097f7d6525c6e69307ecf402af9705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9c90a6fee097f7d6525c6e69… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Sun Jun 27 21:54:02 2010 +0300 crypt32: Ukrainian translation update. --- dlls/crypt32/crypt32_Uk.rc | 80 ++++++++++++++++++++++---------------------- 1 files changed, 40 insertions(+), 40 deletions(-) diff --git a/dlls/crypt32/crypt32_Uk.rc b/dlls/crypt32/crypt32_Uk.rc index d26a456..c21d274 100644 --- a/dlls/crypt32/crypt32_Uk.rc +++ b/dlls/crypt32/crypt32_Uk.rc @@ -32,7 +32,7 @@ STRINGTABLE DISCARDABLE { IDS_AUTHORITY_KEY_ID "Authority Key Identifier" IDS_KEY_ATTRIBUTES "Властивості Ключа" - IDS_KEY_USAGE_RESTRICTION "Key Usage Restriction" + IDS_KEY_USAGE_RESTRICTION "Обмеження використання ключа" IDS_SUBJECT_ALT_NAME "Subject Alternative Name" IDS_ISSUER_ALT_NAME "Issuer Alternative Name" IDS_BASIC_CONSTRAINTS "Основні Обмеження" @@ -47,13 +47,13 @@ STRINGTABLE DISCARDABLE IDS_NEXT_UPDATE_LOCATION "Next Update Location" IDS_YES_OR_NO_TRUST "Yes or No Trust" IDS_EMAIL_ADDRESS "Адреса Ел. Пошти" - IDS_UNSTRUCTURED_NAME "Unstructured Name" + IDS_UNSTRUCTURED_NAME "Неструктурована назва" IDS_CONTENT_TYPE "Тип Вмісту" IDS_MESSAGE_DIGEST "Message Digest" IDS_SIGNING_TIME "Час Входу" IDS_COUNTER_SIGN "Counter Sign" IDS_CHALLENGE_PASSWORD "Challenge Password" - IDS_UNSTRUCTURED_ADDRESS "Unstructured Address" + IDS_UNSTRUCTURED_ADDRESS "Неструктурована адреса" IDS_SMIME_CAPABILITIES "SMIME Capabilities" IDS_PREFER_SIGNED_DATA "Prefer Signed Data" IDS_CPS "CPS" @@ -93,9 +93,9 @@ STRINGTABLE DISCARDABLE IDS_PRINCIPAL_NAME "Principal Name" IDS_WINDOWS_PRODUCT_UPDATE "Windows Product Update" IDS_ENROLLMENT_NAME_VALUE_PAIR "Enrollment Name Value Pair" - IDS_OS_VERSION "OS Version" + IDS_OS_VERSION "Версія OS" IDS_ENROLLMENT_CSP "Enrollment CSP" - IDS_CRL_NUMBER "CRL Number" + IDS_CRL_NUMBER "Номер CRL" IDS_DELTA_CRL_INDICATOR "Delta CRL Indicator" IDS_ISSUING_DIST_POINT "Issuing Distribution Point" IDS_FRESHEST_CRL "Freshest CRL" @@ -106,13 +106,13 @@ STRINGTABLE DISCARDABLE IDS_APPLICATION_POLICIES "Application Policies" IDS_APPLICATION_POLICY_MAPPINGS "Application Policy Mappings" IDS_APPLICATION_POLICY_CONSTRAINTS "Application Policy Constraints" - IDS_CMC_DATA "CMC Data" + IDS_CMC_DATA "Дані CMC" IDS_CMC_RESPONSE "CMC Response" IDS_UNSIGNED_CMC_REQUEST "Unsigned CMC Request" IDS_CMC_STATUS_INFO "CMC Status Info" - IDS_CMC_EXTENSIONS "CMC Extensions" - IDS_CMC_ATTRIBUTES "CMC Attributes" - IDS_PKCS_7_DATA "PKCS 7 Data" + IDS_CMC_EXTENSIONS "Розширення CMC" + IDS_CMC_ATTRIBUTES "Властивості CMC" + IDS_PKCS_7_DATA "PKCS 7 Дані" IDS_PKCS_7_SIGNED "PKCS 7 Signed" IDS_PKCS_7_ENVELOPED "PKCS 7 Enveloped" IDS_PKCS_7_SIGNED_ENVELOPED "PKCS 7 Signed Enveloped" @@ -134,7 +134,7 @@ STRINGTABLE DISCARDABLE IDS_RECIPIENT_NONCE "Recipient Nonce" IDS_REG_INFO "Reg Info" IDS_GET_CERTIFICATE "Get Certificate" - IDS_GET_CRL "Get CRL" + IDS_GET_CRL "Отримати CRL" IDS_REVOKE_REQUEST "Revoke Request" IDS_QUERY_PENDING "Query Pending" IDS_SORTED_CTL "Certificate Trust List" @@ -185,17 +185,17 @@ STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE { - IDS_KEY_ID "KeyID=" + IDS_KEY_ID "ID Ключа=" IDS_CERT_ISSUER "Certificate Issuer" - IDS_CERT_SERIAL_NUMBER "Certificate Serial Number=" + IDS_CERT_SERIAL_NUMBER "Серійний номер сертифікату=" IDS_ALT_NAME_OTHER_NAME "Інше Ім'я=" IDS_ALT_NAME_RFC822_NAME "Адреса Ел. Пошти=" - IDS_ALT_NAME_DNS_NAME "DNS Name=" - IDS_ALT_NAME_DIRECTORY_NAME "Directory Address" + IDS_ALT_NAME_DNS_NAME "Назва DNS=" + IDS_ALT_NAME_DIRECTORY_NAME "Адреса каталогу" IDS_ALT_NAME_URL "URL=" IDS_ALT_NAME_IP_ADDRESS "IP Адреса=" IDS_ALT_NAME_MASK "Маска=" - IDS_ALT_NAME_REGISTERED_ID "Registered ID=" + IDS_ALT_NAME_REGISTERED_ID "Зареєстрований ID=" IDS_USAGE_UNKNOWN "Unknown Key Usage" IDS_SUBJECT_TYPE "Subject Type=" IDS_SUBJECT_TYPE_CA "CA" @@ -204,44 +204,44 @@ STRINGTABLE DISCARDABLE IDS_PATH_LENGTH_NONE "None" IDS_INFO_NOT_AVAILABLE "Information Not Available" IDS_AIA "Authority Info Access" - IDS_ACCESS_METHOD "Access Method=" + IDS_ACCESS_METHOD "Метод доступу=" IDS_ACCESS_METHOD_OCSP "OCSP" IDS_ACCESS_METHOD_CA_ISSUERS "CA Issuers" - IDS_ACCESS_METHOD_UNKNOWN "Unknown Access Method" - IDS_ACCESS_LOCATION "Alternative Name" + IDS_ACCESS_METHOD_UNKNOWN "Невідомий метод доступу" + IDS_ACCESS_LOCATION "Альтернативна назва" IDS_CRL_DIST_POINT "CRL Distribution Point" IDS_CRL_DIST_POINT_NAME "Distribution Point Name" - IDS_CRL_DIST_POINT_FULL_NAME "Full Name" - IDS_CRL_DIST_POINT_RDN_NAME "RDN Name" + IDS_CRL_DIST_POINT_FULL_NAME "Повна назва" + IDS_CRL_DIST_POINT_RDN_NAME "Назва RDN" IDS_CRL_DIST_POINT_REASON "CRL Reason=" IDS_CRL_DIST_POINT_ISSUER "CRL Issuer" IDS_REASON_KEY_COMPROMISE "Key Compromise" IDS_REASON_CA_COMPROMISE "CA Compromise" IDS_REASON_AFFILIATION_CHANGED "Affiliation Changed" - IDS_REASON_SUPERSEDED "Superseded" - IDS_REASON_CESSATION_OF_OPERATION "Operation Ceased" + IDS_REASON_SUPERSEDED "Замінено" + IDS_REASON_CESSATION_OF_OPERATION "Операція зупинена" IDS_REASON_CERTIFICATE_HOLD "Certificate Hold" IDS_FINANCIAL_CRITERIA "Фінансові Дані=" - IDS_FINANCIAL_CRITERIA_AVAILABLE "Available" - IDS_FINANCIAL_CRITERIA_NOT_AVAILABLE "Not Available" - IDS_FINANCIAL_CRITERIA_MEETS_CRITERIA "Meets Criteria=" - IDS_YES "Yes" - IDS_NO "No" + IDS_FINANCIAL_CRITERIA_AVAILABLE "Доступно" + IDS_FINANCIAL_CRITERIA_NOT_AVAILABLE "Недоступно" + IDS_FINANCIAL_CRITERIA_MEETS_CRITERIA "Відповідає критеріям=" + IDS_YES "Так" + IDS_NO "Ні" IDS_DIGITAL_SIGNATURE "Цифровий Підпис" - IDS_NON_REPUDIATION "Non-Repudiation" - IDS_KEY_ENCIPHERMENT "Key Encipherment" - IDS_DATA_ENCIPHERMENT "Data Encipherment" - IDS_KEY_AGREEMENT "Key Agreement" - IDS_CERT_SIGN "Certificate Signing" - IDS_OFFLINE_CRL_SIGN "Off-line CRL Signing" - IDS_CRL_SIGN "CRL Signing" - IDS_ENCIPHER_ONLY "Encipher Only" - IDS_DECIPHER_ONLY "Decipher Only" - IDS_NETSCAPE_SSL_CLIENT "SSL Client Authentication" - IDS_NETSCAPE_SSL_SERVER "SSL Server Authentication" + IDS_NON_REPUDIATION "Без відмови" + IDS_KEY_ENCIPHERMENT "Шифрування ключа" + IDS_DATA_ENCIPHERMENT "Шифрування даних" + IDS_KEY_AGREEMENT "Ключова угода" + IDS_CERT_SIGN "Підписання сертифікату" + IDS_OFFLINE_CRL_SIGN "Офлайн підписання CRL" + IDS_CRL_SIGN "Підписання CRL" + IDS_ENCIPHER_ONLY "Лише зашифр." + IDS_DECIPHER_ONLY "Лише розшифр." + IDS_NETSCAPE_SSL_CLIENT "Ідентифікація клієнта SSL" + IDS_NETSCAPE_SSL_SERVER "Ідентифікація сервера SSL" IDS_NETSCAPE_SMIME "S/MIME" - IDS_NETSCAPE_SIGN "Signature" + IDS_NETSCAPE_SIGN "Підпис" IDS_NETSCAPE_SSL_CA "SSL CA" IDS_NETSCAPE_SMIME_CA "S/MIME CA" - IDS_NETSCAPE_SIGN_CA "Signature CA" + IDS_NETSCAPE_SIGN_CA "Підпис CA" }

1 0

André Hentschel : kernel32: Add NERR_UserNotFound to german winerr.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: 74532c50096d518f1028a569d45d1bd6dcbfda6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=74532c50096d518f1028a569d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 27 20:32:26 2010 +0200 kernel32: Add NERR_UserNotFound to german winerr. --- dlls/kernel32/nls/winerr_deu.mc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/nls/winerr_deu.mc b/dlls/kernel32/nls/winerr_deu.mc index 8b1d75a..478f29b 100644 --- a/dlls/kernel32/nls/winerr_deu.mc +++ b/dlls/kernel32/nls/winerr_deu.mc @@ -3729,3 +3729,8 @@ SymbolicName=RPC_S_GRP_ELT_NOT_REMOVED Language=DEU RPC_S_GRP_ELT_NOT_REMOVED . +MessageId=2221 +SymbolicName=NERR_UserNotFound +Language=DEU +Der Benutzername konnte nicht gefunden werden +.

1 0