wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Henri Verbeet : wined3d: Create a texture_cleanup() function.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: 22022cf8b322c050fe60bedc472555876091e040 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22022cf8b322c050fe60bedc4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 2 09:01:17 2009 +0200 wined3d: Create a texture_cleanup() function. --- dlls/wined3d/texture.c | 39 +++++++++++++++++++++++++-------------- 1 files changed, 25 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 5981a33..5e50e26 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -27,6 +27,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); #define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info +static void texture_cleanup(IWineD3DTextureImpl *This, D3DCB_DESTROYSURFACEFN surface_destroy_cb) +{ + unsigned int i; + + TRACE("(%p) : Cleaning up\n", This); + + for (i = 0; i < This->baseTexture.levels; ++i) + { + if (This->surfaces[i]) + { + /* Clean out the texture name we gave to the surface so that the + * surface doesn't try and release it */ + surface_set_texture_name(This->surfaces[i], 0, TRUE); + surface_set_texture_name(This->surfaces[i], 0, FALSE); + surface_set_texture_target(This->surfaces[i], 0); + IWineD3DSurface_SetContainer(This->surfaces[i], 0); + surface_destroy_cb(This->surfaces[i]); + } + } + + TRACE("(%p) : Cleaning up base texture\n", This); + basetexture_cleanup((IWineD3DBaseTexture *)This); +} + /* ******************************************* IWineD3DTexture IUnknown parts follow ******************************************* */ @@ -276,21 +300,8 @@ static BOOL WINAPI IWineD3DTextureImpl_IsCondNP2(IWineD3DTexture *iface) { ******************************************* */ static void WINAPI IWineD3DTextureImpl_Destroy(IWineD3DTexture *iface, D3DCB_DESTROYSURFACEFN D3DCB_DestroySurface) { IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; - unsigned int i; - TRACE("(%p) : Cleaning up\n",This); - for (i = 0; i < This->baseTexture.levels; i++) { - if (This->surfaces[i] != NULL) { - /* Clean out the texture name we gave to the surface so that the surface doesn't try and release it */ - surface_set_texture_name(This->surfaces[i], 0, TRUE); - surface_set_texture_name(This->surfaces[i], 0, FALSE); - surface_set_texture_target(This->surfaces[i], 0); - IWineD3DSurface_SetContainer(This->surfaces[i], 0); - D3DCB_DestroySurface(This->surfaces[i]); - } - } - TRACE("(%p) : cleaning up base texture\n", This); - basetexture_cleanup((IWineD3DBaseTexture *)iface); + texture_cleanup(This, D3DCB_DestroySurface); /* free the object */ HeapFree(GetProcessHeap(), 0, This); }

1 0

