wine-commits October 2011

wine-commits@winehq.org

3 participants
783 discussions

Ken Sharp : ntdll: Update Win2k8 to SP2.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: e8d9483da93bad6773990eea75fb667538eb3b36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8d9483da93bad6773990eea7… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Sat Oct 15 03:59:52 2011 +0100 ntdll: Update Win2k8 to SP2. --- dlls/ntdll/version.c | 6 +++--- programs/winecfg/appdefaults.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 74010dd..dfe7c3b 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -147,8 +147,8 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = }, /* WIN2K8 */ { - sizeof(RTL_OSVERSIONINFOEXW), 6, 0, 0x1771, VER_PLATFORM_WIN32_NT, - {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','1',0}, + sizeof(RTL_OSVERSIONINFOEXW), 6, 0, 0x1772, VER_PLATFORM_WIN32_NT, + {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','2',0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_SERVER, 0 }, /* WIN7 */ @@ -157,7 +157,7 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','1',0}, 1, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, - /* WIN2K8 */ + /* WIN2K8R2 */ { sizeof(RTL_OSVERSIONINFOEXW), 6, 1, 0x1DB1, VER_PLATFORM_WIN32_NT, {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','1',0}, diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index d2c9e7d..3a4c908 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -51,7 +51,7 @@ static const struct { { "win2008r2", "Windows 2008 R2", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"}, { "win7", "Windows 7", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "WinNT"}, - { "win2008", "Windows 2008", 6, 0, 0x1771,VER_PLATFORM_WIN32_NT, "Service Pack 1", 0, 0, "ServerNT"}, + { "win2008", "Windows 2008", 6, 0, 0x1772,VER_PLATFORM_WIN32_NT, "Service Pack 2", 0, 0, "ServerNT"}, { "vista", "Windows Vista", 6, 0, 0x1772,VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "WinNT"}, { "win2003", "Windows 2003", 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "ServerNT"}, { "winxp", "Windows XP", 5, 1, 0xA28, VER_PLATFORM_WIN32_NT, "Service Pack 3", 3, 0, "WinNT"},

1 0

Alexandre Julliard : gdi32: Add a fall back implementation of BlendImage using client-side blending.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: bfdac3e885f12dfd4b16c0c16f4767c451d0994d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfdac3e885f12dfd4b16c0c16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 17 13:25:05 2011 +0200 gdi32: Add a fall back implementation of BlendImage using client-side blending. --- dlls/gdi32/bitblt.c | 63 ++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/dibdrv/bitblt.c | 14 ++++++++++ dlls/gdi32/driver.c | 6 ---- dlls/gdi32/gdi_private.h | 5 +++ 4 files changed, 82 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index eee6fa2..28b1a73 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -198,6 +198,24 @@ static DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src return err; } +static DWORD blend_bits( const BITMAPINFO *src_info, const struct gdi_image_bits *src_bits, + struct bitblt_coords *src, BITMAPINFO *dst_info, + struct gdi_image_bits *dst_bits, struct bitblt_coords *dst, BLENDFUNCTION blend ) +{ + if (!dst_bits->is_copy) + { + int size = get_dib_image_size( dst_info ); + void *ptr = HeapAlloc( GetProcessHeap(), 0, size ); + if (!ptr) return ERROR_OUTOFMEMORY; + memcpy( ptr, dst_bits->ptr, size ); + if (dst_bits->free) dst_bits->free( dst_bits ); + dst_bits->ptr = ptr; + dst_bits->is_copy = TRUE; + dst_bits->free = free_heap_bits; + } + return blend_bitmapinfo( src_info, src_bits->ptr, src, dst_info, dst_bits->ptr, dst, blend ); +} + /*********************************************************************** * null driver fallback implementations */ @@ -328,6 +346,51 @@ done: } +DWORD nulldrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits, + struct bitblt_coords *src, struct bitblt_coords *dst, BLENDFUNCTION blend ) +{ + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *dst_info = (BITMAPINFO *)buffer; + struct gdi_image_bits dst_bits; + struct bitblt_coords orig_dst; + DC *dc = get_nulldrv_dc( dev ); + DWORD err; + + if (info->bmiHeader.biPlanes != 1) goto update_format; + if (info->bmiHeader.biBitCount != 32) goto update_format; + if (info->bmiHeader.biCompression == BI_BITFIELDS) + { + DWORD *masks = (DWORD *)info->bmiColors; + if (masks[0] != 0xff0000 || masks[1] != 0x00ff00 || masks[2] != 0x0000ff) + goto update_format; + } + + if (!bits) return ERROR_SUCCESS; + if ((src->width != dst->width) || (src->height != dst->height)) return ERROR_TRANSFORM_NOT_SUPPORTED; + + dev = GET_DC_PHYSDEV( dc, pGetImage ); + orig_dst = *dst; + err = dev->funcs->pGetImage( dev, 0, dst_info, &dst_bits, dst ); + if (err) return err; + + dev = GET_DC_PHYSDEV( dc, pPutImage ); + err = blend_bits( info, bits, src, dst_info, &dst_bits, dst, blend ); + if (!err) err = dev->funcs->pPutImage( dev, 0, 0, dst_info, &dst_bits, dst, &orig_dst, SRCCOPY ); + + if (dst_bits.free) dst_bits.free( &dst_bits ); + return err; + +update_format: + if (blend.AlphaFormat & AC_SRC_ALPHA) /* source alpha requires A8R8G8B8 format */ + return ERROR_INVALID_PARAMETER; + + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = 32; + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biClrUsed = 0; + return ERROR_BAD_FORMAT; +} + /*********************************************************************** * PatBlt (GDI32.@) */ diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index bf1256e..de60f47 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -1202,6 +1202,20 @@ DWORD stretch_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bit return ERROR_SUCCESS; } +DWORD blend_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src, + const BITMAPINFO *dst_info, void *dst_bits, struct bitblt_coords *dst, + BLENDFUNCTION blend ) +{ + dib_info src_dib, dst_dib; + + if (!init_dib_info_from_bitmapinfo( &src_dib, src_info, src_bits, 0 ) ) + return ERROR_BAD_FORMAT; + if (!init_dib_info_from_bitmapinfo( &dst_dib, dst_info, dst_bits, 0 ) ) + return ERROR_BAD_FORMAT; + + return blend_rect( &dst_dib, &dst->visrect, &src_dib, &src->visrect, NULL, blend ); +} + /*********************************************************************** * dibdrv_StretchBlt */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 4f111c3..8647b95 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -196,12 +196,6 @@ static BOOL nulldrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, return TRUE; } -static DWORD nulldrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits, - struct bitblt_coords *src, struct bitblt_coords *dst, BLENDFUNCTION func ) -{ - return TRUE; -} - static INT nulldrv_ChoosePixelFormat( PHYSDEV dev, const PIXELFORMATDESCRIPTOR *descr ) { return 0; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 76e146b..d8648ef 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -257,6 +257,9 @@ extern DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, str extern DWORD stretch_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src, const BITMAPINFO *dst_info, void *dst_bits, struct bitblt_coords *dst, INT mode ) DECLSPEC_HIDDEN; +extern DWORD blend_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src, + const BITMAPINFO *dst_info, void *dst_bits, struct bitblt_coords *dst, + BLENDFUNCTION blend ) DECLSPEC_HIDDEN; /* driver.c */ extern const DC_FUNCTIONS null_driver DECLSPEC_HIDDEN; @@ -388,6 +391,8 @@ extern BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, extern BOOL nulldrv_AngleArc( PHYSDEV dev, INT x, INT y, DWORD radius, FLOAT start, FLOAT sweep ) DECLSPEC_HIDDEN; extern BOOL nulldrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL nulldrv_BeginPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern DWORD nulldrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits, + struct bitblt_coords *src, struct bitblt_coords *dst, BLENDFUNCTION func ) DECLSPEC_HIDDEN; extern BOOL nulldrv_CloseFigure( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL nulldrv_EndPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern INT nulldrv_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN;

1 0

Marcus Meissner : msvcrt: Replaced bad memcpy by strcpy (Coverity).
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 6ca6464cf3c175baa698abffaedce5aa9b6df7a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ca6464cf3c175baa698abffa… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Oct 17 00:42:28 2011 +0200 msvcrt: Replaced bad memcpy by strcpy (Coverity). --- dlls/msvcrt/locale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 6733522..c64e3d9 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -102,7 +102,7 @@ static void remap_synonym(char *name) if (!strcasecmp(_country_synonyms[i],name)) { TRACE(":Mapping synonym %s to %s\n",name,_country_synonyms[i+1]); - memcpy(name, _country_synonyms[i+1], sizeof(_country_synonyms[i+1])); + strcpy(name, _country_synonyms[i+1]); return; } }

