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

Nikolay Sivov : comctl32/imagelist: Remove parameter check from IImageList_GetBkColor().
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: 1c82b3491a93ac6f1473260533d435968145504a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c82b3491a93ac6f147326053… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 21 19:20:11 2010 +0400 comctl32/imagelist: Remove parameter check from IImageList_GetBkColor(). --- dlls/comctl32/imagelist.c | 7 +------ dlls/comctl32/tests/imagelist.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 7133d2f..f110787 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3467,9 +3467,6 @@ static HRESULT WINAPI ImageListImpl_SetBkColor(IImageList *iface, COLORREF clrBk static HRESULT WINAPI ImageListImpl_GetBkColor(IImageList *iface, COLORREF *pclr) { - if (!pclr) - return E_FAIL; - *pclr = ImageList_GetBkColor((HIMAGELIST) iface); return S_OK; } @@ -3649,11 +3646,9 @@ static HRESULT ImageListImpl_CreateInstance(const IUnknown *pUnkOuter, REFIID ii if (pUnkOuter) return CLASS_E_NOAGGREGATION; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(struct _IMAGELIST)); + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct _IMAGELIST)); if (!This) return E_OUTOFMEMORY; - ZeroMemory(This, sizeof(struct _IMAGELIST)); - This->lpVtbl = &ImageListImpl_Vtbl; This->ref = 1; diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 210f9ec..dc1c0c8 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1811,6 +1811,28 @@ if (0) IImageList_Release(imgl); } +static void test_IImageList_GetBkColor(void) +{ + IImageList *imgl; + HIMAGELIST himl; + COLORREF color; + HRESULT hr; + + himl = ImageList_Create(16, 16, ILC_COLOR16, 0, 3); + imgl = (IImageList*)himl; + +if (0) +{ + /* crashes on native */ + hr = IImageList_GetBkColor(imgl, NULL); +} + + hr = IImageList_GetBkColor(imgl, &color); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IImageList_Release(imgl); +} + START_TEST(imagelist) { ULONG_PTR ctx_cookie; @@ -1864,6 +1886,7 @@ START_TEST(imagelist) test_IImageList_Draw(); test_IImageList_Merge(); test_IImageList_Clone(); + test_IImageList_GetBkColor(); CoUninitialize();

1 0

Nikolay Sivov : comctl32/imagelist: Fix return value from IImageList_SetBkColor().
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: 9b77425f6a2bdd968f2135142ef54ee7837fcac9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b77425f6a2bdd968f2135142… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 21 19:22:34 2010 +0400 comctl32/imagelist: Fix return value from IImageList_SetBkColor(). --- dlls/comctl32/imagelist.c | 5 +---- dlls/comctl32/tests/imagelist.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index f110787..89333bf 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3458,11 +3458,8 @@ static HRESULT WINAPI ImageListImpl_SetImageCount(IImageList *iface, static HRESULT WINAPI ImageListImpl_SetBkColor(IImageList *iface, COLORREF clrBk, COLORREF *pclr) { - if (!pclr) - return E_FAIL; - *pclr = ImageList_SetBkColor((HIMAGELIST) iface, clrBk); - return *pclr == CLR_NONE ? E_FAIL : S_OK; + return S_OK; } static HRESULT WINAPI ImageListImpl_GetBkColor(IImageList *iface, COLORREF *pclr) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index dc1c0c8..ff3ada4 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1833,6 +1833,36 @@ if (0) IImageList_Release(imgl); } +static void test_IImageList_SetBkColor(void) +{ + IImageList *imgl; + HIMAGELIST himl; + COLORREF color; + HRESULT hr; + + himl = ImageList_Create(16, 16, ILC_COLOR16, 0, 3); + imgl = (IImageList*)himl; + +if (0) +{ + /* crashes on native */ + hr = IImageList_SetBkColor(imgl, RGB(0, 0, 0), NULL); +} + + hr = IImageList_SetBkColor(imgl, CLR_NONE, &color); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IImageList_SetBkColor(imgl, CLR_NONE, &color); + ok(hr == S_OK, "got 0x%08x\n", hr); + + color = 0xdeadbeef; + hr = IImageList_GetBkColor(imgl, &color); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(color == CLR_NONE, "got %x\n", color); + + IImageList_Release(imgl); +} + START_TEST(imagelist) { ULONG_PTR ctx_cookie; @@ -1887,6 +1917,7 @@ START_TEST(imagelist) test_IImageList_Merge(); test_IImageList_Clone(); test_IImageList_GetBkColor(); + test_IImageList_SetBkColor(); CoUninitialize();

1 0

Henri Verbeet : ddraw: Failing surface creation is not an internal error.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: 9364f80b8c4e5136af89ea8c1a427ed9993b6fae URL: http://source.winehq.org/git/wine.git/?a=commit;h=9364f80b8c4e5136af89ea8c1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 22 23:35:40 2010 +0200 ddraw: Failing surface creation is not an internal error. --- dlls/ddraw/ddraw.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d80dc1e..572c790 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3144,9 +3144,9 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, /* Create the first surface */ hr = ddraw_create_surface(This, &desc2, &object, 0); - if( hr != DD_OK) + if (FAILED(hr)) { - ERR("ddraw_create_surface failed, hr %#x.\n", hr); + WARN("ddraw_create_surface failed, hr %#x.\n", hr); LeaveCriticalSection(&ddraw_cs); return hr; }

1 0

Henri Verbeet : ddraw: Attaching an already attached surface is not a FIXME .
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: 866099765ae2e5039b5676ee0ee8bf15313a0570 URL: http://source.winehq.org/git/wine.git/?a=commit;h=866099765ae2e5039b5676ee0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 22 23:35:39 2010 +0200 ddraw: Attaching an already attached surface is not a FIXME. According to the tests it should simply fail. --- dlls/ddraw/surface.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 6b6b257..8583bc8 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -988,13 +988,14 @@ static HRESULT WINAPI ddraw_surface_attach_surface(IDirectDrawSurfaceImpl *This, EnterCriticalSection(&ddraw_cs); /* Check if the surface is already attached somewhere */ - if( (Surf->next_attached != NULL) || - (Surf->first_attached != Surf) ) + if (Surf->next_attached || Surf->first_attached != Surf) { - /* TODO: Test for the structure of the manual attachment. Is it a chain or a list? - * What happens if one surface is attached to 2 different surfaces? - */ - FIXME("(%p) The Surface %p is already attached somewhere else: next_attached = %p, first_attached = %p, can't handle by now\n", This, Surf, Surf->next_attached, Surf->first_attached); + /* TODO: Test for the structure of the manual attachment. Is it a + * chain or a list? What happens if one surface is attached to 2 + * different surfaces? */ + WARN("Surface %p is already attached somewhere. next_attached %p, first_attached %p.\n", + Surf, Surf->next_attached, Surf->first_attached); + LeaveCriticalSection(&ddraw_cs); return DDERR_SURFACEALREADYATTACHED; }

1 0

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

Aug. 23, 2010

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

Aug. 23, 2010

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

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

Aug. 23, 2010

Module: wine Branch: master Commit: 8dd940d0b5abcd0c227d66a4da5cb43fca70dfbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dd940d0b5abcd0c227d66a4d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 24 17:32:26 2010 -0500 gdiplus: Stub GdipTranslatePathGradientTransform. --- dlls/gdiplus/brush.c | 13 +++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index c31ed4d..6bcb63c 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1679,6 +1679,19 @@ GpStatus WINGDIPAPI GdipScalePathGradientTransform(GpPathGradient *grad, return NotImplemented; } +GpStatus WINGDIPAPI GdipTranslatePathGradientTransform(GpPathGradient *grad, + REAL dx, REAL dy, GpMatrixOrder order) +{ + static int calls; + + TRACE("(%p,%0.2f,%0.2f,%i)\n", grad, dx, dy, order); + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSetSolidFillColor(GpSolidFill *sf, ARGB argb) { TRACE("(%p, %x)\n", sf, argb); diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 4a98a43..783b984 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -613,7 +613,7 @@ @ stdcall GdipTranslateClipI(ptr long long) @ stdcall GdipTranslateLineTransform(ptr long long long) @ stdcall GdipTranslateMatrix(ptr long long long) -@ stub GdipTranslatePathGradientTransform +@ stdcall GdipTranslatePathGradientTransform(ptr long long long) @ stub GdipTranslatePenTransform @ stdcall GdipTranslateRegion(ptr long long) @ stdcall GdipTranslateRegionI(ptr long long)

1 0

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

Aug. 23, 2010

Module: wine Branch: master Commit: c3cdebcf441343775a4ce715f673aa3daea971cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3cdebcf441343775a4ce715f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 22 23:35:37 2010 +0200 ddraw: Make some lookup tables const. --- dlls/ddraw/ddraw.c | 5 +++-- dlls/ddraw/device.c | 9 ++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 73b88b6..d80dc1e 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1255,7 +1255,8 @@ static HRESULT WINAPI ddraw1_GetDisplayMode(IDirectDraw *iface, DDSURFACEDESC *s static HRESULT WINAPI ddraw7_GetFourCCCodes(IDirectDraw7 *iface, DWORD *NumCodes, DWORD *Codes) { IDirectDrawImpl *This = (IDirectDrawImpl *)iface; - WINED3DFORMAT formats[] = { + static const WINED3DFORMAT formats[] = + { WINED3DFMT_YUY2, WINED3DFMT_UYVY, WINED3DFMT_YV12, WINED3DFMT_DXT1, WINED3DFMT_DXT2, WINED3DFMT_DXT3, WINED3DFMT_DXT4, WINED3DFMT_DXT5, WINED3DFMT_ATI2N, WINED3DFMT_NVHU, WINED3DFMT_NVHS @@ -1948,7 +1949,7 @@ static HRESULT WINAPI ddraw7_EnumDisplayModes(IDirectDraw7 *iface, DWORD Flags, WINED3DDISPLAYMODE *enum_modes = NULL; unsigned enum_mode_count = 0, enum_mode_array_size = 0; - WINED3DFORMAT checkFormatList[] = + static const WINED3DFORMAT checkFormatList[] = { WINED3DFMT_B8G8R8X8_UNORM, WINED3DFMT_B5G6R5_UNORM, diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index bfd98a7..3b39177 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1122,7 +1122,8 @@ IDirect3DDeviceImpl_7_EnumTextureFormats(IDirect3DDevice7 *iface, WINED3DDISPLAYMODE mode; unsigned int i; - WINED3DFORMAT FormatList[] = { + static const WINED3DFORMAT FormatList[] = + { /* 32 bit */ WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_B8G8R8X8_UNORM, @@ -1142,7 +1143,8 @@ IDirect3DDeviceImpl_7_EnumTextureFormats(IDirect3DDevice7 *iface, WINED3DFMT_DXT5, }; - WINED3DFORMAT BumpFormatList[] = { + static const WINED3DFORMAT BumpFormatList[] = + { WINED3DFMT_R8G8_SNORM, WINED3DFMT_R5G5_SNORM_L6_UNORM, WINED3DFMT_R8G8_SNORM_L8X8_UNORM, @@ -1286,7 +1288,8 @@ IDirect3DDeviceImpl_2_EnumTextureFormats(IDirect3DDevice2 *iface, unsigned int i; WINED3DDISPLAYMODE mode; - WINED3DFORMAT FormatList[] = { + static const WINED3DFORMAT FormatList[] = + { /* 32 bit */ WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_B8G8R8X8_UNORM,

1 0

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

Aug. 23, 2010

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

Vincent Povirk : gdiplus: Set bitmap has alpha flag based on format.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: 517059f3f5b98b08d71075087dc1fe21a4e4b6c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=517059f3f5b98b08d71075087… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Fri Jul 2 17:12:07 2010 -0400 gdiplus: Set bitmap has alpha flag based on format. --- dlls/gdiplus/image.c | 4 ++ dlls/gdiplus/tests/image.c | 109 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 536eebb..7b50f53 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1742,6 +1742,10 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, (*bitmap)->stride = dib_stride; (*bitmap)->own_bits = own_bits; + /* set format-related flags */ + if (format & (PixelFormatAlpha|PixelFormatPAlpha|PixelFormatIndexed)) + (*bitmap)->image.flags |= ImageFlagsHasAlpha; + if (format == PixelFormat1bppIndexed || format == PixelFormat4bppIndexed || format == PixelFormat8bppIndexed) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 0e33049..f00d003 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -734,6 +734,115 @@ static void test_GdipGetImageFlags(void) stat = GdipGetImageFlags(img, NULL); expect(InvalidParameter, stat); + + stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat1bppIndexed, NULL, (GpBitmap**)&img); + expect(Ok, stat); + stat = GdipGetImageFlags(img, &flags); + expect(Ok, stat); + expect(ImageFlagsHasAlpha, flags); + GdipDisposeImage(img); + + stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat4bppIndexed, NULL, (GpBitmap**)&img); + expect(Ok, stat); + stat = GdipGetImageFlags(img, &flags); + expect(Ok, stat); + expect(ImageFlagsHasAlpha, flags); + GdipDisposeImage(img); + + stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat8bppIndexed, NULL, (GpBitmap**)&img); + expect(Ok, stat); + stat = GdipGetImageFlags(img, &flags); + expect(Ok, stat); + expect(ImageFlagsHasAlpha, flags); + GdipDisposeImage(img); + + stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat16bppGrayScale, NULL, (GpBitmap**)&img); + expect(Ok, stat); + stat = GdipGetImageFlags(img, &flags); + expect(Ok, stat); + expect(ImageFlagsNone, flags); + GdipDisposeImage(img); + + stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat16bppRGB555, NULL, (GpBitmap**)&img); + expect(Ok, stat); + stat = GdipGetImageFlags(img, &flags); + expect(Ok, stat); + expect(ImageFlagsNone, flags); + GdipDisposeImage(img); + + stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat16bppRGB565, NULL, (GpBitmap**)&img); + expect(Ok, stat); + stat = GdipGetImageFlags(img, &flags); + expect(Ok, stat); + expect(ImageFlagsNone, flags); + GdipDisposeImage(img); + + stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat16bppARGB1555, NULL, (GpBitmap**)&img); + expect(Ok, stat); + stat = GdipGetImageFlags(img, &flags); + expect(Ok, stat); + expect(ImageFlagsHasAlpha, flags); + GdipDisposeImage(img); + + stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat24bppRGB, NULL, (GpBitmap**)&img); + expect(Ok, stat); + stat = GdipGetImageFlags(img, &flags); + expect(Ok, stat); + expect(ImageFlagsNone, flags); + GdipDisposeImage(img); + + stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat32bppRGB, NULL, (GpBitmap**)&img); + expect(Ok, stat); + stat = GdipGetImageFlags(img, &flags); + expect(Ok, stat); + expect(ImageFlagsNone, flags); + GdipDisposeImage(img); + + stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat32bppARGB, NULL, (GpBitmap**)&img); + expect(Ok, stat); + stat = GdipGetImageFlags(img, &flags); + expect(Ok, stat); + expect(ImageFlagsHasAlpha, flags); + GdipDisposeImage(img); + + stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat32bppPARGB, NULL, (GpBitmap**)&img); + expect(Ok, stat); + stat = GdipGetImageFlags(img, &flags); + expect(Ok, stat); + expect(ImageFlagsHasAlpha, flags); + GdipDisposeImage(img); + + stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat48bppRGB, NULL, (GpBitmap**)&img); + expect(Ok, stat); + if (stat == Ok) + { + stat = GdipGetImageFlags(img, &flags); + expect(Ok, stat); + expect(ImageFlagsNone, flags); + GdipDisposeImage(img); + } + + stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat64bppARGB, NULL, (GpBitmap**)&img); + expect(Ok, stat); + if (stat == Ok) + { + expect(Ok, stat); + stat = GdipGetImageFlags(img, &flags); + expect(Ok, stat); + expect(ImageFlagsHasAlpha, flags); + GdipDisposeImage(img); + } + + stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat64bppPARGB, NULL, (GpBitmap**)&img); + expect(Ok, stat); + if (stat == Ok) + { + expect(Ok, stat); + stat = GdipGetImageFlags(img, &flags); + expect(Ok, stat); + expect(ImageFlagsHasAlpha, flags); + GdipDisposeImage(img); + } } static void test_GdipCloneImage(void)

1 0