Henri Verbeet : wined3d: Call resource_init() from basetexture_init().
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: 451a416fcf9af93fe64467eddbfcaff351fe0256 URL: http://source.winehq.org/git/wine.git/?a=commit;h=451a416fcf9af93fe64467edd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 2 09:01:17 2009 +0200 wined3d: Call resource_init() from basetexture_init(). --- dlls/wined3d/basetexture.c | 29 +++++++++++++++++++++-------- dlls/wined3d/device.c | 28 ++++++++++++---------------- dlls/wined3d/wined3d_private.h | 4 +++- 3 files changed, 36 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 9d64b63..aeec963 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -27,15 +27,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); #define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info -void basetexture_init(struct IWineD3DBaseTextureClass *texture, UINT levels, DWORD usage) +HRESULT basetexture_init(IWineD3DBaseTextureImpl *texture, UINT levels, WINED3DRESOURCETYPE resource_type, + IWineD3DDeviceImpl *device, UINT size, DWORD usage, const struct GlPixelFormatDesc *format_desc, + WINED3DPOOL pool, IUnknown *parent) { - texture->levels = levels; - texture->filterType = (usage & WINED3DUSAGE_AUTOGENMIPMAP) ? WINED3DTEXF_LINEAR : WINED3DTEXF_NONE; - texture->LOD = 0; - texture->dirty = TRUE; - texture->srgbDirty = TRUE; - texture->is_srgb = FALSE; - texture->pow2Matrix_identity = TRUE; + HRESULT hr; + + hr = resource_init((IWineD3DResource *)texture, resource_type, device, size, usage, format_desc, pool, parent); + if (FAILED(hr)) + { + WARN("Failed to initialize resource, returning %#x\n", hr); + return hr; + } + + texture->baseTexture.levels = levels; + texture->baseTexture.filterType = (usage & WINED3DUSAGE_AUTOGENMIPMAP) ? WINED3DTEXF_LINEAR : WINED3DTEXF_NONE; + texture->baseTexture.LOD = 0; + texture->baseTexture.dirty = TRUE; + texture->baseTexture.srgbDirty = TRUE; + texture->baseTexture.is_srgb = FALSE; + texture->baseTexture.pow2Matrix_identity = TRUE; + + return WINED3D_OK; } void basetexture_cleanup(IWineD3DBaseTexture *iface) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bb8b975..5c95f32 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1159,21 +1159,20 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, } object->lpVtbl = &IWineD3DTexture_Vtbl; - hr = resource_init((IWineD3DResource *)object, WINED3DRTYPE_TEXTURE, This, 0, Usage, format_desc, Pool, parent); + hr = basetexture_init((IWineD3DBaseTextureImpl *)object, Levels, + WINED3DRTYPE_TEXTURE, This, 0, Usage, format_desc, Pool, parent); if (FAILED(hr)) { - WARN("Failed to initialize resource, returning %#x\n", hr); + WARN("Failed to initialize basetexture, returning %#x\n", hr); HeapFree(GetProcessHeap(), 0, object); *ppTexture = NULL; return hr; } - TRACE("(%p) : Created resource %p\n", This, object); + TRACE("(%p) : Created basetexture %p\n", This, object); *ppTexture = (IWineD3DTexture *)object; - basetexture_init(&object->baseTexture, Levels, Usage); - if (object->resource.format_desc->Flags & WINED3DFMT_FLAG_FILTERING) { object->baseTexture.minMipLookup = minMipLookup; @@ -1316,19 +1315,17 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolumeTexture(IWineD3DDevice *ifa } object->lpVtbl = &IWineD3DVolumeTexture_Vtbl; - hr = resource_init((IWineD3DResource *)object, WINED3DRTYPE_VOLUMETEXTURE, - This, 0, Usage, format_desc, Pool, parent); + hr = basetexture_init((IWineD3DBaseTextureImpl *)object, Levels, + WINED3DRTYPE_VOLUMETEXTURE, This, 0, Usage, format_desc, Pool, parent); if (FAILED(hr)) { - WARN("Failed to initialize resource, returning %#x\n", hr); + WARN("Failed to initialize basetexture, returning %#x\n", hr); HeapFree(GetProcessHeap(), 0, object); *ppVolumeTexture = NULL; return hr; } - TRACE("(%p) : Created resource %p\n", This, object); - - basetexture_init(&object->baseTexture, Levels, Usage); + TRACE("(%p) : Created basetexture %p\n", This, object); TRACE("(%p) : W(%d) H(%d) D(%d), Lvl(%d) Usage(%d), Fmt(%u,%s), Pool(%s)\n", This, Width, Height, Depth, Levels, Usage, Format, debug_d3dformat(Format), debug_d3dpool(Pool)); @@ -1492,18 +1489,17 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface } object->lpVtbl = &IWineD3DCubeTexture_Vtbl; - hr = resource_init((IWineD3DResource *)object, WINED3DRTYPE_CUBETEXTURE, This, 0, Usage, format_desc, Pool, parent); + hr = basetexture_init((IWineD3DBaseTextureImpl *)object, Levels, + WINED3DRTYPE_CUBETEXTURE, This, 0, Usage, format_desc, Pool, parent); if (FAILED(hr)) { - WARN("Failed to initialize resource, returning %#x\n", hr); + WARN("Failed to initialize basetexture, returning %#x\n", hr); HeapFree(GetProcessHeap(), 0, object); *ppCubeTexture = NULL; return hr; } - TRACE("(%p) : Created resource %p\n", This, object); - - basetexture_init(&object->baseTexture, Levels, Usage); + TRACE("(%p) : Created basetexture %p\n", This, object); TRACE("(%p) Create Cube Texture\n", This); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f217366..42c769c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1736,7 +1736,9 @@ WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTexture BOOL basetexture_get_dirty(IWineD3DBaseTexture *iface); DWORD basetexture_get_level_count(IWineD3DBaseTexture *iface); DWORD basetexture_get_lod(IWineD3DBaseTexture *iface); -void basetexture_init(struct IWineD3DBaseTextureClass *texture, UINT levels, DWORD usage); +HRESULT basetexture_init(IWineD3DBaseTextureImpl *texture, UINT levels, WINED3DRESOURCETYPE resource_type, + IWineD3DDeviceImpl *device, UINT size, DWORD usage, const struct GlPixelFormatDesc *format_desc, + WINED3DPOOL pool, IUnknown *parent); HRESULT basetexture_set_autogen_filter_type(IWineD3DBaseTexture *iface, WINED3DTEXTUREFILTERTYPE filter_type); BOOL basetexture_set_dirty(IWineD3DBaseTexture *iface, BOOL dirty); DWORD basetexture_set_lod(IWineD3DBaseTexture *iface, DWORD new_lod);

