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

Roderick Colenbrander : wined3d: Use RECT instead of WINED3DRECT in fb_copy_to_texture_direct.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 7f1f61e28e695d5e6a86e69500425022933929c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f1f61e28e695d5e6a86e6950… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Mar 30 22:18:59 2010 +0200 wined3d: Use RECT instead of WINED3DRECT in fb_copy_to_texture_direct. --- dlls/wined3d/surface.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3630da2..f028d10 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3409,7 +3409,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Flip(IWineD3DSurface *iface, IWineD3DS * with single pixel copy calls */ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3DSurface *SrcSurface, - const WINED3DRECT *srect, const WINED3DRECT *drect, BOOL upsidedown, WINED3DTEXTUREFILTERTYPE Filter) + const RECT *src_rect, const RECT *dst_rect, BOOL upsidedown, WINED3DTEXTUREFILTERTYPE Filter) { IWineD3DDeviceImpl *myDevice = This->resource.device; float xrel, yrel; @@ -3436,8 +3436,8 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D } checkGLcall("glReadBuffer"); - xrel = (float) (srect->x2 - srect->x1) / (float) (drect->x2 - drect->x1); - yrel = (float) (srect->y2 - srect->y1) / (float) (drect->y2 - drect->y1); + xrel = (float) (src_rect->right - src_rect->left) / (float) (dst_rect->right - dst_rect->left); + yrel = (float) (src_rect->bottom - src_rect->top) / (float) (dst_rect->bottom - dst_rect->top); if ((xrel - 1.0f < -eps) || (xrel - 1.0f > eps)) { @@ -3460,18 +3460,18 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D /* Upside down copy without stretching is nice, one glCopyTexSubImage call will do */ glCopyTexSubImage2D(This->texture_target, This->texture_level, - drect->x1 /*xoffset */, drect->y1 /* y offset */, - srect->x1, Src->currentDesc.Height - srect->y2, - drect->x2 - drect->x1, drect->y2 - drect->y1); + dst_rect->left /*xoffset */, dst_rect->top /* y offset */, + src_rect->left, Src->currentDesc.Height - src_rect->bottom, + dst_rect->right - dst_rect->left, dst_rect->bottom - dst_rect->top); } else { - UINT yoffset = Src->currentDesc.Height - srect->y1 + drect->y1 - 1; + UINT yoffset = Src->currentDesc.Height - src_rect->top + dst_rect->top - 1; /* I have to process this row by row to swap the image, * otherwise it would be upside down, so stretching in y direction * doesn't cost extra time * * However, stretching in x direction can be avoided if not necessary */ - for(row = drect->y1; row < drect->y2; row++) { + for(row = dst_rect->top; row < dst_rect->bottom; row++) { if ((xrel - 1.0f < -eps) || (xrel - 1.0f > eps)) { /* Well, that stuff works, but it's very slow. @@ -3479,15 +3479,15 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D */ UINT col; - for(col = drect->x1; col < drect->x2; col++) { + for(col = dst_rect->left; col < dst_rect->right; col++) { glCopyTexSubImage2D(This->texture_target, This->texture_level, - drect->x1 + col /* x offset */, row /* y offset */, - srect->x1 + col * xrel, yoffset - (int) (row * yrel), 1, 1); + dst_rect->left + col /* x offset */, row /* y offset */, + src_rect->left + col * xrel, yoffset - (int) (row * yrel), 1, 1); } } else { glCopyTexSubImage2D(This->texture_target, This->texture_level, - drect->x1 /* x offset */, row /* y offset */, - srect->x1, yoffset - (int) (row * yrel), drect->x2-drect->x1, 1); + dst_rect->left /* x offset */, row /* y offset */, + src_rect->left, yoffset - (int) (row * yrel), dst_rect->right-dst_rect->left, 1); } } } @@ -3994,7 +3994,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const } else if((!stretchx) || dst_rect.right - dst_rect.left > Src->currentDesc.Width || dst_rect.bottom - dst_rect.top > Src->currentDesc.Height) { TRACE("No stretching in x direction, using direct framebuffer -> texture copy\n"); - fb_copy_to_texture_direct(This, SrcSurface, (WINED3DRECT*)&src_rect, (WINED3DRECT*)&dst_rect, upsideDown, Filter); + fb_copy_to_texture_direct(This, SrcSurface, &src_rect, &dst_rect, upsideDown, Filter); } else { TRACE("Using hardware stretching to flip / stretch the texture\n"); fb_copy_to_texture_hwstretch(This, SrcSurface, srcSwapchain, (WINED3DRECT*)&src_rect, (WINED3DRECT*)&dst_rect, upsideDown, Filter);

1 0

Alexandre Julliard : ntdll/tests: Fix a number of test failures on Wow64.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: b7b2a20aa2a9d044a48d5774bf7d1116aeb0f159 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7b2a20aa2a9d044a48d5774b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 31 12:17:35 2010 +0200 ntdll/tests: Fix a number of test failures on Wow64. --- dlls/ntdll/tests/info.c | 31 +++++++++++++++++++++---------- 1 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index a8e19f9..74ce710 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -28,6 +28,9 @@ static NTSTATUS (WINAPI * pNtQueryInformationThread)(HANDLE, THREADINFOCLASS, PV static NTSTATUS (WINAPI * pNtSetInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG); static NTSTATUS (WINAPI * pNtSetInformationThread)(HANDLE, THREADINFOCLASS, PVOID, ULONG); static NTSTATUS (WINAPI * pNtReadVirtualMemory)(HANDLE, const void*, void*, SIZE_T, SIZE_T*); +static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); + +static BOOL is_wow64; /* one_before_last_pid is used to be able to compare values of a still running process with the output of the test_query_process_times and test_query_process_handlecount tests. @@ -59,6 +62,8 @@ static BOOL InitFunctionPtrs(void) NTDLL_GET_PROC(NtSetInformationThread); NTDLL_GET_PROC(NtReadVirtualMemory); + pIsWow64Process = (void *)GetProcAddress(GetModuleHandle("kernel32.dll"), "IsWow64Process"); + if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; return TRUE; } @@ -129,21 +134,25 @@ static void test_query_performance(void) { NTSTATUS status; ULONG ReturnLength; - ULONGLONG buffer[sizeof(SYSTEM_PERFORMANCE_INFORMATION)/sizeof(ULONGLONG) + 1]; + ULONGLONG buffer[sizeof(SYSTEM_PERFORMANCE_INFORMATION)/sizeof(ULONGLONG) + 5]; + DWORD size = sizeof(SYSTEM_PERFORMANCE_INFORMATION); status = pNtQuerySystemInformation(SystemPerformanceInformation, buffer, 0, &ReturnLength); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - status = pNtQuerySystemInformation(SystemPerformanceInformation, buffer, - sizeof(SYSTEM_PERFORMANCE_INFORMATION), &ReturnLength); + status = pNtQuerySystemInformation(SystemPerformanceInformation, buffer, size, &ReturnLength); + if (status == STATUS_INFO_LENGTH_MISMATCH && is_wow64) + { + /* size is larger on wow64 under w2k8/win7 */ + size += 16; + status = pNtQuerySystemInformation(SystemPerformanceInformation, buffer, size, &ReturnLength); + } ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( ReturnLength == sizeof(SYSTEM_PERFORMANCE_INFORMATION), "Inconsistent length %d\n", ReturnLength); + ok( ReturnLength == size, "Inconsistent length %d\n", ReturnLength); - status = pNtQuerySystemInformation(SystemPerformanceInformation, buffer, - sizeof(SYSTEM_PERFORMANCE_INFORMATION) + 2, &ReturnLength); + status = pNtQuerySystemInformation(SystemPerformanceInformation, buffer, size + 2, &ReturnLength); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( ReturnLength == sizeof(SYSTEM_PERFORMANCE_INFORMATION) || - ReturnLength == sizeof(SYSTEM_PERFORMANCE_INFORMATION) + 2, + ok( ReturnLength == size || ReturnLength == size + 2, "Inconsistent length %d\n", ReturnLength); /* Not return values yet, as struct members are unknown */ @@ -748,7 +757,9 @@ static void test_query_process_times(void) status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessTimes, &spti, sizeof(spti) * 2, &ReturnLength); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - ok( sizeof(spti) == ReturnLength || ReturnLength == 0 /* vista */, + ok( sizeof(spti) == ReturnLength || + ReturnLength == 0 /* vista */ || + broken(is_wow64), /* returns garbage on wow64 */ "Inconsistent length %d\n", ReturnLength); } @@ -1001,7 +1012,7 @@ static void test_affinity(void) ok( tbi.AffinityMask == 1, "Unexpected thread affinity\n" ); /* NOTE: Pre-Vista does not recognize the "all processors" flag (all bits set) */ - thread_affinity = ~0UL; + thread_affinity = ~(DWORD_PTR)0; status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); ok( broken(status == STATUS_INVALID_PARAMETER) || status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);

