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

Henri Verbeet : wined3d: Get rid of some asserts.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 404f4f73214c52c985adaeae6e18187c1a08cb66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=404f4f73214c52c985adaeae6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 22 10:16:00 2009 +0200 wined3d: Get rid of some asserts. --- dlls/wined3d/directx.c | 3 --- dlls/wined3d/palette.c | 5 +++-- dlls/wined3d/surface_base.c | 5 ----- dlls/wined3d/surface_gdi.c | 1 - 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 25fd4d4..536d7a4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -23,7 +23,6 @@ */ #include "config.h" -#include <assert.h> #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); @@ -242,7 +241,6 @@ static void WineD3D_ReleaseFakeGLContext(void) { wined3d_fake_gl_context_hwnd = NULL; wined3d_fake_gl_context_available = FALSE; } - assert(wined3d_fake_gl_context_ref >= 0); LeaveCriticalSection(&wined3d_fake_gl_context_cs); } @@ -254,7 +252,6 @@ static BOOL WineD3D_CreateFakeGLContext(void) { TRACE("getting context...\n"); if(wined3d_fake_gl_context_ref > 0) goto ret; - assert(0 == wined3d_fake_gl_context_ref); wined3d_fake_gl_context_foreign = TRUE; diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 338e66e..a5447d0 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -22,7 +22,6 @@ #include "winerror.h" #include "wine/debug.h" -#include <assert.h> #include <string.h> #include "wined3d_private.h" @@ -78,7 +77,9 @@ DWORD IWineD3DPaletteImpl_Size(DWORD dwFlags) { case WINEDDPCAPS_2BIT: return 4; case WINEDDPCAPS_4BIT: return 16; case WINEDDPCAPS_8BIT: return 256; - default: assert(0); return 256; + default: + FIXME("Unhandled size bits %#x.\n", dwFlags & SIZE_BITS); + return 256; } } diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index d776785..44b9423 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -30,8 +30,6 @@ #include "wine/port.h" #include "wined3d_private.h" -#include <assert.h> - WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); /* See also float_16_to_32() in wined3d_private.h */ @@ -1117,8 +1115,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT *D dstwidth = xdst.right - xdst.left; width = (xdst.right - xdst.left) * bpp; - assert(width <= dlock.Pitch); - if (DestRect && Src != This) dbuf = dlock.pBits; else @@ -1619,7 +1615,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dst slock.Pitch = dlock.Pitch; /* Since slock was originally copied from this surface's description, we can just reuse it */ - assert(This->resource.allocatedMemory != NULL); sbuf = This->resource.allocatedMemory + lock_src.top * pitch + lock_src.left * bpp; dbuf = This->resource.allocatedMemory + lock_dst.top * pitch + lock_dst.left * bpp; sEntry = Src->resource.format_desc; diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index a194569..96054d9 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -29,7 +29,6 @@ #include "wine/port.h" #include "wined3d_private.h" -#include <assert.h> #include <stdio.h> /* Use the d3d_surface debug channel to have one channel for all surfaces */

1 0

