July 2012 - Wine-commits - list.winehq.org

Nikolay Sivov : ole32: Fix QueryInterface for IErrorInfo to return IUnknown pointer.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 959814a3bdb8bb7337840e7cb93cea9f2fbd00fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=959814a3bdb8bb7337840e7cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 17 11:22:59 2012 +0400 ole32: Fix QueryInterface for IErrorInfo to return IUnknown pointer. --- dlls/ole32/errorinfo.c | 2 +- dlls/ole32/tests/errorinfo.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c index 6a499fc..055d6a5 100644 --- a/dlls/ole32/errorinfo.c +++ b/dlls/ole32/errorinfo.c @@ -160,7 +160,7 @@ static HRESULT WINAPI IErrorInfoImpl_QueryInterface( *ppvoid = NULL; - if(IsEqualIID(riid, &IID_IErrorInfo)) + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IErrorInfo)) { *ppvoid = &This->IErrorInfo_iface; } diff --git a/dlls/ole32/tests/errorinfo.c b/dlls/ole32/tests/errorinfo.c index f55d480..bb350ae 100644 --- a/dlls/ole32/tests/errorinfo.c +++ b/dlls/ole32/tests/errorinfo.c @@ -47,10 +47,15 @@ static void test_error_info(void) static WCHAR wszDescription[] = {'F','a','i','l','e','d',' ','S','p','r','o','c','k','e','t',0}; static WCHAR wszHelpFile[] = {'s','p','r','o','c','k','e','t','.','h','l','p',0}; static WCHAR wszSource[] = {'s','p','r','o','c','k','e','t',0}; + IUnknown *unk; hr = CreateErrorInfo(&pCreateErrorInfo); ok_ole_success(hr, "CreateErrorInfo"); + hr = ICreateErrorInfo_QueryInterface(pCreateErrorInfo, &IID_IUnknown, (void**)&unk); + ok_ole_success(hr, "QI"); + IUnknown_Release(unk); + hr = ICreateErrorInfo_SetDescription(pCreateErrorInfo, NULL); ok_ole_success(hr, "ICreateErrorInfo_SetDescription"); @@ -78,6 +83,10 @@ static void test_error_info(void) hr = ICreateErrorInfo_QueryInterface(pCreateErrorInfo, &IID_IErrorInfo, (void **)&pErrorInfo); ok_ole_success(hr, "ICreateErrorInfo_QueryInterface"); + hr = IErrorInfo_QueryInterface(pErrorInfo, &IID_IUnknown, (void**)&unk); + ok_ole_success(hr, "QI"); + IUnknown_Release(unk); + ICreateErrorInfo_Release(pCreateErrorInfo); hr = SetErrorInfo(0, pErrorInfo);

1 0

Jacek Caban : d3drmdef.h: Replace unsigned long by ULONG.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 80ebe35aa7e9249fea86ec165163d5bdaa04318d URL: http://source.winehq.org/git/wine.git/?a=commit;h=80ebe35aa7e9249fea86ec165… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 17 10:37:58 2012 +0200 d3drmdef.h: Replace unsigned long by ULONG. --- include/d3drmdef.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/d3drmdef.h b/include/d3drmdef.h index e83869f..ab9f02d 100644 --- a/include/d3drmdef.h +++ b/include/d3drmdef.h @@ -154,10 +154,10 @@ typedef struct _D3DRMIMAGE { int bytes_per_line; void* buffer1; void* buffer2; - unsigned long red_mask; - unsigned long green_mask; - unsigned long blue_mask; - unsigned long alpha_mask; + ULONG red_mask; + ULONG green_mask; + ULONG blue_mask; + ULONG alpha_mask; int palette_size; D3DRMPALETTEENTRY* palette; } D3DRMIMAGE, *LPD3DRMIMAGE;

1 0