1 0

Vincent Povirk : gdiplus: Implement GdipImageRotateFlip.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: f2e3d996093420e2ff477c3d13902ec60be1c615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2e3d996093420e2ff477c3d1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 24 16:59:50 2010 -0600 gdiplus: Implement GdipImageRotateFlip. --- dlls/gdiplus/image.c | 141 +++++++++++++++++++++++++++++++++++++++++++- dlls/gdiplus/tests/image.c | 38 ++++++------ 2 files changed, 158 insertions(+), 21 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 8736b23..0a73dcf 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1831,6 +1831,37 @@ GpStatus WINGDIPAPI GdipEmfToWmfBits(HENHMETAFILE hemf, UINT cbData16, return NotImplemented; } +/* Internal utility function: Replace the image data of dst with that of src, + * and free src. */ +static void move_bitmap(GpBitmap *dst, GpBitmap *src, BOOL clobber_palette) +{ + GdipFree(dst->bitmapbits); + DeleteDC(dst->hdc); + DeleteObject(dst->hbitmap); + + if (clobber_palette) + { + GdipFree(dst->image.palette_entries); + dst->image.palette_flags = src->image.palette_flags; + dst->image.palette_count = src->image.palette_count; + dst->image.palette_entries = src->image.palette_entries; + } + else + GdipFree(src->image.palette_entries); + + dst->image.xres = src->image.xres; + dst->image.yres = src->image.yres; + dst->width = src->width; + dst->height = src->height; + dst->format = src->format; + dst->hbitmap = src->hbitmap; + dst->hdc = src->hdc; + dst->bits = src->bits; + dst->stride = src->stride; + + GdipFree(src); +} + GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image) { TRACE("%p\n", image); @@ -3438,6 +3469,112 @@ GpStatus WINGDIPAPI GdipGetImageThumbnail(GpImage *image, UINT width, UINT heigh */ GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage *image, RotateFlipType type) { - FIXME("(%p %u) stub\n", image, type); - return NotImplemented; + GpBitmap *new_bitmap; + GpBitmap *bitmap; + int bpp, bytesperpixel; + int rotate_90, flip_x, flip_y; + int src_x_offset, src_y_offset; + LPBYTE src_origin; + UINT x, y, width, height; + BitmapData src_lock, dst_lock; + GpStatus stat; + + TRACE("(%p, %u)\n", image, type); + + rotate_90 = type&1; + flip_x = (type&6) == 2 || (type&6) == 4; + flip_y = (type&3) == 1 || (type&3) == 2; + + if (image->type != ImageTypeBitmap) + { + FIXME("Not implemented for type %i\n", image->type); + return NotImplemented; + } + + bitmap = (GpBitmap*)image; + bpp = PIXELFORMATBPP(bitmap->format); + + if (bpp < 8) + { + FIXME("Not implemented for %i bit images\n", bpp); + return NotImplemented; + } + + if (rotate_90) + { + width = bitmap->height; + height = bitmap->width; + } + else + { + width = bitmap->width; + height = bitmap->height; + } + + bytesperpixel = bpp/8; + + stat = GdipCreateBitmapFromScan0(width, height, 0, bitmap->format, NULL, &new_bitmap); + + if (stat != Ok) + return stat; + + stat = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead, bitmap->format, &src_lock); + + if (stat == Ok) + { + stat = GdipBitmapLockBits(new_bitmap, NULL, ImageLockModeWrite, bitmap->format, &dst_lock); + + if (stat == Ok) + { + LPBYTE src_row, src_pixel; + LPBYTE dst_row, dst_pixel; + + src_origin = src_lock.Scan0; + if (flip_x) src_origin += bytesperpixel * (bitmap->width - 1); + if (flip_y) src_origin += src_lock.Stride * (bitmap->height - 1); + + if (rotate_90) + { + if (flip_y) src_x_offset = -src_lock.Stride; + else src_x_offset = src_lock.Stride; + if (flip_x) src_y_offset = -bytesperpixel; + else src_y_offset = bytesperpixel; + } + else + { + if (flip_x) src_x_offset = -bytesperpixel; + else src_x_offset = bytesperpixel; + if (flip_y) src_y_offset = -src_lock.Stride; + else src_y_offset = src_lock.Stride; + } + + src_row = src_origin; + dst_row = dst_lock.Scan0; + for (y=0; y<height; y++) + { + src_pixel = src_row; + dst_pixel = dst_row; + for (x=0; x<width; x++) + { + /* FIXME: This could probably be faster without memcpy. */ + memcpy(dst_pixel, src_pixel, bytesperpixel); + dst_pixel += bytesperpixel; + src_pixel += src_x_offset; + } + src_row += src_y_offset; + dst_row += dst_lock.Stride; + } + + GdipBitmapUnlockBits(new_bitmap, &dst_lock); + } + + GdipBitmapUnlockBits(bitmap, &src_lock); + } + + if (stat == Ok) + move_bitmap(bitmap, new_bitmap, FALSE); + else + GdipDisposeImage((GpImage*)new_bitmap); + + return stat; } diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 262f9a2..0ca22e5 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1719,30 +1719,30 @@ static void test_rotateflip(void) expect(Ok, stat); stat = GdipImageRotateFlip(bitmap, Rotate90FlipNone); - todo_wine expect(Ok, stat); + expect(Ok, stat); stat = GdipGetImageWidth(bitmap, &width); expect(Ok, stat); stat = GdipGetImageHeight(bitmap, &height); expect(Ok, stat); - todo_wine expect(2, width); - todo_wine expect(3, height); + expect(2, width); + expect(3, height); stat = GdipBitmapGetPixel((GpBitmap*)bitmap, 0, 0, &color); expect(Ok, stat); - todo_wine expect(0xff00ffff, color); + expect(0xff00ffff, color); stat = GdipBitmapGetPixel((GpBitmap*)bitmap, 1, 0, &color); expect(Ok, stat); - todo_wine expect(0xffff0000, color); + expect(0xffff0000, color); stat = GdipBitmapGetPixel((GpBitmap*)bitmap, 0, 2, &color); - todo_wine expect(Ok, stat); - todo_wine expect(0xffffff00, color); + expect(Ok, stat); + expect(0xffffff00, color); stat = GdipBitmapGetPixel((GpBitmap*)bitmap, 1, 2, &color); - todo_wine expect(Ok, stat); - todo_wine expect(0xff0000ff, color); + expect(Ok, stat); + expect(0xff0000ff, color); expect(0, bits[0]); expect(0, bits[1]); @@ -1755,7 +1755,7 @@ static void test_rotateflip(void) expect(Ok, stat); stat = GdipImageRotateFlip(bitmap, RotateNoneFlipX); - todo_wine expect(Ok, stat); + expect(Ok, stat); stat = GdipGetImageWidth(bitmap, &width); expect(Ok, stat); @@ -1766,19 +1766,19 @@ static void test_rotateflip(void) stat = GdipBitmapGetPixel((GpBitmap*)bitmap, 0, 0, &color); expect(Ok, stat); - todo_wine expect(0xff0000ff, color); + expect(0xff0000ff, color); stat = GdipBitmapGetPixel((GpBitmap*)bitmap, 2, 0, &color); expect(Ok, stat); - todo_wine expect(0xffff0000, color); + expect(0xffff0000, color); stat = GdipBitmapGetPixel((GpBitmap*)bitmap, 0, 1, &color); expect(Ok, stat); - todo_wine expect(0xffffff00, color); + expect(0xffffff00, color); stat = GdipBitmapGetPixel((GpBitmap*)bitmap, 2, 1, &color); expect(Ok, stat); - todo_wine expect(0xff00ffff, color); + expect(0xff00ffff, color); expect(0, bits[0]); expect(0, bits[1]); @@ -1791,7 +1791,7 @@ static void test_rotateflip(void) expect(Ok, stat); stat = GdipImageRotateFlip(bitmap, RotateNoneFlipY); - todo_wine expect(Ok, stat); + expect(Ok, stat); stat = GdipGetImageWidth(bitmap, &width); expect(Ok, stat); @@ -1802,19 +1802,19 @@ static void test_rotateflip(void) stat = GdipBitmapGetPixel((GpBitmap*)bitmap, 0, 0, &color); expect(Ok, stat); - todo_wine expect(0xff00ffff, color); + expect(0xff00ffff, color); stat = GdipBitmapGetPixel((GpBitmap*)bitmap, 2, 0, &color); expect(Ok, stat); - todo_wine expect(0xffffff00, color); + expect(0xffffff00, color); stat = GdipBitmapGetPixel((GpBitmap*)bitmap, 0, 1, &color); expect(Ok, stat); - todo_wine expect(0xffff0000, color); + expect(0xffff0000, color); stat = GdipBitmapGetPixel((GpBitmap*)bitmap, 2, 1, &color); expect(Ok, stat); - todo_wine expect(0xff0000ff, color); + expect(0xff0000ff, color); expect(0, bits[0]); expect(0, bits[1]);