Henri Verbeet : wined3d: Add an rtInternal fallback for WINED3DFMT_R16G16_UNORM.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: e5e4d1e9a7ace4057eeed3a28d5f0a8ace8b480c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e4d1e9a7ace4057eeed3a28… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 22 10:16:01 2009 +0200 wined3d: Add an rtInternal fallback for WINED3DFMT_R16G16_UNORM. --- dlls/wined3d/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 881736e..82d5527 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -353,7 +353,7 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE}, - {WINED3DFMT_R16G16_UNORM, GL_RGB16_EXT, GL_RGB16_EXT, 0, + {WINED3DFMT_R16G16_UNORM, GL_RGB16_EXT, GL_RGB16_EXT, GL_RGBA16_EXT, GL_RGB, GL_UNSIGNED_SHORT, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE},

1 0

Nikolay Sivov : comctl32/listview: Implement LVM_CANCELEDITLABEL with tests .
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 9c565342d02f8df86c6b474bd5b410ca3276bcd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c565342d02f8df86c6b474bd… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Jun 20 00:39:50 2009 +0400 comctl32/listview: Implement LVM_CANCELEDITLABEL with tests. --- dlls/comctl32/listview.c | 31 +++++++++++++++++++----- dlls/comctl32/tests/listview.c | 50 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index ebf49c6..f9608c6 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -106,7 +106,6 @@ * -- LVN_BEGINRDRAG * * Messages: - * -- LVM_CANCELEDITLABEL * -- LVM_ENABLEGROUPVIEW * -- LVM_GETBKIMAGE, LVM_SETBKIMAGE * -- LVM_GETGROUPINFO, LVM_SETGROUPINFO @@ -419,6 +418,7 @@ static BOOL LISTVIEW_EnsureVisible(LISTVIEW_INFO *, INT, BOOL); static HWND CreateEditLabelT(LISTVIEW_INFO *, LPCWSTR, DWORD, BOOL); static HIMAGELIST LISTVIEW_SetImageList(LISTVIEW_INFO *, INT, HIMAGELIST); static INT LISTVIEW_HitTest(const LISTVIEW_INFO *, LPLVHITTESTINFO, BOOL, BOOL); +static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *, BOOL, BOOL); /******** Text handling functions *************************************/ @@ -4591,6 +4591,26 @@ static DWORD LISTVIEW_ApproximateViewRect(const LISTVIEW_INFO *infoPtr, INT nIte return dwViewRect; } +/*** + * DESCRIPTION: + * Cancel edit label with saving item text. + * + * PARAMETER(S): + * [I] infoPtr : valid pointer to the listview structure + * + * RETURN: + * Always returns TRUE. + */ +static LRESULT LISTVIEW_CancelEditLabel(LISTVIEW_INFO *infoPtr) +{ + /* handle value will be lost after LISTVIEW_EndEditLabelT */ + HWND edit = infoPtr->hwndEdit; + + LISTVIEW_EndEditLabelT(infoPtr, TRUE, IsWindowUnicode(infoPtr->hwndEdit)); + SendMessageW(edit, WM_CLOSE, 0, 0); + + return TRUE; +} /*** * DESCRIPTION: @@ -10113,7 +10133,8 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case LVM_ARRANGE: return LISTVIEW_Arrange(infoPtr, (INT)wParam); -/* case LVM_CANCELEDITLABEL: */ + case LVM_CANCELEDITLABEL: + return LISTVIEW_CancelEditLabel(infoPtr); case LVM_CREATEDRAGIMAGE: return (LRESULT)LISTVIEW_CreateDragImage(infoPtr, (INT)wParam, (LPPOINT)lParam); @@ -10734,11 +10755,7 @@ static LRESULT LISTVIEW_Command(LISTVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lP } case EN_KILLFOCUS: { - /* handle value will be lost after LISTVIEW_EndEditLabelT */ - HWND edit = infoPtr->hwndEdit; - - LISTVIEW_EndEditLabelT(infoPtr, TRUE, IsWindowUnicode(infoPtr->hwndEdit)); - SendMessageW(edit, WM_CLOSE, 0, 0); + LISTVIEW_CancelEditLabel(infoPtr); } default: diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 2c3ab64..7d14294 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3534,6 +3534,55 @@ static void test_get_set_view(void) DestroyWindow(hwnd); } +static void test_canceleditlabel(void) +{ + HWND hwnd, hwndedit; + DWORD ret; + CHAR buff[10]; + LVITEMA itema; + static CHAR test[] = "test"; + static const CHAR test1[] = "test1"; + + hwnd = create_listview_control(LVS_EDITLABELS); + ok(hwnd != NULL, "failed to create a listview window\n"); + + insert_item(hwnd, 0); + + /* try without edit created */ + ret = SendMessage(hwnd, LVM_CANCELEDITLABEL, 0, 0); + expect(TRUE, ret); + + /* cancel without data change */ + SetFocus(hwnd); + hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); + ok(IsWindow(hwndedit), "Expected edit control to be created\n"); + ret = SendMessage(hwnd, LVM_CANCELEDITLABEL, 0, 0); + expect(TRUE, ret); + ok(!IsWindow(hwndedit), "Expected edit control to be destroyed\n"); + + /* cancel after data change */ + memset(&itema, 0, sizeof(itema)); + itema.pszText = test; + ret = SendMessage(hwnd, LVM_SETITEMTEXT, 0, (LPARAM)&itema); + expect(TRUE, ret); + SetFocus(hwnd); + hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); + ok(IsWindow(hwndedit), "Expected edit control to be created\n"); + ret = SetWindowText(hwndedit, test1); + ok(ret != 0, "Expected edit text to change\n"); + ret = SendMessage(hwnd, LVM_CANCELEDITLABEL, 0, 0); + expect(TRUE, ret); + ok(!IsWindow(hwndedit), "Expected edit control to be destroyed\n"); + memset(&itema, 0, sizeof(itema)); + itema.pszText = buff; + itema.cchTextMax = sizeof(buff)/sizeof(CHAR); + ret = SendMessage(hwnd, LVM_GETITEMTEXT, 0, (LPARAM)&itema); + expect(5, ret); + ok(strcmp(buff, test1) == 0, "Expected label text not to change\n"); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -3598,6 +3647,7 @@ START_TEST(listview) /* comctl32 version 6 tests start here */ test_get_set_view(); + test_canceleditlabel(); unload_v6_module(ctx_cookie);