1 0

Henri Verbeet : wined3d: Partially revert 7433eb76b5f05ae54702fe9e57ba315407ed651b.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: 812ee5208c380481298183b29f03246f85a171fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=812ee5208c380481298183b29… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 2 09:01:16 2009 +0200 wined3d: Partially revert 7433eb76b5f05ae54702fe9e57ba315407ed651b. The write mask sizes for the input and output semantics can be different, resulting in compilation failure. --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2385dbc..d7a8835 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3411,7 +3411,7 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_in && !strcmp(semantic_name_in, semantic_name_out)) { shader_addline(buffer, "%s%s = OUT[%u]%s;\n", - destination, reg_mask, j, reg_mask_out); + destination, reg_mask, j, reg_mask); found = TRUE; } }

1 0

Andrew Eikum : gdiplus: Stub for GdipComment.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: b850008bec7d949f6344d0572768edded072e0a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b850008bec7d949f6344d0572… Author: Andrew Eikum <andrew(a)brightnightgames.com> Date: Mon Jun 1 20:01:43 2009 -0500 gdiplus: Stub for GdipComment. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 6 ++++++ include/gdiplusflat.h | 1 + 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 40f7327..beff7a4 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -65,7 +65,7 @@ @ stdcall GdipCombineRegionRect(ptr ptr long) @ stdcall GdipCombineRegionRectI(ptr ptr long) @ stdcall GdipCombineRegionRegion(ptr ptr long) -@ stub GdipComment +@ stdcall GdipComment(ptr long ptr) @ stdcall GdipConvertToEmfPlus(ptr ptr ptr long ptr ptr) @ stub GdipConvertToEmfPlusToFile @ stub GdipConvertToEmfPlusToStream diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index adeea3c..8d3d09e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3164,6 +3164,12 @@ GpStatus WINGDIPAPI GdipBeginContainerI(GpGraphics *graphics, GDIPCONST GpRect * return NotImplemented; } +GpStatus WINGDIPAPI GdipComment(GpGraphics *graphics, UINT sizeData, GDIPCONST BYTE *data) +{ + FIXME("(%p, %d, %p): stub\n", graphics, sizeData, data); + return NotImplemented; +} + GpStatus WINGDIPAPI GdipEndContainer(GpGraphics *graphics, GraphicsState state) { FIXME("(%p, 0x%x)\n", graphics, state); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 99163ca..bade9e5 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -123,6 +123,7 @@ GpStatus WINGDIPAPI GdipFlush(GpGraphics*, GpFlushIntention); GpStatus WINGDIPAPI GdipBeginContainer(GpGraphics*,GDIPCONST GpRectF*,GDIPCONST GpRectF*,GpUnit,GraphicsContainer*); GpStatus WINGDIPAPI GdipBeginContainer2(GpGraphics*,GraphicsContainer*); GpStatus WINGDIPAPI GdipBeginContainerI(GpGraphics*,GDIPCONST GpRect*,GDIPCONST GpRect*,GpUnit,GraphicsContainer*); +GpStatus WINGDIPAPI GdipComment(GpGraphics*,UINT,GDIPCONST BYTE*); GpStatus WINGDIPAPI GdipCreateFromHDC(HDC,GpGraphics**); GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC,HANDLE,GpGraphics**); GpStatus WINGDIPAPI GdipCreateFromHWND(HWND,GpGraphics**);

