wine-commits August 2010

wine-commits@winehq.org

2 participants
884 discussions

Damjan Jovanovic : winemenubuilder: Defer best icon selection to when we generate the native icons.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: d58f2680d1d0320b01cb88d736523cf521f6adc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d58f2680d1d0320b01cb88d73… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Aug 22 19:46:51 2010 +0200 winemenubuilder: Defer best icon selection to when we generate the native icons. --- programs/winemenubuilder/winemenubuilder.c | 162 ++++++++++++++++------------ 1 files changed, 91 insertions(+), 71 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 445fe53..8941cbf 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -301,54 +301,108 @@ end: return SUCCEEDED(hr); } -static IStream* module_icon_to_stream(GRPICONDIRENTRY *grpIconDirEntry, BITMAPINFO *pIcon) +static IStream *add_module_icons_to_stream(HMODULE hModule, GRPICONDIR *grpIconDir) { - SIZE_T size; - HGLOBAL hGlobal = NULL; + int i; + SIZE_T iconsSize = 0; + BYTE *icons = NULL; + ICONDIRENTRY *iconDirEntries = NULL; IStream *stream = NULL; - char *p; - ICONDIR *pIconDir; - ICONDIRENTRY *pIconDirEntry; HRESULT hr = E_FAIL; + ULONG bytesWritten; + ICONDIR iconDir; + SIZE_T iconOffset; + int validEntries = 0; + LARGE_INTEGER zero; - size = sizeof(ICONDIR) + sizeof(ICONDIRENTRY) + grpIconDirEntry->dwBytesInRes; - hGlobal = GlobalAlloc(GMEM_MOVEABLE, size); - if (hGlobal == NULL) + for (i = 0; i < grpIconDir->idCount; i++) + iconsSize += grpIconDir->idEntries[i].dwBytesInRes; + icons = HeapAlloc(GetProcessHeap(), 0, iconsSize); + if (icons == NULL) { WINE_ERR("out of memory allocating icon\n"); goto end; } - p = GlobalLock(hGlobal); - pIconDir = (ICONDIR*)p; - pIconDir->idReserved = 0; - pIconDir->idType = 1; - pIconDir->idCount = 1; - p += sizeof(ICONDIR); - pIconDirEntry = (ICONDIRENTRY*)p; - pIconDirEntry->bWidth = grpIconDirEntry->bWidth; - pIconDirEntry->bHeight = grpIconDirEntry->bHeight; - pIconDirEntry->bColorCount = grpIconDirEntry->bColorCount; - pIconDirEntry->bReserved = grpIconDirEntry->bReserved; - pIconDirEntry->wPlanes = grpIconDirEntry->wPlanes; - pIconDirEntry->wBitCount = grpIconDirEntry->wBitCount; - pIconDirEntry->dwBytesInRes = grpIconDirEntry->dwBytesInRes; - pIconDirEntry->dwImageOffset = sizeof(ICONDIR) + sizeof(ICONDIRENTRY); - p += sizeof(ICONDIRENTRY); - memcpy(p, pIcon, grpIconDirEntry->dwBytesInRes); - GlobalUnlock(hGlobal); - - hr = CreateStreamOnHGlobal(hGlobal, TRUE, &stream); + iconDirEntries = HeapAlloc(GetProcessHeap(), 0, grpIconDir->idCount*sizeof(ICONDIRENTRY)); + if (iconDirEntries == NULL) + { + WINE_ERR("out of memory allocating icon dir entries\n"); + goto end; + } + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); if (FAILED(hr)) { - WINE_ERR("could not create stream on icon hglobal, error 0x%08X\n", hr); + WINE_ERR("error creating icon stream\n"); + goto end; + } + + iconOffset = 0; + for (i = 0; i < grpIconDir->idCount; i++) + { + HRSRC hResInfo; + LPCWSTR lpName = MAKEINTRESOURCEW(grpIconDir->idEntries[i].nID); + if ((hResInfo = FindResourceW(hModule, lpName, (LPCWSTR)RT_ICON))) + { + HGLOBAL hResData; + if ((hResData = LoadResource(hModule, hResInfo))) + { + BITMAPINFO *pIcon; + if ((pIcon = LockResource(hResData))) + { + iconDirEntries[validEntries].bWidth = grpIconDir->idEntries[i].bWidth; + iconDirEntries[validEntries].bHeight = grpIconDir->idEntries[i].bHeight; + iconDirEntries[validEntries].bColorCount = grpIconDir->idEntries[i].bColorCount; + iconDirEntries[validEntries].bReserved = grpIconDir->idEntries[i].bReserved; + iconDirEntries[validEntries].wPlanes = grpIconDir->idEntries[i].wPlanes; + iconDirEntries[validEntries].wBitCount = grpIconDir->idEntries[i].wBitCount; + iconDirEntries[validEntries].dwBytesInRes = grpIconDir->idEntries[i].dwBytesInRes; + iconDirEntries[validEntries].dwImageOffset = iconOffset; + validEntries++; + memcpy(&icons[iconOffset], pIcon, grpIconDir->idEntries[i].dwBytesInRes); + iconOffset += grpIconDir->idEntries[i].dwBytesInRes; + } + FreeResource(hResData); + } + } + } + + if (validEntries == 0) + { + WINE_ERR("no valid icon entries\n"); goto end; } - hr = S_OK; + + iconDir.idReserved = 0; + iconDir.idType = 1; + iconDir.idCount = validEntries; + hr = IStream_Write(stream, &iconDir, sizeof(iconDir), &bytesWritten); + if (FAILED(hr) || bytesWritten != sizeof(iconDir)) + { + WINE_ERR("error 0x%08X writing icon stream\n", hr); + goto end; + } + for (i = 0; i < validEntries; i++) + iconDirEntries[i].dwImageOffset += sizeof(ICONDIR) + validEntries*sizeof(ICONDIRENTRY); + hr = IStream_Write(stream, iconDirEntries, validEntries*sizeof(ICONDIRENTRY), &bytesWritten); + if (FAILED(hr) || bytesWritten != validEntries*sizeof(ICONDIRENTRY)) + { + WINE_ERR("error 0x%08X writing icon dir entries to stream\n", hr); + goto end; + } + hr = IStream_Write(stream, icons, iconOffset, &bytesWritten); + if (FAILED(hr) || bytesWritten != iconOffset) + { + WINE_ERR("error 0x%08X writing icon images to stream\n", hr); + goto end; + } + zero.QuadPart = 0; + hr = IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); end: - if (hGlobal && stream == NULL) - GlobalFree(hGlobal); + HeapFree(GetProcessHeap(), 0, icons); + HeapFree(GetProcessHeap(), 0, iconDirEntries); if (FAILED(hr) && stream != NULL) { IStream_Release(stream); @@ -374,15 +428,9 @@ static HRESULT open_module_icon(LPCWSTR szFileName, int nIndex, IStream **ppStre { HMODULE hModule; HRSRC hResInfo; - LPCWSTR lpName = NULL; HGLOBAL hResData; GRPICONDIR *pIconDir; - BITMAPINFO *pIcon; ENUMRESSTRUCT sEnumRes; - int nMax = 0; - int nMaxBits = 0; - GRPICONDIRENTRY iconDirEntry = {0}; - int i; HRESULT hr = E_FAIL; hModule = LoadLibraryExW(szFileName, 0, LOAD_LIBRARY_AS_DATAFILE); @@ -418,20 +466,9 @@ static HRESULT open_module_icon(LPCWSTR szFileName, int nIndex, IStream **ppStre { if ((pIconDir = LockResource(hResData))) { - lpName = MAKEINTRESOURCEW(pIconDir->idEntries[0].nID); /* default to first entry */ - for (i = 0; i < pIconDir->idCount; i++) - { - if (pIconDir->idEntries[i].wBitCount >= nMaxBits) - { - if ((pIconDir->idEntries[i].bHeight * pIconDir->idEntries[i].bWidth) >= nMax) - { - lpName = MAKEINTRESOURCEW(pIconDir->idEntries[i].nID); - nMax = pIconDir->idEntries[i].bHeight * pIconDir->idEntries[i].bWidth; - nMaxBits = pIconDir->idEntries[i].wBitCount; - iconDirEntry = pIconDir->idEntries[i]; - } - } - } + *ppStream = add_module_icons_to_stream(hModule, pIconDir); + if (*ppStream) + hr = S_OK; } FreeResource(hResData); @@ -443,23 +480,6 @@ static HRESULT open_module_icon(LPCWSTR szFileName, int nIndex, IStream **ppStre FreeLibrary(hModule); return HRESULT_FROM_WIN32(ERROR_NOT_FOUND); } - - if ((hResInfo = FindResourceW(hModule, lpName, (LPCWSTR)RT_ICON))) - { - if ((hResData = LoadResource(hModule, hResInfo))) - { - if ((pIcon = LockResource(hResData))) - { - *ppStream = module_icon_to_stream(&iconDirEntry, pIcon); - if (*ppStream) - hr = S_OK; - else - hr = E_FAIL; - } - - FreeResource(hResData); - } - } FreeLibrary(hModule); return hr;

1 0

Damjan Jovanovic : winemenubuilder: Decouple opening a Windows icon from generating the native icon.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: bc5a2050978d63532bb052c27e60ab9968f32fa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc5a2050978d63532bb052c27… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Aug 22 19:42:18 2010 +0200 winemenubuilder: Decouple opening a Windows icon from generating the native icon. --- programs/winemenubuilder/winemenubuilder.c | 202 +++++++++++++++------------- 1 files changed, 109 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bc5a2050978d63532bb05…

1 0

Alexandre Goujon : kernel32: Fix GetComputerName errors.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: 49c5bd0365ebb32bb1bb9faf55cb587d4e407513 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c5bd0365ebb32bb1bb9faf5… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Sun Aug 22 11:40:00 2010 +0200 kernel32: Fix GetComputerName errors. --- dlls/kernel32/computername.c | 30 +++++++++++++++++++++++------- dlls/kernel32/tests/environ.c | 2 -- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/computername.c b/dlls/kernel32/computername.c index f710d7c..dabaae8 100644 --- a/dlls/kernel32/computername.c +++ b/dlls/kernel32/computername.c @@ -316,23 +316,33 @@ BOOL WINAPI GetComputerNameW(LPWSTR name,LPDWORD size) DWORD len = sizeof( buf ); LPWSTR theName = (LPWSTR) (buf + offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data )); NTSTATUS st = STATUS_INVALID_PARAMETER; + DWORD err = ERROR_SUCCESS; TRACE ("%p %p\n", name, size); _init_attr ( &attr, &nameW ); RtlInitUnicodeString( &nameW, ComputerW ); if ( ( st = NtOpenKey( &hkey, KEY_READ, &attr ) ) != STATUS_SUCCESS ) + { + err = RtlNtStatusToDosError ( st ); goto out; + } attr.RootDirectory = hkey; RtlInitUnicodeString( &nameW, ActiveComputerNameW ); if ( ( st = NtOpenKey( &hsubkey, KEY_READ, &attr ) ) != STATUS_SUCCESS ) + { + err = RtlNtStatusToDosError ( st ); goto out; + } RtlInitUnicodeString( &nameW, ComputerNameW ); if ( ( st = NtQueryValueKey( hsubkey, &nameW, KeyValuePartialInformation, buf, len, &len ) ) != STATUS_SUCCESS ) + { + err = RtlNtStatusToDosError ( st ); goto out; + } len = (len -offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data )) / sizeof (WCHAR) - 1; TRACE ("ComputerName is %s (length %u)\n", debugstr_w ( theName ), len); @@ -340,25 +350,24 @@ BOOL WINAPI GetComputerNameW(LPWSTR name,LPDWORD size) if ( *size < len + 1 ) { *size = len + 1; - st = STATUS_MORE_ENTRIES; + err = ERROR_BUFFER_OVERFLOW; } else { memcpy ( name, theName, len * sizeof (WCHAR) ); name[len] = 0; *size = len; - st = STATUS_SUCCESS; } out: NtClose ( hsubkey ); NtClose ( hkey ); - if ( st == STATUS_SUCCESS ) + if ( err == ERROR_SUCCESS ) return TRUE; else { - SetLastError ( RtlNtStatusToDosError ( st ) ); + SetLastError ( err ); WARN ( "Status %u reading computer name from registry\n", st ); return FALSE; } @@ -383,7 +392,7 @@ BOOL WINAPI GetComputerNameA(LPSTR name, LPDWORD size) if ( *size < len ) { *size = len; - SetLastError( ERROR_MORE_DATA ); + SetLastError( ERROR_BUFFER_OVERFLOW ); ret = FALSE; } else @@ -415,7 +424,11 @@ BOOL WINAPI GetComputerNameExA(COMPUTER_NAME_FORMAT type, LPSTR name, LPDWORD si { case ComputerNameNetBIOS: case ComputerNamePhysicalNetBIOS: - return GetComputerNameA (name, size); + ret = GetComputerNameA (name, size); + if (!ret && GetLastError() == ERROR_BUFFER_OVERFLOW) + SetLastError( ERROR_MORE_DATA ); + return ret; + case ComputerNameDnsHostname: case ComputerNamePhysicalDnsHostname: ret = dns_hostname (buf, &len); @@ -468,7 +481,10 @@ BOOL WINAPI GetComputerNameExW( COMPUTER_NAME_FORMAT type, LPWSTR name, LPDWORD { case ComputerNameNetBIOS: case ComputerNamePhysicalNetBIOS: - return GetComputerNameW (name, size); + ret = GetComputerNameW (name, size); + if (!ret && GetLastError() == ERROR_BUFFER_OVERFLOW) + SetLastError( ERROR_MORE_DATA ); + return ret; case ComputerNameDnsHostname: case ComputerNamePhysicalDnsHostname: ret = dns_hostname (buf, &len); diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index 19d11b5..c38aef7 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -330,7 +330,6 @@ static void test_GetComputerName(void) size = 0; ret = GetComputerNameA((LPSTR)0xdeadbeef, &size); error = GetLastError(); - todo_wine ok(!ret && error == ERROR_BUFFER_OVERFLOW, "GetComputerNameA should have failed with ERROR_BUFFER_OVERFLOW instead of %d\n", error); /* Only Vista returns the computer name length as documented in the MSDN */ @@ -362,7 +361,6 @@ static void test_GetComputerName(void) win_skip("GetComputerNameW is not implemented\n"); else { - todo_wine ok(!ret && error == ERROR_BUFFER_OVERFLOW, "GetComputerNameW should have failed with ERROR_BUFFER_OVERFLOW instead of %d\n", error); size++; /* nul terminating character */ nameW = HeapAlloc(GetProcessHeap(), 0, size * sizeof(nameW[0]));

1 0

Julius Schwartzenberg : setupapi: Add stubs SetupQueryDrivesInDiskSpaceList{A, W}.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: 53aef28e36078f0eb28d925c01a9f81e9aeb94ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=53aef28e36078f0eb28d925c0… Author: Julius Schwartzenberg <julius.schwartzenberg(a)gmail.com> Date: Sat Aug 21 22:39:49 2010 +0200 setupapi: Add stubs SetupQueryDrivesInDiskSpaceList{A,W}. --- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 1b43bb9..a3dd4b0 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -469,8 +469,8 @@ @ stdcall SetupPromptForDiskA(ptr str str str str str long ptr long ptr) @ stdcall SetupPromptForDiskW(ptr wstr wstr wstr wstr wstr long ptr long ptr) @ stdcall SetupPromptReboot(ptr ptr long) -@ stub SetupQueryDrivesInDiskSpaceListA -@ stub SetupQueryDrivesInDiskSpaceListW +@ stdcall SetupQueryDrivesInDiskSpaceListA(ptr ptr long ptr) +@ stdcall SetupQueryDrivesInDiskSpaceListW(ptr ptr long ptr) @ stub SetupQueryFileLogA @ stub SetupQueryFileLogW @ stdcall SetupQueryInfFileInformationA(ptr long str long ptr) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index a37d689..fd40343 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -194,6 +194,24 @@ INT WINAPI SetupPromptReboot( HSPFILEQ file_queue, HWND owner, BOOL scan_only ) } /*********************************************************************** + * SetupQueryDrivesInDiskSpaceListA (SETUPAPI.@) + */ +BOOL WINAPI SetupQueryDrivesInDiskSpaceListA(HDSKSPC disk_space, PSTR return_buffer, DWORD return_buffer_size, PDWORD required_size) +{ + FIXME("%p, %p, %d, %p\n", disk_space, return_buffer, return_buffer_size, required_size); + return FALSE; +} + +/*********************************************************************** + * SetupQueryDrivesInDiskSpaceListW (SETUPAPI.@) + */ +BOOL WINAPI SetupQueryDrivesInDiskSpaceListW(HDSKSPC disk_space, PWSTR return_buffer, DWORD return_buffer_size, PDWORD required_size) +{ + FIXME("%p, %p, %d, %p\n", disk_space, return_buffer, return_buffer_size, required_size); + return FALSE; +} + +/*********************************************************************** * SetupSetSourceListA (SETUPAPI.@) */ BOOL WINAPI SetupSetSourceListA(DWORD flags, PCSTR *list, UINT count)

1 0

Luca Bennati : wineconsole: Fix Italian translation.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: c48087756fe21e3c4095f163927e999083cc2123 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c48087756fe21e3c4095f1639… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sat Aug 21 19:33:03 2010 +0200 wineconsole: Fix Italian translation. --- programs/wineconsole/wineconsole_It.rc | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/programs/wineconsole/wineconsole_It.rc b/programs/wineconsole/wineconsole_It.rc index dad2930..36e568b 100644 --- a/programs/wineconsole/wineconsole_It.rc +++ b/programs/wineconsole/wineconsole_It.rc @@ -26,9 +26,9 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN IDS_EDIT, "&Modifica" -IDS_DEFAULT, "Imposta &Default" +IDS_DEFAULT, "Imposta pre&definite" IDS_PROPERTIES, "&Proprietà" -IDS_MARK, "Mark&" +IDS_MARK, "Ma&rca" IDS_COPY, "&Copia" IDS_PASTE, "&Incolla" IDS_SELECTALL, "&Seleziona tutto" @@ -36,16 +36,16 @@ 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, "Questa è una prova" -IDS_DLG_TIT_DEFAULT, "Impostazioni di Default" +IDS_DLG_TIT_DEFAULT, "Impostazioni predefinite" 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_CMD_INVALID_EVENT_ID "wineconsole: impossibile parse event id\n" +IDS_CMD_INVALID_EVENT_ID "wineconsole: impossibile analizzare id evento\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"\ +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" @@ -66,11 +66,11 @@ FONT 8, "MS Shell Dlg" AUTORADIOBUTTON "&Grande", IDC_OPT_CURSOR_LARGE, 14, 43, 44, 10, WS_TABSTOP GROUPBOX "Controlli", -1, 75, 11, 125, 44, BS_GROUPBOX - LTEXT "Popup menu", -1, 79, 23, 40, 10 - AUTOCHECKBOX "&Control", IDC_OPT_CONF_CTRL, 129, 23, 60, 10, WS_TABSTOP - AUTOCHECKBOX "S&hift", IDC_OPT_CONF_SHIFT, 129, 33, 60, 10, WS_TABSTOP + LTEXT "Menu a comparsa", -1, 79, 23, 40, 10 + AUTOCHECKBOX "&Controlla", IDC_OPT_CONF_CTRL, 129, 23, 60, 10, WS_TABSTOP + AUTOCHECKBOX "Sco&rri", IDC_OPT_CONF_SHIFT, 129, 33, 60, 10, WS_TABSTOP LTEXT "Modifica rapida", -1, 79, 43, 50, 10 - AUTOCHECKBOX "&abilita", IDC_OPT_QUICK_EDIT, 129, 43, 60, 10, WS_TABSTOP + AUTOCHECKBOX "&Abilita", IDC_OPT_QUICK_EDIT, 129, 43, 60, 10, WS_TABSTOP GROUPBOX "Cronologia", -1, 10, 57, 190, 35, BS_GROUPBOX LTEXT "&Numero di comandi richiamati :", -1, 14, 67, 78, 18 @@ -84,9 +84,9 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION " Carattere " FONT 8, "MS Shell Dlg" { - LTEXT "&Font", -1, 5, 5, 24, 8 + LTEXT "&Carattere", -1, 5, 5, 24, 8 LISTBOX IDC_FNT_LIST_FONT, 5, 18, 90, 42, LBS_SORT|WS_VSCROLL - LTEXT "&Colore", -1, 100, 5, 50, 8 + LTEXT "C&olore", -1, 100, 5, 50, 8 CONTROL "", IDC_FNT_COLOR_FG, "WineConColorPreview", 0L, 100, 18, 48, 16 CONTROL "", IDC_FNT_COLOR_BK, "WineConColorPreview", 0L, 100, 40, 48, 16 LTEXT "&Dimensione", -1, 158, 5, 40, 8 @@ -133,5 +133,5 @@ FONT 8, "MS Shell Dlg" AUTORADIOBUTTON "Modifica solo la sessione corrente", IDC_SAV_SESSION, 14, 27, 110, 10, WS_TABSTOP PUSHBUTTON "OK", IDOK, 20, 45, 35, 12 - PUSHBUTTON "Cancella", IDCANCEL, 65, 45, 35, 12 + PUSHBUTTON "Annulla", IDCANCEL, 65, 45, 35, 12 }

1 0

Luca Bennati : winhlp32: Fix Italian translation.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: 4f180c91d421b10dfb0c2afb1b7e9abac5959e6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f180c91d421b10dfb0c2afb1… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sat Aug 21 19:36:58 2010 +0200 winhlp32: Fix Italian translation. --- programs/winhlp32/It.rc | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/programs/winhlp32/It.rc b/programs/winhlp32/It.rc index b146b10..14d5dbd 100644 --- a/programs/winhlp32/It.rc +++ b/programs/winhlp32/It.rc @@ -21,10 +21,11 @@ #include "winhelp_res.h" -LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL - +/* UTF-8 */ #pragma code_page(65001) +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + /* Menu */ MAIN_MENU MENU @@ -55,11 +56,11 @@ MAIN_MENU MENU MENUITEM "Cronologia", MNID_OPTS_HISTORY POPUP "Caratteri" BEGIN - MENUITEM "Piccolo", MNID_OPTS_FONTS_SMALL - MENUITEM "Normale", MNID_OPTS_FONTS_NORMAL - MENUITEM "Grande", MNID_OPTS_FONTS_LARGE + MENUITEM "Piccoli", MNID_OPTS_FONTS_SMALL + MENUITEM "Normali", MNID_OPTS_FONTS_NORMAL + MENUITEM "Grandi", MNID_OPTS_FONTS_LARGE END - MENUITEM "Usa colori di sistema", MNID_OPTS_SYSTEM_COLORS + MENUITEM "Usa i colori di sistema", MNID_OPTS_SYSTEM_COLORS } POPUP "&Aiuto" { MENUITEM "&Aiuto sulla guida", MNID_HELP_HELPON @@ -67,7 +68,7 @@ MAIN_MENU MENU MENUITEM SEPARATOR MENUITEM "&Informazioni su...", MNID_HELP_ABOUT #ifdef WINELIB - MENUITEM "&Informazioni su WINE", MNID_HELP_WINE + MENUITEM "&Informazioni su Wine", MNID_HELP_WINE #endif } } @@ -91,7 +92,7 @@ CAPTION "Cerca" /* Strings */ STRINGTABLE { -STID_WINE_HELP, "Guida di WINE" +STID_WINE_HELP, "Guida di Wine" STID_WHERROR, "ERRORE" STID_WARNING, "ATTENZIONE" STID_INFO, "Informazione" @@ -101,7 +102,7 @@ STID_INDEX, "Indice" STID_CONTENTS, "&Sommario" STID_BACK, "&Precedente" STID_ALL_FILES, "Tutti i file (*.*)" -STID_HELP_FILES_HLP, "File della Guida (*.hlp)" +STID_HELP_FILES_HLP, "File della guida (*.hlp)" STID_FILE_NOT_FOUND_s "Non è stato possibile trovare '%s'. Vuoi cercare questo file?" STID_NO_RICHEDIT "Non è stato possibile trovare un'implementazione richedit... Annullando" STID_PSH_INDEX, "Argomenti di aiuto: " @@ -116,13 +117,13 @@ BEGIN MENUITEM "Stampa...", MNID_CTXT_PRINT POPUP "Caratteri" BEGIN - MENUITEM "Piccolo", MNID_CTXT_FONTS_SMALL - MENUITEM "Normale", MNID_CTXT_FONTS_NORMAL - MENUITEM "Grande", MNID_CTXT_FONTS_LARGE + MENUITEM "Piccoli", MNID_CTXT_FONTS_SMALL + MENUITEM "Normali", MNID_CTXT_FONTS_NORMAL + MENUITEM "Grandi", MNID_CTXT_FONTS_LARGE END POPUP "Aiuto sempre visibile" BEGIN - MENUITEM "Default", MNID_CTXT_HELP_DEFAULT + MENUITEM "Predefinito", MNID_CTXT_HELP_DEFAULT MENUITEM "Visibile", MNID_CTXT_HELP_VISIBLE MENUITEM "Non visibile", MNID_CTXT_HELP_NONVISIBLE END

1 0

Luca Bennati : taskmgr: Fix Italian translation.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: 750ef1569ab275afbb967a733dac143d94e70f3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=750ef1569ab275afbb967a733… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sat Aug 21 19:27:05 2010 +0200 taskmgr: Fix Italian translation. --- programs/taskmgr/It.rc | 140 ++++++++++++++++++++++++------------------------ 1 files changed, 70 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=750ef1569ab275afbb967…

1 0

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

23 Aug '10

Module: wine Branch: master Commit: 5327cb77d14c9e6756432fc4e0d3b0d54a476499 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5327cb77d14c9e6756432fc4e… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sat Aug 21 19:11:03 2010 +0200 winecfg: Fix Italian translation. --- programs/winecfg/It.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/It.rc b/programs/winecfg/It.rc index 46a898c..35e8308 100644 --- a/programs/winecfg/It.rc +++ b/programs/winecfg/It.rc @@ -76,7 +76,7 @@ BEGIN GROUPBOX " Impostazioni delle finestre ",IDC_STATIC,8,4,244,84 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 di finestre di controllare le finestre",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,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", BS_AUTOCHECKBOX | WS_TABSTOP,15,56,230,8 LTEXT "Dimensione della Scrivania:",IDC_DESKTOP_SIZE,15,70,44,8,WS_DISABLED @@ -93,7 +93,7 @@ BEGIN CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,161,187,15 EDITTEXT IDC_RES_DPIEDIT,204,161,23,13,ES_NUMBER|WS_TABSTOP LTEXT "dpi",IDC_STATIC,235,163,10,8 - LTEXT "Questo è un testo di esempio che usa Tahoma a 10 punti",IDC_RES_FONT_PREVIEW,15,181,230,28 + LTEXT "Questo è un testo di esempio che usa il carattere Tahoma a 10 punti",IDC_RES_FONT_PREVIEW,15,181,230,28 END IDD_DLLCFG DIALOG 0, 0, 260, 220

1 0

Anders Jonsson : shell32: Update Swedish translation.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: c6e3286d716dac3b6ade2ccb1916706ab392c00a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6e3286d716dac3b6ade2ccb1… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Fri Aug 20 15:18:57 2010 +0200 shell32: Update Swedish translation. --- dlls/shell32/shell32_Sv.rc | 219 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 215 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c6e3286d716dac3b6ade2…

1 0

Gerald Pfeifer : d3dx9_36: Simplify instr_ps_1_0123_texld.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: 0fed73ef4b42dfb4e52ed2423aa0b0fa3113d24d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fed73ef4b42dfb4e52ed2423… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Aug 21 11:33:07 2010 +0200 d3dx9_36: Simplify instr_ps_1_0123_texld. --- dlls/d3dx9_36/bytecodewriter.c | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/bytecodewriter.c b/dlls/d3dx9_36/bytecodewriter.c index 07f96e7..e7bd8a5 100644 --- a/dlls/d3dx9_36/bytecodewriter.c +++ b/dlls/d3dx9_36/bytecodewriter.c @@ -1035,7 +1035,7 @@ static const struct bytecode_backend vs_1_x_backend = { static void instr_ps_1_0123_texld(struct bc_writer *This, const struct instruction *instr, struct bytecode_buffer *buffer) { - DWORD idx, srcidx; + DWORD idx; struct shader_reg reg; DWORD swizzlemask; @@ -1074,17 +1074,6 @@ static void instr_ps_1_0123_texld(struct bc_writer *This, /* map the temp dstreg to the ps_1_3 texture temporary register */ This->funcs->dstreg(This, &instr->dst, buffer, instr->shift, instr->dstmod); } else if(instr->src[0].type == BWRITERSPR_TEMP) { - if(instr->src[0].regnum == T0_REG) { - srcidx = 0; - } else if(instr->src[0].regnum == T1_REG) { - srcidx = 1; - } else if(instr->src[0].regnum == T2_REG) { - srcidx = 2; - } else if(instr->src[0].regnum == T3_REG) { - srcidx = 3; - } else { - WARN("Invalid address data source register r%u\n", instr->src[0].regnum); - } swizzlemask = (3 << BWRITERVS_SWIZZLE_SHIFT) | (3 << (BWRITERVS_SWIZZLE_SHIFT + 2)) |

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
89
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 August 2010