1 0

Aurimas Fišeras : sane.ds: Add Lithuanian translation.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: e057672b1689952157a5c3e936629bbad84817bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e057672b1689952157a5c3e93… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jun 21 13:47:02 2009 +0300 sane.ds: Add Lithuanian translation. --- dlls/sane.ds/rsrc.rc | 1 + dlls/sane.ds/sane_Lt.rc | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/sane.ds/rsrc.rc b/dlls/sane.ds/rsrc.rc index 53d099f..ac80eb9 100644 --- a/dlls/sane.ds/rsrc.rc +++ b/dlls/sane.ds/rsrc.rc @@ -32,6 +32,7 @@ #include "sane_Fi.rc" #include "sane_Fr.rc" #include "sane_Ko.rc" +#include "sane_Lt.rc" #include "sane_Nl.rc" #include "sane_No.rc" #include "sane_Pl.rc" diff --git a/dlls/sane.ds/sane_Lt.rc b/dlls/sane.ds/sane_Lt.rc new file mode 100644 index 0000000..c96eceb --- /dev/null +++ b/dlls/sane.ds/sane_Lt.rc @@ -0,0 +1,45 @@ +/* + * Lithuanian resources for Twain + * + * Copyright 2009 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 + * 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 + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "Skaitoma" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "SKAITOMA... Prašome palaukti",IDC_STATIC,5,19,176,8, SS_CENTER +END + +STRINGTABLE DISCARDABLE +{ + 0 "" + 1 "piks" + 2 "b" + 3 "mm" + 4 "tašk./col." + 5 "%" + 6 "ns" +} + +#pragma code_page(default)

1 0

Aurimas Fišeras : serialui: Add Lithuanian translation .
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 77b457421b6192bb653d7e5c94cb4761fa5797d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77b457421b6192bb653d7e5c9… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jun 21 14:00:17 2009 +0300 serialui: Add Lithuanian translation. --- dlls/serialui/Lt.rc | 46 ++++++++++++++++++++++++++++++++++++++++++ dlls/serialui/serialui_rc.rc | 1 + 2 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/serialui/Lt.rc b/dlls/serialui/Lt.rc new file mode 100644 index 0000000..31e2a95 --- /dev/null +++ b/dlls/serialui/Lt.rc @@ -0,0 +1,46 @@ +/* + * Copyright 2009 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 + * 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 + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 160, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Savybės: " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Bodų sparta", -1,5,20,55,10 + COMBOBOX IDC_BAUD, 60, 20, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Lyginumas", -1,5,40,55,10 + COMBOBOX IDC_PARITY, 60, 40, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Srauto valdymas", -1,5,60,55,10 + COMBOBOX IDC_FLOW, 60, 60, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Duomenų bitai", -1,5,80,55,10 + COMBOBOX IDC_DATA, 60, 80, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Pabaigos bitai", -1,5,100,55,10 + COMBOBOX IDC_STOP, 60, 100, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "Gerai", IDOK,30,138,50,14 + PUSHBUTTON "Atsisakyti", IDCANCEL,85,138,50,14 + /* these two buttons are for testing Get/SetDefaultCommConfig */ + /* PUSHBUTTON "GetDefault", ID_GETDEFAULT,30,115,50,14 */ + /* PUSHBUTTON "SetDefault", ID_SETDEFAULT,85,115,50,14 */ +END + +#pragma code_page(default) diff --git a/dlls/serialui/serialui_rc.rc b/dlls/serialui/serialui_rc.rc index b732435..11b3e6c 100644 --- a/dlls/serialui/serialui_rc.rc +++ b/dlls/serialui/serialui_rc.rc @@ -34,6 +34,7 @@ #include "It.rc" #include "Ja.rc" #include "Ko.rc" +#include "Lt.rc" #include "Nl.rc" #include "No.rc" #include "Pt.rc"

1 0