Henri Verbeet : wined3d: Use the proper texture target in arbfp_blit_set().
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 86db5b601f77e41d2fedbdf81759b87dc9250f33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86db5b601f77e41d2fedbdf81… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 17 11:40:34 2012 +0200 wined3d: Use the proper texture target in arbfp_blit_set(). For cube maps, texture->target is GL_TEXTURE_CUBE_MAP and would be used for calls that apply to the entire texture, like glTexParameter(). surface->texture_target refers to individual faces like GL_TEXTURE_CUBE_MAP_POSITIVE_X, etc., and would be used for calls like glTexImage2D(). What makes this a bit ugly is the fact that surfaces don't always have an associated texture. --- dlls/wined3d/arb_program_shader.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index db1d812..a85e6fd 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7196,8 +7196,13 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, float size[4] = {(float) surface->pow2Width, (float) surface->pow2Height, 1.0f, 1.0f}; struct arbfp_blit_priv *priv = blit_priv; enum complex_fixup fixup; - GLenum textype = surface->texture_target; const struct wined3d_gl_info *gl_info = context->gl_info; + GLenum textype; + + if (surface->container.type == WINED3D_CONTAINER_TEXTURE) + textype = surface->container.u.texture->target; + else + textype = surface->texture_target; if (surface->flags & SFLAG_CONVERTED) {

1 0

