March 2011 - Wine-commits - list.winehq.org

John Edmonds : gdi32/tests: Updated tests for top-down destination bitmaps.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 374db9240b4c951c14b851dd5c840d55c6bf87fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=374db9240b4c951c14b851dd5… Author: John Edmonds <pocketcookies2(a)gmail.com> Date: Tue Mar 1 22:29:50 2011 -0500 gdi32/tests: Updated tests for top-down destination bitmaps. --- dlls/gdi32/tests/bitmap.c | 64 ++++++++++++++++++++++++++++---------------- 1 files changed, 41 insertions(+), 23 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 17601be..01ac758 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2956,7 +2956,7 @@ static void test_32bit_bitmap_blt(void) } /* - * Used by test_GetDIBits_single_pixel_destination to create the bitmap to test against. + * Used by test_GetDIBits_top_down to create the bitmap to test against. */ static void setup_picture(char *picture, int bpp) { @@ -2980,12 +2980,12 @@ static void setup_picture(char *picture, int bpp) } } -static void test_GetDIBits_single_pixel_destination(int bpp) +static void test_GetDIBits_top_down(int bpp) { BITMAPINFO bi; HBITMAP bmptb, bmpbt; HDC hdc; - int pixelOut; + int pictureOut[4]; int *picture; int statusCode; @@ -3015,36 +3015,54 @@ static void test_GetDIBits_single_pixel_destination(int bpp) bi.bmiHeader.biWidth = 1; bi.bmiHeader.biHeight = 2; - statusCode = GetDIBits(hdc, bmpbt, 0, 1, &pixelOut, &bi, DIB_RGB_COLORS); + statusCode = GetDIBits(hdc, bmpbt, 0, 1, pictureOut, &bi, DIB_RGB_COLORS); ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); /*Check the first byte of the pixel.*/ - ok((char)pixelOut == 0, "Bottom-up -> bottom-up: first pixel should be 0 but was %d.\n", (char)pixelOut); - statusCode = GetDIBits(hdc, bmptb, 0, 1, &pixelOut, &bi, DIB_RGB_COLORS); + ok((char)pictureOut[0] == 0, "Bottom-up -> bottom-up: first pixel should be 0 but was %d.\n", (char)pictureOut[0]); + statusCode = GetDIBits(hdc, bmptb, 0, 1, pictureOut, &bi, DIB_RGB_COLORS); ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); - ok((char)pixelOut == 2, "Top-down -> bottom-up: first pixel should be 2 but was %d.\n", (char)pixelOut); + ok((char)pictureOut[0] == 2, "Top-down -> bottom-up: first pixel should be 2 but was %d.\n", (char)pictureOut[0]); /*Check second scanline.*/ - statusCode = GetDIBits(hdc, bmptb, 1, 1, &pixelOut, &bi, DIB_RGB_COLORS); + statusCode = GetDIBits(hdc, bmptb, 1, 1, pictureOut, &bi, DIB_RGB_COLORS); ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); - ok((char)pixelOut == 0, "Top-down -> bottom-up: first pixel should be 0 but was %d.\n", (char)pixelOut); - statusCode = GetDIBits(hdc, bmpbt, 1, 1, &pixelOut, &bi, DIB_RGB_COLORS); + ok((char)pictureOut[0] == 0, "Top-down -> bottom-up: first pixel should be 0 but was %d.\n", (char)pictureOut[0]); + statusCode = GetDIBits(hdc, bmpbt, 1, 1, pictureOut, &bi, DIB_RGB_COLORS); ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); - ok((char)pixelOut == 2, "Top-down -> bottom-up: first pixel should be 2 but was %d.\n", (char)pixelOut); + ok((char)pictureOut[0] == 2, "Bottom-up -> bottom-up: first pixel should be 2 but was %d.\n", (char)pictureOut[0]); + /*Check both scanlines.*/ + statusCode = GetDIBits(hdc, bmptb, 0, 2, pictureOut, &bi, DIB_RGB_COLORS); + ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); + ok((char)pictureOut[0] == 2, "Top-down -> bottom-up: first scanline should be 2 but was %d.\n", (char)pictureOut[0]); + ok((char)pictureOut[1] == 0, "Top-down -> bottom-up: second scanline should be 0 but was %d.\n", (char)pictureOut[0]); + statusCode = GetDIBits(hdc, bmpbt, 0, 2, pictureOut, &bi, DIB_RGB_COLORS); + ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); + ok((char)pictureOut[0] == 0, "Bottom up -> bottom-up: first scanline should be 0 but was %d.\n", (char)pictureOut[0]); + ok((char)pictureOut[1] == 2, "Bottom up -> bottom-up: second scanline should be 2 but was %d.\n", (char)pictureOut[0]); - /*Make destination bitmap top-down. This should be ignored by GetDIBits.*/ + /*Make destination bitmap top-down.*/ bi.bmiHeader.biHeight = -2; - statusCode = GetDIBits(hdc, bmpbt, 0, 1, &pixelOut, &bi, DIB_RGB_COLORS); + statusCode = GetDIBits(hdc, bmpbt, 0, 1, pictureOut, &bi, DIB_RGB_COLORS); ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); - ok((char)pixelOut == 0, "Bottom-up -> top-down: first pixel should be 0 but was %d.\n", (char)pixelOut); - statusCode = GetDIBits(hdc, bmptb, 0, 1, &pixelOut, &bi, DIB_RGB_COLORS); + ok((char)pictureOut[0] == 0, "Bottom-up -> top-down: first pixel should be 0 but was %d.\n", (char)pictureOut[0]); + statusCode = GetDIBits(hdc, bmptb, 0, 1, pictureOut, &bi, DIB_RGB_COLORS); ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); - ok((char)pixelOut == 2, "Top-down -> top-down: first pixel should be 2 but was %d.\n", (char)pixelOut); + ok((char)pictureOut[0] == 2, "Top-down -> top-down: first pixel should be 2 but was %d.\n", (char)pictureOut[0]); /*Check second scanline.*/ - statusCode = GetDIBits(hdc, bmptb, 1, 1, &pixelOut, &bi, DIB_RGB_COLORS); + statusCode = GetDIBits(hdc, bmptb, 1, 1, pictureOut, &bi, DIB_RGB_COLORS); + ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); + ok((char)pictureOut[0] == 0, "Top-down -> bottom-up: first pixel should be 0 but was %d.\n", (char)pictureOut[0]); + statusCode = GetDIBits(hdc, bmpbt, 1, 1, pictureOut, &bi, DIB_RGB_COLORS); + ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); + ok((char)pictureOut[0] == 2, "Top-down -> bottom-up: first pixel should be 2 but was %d.\n", (char)pictureOut[0]); + /*Check both scanlines.*/ + statusCode = GetDIBits(hdc, bmptb, 0, 2, pictureOut, &bi, DIB_RGB_COLORS); ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); - ok((char)pixelOut == 0, "Top-down -> bottom-up: first pixel should be 0 but was %d.\n", (char)pixelOut); - statusCode = GetDIBits(hdc, bmpbt, 1, 1, &pixelOut, &bi, DIB_RGB_COLORS); + todo_wine ok((char)pictureOut[0] == 0, "Top-down -> top-down: first scanline should be 0 but was %d.\n", (char)pictureOut[0]); + todo_wine ok((char)pictureOut[1] == 2, "Top-down -> top-down: second scanline should be 2 but was %d.\n", (char)pictureOut[0]); + statusCode = GetDIBits(hdc, bmpbt, 0, 2, pictureOut, &bi, DIB_RGB_COLORS); ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); - ok((char)pixelOut == 2, "Top-down -> bottom-up: first pixel should be 2 but was %d.\n", (char)pixelOut); + todo_wine ok((char)pictureOut[0] == 2, "Bottom up -> top-down: first scanline should be 2 but was %d.\n", (char)pictureOut[0]); + todo_wine ok((char)pictureOut[1] == 0, "Bottom up -> top-down: second scanline should be 0 but was %d.\n", (char)pictureOut[0]); DeleteObject(bmpbt); DeleteObject(bmptb); @@ -3079,7 +3097,7 @@ START_TEST(bitmap) test_bitmapinfoheadersize(); test_get16dibits(); test_clipping(); - test_GetDIBits_single_pixel_destination(16); - test_GetDIBits_single_pixel_destination(24); - test_GetDIBits_single_pixel_destination(32); + test_GetDIBits_top_down(16); + test_GetDIBits_top_down(24); + test_GetDIBits_top_down(32); }

