August 2010 - Wine-Commits - list.winehq.org

Vincent Povirk : gdiplus: Stub GdipTranslatePenTransform.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: 18a4e2436894acae3722269b62272197afe65404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18a4e2436894acae3722269b6… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Fri Jul 2 16:36:21 2010 -0400 gdiplus: Stub GdipTranslatePenTransform. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pen.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 6f9cf88..2d99601 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -614,7 +614,7 @@ @ stdcall GdipTranslateLineTransform(ptr long long long) @ stdcall GdipTranslateMatrix(ptr long long long) @ stdcall GdipTranslatePathGradientTransform(ptr long long long) -@ stub GdipTranslatePenTransform +@ stdcall GdipTranslatePenTransform(ptr long long long) @ stdcall GdipTranslateRegion(ptr long long) @ stdcall GdipTranslateRegionI(ptr long long) @ stdcall GdipTranslateTextureTransform(ptr long long long) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 4fed4d2..a022cfb 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -434,6 +434,21 @@ GpStatus WINGDIPAPI GdipGetPenTransform(GpPen *pen, GpMatrix *matrix) return NotImplemented; } +GpStatus WINGDIPAPI GdipTranslatePenTransform(GpPen *pen, REAL dx, REAL dy, GpMatrixOrder order) +{ + static int calls; + + TRACE("(%p,%0.2f,%0.2f,%u)\n", pen, dx, dy, order); + + if(!pen) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipScalePenTransform(GpPen *pen, REAL sx, REAL sy, GpMatrixOrder order) { static int calls;

1 0

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

Aug. 23, 2010

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

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

Aug. 23, 2010

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

Vincent Povirk : gdiplus: Stub GdipGetPathGradientPresetBlend.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: b57c4314c1eddb11ac872d2ade0d07d65ba05cde URL: http://source.winehq.org/git/wine.git/?a=commit;h=b57c4314c1eddb11ac872d2ad… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 24 17:32:52 2010 -0500 gdiplus: Stub GdipGetPathGradientPresetBlend. --- dlls/gdiplus/brush.c | 7 +++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 6bcb63c..02d1522 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1487,6 +1487,13 @@ GpStatus WINGDIPAPI GdipSetPathGradientPresetBlend(GpPathGradient *brush, return NotImplemented; } +GpStatus WINGDIPAPI GdipGetPathGradientPresetBlend(GpPathGradient *brush, + ARGB *blend, REAL *pos, INT count) +{ + FIXME("(%p,%p,%p,%i): stub\n", brush, blend, pos, count); + return NotImplemented; +} + GpStatus WINGDIPAPI GdipGetPathGradientPresetBlendCount(GpPathGradient *brush, INT *count) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 783b984..6f9cf88 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -334,7 +334,7 @@ @ stdcall GdipGetPathGradientGammaCorrection(ptr ptr) @ stub GdipGetPathGradientPath @ stdcall GdipGetPathGradientPointCount(ptr ptr) -@ stub GdipGetPathGradientPresetBlend +@ stdcall GdipGetPathGradientPresetBlend(ptr ptr ptr long) @ stdcall GdipGetPathGradientPresetBlendCount(ptr ptr) @ stdcall GdipGetPathGradientRect(ptr ptr) @ stdcall GdipGetPathGradientRectI(ptr ptr)

1 0

Henri Verbeet : wined3d: Make some lookup tables const.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: 3fd66bc6505239c0f148e7e9dcabca691a153b38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fd66bc6505239c0f148e7e9d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 22 23:35:38 2010 +0200 wined3d: Make some lookup tables const. --- dlls/wined3d/context.c | 7 +++++-- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/utils.c | 5 +++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f80ab4f..a893348 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1114,11 +1114,14 @@ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, short redBits, greenBits, blueBits, alphaBits, colorBits; short depthBits=0, stencilBits=0; - struct match_type { + static const struct + { BOOL require_aux; BOOL exact_alpha; BOOL exact_color; - } matches[] = { + } + matches[] = + { /* First, try without alpha match buffers. MacOS supports aux buffers only * on A8R8G8B8, and we prefer better offscreen rendering over an alpha match. * Then try without aux buffers - this is the most common cause for not diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c376cbf..5b8a659 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -771,7 +771,7 @@ HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface if (surface_type == SURFACE_OPENGL) { - WINED3DFORMAT formats[] = + static const WINED3DFORMAT formats[] = { WINED3DFMT_D24_UNORM_S8_UINT, WINED3DFMT_D32_UNORM, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 086350f..e3a0cb6 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1192,8 +1192,8 @@ static BOOL color_match(DWORD c1, DWORD c2, BYTE max_diff) /* A context is provided by the caller */ static BOOL check_filter(const struct wined3d_gl_info *gl_info, GLenum internal) { + static const DWORD data[] = {0x00000000, 0xffffffff}; GLuint tex, fbo, buffer; - const DWORD data[] = {0x00000000, 0xffffffff}; DWORD readback[16 * 1]; BOOL ret = FALSE; @@ -1291,7 +1291,8 @@ static void init_format_filter_info(struct wined3d_gl_info *gl_info, enum wined3 { struct wined3d_format_desc *desc; unsigned int fmt_idx, i; - WINED3DFORMAT fmts16[] = { + static const WINED3DFORMAT fmts16[] = + { WINED3DFMT_R16_FLOAT, WINED3DFMT_R16G16_FLOAT, WINED3DFMT_R16G16B16A16_FLOAT,

1 0

Luca Bennati : winhlp32: Fix Italian translation.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

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

Gerald Pfeifer : d3dx9_36: Simplify instr_ps_1_0123_texld.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

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

Luca Bennati : winecfg: Fix Italian translation.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

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 Aug. 23, 2010

Aug. 23, 2010

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

Luca Bennati : taskmgr: Fix Italian translation.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

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