Henri Verbeet : wined3d: Use the proper texture target in ffp_blit_set().
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: f5e289c6e00197af268d6a96c584dc6478a2d010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5e289c6e00197af268d6a96c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 17 11:40:35 2012 +0200 wined3d: Use the proper texture target in ffp_blit_set(). --- dlls/wined3d/surface.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 21028ba..3fa10d1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6340,6 +6340,12 @@ static void ffp_blit_p8_upload_palette(const struct wined3d_surface *surface, co static HRESULT ffp_blit_set(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface) { enum complex_fixup fixup = get_complex_fixup(surface->resource.format->color_fixup); + GLenum target; + + if (surface->container.type == WINED3D_CONTAINER_TEXTURE) + target = surface->container.u.texture->target; + else + target = surface->texture_target; /* When EXT_PALETTED_TEXTURE is around, palette conversion is done by the GPU * else the surface is converted in software at upload time in LoadLocation. @@ -6349,8 +6355,8 @@ static HRESULT ffp_blit_set(void *blit_priv, struct wined3d_context *context, co ffp_blit_p8_upload_palette(surface, context->gl_info); ENTER_GL(); - glEnable(surface->texture_target); - checkGLcall("glEnable(surface->texture_target)"); + glEnable(target); + checkGLcall("glEnable(target)"); LEAVE_GL(); return WINED3D_OK; }

1 0

Henri Verbeet : wined3d: Use the proper texture target in fb_copy_to_texture_direct().
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 092ba1e1bf7edfaa7321ac003f8efed76bd9a638 URL: http://source.winehq.org/git/wine.git/?a=commit;h=092ba1e1bf7edfaa7321ac003… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 17 11:40:36 2012 +0200 wined3d: Use the proper texture target in fb_copy_to_texture_direct(). --- dlls/wined3d/surface.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3fa10d1..c0b27ba 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4888,6 +4888,12 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc struct wined3d_context *context; BOOL upsidedown = FALSE; RECT dst_rect = *dst_rect_in; + GLenum dst_target; + + if (dst_surface->container.type == WINED3D_CONTAINER_TEXTURE) + dst_target = dst_surface->container.u.texture->target; + else + dst_target = dst_surface->texture_target; /* Make sure that the top pixel is always above the bottom pixel, and keep a separate upside down flag * glCopyTexSubImage is a bit picky about the parameters we pass to it @@ -4905,7 +4911,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc ENTER_GL(); /* Bind the target texture */ - context_bind_texture(context, dst_surface->texture_target, dst_surface->texture_name); + context_bind_texture(context, dst_target, dst_surface->texture_name); if (surface_is_offscreen(src_surface)) { TRACE("Reading from an offscreen target\n");

1 0

Henri Verbeet : wined3d: Use the proper texture target in ffp_blit_p8_upload_palette().
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: f0fb19992580cc66a3fed9f9e0f5ca1c78d73dc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0fb19992580cc66a3fed9f9e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 17 11:40:37 2012 +0200 wined3d: Use the proper texture target in ffp_blit_p8_upload_palette(). --- dlls/wined3d/surface.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c0b27ba..13c88f9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6333,12 +6333,18 @@ static void ffp_blit_p8_upload_palette(const struct wined3d_surface *surface, co { BYTE table[256][4]; BOOL colorkey_active = (surface->CKeyFlags & WINEDDSD_CKSRCBLT) ? TRUE : FALSE; + GLenum target; + + if (surface->container.type == WINED3D_CONTAINER_TEXTURE) + target = surface->container.u.texture->target; + else + target = surface->texture_target; d3dfmt_p8_init_palette(surface, table, colorkey_active); TRACE("Using GL_EXT_PALETTED_TEXTURE for 8-bit paletted texture support\n"); ENTER_GL(); - GL_EXTCALL(glColorTableEXT(surface->texture_target, GL_RGBA, 256, GL_RGBA, GL_UNSIGNED_BYTE, table)); + GL_EXTCALL(glColorTableEXT(target, GL_RGBA, 256, GL_RGBA, GL_UNSIGNED_BYTE, table)); LEAVE_GL(); }

1 0

Henri Verbeet : wined3d: Introduce a separate function for initializing various limits.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: e834c920ec09390a491848a3075eca8f35e3a253 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e834c920ec09390a491848a30… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 17 11:40:38 2012 +0200 wined3d: Introduce a separate function for initializing various limits. --- dlls/wined3d/directx.c | 388 +++++++++++++++++++++++------------------------ 1 files changed, 190 insertions(+), 198 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e834c920ec09390a49184…

1 0

Alexandre Julliard : server: Subtract the current update region from the valid rect when a window client area is changed .
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 0816a04d92ba5a08f01ae80db2fecacb9ea71122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0816a04d92ba5a08f01ae80db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 18 17:11:55 2012 +0200 server: Subtract the current update region from the valid rect when a window client area is changed. --- server/window.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/server/window.c b/server/window.c index 3456e1a..cc4b07b 100644 --- a/server/window.c +++ b/server/window.c @@ -1645,6 +1645,13 @@ static void set_window_pos( struct window *win, struct window *previous, if (tmp) { set_region_rect( tmp, &valid_rects[0] ); + /* subtract update region since invalid parts of the valid rect won't be copied */ + if (win->update_region) + { + offset_region( tmp, -window_rect->left, -window_rect->top ); + subtract_region( tmp, tmp, win->update_region ); + offset_region( tmp, window_rect->left, window_rect->top ); + } if (subtract_region( tmp, win_rgn, tmp )) win_rgn = tmp; else free_region( tmp ); }

1 0

Nicolas Le Cam : windowscodecs: Avoid using uninitialized value (LLVM/Clang ).
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 986b98160bfb9ef555c639bbac46ed00545923bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=986b98160bfb9ef555c639bba… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sat Jul 14 16:14:41 2012 +0200 windowscodecs: Avoid using uninitialized value (LLVM/Clang). --- dlls/windowscodecs/bmpencode.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index d9931d6..dfef7f4 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -314,7 +314,7 @@ static HRESULT WINAPI BmpFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, This->stride*(This->height-This->lineswritten), This->bits + This->stride*This->lineswritten); - This->lineswritten += rc.Height; + This->lineswritten += prc->Height; return S_OK; }

1 0

Dmitry Timoshkov : gdiplus: Make sure that GdipBitmapLockBits stores valid lockmode.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: c108fd6bf91f6cf4058905161e36e18bccc44ed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c108fd6bf91f6cf4058905161… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 17 14:57:40 2012 +0900 gdiplus: Make sure that GdipBitmapLockBits stores valid lockmode. --- dlls/gdiplus/image.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index f7bfd1a..cdbf7bf 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -953,7 +953,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, lockeddata->Scan0 = bitmap->bits + (bitspp / 8) * act_rect.X + bitmap->stride * act_rect.Y; - bitmap->lockmode = flags; + bitmap->lockmode = flags | ImageLockModeRead; bitmap->numlocks++; return Ok; @@ -1022,7 +1022,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, } } - bitmap->lockmode = flags; + bitmap->lockmode = flags | ImageLockModeRead; bitmap->numlocks++; bitmap->lockx = act_rect.X; bitmap->locky = act_rect.Y;

1 0