1 0

Andrew Eikum : gdiplus: Stub for GdipCloneBitmapArea.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: 57134fc8905de19dbdd7ebedd6e6895a7652d73c URL: http://source.winehq.org/git/wine.git/?a=commit;h=57134fc8905de19dbdd7ebedd… Author: Andrew Eikum <andrew(a)brightnightgames.com> Date: Mon Jun 1 20:01:26 2009 -0500 gdiplus: Stub for GdipCloneBitmapArea. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 10 +++++++++- include/gdiplusflat.h | 2 ++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index e156db4..40f7327 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -46,7 +46,7 @@ @ stdcall GdipBitmapSetResolution(ptr long long) @ stdcall GdipBitmapUnlockBits(ptr ptr) @ stdcall GdipClearPathMarkers(ptr) -@ stub GdipCloneBitmapArea +@ stdcall GdipCloneBitmapArea(long long long long long ptr ptr) @ stdcall GdipCloneBitmapAreaI(long long long long long ptr ptr) @ stdcall GdipCloneBrush(ptr ptr) @ stdcall GdipCloneCustomLineCap(ptr ptr) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 29eb000..8691d64 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -271,10 +271,18 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, return Ok; } +GpStatus WINGDIPAPI GdipCloneBitmapArea(REAL x, REAL y, REAL width, REAL height, + PixelFormat format, GpBitmap* srcBitmap, GpBitmap** dstBitmap) +{ + FIXME("(%f,%f,%f,%f,%i,%p,%p): stub\n", x, y, width, height, format, srcBitmap, dstBitmap); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipCloneBitmapAreaI(INT x, INT y, INT width, INT height, PixelFormat format, GpBitmap* srcBitmap, GpBitmap** dstBitmap) { - FIXME("(%i,%i,%i,%i,%i,%p,%p)\n", x, y, width, height, format, srcBitmap, dstBitmap); + FIXME("(%i,%i,%i,%i,%i,%p,%p): stub\n", x, y, width, height, format, srcBitmap, dstBitmap); return NotImplemented; } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 28cea41..99163ca 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -44,6 +44,8 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap*,GDIPCONST GpRect*,UINT, PixelFormat,BitmapData*); GpStatus WINGDIPAPI GdipBitmapSetPixel(GpBitmap*,INT,INT,ARGB); GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap*,BitmapData*); +GpStatus WINGDIPAPI GdipCloneBitmapArea(REAL,REAL,REAL,REAL,PixelFormat,GpBitmap*,GpBitmap**); +GpStatus WINGDIPAPI GdipCloneBitmapAreaI(INT,INT,INT,INT,PixelFormat,GpBitmap*,GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromFile(GDIPCONST WCHAR*,GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromFileICM(GDIPCONST WCHAR*,GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromGdiDib(GDIPCONST BITMAPINFO*,VOID*,GpBitmap**);

1 0

Nicolas Le Cam : winetest: Add a missing carriage return in help message.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: 90ef31ecdc36a52770d2a5f9742f0ad8cfdc6ba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90ef31ecdc36a52770d2a5f97… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Tue Jun 2 01:32:43 2009 +0200 winetest: Add a missing carriage return in help message. --- programs/winetest/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 7009ce8..66daa65 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -823,7 +823,7 @@ usage (void) " --help print this message and exit\n" " --version print the build version and exit\n" " -c console mode, no GUI\n" -" -d DIR Use DIR as temp directory (default: %%TEMP%%\\wct)" +" -d DIR Use DIR as temp directory (default: %%TEMP%%\\wct)\n" " -e preserve the environment\n" " -h print this message and exit\n" " -p shutdown when the tests are done\n"

