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

Paul Vriens : shell32: Add the Serbian (Cyrillic) translation.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 1ed27712c153f0b1fb98e9f27e6f11da723238f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ed27712c153f0b1fb98e9f27… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Jul 25 10:51:54 2010 +0200 shell32: Add the Serbian (Cyrillic) translation. Translation by Nenad Vujic <nesa24casa(a)gmail.com> --- dlls/shell32/shell32_Sr.rc | 288 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 288 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ed27712c153f0b1fb98e…

1 0

Paul Vriens : user32: Add the Serbian (Cyrillic) translation.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: c2d722e3ee96457de12e46440625bcf21a0da468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2d722e3ee96457de12e46440… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Jul 25 16:01:30 2010 +0200 user32: Add the Serbian (Cyrillic) translation. Translation by Nenad Vujic <nesa24casa(a)gmail.com> --- dlls/user32/resources/user32_Sr.rc | 63 ++++++++++++++++++++++++++++++++++++ 1 files changed, 63 insertions(+), 0 deletions(-) diff --git a/dlls/user32/resources/user32_Sr.rc b/dlls/user32/resources/user32_Sr.rc index eadb81f..c83b5a4 100644 --- a/dlls/user32/resources/user32_Sr.rc +++ b/dlls/user32/resources/user32_Sr.rc @@ -84,3 +84,66 @@ STRINGTABLE IDS_ERROR "Greška" IDS_MDI_MOREWINDOWS "&Vise Prozora..." } + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +SYSMENU MENU +{ + MENUITEM "&Обнови", 61728 + MENUITEM "&Помери", 61456 + MENUITEM "&Величина", 61440 + MENUITEM "С&мањи", 61472 + MENUITEM "Цео &екран", 61488 + MENUITEM SEPARATOR + MENUITEM "&Затвори\tAlt-F4", 61536 + MENUITEM SEPARATOR + MENUITEM "&O Wine...", 61761 +} + +EDITMENU MENU +{ + POPUP "" + BEGIN + MENUITEM "&Опозови", EM_UNDO + MENUITEM SEPARATOR + MENUITEM "Исе&ци", WM_CUT + MENUITEM "&Копирај", WM_COPY + MENUITEM "&Убаци", WM_PASTE + MENUITEM "&Обриши", WM_CLEAR + MENUITEM SEPARATOR + MENUITEM "Изабери &Све", EM_SETSEL + END +} + +MSGBOX DIALOG 100, 80, 216, 168 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +BEGIN + ICON "", 1088, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE + LTEXT "", 100, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP | SS_NOPREFIX + PUSHBUTTON "&ОK", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Откажи", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Прекини", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Покушај поново", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Игнриши", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Да", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Не", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Пробај поново", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Настави", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Помоћ", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +MDI_MOREWINDOWS DIALOG 20, 20, 232, 122 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Изабери прозор" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX MDI_IDC_LISTBOX, 5, 7, 222, 90, WS_VSCROLL | WS_HSCROLL /* defined in mdi.h */ + DEFPUSHBUTTON "ОK", IDOK, 75, 100, 35, 14 + PUSHBUTTON "Откажи", IDCANCEL, 120, 100, 35, 14 +END + +STRINGTABLE +{ + IDS_ERROR "Грешка" + IDS_MDI_MOREWINDOWS "&Више прозора..." +}

1 0