Aurimas Fišeras : taskmgr: Make all static text translatable.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 34ccc50a992952c5f91f6579bf8d741752dd657f URL: http://source.winehq.org/git/wine.git/?a=commit;h=34ccc50a992952c5f91f6579b… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jun 21 15:28:09 2009 +0300 taskmgr: Make all static text translatable. --- programs/taskmgr/En.rc | 17 +++++++++++++++ programs/taskmgr/resource.h | 13 ++++++++++++ programs/taskmgr/taskmgr.c | 46 ++++++++++++++++++++++++++---------------- 3 files changed, 58 insertions(+), 18 deletions(-) diff --git a/programs/taskmgr/En.rc b/programs/taskmgr/En.rc index 8694588..a36503e 100644 --- a/programs/taskmgr/En.rc +++ b/programs/taskmgr/En.rc @@ -484,3 +484,20 @@ BEGIN "Sets process to the BELOW NORMAL priority class" ID_PROCESS_PAGE_SETPRIORITY_LOW "Sets process to the LOW priority class" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_VIEW_LARGE "Lar&ge Icons" + IDS_VIEW_SMALL "S&mall Icons" + IDS_VIEW_DETAILS "&Details" + IDS_WINDOWS "&Windows" + IDS_VIEW_SELECTCOLUMNS "&Select Columns..." + IDS_OPTIONS_SHOW16BITTASKS "&Show 16-bit tasks" + IDS_VIEW_CPUHISTORY "&CPU History" + IDS_VIEW_CPUHISTORY_ONEGRAPHALL "&One Graph, All CPUs" + IDS_VIEW_CPUHISTORY_ONEGRAPHPERCPU "One Graph &Per CPU" + IDS_VIEW_SHOWKERNELTIMES "&Show Kernel Times" + IDS_APPLICATIONS "Applications" + IDS_PROCESSES "Processes" + IDS_PERFORMANCE "Performance" +END diff --git a/programs/taskmgr/resource.h b/programs/taskmgr/resource.h index cc9ac01..959efdb 100644 --- a/programs/taskmgr/resource.h +++ b/programs/taskmgr/resource.h @@ -182,6 +182,19 @@ #define ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL 32813 #define ID_PROCESS_PAGE_SETPRIORITY_LOW 32814 #define ID_PROCESS_PAGE_DEBUGCHANNELS 32815 +#define IDS_VIEW_LARGE 32816 +#define IDS_VIEW_SMALL 32817 +#define IDS_VIEW_DETAILS 32818 +#define IDS_WINDOWS 32819 +#define IDS_VIEW_SELECTCOLUMNS 32820 +#define IDS_OPTIONS_SHOW16BITTASKS 32821 +#define IDS_VIEW_CPUHISTORY 32822 +#define IDS_VIEW_CPUHISTORY_ONEGRAPHALL 32823 +#define IDS_VIEW_CPUHISTORY_ONEGRAPHPERCPU 32824 +#define IDS_VIEW_SHOWKERNELTIMES 32825 +#define IDS_APPLICATIONS 32826 +#define IDS_PROCESSES 32827 +#define IDS_PERFORMANCE 32828 #define IDC_STATIC -1 /* diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index 923a445..8393623 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -122,9 +122,13 @@ static BOOL OnCreate(HWND hWnd) RECT rc; TCITEMW item; - static WCHAR wszApplications[] = {'A','p','p','l','i','c','a','t','i','o','n','s',0}; - static WCHAR wszProcesses[] = {'P','r','o','c','e','s','s','e','s',0}; - static WCHAR wszPerformance[] = {'P','e','r','f','o','r','m','a','n','c','e',0}; + static WCHAR wszApplications[255]; + static WCHAR wszProcesses[255]; + static WCHAR wszPerformance[255]; + + LoadStringW(hInst, IDS_APPLICATIONS, wszApplications, sizeof(wszApplications)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_PROCESSES, wszProcesses, sizeof(wszProcesses)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_PERFORMANCE, wszPerformance, sizeof(wszPerformance)/sizeof(WCHAR)); SendMessageW(hMainWnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIcon(hInst, MAKEINTRESOURCE(IDI_TASKMANAGER))); @@ -621,21 +625,27 @@ static void TaskManager_OnTabWndSelChange(void) HMENU hViewMenu; HMENU hSubMenu; - static const WCHAR wszLargeIcons[] = {'L','a','r','&','g','e',' ','I','c','o','n','s',0}; - static const WCHAR wszSmallIcons[] = {'S','&','m','a','l','l',' ','I','c','o','n','s',0}; - static const WCHAR wszDetails[] = {'&','D','e','t','a','i','l','s',0}; - static const WCHAR wszWindows[] = {'&','W','i','n','d','o','w','s',0}; - static const WCHAR wszSelectColumns[] = {'&','S','e','l','e','c','t',' ', - 'C','o','l','u','m','n','s','.','.','.',0}; - static const WCHAR wszShow16bTasks[] = {'&','S','h','o','w',' ','1','6','-','b','i','t',' ', - 't','a','s','k','s',0}; - static const WCHAR wszOneGraphAllCPU[] = {'&','O','n','e',' ','G','r','a','p','h',',',' ', - 'A','l','l',' ','C','P','U','s',0}; - static const WCHAR wszOneGraphPerCPU[] = {'O','n','e',' ','G','r','a','p','h',' ', - '&','P','e','r',' ','C','P','U',0}; - static const WCHAR wszCPUHistory[] = {'&','C','P','U',' ','H','i','s','t','o','r','y',0}; - static const WCHAR wszShowKernelTimes[] = {'&','S','h','o','w',' ','K','e','r','n','e','l',' ', - 'T','i','m','e','s',0}; + WCHAR wszLargeIcons[255]; + WCHAR wszSmallIcons[255]; + WCHAR wszDetails[255]; + WCHAR wszWindows[255]; + WCHAR wszSelectColumns[255]; + WCHAR wszShow16bTasks[255]; + WCHAR wszOneGraphAllCPU[255]; + WCHAR wszOneGraphPerCPU[255]; + WCHAR wszCPUHistory[255]; + WCHAR wszShowKernelTimes[255]; + + LoadStringW(hInst, IDS_VIEW_LARGE, wszLargeIcons, sizeof(wszLargeIcons)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_VIEW_SMALL, wszSmallIcons, sizeof(wszSmallIcons)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_VIEW_DETAILS, wszDetails, sizeof(wszDetails)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_WINDOWS, wszWindows, sizeof(wszWindows)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_VIEW_SELECTCOLUMNS, wszSelectColumns, sizeof(wszSelectColumns)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_OPTIONS_SHOW16BITTASKS, wszShow16bTasks, sizeof(wszShow16bTasks)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_VIEW_CPUHISTORY_ONEGRAPHALL, wszOneGraphAllCPU, sizeof(wszOneGraphAllCPU)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_VIEW_CPUHISTORY_ONEGRAPHPERCPU, wszOneGraphPerCPU, sizeof(wszOneGraphPerCPU)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_VIEW_CPUHISTORY, wszCPUHistory, sizeof(wszCPUHistory)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_VIEW_SHOWKERNELTIMES, wszShowKernelTimes, sizeof(wszShowKernelTimes)/sizeof(WCHAR)); hMenu = GetMenu(hMainWnd); hViewMenu = GetSubMenu(hMenu, 2);