1 0

Jacek Caban : wininet: Fixed tests on Windows.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: 45064eb5b0260f91f8434a9eee308ecdd124fdd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45064eb5b0260f91f8434a9ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 2 01:20:20 2009 +0200 wininet: Fixed tests on Windows. --- dlls/wininet/tests/http.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 326296a..62b158c 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -336,8 +336,10 @@ static void InternetReadFile_test(int flags, const test_data_t *test) CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); CHECK_NOT_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); CHECK_NOT_NOTIFIED(INTERNET_STATUS_NAME_RESOLVED); - if(test->flags & TESTF_ALLOW_COOKIE) + if(test->flags & TESTF_ALLOW_COOKIE) { SET_OPTIONAL(INTERNET_STATUS_COOKIE_SENT); + SET_OPTIONAL(INTERNET_STATUS_COOKIE_RECEIVED); + } if (first_connection_to_test_url) { SET_EXPECT(INTERNET_STATUS_RESOLVING_NAME); @@ -374,7 +376,10 @@ static void InternetReadFile_test(int flags, const test_data_t *test) BOOL b = TRUE; res = InternetSetOption(hor, INTERNET_OPTION_HTTP_DECODING, &b, sizeof(b)); - ok(res, "InternetSetOption failed: %08x\n", GetLastError()); + ok(res || broken(!res && GetLastError() == ERROR_INTERNET_INVALID_OPTION), + "InternetSetOption failed: %u\n", GetLastError()); + if(!res) + goto abort; } trace("HttpSendRequestA -->\n"); @@ -391,8 +396,10 @@ static void InternetReadFile_test(int flags, const test_data_t *test) if (flags & INTERNET_FLAG_ASYNC) WaitForSingleObject(hCompleteEvent, INFINITE); - if(test->flags & TESTF_ALLOW_COOKIE) + if(test->flags & TESTF_ALLOW_COOKIE) { CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); + CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_RECEIVED); + } if (first_connection_to_test_url) { CHECK_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME);

1 0