Owen Rudge : d3dx9: Add basic implementation of D3DXFilterTexture, plus tests.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 54f049a656ba236bd4b9d00c1b0abe4a8721f904 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54f049a656ba236bd4b9d00c1… Author: Owen Rudge <owen(a)owenrudge.net> Date: Thu Jul 22 20:38:31 2010 +0100 d3dx9: Add basic implementation of D3DXFilterTexture, plus tests. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/tests/texture.c | 55 ++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/texture.c | 66 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 122 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index b9a00da..622a03c 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -128,7 +128,7 @@ @ stub D3DXFillTextureTX @ stub D3DXFillVolumeTexture @ stub D3DXFillVolumeTextureTX -@ stub D3DXFilterTexture +@ stdcall D3DXFilterTexture(ptr ptr long long) @ stdcall D3DXFindShaderComment(ptr long ptr ptr) @ stub D3DXFloat16To32Array @ stub D3DXFloat32To16Array diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 0eaf649..9a3b3bc 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -315,6 +315,60 @@ static void test_D3DXCreateTexture(IDirect3DDevice9 *device) } } +static void test_D3DXFilterTexture(IDirect3DDevice9 *device) +{ + IDirect3DTexture9 *tex; + HRESULT hr; + + hr = IDirect3DDevice9_CreateTexture(device, 256, 256, 5, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &tex, NULL); + + if (SUCCEEDED(hr)) + { + hr = D3DXFilterTexture((IDirect3DBaseTexture9*) tex, NULL, 0, D3DX_FILTER_NONE); + ok(hr == D3D_OK, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3D_OK); + + hr = D3DXFilterTexture((IDirect3DBaseTexture9*) tex, NULL, 0, D3DX_FILTER_BOX + 1); /* Invalid filter */ + ok(hr == D3DERR_INVALIDCALL, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXFilterTexture((IDirect3DBaseTexture9*) tex, NULL, 5, D3DX_FILTER_NONE); /* Last miplevel */ + ok(hr == D3DERR_INVALIDCALL, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXFilterTexture((IDirect3DBaseTexture9*) tex, NULL, 20, D3DX_FILTER_NONE); /* Invalid miplevel */ + ok(hr == D3DERR_INVALIDCALL, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + } + else + skip("Failed to create texture\n"); + + IDirect3DTexture9_Release(tex); + + hr = D3DXFilterTexture(NULL, NULL, 0, D3DX_FILTER_NONE); + ok(hr == D3DERR_INVALIDCALL, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + /* Test different pools */ + hr = IDirect3DDevice9_CreateTexture(device, 256, 256, 0, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &tex, NULL); + + if (SUCCEEDED(hr)) + { + hr = D3DXFilterTexture((IDirect3DBaseTexture9*) tex, NULL, 0, D3DX_FILTER_NONE); + ok(hr == D3D_OK, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3D_OK); + IDirect3DTexture9_Release(tex); + } + else + skip("Failed to create texture\n"); + + + hr = IDirect3DDevice9_CreateTexture(device, 256, 256, 0, 0, D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &tex, NULL); + + if (SUCCEEDED(hr)) + { + hr = D3DXFilterTexture((IDirect3DBaseTexture9*) tex, NULL, 0, D3DX_FILTER_NONE); + ok(hr == D3D_OK, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3D_OK); + IDirect3DTexture9_Release(tex); + } + else + skip("Failed to create texture\n"); +} + START_TEST(texture) { HWND wnd; @@ -348,6 +402,7 @@ START_TEST(texture) test_D3DXCheckTextureRequirements(device); test_D3DXCreateTexture(device); + test_D3DXFilterTexture(device); IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d); diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 9d547ce..8992399 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -44,6 +44,72 @@ UINT make_pow2(UINT num) return result; } +HRESULT WINAPI D3DXFilterTexture(LPDIRECT3DBASETEXTURE9 texture, + CONST PALETTEENTRY *palette, + UINT srclevel, + DWORD filter) +{ + UINT level = srclevel + 1; + HRESULT hr; + + TRACE("(%p, %p, %d, %d)\n", texture, palette, srclevel, filter); + + if (!texture) + return D3DERR_INVALIDCALL; + + if ((filter & 0xFFFF) > D3DX_FILTER_BOX && filter != D3DX_DEFAULT) + return D3DERR_INVALIDCALL; + + if (srclevel >= IDirect3DBaseTexture9_GetLevelCount(texture)) + return D3DERR_INVALIDCALL; + + switch (IDirect3DBaseTexture9_GetType(texture)) + { + case D3DRTYPE_TEXTURE: + { + IDirect3DSurface9 *topsurf, *mipsurf; + D3DSURFACE_DESC desc; + + if (filter == D3DX_DEFAULT) + { + IDirect3DTexture9_GetLevelDesc((IDirect3DTexture9*) texture, srclevel, &desc); + + if (is_pow2(desc.Width) && is_pow2(desc.Height)) + filter = D3DX_FILTER_BOX; + else + filter = D3DX_FILTER_BOX | D3DX_FILTER_DITHER; + } + + hr = IDirect3DTexture9_GetSurfaceLevel((IDirect3DTexture9*) texture, srclevel, &topsurf); + + if (FAILED(hr)) + return D3DERR_INVALIDCALL; + + while (IDirect3DTexture9_GetSurfaceLevel((IDirect3DTexture9*) texture, level, &mipsurf) == D3D_OK) + { + hr = D3DXLoadSurfaceFromSurface(mipsurf, palette, NULL, topsurf, palette, NULL, filter, 0); + IDirect3DSurface9_Release(mipsurf); + + if (FAILED(hr)) + break; + + level++; + } + + IDirect3DSurface9_Release(topsurf); + + if (level == srclevel + 1) + return D3DERR_INVALIDCALL; + + return D3D_OK; + } + + default: + FIXME("Implement volume and cube texture filtering\n"); + return E_NOTIMPL; + } +} + HRESULT WINAPI D3DXCheckTextureRequirements(LPDIRECT3DDEVICE9 device, UINT* width, UINT* height,

1 0

Alexandre Julliard : user32: Don' t make constants static to avoid compile error without optimization.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: bde57f0e6412742884994181653ebc43852c7641 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bde57f0e64127428849941816… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jul 24 11:17:05 2010 +0200 user32: Don't make constants static to avoid compile error without optimization. --- dlls/user32/painting.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 5e57e7f..cd096cd 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -909,8 +909,8 @@ BOOL WINAPI EndPaint( HWND hwnd, const PAINTSTRUCT *lps ) */ HDC WINAPI GetDCEx( HWND hwnd, HRGN hrgnClip, DWORD flags ) { - static const DWORD clip_flags = DCX_PARENTCLIP | DCX_CLIPSIBLINGS | DCX_CLIPCHILDREN | DCX_WINDOW; - static const DWORD user_flags = clip_flags | DCX_NORESETATTRS; /* flags that can be set by user */ + const DWORD clip_flags = DCX_PARENTCLIP | DCX_CLIPSIBLINGS | DCX_CLIPCHILDREN | DCX_WINDOW; + const DWORD user_flags = clip_flags | DCX_NORESETATTRS; /* flags that can be set by user */ struct dce *dce; BOOL bUpdateVisRgn = TRUE; HWND parent;

1 0

Andrew Eikum : comdlg32: Store and use save/open dialogs' most-recently-used data.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 4b93548df1578d4345d89ae978207cebb0366a00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b93548df1578d4345d89ae97… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jul 23 13:13:04 2010 -0500 comdlg32: Store and use save/open dialogs' most-recently-used data. --- dlls/comdlg32/filedlg.c | 226 ++++++++++++++++++++++++++++++++++++++++- dlls/comdlg32/tests/filedlg.c | 60 +++++++++++ 2 files changed, 283 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b93548df1578d4345d89…

1 0

Andrew Eikum : notepad: Don't specify initial dir for save and open dialogs .
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 7854f191bb3d374946c2e74f587a3f6364a709b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7854f191bb3d374946c2e74f5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jul 23 13:13:11 2010 -0500 notepad: Don't specify initial dir for save and open dialogs. --- programs/notepad/dialog.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index ff5df75..e9a650d 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -597,13 +597,11 @@ VOID DIALOG_FileOpen(VOID) { OPENFILENAMEW openfilename; WCHAR szPath[MAX_PATH]; - WCHAR szDir[MAX_PATH]; static const WCHAR szDefaultExt[] = { 't','x','t',0 }; static const WCHAR txt_files[] = { '*','.','t','x','t',0 }; ZeroMemory(&openfilename, sizeof(openfilename)); - GetCurrentDirectoryW(ARRAY_SIZE(szDir), szDir); lstrcpyW(szPath, txt_files); openfilename.lStructSize = sizeof(openfilename); @@ -612,7 +610,6 @@ VOID DIALOG_FileOpen(VOID) openfilename.lpstrFilter = Globals.szFilter; openfilename.lpstrFile = szPath; openfilename.nMaxFile = ARRAY_SIZE(szPath); - openfilename.lpstrInitialDir = szDir; openfilename.Flags = OFN_ENABLETEMPLATE | OFN_ENABLEHOOK | OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_ENABLESIZING; @@ -647,13 +644,11 @@ BOOL DIALOG_FileSaveAs(VOID) { OPENFILENAMEW saveas; WCHAR szPath[MAX_PATH]; - WCHAR szDir[MAX_PATH]; static const WCHAR szDefaultExt[] = { 't','x','t',0 }; static const WCHAR txt_files[] = { '*','.','t','x','t',0 }; ZeroMemory(&saveas, sizeof(saveas)); - GetCurrentDirectoryW(ARRAY_SIZE(szDir), szDir); lstrcpyW(szPath, txt_files); saveas.lStructSize = sizeof(OPENFILENAMEW); @@ -662,7 +657,6 @@ BOOL DIALOG_FileSaveAs(VOID) saveas.lpstrFilter = Globals.szFilter; saveas.lpstrFile = szPath; saveas.nMaxFile = ARRAY_SIZE(szPath); - saveas.lpstrInitialDir = szDir; saveas.Flags = OFN_ENABLETEMPLATE | OFN_ENABLEHOOK | OFN_EXPLORER | OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY | OFN_ENABLESIZING;

1 0

Igor Paliychuk : start: Add Ukrainian translation.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: f784998bfab11725121602a25bf0e31886d69588 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f784998bfab11725121602a25… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Fri Jul 23 21:48:43 2010 +0300 start: Add Ukrainian translation. --- programs/start/Makefile.in | 3 +- programs/start/Uk.rc | 74 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletions(-) diff --git a/programs/start/Makefile.in b/programs/start/Makefile.in index e3ceade..fc3b54e 100644 --- a/programs/start/Makefile.in +++ b/programs/start/Makefile.in @@ -27,6 +27,7 @@ RC_SRCS = \ Ro.rc \ Ru.rc \ Si.rc \ - Tr.rc + Tr.rc \ + Uk.rc @MAKE_PROG_RULES@ diff --git a/programs/start/Uk.rc b/programs/start/Uk.rc new file mode 100644 index 0000000..c42d877 --- /dev/null +++ b/programs/start/Uk.rc @@ -0,0 +1,74 @@ +/* + * Start + * Ukrainian Language Support + * + * Copyright 2003 Dan Kegel + * Copyright 2010 Igor Paliychuk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resources.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ +STRING_USAGE, "Запустити програму чи відкрити документ в програмі, яка\n\ +зазвичай використовується для файлів з цим розширенням.\n\ +Використання:\n\ +start [опції] ім'я_файлу_програми [...]\n\ +start [опції] ім'я_файлу_документу\n\ +\n\ +Опції:\n\ +/M[inimized] Запустити програму згорнутою.\n\ +/MAX[imized] Запустити програму на весь екран.\n\ +/R[estored] Запустити програму зі звичайним розміром вікна.\n\ +/W[ait] Очікувати завершення запущеної програми і вийти з кодом її виходу.\n\ +/Unix Сприймати шлях до документу записаним в Unix-форматі.\n\ +/ProgIDOpen Відкрити документ, використовуючи зазначений progID.\n\ +/L Показати ліцензію кінцевого користувача.\n\ +\n\ +start.exe версія 0.2 Copyright (C) 2003, Dan Kegel\n\ +Start надається БЕЗ БУДЬ-ЯКИХ ГАРАНТІЙ; для подробиць запустіть з опцією /L.\n\ +Це є вільне ПЗ, ви можете розповсюджувати його згідно\n\ +певних умов; запустіть 'start /L' для подробиць.\n\ +" + +STRING_LICENSE, "start.exe версія 0.2 Copyright (C) 2003, Dan Kegel\n\ +Ця програма є вільним ПЗ; ви можете поширювати її та/або\n\ +змінювати згідно умов GNU Lesser General Public License,\n\ +яка опублікована Free Software Foundation; версії 2.1\n\ +Ліцензії, чи (на ваш розсуд) новішої версії.\n\ +\n\ +Ця програма розповсюджується з надією, що буде корисною,\n\ +але БЕЗ БУДЬ-ЯКИХ ГАРАНТІЙ; навіть без непрямих гарантій щодо\n\ +ПРОДАЖУ чи ПРИДАТНОСТІ ДЛЯ ПЕВНИХ ЦІЛЕЙ. Дивіться GNU\n\ +Lesser General Public License для детальної інформації.\n\ +\n\ +Ви повинні були отримати копію GNU Lesser General Public License\n\ +разом з програмою; якщо ні, напишіть до Free Software\n\ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.\n\ +\n\ +Ліцензійна інформація знаходитьься в файлі COPYING.LIB.\n\ +" + +STRING_EXECFAIL, "Програма не може бути запущена або немає асоційованих з типом даного документа додатків.\nВиклик ShellExecuteEx провалився" + +STRING_UNIXFAIL "Неможливо перетворити ім'я файлу UNIX в ім'я файлу DOS." +}

1 0

Igor Paliychuk : shdocvw: Add Ukrainian translation.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: f31428e107f3f2e8f616e4de727f59326a84d4ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=f31428e107f3f2e8f616e4de7… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Fri Jul 23 21:49:27 2010 +0300 shdocvw: Add Ukrainian translation. --- dlls/shdocvw/Makefile.in | 1 + dlls/shdocvw/Uk.rc | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 8326b78..f18b08d 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -30,6 +30,7 @@ C_SRCS = \ RC_SRCS = \ En.rc \ + Uk.rc \ shdocvw.rc IDL_TLB_SRCS = shdocvw_v1.idl diff --git a/dlls/shdocvw/Uk.rc b/dlls/shdocvw/Uk.rc new file mode 100644 index 0000000..6af3f3b --- /dev/null +++ b/dlls/shdocvw/Uk.rc @@ -0,0 +1,61 @@ +/* + * Copyright 2010 Alexander N. Sørnes <alex(a)thehandofagony.com> + * Copyright 2010 Igor Paliychuk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_BROWSE_OPEN DIALOG 10, 10, 200, 70 +STYLE DS_MODALFRAME | WS_CAPTION +CAPTION "Відкрити URL" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Вкажіть URL, що ви хочете відкрити в Internet Explorer",-1,25, 5, 150,15 + LTEXT "Відкрити:", -1, 2, 32, 30, 15 + EDITTEXT IDC_BROWSE_OPEN_URL, 35, 30, 160, 13 + DEFPUSHBUTTON "&OK", IDOK, 45, 50, 50, 15 + PUSHBUTTON "&Скасувати", IDCANCEL, 105, 50, 50, 15 +} + +IDR_BROWSE_MAIN_MENU MENU +{ + POPUP "&Файл" + { + POPUP "&Створити" + { + MENUITEM "&Вікно" ID_BROWSE_NEW_WINDOW + } + MENUITEM "&Відкрити...", ID_BROWSE_OPEN + MENUITEM "&Зберегти", ID_BROWSE_SAVE + MENUITEM "Зберегти &як...", ID_BROWSE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&Формат друку...", ID_BROWSE_PRINT_FORMAT + MENUITEM "&Друк...", ID_BROWSE_PRINT + MENUITEM "Попередній пе&регляд...", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "В&ластивості...", ID_BROWSE_PROPERTIES + } + POPUP "&Довідка" + { + MENUITEM "&Про Internet Explorer...", ID_BROWSE_ABOUT + } +}

1 0

Alexandre Julliard : configure: Disable the unused result warnings when Fortify is enabled.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 83676d721fc6a981f025eda5b9626ea3137c4213 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83676d721fc6a981f025eda5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jul 24 11:42:59 2010 +0200 configure: Disable the unused result warnings when Fortify is enabled. --- configure | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 11 +++++++++++ 2 files changed, 68 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 6f8fca2..437fb20 100755 --- a/configure +++ b/configure @@ -11875,6 +11875,63 @@ $as_echo "$ac_cv_c_string_h_warnings" >&6; } EXTRACFLAGS="$EXTRACFLAGS -Wpointer-arith" fi + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Werror" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken unused result warnings" >&5 +$as_echo_n "checking for broken unused result warnings... " >&6; } +if test "${ac_cv_c_unused_result_warnings+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <unistd.h> +int +main () +{ +write(2,"a",1) + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_unused_result_warnings=no +else + ac_cv_c_unused_result_warnings=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_unused_result_warnings" >&5 +$as_echo "$ac_cv_c_unused_result_warnings" >&6; } + CFLAGS="$saved_CFLAGS" + if test "$ac_cv_c_unused_result_warnings" = "yes" + then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-unused-result" >&5 +$as_echo_n "checking whether the compiler supports -Wno-unused-result... " >&6; } +if test "${ac_cv_cflags__Wno_unused_result+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wno-unused-result" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wno_unused_result=yes +else + ac_cv_cflags__Wno_unused_result=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wno_unused_result" >&5 +$as_echo "$ac_cv_cflags__Wno_unused_result" >&6; } +if test $ac_cv_cflags__Wno_unused_result = yes; then : + EXTRACFLAGS="$EXTRACFLAGS -Wno-unused-result" +fi + fi + if test "x$enable_maintainer_mode" = "xyes" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Werror" >&5 diff --git a/configure.ac b/configure.ac index 5638f2b..0c3a212 100644 --- a/configure.ac +++ b/configure.ac @@ -1604,6 +1604,17 @@ then EXTRACFLAGS="$EXTRACFLAGS -Wpointer-arith" fi + dnl Fortify enables unused result warnings on a gazillion functions, making it useless + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Werror" + AC_CACHE_CHECK([for broken unused result warnings], ac_cv_c_unused_result_warnings, + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[write(2,"a",1)]])],[ac_cv_c_unused_result_warnings=no],[ac_cv_c_unused_result_warnings=yes])) + CFLAGS="$saved_CFLAGS" + if test "$ac_cv_c_unused_result_warnings" = "yes" + then + WINE_TRY_CFLAGS([-Wno-unused-result]) + fi + dnl Enable -Werror for maintainer mode if test "x$enable_maintainer_mode" = "xyes" then

1 0

Piotr Caban : wininet: Fixed CreateUrlCacheEntryA implementation.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 54bdf622a0269600afc40374ab815c5827be7cff URL: http://source.winehq.org/git/wine.git/?a=commit;h=54bdf622a0269600afc40374a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jul 24 17:55:18 2010 +0200 wininet: Fixed CreateUrlCacheEntryA implementation. --- dlls/wininet/urlcache.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index c617a93..2fe488a 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2184,14 +2184,17 @@ BOOL WINAPI CreateUrlCacheEntryA( ) { WCHAR *url_name; - WCHAR *file_extension; + WCHAR *file_extension = NULL; WCHAR file_name[MAX_PATH]; BOOL bSuccess = FALSE; DWORD dwError = 0; + TRACE("(%s %d %s %p %d)\n", debugstr_a(lpszUrlName), dwExpectedFileSize, + debugstr_a(lpszFileExtension), lpszFileName, dwReserved); + if (lpszUrlName && (url_name = heap_strdupAtoW(lpszUrlName))) { - if (lpszFileExtension && (file_extension = heap_strdupAtoW(lpszFileExtension))) + if (!lpszFileExtension || (file_extension = heap_strdupAtoW(lpszFileExtension))) { if (CreateUrlCacheEntryW(url_name, dwExpectedFileSize, file_extension, file_name, dwReserved)) {

1 0