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

Henri Verbeet : ddraw: Remove rectangle validation from ddraw_surface7_BltFast().
by Alexandre Julliard Aug. 5, 2011

Aug. 5, 2011

Module: wine Branch: master Commit: 831801dd60ffee59f9f3c7532d0a3e18a5a3ef96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=831801dd60ffee59f9f3c7532… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 4 19:53:28 2011 +0200 ddraw: Remove rectangle validation from ddraw_surface7_BltFast(). This is already done by wined3d_surface_blt(). --- dlls/ddraw/surface.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index b51c360..2b06cb9 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3622,14 +3622,6 @@ static HRESULT WINAPI ddraw_surface7_BltFast(IDirectDrawSurface7 *iface, DWORD d */ if(rsrc) { - if(rsrc->top > rsrc->bottom || rsrc->left > rsrc->right || - rsrc->right > src->surface_desc.dwWidth || - rsrc->bottom > src->surface_desc.dwHeight) - { - WARN("Source rectangle is invalid, returning DDERR_INVALIDRECT\n"); - return DDERR_INVALIDRECT; - } - src_w = rsrc->right - rsrc->left; src_h = rsrc->bottom - rsrc->top; }

1 0

Henri Verbeet : wined3d: Always pass a non-NULL rectangle to surface_color_fill() in wined3d_device_color_fill().
by Alexandre Julliard Aug. 5, 2011

Aug. 5, 2011

Module: wine Branch: master Commit: 7e8e7ecebb2b2574cf185fa92e171844efe895bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e8e7ecebb2b2574cf185fa92… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 4 19:53:29 2011 +0200 wined3d: Always pass a non-NULL rectangle to surface_color_fill() in wined3d_device_color_fill(). --- dlls/wined3d/device.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 19aa3d0..ee08b7d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4981,6 +4981,8 @@ HRESULT CDECL wined3d_device_delete_patch(struct wined3d_device *device, UINT ha HRESULT CDECL wined3d_device_color_fill(struct wined3d_device *device, struct wined3d_surface *surface, const RECT *rect, const WINED3DCOLORVALUE *color) { + RECT r; + TRACE("device %p, surface %p, rect %s, color {%.8e, %.8e, %.8e, %.8e}.\n", device, surface, wine_dbgstr_rect(rect), color->r, color->g, color->b, color->a); @@ -4991,6 +4993,12 @@ HRESULT CDECL wined3d_device_color_fill(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } + if (!rect) + { + SetRect(&r, 0, 0, surface->resource.width, surface->resource.height); + rect = &r; + } + return surface_color_fill(surface, rect, color); }

1 0

Alexandre Julliard : gdi32: Always set compression to BI_BITFIELDS for 16-bpp DIB sections.
by Alexandre Julliard Aug. 5, 2011

Aug. 5, 2011

Module: wine Branch: master Commit: c668354cc0d66f8f8a73fa1c302aad41c36eb869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c668354cc0d66f8f8a73fa1c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 5 12:30:10 2011 +0200 gdi32: Always set compression to BI_BITFIELDS for 16-bpp DIB sections. --- dlls/gdi32/dib.c | 9 ++------- dlls/gdi32/tests/dib.c | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 79d339b..ebc6fe4 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1221,15 +1221,9 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, dib->dsBmih.biClrUsed = 1 << info->bmiHeader.biBitCount; /* set dsBitfields values */ - dib->dsBitfields[0] = dib->dsBitfields[1] = dib->dsBitfields[2] = 0; - if (info->bmiHeader.biBitCount == 16 && info->bmiHeader.biCompression == BI_RGB) { - /* In this case Windows changes biCompression to BI_BITFIELDS, - however for now we won't do this, as there are a lot - of places where BI_BITFIELDS is currently unsupported. */ - - /* dib->dsBmih.biCompression = compression = BI_BITFIELDS;*/ + dib->dsBmih.biCompression = BI_BITFIELDS; dib->dsBitfields[0] = 0x7c00; dib->dsBitfields[1] = 0x03e0; dib->dsBitfields[2] = 0x001f; @@ -1241,6 +1235,7 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, dib->dsBitfields[2] = *((const DWORD *)bmi->bmiColors + 2); if (!dib->dsBitfields[0] || !dib->dsBitfields[1] || !dib->dsBitfields[2]) goto error; } + else dib->dsBitfields[0] = dib->dsBitfields[1] = dib->dsBitfields[2] = 0; /* get storage location for DIB bits */ diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 69f241c..a1c9d27 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -1125,7 +1125,6 @@ static void test_simple_graphics(void) ok(ds.dsBitfields[0] == 0x7c00, "got %08x\n", ds.dsBitfields[0]); ok(ds.dsBitfields[1] == 0x03e0, "got %08x\n", ds.dsBitfields[1]); ok(ds.dsBitfields[2] == 0x001f, "got %08x\n", ds.dsBitfields[2]); -todo_wine ok(ds.dsBmih.biCompression == BI_BITFIELDS, "got %x\n", ds.dsBmih.biCompression); orig_bm = SelectObject(mem_dc, dib);

1 0

Henri Verbeet : wined3d: Pass a non-NULL rectangle to surface_color_fill() in wined3d_device_clear_rendertarget_view().
by Alexandre Julliard Aug. 5, 2011

Aug. 5, 2011

Module: wine Branch: master Commit: 293bf961ed7e161b29069f99a737d6249ca25365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=293bf961ed7e161b29069f99a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 4 19:53:30 2011 +0200 wined3d: Pass a non-NULL rectangle to surface_color_fill() in wined3d_device_clear_rendertarget_view(). --- dlls/wined3d/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ee08b7d..66f89f1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5008,6 +5008,7 @@ void CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *device, { struct wined3d_resource *resource; HRESULT hr; + RECT rect; resource = rendertarget_view->resource; if (resource->resourceType != WINED3DRTYPE_SURFACE) @@ -5016,7 +5017,8 @@ void CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *device, return; } - hr = surface_color_fill(surface_from_resource(resource), NULL, color); + SetRect(&rect, 0, 0, resource->width, resource->height); + hr = surface_color_fill(surface_from_resource(resource), &rect, color); if (FAILED(hr)) ERR("Color fill failed, hr %#x.\n", hr); }

1 0

André Hentschel : c2man: Mark the file used if a comment is found.
by Alexandre Julliard Aug. 5, 2011

Aug. 5, 2011

Module: wine Branch: master Commit: 1923e0e159b0c8140cf28d5378bd7c34b2ac1fa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1923e0e159b0c8140cf28d537… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Aug 4 21:08:37 2011 +0200 c2man: Mark the file used if a comment is found. --- tools/c2man.pl | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/c2man.pl b/tools/c2man.pl index ce8a444..7eca8c4 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -300,6 +300,9 @@ sub process_source_file($) { if ( /^\/\**$/ ) { + # This file is used by the DLL - Make sure we get our contributors right + @{$spec_files{$comment->{DLL_NAME}}[0]->{CURRENT_EXTRA}} = (); + push (@{$spec_files{$comment->{DLL_NAME}}[0]->{SOURCES}},$comment->{FILE}); # Found a comment start $comment->{COMMENT_NAME} = ""; $comment->{ALT_NAME} = ""; @@ -419,10 +422,6 @@ sub process_source_file($) if ($parse_state == 4) # Reading in the function definition { - # This file is used by the DLL - Make sure we get our contributors right - @{$spec_files{$comment->{DLL_NAME}}[0]->{CURRENT_EXTRA}} = (); - push (@{$spec_files{$comment->{DLL_NAME}}[0]->{SOURCES}},$comment->{FILE}); - push (@{$comment->{PROTOTYPE}},$_); # Strip comments from the line before checking for ')' my $stripped_line = $_;

1 0

Alexandre Julliard : gdi32: Always use BI_BITFIELDS for 16-bpp in GetImage.
by Alexandre Julliard Aug. 5, 2011

Aug. 5, 2011

Module: wine Branch: master Commit: 3a1194edd7f3c289a2b901bf5ddee65d1119dca3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a1194edd7f3c289a2b901bf5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 5 12:33:58 2011 +0200 gdi32: Always use BI_BITFIELDS for 16-bpp in GetImage. --- dlls/gdi32/bitmap.c | 8 ++++++++ dlls/gdi32/dibdrv/dc.c | 23 ++++++++--------------- dlls/winex11.drv/bitblt.c | 3 +-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 69b09ad..8117d6d 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -67,6 +67,14 @@ DWORD nulldrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, info->bmiHeader.biYPelsPerMeter = 0; info->bmiHeader.biClrUsed = 0; info->bmiHeader.biClrImportant = 0; + if (bmp->bitmap.bmBitsPixel == 16) + { + DWORD *masks = (DWORD *)info->bmiColors; + masks[0] = 0x7c00; + masks[1] = 0x03e0; + masks[2] = 0x001f; + info->bmiHeader.biCompression = BI_BITFIELDS; + } if (!bits) goto done; height = src->visrect.bottom - src->visrect.top; diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 17b2966..b5f4f2b 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -339,6 +339,8 @@ static BOOL dibdrv_DeleteDC( PHYSDEV dev ) static void set_color_info( const dib_info *dib, BITMAPINFO *info ) { + DWORD *masks = (DWORD *)info->bmiColors; + info->bmiHeader.biCompression = BI_RGB; info->bmiHeader.biClrUsed = 0; @@ -355,19 +357,14 @@ static void set_color_info( const dib_info *dib, BITMAPINFO *info ) } break; case 16: - if (dib->funcs != &funcs_555) - { - DWORD *masks = (DWORD *)info->bmiColors; - masks[0] = dib->red_mask; - masks[1] = dib->green_mask; - masks[2] = dib->blue_mask; - info->bmiHeader.biCompression = BI_BITFIELDS; - } + masks[0] = dib->red_mask; + masks[1] = dib->green_mask; + masks[2] = dib->blue_mask; + info->bmiHeader.biCompression = BI_BITFIELDS; break; case 32: if (dib->funcs != &funcs_8888) { - DWORD *masks = (DWORD *)info->bmiColors; masks[0] = dib->red_mask; masks[1] = dib->green_mask; masks[2] = dib->blue_mask; @@ -417,12 +414,8 @@ static DWORD dibdrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, } break; case 16: - if (bmp->dib->dsBmih.biCompression == BI_BITFIELDS && - memcmp( bmp->dib->dsBitfields, bit_fields_555, sizeof(bmp->dib->dsBitfields) )) - { - info->bmiHeader.biCompression = BI_BITFIELDS; - memcpy( info->bmiColors, bmp->dib->dsBitfields, sizeof(bmp->dib->dsBitfields) ); - } + info->bmiHeader.biCompression = BI_BITFIELDS; + memcpy( info->bmiColors, bmp->dib->dsBitfields, sizeof(bmp->dib->dsBitfields) ); break; case 32: if (bmp->dib->dsBmih.biCompression == BI_BITFIELDS && diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 8d2383a..7f314c2 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1641,8 +1641,7 @@ static void set_color_info( PHYSDEV dev, const ColorShifts *color_shifts, BITMAP colors[0] = color_shifts->logicalRed.max << color_shifts->logicalRed.shift; colors[1] = color_shifts->logicalGreen.max << color_shifts->logicalGreen.shift; colors[2] = color_shifts->logicalBlue.max << color_shifts->logicalBlue.shift; - if (colors[0] != 0x7c00 || colors[1] != 0x03e0 || colors[2] != 0x001f) - info->bmiHeader.biCompression = BI_BITFIELDS; + info->bmiHeader.biCompression = BI_BITFIELDS; break; case 32: colors[0] = color_shifts->logicalRed.max << color_shifts->logicalRed.shift;

1 0

Francois Gouget : kernel32: Implement K32GetProcessImageFileNameA().
by Alexandre Julliard Aug. 5, 2011

Aug. 5, 2011

Module: wine Branch: master Commit: 3b239dbc62b6bb73126c987ccd080a8911df064a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b239dbc62b6bb73126c987cc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 5 09:56:26 2011 +0200 kernel32: Implement K32GetProcessImageFileNameA(). --- dlls/kernel32/process.c | 3 +-- dlls/psapi/tests/psapi_main.c | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 9bc5070..b0eba7c 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3479,8 +3479,7 @@ cleanup: */ DWORD WINAPI K32GetProcessImageFileNameA( HANDLE process, LPSTR file, DWORD size ) { - FIXME("(%p, %p, %d) stub\n", process, file, size ); - return 0; + return QueryFullProcessImageNameA(process, PROCESS_NAME_NATIVE, file, &size) ? size : 0; } /*********************************************************************** diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index b855250..c4c129b 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -222,15 +222,15 @@ static void test_GetProcessImageFileName(void) SetLastError(0xdeadbeef); pGetProcessImageFileNameA(NULL, szImgPath, sizeof(szImgPath)); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); SetLastError(0xdeadbeef); pGetProcessImageFileNameA(hpSR, szImgPath, sizeof(szImgPath)); - todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError(0xdeadbeef); pGetProcessImageFileNameA(hpQI, szImgPath, 0); - todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected error=ERROR_INSUFFICIENT_BUFFER but got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected error=ERROR_INSUFFICIENT_BUFFER but got %d\n", GetLastError()); ret = pGetProcessImageFileNameA(hpQI, szImgPath, sizeof(szImgPath)); ret1 = pGetMappedFileNameA(hpQV, hMod, szMapPath, sizeof(szMapPath));

1 0

Alexandre Julliard : gdi32: Add a missing release in the error path.
by Alexandre Julliard Aug. 5, 2011

Aug. 5, 2011

Module: wine Branch: master Commit: 805f083f3464b7f4b9f68cbe67578cb12cbbcd4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=805f083f3464b7f4b9f68cbe6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 5 10:58:16 2011 +0200 gdi32: Add a missing release in the error path. --- dlls/gdi32/bitmap.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 3d7e1a2..69b09ad 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -179,6 +179,7 @@ update_format: info->bmiHeader.biPlanes = 1; info->bmiHeader.biBitCount = bmp->bitmap.bmBitsPixel; if (info->bmiHeader.biHeight > 0) info->bmiHeader.biHeight = -info->bmiHeader.biHeight; + GDI_ReleaseObj( hbitmap ); return ERROR_BAD_FORMAT; }

1 0

Frédéric Delanoy : tests: Assorted spelling fixes .
by Alexandre Julliard Aug. 4, 2011

Aug. 4, 2011

1 0

Mariusz Pluciński : shell32/tests: Add verification of FOLDERID_ProgramFilesX64 and FOLDERID_ProgramFilesCommonX64 .
by Alexandre Julliard Aug. 4, 2011

Aug. 4, 2011

Module: wine Branch: master Commit: faa9d41e7f2cd6e6d793badeb110373bd2a7daf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faa9d41e7f2cd6e6d793badeb… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu Aug 4 16:25:47 2011 +0200 shell32/tests: Add verification of FOLDERID_ProgramFilesX64 and FOLDERID_ProgramFilesCommonX64. These two known folders exists on 64-bit Windows versions. --- dlls/shell32/tests/shellpath.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 92a4b6d..0db72df 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1390,6 +1390,15 @@ static const struct knownFolderDef known_folders[] = { NULL, 0, 0), + KNOWN_FOLDER(FOLDERID_ProgramFilesCommonX64, + NO_CSIDL, + "ProgramFilesCommonX64", + KF_CATEGORY_FIXED, + GUID_NULL, + NULL, + NULL, + 0, + 0), KNOWN_FOLDER(FOLDERID_ProgramFilesCommonX86, NO_CSIDL, "ProgramFilesCommonX86", @@ -1399,6 +1408,15 @@ static const struct knownFolderDef known_folders[] = { NULL, 0, 0), + KNOWN_FOLDER(FOLDERID_ProgramFilesX64, + NO_CSIDL, + "ProgramFilesX64", + KF_CATEGORY_FIXED, + GUID_NULL, + NULL, + NULL, + 0, + 0), KNOWN_FOLDER(FOLDERID_ProgramFilesX86, CSIDL_PROGRAM_FILESX86, "ProgramFilesX86",

1 0