1 0

Marcus Meissner : setupx.dll16: Fixed bad sizeof() (Coverity).
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 68f8eff5e0e8ea255349d28e617cfc27843a54b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68f8eff5e0e8ea255349d28e6… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Oct 17 00:26:21 2011 +0200 setupx.dll16: Fixed bad sizeof() (Coverity). --- dlls/setupx.dll16/virtcopy.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupx.dll16/virtcopy.c b/dlls/setupx.dll16/virtcopy.c index 5137548..f2ce4e8 100644 --- a/dlls/setupx.dll16/virtcopy.c +++ b/dlls/setupx.dll16/virtcopy.c @@ -224,10 +224,10 @@ static RETERR16 VCP_VirtnodeCreate(const VCPFILESPEC *vfsSrc, const VCPFILESPEC vn_num += 20; if (pvnlist) pvnlist = HeapReAlloc(heap, HEAP_ZERO_MEMORY, pvnlist, - sizeof(LPVIRTNODE *) * vn_num); + sizeof(*pvnlist) * vn_num); else pvnlist = HeapAlloc(heap, HEAP_ZERO_MEMORY, - sizeof(LPVIRTNODE *) * vn_num); + sizeof(*pvnlist) * vn_num); } pvnlist[vn_last] = HeapAlloc(heap, HEAP_ZERO_MEMORY, sizeof(VIRTNODE)); lpvn = pvnlist[vn_last];

