February 2010 - Wine-commits

Huw Davies : oleaut32: Realize the font in getter functions.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: cf602ca4228f954d7de3b8100cea8fad680ed7f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf602ca4228f954d7de3b8100… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 2 10:15:39 2010 +0000 oleaut32: Realize the font in getter functions. --- dlls/oleaut32/olefont.c | 134 +++++++++++++++++++++++++---------------- dlls/oleaut32/tests/olefont.c | 2 - 2 files changed, 83 insertions(+), 53 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index 9309b0f..c0d9b66 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -111,6 +111,22 @@ static HFONTItem *find_hfontitem(HFONT hfont) return NULL; } +/* Add an item to the list with one internal reference */ +static HRESULT add_hfontitem(HFONT hfont) +{ + HFONTItem *new_item = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_item)); + + if(!new_item) return E_OUTOFMEMORY; + + new_item->int_refs = 1; + new_item->total_refs = 1; + new_item->gdiFont = hfont; + EnterCriticalSection(&OLEFontImpl_csHFONTLIST); + list_add_tail(&OLEFontImpl_hFontList,&new_item->entry); + LeaveCriticalSection(&OLEFontImpl_csHFONTLIST); + return S_OK; +} + static HRESULT inc_int_ref(HFONT hfont) { HFONTItem *item; @@ -221,7 +237,7 @@ struct OLEFontImpl * Contain the font associated with this object. */ HFONT gdiFont; - + BOOL dirty; /* * Size ratio */ @@ -370,8 +386,8 @@ static void OLEFont_SendNotify(OLEFontImpl* this, DISPID dispID) CONNECTDATA CD; HRESULT hres; - dec_int_ref(this->gdiFont); - this->gdiFont = 0; + this->dirty = TRUE; + hres = IConnectionPoint_EnumConnections(this->pPropertyNotifyCP, &pEnum); if (SUCCEEDED(hres)) { @@ -526,6 +542,52 @@ static ULONG WINAPI OLEFontImpl_Release( return ret; } +static void realize_font(OLEFontImpl *This) +{ + if (This->dirty) + { + LOGFONTW logFont; + INT fontHeight; + + if(This->gdiFont) + { + dec_int_ref(This->gdiFont); + This->gdiFont = 0; + } + + /* + * The height of the font returned by the get_Size property is the + * height of the font in points multiplied by 10000... Using some + * simple conversions and the ratio given by the application, it can + * be converted to a height in pixels. + */ + + /* Standard ratio is 72 / 2540, or 18 / 635 in lowest terms. */ + /* Ratio is applied here relative to the standard. */ + fontHeight = MulDiv( This->description.cySize.s.Lo, This->cyLogical*635, This->cyHimetric*18 ); + + memset(&logFont, 0, sizeof(LOGFONTW)); + + logFont.lfHeight = ((fontHeight%10000L)>5000L) ? (-fontHeight/10000L) - 1 : + (-fontHeight/10000L); + logFont.lfItalic = This->description.fItalic; + logFont.lfUnderline = This->description.fUnderline; + logFont.lfStrikeOut = This->description.fStrikethrough; + logFont.lfWeight = This->description.sWeight; + logFont.lfCharSet = This->description.sCharset; + logFont.lfOutPrecision = OUT_CHARACTER_PRECIS; + logFont.lfClipPrecision = CLIP_DEFAULT_PRECIS; + logFont.lfQuality = DEFAULT_QUALITY; + logFont.lfPitchAndFamily = DEFAULT_PITCH; + lstrcpynW(logFont.lfFaceName, This->description.lpstrName, LF_FACESIZE); + + This->gdiFont = CreateFontIndirectW(&logFont); + This->dirty = FALSE; + + add_hfontitem(This->gdiFont); + } +} + /************************************************************************ * OLEFontImpl_get_Name (IFont) * @@ -543,6 +605,8 @@ static HRESULT WINAPI OLEFontImpl_get_Name( if (pname==0) return E_POINTER; + if(this->dirty) realize_font(this); + if (this->description.lpstrName!=0) *pname = SysAllocString(this->description.lpstrName); else @@ -607,6 +671,8 @@ static HRESULT WINAPI OLEFontImpl_get_Size( if (psize==0) return E_POINTER; + if(this->dirty) realize_font(this); + psize->s.Hi = 0; psize->s.Lo = this->description.cySize.s.Lo; @@ -648,6 +714,8 @@ static HRESULT WINAPI OLEFontImpl_get_Bold( if (pbold==0) return E_POINTER; + if(this->dirty) realize_font(this); + *pbold = this->description.sWeight > 550; return S_OK; @@ -687,6 +755,8 @@ static HRESULT WINAPI OLEFontImpl_get_Italic( if (pitalic==0) return E_POINTER; + if(this->dirty) realize_font(this); + *pitalic = this->description.fItalic; return S_OK; @@ -728,6 +798,8 @@ static HRESULT WINAPI OLEFontImpl_get_Underline( if (punderline==0) return E_POINTER; + if(this->dirty) realize_font(this); + *punderline = this->description.fUnderline; return S_OK; @@ -769,6 +841,8 @@ static HRESULT WINAPI OLEFontImpl_get_Strikethrough( if (pstrikethrough==0) return E_POINTER; + if(this->dirty) realize_font(this); + *pstrikethrough = this->description.fStrikethrough; return S_OK; @@ -810,6 +884,8 @@ static HRESULT WINAPI OLEFontImpl_get_Weight( if (pweight==0) return E_POINTER; + if(this->dirty) realize_font(this); + *pweight = this->description.sWeight; return S_OK; @@ -851,6 +927,8 @@ static HRESULT WINAPI OLEFontImpl_get_Charset( if (pcharset==0) return E_POINTER; + if(this->dirty) realize_font(this); + *pcharset = this->description.sCharset; return S_OK; @@ -888,54 +966,7 @@ static HRESULT WINAPI OLEFontImpl_get_hFont( if (phfont==NULL) return E_POINTER; - /* - * Realize the font if necessary - */ - if (this->gdiFont==0) -{ - LOGFONTW logFont; - INT fontHeight; - CY cySize; - PHFONTItem newEntry; - - /* - * The height of the font returned by the get_Size property is the - * height of the font in points multiplied by 10000... Using some - * simple conversions and the ratio given by the application, it can - * be converted to a height in pixels. - */ - IFont_get_Size(iface, &cySize); - - /* Standard ratio is 72 / 2540, or 18 / 635 in lowest terms. */ - /* Ratio is applied here relative to the standard. */ - fontHeight = MulDiv( cySize.s.Lo, this->cyLogical*635, this->cyHimetric*18 ); - - memset(&logFont, 0, sizeof(LOGFONTW)); - - logFont.lfHeight = ((fontHeight%10000L)>5000L) ? (-fontHeight/10000L)-1 : - (-fontHeight/10000L); - logFont.lfItalic = this->description.fItalic; - logFont.lfUnderline = this->description.fUnderline; - logFont.lfStrikeOut = this->description.fStrikethrough; - logFont.lfWeight = this->description.sWeight; - logFont.lfCharSet = this->description.sCharset; - logFont.lfOutPrecision = OUT_CHARACTER_PRECIS; - logFont.lfClipPrecision = CLIP_DEFAULT_PRECIS; - logFont.lfQuality = DEFAULT_QUALITY; - logFont.lfPitchAndFamily = DEFAULT_PITCH; - strcpyW(logFont.lfFaceName,this->description.lpstrName); - - this->gdiFont = CreateFontIndirectW(&logFont); - - /* Add font to the cache */ - newEntry = HeapAlloc(GetProcessHeap(), 0, sizeof(HFONTItem)); - newEntry->int_refs = 1; - newEntry->total_refs = 1; - newEntry->gdiFont = this->gdiFont; - EnterCriticalSection(&OLEFontImpl_csHFONTLIST); - list_add_tail(&OLEFontImpl_hFontList,&newEntry->entry); - LeaveCriticalSection(&OLEFontImpl_csHFONTLIST); - } + if(this->dirty) realize_font(this); *phfont = this->gdiFont; TRACE("Returning %p\n", *phfont); @@ -2286,6 +2317,7 @@ static OLEFontImpl* OLEFontImpl_Construct(const FONTDESC *fontDesc) * Initializing all the other members. */ newObject->gdiFont = 0; + newObject->dirty = TRUE; newObject->cyLogical = 72L; newObject->cyHimetric = 2540L; newObject->pPropertyNotifyCP = NULL; diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 906eeb4..79dbade 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -877,7 +877,6 @@ static void test_hfont_lifetime(void) /* put_Size doesn't cause the new font to be realized */ obj_type = GetObjectType(last_hfont); -todo_wine ok(obj_type == OBJ_FONT, "got obj type %d\n", obj_type); hr = IFont_get_hFont(font, &hfont); @@ -939,7 +938,6 @@ todo_wine /* put_Size doesn't cause the new font to be realized */ obj_type = GetObjectType(last_hfont); -todo_wine ok(obj_type == OBJ_FONT, "got obj type %d\n", obj_type); hr = IFont_get_hFont(font, &hfont);

1 0

Huw Davies : oleaut32: If the font name property is changed, don' t insist on the current charset when selecting a new font.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 7e42fd8b4e1acc5c7df9e6a03af07f1a00ec37cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e42fd8b4e1acc5c7df9e6a03… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 2 10:20:50 2010 +0000 oleaut32: If the font name property is changed, don't insist on the current charset when selecting a new font. --- dlls/oleaut32/olefont.c | 102 +++++++++++++++++++++++++++++++++++++++-- dlls/oleaut32/tests/olefont.c | 58 +++++++++++++++++++++++ 2 files changed, 155 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index c0d9b66..df7de87 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -53,6 +53,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); #define FONTPERSIST_UNDERLINE 0x04 #define FONTPERSIST_STRIKETHROUGH 0x08 +static HDC olefont_hdc; /*********************************************************************** * List of the HFONTs it has given out, with each one having a separate @@ -91,6 +92,28 @@ static CRITICAL_SECTION_DEBUG OLEFontImpl_csHFONTLIST_debug = }; static CRITICAL_SECTION OLEFontImpl_csHFONTLIST = { &OLEFontImpl_csHFONTLIST_debug, -1, 0, 0, 0, 0 }; +static HDC get_dc(void) +{ + HDC hdc; + EnterCriticalSection(&OLEFontImpl_csHFONTLIST); + if(!olefont_hdc) + olefont_hdc = CreateCompatibleDC(NULL); + hdc = olefont_hdc; + LeaveCriticalSection(&OLEFontImpl_csHFONTLIST); + return hdc; +} + +static void delete_dc(void) +{ + EnterCriticalSection(&OLEFontImpl_csHFONTLIST); + if(olefont_hdc) + { + DeleteDC(olefont_hdc); + olefont_hdc = NULL; + } + LeaveCriticalSection(&OLEFontImpl_csHFONTLIST); +} + static void HFONTItem_Delete(PHFONTItem item) { DeleteObject(item->gdiFont); @@ -204,6 +227,17 @@ static HRESULT dec_ext_ref(HFONT hfont) return hr; } +static WCHAR *strdupW(const WCHAR* str) +{ + WCHAR *ret; + DWORD size = (strlenW(str) + 1) * sizeof(WCHAR); + + ret = HeapAlloc(GetProcessHeap(), 0, size); + if(ret) + memcpy(ret, str, size); + return ret; +} + /*********************************************************************** * Declaration of the implementation class for the IFont interface */ @@ -531,6 +565,7 @@ static ULONG WINAPI OLEFontImpl_Release( LIST_FOR_EACH_ENTRY_SAFE(item, cursor2, &OLEFontImpl_hFontList, HFONTItem, entry) HFONTItem_Delete(item); LeaveCriticalSection(&OLEFontImpl_csHFONTLIST); + delete_dc(); } else { @@ -542,31 +577,77 @@ static ULONG WINAPI OLEFontImpl_Release( return ret; } +typedef struct +{ + short orig_cs; + short avail_cs; +} enum_data; + +static int CALLBACK font_enum_proc(const LOGFONTW *elf, const TEXTMETRICW *ntm, DWORD type, LPARAM lp) +{ + enum_data *data = (enum_data*)lp; + + if(elf->lfCharSet == data->orig_cs) + { + data->avail_cs = data->orig_cs; + return 0; + } + if(data->avail_cs == -1) data->avail_cs = elf->lfCharSet; + return 1; +} + static void realize_font(OLEFontImpl *This) { if (This->dirty) { LOGFONTW logFont; INT fontHeight; + WCHAR text_face[LF_FACESIZE]; + HDC hdc = get_dc(); + HFONT old_font; + TEXTMETRICW tm; + + text_face[0] = 0; if(This->gdiFont) { + old_font = SelectObject(hdc, This->gdiFont); + GetTextFaceW(hdc, sizeof(text_face) / sizeof(text_face[0]), text_face); + SelectObject(hdc, old_font); dec_int_ref(This->gdiFont); This->gdiFont = 0; } + memset(&logFont, 0, sizeof(LOGFONTW)); + + lstrcpynW(logFont.lfFaceName, This->description.lpstrName, LF_FACESIZE); + logFont.lfCharSet = This->description.sCharset; + + /* If the font name has been changed then enumerate all charsets + and pick one that'll result in the font specified being selected */ + if(text_face[0] && lstrcmpiW(text_face, This->description.lpstrName)) + { + enum_data data; + data.orig_cs = This->description.sCharset; + data.avail_cs = -1; + logFont.lfCharSet = DEFAULT_CHARSET; + EnumFontFamiliesExW(get_dc(), &logFont, font_enum_proc, (LPARAM)&data, 0); + if(data.avail_cs != -1) logFont.lfCharSet = data.avail_cs; + } + + /* * The height of the font returned by the get_Size property is the * height of the font in points multiplied by 10000... Using some * simple conversions and the ratio given by the application, it can * be converted to a height in pixels. + * + * Standard ratio is 72 / 2540, or 18 / 635 in lowest terms. + * Ratio is applied here relative to the standard. */ - /* Standard ratio is 72 / 2540, or 18 / 635 in lowest terms. */ - /* Ratio is applied here relative to the standard. */ fontHeight = MulDiv( This->description.cySize.s.Lo, This->cyLogical*635, This->cyHimetric*18 ); - memset(&logFont, 0, sizeof(LOGFONTW)); logFont.lfHeight = ((fontHeight%10000L)>5000L) ? (-fontHeight/10000L) - 1 : (-fontHeight/10000L); @@ -574,17 +655,28 @@ static void realize_font(OLEFontImpl *This) logFont.lfUnderline = This->description.fUnderline; logFont.lfStrikeOut = This->description.fStrikethrough; logFont.lfWeight = This->description.sWeight; - logFont.lfCharSet = This->description.sCharset; logFont.lfOutPrecision = OUT_CHARACTER_PRECIS; logFont.lfClipPrecision = CLIP_DEFAULT_PRECIS; logFont.lfQuality = DEFAULT_QUALITY; logFont.lfPitchAndFamily = DEFAULT_PITCH; - lstrcpynW(logFont.lfFaceName, This->description.lpstrName, LF_FACESIZE); This->gdiFont = CreateFontIndirectW(&logFont); This->dirty = FALSE; add_hfontitem(This->gdiFont); + + /* Fixup the name and charset properties so that they match the + selected font */ + old_font = SelectObject(get_dc(), This->gdiFont); + GetTextFaceW(hdc, sizeof(text_face) / sizeof(text_face[0]), text_face); + if(lstrcmpiW(text_face, This->description.lpstrName)) + { + HeapFree(GetProcessHeap(), 0, This->description.lpstrName); + This->description.lpstrName = strdupW(text_face); + } + GetTextMetricsW(hdc, &tm); + This->description.sCharset = tm.tmCharSet; + SelectObject(hdc, old_font); } } diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 79dbade..2f3eff8 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -45,6 +45,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static WCHAR MSSansSerif_font[] = {'M','S',' ','S','a','n','s',' ','S','e','r','i','f',0}; static WCHAR system_font[] = { 'S','y','s','t','e','m',0 }; static WCHAR arial_font[] = { 'A','r','i','a','l',0 }; +static WCHAR marlett_font[] = { 'M','a','r','l','e','t','t',0 }; static HMODULE hOleaut32; @@ -1018,6 +1019,62 @@ todo_wine ok(obj_type == 0, "got obj type %d\n", obj_type); } +static void test_realization(void) +{ + IFont *font; + FONTDESC fontdesc; + HRESULT hr; + BSTR name; + SHORT cs; + + /* Try to create a symbol only font (marlett) with charset + set to ANSI. This will result in another, ANSI, font + being selected */ + fontdesc.cbSizeofstruct = sizeof(fontdesc); + fontdesc.lpstrName = marlett_font; + fontdesc.cySize.int64 = 12 * 10000; /* 12 pt */ + fontdesc.sWeight = FW_NORMAL; + fontdesc.sCharset = ANSI_CHARSET; + fontdesc.fItalic = FALSE; + fontdesc.fUnderline = FALSE; + fontdesc.fStrikethrough = FALSE; + + hr = pOleCreateFontIndirect(&fontdesc, &IID_IFont, (void **)&font); + ok_ole_success(hr, "OleCreateFontIndirect"); + + hr = IFont_get_Charset(font, &cs); + ok_ole_success(hr, "get_Charset"); + ok(cs == ANSI_CHARSET, "got charset %d\n", cs); + + IFont_Release(font); + + /* Now create an ANSI font and change the name to marlett */ + + fontdesc.lpstrName = arial_font; + + hr = pOleCreateFontIndirect(&fontdesc, &IID_IFont, (void **)&font); + ok_ole_success(hr, "OleCreateFontIndirect"); + + hr = IFont_get_Charset(font, &cs); + ok_ole_success(hr, "get_Charset"); + ok(cs == ANSI_CHARSET, "got charset %d\n", cs); + + name = SysAllocString(marlett_font); + hr = IFont_put_Name(font, name); + ok_ole_success(hr, "put_Name"); + SysFreeString(name); + + hr = IFont_get_Name(font, &name); + ok_ole_success(hr, "get_Name"); + ok(!lstrcmpiW(name, marlett_font), "got name %s\n", wine_dbgstr_w(name)); + SysFreeString(name); + + hr = IFont_get_Charset(font, &cs); + ok_ole_success(hr, "get_Charset"); + ok(cs == SYMBOL_CHARSET, "got charset %d\n", cs); + + IFont_Release(font); +} START_TEST(olefont) { @@ -1053,4 +1110,5 @@ START_TEST(olefont) test_AddRefHfont(); test_returns(); test_hfont_lifetime(); + test_realization(); }

1 0

Alexandre Julliard : user: Reimplement GetIconInfo16 using the 16-bit icon structure directly.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: e474bfe0f39ed13f0364cccb273fbe368653b2d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e474bfe0f39ed13f0364cccb2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 17:31:27 2010 +0100 user: Reimplement GetIconInfo16 using the 16-bit icon structure directly. --- dlls/user.exe16/user.c | 47 ++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 38 insertions(+), 9 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 0b321b7..7d60bac 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -265,6 +265,8 @@ struct cache_entry static struct list icon_cache = LIST_INIT( icon_cache ); +static const WORD ICON_HOTSPOT = 0x4242; + static HICON16 alloc_icon_handle( unsigned int size ) { HGLOBAL16 handle = GlobalAlloc16( GMEM_MOVEABLE, size ); @@ -2117,15 +2119,43 @@ BOOL16 WINAPI DrawIconEx16(HDC16 hdc, INT16 xLeft, INT16 yTop, HICON16 hIcon, */ BOOL16 WINAPI GetIconInfo16(HICON16 hIcon, LPICONINFO16 iconinfo) { - ICONINFO ii32; - BOOL16 ret = GetIconInfo(HICON_32(hIcon), &ii32); + CURSORICONINFO *info = get_icon_ptr( hIcon ); + INT height; + + if (!info) return FALSE; + + if ((info->ptHotSpot.x == ICON_HOTSPOT) && (info->ptHotSpot.y == ICON_HOTSPOT)) + { + iconinfo->fIcon = TRUE; + iconinfo->xHotspot = info->nWidth / 2; + iconinfo->yHotspot = info->nHeight / 2; + } + else + { + iconinfo->fIcon = FALSE; + iconinfo->xHotspot = info->ptHotSpot.x; + iconinfo->yHotspot = info->ptHotSpot.y; + } - iconinfo->fIcon = ii32.fIcon; - iconinfo->xHotspot = ii32.xHotspot; - iconinfo->yHotspot = ii32.yHotspot; - iconinfo->hbmMask = HBITMAP_16(ii32.hbmMask); - iconinfo->hbmColor = HBITMAP_16(ii32.hbmColor); - return ret; + height = info->nHeight; + + if (info->bBitsPerPixel > 1) + { + iconinfo->hbmColor = HBITMAP_16( CreateBitmap( info->nWidth, info->nHeight, + info->bPlanes, info->bBitsPerPixel, + (char *)(info + 1) + + info->nHeight * + get_bitmap_width_bytes(info->nWidth,1) )); + } + else + { + iconinfo->hbmColor = 0; + height *= 2; + } + + iconinfo->hbmMask = HBITMAP_16( CreateBitmap( info->nWidth, height, 1, 1, info + 1 )); + release_icon_ptr( hIcon, info ); + return TRUE; } @@ -2167,7 +2197,6 @@ HICON16 WINAPI CreateIcon16( HINSTANCE16 hInstance, INT16 nWidth, INT16 nHeight, BYTE bPlanes, BYTE bBitsPixel, LPCVOID lpANDbits, LPCVOID lpXORbits ) { - static const WORD ICON_HOTSPOT = 0x4242; CURSORICONINFO info; info.ptHotSpot.x = ICON_HOTSPOT;

1 0

Alexandre Julliard : user: Call the 16-bit CreateIconFromResourceEx from LoadIconHandler16.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 3d55d1430bbfcc34a00498667224914876fa9e09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d55d1430bbfcc34a00498667… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 20:36:35 2010 +0100 user: Call the 16-bit CreateIconFromResourceEx from LoadIconHandler16. --- dlls/user.exe16/user.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 7d60bac..d415f78 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -2614,9 +2614,8 @@ WORD WINAPI GetIconID16( HGLOBAL16 hResource, DWORD resType ) */ HICON16 WINAPI LoadIconHandler16( HGLOBAL16 hResource, BOOL16 bNew ) { - LPBYTE bits = LockResource16( hResource ); - return HICON_16(CreateIconFromResourceEx( bits, 0, TRUE, - bNew ? 0x00030000 : 0x00020000, 0, 0, LR_DEFAULTCOLOR)); + return CreateIconFromResourceEx16( LockResource16( hResource ), 0, TRUE, + bNew ? 0x00030000 : 0x00020000, 0, 0, LR_DEFAULTCOLOR ); }

1 0

Alexandre Julliard : user: Add internal functions for cursor/icon 16<-> 32 conversion to replace the typecasting macros.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 8fc1fc49fdf1a86bf149c1b03a789e7a493584cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fc1fc49fdf1a86bf149c1b03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 2 12:14:10 2010 +0100 user: Add internal functions for cursor/icon 16<->32 conversion to replace the typecasting macros. --- dlls/user.exe16/message.c | 14 +++++++------- dlls/user.exe16/user.c | 34 ++++++++++++++++++++++++---------- dlls/user.exe16/user_private.h | 9 +++------ dlls/user.exe16/window.c | 14 +++++++------- 4 files changed, 41 insertions(+), 30 deletions(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 1ff58a7..af9da07 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -2619,7 +2619,7 @@ static LRESULT static_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, HICON16 icon = LoadIcon16( HINSTANCE_16(cs->hInstance), cs->lpszName ); if (!icon) icon = LoadCursor16( HINSTANCE_16(cs->hInstance), cs->lpszName ); if (icon) wow_handlers32.static_proc( hwnd, STM_SETIMAGE, IMAGE_ICON, - (LPARAM)HICON_32(icon), FALSE ); + (LPARAM)get_icon_32(icon), FALSE ); break; } case SS_BITMAP: @@ -2633,10 +2633,10 @@ static LRESULT static_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, return ret; } case STM_SETICON16: - wParam = (WPARAM)HICON_32( (HICON16)wParam ); + wParam = (WPARAM)get_icon_32( (HICON16)wParam ); return wow_handlers32.static_proc( hwnd, STM_SETICON, wParam, lParam, FALSE ); case STM_GETICON16: - return HICON_16( wow_handlers32.static_proc( hwnd, STM_GETICON, wParam, lParam, FALSE )); + return get_icon_16( (HICON)wow_handlers32.static_proc( hwnd, STM_GETICON, wParam, lParam, FALSE )); default: return wow_handlers32.static_proc( hwnd, msg, wParam, lParam, unicode ); } @@ -2678,22 +2678,22 @@ static HICON alloc_icon_handle( unsigned int size ) { HGLOBAL16 handle = GlobalAlloc16( GMEM_MOVEABLE, size ); FarSetOwner16( handle, 0 ); - return HICON_32( handle ); + return (HICON)(ULONG_PTR)handle; } static struct tagCURSORICONINFO *get_icon_ptr( HICON handle ) { - return GlobalLock16( HICON_16(handle) ); + return GlobalLock16( LOWORD(handle) ); } static void release_icon_ptr( HICON handle, struct tagCURSORICONINFO *ptr ) { - GlobalUnlock16( HICON_16(handle) ); + GlobalUnlock16( LOWORD(handle) ); } static int free_icon_handle( HICON handle ) { - return GlobalFree16( HICON_16(handle) ); + return GlobalFree16( LOWORD(handle) ); } diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index d415f78..5462d94 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -289,6 +289,16 @@ static int free_icon_handle( HICON16 handle ) return GlobalFree16( handle ); } +HICON get_icon_32( HICON16 icon16 ) +{ + return (HICON)(ULONG_PTR)icon16; +} + +HICON16 get_icon_16( HICON icon ) +{ + return LOWORD( icon ); +} + static void add_shared_icon( HINSTANCE16 inst, HRSRC16 rsrc, HRSRC16 group, HICON16 icon ) { struct cache_entry *cache = HeapAlloc( GetProcessHeap(), 0, sizeof(*cache) ); @@ -471,7 +481,7 @@ BOOL16 WINAPI AnyPopup16(void) */ HCURSOR16 WINAPI SetCursor16(HCURSOR16 hCursor) { - return HCURSOR_16(SetCursor(HCURSOR_32(hCursor))); + return get_icon_16( SetCursor( get_icon_32(hCursor) )); } @@ -673,7 +683,7 @@ INT16 WINAPI FrameRect16( HDC16 hdc, const RECT16 *rect16, HBRUSH16 hbrush ) */ BOOL16 WINAPI DrawIcon16(HDC16 hdc, INT16 x, INT16 y, HICON16 hIcon) { - return DrawIcon(HDC_32(hdc), x, y, HICON_32(hIcon)); + return DrawIcon(HDC_32(hdc), x, y, get_icon_32(hIcon) ); } @@ -1453,7 +1463,7 @@ BOOL16 WINAPI ExitWindowsExec16( LPCSTR lpszExe, LPCSTR lpszParams ) */ HCURSOR16 WINAPI GetCursor16(void) { - return HCURSOR_16(GetCursor()); + return get_icon_16( GetCursor() ); } @@ -1986,7 +1996,12 @@ HANDLE16 WINAPI LoadImage16(HINSTANCE16 hinst, LPCSTR name, UINT16 type, INT16 c HRSRC16 hRsrc, hGroupRsrc; if (!hinst || (flags & LR_LOADFROMFILE)) - return HICON_16( LoadImageA( 0, name, type, cx, cy, flags )); + { + if (type == IMAGE_BITMAP) + return HBITMAP_16( LoadImageA( 0, name, type, cx, cy, flags )); + else + return get_icon_16( LoadImageA( 0, name, type, cx, cy, flags )); + } hinst = GetExePtr( hinst ); @@ -2110,7 +2125,7 @@ BOOL16 WINAPI DrawIconEx16(HDC16 hdc, INT16 xLeft, INT16 yTop, HICON16 hIcon, INT16 cxWidth, INT16 cyWidth, UINT16 istep, HBRUSH16 hbr, UINT16 flags) { - return DrawIconEx(HDC_32(hdc), xLeft, yTop, HICON_32(hIcon), cxWidth, cyWidth, + return DrawIconEx(HDC_32(hdc), xLeft, yTop, get_icon_32(hIcon), cxWidth, cyWidth, istep, HBRUSH_32(hbr), flags); } @@ -2563,8 +2578,7 @@ HICON16 WINAPI CreateIconFromResourceEx16(LPBYTE bits, UINT16 cbSize, INT16 width, INT16 height, UINT16 cFlag) { - return HICON_16(CreateIconFromResourceEx(bits, cbSize, bIcon, dwVersion, - width, height, cFlag)); + return get_icon_16( CreateIconFromResourceEx( bits, cbSize, bIcon, dwVersion, width, height, cFlag )); } @@ -2722,7 +2736,7 @@ DWORD WINAPI DragObject16( HWND16 hwndScope, HWND16 hWnd, UINT16 wObj, MSG msg; LPDRAGINFO16 lpDragInfo; SEGPTR spDragInfo; - HCURSOR hOldCursor=0, hBummer=0; + HCURSOR hOldCursor=0, hBummer=0, hCursor32; HGLOBAL16 hDragInfo = GlobalAlloc16( GMEM_SHARE | GMEM_ZEROINIT, 2*sizeof(DRAGINFO16)); HCURSOR hCurrentCursor = 0; HWND16 hCurrentWnd = 0; @@ -2738,7 +2752,7 @@ DWORD WINAPI DragObject16( HWND16 hwndScope, HWND16 hWnd, UINT16 wObj, return 0L; } - if(hCursor) hOldCursor = SetCursor(HCURSOR_32(hCursor)); + if ((hCursor32 = get_icon_32( hCursor ))) SetCursor( hCursor32 ); lpDragInfo->hWnd = hWnd; lpDragInfo->hScope = 0; @@ -2761,7 +2775,7 @@ DWORD WINAPI DragObject16( HWND16 hwndScope, HWND16 hWnd, UINT16 wObj, /* update DRAGINFO struct */ if( DRAG_QueryUpdate16(WIN_Handle32(hwndScope), spDragInfo) > 0 ) - hCurrentCursor = HCURSOR_32(hCursor); + hCurrentCursor = hCursor32; else { hCurrentCursor = hBummer; diff --git a/dlls/user.exe16/user_private.h b/dlls/user.exe16/user_private.h index 97cd669..9c68b85 100644 --- a/dlls/user.exe16/user_private.h +++ b/dlls/user.exe16/user_private.h @@ -117,14 +117,11 @@ typedef struct tagDIALOGINFO #define DF_OWNERENABLED 0x0002 /* HANDLE16 <-> HANDLE conversions */ -#define HCURSOR_16(h32) (LOWORD(h32)) -#define HICON_16(h32) (LOWORD(h32)) #define HINSTANCE_16(h32) (LOWORD(h32)) - -#define HCURSOR_32(h16) ((HCURSOR)(ULONG_PTR)(h16)) -#define HICON_32(h16) ((HICON)(ULONG_PTR)(h16)) #define HINSTANCE_32(h16) ((HINSTANCE)(ULONG_PTR)(h16)) -#define HMODULE_32(h16) ((HMODULE)(ULONG_PTR)(h16)) + +extern HICON16 get_icon_16( HICON icon ) DECLSPEC_HIDDEN; +extern HICON get_icon_32( HICON16 icon16 ) DECLSPEC_HIDDEN; extern DWORD USER16_AlertableWait DECLSPEC_HIDDEN; extern WORD USER_HeapSel DECLSPEC_HIDDEN; diff --git a/dlls/user.exe16/window.c b/dlls/user.exe16/window.c index 0bd4518..b617c4d 100644 --- a/dlls/user.exe16/window.c +++ b/dlls/user.exe16/window.c @@ -1575,12 +1575,12 @@ ATOM WINAPI RegisterClassEx16( const WNDCLASSEX16 *wc ) wc32.cbClsExtra = wc->cbClsExtra; wc32.cbWndExtra = wc->cbWndExtra; wc32.hInstance = HINSTANCE_32(inst); - wc32.hIcon = HICON_32(wc->hIcon); - wc32.hCursor = HCURSOR_32(wc->hCursor); + wc32.hIcon = get_icon_32(wc->hIcon); + wc32.hCursor = get_icon_32( wc->hCursor ); wc32.hbrBackground = HBRUSH_32(wc->hbrBackground); wc32.lpszMenuName = MapSL(wc->lpszMenuName); wc32.lpszClassName = MapSL(wc->lpszClassName); - wc32.hIconSm = HICON_32(wc->hIconSm); + wc32.hIconSm = get_icon_32(wc->hIconSm); atom = RegisterClassExA( &wc32 ); if ((class = HeapAlloc( GetProcessHeap(), 0, sizeof(*class) ))) { @@ -1618,9 +1618,9 @@ BOOL16 WINAPI GetClassInfoEx16( HINSTANCE16 hInst16, SEGPTR name, WNDCLASSEX16 * wc->cbClsExtra = wc32.cbClsExtra; wc->cbWndExtra = wc32.cbWndExtra; wc->hInstance = (wc32.hInstance == user32_module) ? GetModuleHandle16("user") : HINSTANCE_16(wc32.hInstance); - wc->hIcon = HICON_16(wc32.hIcon); - wc->hIconSm = HICON_16(wc32.hIconSm); - wc->hCursor = HCURSOR_16(wc32.hCursor); + wc->hIcon = get_icon_16( wc32.hIcon ); + wc->hIconSm = get_icon_16( wc32.hIconSm ); + wc->hCursor = get_icon_16( wc32.hCursor ); wc->hbrBackground = HBRUSH_16(wc32.hbrBackground); wc->lpszClassName = 0; wc->lpszMenuName = MapLS(wc32.lpszMenuName); /* FIXME: leak */ @@ -2048,7 +2048,7 @@ BOOL16 WINAPI DrawCaptionTemp16( HWND16 hwnd, HDC16 hdc, const RECT16 *rect, } return DrawCaptionTempA( WIN_Handle32(hwnd), HDC_32(hdc), rect ? &rect32 : NULL, HFONT_32(hFont), - HICON_32(hIcon), str, uFlags & 0x1f ); + get_icon_32(hIcon), str, uFlags & 0x1f ); }

1 0

Luca Bennati : progman: Fix Italian translation.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 691ac6faaf8b3e0b3d6eabb48f18cbd42a40a91f URL: http://source.winehq.org/git/wine.git/?a=commit;h=691ac6faaf8b3e0b3d6eabb48… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Feb 1 11:33:48 2010 +0100 progman: Fix Italian translation. --- programs/progman/It.rc | 36 ++++++++++++++++++++++++++++++++---- 1 files changed, 32 insertions(+), 4 deletions(-) diff --git a/programs/progman/It.rc b/programs/progman/It.rc index 9e3437d..7bd54d7 100644 --- a/programs/progman/It.rc +++ b/programs/progman/It.rc @@ -4,6 +4,7 @@ * Copyright 1996 Ulrich Schmid * Copyright 2002 Sylvain Petreolle * Copyright 2003 Ivan Leo Puoti + * Copyright 2010 Luca Bennati * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,6 +23,9 @@ #include "progman.h" +/*UTF-8*/ +#pragma code_page(65001) + /* Menu */ MAIN_MENU MENU LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL @@ -32,7 +36,7 @@ MAIN_MENU MENU LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL MENUITEM "&Sposta...\tF7", PM_MOVE, GRAYED MENUITEM "&Copia...\tF8", PM_COPY, GRAYED MENUITEM "&Elimina\tEntf", PM_DELETE - MENUITEM "&Propriet�...\tAlt+Invio", PM_ATTRIBUTES + MENUITEM "&Proprietà...\tAlt+Invio", PM_ATTRIBUTES MENUITEM SEPARATOR MENUITEM "&Esegui...", PM_EXECUTE MENUITEM SEPARATOR @@ -122,7 +126,7 @@ PUSHBUTTON "&Aiuto", PM_HELP, 185, 45, 60, 15, WS_TABST DIALOG_GROUP DIALOG 0, 0, 230, 65 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Propriet� del gruppo di Programmi" +CAPTION "Proprietà del gruppo di Programmi" { LTEXT "&Descrizione:", PM_DESCRIPTION_TXT, 05, 18, 50, 10 EDITTEXT PM_DESCRIPTION, 60, 18, 90, 15, WS_TABSTOP @@ -138,7 +142,7 @@ PUSHBUTTON "&Aiuto", PM_HELP, 155, 45, 60, 15, WS_TABST DIALOG_PROGRAM DIALOG 0, 0, 250, 105 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Propriet� del programma" +CAPTION "Proprietà del programma" { LTEXT "&Descrizione:", PM_DESCRIPTION_TXT, 05, 10, 60, 10 EDITTEXT PM_DESCRIPTION, 80, 10, 90, 15, WS_TABSTOP @@ -208,7 +212,7 @@ IDS_NOT_IMPLEMENTED, "Non implementato" IDS_FILE_READ_ERROR_s, "Errore di lettura `%s'." IDS_FILE_WRITE_ERROR_s, "Errore di scrittura `%s'." IDS_GRPFILE_READ_ERROR_s, "\ -Il file di gruppo `%s' non puo' essere aperto.\n\ +Il file di gruppo `%s' non può essere aperto.\n\ Provare ad aprirlo in futuro?" IDS_OUT_OF_MEMORY, "Memoria esaurita" IDS_WINHELP_ERROR, "Guida non disponibile" @@ -222,3 +226,27 @@ IDS_LIBRARIES_DLL, "Librerie (*.dll)" IDS_SYMBOL_FILES, "File icona" IDS_SYMBOLS_ICO, "Icone (*.ico)" } + +STRINGTABLE DISCARDABLE LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL +{ +IDS_LICENSE_CAPTION, "LICENZA" +IDS_LICENSE, +"Questo programma è software libero; puoi redistribuirlo e/o \ +modificarlo sotto i termini della GNU Lesser General Public \ +License come pubblicata dalla Free Software Foundation; sia la \ +versione 2.1 della LGPL, che (a tua scelta) una versione più nuova.\n\ +Questo programma è distribuito nella speranza che sarà utile, \ +ma SENZA ALCUNA GARANZIA; pure senza la garanzia implicita di \ +COMMERCIABILTÀ o ADEGUATEZZA PER UN PARTICOLARE SCOPO. Leggere la GNU \ +Lesser General Public License per più informazioni.\n\ +Dovresti aver ricevuto una copia della GNU Lesser General Public \ +License insieme a questo programma; sennò, scrivi alla Free Software \ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA" + +IDS_WARRANTY_CAPTION, "NESSUNA GARANZIA" +IDS_WARRANTY, +"Questo programma è distribuito nella speranza che sarà utile, \ +ma SENZA ALCUNA GARANZIA; pure senza la garanzia implicita di \ +COMMERCIABILTÀ o ADEGUATEZZA PER UN PARTICOLARE SCOPO. Leggere la GNU \ +Lesser General Public License per più informazioni." +}

1 0

Luca Bennati : uninstaller: Fix Italian translation.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: d92b85de233936d72358430645e3158b3f3a7f85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d92b85de233936d7235843064… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Feb 1 11:41:01 2010 +0100 uninstaller: Fix Italian translation. --- programs/uninstaller/It.rc | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/uninstaller/It.rc b/programs/uninstaller/It.rc index 3eaad1f..66d33be 100644 --- a/programs/uninstaller/It.rc +++ b/programs/uninstaller/It.rc @@ -20,9 +20,12 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { IDS_APPNAME, "Wine Disinstallazione Applicazioni" -IDS_UNINSTALLFAILED, "Esecuzione del comando di disinstallazione '%s' � fallita, forse a causa di un eseguibile mancante.\r\nVuoi rimuovere dal registro la entry di disinstallazione?" +IDS_UNINSTALLFAILED, "L'esecuzione del comando di disinstallazione '%s' è fallita, forse a causa di un eseguibile mancante.\r\nVuoi rimuovere dal registro la voce di disinstallazione?" }

1 0

Luca Bennati : view: Fix Italian translation.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 7bc4c7425dadd9e3b09404f2d6cbbd94e5299e67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bc4c7425dadd9e3b09404f2d… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Feb 1 11:45:09 2010 +0100 view: Fix Italian translation. --- programs/view/It.rc | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/view/It.rc b/programs/view/It.rc index 0839c44..c54c264 100644 --- a/programs/view/It.rc +++ b/programs/view/It.rc @@ -23,6 +23,9 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL /* @@ -44,7 +47,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Sinistra", IDM_LEFT MENUITEM "&Destra", IDM_RIGHT - MENUITEM "&Alto", IDM_UP + MENUITEM "A&lto", IDM_UP MENUITEM "&Basso", IDM_DOWN END END

1 0

Luca Bennati : wineconsole: Fix Italian translation.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 4cd6feffb4855f9607a4de61d8d9c3bab081b039 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cd6feffb4855f9607a4de61d… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Feb 1 14:14:59 2010 +0100 wineconsole: Fix Italian translation. --- programs/wineconsole/wineconsole_It.rc | 26 +++++++++++++++++++++----- 1 files changed, 21 insertions(+), 5 deletions(-) diff --git a/programs/wineconsole/wineconsole_It.rc b/programs/wineconsole/wineconsole_It.rc index bc1f901..61b7b9d 100644 --- a/programs/wineconsole/wineconsole_It.rc +++ b/programs/wineconsole/wineconsole_It.rc @@ -18,26 +18,42 @@ #include "wineconsole_res.h" +/*UTF-8*/ +#pragma code_page(65001) + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN IDS_EDIT, "&Modifica" IDS_DEFAULT, "Imposta &Default" -IDS_PROPERTIES, "&Propriet�" +IDS_PROPERTIES, "&Proprietà" IDS_MARK, "Mark&" IDS_COPY, "&Copia" IDS_PASTE, "&Incolla" IDS_SELECTALL, "&Seleziona tutto" IDS_SCROLL, "Sc&orri" IDS_SEARCH, "C&erca" -IDS_FNT_DISPLAY, "Il carattere � %ld pixel di larghezza e %ld pixel di altezza" -IDS_FNT_PREVIEW_1, "Questa � una prova" +IDS_FNT_DISPLAY, "Il carattere è %ld pixel di larghezza e %ld pixel di altezza" +IDS_FNT_PREVIEW_1, "Questa è una prova" IDS_FNT_PREVIEW_2, "" IDS_DLG_TIT_DEFAULT, "Impostazioni di Default" IDS_DLG_TIT_CURRENT, "Impostazioni correnti" IDS_DLG_TIT_ERROR, "Errore di configurazione" -IDS_DLG_ERR_SBWINSIZE, "Il buffer dello schermo deve essere pi� grande o uguale a quello della finestra" +IDS_DLG_ERR_SBWINSIZE, "Il buffer dello schermo deve essere più grande o uguale a quello della finestra" + +IDS_CMD_INVALID_EVENT_ID "wineconsole: impossibile parse event id\n" +IDS_CMD_INVALID_BACKEND "wineconsole: backend non valido\n" +IDS_CMD_INVALID_OPTION "wineconsole: opzione della linea di comando non riconosciuta\n" +IDS_CMD_ABOUT "Avvia un programma in una console Wine\n" +IDS_CMD_LAUNCH_FAILED "wineconsole: Impossibile avviare %s.\n"\ + "Il comando non è valido.\n" + +IDS_USAGE_HEADER "\nUso:\n wineconsole [opzioni] <comando>\n\nOpzioni:\n" +IDS_USAGE_BACKEND " --backend={user|curses} Scegliere user farà aprire una nuova finestra, curses proverà\n"\ + " ad inizializzare terminale corrente come una console Wine\n" +IDS_USAGE_COMMAND " <comando> Il programma di Wine da lanciare in una console\n" +IDS_USAGE_FOOTER "\nEsempio:\n wineconsole cmd\nAvvia il prompt dei comandi di Wine in una console Wine\n\n" END IDD_OPTION DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 @@ -66,7 +82,7 @@ FONT 8, "MS Shell Dlg" IDD_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION " Caratteri " +CAPTION " Carattere " FONT 8, "MS Shell Dlg" { LTEXT "&Font", -1, 5, 5, 24, 8

1 0

Luca Bennati : winefile: Fix Italian translation.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: a0f7a634276f7bf54a9445024377573c8fd5d778 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0f7a634276f7bf54a9445024… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Feb 1 14:47:52 2010 +0100 winefile: Fix Italian translation. --- programs/winefile/It.rc | 93 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 89 insertions(+), 4 deletions(-) diff --git a/programs/winefile/It.rc b/programs/winefile/It.rc index 42fea06..843d473 100644 --- a/programs/winefile/It.rc +++ b/programs/winefile/It.rc @@ -6,6 +6,7 @@ * Copyright 2002 Steven Edwards * Copyright 2002 Alexandre Julliard * Copyright 2004 Ivan Leo Puoti + * Copyright 2010 Luca Bennati * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,6 +25,9 @@ #include "resource.h" +/*UTF-8*/ +#pragma code_page(65001) + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL /* Menu */ @@ -37,7 +41,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "&Negli Appunti...\tF9", 118 MENUITEM "&Cancella\tDel", ID_FILE_DELETE MENUITEM "Ri&nomina...", 109 - MENUITEM "Propri&et�...\tAlt+Invio", ID_EDIT_PROPERTIES + MENUITEM "Propri&età...\tAlt+Invio", ID_EDIT_PROPERTIES MENUITEM SEPARATOR MENUITEM "C&omprimi...", 119 MENUITEM "Dec&omprimi...", 120 @@ -81,7 +85,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "Espandi &tutto\tStrg+*", 303 MENUITEM "Riduci &Albero\t-", 304 MENUITEM SEPARATOR - MENUITEM "&Seleziona unit�", 505 + MENUITEM "&Seleziona unità", 505 } POPUP "&Visualizza" { @@ -141,7 +145,7 @@ IDM_WINEFILE MENU FIXED IMPURE POPUP "&Guida" { MENUITEM "&Sommario della Guida\tF1", ID_HELP MENUITEM "&Cerca nella Guida...\tF1", ID_HELP - MENUITEM "&Uso dell Guida\tF1", ID_HELP_USING + MENUITEM "&Uso della Guida\tF1", ID_HELP_USING MENUITEM SEPARATOR MENUITEM "&Informazioni su Winefile...",ID_ABOUT } @@ -160,8 +164,89 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Naviga", 254, 158, 43, 47, 14 } +IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Per tipo di file" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "&Nome:",-1,7,8,22,10 + EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL + GROUPBOX "Tipo di file",-1,7,23,87,56 + CONTROL "&Cartelle",IDC_VIEW_TYPE_DIRECTORIES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 + CONTROL "&Programmi",IDC_VIEW_TYPE_PROGRAMS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 + CONTROL "Docu&menti",IDC_VIEW_TYPE_DOCUMENTS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 + CONTROL "&Altri files",IDC_VIEW_TYPE_OTHERS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 + CONTROL "&Mostra files nascosti/di sistema",IDC_VIEW_TYPE_HIDDEN, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 + DEFPUSHBUTTON "OK",IDOK,104,7,50,14 + PUSHBUTTON "Annulla",IDCANCEL,104,24,50,14 +END + +IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Propprietà di %s" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,191,7,50,14 + PUSHBUTTON "Annulla",IDCANCEL,191,29,50,14 + LTEXT "Nome del &file:",-1,7,7,59,9 + EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "&Indirizzo completo:",-1,7,18,59,9 + EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Ultima modifica:",-1,7,29,59,9 + EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Versione:",-1,7,40,59,9 + EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Cop&yright:",-1,7,51,59,9 + EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Dimensione:",-1,7,62,59,9 + EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + GROUPBOX "Attributi",-1,7,79,158,46 + CONTROL "&Sola lettura",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "&Nascosto",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + CONTROL "&Archivio",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 + CONTROL "&Di sistema",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 + CONTROL "&Compresso",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + GROUPBOX "&Informazioni sulla versione",-1,7,129,234,79 + LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL +END + + STRINGTABLE { IDS_FONT_SEL_DLG_NAME "Applica le impostazioni dei caratteri" - IDS_FONT_SEL_ERROR "Si � verificato un errore durante la selezione del nuovo carattere." + IDS_FONT_SEL_ERROR "Si è verificato un errore durante la selezione del nuovo carattere." +} + +STRINGTABLE +{ + IDS_WINEFILE "Wine File Manager" + IDS_ERROR "Errore" + IDS_ROOT_FS "root fs" + IDS_UNIXFS "unixfs" + IDS_DESKTOP "Scrivania" + IDS_SHELL "Shell" + IDS_TITLEFMT "%s - %s" + IDS_NO_IMPL "Non ancora implementato" + IDS_WINE_FILE "Wine File" +} + +STRINGTABLE +{ + IDS_COL_NAME "Nome" + IDS_COL_SIZE "Dimensione" + IDS_COL_CDATE "CDate" + IDS_COL_ADATE "ADate" + IDS_COL_MDATE "MDate" + IDS_COL_IDX "Index/Inode" + IDS_COL_LINKS "Collegamenti" + IDS_COL_ATTR "Attributi" + IDS_COL_SEC "Sicurezza" + + IDS_FREE_SPACE_FMT "liberi %s di %s" }

1 0