1 0

Vincent Povirk : gdiplus: Add tests for GdipMeasureCharacterRanges.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: f860285ccac03492e2af6ad529c89b11855b4250 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f860285ccac03492e2af6ad52… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 30 15:16:22 2010 -0500 gdiplus: Add tests for GdipMeasureCharacterRanges. --- dlls/gdiplus/tests/graphics.c | 80 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 80 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 0a6490e..17caf90 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2416,6 +2416,11 @@ static void test_string_functions(void) const WCHAR teststring[] = {'o','o',' ','o','\n','o',0}; REAL char_width, char_height; INT codepointsfitted, linesfilled; + GpStringFormat *format; + CharacterRange ranges[3] = {{0, 1}, {1, 3}, {5, 1}}; + GpRegion *regions[4] = {0}; + BOOL region_isempty[4]; + int i; ok(hdc != NULL, "Expected HDC to be initialized\n"); status = GdipCreateFromHDC(hdc, &graphics); @@ -2439,6 +2444,9 @@ static void test_string_functions(void) status = GdipCreateSolidFill(color, (GpSolidFill**)&brush); expect(Ok, status); + status = GdipCreateStringFormat(0, LANG_NEUTRAL, &format); + expect(Ok, status); + rc.X = 0; rc.Y = 0; rc.Width = 100.0; @@ -2548,6 +2556,78 @@ static void test_string_functions(void) expect(6, codepointsfitted); todo_wine expect(4, linesfilled); + status = GdipSetStringFormatMeasurableCharacterRanges(format, 3, ranges); + expect(Ok, status); + + rc.Width = 100.0; + + for (i=0; i<4; i++) + { + status = GdipCreateRegion(&regions[i]); + expect(Ok, status); + } + + status = GdipMeasureCharacterRanges(NULL, teststring, 6, font, &rc, format, 3, regions); + expect(InvalidParameter, status); + + status = GdipMeasureCharacterRanges(graphics, NULL, 6, font, &rc, format, 3, regions); + expect(InvalidParameter, status); + + status = GdipMeasureCharacterRanges(graphics, teststring, 6, NULL, &rc, format, 3, regions); + expect(InvalidParameter, status); + + status = GdipMeasureCharacterRanges(graphics, teststring, 6, font, NULL, format, 3, regions); + expect(InvalidParameter, status); + + if (0) + { + /* Crashes on Windows XP */ + status = GdipMeasureCharacterRanges(graphics, teststring, 6, font, &rc, NULL, 3, regions); + expect(InvalidParameter, status); + } + + status = GdipMeasureCharacterRanges(graphics, teststring, 6, font, &rc, format, 3, NULL); + expect(InvalidParameter, status); + + status = GdipMeasureCharacterRanges(graphics, teststring, 6, font, &rc, format, 2, regions); + todo_wine expect(InvalidParameter, status); + + status = GdipMeasureCharacterRanges(graphics, teststring, 6, font, &rc, format, 4, regions); + todo_wine expect(Ok, status); + + for (i=0; i<4; i++) + { + status = GdipIsEmptyRegion(regions[i], graphics, &region_isempty[i]); + expect(Ok, status); + } + + ok(!region_isempty[0], "region shouldn't be empty\n"); + ok(!region_isempty[1], "region shouldn't be empty\n"); + ok(!region_isempty[2], "region shouldn't be empty\n"); + ok(!region_isempty[3], "region shouldn't be empty\n"); + + /* Cut off everything after the first space, and the second line. */ + rc.Width = char_bounds.Width + char_width * 2.5; + rc.Height = char_bounds.Height + char_height * 0.5; + + status = GdipMeasureCharacterRanges(graphics, teststring, 6, font, &rc, format, 3, regions); + todo_wine expect(Ok, status); + + for (i=0; i<4; i++) + { + status = GdipIsEmptyRegion(regions[i], graphics, &region_isempty[i]); + expect(Ok, status); + } + + ok(!region_isempty[0], "region shouldn't be empty\n"); + ok(!region_isempty[1], "region shouldn't be empty\n"); + todo_wine ok(region_isempty[2], "region should be empty\n"); + ok(!region_isempty[3], "region shouldn't be empty\n"); + + for (i=0; i<4; i++) + GdipDeleteRegion(regions[i]); + + GdipDeleteStringFormat(format); GdipDeleteBrush(brush); GdipDeleteFont(font); GdipDeleteFontFamily(family);