1 0

John Edmonds : gdi32: Fixes GetDIBits for top-down destination bitmaps.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 0d0d4f394fd9e3f66f6a8ca6855cb31f4c741272 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d0d4f394fd9e3f66f6a8ca68… Author: John Edmonds <pocketcookies2(a)gmail.com> Date: Tue Mar 1 22:29:51 2011 -0500 gdi32: Fixes GetDIBits for top-down destination bitmaps. --- dlls/gdi32/dib.c | 14 ++++++++++---- dlls/gdi32/tests/bitmap.c | 8 ++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index eae7f35..0abd833 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -874,7 +874,7 @@ INT WINAPI GetDIBits( unsigned int srcwidth = bmp->dib->dsBm.bmWidth; int srcwidthb = bmp->dib->dsBm.bmWidthBytes; unsigned int dstwidth = width; - unsigned int dstwidthb = DIB_GetDIBWidthBytes( width, bpp ); + int dstwidthb = DIB_GetDIBWidthBytes( width, bpp ); LPBYTE dbits = bits, sbits = (LPBYTE) bmp->dib->dsBm.bmBits + (startscan * srcwidthb); unsigned int x, y, width, widthb; @@ -888,6 +888,12 @@ INT WINAPI GetDIBits( sbits += (srcwidthb * (int)(abs(bmp->dib->dsBmih.biHeight) - 2 * startscan - 1)); srcwidthb = -srcwidthb; } + /*Same for the destination.*/ + if (height < 0) + { + dbits = (LPBYTE)bits + (dstwidthb * (lines - 1)); + dstwidthb = -dstwidthb; + } switch( bpp ) { case 15: @@ -902,7 +908,7 @@ INT WINAPI GetDIBits( case 16: /* 16 bpp srcDIB -> 16 bpp dstDIB */ { - widthb = min(abs(srcwidthb), dstwidthb); + widthb = min(abs(srcwidthb), abs(dstwidthb)); /* FIXME: BI_BITFIELDS not supported yet */ for (y = 0; y < lines; y++, dbits+=dstwidthb, sbits+=srcwidthb) memcpy(dbits, sbits, widthb); @@ -980,7 +986,7 @@ INT WINAPI GetDIBits( case 24: /* 24 bpp srcDIB -> 24 bpp dstDIB */ { - widthb = min(abs(srcwidthb), dstwidthb); + widthb = min(abs(srcwidthb), abs(dstwidthb)); for (y = 0; y < lines; y++, dbits+=dstwidthb, sbits+=srcwidthb) memcpy(dbits, sbits, widthb); } @@ -1056,7 +1062,7 @@ INT WINAPI GetDIBits( case 32: /* 32 bpp srcDIB -> 32 bpp dstDIB */ { - widthb = min(abs(srcwidthb), dstwidthb); + widthb = min(abs(srcwidthb), abs(dstwidthb)); /* FIXME: BI_BITFIELDS not supported yet */ for (y = 0; y < lines; y++, dbits+=dstwidthb, sbits+=srcwidthb) { memcpy(dbits, sbits, widthb); diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 01ac758..adef035 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -3057,12 +3057,12 @@ static void test_GetDIBits_top_down(int bpp) /*Check both scanlines.*/ statusCode = GetDIBits(hdc, bmptb, 0, 2, pictureOut, &bi, DIB_RGB_COLORS); ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); - todo_wine ok((char)pictureOut[0] == 0, "Top-down -> top-down: first scanline should be 0 but was %d.\n", (char)pictureOut[0]); - todo_wine ok((char)pictureOut[1] == 2, "Top-down -> top-down: second scanline should be 2 but was %d.\n", (char)pictureOut[0]); + ok((char)pictureOut[0] == 0, "Top-down -> top-down: first scanline should be 0 but was %d.\n", (char)pictureOut[0]); + ok((char)pictureOut[1] == 2, "Top-down -> top-down: second scanline should be 2 but was %d.\n", (char)pictureOut[0]); statusCode = GetDIBits(hdc, bmpbt, 0, 2, pictureOut, &bi, DIB_RGB_COLORS); ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); - todo_wine ok((char)pictureOut[0] == 2, "Bottom up -> top-down: first scanline should be 2 but was %d.\n", (char)pictureOut[0]); - todo_wine ok((char)pictureOut[1] == 0, "Bottom up -> top-down: second scanline should be 0 but was %d.\n", (char)pictureOut[0]); + ok((char)pictureOut[0] == 2, "Bottom up -> top-down: first scanline should be 2 but was %d.\n", (char)pictureOut[0]); + ok((char)pictureOut[1] == 0, "Bottom up -> top-down: second scanline should be 0 but was %d.\n", (char)pictureOut[0]); DeleteObject(bmpbt); DeleteObject(bmptb);

1 0

Andrew Eikum : dsound: Also handle two-to-six-channel conversions.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 54ff22b8443fcc3023ef8d384656f2f24608a2f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54ff22b8443fcc3023ef8d384… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Mar 1 14:57:35 2011 -0600 dsound: Also handle two-to-six-channel conversions. --- dlls/dsound/mixer.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 6647e4a..846278e 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -294,22 +294,29 @@ static inline void cp_fields(const IDirectSoundBufferImpl *dsb, const BYTE *ibuf INT istep = dsb->pwfx->wBitsPerSample / 8, ostep = device->pwfx->wBitsPerSample / 8; if (device->pwfx->nChannels == dsb->pwfx->nChannels || - (device->pwfx->nChannels == 2 && dsb->pwfx->nChannels == 6)) { + (device->pwfx->nChannels == 2 && dsb->pwfx->nChannels == 6) || + (device->pwfx->nChannels == 6 && dsb->pwfx->nChannels == 2)) { dsb->convert(ibuf, obuf, istride, ostride, count, freqAcc, adj); - if (device->pwfx->nChannels == 2) + if (device->pwfx->nChannels == 2 || dsb->pwfx->nChannels == 2) dsb->convert(ibuf + istep, obuf + ostep, istride, ostride, count, freqAcc, adj); + return; } if (device->pwfx->nChannels == 1 && dsb->pwfx->nChannels == 2) { dsb->convert(ibuf, obuf, istride, ostride, count, freqAcc, adj); + return; } if (device->pwfx->nChannels == 2 && dsb->pwfx->nChannels == 1) { dsb->convert(ibuf, obuf, istride, ostride, count, freqAcc, adj); dsb->convert(ibuf, obuf + ostep, istride, ostride, count, freqAcc, adj); + return; } + + WARN("Unable to remap channels: device=%u, buffer=%u\n", device->pwfx->nChannels, + dsb->pwfx->nChannels); } /**

1 0

Henri Verbeet : wined3d: The basetexture_set_dirty() return value is never used.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 7b2274dff19baece534fc3a9b1a331a7ac05c555 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b2274dff19baece534fc3a9b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 08:55:46 2011 +0100 wined3d: The basetexture_set_dirty() return value is never used. --- dlls/wined3d/basetexture.c | 7 +------ dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 8b2797e..2c88675 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -232,15 +232,10 @@ void basetexture_generate_mipmaps(IWineD3DBaseTextureImpl *texture) FIXME("texture %p stub!\n", texture); } -BOOL basetexture_set_dirty(IWineD3DBaseTextureImpl *texture, BOOL dirty) +void basetexture_set_dirty(IWineD3DBaseTextureImpl *texture, BOOL dirty) { - BOOL old; - - old = texture->baseTexture.texture_rgb.dirty || texture->baseTexture.texture_srgb.dirty; texture->baseTexture.texture_rgb.dirty = dirty; texture->baseTexture.texture_srgb.dirty = dirty; - - return old; } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0487a78..3155b04 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1925,7 +1925,7 @@ HRESULT basetexture_init(IWineD3DBaseTextureImpl *texture, const struct wined3d_ const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) DECLSPEC_HIDDEN; HRESULT basetexture_set_autogen_filter_type(IWineD3DBaseTextureImpl *texture, WINED3DTEXTUREFILTERTYPE filter_type) DECLSPEC_HIDDEN; -BOOL basetexture_set_dirty(IWineD3DBaseTextureImpl *texture, BOOL dirty) DECLSPEC_HIDDEN; +void basetexture_set_dirty(IWineD3DBaseTextureImpl *texture, BOOL dirty) DECLSPEC_HIDDEN; DWORD basetexture_set_lod(IWineD3DBaseTextureImpl *texture, DWORD lod) DECLSPEC_HIDDEN; void basetexture_unload(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Use basetexture_set_dirty() in some more places.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: fe425a2f23180ccbec4434ca9796167963fd0f6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe425a2f23180ccbec4434ca9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 08:55:47 2011 +0100 wined3d: Use basetexture_set_dirty() in some more places. --- dlls/wined3d/basetexture.c | 3 +-- dlls/wined3d/cubetexture.c | 3 +-- dlls/wined3d/texture.c | 3 +-- dlls/wined3d/volume.c | 3 +-- dlls/wined3d/volumetexture.c | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 2c88675..20685e4 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -122,8 +122,7 @@ void basetexture_unload(IWineD3DBaseTextureImpl *texture) if (context) context_release(context); - texture->baseTexture.texture_rgb.dirty = TRUE; - texture->baseTexture.texture_srgb.dirty = TRUE; + basetexture_set_dirty(texture, TRUE); resource_unload(&texture->resource); } diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 0fc5aba..47dcc2b 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -418,8 +418,7 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_AddDirtyRect(IWineD3DCubeTexture * return WINED3DERR_INVALIDCALL; } - texture->baseTexture.texture_rgb.dirty = TRUE; - texture->baseTexture.texture_srgb.dirty = TRUE; + basetexture_set_dirty(texture, TRUE); surface_add_dirty_rect(surface_from_resource(sub_resource), dirty_rect); return WINED3D_OK; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index df52996..32ff66b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -435,8 +435,7 @@ static HRESULT WINAPI IWineD3DTextureImpl_AddDirtyRect(IWineD3DTexture *iface, c return WINED3DERR_INVALIDCALL; } - texture->baseTexture.texture_rgb.dirty = TRUE; - texture->baseTexture.texture_srgb.dirty = TRUE; + basetexture_set_dirty(texture, TRUE); surface_add_dirty_rect(surface_from_resource(sub_resource), dirty_rect); return WINED3D_OK; diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 7c98cc9..e877cfb 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -279,8 +279,7 @@ static HRESULT WINAPI IWineD3DVolumeImpl_Map(IWineD3DVolume *iface, if (!(flags & (WINED3DLOCK_NO_DIRTY_UPDATE | WINED3DLOCK_READONLY))) { volume_add_dirty_box(This, &This->lockedBox); - This->container->baseTexture.texture_rgb.dirty = TRUE; - This->container->baseTexture.texture_srgb.dirty = TRUE; + basetexture_set_dirty((IWineD3DBaseTextureImpl *)This->container, TRUE); } This->locked = TRUE; diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 6ebd1c2..2ac6091 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -349,8 +349,7 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_AddDirtyBox(IWineD3DVolumeTextur return WINED3DERR_INVALIDCALL; } - texture->baseTexture.texture_rgb.dirty = TRUE; - texture->baseTexture.texture_srgb.dirty = TRUE; + basetexture_set_dirty(texture, TRUE); volume_add_dirty_box(volume_from_resource(sub_resource), dirty_box); return WINED3D_OK;

1 0

Henri Verbeet : wined3d: Standalone surfaces should never be sRGB.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: ddc7a803e96897b8e95e9ce6ca54021cbb68e87d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddc7a803e96897b8e95e9ce6c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 08:55:48 2011 +0100 wined3d: Standalone surfaces should never be sRGB. --- dlls/wined3d/surface.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b0f9dc6..0897467 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -707,24 +707,25 @@ void surface_bind(IWineD3DSurfaceImpl *surface, BOOL srgb) } else { - GLuint *name = srgb ? &surface->texture_name_srgb : &surface->texture_name; - if (surface->texture_level) { ERR("Standalone surface %p is non-zero texture level %u.\n", surface, surface->texture_level); } + if (srgb) + ERR("Trying to bind standalone surface %p as sRGB.\n", surface); + ENTER_GL(); - if (!*name) + if (!surface->texture_name) { - glGenTextures(1, name); + glGenTextures(1, &surface->texture_name); checkGLcall("glGenTextures"); - TRACE("Surface %p given name %u.\n", surface, *name); + TRACE("Surface %p given name %u.\n", surface, surface->texture_name); - glBindTexture(surface->texture_target, *name); + glBindTexture(surface->texture_target, surface->texture_name); checkGLcall("glBindTexture"); glTexParameteri(surface->texture_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(surface->texture_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); @@ -735,7 +736,7 @@ void surface_bind(IWineD3DSurfaceImpl *surface, BOOL srgb) } else { - glBindTexture(surface->texture_target, *name); + glBindTexture(surface->texture_target, surface->texture_name); checkGLcall("glBindTexture"); }

1 0

Henri Verbeet : wined3d: Retrieve the surface' s texture name through a function.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: d523dee76b032e269d8724c43dc77d8f325fafae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d523dee76b032e269d8724c43… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 08:55:49 2011 +0100 wined3d: Retrieve the surface's texture name through a function. --- dlls/wined3d/context.c | 14 ++++++-------- dlls/wined3d/wined3d_private.h | 5 +++++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index cc0ad7e..9ace3b2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -273,20 +273,18 @@ static void context_attach_surface_fbo(const struct wined3d_context *context, if (surface && surface->resource.format->id != WINED3DFMT_NULL) { + BOOL srgb; + switch (location) { case SFLAG_INTEXTURE: - surface_prepare_texture(surface, gl_info, FALSE); - context_apply_attachment_filter_states(surface, location); - gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_COLOR_ATTACHMENT0 + idx, - surface->texture_target, surface->texture_name, surface->texture_level); - break; - case SFLAG_INSRGBTEX: - surface_prepare_texture(surface, gl_info, TRUE); + srgb = location == SFLAG_INSRGBTEX; + surface_prepare_texture(surface, gl_info, srgb); context_apply_attachment_filter_states(surface, location); gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_COLOR_ATTACHMENT0 + idx, - surface->texture_target, surface->texture_name_srgb, surface->texture_level); + surface->texture_target, surface_get_texture_name(surface, srgb), + surface->texture_level); break; default: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3155b04..32a2189 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2155,6 +2155,11 @@ static inline IWineD3DSurfaceImpl *surface_from_resource(struct wined3d_resource return CONTAINING_RECORD(resource, IWineD3DSurfaceImpl, resource); } +static inline GLuint surface_get_texture_name(IWineD3DSurfaceImpl *surface, BOOL srgb) +{ + return srgb ? surface->texture_name_srgb : surface->texture_name; +} + void surface_add_dirty_rect(IWineD3DSurfaceImpl *surface, const RECT *dirty_rect) DECLSPEC_HIDDEN; void surface_bind(IWineD3DSurfaceImpl *surface, BOOL srgb) DECLSPEC_HIDDEN; HRESULT surface_color_fill(IWineD3DSurfaceImpl *s, const RECT *rect, const WINED3DCOLORVALUE *color) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : server: Map the Unix user id to a local user SID instead of the interactive SID.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: c65bcce5899ba81226295303ed3df73a7be86c09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c65bcce5899ba81226295303e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 2 10:46:12 2011 +0100 server: Map the Unix user id to a local user SID instead of the interactive SID. --- dlls/advapi32/tests/security.c | 12 +++--------- dlls/kernel32/tests/environ.c | 3 +-- server/registry.c | 2 +- server/security.h | 2 +- server/token.c | 13 +++++++++++-- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 4ba244f..3dae81b 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1674,10 +1674,7 @@ static void test_LookupAccountSid(void) user_sizeA = MAX_PATH; ret = GetUserNameA(usernameA , &user_sizeA); ok(ret, "GetUserNameA() Expected TRUE, got FALSE\n"); - todo_wine - { - ok(lstrcmpA(usernameA, accountA) == 0, "LookupAccountSidA() Expected account name: %s got: %s\n", usernameA, accountA ); - } + ok(lstrcmpA(usernameA, accountA) == 0, "LookupAccountSidA() Expected account name: %s got: %s\n", usernameA, accountA ); } HeapFree(GetProcessHeap(), 0, ptiUser); @@ -1912,11 +1909,8 @@ static void test_LookupAccountName(void) get_sid_info(psid, &account, &sid_dom); ok(ret, "Failed to lookup account name\n"); ok(sid_size == GetLengthSid(psid), "Expected %d, got %d\n", GetLengthSid(psid), sid_size); - todo_wine - { - ok(!lstrcmp(account, user_name), "Expected %s, got %s\n", user_name, account); - ok(!lstrcmp(domain, sid_dom), "Expected %s, got %s\n", sid_dom, domain); - } + ok(!lstrcmp(account, user_name), "Expected %s, got %s\n", user_name, account); + ok(!lstrcmp(domain, sid_dom), "Expected %s, got %s\n", sid_dom, domain); ok(domain_size == domain_save - 1, "Expected %d, got %d\n", domain_save - 1, domain_size); ok(strlen(domain) == domain_size, "Expected %d, got %d\n", lstrlen(domain), domain_size); ok(sid_use == SidTypeUser, "Expected SidTypeUser (%d), got %d\n", SidTypeUser, sid_use); diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index 0a7eef9..3ac86cd 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -72,8 +72,7 @@ static void test_Predefined(void) ok(NoErr, "Failed to open token, error %u\n", GetLastError()); DataSize = sizeof(Data); NoErr = pGetUserProfileDirectoryA(Token, Data, &DataSize); - todo_wine ok(NoErr, "Failed to get user profile dir, error %u\n", - GetLastError()); + ok(NoErr, "Failed to get user profile dir, error %u\n", GetLastError()); if (NoErr) { EnvSize = GetEnvironmentVariableA("USERPROFILE", Env, sizeof(Env)); diff --git a/server/registry.c b/server/registry.c index 2aea747..a144c26 100644 --- a/server/registry.c +++ b/server/registry.c @@ -1718,7 +1718,7 @@ void init_registry(void) /* load user.reg into HKEY_CURRENT_USER */ /* FIXME: match default user in token.c. should get from process token instead */ - current_user_path = format_user_registry_path( security_interactive_sid, &current_user_str ); + current_user_path = format_user_registry_path( security_local_user_sid, &current_user_str ); if (!current_user_path || !(hkcu = create_key_recursive( root_key, &current_user_str, current_time ))) fatal_error( "could not create HKEY_CURRENT_USER registry key\n" ); diff --git a/server/security.h b/server/security.h index 33cf5da..d5f629d 100644 --- a/server/security.h +++ b/server/security.h @@ -40,7 +40,7 @@ extern const LUID SeImpersonatePrivilege; extern const LUID SeCreateGlobalPrivilege; extern const PSID security_world_sid; -extern const PSID security_interactive_sid; +extern const PSID security_local_user_sid; extern const PSID security_local_system_sid; diff --git a/server/token.c b/server/token.c index 69ffab7..e8e85fc 100644 --- a/server/token.c +++ b/server/token.c @@ -70,11 +70,20 @@ static const SID interactive_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, static const SID anonymous_logon_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_ANONYMOUS_LOGON_RID } }; static const SID authenticated_user_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_AUTHENTICATED_USER_RID } }; static const SID local_system_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_LOCAL_SYSTEM_RID } }; +static const struct /* same fields as struct SID */ +{ + BYTE Revision; + BYTE SubAuthorityCount; + SID_IDENTIFIER_AUTHORITY IdentifierAuthority; + DWORD SubAuthority[5]; +} local_user_sid = { SID_REVISION, 5, { SECURITY_NT_AUTHORITY }, { SECURITY_NT_NON_UNIQUE, 0, 0, 0, 1000 } }; + const PSID security_world_sid = (PSID)&world_sid; static const PSID security_local_sid = (PSID)&local_sid; -const PSID security_interactive_sid = (PSID)&interactive_sid; +static const PSID security_interactive_sid = (PSID)&interactive_sid; static const PSID security_authenticated_user_sid = (PSID)&authenticated_user_sid; const PSID security_local_system_sid = (PSID)&local_system_sid; +const PSID security_local_user_sid = (PSID)&local_user_sid; static luid_t prev_luid_value = { 1000, 0 }; @@ -194,7 +203,7 @@ const SID *security_unix_uid_to_sid( uid_t uid ) { /* very simple mapping: either the current user or not the current user */ if (uid == getuid()) - return &interactive_sid; + return (const SID *)&local_user_sid; else return &anonymous_logon_sid; }