1 0

Dan Kegel : comdlg32/tests: Initialize find & replace strings before testing FindTextA, etc.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 4a38b10a56209758287b61553a2e389fdc09756f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a38b10a56209758287b61553… Author: Dan Kegel <dank(a)kegel.com> Date: Sun Oct 16 10:47:59 2011 -0700 comdlg32/tests: Initialize find & replace strings before testing FindTextA, etc. --- dlls/comdlg32/tests/finddlg.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/tests/finddlg.c b/dlls/comdlg32/tests/finddlg.c index 4a10909..82a7a46 100644 --- a/dlls/comdlg32/tests/finddlg.c +++ b/dlls/comdlg32/tests/finddlg.c @@ -103,11 +103,13 @@ static void test_param_check(void) /* invalid lpstrFindWhat (NULL) */ CHECK_FINDREPLACE_FAIL(FRERR_BUFFERLENGTHZERO); fr.lpstrFindWhat = findbuffer; + strcpy(findbuffer, "abc"); /* invalid lpstrReplaceWith (NULL) for ReplaceText */ CHECK_FIND_SUCCEED(); CHECK_REPLACE_FAIL(FRERR_BUFFERLENGTHZERO); fr.lpstrReplaceWith = replacebuffer; + strcpy(replacebuffer, "def"); /* wReplaceWithLen may be 0, even for ReplaceText */ CHECK_FIND_SUCCEED();

1 0

Marcus Meissner : dsound: Remove dead code from mixer (Coverity).
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 587cd82013c6a2dd80da5ba90efde0eb442bc3a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=587cd82013c6a2dd80da5ba90… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Oct 16 19:16:41 2011 +0200 dsound: Remove dead code from mixer (Coverity). --- dlls/dsound/mixer.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 8adbdff..b1925d5 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -934,11 +934,6 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) size2 = 0; FillMemory(device->mix_buffer + mixplaypos, mixplaypos2 - mixplaypos, 0); FillMemory(buf1, size1, nfiller); - if (buf2 && size2) - { - FIXME("%d: There should be no additional buffer here!!\n", __LINE__); - FillMemory(buf2, size2, nfiller); - } } device->playpos = playpos;

1 0