Detlef Riekenberg : kernel32/tests: Add tests for GetLocaleInfo with SUBLANG_NEUTRAL.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: fd0d17ec1ca8ea1841eab4f5f8a446115036bb51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd0d17ec1ca8ea1841eab4f5f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jun 1 23:12:30 2009 +0200 kernel32/tests: Add tests for GetLocaleInfo with SUBLANG_NEUTRAL. --- dlls/kernel32/tests/locale.c | 44 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 4f287cf..2b7a165 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -120,23 +120,61 @@ static void test_GetLocaleInfoA(void) int ret; LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); char buffer[BUFFER_SIZE]; + const char * expected; ok(lcid == 0x409, "wrong LCID calculated - %d\n", lcid); + /* en, ar and zh use SUBLANG_NEUTRAL, but GetLocaleInfo assume SUBLANG_DEFAULT */ + SetLastError(0xdeadbeef); + memset(buffer, 0, COUNTOF(buffer)); + ret = GetLocaleInfoA(LANG_ENGLISH, LOCALE_SLANGUAGE, buffer, COUNTOF(buffer)); + expected = "English (United States)"; + ok((ret == (lstrlenA(expected)+1)) && !lstrcmpA(buffer, expected), + "got %d with '%s' (expected %d with '%s')\n", + ret, buffer, lstrlenA(expected)+1, expected); + + SetLastError(0xdeadbeef); + memset(buffer, 0, COUNTOF(buffer)); + ret = GetLocaleInfoA(LANG_ARABIC, LOCALE_SLANGUAGE, buffer, COUNTOF(buffer)); + expected = "Arabic (Saudi Arabia)"; + ok((ret == (lstrlenA(expected)+1)) && !lstrcmpA(buffer, expected), + "got %d with '%s' (expected %d with '%s')\n", + ret, buffer, lstrlenA(expected)+1, expected); + + SetLastError(0xdeadbeef); + memset(buffer, 0, COUNTOF(buffer)); + ret = GetLocaleInfoA(LANG_CHINESE, LOCALE_SLANGUAGE, buffer, COUNTOF(buffer)); + expected = "Chinese (Taiwan)"; + ok((ret == (lstrlenA(expected)+1)) && !lstrcmpA(buffer, expected), + "got %d with '%s' (expected %d with '%s')\n", + ret, buffer, lstrlenA(expected)+1, expected); + + /* SUBLANG_DEFAULT is not required for GetLocaleInfo */ + SetLastError(0xdeadbeef); + memset(buffer, 0, COUNTOF(buffer)); + ret = GetLocaleInfoA(LANG_GERMAN, LOCALE_SLANGUAGE, buffer, COUNTOF(buffer)); + expected = "German (Germany)"; + ok((ret == (lstrlenA(expected)+1)) && !lstrcmpA(buffer, expected), + "got %d with '%s' (expected %d with '%s')\n", + ret, buffer, lstrlenA(expected)+1, expected); + /* HTMLKit and "Font xplorer lite" expect GetLocaleInfoA to * partially fill the buffer even if it is too short. See bug 637. */ - SetLastError(0); memset(buffer, 0, COUNTOF(buffer)); + SetLastError(0xdeadbeef); + memset(buffer, 0, COUNTOF(buffer)); ret = GetLocaleInfoA(lcid, NUO|LOCALE_SDAYNAME1, buffer, 0); ok(ret == 7 && !buffer[0], "Expected len=7, got %d\n", ret); - SetLastError(0); memset(buffer, 0, COUNTOF(buffer)); + SetLastError(0xdeadbeef); + memset(buffer, 0, COUNTOF(buffer)); ret = GetLocaleInfoA(lcid, NUO|LOCALE_SDAYNAME1, buffer, 3); ok( !ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); ok(!strcmp(buffer, "Mon"), "Expected 'Mon', got '%s'\n", buffer); - SetLastError(0); memset(buffer, 0, COUNTOF(buffer)); + SetLastError(0xdeadbeef); + memset(buffer, 0, COUNTOF(buffer)); ret = GetLocaleInfoA(lcid, NUO|LOCALE_SDAYNAME1, buffer, 10); ok(ret == 7, "Expected ret == 7, got %d, error %d\n", ret, GetLastError()); ok(!strcmp(buffer, "Monday"), "Expected 'Monday', got '%s'\n", buffer);

1 0

Nikolay Sivov : comctl32/listview: Block LVM_EDITLABEL when control is unfocused and no label created.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: 43d982fde6b363199c95037935e0f5446df8f733 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43d982fde6b363199c9503793… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jun 1 23:53:48 2009 +0400 comctl32/listview: Block LVM_EDITLABEL when control is unfocused and no label created. --- dlls/comctl32/listview.c | 2 ++ dlls/comctl32/tests/listview.c | 13 +++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index a1aa250..09d8dae 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5010,6 +5010,8 @@ static HWND LISTVIEW_EditLabelT(LISTVIEW_INFO *infoPtr, INT nItem, BOOL isW) if (~infoPtr->dwStyle & LVS_EDITLABELS) return 0; if (nItem < 0 || nItem >= infoPtr->nItemCount) return 0; + /* Edit could be created only on focused control and if isn't already created */ + if (GetFocus() != infoPtr->hwndSelf && !IsWindow(infoPtr->hwndEdit)) return 0; infoPtr->nEditLabelItem = nItem; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index dd5fd86..fa110cd 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2836,7 +2836,7 @@ static void test_getitemrect(void) static void test_editbox(void) { - HWND hwnd, hwndedit; + HWND hwnd, hwndedit, hwndedit2; LVITEMA item; DWORD r; static CHAR testitemA[] = "testitem"; @@ -2878,10 +2878,19 @@ static void test_editbox(void) ok(strcmp(buffer, testitem1A) == 0, "Expected item text to change\n"); + /* send LVM_EDITLABEL on already created edit */ + SetFocus(hwnd); + hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); + ok(IsWindow(hwndedit), "Expected Edit window to be created\n"); + /* focus will be set to edit */ + ok(GetFocus() == hwndedit, "Expected Edit window to be focused\n"); + hwndedit2 = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); + ok(IsWindow(hwndedit2), "Expected Edit window to be created\n"); + /* creating label disabled when control isn't focused */ SetFocus(0); hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); - todo_wine ok(hwndedit == NULL, "Expected Edit window not to be created\n"); + ok(hwndedit == NULL, "Expected Edit window not to be created\n"); DestroyWindow(hwnd); }