1 0

Aurimas Fišeras : setupapi: Add Lithuanian translation .
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: f326c268744b07f05d00ebf55f02e1d6c28cba0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f326c268744b07f05d00ebf55… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jun 21 16:40:22 2009 +0300 setupapi: Add Lithuanian translation. --- dlls/setupapi/Lt.rc | 61 +++++++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/setupapi.rc | 1 + 2 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/Lt.rc b/dlls/setupapi/Lt.rc new file mode 100644 index 0000000..f56b079 --- /dev/null +++ b/dlls/setupapi/Lt.rc @@ -0,0 +1,61 @@ +/* + * Lithuanian resources for SETUPAPI + * + * Copyright 2009 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 + * 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 + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_PROMPTDISK "Reikalingas failas '%s' esantis %s" + IDS_UNKNOWN "Nežinomas" + IDS_COPYFROM "Kopijuoti failus iš:" + IDS_INFO "Įveskite kelią iki failo, o tada spauskite Gerai." +} + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Kopijuojami failai..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Atsisakyti", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Šaltinis:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Paskirtis:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDPROMPTFORDISK DIALOG MOVEABLE DISCARDABLE 0, 0, 250, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Reikalingi failai" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Įdėkite gamintojo diegimo diską, o tada\nįsitikinkite, kad žemiau išrinktas teisingas diskas", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Kopijuoti gamintojo failus iš:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + PUSHBUTTON "Gerai", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Atsisakyti", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Parinkti...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +#pragma code_page(default) diff --git a/dlls/setupapi/setupapi.rc b/dlls/setupapi/setupapi.rc index 4a98758..97d2a07 100644 --- a/dlls/setupapi/setupapi.rc +++ b/dlls/setupapi/setupapi.rc @@ -37,6 +37,7 @@ #include "It.rc" #include "Ja.rc" #include "Ko.rc" +#include "Lt.rc" #include "Nl.rc" #include "No.rc" #include "Pl.rc"

1 0

Aurimas Fišeras : shlwapi: Add Lithuanian translation.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: ec7fc36862d91d2f4a3ec967497fa89b0160816c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec7fc36862d91d2f4a3ec9674… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jun 21 16:48:19 2009 +0300 shlwapi: Add Lithuanian translation. --- dlls/shlwapi/shlwapi.rc | 1 + dlls/shlwapi/shlwapi_Lt.rc | 48 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/shlwapi.rc b/dlls/shlwapi/shlwapi.rc index d159dab..f9e6873 100644 --- a/dlls/shlwapi/shlwapi.rc +++ b/dlls/shlwapi/shlwapi.rc @@ -36,6 +36,7 @@ #include "shlwapi_It.rc" #include "shlwapi_Ja.rc" #include "shlwapi_Ko.rc" +#include "shlwapi_Lt.rc" #include "shlwapi_Nl.rc" #include "shlwapi_No.rc" #include "shlwapi_Pl.rc" diff --git a/dlls/shlwapi/shlwapi_Lt.rc b/dlls/shlwapi/shlwapi_Lt.rc new file mode 100644 index 0000000..9ef2593 --- /dev/null +++ b/dlls/shlwapi/shlwapi_Lt.rc @@ -0,0 +1,48 @@ +/* + * Lithuanian resources for shlwapi + * + * Copyright 2009 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 + * 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 + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Klaida!" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 + LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 + CHECKBOX "Daugiau ne&rodyti šio pranešimo", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Gerai" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Atsisakyti" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Taip" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Ne" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ + IDS_BYTES_FORMAT "%ld baitai" + IDS_TIME_INTERVAL_HOURS " val" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " sek" +} + +#pragma code_page(default)

1 0

Gerald Pfeifer : ddraw: Fix error checking in IDirect3DExecuteBufferImpl_Execute().
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 3176d936f988d54d8f170cd47bc2fa1f9df4fa66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3176d936f988d54d8f170cd47… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Jun 19 19:01:21 2009 +0200 ddraw: Fix error checking in IDirect3DExecuteBufferImpl_Execute(). --- dlls/ddraw/executebuffer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 73e0657..6d6d304 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -249,7 +249,7 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, TRACE("(%08x,%08x)\n", ci->u1.dlstLightStateType, ci->u2.dwArg[0]); - if (!ci->u1.dlstLightStateType && (ci->u1.dlstLightStateType > D3DLIGHTSTATE_COLORVERTEX)) + if (!ci->u1.dlstLightStateType || (ci->u1.dlstLightStateType > D3DLIGHTSTATE_COLORVERTEX)) ERR("Unexpected Light State Type\n"); else if (ci->u1.dlstLightStateType == D3DLIGHTSTATE_MATERIAL /* 1 */) { DWORD matHandle = ci->u2.dwArg[0];

1 0

Gerald Pfeifer : ddraw: Fix two bounds checks.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: d1e5b3bf62b0a0baa0d842e109ad1c136625280b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e5b3bf62b0a0baa0d842e10… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Jun 19 19:07:42 2009 +0200 ddraw: Fix two bounds checks. --- dlls/ddraw/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 261d6e3..439e99f 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2956,7 +2956,7 @@ IDirect3DDeviceImpl_3_SetLightState(IDirect3DDevice3 *iface, TRACE("(%p)->(%08x,%08x)\n", This, LightStateType, Value); - if (!LightStateType && (LightStateType > D3DLIGHTSTATE_COLORVERTEX)) + if (!LightStateType || (LightStateType > D3DLIGHTSTATE_COLORVERTEX)) { TRACE("Unexpected Light State Type\n"); return DDERR_INVALIDPARAMS; @@ -3089,7 +3089,7 @@ IDirect3DDeviceImpl_3_GetLightState(IDirect3DDevice3 *iface, TRACE("(%p)->(%08x,%p)\n", This, LightStateType, Value); - if (!LightStateType && (LightStateType > D3DLIGHTSTATE_COLORVERTEX)) + if (!LightStateType || (LightStateType > D3DLIGHTSTATE_COLORVERTEX)) { TRACE("Unexpected Light State Type\n"); return DDERR_INVALIDPARAMS;

1 0