Marcus Meissner : usp10: Fixed some oom handling (Coverity).
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 76702f33916f69af67352c9c3e8720c5e3b8d267 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76702f33916f69af67352c9c3… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Oct 16 12:38:24 2011 +0200 usp10: Fixed some oom handling (Coverity). --- dlls/usp10/usp10.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 107f8cc..65d42e4 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1029,6 +1029,8 @@ static BOOL requires_fallback(HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS *psa, return TRUE; glyphs = heap_alloc(sizeof(WORD) * cChars); + if (!glyphs) + return FALSE; if (ScriptGetCMap(hdc, psc, pwcInChars, cChars, 0, glyphs) != S_OK) { heap_free(glyphs); @@ -1111,6 +1113,11 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, if (dwFlags & SSA_PASSWORD) { iString = heap_alloc(sizeof(WCHAR)*cString); + if (!iString) + { + hr = E_OUTOFMEMORY; + goto error; + } for (i = 0; i < cString; i++) iString[i] = *((const WCHAR *)pString); pString = iString; @@ -1133,6 +1140,9 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, } if (hr != S_OK) goto error; + /* set back to out of memory for default goto error behaviour */ + hr = E_OUTOFMEMORY; + if (dwFlags & SSA_BREAK) { if ((analysis->logattrs = heap_alloc(sizeof(SCRIPT_LOGATTR) * cString))) @@ -1173,6 +1183,18 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, const WCHAR* pStr = (const WCHAR*)pString; analysis->glyphs[i].fallbackFont = NULL; + if (!glyphs || !pwLogClust || !piAdvance || !psva || !pGoffset || !abc) + { + heap_free (glyphs); + heap_free (pwLogClust); + heap_free (piAdvance); + heap_free (psva); + heap_free (pGoffset); + heap_free (abc); + hr = E_OUTOFMEMORY; + goto error; + } + if ((dwFlags & SSA_FALLBACK) && requires_fallback(hdc, sc, &analysis->pItem[i].a, &pStr[analysis->pItem[i].iCharPos], cChar)) { LOGFONTW lf;

1 0

Marcus Meissner : user32: Load PaddedBorderWidth from registry too ( Coverity).
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 118dc1998f04fc5e5b7729f1ce15973c19a02c40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=118dc1998f04fc5e5b7729f1c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Oct 16 11:32:03 2011 +0200 user32: Load PaddedBorderWidth from registry too (Coverity). --- dlls/user32/sysparams.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 3c7da43..6a80687 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -254,6 +254,7 @@ static const WCHAR METRICS_MENUWIDTH_VALNAME[]= {'M','e','n','u','W','i',' static const WCHAR METRICS_MENUHEIGHT_VALNAME[]= {'M','e','n','u','H','e','i','g','h','t',0}; static const WCHAR METRICS_ICONSIZE_VALNAME[]= {'S','h','e','l','l',' ','I','c','o','n',' ','S','i','z','e',0}; static const WCHAR METRICS_BORDERWIDTH_VALNAME[]= {'B','o','r','d','e','r','W','i','d','t','h',0}; +static const WCHAR METRICS_PADDEDBORDERWIDTH_VALNAME[]={'P','a','d','d','e','d','B','o','r','d','e','r','W','i','d','t','h',0}; static const WCHAR METRICS_CAPTIONLOGFONT_VALNAME[]= {'C','a','p','t','i','o','n','F','o','n','t',0}; static const WCHAR METRICS_SMCAPTIONLOGFONT_VALNAME[]={'S','m','C','a','p','t','i','o','n','F','o','n','t',0}; static const WCHAR METRICS_MENULOGFONT_VALNAME[]= {'M','e','n','u','F','o','n','t',0}; @@ -1079,6 +1080,7 @@ static void load_nonclient_metrics(void) ncm.iBorderWidth = get_reg_metric(hkey, METRICS_BORDERWIDTH_VALNAME, 1); ncm.iScrollWidth = get_reg_metric(hkey, METRICS_SCROLLWIDTH_VALNAME, 16); ncm.iScrollHeight = get_reg_metric(hkey, METRICS_SCROLLHEIGHT_VALNAME, 16); + ncm.iPaddedBorderWidth = get_reg_metric(hkey, METRICS_PADDEDBORDERWIDTH_VALNAME, 0); /* size of the normal caption buttons */ ncm.iCaptionHeight = get_reg_metric(hkey, METRICS_CAPTIONHEIGHT_VALNAME, 18);

1 0

Luca Bennati : winecfg: Update Italian translation.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: aabe6e6f181e4ca27a10b7a6adbde08ebfe98c03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aabe6e6f181e4ca27a10b7a6a… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sat Oct 15 15:49:52 2011 +0200 winecfg: Update Italian translation. --- programs/winecfg/It.rc | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/programs/winecfg/It.rc b/programs/winecfg/It.rc index c6515cd..0193989 100644 --- a/programs/winecfg/It.rc +++ b/programs/winecfg/It.rc @@ -3,7 +3,7 @@ * Italian Language Support * * Copyright 2004 Ivan Leo Pioti - * Copyright 2009 Luca Bennati + * Copyright 2009,2011 Luca Bennati * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -66,7 +66,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Impostazioni delle finestre ",IDC_STATIC,8,4,244,84 - CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "Cattura automaticamente il &mouse nelle finestre a schermo pieno",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Permetti al gestore delle finestre di &decorare le finestre",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Permetti al &gestore delle finestre di controllare le finestre",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "&Emula un desktop virtuale",IDC_ENABLE_DESKTOP,"Button", @@ -115,7 +115,7 @@ BEGIN CONTROL "In&tegrata poi nativa",IDC_RAD_BUILTIN_NATIVE,"Button", BS_AUTORADIOBUTTON,16,34,75,10 CONTROL "N&ativa poi integrata",IDC_RAD_NATIVE_BUILTIN,"Button", BS_AUTORADIOBUTTON,16,44,75,10 CONTROL "&Disabilita",IDC_RAD_DISABLE,"Button", BS_AUTORADIOBUTTON,16,54,75,10 - DEFPUSHBUTTON "OK",IDOK,8,74,45,14,WS_GROUP + DEFPUSHBUTTON "Ok",IDOK,8,74,45,14,WS_GROUP PUSHBUTTON "Annulla",IDCANCEL,57,74,45,14,WS_GROUP END @@ -125,7 +125,7 @@ CAPTION "Seleziona la lettera dell'unità" FONT 8, "MS Shell Dlg" BEGIN COMBOBOX IDC_DRIVESA2Z,15,10,75,230,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "OK",IDOK,105,10,45,14,WS_GROUP + DEFPUSHBUTTON "Ok",IDOK,105,10,45,14,WS_GROUP PUSHBUTTON "Annulla",IDCANCEL,105,30,45,14,WS_GROUP END @@ -166,13 +166,13 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Driver Diagnostics ",IDC_STATIC,8,4,244,27 + GROUPBOX " Diagnostica del driver ",IDC_STATIC,8,4,244,27 LTEXT "",IDC_AUDIO_DRIVER,18,16,230,8 - GROUPBOX " Defaults ",IDC_STATIC,8,33,244,76 - LTEXT "Output device:",IDC_STATIC,18,45,230,8 - LTEXT "Voice output device:",IDC_STATIC,18,61,230,8 - LTEXT "Input device:",IDC_STATIC,18,77,230,8 - LTEXT "Voice input device:",IDC_STATIC,18,93,230,8 + GROUPBOX " Valori predefiniti ",IDC_STATIC,8,33,244,76 + LTEXT "Unità output:",IDC_STATIC,18,45,230,8 + LTEXT "Unità output voce:",IDC_STATIC,18,61,230,8 + LTEXT "Unità input:",IDC_STATIC,18,77,230,8 + LTEXT "Unità input voce:",IDC_STATIC,18,93,230,8 COMBOBOX IDC_AUDIOOUT_DEVICE,110,43,135,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_VOICEOUT_DEVICE,110,59,135,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_AUDIOIN_DEVICE,110,75,135,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

1 0

Luca Bennati : comdlg32: Update Italian translation.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 6da39c228da689a8866d7e8ecae6dc36ef381280 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6da39c228da689a8866d7e8ec… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sat Oct 15 15:06:41 2011 +0200 comdlg32: Update Italian translation. --- dlls/comdlg32/cdlg_It.rc | 249 +++++++++++++++++++++++++--------------------- 1 files changed, 134 insertions(+), 115 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6da39c228da689a8866d7…

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2011