1 0

Paul Vriens : oleaut32/tests: Fix some intermittent test failures on W98 and NT4.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: 28d0487c24442b6a4994f25788f9829ff3e42016 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28d0487c24442b6a4994f2578… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jun 1 21:21:25 2009 +0200 oleaut32/tests: Fix some intermittent test failures on W98 and NT4. --- dlls/oleaut32/tests/vartest.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 662c0a0..53b0afc 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -5234,11 +5234,13 @@ static void test_VarAdd(void) static void test_VarCat(void) { LCID lcid; - VARIANT left, right, result, expected; + VARIANT left, right, result, expected, expected_broken; static const WCHAR sz34[] = {'3','4','\0'}; static const WCHAR sz1234[] = {'1','2','3','4','\0'}; static const WCHAR date_sz12[] = {'9','/','3','0','/','1','9','8','0','1','2','\0'}; + static const WCHAR date_sz12_broken[] = {'9','/','3','0','/','8','0','1','2','\0'}; static const WCHAR sz12_date[] = {'1','2','9','/','3','0','/','1','9','8','0','\0'}; + static const WCHAR sz12_date_broken[] = {'1','2','9','/','3','0','/','8','0','\0'}; static const WCHAR sz_empty[] = {'\0'}; TCHAR orig_date_format[128]; VARTYPE leftvt, rightvt, resultvt; @@ -5506,34 +5508,42 @@ static void test_VarCat(void) V_VT(&left) = VT_BSTR; V_VT(&right) = VT_DATE; V_VT(&expected) = VT_BSTR; + V_VT(&expected_broken) = VT_BSTR; V_BSTR(&left) = SysAllocString(sz12); V_DATE(&right) = 29494.0; V_BSTR(&expected)= SysAllocString(sz12_date); + V_BSTR(&expected_broken)= SysAllocString(sz12_date_broken); hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08x\n", hres); - ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ, + ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ || + broken(VarCmp(&result,&expected_broken,lcid,0) == VARCMP_EQ), /* Some W98 and NT4 (intermittent) */ "VarCat: VT_BSTR concat with VT_DATE returned incorrect result\n"); VariantClear(&left); VariantClear(&right); VariantClear(&result); VariantClear(&expected); + VariantClear(&expected_broken); V_VT(&left) = VT_DATE; V_VT(&right) = VT_BSTR; V_VT(&expected) = VT_BSTR; + V_VT(&expected_broken) = VT_BSTR; V_DATE(&left) = 29494.0; V_BSTR(&right) = SysAllocString(sz12); V_BSTR(&expected)= SysAllocString(date_sz12); + V_BSTR(&expected_broken)= SysAllocString(date_sz12_broken); hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08x\n", hres); - ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ, + ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ || + broken(VarCmp(&result,&expected_broken,lcid,0) == VARCMP_EQ), /* Some W98 and NT4 (intermittent) */ "VarCat: VT_DATE concat with VT_BSTR returned incorrect result\n"); VariantClear(&left); VariantClear(&right); VariantClear(&result); VariantClear(&expected); + VariantClear(&expected_broken); /* Test of both expressions are empty */ V_VT(&left) = VT_BSTR;

1 0

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 June 2009