1 0

Hans Leidekker : advapi32: Use a fixed computer SID that matches local user SIDs.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 837fc836aacfc1ea654e3c6c29b74c14d9bd9686 URL: http://source.winehq.org/git/wine.git/?a=commit;h=837fc836aacfc1ea654e3c6c2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 2 10:46:30 2011 +0100 advapi32: Use a fixed computer SID that matches local user SIDs. --- dlls/advapi32/lsa.c | 1 - dlls/advapi32/security.c | 64 +++++++-------------------------------------- 2 files changed, 10 insertions(+), 55 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 863ddb2..4806216 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -656,7 +656,6 @@ NTSTATUS WINAPI LsaQueryInformationPolicy( xdi->info.DomainSid = &xdi->sid; - /* read the computer SID from the registry */ if (!ADVAPI_GetComputerSid(&xdi->sid)) { HeapFree(GetProcessHeap(), 0, xdi); diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index de090dc..1aa7990 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -446,64 +446,20 @@ BOOL ADVAPI_IsLocalComputer(LPCWSTR ServerName) /************************************************************ * ADVAPI_GetComputerSid - * - * Reads the computer SID from the registry. */ BOOL ADVAPI_GetComputerSid(PSID sid) { - HKEY key; - LONG ret; - BOOL retval = FALSE; - static const WCHAR Account[] = { 'S','E','C','U','R','I','T','Y','\\','S','A','M','\\','D','o','m','a','i','n','s','\\','A','c','c','o','u','n','t',0 }; - static const WCHAR V[] = { 'V',0 }; - - if ((ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, Account, 0, - KEY_READ, &key)) == ERROR_SUCCESS) + static const struct /* same fields as struct SID */ { - DWORD size = 0; - ret = RegQueryValueExW(key, V, NULL, NULL, NULL, &size); - if (ret == ERROR_MORE_DATA || ret == ERROR_SUCCESS) - { - BYTE * data = HeapAlloc(GetProcessHeap(), 0, size); - if (data) - { - if ((ret = RegQueryValueExW(key, V, NULL, NULL, - data, &size)) == ERROR_SUCCESS) - { - /* the SID is in the last 24 bytes of the binary data */ - CopyMemory(sid, &data[size-24], 24); - retval = TRUE; - } - HeapFree(GetProcessHeap(), 0, data); - } - } - RegCloseKey(key); - } - - if(retval == TRUE) return retval; - - /* create a new random SID */ - if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, Account, - 0, NULL, 0, KEY_ALL_ACCESS, NULL, &key, NULL) == ERROR_SUCCESS) - { - PSID new_sid; - SID_IDENTIFIER_AUTHORITY identifierAuthority = {SECURITY_NT_AUTHORITY}; - DWORD id[3]; - - if (RtlGenRandom(id, sizeof(id))) - { - if (AllocateAndInitializeSid(&identifierAuthority, 4, SECURITY_NT_NON_UNIQUE, id[0], id[1], id[2], 0, 0, 0, 0, &new_sid)) - { - if (RegSetValueExW(key, V, 0, REG_BINARY, new_sid, GetLengthSid(new_sid)) == ERROR_SUCCESS) - retval = CopySid(GetLengthSid(new_sid), sid, new_sid); - - FreeSid(new_sid); - } - } - RegCloseKey(key); - } - - return retval; + BYTE Revision; + BYTE SubAuthorityCount; + SID_IDENTIFIER_AUTHORITY IdentifierAuthority; + DWORD SubAuthority[4]; + } computer_sid = + { SID_REVISION, 4, { SECURITY_NT_AUTHORITY }, { SECURITY_NT_NON_UNIQUE, 0, 0, 0 } }; + + memcpy( sid, &computer_sid, sizeof(computer_sid) ); + return TRUE; } /* ##############################

1 0

Juan Lang : wininet: De-Hungarian appinfo member names.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 7243156bc1d34d97b17245c06b546c997ef61f64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7243156bc1d34d97b17245c06… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 1 11:00:49 2011 -0800 wininet: De-Hungarian appinfo member names. --- dlls/wininet/dialogs.c | 10 +++--- dlls/wininet/ftp.c | 6 ++-- dlls/wininet/http.c | 26 ++++++++-------- dlls/wininet/internet.c | 78 +++++++++++++++++++++++----------------------- dlls/wininet/internet.h | 12 +++--- 5 files changed, 66 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7243156bc1d34d97b1724…

1 0