1 0

Vincent Povirk : gdiplus: Implement GdipMeasureCharacterRanges.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: deb6466f3f059db7ad7943ef284d4bc0de1ca667 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deb6466f3f059db7ad7943ef2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 30 15:51:44 2010 -0500 gdiplus: Implement GdipMeasureCharacterRanges. --- dlls/gdiplus/graphics.c | 75 +++++++++++++++++++++++++++++++++++++++-- dlls/gdiplus/tests/graphics.c | 8 ++-- 2 files changed, 76 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index f6f5812..3d5a961 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3479,18 +3479,87 @@ static GpStatus gdip_format_string(GpGraphics *graphics, return stat; } +struct measure_ranges_args { + GpRegion **regions; +}; + +GpStatus measure_ranges_callback(GpGraphics *graphics, + GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font, + GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, + INT lineno, const RectF *bounds, void *user_data) +{ + int i; + GpStatus stat = Ok; + struct measure_ranges_args *args = user_data; + + for (i=0; i<format->range_count; i++) + { + INT range_start = max(index, format->character_ranges[i].First); + INT range_end = min(index+length, format->character_ranges[i].First+format->character_ranges[i].Length); + if (range_start < range_end) + { + GpRectF range_rect; + SIZE range_size; + + range_rect.Y = bounds->Y; + range_rect.Height = bounds->Height; + + GetTextExtentExPointW(graphics->hdc, string + index, range_start - index, + INT_MAX, NULL, NULL, &range_size); + range_rect.X = bounds->X + range_size.cx; + + GetTextExtentExPointW(graphics->hdc, string + index, range_end - index, + INT_MAX, NULL, NULL, &range_size); + range_rect.Width = (bounds->X + range_size.cx) - range_rect.X; + + stat = GdipCombineRegionRect(args->regions[i], &range_rect, CombineModeUnion); + if (stat != Ok) + break; + } + } + + return stat; +} + GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, GDIPCONST WCHAR* string, INT length, GDIPCONST GpFont* font, GDIPCONST RectF* layoutRect, GDIPCONST GpStringFormat *stringFormat, INT regionCount, GpRegion** regions) { - FIXME("stub: %p %s %d %p %p %p %d %p\n", graphics, debugstr_w(string), - length, font, layoutRect, stringFormat, regionCount, regions); + GpStatus stat; + int i; + HFONT oldfont; + struct measure_ranges_args args; + + TRACE("(%p %s %d %p %s %p %d %p)\n", graphics, debugstr_w(string), + length, font, debugstr_rectf(layoutRect), stringFormat, regionCount, regions); if (!(graphics && string && font && layoutRect && stringFormat && regions)) return InvalidParameter; - return NotImplemented; + if (regionCount < stringFormat->range_count) + return InvalidParameter; + + if (stringFormat->attr) + TRACE("may be ignoring some format flags: attr %x\n", stringFormat->attr); + + oldfont = SelectObject(graphics->hdc, CreateFontIndirectW(&font->lfw)); + + for (i=0; i<stringFormat->range_count; i++) + { + stat = GdipSetEmpty(regions[i]); + if (stat != Ok) + return stat; + } + + args.regions = regions; + + stat = gdip_format_string(graphics, string, length, font, layoutRect, stringFormat, + measure_ranges_callback, &args); + + DeleteObject(SelectObject(graphics->hdc, oldfont)); + + return stat; } struct measure_string_args { diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 17caf90..57ce638 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2590,10 +2590,10 @@ static void test_string_functions(void) expect(InvalidParameter, status); status = GdipMeasureCharacterRanges(graphics, teststring, 6, font, &rc, format, 2, regions); - todo_wine expect(InvalidParameter, status); + expect(InvalidParameter, status); status = GdipMeasureCharacterRanges(graphics, teststring, 6, font, &rc, format, 4, regions); - todo_wine expect(Ok, status); + expect(Ok, status); for (i=0; i<4; i++) { @@ -2611,7 +2611,7 @@ static void test_string_functions(void) rc.Height = char_bounds.Height + char_height * 0.5; status = GdipMeasureCharacterRanges(graphics, teststring, 6, font, &rc, format, 3, regions); - todo_wine expect(Ok, status); + expect(Ok, status); for (i=0; i<4; i++) { @@ -2621,7 +2621,7 @@ static void test_string_functions(void) ok(!region_isempty[0], "region shouldn't be empty\n"); ok(!region_isempty[1], "region shouldn't be empty\n"); - todo_wine ok(region_isempty[2], "region should be empty\n"); + ok(region_isempty[2], "region should be empty\n"); ok(!region_isempty[3], "region shouldn't be empty\n"); for (i=0; i<4; i++)

1 0

André Hentschel : msxml3: Make xmlnode_get_parsed a stub.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 20fbdfc3c24387008760bf80f9160e3f9b230d9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=20fbdfc3c24387008760bf80f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Mar 30 19:56:27 2010 +0200 msxml3: Make xmlnode_get_parsed a stub. --- dlls/msxml3/node.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index d628b13..9106a9f 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1548,8 +1548,9 @@ static HRESULT WINAPI xmlnode_get_parsed( VARIANT_BOOL* isParsed) { xmlnode *This = impl_from_IXMLDOMNode( iface ); - FIXME("(%p)->(%p)\n", This, isParsed); - return E_NOTIMPL; + FIXME("(%p)->(%p) stub!\n", This, isParsed); + *isParsed = VARIANT_TRUE; + return S_OK; } static HRESULT WINAPI xmlnode_get_namespaceURI(

1 0

Alexandre Julliard : msxml3: Remove unnecessary string constants.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: d3d2f4afce2e33f0d1af34ebad7107f3ad65ef65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3d2f4afce2e33f0d1af34eba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 31 11:47:10 2010 +0200 msxml3: Remove unnecessary string constants. --- dlls/msxml3/node.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 500fb94..d628b13 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1294,8 +1294,6 @@ static HRESULT WINAPI xmlnode_put_dataType( static BSTR EnsureCorrectEOL(BSTR sInput) { - static const WCHAR SZ_RETURN[] = {'\n',0}; - static const WCHAR SZ_LINEFEED[] = {'\r',0}; int nNum = 0; BSTR sNew; int nLen; @@ -1305,7 +1303,7 @@ static BSTR EnsureCorrectEOL(BSTR sInput) /* Count line endings */ for(i=0; i < nLen; i++) { - if(sInput[i] == SZ_RETURN[0]) + if(sInput[i] == '\n') nNum++; } @@ -1318,9 +1316,9 @@ static BSTR EnsureCorrectEOL(BSTR sInput) sNew = SysAllocStringLen(NULL, nLen + nNum+1); for(i=0; i < nLen; i++) { - if(sInput[i] == SZ_RETURN[0]) + if(sInput[i] == '\n') { - sNew[i+nPlace] = SZ_LINEFEED[0]; + sNew[i+nPlace] = '\r'; nPlace++; } sNew[i+nPlace] = sInput[i];

1 0

Stefan Leichter : ws2_32: Partly implement level IPPROTO_IPV6 of setsockopt .
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: d0eaf2ce0e2f67491aa43d4497136312c8ab15bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0eaf2ce0e2f67491aa43d449… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Mar 31 00:07:24 2010 +0200 ws2_32: Partly implement level IPPROTO_IPV6 of setsockopt. --- dlls/ws2_32/socket.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e4ee97c..3f87eb6 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -344,6 +344,21 @@ static const int ws_ip_map[][2] = MAP_OPTION( IP_TTL ), }; +static const int ws_ipv6_map[][2] = +{ +#ifdef IPV6_ADD_MEMBERSHIP + MAP_OPTION( IPV6_ADD_MEMBERSHIP ), +#endif +#ifdef IPV6_DROP_MEMBERSHIP + MAP_OPTION( IPV6_DROP_MEMBERSHIP ), +#endif + MAP_OPTION( IPV6_MULTICAST_IF ), + MAP_OPTION( IPV6_MULTICAST_HOPS ), + MAP_OPTION( IPV6_MULTICAST_LOOP ), + MAP_OPTION( IPV6_UNICAST_HOPS ), + MAP_OPTION( IPV6_V6ONLY ), +}; + static const int ws_af_map[][2] = { MAP_OPTION( AF_UNSPEC ), @@ -793,6 +808,17 @@ static int convert_sockopt(INT *level, INT *optname) } FIXME("Unknown IPPROTO_IP optname 0x%x\n", *optname); break; + case WS_IPPROTO_IPV6: + *level = IPPROTO_IPV6; + for(i=0; i<sizeof(ws_ipv6_map)/sizeof(ws_ipv6_map[0]); i++) { + if (ws_ipv6_map[i][0] == *optname ) + { + *optname = ws_ipv6_map[i][1]; + return 1; + } + } + FIXME("Unknown IPPROTO_IPV6 optname 0x%x\n", *optname); + break; default: FIXME("Unimplemented or unknown socket level\n"); } return 0; @@ -3467,6 +3493,27 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, } break; + case WS_IPPROTO_IPV6: + switch(optname) + { + case WS_IPV6_ADD_MEMBERSHIP: + case WS_IPV6_DROP_MEMBERSHIP: + case WS_IPV6_MULTICAST_IF: + case WS_IPV6_MULTICAST_HOPS: + case WS_IPV6_MULTICAST_LOOP: + case WS_IPV6_UNICAST_HOPS: + case WS_IPV6_V6ONLY: + convert_sockopt(&level, &optname); + break; + case WS_IPV6_DONTFRAG: + FIXME("IPV6_DONTFRAG is silently ignored!\n"); + return 0; + default: + FIXME("Unknown IPPROTO_IPV6 optname 0x%08x\n", optname); + return SOCKET_ERROR; + } + break; + default: WARN("Unknown level: 0x%08x\n", level); SetLastError(WSAEINVAL);

1 0

Marcus Meissner : kernel32: Initialize env (Coverity).
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 35dfd34a9f26156aa9ae670aa2555118b6d4180b URL: http://source.winehq.org/git/wine.git/?a=commit;h=35dfd34a9f26156aa9ae670aa… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Mar 31 10:22:25 2010 +0200 kernel32: Initialize env (Coverity). --- dlls/kernel32/process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 251da4e..1062aa6 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1618,9 +1618,9 @@ static const char *get_alternate_loader( char **ret_env ) if ((loader = strrchr( env, '/' ))) loader++; else loader = env; } + *ret_env = env; } if (!loader) loader = is_win64 ? "wine32" : "wine"; - *ret_env = env; return loader; }

1 0

André Hentschel : msxml3: Make xmlnode_get_specified a stub.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: b7aec2a215992a9abe613a1e36146f5e002908f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7aec2a215992a9abe613a1e3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Mar 30 19:56:44 2010 +0200 msxml3: Make xmlnode_get_specified a stub. --- dlls/msxml3/node.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 9106a9f..e263a2a 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -934,8 +934,9 @@ static HRESULT WINAPI xmlnode_get_specified( VARIANT_BOOL* isSpecified) { xmlnode *This = impl_from_IXMLDOMNode( iface ); - FIXME("(%p)->(%p)\n", This, isSpecified); - return E_NOTIMPL; + FIXME("(%p)->(%p) stub!\n", This, isSpecified); + *isSpecified = VARIANT_TRUE; + return S_OK; } static HRESULT WINAPI xmlnode_get_definition(

1 0