September 2010 - Wine-commits

Sven Baars : mciwave: Fix some typos.
by Alexandre Julliard 23 Sep '10

23 Sep '10

Module: wine Branch: master Commit: e169a780b081cb311324f7820b9cf555ff215cb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e169a780b081cb311324f7820… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed Sep 22 20:56:05 2010 +0200 mciwave: Fix some typos. --- dlls/mciwave/mciwave.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 67cf09a..b2dc1a1 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -483,7 +483,7 @@ static LRESULT WAVE_mciOpenFile(WINE_MCIWAVE* wmw, LPCWSTR filename) { LPMMCKINFO lpckMainRIFF = &wmw->ckMainRIFF; - /* make sure we're are the beginning of the file */ + /* make sure we're at the beginning of the file */ mmioSeek(wmw->hFile, 0, SEEK_SET); /* first reading of this file. read the waveformat chunk */ @@ -916,7 +916,7 @@ cleanUp: wmw->dwStatus = MCI_MODE_STOP; - /* Let the potentically asynchronous commands support FAILURE notification. */ + /* Let the potentially asynchronous commands support FAILURE notification. */ if (oldcb) mciDriverNotify(oldcb, wDevID, dwRet ? MCI_NOTIFY_FAILURE : MCI_NOTIFY_SUCCESSFUL); @@ -1752,7 +1752,7 @@ LRESULT CALLBACK MCIWAVE_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_CUT: case MCI_DELETE: case MCI_PASTE: - FIXME("Unsupported yet command [%u]\n", wMsg); + FIXME("Unsupported command [%u]\n", wMsg); break; case MCI_WINDOW: TRACE("Unsupported command [%u]\n", wMsg);

1 0

Vitaly Perov : winspool.drv: Support pDevMode field in {Get/Set}Job.
by Alexandre Julliard 23 Sep '10

23 Sep '10

Module: wine Branch: master Commit: e8f56565cb24ec43c82a7dbef418ec570d638f90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8f56565cb24ec43c82a7dbef… Author: Vitaly Perov <vitperov(a)etersoft.ru> Date: Mon Sep 20 18:26:49 2010 +0400 winspool.drv: Support pDevMode field in {Get/Set}Job. --- dlls/winspool.drv/info.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 7f6d12c..2db3100 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -7,6 +7,7 @@ * Copyright 1999, 2000 Huw D M Davies * Copyright 2001 Marcus Meissner * Copyright 2005-2010 Detlef Riekenberg + * Copyright 2010 Vitaly Perov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -100,6 +101,7 @@ typedef struct { WCHAR *portname; WCHAR *document_title; WCHAR *printer_name; + LPDEVMODEW devmode; } job_t; @@ -2298,6 +2300,7 @@ BOOL WINAPI AddJobW(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPD memcpy(job->filename, filename, (len + 1) * sizeof(WCHAR)); job->document_title = strdupW(default_doc_title); job->printer_name = strdupW(printer->name); + job->devmode = NULL; list_add_tail(&printer->queue->jobs, &job->entry); *pcbNeeded = (len + 1) * sizeof(WCHAR) + sizeof(*addjob); @@ -2852,6 +2855,7 @@ BOOL WINAPI SetJobW(HANDLE hPrinter, DWORD JobId, DWORD Level, { BOOL ret = FALSE; job_t *job; + DWORD size; TRACE("(%p, %d, %d, %p, %d)\n", hPrinter, JobId, Level, pJob, Command); FIXME("Ignoring everything other than document title\n"); @@ -2877,6 +2881,15 @@ BOOL WINAPI SetJobW(HANDLE hPrinter, DWORD JobId, DWORD Level, JOB_INFO_2W *info2 = (JOB_INFO_2W*)pJob; HeapFree(GetProcessHeap(), 0, job->document_title); job->document_title = strdupW(info2->pDocument); + HeapFree(GetProcessHeap(), 0, job->devmode); + if (info2->pDevMode) + { + size = info2->pDevMode->dmSize + info2->pDevMode->dmDriverExtra; + job->devmode = HeapAlloc(GetProcessHeap(), 0, size); + memcpy(job->devmode, info2->pDevMode, size); + } + else + job->devmode = NULL; break; } case 3: @@ -7099,8 +7112,11 @@ static BOOL get_job_info_2(job_t *job, JOB_INFO_2W *ji2, LPBYTE buf, DWORD cbBuf LPDWORD pcbNeeded, BOOL unicode) { DWORD size, left = cbBuf; + DWORD shift; BOOL space = (cbBuf > 0); LPBYTE ptr = buf; + LPDEVMODEA dmA; + LPDEVMODEW devmode; *pcbNeeded = 0; @@ -7134,6 +7150,43 @@ static BOOL get_job_info_2(job_t *job, JOB_INFO_2W *ji2, LPBYTE buf, DWORD cbBuf *pcbNeeded += size; } + if (job->devmode) + { + if (!unicode) + { + dmA = DEVMODEdupWtoA(job->devmode); + devmode = (LPDEVMODEW) dmA; + if (dmA) size = dmA->dmSize + dmA->dmDriverExtra; + } + else + { + devmode = job->devmode; + size = devmode->dmSize + devmode->dmDriverExtra; + } + + if (!devmode) + FIXME("Can't convert DEVMODE W to A\n"); + else + { + /* align DEVMODE to a DWORD boundary */ + shift= (4 - ( (DWORD_PTR) ptr & 3)) & 3; + size += shift; + + if (size <= left) + { + ptr += shift; + memcpy(ptr, devmode, size-shift); + ji2->pDevMode = (LPDEVMODEW)ptr; + if (!unicode) HeapFree(GetProcessHeap(), 0, dmA); + ptr += size; + left -= size; + } + else + space = FALSE; + *pcbNeeded +=size; + } + } + return space; } @@ -7570,6 +7623,7 @@ BOOL WINAPI ScheduleJob( HANDLE hPrinter, DWORD dwJobID ) HeapFree(GetProcessHeap(), 0, job->printer_name); HeapFree(GetProcessHeap(), 0, job->portname); HeapFree(GetProcessHeap(), 0, job->filename); + HeapFree(GetProcessHeap(), 0, job->devmode); HeapFree(GetProcessHeap(), 0, job); break; }

1 0

Misha Koshelev : d3dx9_36: D3DXDeclaratorFromFVF returns D3DERR_INVALIDCALL when an invalid declarator is passed .
by Alexandre Julliard 23 Sep '10

23 Sep '10

Module: wine Branch: master Commit: a6f2c003a3ec264132b7a92415924aff817a0c56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6f2c003a3ec264132b7a9241… Author: Misha Koshelev <misha680(a)gmail.com> Date: Wed Sep 22 18:42:48 2010 -0500 d3dx9_36: D3DXDeclaratorFromFVF returns D3DERR_INVALIDCALL when an invalid declarator is passed. --- dlls/d3dx9_36/mesh.c | 2 ++ dlls/d3dx9_36/tests/mesh.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 844d521..166000f 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -559,6 +559,8 @@ HRESULT WINAPI D3DXDeclaratorFromFVF(DWORD fvf, D3DVERTEXELEMENT9 declaration[MA TRACE("fvf %#x, declaration %p.\n", fvf, declaration); + if (fvf & (D3DFVF_RESERVED0 | D3DFVF_RESERVED2)) return D3DERR_INVALIDCALL; + if (fvf & D3DFVF_POSITION_MASK) { BOOL has_blend = (fvf & D3DFVF_XYZB5) >= D3DFVF_XYZB1; diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 05df51e..c55a3c7 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -836,6 +836,8 @@ static void test_fvf_decl_conversion(void) }; test_decl_to_fvf(decl, 0, D3DERR_INVALIDCALL, __LINE__, 0); } + /* Invalid FVFs cannot be converted to a declarator. */ + test_fvf_to_decl(0xdeadbeef, NULL, D3DERR_INVALIDCALL, __LINE__, 0); } static void D3DXGetFVFVertexSizeTest(void)

1 0

Misha Koshelev : d3dx9_36: Implement D3DXCreateMeshFVF.
by Alexandre Julliard 23 Sep '10

23 Sep '10

Module: wine Branch: master Commit: e4182ead47ff4094dd397afccf3c0e5c59c05b24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4182ead47ff4094dd397afcc… Author: Misha Koshelev <misha680(a)gmail.com> Date: Wed Sep 22 18:42:57 2010 -0500 d3dx9_36: Implement D3DXCreateMeshFVF. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 17 +++++ dlls/d3dx9_36/tests/mesh.c | 140 +++++++++++++++++++++++++++++++++++++++++++ include/d3dx9mesh.h | 1 + 4 files changed, 159 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index e2e401c..133ce16 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -72,7 +72,7 @@ @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) -@ stub D3DXCreateMeshFVF +@ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) @ stub D3DXCreateNPatchMesh @ stub D3DXCreatePMeshFromStream @ stub D3DXCreatePatchMesh diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 166000f..3e5dd47 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -1038,6 +1038,23 @@ HRESULT WINAPI D3DXCreateMesh(DWORD numfaces, DWORD numvertices, DWORD options, return D3D_OK; } +/************************************************************************* + * D3DXCreateMeshFVF + */ +HRESULT WINAPI D3DXCreateMeshFVF(DWORD numfaces, DWORD numvertices, DWORD options, DWORD fvf, + LPDIRECT3DDEVICE9 device, LPD3DXMESH *mesh) +{ + HRESULT hr; + D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]; + + TRACE("(%u, %u, %u, %u, %p, %p)\n", numfaces, numvertices, options, fvf, device, mesh); + + hr = D3DXDeclaratorFromFVF(fvf, declaration); + if (FAILED(hr)) return hr; + + return D3DXCreateMesh(numfaces, numvertices, options, declaration, device, mesh); +} + HRESULT WINAPI D3DXCreateBox(LPDIRECT3DDEVICE9 device, FLOAT width, FLOAT height, FLOAT depth, LPD3DXMESH* mesh, LPD3DXBUFFER* adjacency) { diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index c55a3c7..2404024 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1208,6 +1208,145 @@ static void D3DXCreateMeshTest(void) DestroyWindow(wnd); } +static void D3DXCreateMeshFVFTest(void) +{ + HRESULT hr; + HWND wnd; + IDirect3D9 *d3d; + IDirect3DDevice9 *device, *test_device; + D3DPRESENT_PARAMETERS d3dpp; + ID3DXMesh *d3dxmesh; + int i, size; + D3DVERTEXELEMENT9 test_decl[MAX_FVF_DECL_SIZE]; + DWORD options; + struct mesh mesh; + + static const D3DVERTEXELEMENT9 decl[3] = { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {0, 12, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_NORMAL, 0}, + D3DDECL_END(), }; + + hr = D3DXCreateMeshFVF(0, 0, 0, 0, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateMeshFVF(1, 3, D3DXMESH_MANAGED, D3DFVF_XYZ | D3DFVF_NORMAL, NULL, &d3dxmesh); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + wnd = CreateWindow("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL); + if (!wnd) + { + skip("Couldn't create application window\n"); + return; + } + d3d = Direct3DCreate9(D3D_SDK_VERSION); + if (!d3d) + { + skip("Couldn't create IDirect3D9 object\n"); + DestroyWindow(wnd); + return; + } + + ZeroMemory(&d3dpp, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + if (FAILED(hr)) + { + skip("Failed to create IDirect3DDevice9 object %#x\n", hr); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); + return; + } + + hr = D3DXCreateMeshFVF(0, 3, D3DXMESH_MANAGED, D3DFVF_XYZ | D3DFVF_NORMAL, device, &d3dxmesh); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateMeshFVF(1, 0, D3DXMESH_MANAGED, D3DFVF_XYZ | D3DFVF_NORMAL, device, &d3dxmesh); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateMeshFVF(1, 3, 0, D3DFVF_XYZ | D3DFVF_NORMAL, device, &d3dxmesh); + ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); + + if (hr == D3D_OK) + { + d3dxmesh->lpVtbl->Release(d3dxmesh); + } + + hr = D3DXCreateMeshFVF(1, 3, D3DXMESH_MANAGED, 0xdeadbeef, device, &d3dxmesh); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateMeshFVF(1, 3, D3DXMESH_MANAGED, D3DFVF_XYZ | D3DFVF_NORMAL, device, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateMeshFVF(1, 3, D3DXMESH_MANAGED, D3DFVF_XYZ | D3DFVF_NORMAL, device, &d3dxmesh); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + + if (hr == D3D_OK) + { + /* device */ + hr = d3dxmesh->lpVtbl->GetDevice(d3dxmesh, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = d3dxmesh->lpVtbl->GetDevice(d3dxmesh, &test_device); + ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); + ok(test_device == device, "Got result %p, expected %p\n", test_device, device); + + if (hr == D3D_OK) + { + IDirect3DDevice9_Release(device); + } + + /* declaration */ + hr = d3dxmesh->lpVtbl->GetDeclaration(d3dxmesh, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = d3dxmesh->lpVtbl->GetDeclaration(d3dxmesh, test_decl); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + + if (hr == D3D_OK) + { + size = sizeof(decl) / sizeof(decl[0]); + for (i = 0; i < size - 1; i++) + { + ok(test_decl[i].Stream == decl[i].Stream, "Returned stream %d, expected %d\n", test_decl[i].Stream, decl[i].Stream); + ok(test_decl[i].Type == decl[i].Type, "Returned type %d, expected %d\n", test_decl[i].Type, decl[i].Type); + ok(test_decl[i].Method == decl[i].Method, "Returned method %d, expected %d\n", test_decl[i].Method, decl[i].Method); + ok(test_decl[i].Usage == decl[i].Usage, "Returned usage %d, expected %d\n", test_decl[i].Usage, decl[i].Usage); + ok(test_decl[i].UsageIndex == decl[i].UsageIndex, "Returned usage index %d, expected %d\n", + test_decl[i].UsageIndex, decl[i].UsageIndex); + ok(test_decl[i].Offset == decl[i].Offset, "Returned offset %d, expected %d\n", test_decl[i].Offset, decl[i].Offset); + } + ok(decl[size-1].Stream == 0xFF, "Returned too long vertex declaration\n"); /* end element */ + } + + /* options */ + options = d3dxmesh->lpVtbl->GetOptions(d3dxmesh); + ok(options == D3DXMESH_MANAGED, "Got result %x, expected %x (D3DXMESH_MANAGED)\n", options, D3DXMESH_MANAGED); + + /* rest */ + if (!new_mesh(&mesh, 3, 1)) + { + skip("Couldn't create mesh\n"); + } + else + { + memset(mesh.vertices, 0, mesh.number_of_vertices * sizeof(*mesh.vertices)); + memset(mesh.faces, 0, mesh.number_of_faces * sizeof(*mesh.faces)); + mesh.fvf = D3DFVF_XYZ | D3DFVF_NORMAL; + + compare_mesh("createmeshfvf", d3dxmesh, &mesh); + + free_mesh(&mesh); + } + + d3dxmesh->lpVtbl->Release(d3dxmesh); + } + + IDirect3DDevice9_Release(device); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); +} + struct sincos_table { float *sin; @@ -1624,6 +1763,7 @@ START_TEST(mesh) D3DXGetFVFVertexSizeTest(); D3DXIntersectTriTest(); D3DXCreateMeshTest(); + D3DXCreateMeshFVFTest(); D3DXCreateSphereTest(); test_get_decl_length(); test_get_decl_vertex_size(); diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 02dc7a9..de34dd3 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -151,6 +151,7 @@ extern "C" { #endif HRESULT WINAPI D3DXCreateMesh(DWORD, DWORD, DWORD, CONST D3DVERTEXELEMENT9 *, LPDIRECT3DDEVICE9, LPD3DXMESH *); +HRESULT WINAPI D3DXCreateMeshFVF(DWORD, DWORD, DWORD, DWORD, LPDIRECT3DDEVICE9, LPD3DXMESH *); HRESULT WINAPI D3DXCreateBuffer(DWORD, LPD3DXBUFFER*); UINT WINAPI D3DXGetDeclLength(const D3DVERTEXELEMENT9 *decl); UINT WINAPI D3DXGetDeclVertexSize(const D3DVERTEXELEMENT9 *decl, DWORD stream_idx);

1 0

Luca Bennati : winecfg: Fix Italian translation.
by Alexandre Julliard 23 Sep '10

23 Sep '10

Module: wine Branch: master Commit: 703a79dce049cf8f98a6dd092fd1eade67098d80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=703a79dce049cf8f98a6dd092… Author: Luca Bennati <lucak3(a)gmail.com> Date: Thu Sep 23 13:24:05 2010 +0200 winecfg: Fix Italian translation. --- programs/winecfg/It.rc | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/programs/winecfg/It.rc b/programs/winecfg/It.rc index f4d8b87..d27433f 100644 --- a/programs/winecfg/It.rc +++ b/programs/winecfg/It.rc @@ -77,9 +77,9 @@ BEGIN CONTROL "Le applicazioni Direct&X impediscono al mouse di lasciare la finestra",IDC_DX_MOUSE_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 una scrivania virtuale",IDC_ENABLE_DESKTOP,"Button", + CONTROL "&Emula un desktop virtuale",IDC_ENABLE_DESKTOP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,15,56,230,8 - LTEXT "Dimensione della Scrivania:",IDC_DESKTOP_SIZE,15,70,44,8,WS_DISABLED + LTEXT "Dimensione del desktop:",IDC_DESKTOP_SIZE,15,70,44,8,WS_DISABLED LTEXT "X",IDC_DESKTOP_BY,109,70,8,8,WS_DISABLED EDITTEXT IDC_DESKTOP_WIDTH,64,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED EDITTEXT IDC_DESKTOP_HEIGHT,117,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED @@ -101,7 +101,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Sostituzioni di DLL ",IDC_STATIC,8,4,244,210 - LTEXT "Le Dynamic Link Libraries possono essere specificate individualmente per essere builtin (fornite da Wine) o native (prese da Windows o fornite dall'applicazione)." + LTEXT "Le Dynamic Link Libraries possono essere specificate individualmente per essere integrate (fornite da Wine) o native (prese da Windows o fornite dall'applicazione)." ,IDC_STATIC,16,16,220,32 LTEXT "&Nuova sostituzione per la libreria:",IDC_STATIC,16,48,100,8 COMBOBOX IDC_DLLCOMBO,16,58,140,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP | CBS_SORT | CBS_LOWERCASE @@ -118,10 +118,10 @@ CAPTION "Modifica sostituzione" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Carica l'ordine ",IDC_STATIC,8,4,94,66 - CONTROL "&Builtin (Wine)",IDC_RAD_BUILTIN,"Button", BS_AUTORADIOBUTTON | WS_GROUP,16,14,75,10 + CONTROL "&Integrata (Wine)",IDC_RAD_BUILTIN,"Button", BS_AUTORADIOBUTTON | WS_GROUP,16,14,75,10 CONTROL "&Nativa (Windows)",IDC_RAD_NATIVE,"Button", BS_AUTORADIOBUTTON,16,24,75,10 - CONTROL "B&uiltin poi Nativa",IDC_RAD_BUILTIN_NATIVE,"Button", BS_AUTORADIOBUTTON,16,34,75,10 - CONTROL "N&ativa poi Builtin",IDC_RAD_NATIVE_BUILTIN,"Button", BS_AUTORADIOBUTTON,16,44,75,10 + 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 PUSHBUTTON "Annulla",IDCANCEL,57,74,45,14,WS_GROUP @@ -228,7 +228,7 @@ BEGIN IDS_TAB_GRAPHICS "Grafica" IDS_TAB_DESKTOP_INTEGRATION "Integrazione del desktop" IDS_TAB_AUDIO "Audio" - IDS_TAB_ABOUT "Riguardo A" + IDS_TAB_ABOUT "Riguardo a" IDS_WINECFG_TITLE "Configurazione di Wine" IDS_WINECFG_TITLE_APP "Configurazione di Wine per %s" IDS_THEMEFILE "File del tema (*.msstyles; *.theme)" @@ -242,10 +242,10 @@ STRINGTABLE BEGIN IDS_DLL_WARNING "Cambiare l'ordine di caricamento di questa libreria non è raccomandato.\nSei sicuro di volerlo fare?" IDS_DLL_WARNING_CAPTION "Attenzione: libreria di sistema" - IDS_DLL_NATIVE "native" - IDS_DLL_BUILTIN "builtin" - IDS_DLL_NATIVE_BUILTIN "native, builtin" - IDS_DLL_BUILTIN_NATIVE "builtin, native" + IDS_DLL_NATIVE "nativa" + IDS_DLL_BUILTIN "integrata" + IDS_DLL_NATIVE_BUILTIN "nativa, integrata" + IDS_DLL_BUILTIN_NATIVE "integrata, nativa" IDS_DLL_DISABLED "disabilitato" IDS_DEFAULT_SETTINGS "Impostazioni predefinite" IDS_EXECUTABLE_FILTER "Programmi di Wine (*.exe,*.exe.so)\0*.exe;*.exe.so\0"

1 0

Luca Bennati : reg: Update Italian translation.
by Alexandre Julliard 23 Sep '10

23 Sep '10

Module: wine Branch: master Commit: c12965b7e945414f67362bc46d4a9ef47550355b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c12965b7e945414f67362bc46… Author: Luca Bennati <lucak3(a)gmail.com> Date: Thu Sep 23 13:27:43 2010 +0200 reg: Update Italian translation. --- programs/reg/It.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/reg/It.rc b/programs/reg/It.rc index 09d38fd..0a79a7d 100644 --- a/programs/reg/It.rc +++ b/programs/reg/It.rc @@ -35,6 +35,6 @@ STRINGTABLE STRING_SUCCESS, "Operazione completata con successo\n" STRING_INVALID_KEY, "Errore: nome della chiave non valido\n" STRING_INVALID_CMDLINE, "Errore: parametri della linea di comando non validi\n" - STRING_NO_REMOTE, "Errore: Impossibile aggiungere chiavi alla macchina remota\n" - STRING_CANNOT_FIND, "Errore: Il sistema non è riuscito a trovare la chiave di registro o il valore specificati\n" + STRING_NO_REMOTE, "Errore: impossibile aggiungere chiavi alla macchina remota\n" + STRING_CANNOT_FIND, "Errore: il sistema non è riuscito a trovare la chiave di registro o il valore specificati\n" }

1 0

Luca Bennati : wordpad: Update Italian translation.
by Alexandre Julliard 23 Sep '10

23 Sep '10

Module: wine Branch: master Commit: 112f7db1792ed2f2fe24260aeaded2ec0e2c0573 URL: http://source.winehq.org/git/wine.git/?a=commit;h=112f7db1792ed2f2fe24260ae… Author: Luca Bennati <lucak3(a)gmail.com> Date: Thu Sep 23 14:08:47 2010 +0200 wordpad: Update Italian translation. --- programs/wordpad/It.rc | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/wordpad/It.rc b/programs/wordpad/It.rc index a19bc64..79278d5 100644 --- a/programs/wordpad/It.rc +++ b/programs/wordpad/It.rc @@ -54,7 +54,7 @@ BEGIN MENUITEM "Trova s&uccessivo\tF3", ID_FIND_NEXT MENUITEM "S&ostituisci...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR - MENUITEM "Solo &Lettura", ID_EDIT_READONLY + MENUITEM "Sola &lettura", ID_EDIT_READONLY MENUITEM "&Modificato", ID_EDIT_MODIFIED MENUITEM SEPARATOR POPUP "E&xtra" @@ -71,7 +71,7 @@ BEGIN MENUITEM "Barra degli &strumenti", ID_TOGGLE_TOOLBAR MENUITEM "Barra del &formato", ID_TOGGLE_FORMATBAR MENUITEM "&Righello", ID_TOGGLE_RULER - MENUITEM "Barra dello s&tato", ID_TOGGLE_STATUSBAR + MENUITEM "Barra di s&tato", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR MENUITEM "&Opzioni...", ID_VIEWPROPERTIES END @@ -119,8 +119,8 @@ BEGIN MENUITEM "Verde" ID_COLOR_GREEN MENUITEM "Verde oliva" ID_COLOR_OLIVE MENUITEM "Blu oltremare" ID_COLOR_NAVY - MENUITEM "Propora" ID_COLOR_PURPLE - MENUITEM "Teal" ID_COLOR_TEAL + MENUITEM "Porpora" ID_COLOR_PURPLE + MENUITEM "Foglia di Tè" ID_COLOR_TEAL MENUITEM "Grigio" ID_COLOR_GRAY MENUITEM "Argento" ID_COLOR_SILVER MENUITEM "Rosso" ID_COLOR_RED @@ -128,9 +128,9 @@ BEGIN MENUITEM "Giallo" ID_COLOR_YELLOW MENUITEM "Blu" ID_COLOR_BLUE MENUITEM "Fucsia" ID_COLOR_FUCHSIA - MENUITEM "Aqua" ID_COLOR_AQUA + MENUITEM "Acqua" ID_COLOR_AQUA MENUITEM "Bianco" ID_COLOR_WHITE - MENUITEM "Automatico" ID_COLOR_AUTOMATIC + MENUITEM "Automatico" ID_COLOR_AUTOMATIC END END @@ -201,13 +201,13 @@ BEGIN CHECKBOX "Barra degli &strumenti", IDC_PAGEFMT_TB, 180, 20, 80, 15 CHECKBOX "Barra del &formato", IDC_PAGEFMT_FB, 180, 38, 80, 15 CHECKBOX "&Righello", IDC_PAGEFMT_RU, 180, 56, 80, 15 - CHECKBOX "Barra dello s&tato", IDC_PAGEFMT_SB, 180, 74, 80, 15 + CHECKBOX "Barra di s&tato", IDC_PAGEFMT_SB, 180, 74, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END STRINGTABLE BEGIN - STRING_ALL_FILES, "Tutti i files (*.*)" + STRING_ALL_FILES, "Tutti i file (*.*)" STRING_TEXT_FILES_TXT, "File di testo (*.txt)" STRING_TEXT_FILES_UNICODE_TXT, "File di testo Unicode (*.txt)" STRING_RICHTEXT_FILES_RTF, "Formato rich text (*.rtf)"

1 0

Luca Bennati : winemine: Update Italian translation.
by Alexandre Julliard 23 Sep '10

23 Sep '10

Module: wine Branch: master Commit: dff754f5a096890deffd8dd991daa1b2b2d97f60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dff754f5a096890deffd8dd99… Author: Luca Bennati <lucak3(a)gmail.com> Date: Thu Sep 23 13:46:34 2010 +0200 winemine: Update Italian translation. --- programs/winemine/It.rc | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/winemine/It.rc b/programs/winemine/It.rc index ec4da79..d95ad93 100644 --- a/programs/winemine/It.rc +++ b/programs/winemine/It.rc @@ -23,6 +23,9 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE { @@ -82,7 +85,7 @@ CAPTION "Congratulazioni!" DLG_CUSTOM DIALOG 0, 0, 100, 100 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "Gioco Personalizzato" +CAPTION "Gioco personalizzato" { LTEXT "Righe", -1, 5, 5, 30, 10 LTEXT "Colonne", -1, 5, 35, 30, 10

1 0

Luca Bennati : xcopy: Fix Italian translation.
by Alexandre Julliard 23 Sep '10

23 Sep '10

Module: wine Branch: master Commit: 0c6c63891f25982f303af87c26143716b001b8ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c6c63891f25982f303af87c2… Author: Luca Bennati <lucak3(a)gmail.com> Date: Thu Sep 23 14:13:53 2010 +0200 xcopy: Fix Italian translation. --- programs/xcopy/It.rc | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/xcopy/It.rc b/programs/xcopy/It.rc index fa2d75a..03efbb8 100644 --- a/programs/xcopy/It.rc +++ b/programs/xcopy/It.rc @@ -31,7 +31,7 @@ STRINGTABLE STRING_INVPARMS, "Numero non valido di parametri - Digita xcopy /? per l'aiuto\n" STRING_INVPARM, "Parametro '%s' non valido - Digita xcopy /? per l'aiuto\n" STRING_PAUSE, "Premi Invio per iniziare a copiare\n" - STRING_SIMCOPY, "%d file sarebbero copiati\n" + STRING_SIMCOPY, "%d file saranno copiati\n" STRING_COPY, "%d file copiato/i\n" STRING_QISDIR, "'%s' è il nome di un file o una cartella\n" \ "nell'obiettivo?\n" \ @@ -59,18 +59,18 @@ Dove:\n\ [/I] Assume una cartella se la destinazione non esiste e sono copiati 2 o\n\ \tpiù file\n\ [/S] Copia le cartelle e le sottocartelle\n\ -[/E] Copia le cartelle e le sottocartelle, includendo quelle vuote\n\ +[/E] Copia le cartelle e le sottocartelle, incluse quelle vuote\n\ [/Q] Non mostra i nomi durante la copia, modalità silenziosa.\n\ [/F] Mostra i nomi completi della sorgente e della destinazione durante la copia\n\ -[/L] Simula l'operazione, mostrando i nome che sarebbero copiati\n\ +[/L] Simula l'operazione, mostrando i nomi che sarebbero copiati\n\ [/W] Richiede prima di iniziare l'operazione di copia\n\ -[/T] Crea la struttura di cartelle vuote ma non copia i files\n\ -[/Y] Disabilita le conferme quando sono sovrascritti files\n\ -[/-Y] Abilita le conferme quando sono sovrascritti files\n\ +[/T] Crea la struttura di cartelle vuote ma non copia i file\n\ +[/Y] Disabilita le conferme quando sono sovrascritti dei file\n\ +[/-Y] Abilita le conferme quando sono sovrascritti dei file\n\ [/P] Chiede conferma per ogni file sorgente prima di copiare\n\ [/N] Copia usando i nomi abbreviati\n\ [/U] Copia solo files che sono già presenti nella destinazione\n\ -[/R] Sovrascrive ogni file che abbia l'attributo Sola Lettura\n\ +[/R] Sovrascrive ogni file che abbia l'attributo Sola lettura\n\ [/H] Include i file nascosti e di sistema nella copia\n\ [/C] Continua anche se accade un errore durante la copia\n\ [/A] Copia solo i file che abbiano l'attributo Archivio\n\

1 0

Luca Bennati : start: Fix Italian translation.
by Alexandre Julliard 23 Sep '10

23 Sep '10

Module: wine Branch: master Commit: 84b84f776a730e993740cae9803a27b19583a1ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=84b84f776a730e993740cae98… Author: Luca Bennati <lucak3(a)gmail.com> Date: Thu Sep 23 12:45:12 2010 +0200 start: Fix Italian translation. --- programs/start/It.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/start/It.rc b/programs/start/It.rc index 3010a57..9a5e871 100644 --- a/programs/start/It.rc +++ b/programs/start/It.rc @@ -30,7 +30,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE { -STRING_USAGE, "Avvia un programma, o apri un documento con il programma normalmente usato per i files con quell'estensione\n\ +STRING_USAGE, "Avvia un programma, o apri un documento con il programma normalmente usato per i file con quell'estensione\n\ Usage:\n\ start [opzioni] nome_programma [...]\n\ start [opzioni] nome_documento\n\ @@ -40,7 +40,7 @@ Options:\n\ /MAX[imized] Avvia il programma massimizato.\n\ /R[estored] Avvia il programma normalmente (né minimizzato né massimizzato).\n\ /W[ait] Attendi l'uscita del programma, poi esci con il suo codice di uscita.\n\ -/Unix Usa un nome file Unix e apre il file come windows explorer.\n\ +/Unix Usa un nome file Unix e apre il file come Windows Explorer.\n\ /ProgIDOpen Apri un documento usando il seguente progID.\n\ /L Mostra l'accordo di licenza con l'utente finale.\n\ \n\

1 0