wine-commits July 2010

wine-commits@winehq.org

2 participants
892 discussions

Alexandre Julliard : gdi32: Replace the SelectVisRgn Wine-specific export by a private entry point.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 1472f35e823f84721d867494148f721d72f9dc7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1472f35e823f84721d8674941… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 26 15:28:02 2010 +0200 gdi32: Replace the SelectVisRgn Wine-specific export by a private entry point. --- dlls/gdi32/clipping.c | 20 +++++++++----------- dlls/gdi32/gdi32.spec | 2 +- dlls/user32/painting.c | 5 +---- dlls/user32/sysparams.c | 2 -- include/wingdi.h | 5 ++++- 5 files changed, 15 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index a942fe1..e865656 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -156,26 +156,24 @@ INT WINAPI ExtSelectClipRgn( HDC hdc, HRGN hrgn, INT fnMode ) } /*********************************************************************** - * SelectVisRgn (GDI32.@) - * - * Note: not exported on Windows, only the 16-bit version is exported. + * __wine_set_visible_region (GDI32.@) */ -INT WINAPI SelectVisRgn( HDC hdc, HRGN hrgn ) +void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect ) { - int retval; DC * dc; - if (!hrgn) return ERROR; - if (!(dc = get_dc_ptr( hdc ))) return ERROR; + if (!(dc = get_dc_ptr( hdc ))) return; - TRACE("%p %p\n", hdc, hrgn ); + TRACE( "%p %p %s\n", hdc, hrgn, wine_dbgstr_rect(vis_rect) ); - dc->dirty = 0; + /* map region to DC coordinates */ + OffsetRgn( hrgn, -vis_rect->left, -vis_rect->top ); - retval = CombineRgn( dc->hVisRgn, hrgn, 0, RGN_COPY ); + DeleteObject( dc->hVisRgn ); + dc->dirty = 0; + dc->hVisRgn = hrgn; CLIPPING_UpdateGCRegion( dc ); release_dc_ptr( dc ); - return retval; } diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index d3843e6..f66e7d5 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -514,7 +514,6 @@ # Wine extensions: Win16 functions that are needed by other dlls # @ stdcall GetDCHook(long ptr) -@ stdcall SelectVisRgn(long long) @ stdcall SetDCHook(long ptr long) @ stdcall SetHookFlags(long long) @@ -526,3 +525,4 @@ # GDI objects @ cdecl __wine_make_gdi_object_system(long long) +@ cdecl __wine_set_visible_region(long long ptr) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index cd096cd..969c63e 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -160,10 +160,7 @@ static void update_visible_region( struct dce *dce ) if (dce->clip_rgn) CombineRgn( vis_rgn, vis_rgn, dce->clip_rgn, (flags & DCX_INTERSECTRGN) ? RGN_AND : RGN_DIFF ); - /* map region to DC coordinates */ - OffsetRgn( vis_rgn, -win_rect.left, -win_rect.top ); - SelectVisRgn( dce->hdc, vis_rgn ); - DeleteObject( vis_rgn ); + __wine_set_visible_region( dce->hdc, vis_rgn, &win_rect ); } diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 3d4075f..8c6367e 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -384,8 +384,6 @@ static const WORD wPattern55AA[] = { 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xa HBRUSH SYSCOLOR_55AABrush = 0; -extern void CDECL __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set ); - static void SYSPARAMS_LogFont16To32W( const LOGFONT16 *font16, LPLOGFONTW font32 ) { diff --git a/include/wingdi.h b/include/wingdi.h index 53db856..3f5058f 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3790,7 +3790,10 @@ typedef BOOL (CALLBACK *DCHOOKPROC)(HDC,WORD,DWORD_PTR,LPARAM); WINGDIAPI DWORD_PTR WINAPI GetDCHook(HDC,DCHOOKPROC*); WINGDIAPI BOOL WINAPI SetDCHook(HDC,DCHOOKPROC,DWORD_PTR); WINGDIAPI WORD WINAPI SetHookFlags(HDC,WORD); -WINGDIAPI INT WINAPI SelectVisRgn(HDC,HRGN); + +extern void CDECL __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set ); +extern void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect ); + #endif /* __WINESRC__ */ #ifdef __cplusplus

1 0

Alexandre Julliard : gdi32: Store the total visible rectangle in the DC.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 69c8f0b67d445493a83dc932aaacefc26bb42c09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69c8f0b67d445493a83dc932a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 26 15:30:26 2010 +0200 gdi32: Store the total visible rectangle in the DC. --- dlls/gdi32/bitmap.c | 4 ++++ dlls/gdi32/clipping.c | 1 + dlls/gdi32/dc.c | 19 +++++++++++++++---- dlls/gdi32/gdi_private.h | 1 + 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 937a67d..e5a02be 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -611,6 +611,10 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) dc->hBitmap = handle; GDI_inc_ref_count( handle ); dc->dirty = 0; + dc->vis_rect.left = 0; + dc->vis_rect.top = 0; + dc->vis_rect.right = bitmap->bitmap.bmWidth; + dc->vis_rect.bottom = bitmap->bitmap.bmHeight; SetRectRgn( dc->hVisRgn, 0, 0, bitmap->bitmap.bmWidth, bitmap->bitmap.bmHeight); GDI_ReleaseObj( handle ); DC_InitDC( dc ); diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index e865656..142c520 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -171,6 +171,7 @@ void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect ) DeleteObject( dc->hVisRgn ); dc->dirty = 0; + dc->vis_rect = *vis_rect; dc->hVisRgn = hrgn; CLIPPING_UpdateGCRegion( dc ); release_dc_ptr( dc ); diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 7c86d34..738e42e 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -666,8 +666,11 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, goto error; } - SetRectRgn( dc->hVisRgn, 0, 0, - GetDeviceCaps( hdc, DESKTOPHORZRES ), GetDeviceCaps( hdc, DESKTOPVERTRES ) ); + dc->vis_rect.left = 0; + dc->vis_rect.top = 0; + dc->vis_rect.right = GetDeviceCaps( hdc, DESKTOPHORZRES ); + dc->vis_rect.bottom = GetDeviceCaps( hdc, DESKTOPVERTRES ); + SetRectRgn(dc->hVisRgn, dc->vis_rect.left, dc->vis_rect.top, dc->vis_rect.right, dc->vis_rect.bottom); DC_InitDC( dc ); release_dc_ptr( dc ); @@ -768,6 +771,10 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) TRACE("(%p): returning %p\n", hdc, dc->hSelf ); dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP )); + dc->vis_rect.left = 0; + dc->vis_rect.top = 0; + dc->vis_rect.right = 1; + dc->vis_rect.bottom = 1; if (!(dc->hVisRgn = CreateRectRgn( 0, 0, 1, 1 ))) goto error; /* default bitmap is 1x1 */ /* Copy the driver-specific physical device info into @@ -860,8 +867,12 @@ HDC WINAPI ResetDCW( HDC hdc, const DEVMODEW *devmode ) if (ret) /* reset the visible region */ { dc->dirty = 0; - SetRectRgn( dc->hVisRgn, 0, 0, GetDeviceCaps( hdc, DESKTOPHORZRES ), - GetDeviceCaps( hdc, DESKTOPVERTRES ) ); + dc->vis_rect.left = 0; + dc->vis_rect.top = 0; + dc->vis_rect.right = GetDeviceCaps( hdc, DESKTOPHORZRES ); + dc->vis_rect.bottom = GetDeviceCaps( hdc, DESKTOPVERTRES ); + SetRectRgn( dc->hVisRgn, dc->vis_rect.left, dc->vis_rect.top, + dc->vis_rect.right, dc->vis_rect.bottom ); CLIPPING_UpdateGCRegion( dc ); } } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index d1cb66b..8ac78ef 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -261,6 +261,7 @@ typedef struct tagDC INT vportExtY; SIZE virtual_res; /* Initially HORZRES,VERTRES. Changed by SetVirtualResolution */ SIZE virtual_size; /* Initially HORZSIZE,VERTSIZE. Changed by SetVirtualResolution */ + RECT vis_rect; /* visible rectangle in screen coords */ FLOAT miterLimit; int flags;

1 0

Alexandre Julliard : gdi.exe: Disable the remaining 16-bit visible region functions, they can't work.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: b644c8538ab81be7e057f8bd2c36d4f15cdee403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b644c8538ab81be7e057f8bd2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 26 15:26:38 2010 +0200 gdi.exe: Disable the remaining 16-bit visible region functions, they can't work. --- dlls/gdi.exe16/gdi.c | 38 ++++++-------------------------------- 1 files changed, 6 insertions(+), 32 deletions(-) diff --git a/dlls/gdi.exe16/gdi.c b/dlls/gdi.exe16/gdi.c index 85dfef8..4eff2bc 100644 --- a/dlls/gdi.exe16/gdi.c +++ b/dlls/gdi.exe16/gdi.c @@ -1776,7 +1776,8 @@ BOOL16 WINAPI PtVisible16( HDC16 hdc, INT16 x, INT16 y ) */ INT16 WINAPI SelectVisRgn16( HDC16 hdc, HRGN16 hrgn ) { - return SelectVisRgn( HDC_32(hdc), HRGN_32(hrgn) ); + FIXME( "%04x %04x no longer supported\n", hdc, hrgn ); + return ERROR; } @@ -3703,21 +3704,8 @@ INT16 WINAPI IntersectVisRect16( HDC16 hdc16, INT16 left, INT16 top, INT16 right */ HRGN16 WINAPI SaveVisRgn16( HDC16 hdc16 ) { - struct saved_visrgn *saved; - HDC hdc = HDC_32( hdc16 ); - - TRACE("%p\n", hdc ); - - if (!(saved = HeapAlloc( GetProcessHeap(), 0, sizeof(*saved) ))) return 0; - if (!(saved->hrgn = CreateRectRgn( 0, 0, 0, 0 ))) - { - HeapFree( GetProcessHeap(), 0, saved ); - return 0; - } - saved->hdc = hdc; - GetRandomRgn( hdc, saved->hrgn, SYSRGN ); - list_add_head( &saved_regions, &saved->entry ); - return HRGN_16(saved->hrgn); + FIXME( "%04x no longer supported\n", hdc16 ); + return 0; } @@ -3726,22 +3714,8 @@ HRGN16 WINAPI SaveVisRgn16( HDC16 hdc16 ) */ INT16 WINAPI RestoreVisRgn16( HDC16 hdc16 ) { - struct saved_visrgn *saved; - HDC hdc = HDC_32( hdc16 ); - INT16 ret = ERROR; - - TRACE("%p\n", hdc ); - - LIST_FOR_EACH_ENTRY( saved, &saved_regions, struct saved_visrgn, entry ) - { - if (saved->hdc != hdc) continue; - ret = SelectVisRgn( hdc, saved->hrgn ); - list_remove( &saved->entry ); - DeleteObject( saved->hrgn ); - HeapFree( GetProcessHeap(), 0, saved ); - break; - } - return ret; + FIXME( "%04x no longer supported\n", hdc16 ); + return ERROR; }

1 0

Hans Leidekker : msi/tests: Skip tests if UAC is enabled and the process is not running elevated.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 33b6ad7f73ea511939a0f4ddf79f125f0dec3ab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33b6ad7f73ea511939a0f4ddf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 26 12:09:57 2010 +0200 msi/tests: Skip tests if UAC is enabled and the process is not running elevated. --- dlls/msi/tests/install.c | 362 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/package.c | 35 +++++ dlls/msi/tests/patch.c | 40 +++++ 3 files changed, 437 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=33b6ad7f73ea511939a0f…

1 0

Hans Leidekker : include: Add the TOKEN_ELEVATION_TYPE enumeration.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: deb1c552d6d9f998c77fc599ddc5ccde5eb85df0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deb1c552d6d9f998c77fc599d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 26 12:09:37 2010 +0200 include: Add the TOKEN_ELEVATION_TYPE enumeration. --- include/winnt.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index e29444a..0bcb31b 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3800,6 +3800,12 @@ typedef PVOID PACCESS_TOKEN; typedef PVOID PSECURITY_DESCRIPTOR; typedef PVOID PSID; +typedef enum _TOKEN_ELEVATION_TYPE { + TokenElevationTypeDefault = 1, + TokenElevationTypeFull, + TokenElevationTypeLimited +} TOKEN_ELEVATION_TYPE, *PTOKEN_ELEVATION_TYPE; + /* * TOKEN_INFORMATION_CLASS */

1 0

Hans Leidekker : msi/tests: Skip a test if the current user has insufficient rights.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 9686c95749ed604d13fac1504b30c953897e1ff7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9686c95749ed604d13fac1504… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 26 12:09:12 2010 +0200 msi/tests: Skip a test if the current user has insufficient rights. --- dlls/msi/tests/msi.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 06f85b5..dc023f4 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -297,6 +297,13 @@ static void test_null(void) } r = RegSetValueA(hkey, NULL, REG_SZ, "test", strlen("test")); + if (r == ERROR_ACCESS_DENIED) + { + skip("Not enough rights to perform tests\n"); + HeapFree(GetProcessHeap(), 0, lpData); + RegCloseKey(hkey); + return; + } ok( r == ERROR_SUCCESS, "wrong error %d\n", r); r = MsiGetProductInfoA("", "", NULL, NULL);

1 0

Henri Verbeet : wined3d: Cleanup Get/SetRenderState traces a bit.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 3e37b27d37f23c676c73d0e900cf26e42080376a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e37b27d37f23c676c73d0e90… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 26 12:06:35 2010 +0200 wined3d: Cleanup Get/SetRenderState traces a bit. --- dlls/wined3d/device.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d59a5e7..be473d7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3018,7 +3018,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, W IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; DWORD oldValue = This->stateBlock->renderState[State]; - TRACE("(%p)->state = %s(%d), value = %d\n", This, debug_d3drenderstate(State), State, Value); + TRACE("iface %p, state %s (%#x), value %#x.\n", iface, debug_d3drenderstate(State), State, Value); This->updateStateBlock->changed.renderState[State >> 5] |= 1 << (State & 0x1f); This->updateStateBlock->renderState[State] = Value; @@ -3041,7 +3041,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, W static HRESULT WINAPI IWineD3DDeviceImpl_GetRenderState(IWineD3DDevice *iface, WINED3DRENDERSTATETYPE State, DWORD *pValue) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - TRACE("(%p) for State %d = %d\n", This, State, This->stateBlock->renderState[State]); + + TRACE("iface %p, state %s (%#x), value %p.\n", iface, debug_d3drenderstate(State), State, pValue); + *pValue = This->stateBlock->renderState[State]; return WINED3D_OK; }

1 0

Henri Verbeet : wined3d: Add a missing return statement to surface_prepare_texture().
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 6874743e78c718ffe318646ece04d79f2dfc161a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6874743e78c718ffe318646ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 26 12:06:34 2010 +0200 wined3d: Add a missing return statement to surface_prepare_texture(). Calling surface_prepare_texture_internal() twice on the same surface is harmless, but unnecessary. --- dlls/wined3d/surface.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 662cdb8..561e9c9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1569,6 +1569,8 @@ void surface_prepare_texture(IWineD3DSurfaceImpl *surface, const struct wined3d_ } IWineD3DBaseTexture_Release((IWineD3DBaseTexture *)texture); + + return; } surface_prepare_texture_internal(surface, gl_info, srgb);

1 0

Henri Verbeet : wined3d: Merge strect_rect_fbo() and surface_load_srgb_fbo( ).
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 0bf68b846adde16fe19d4b7814d866ba1e4d012a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bf68b846adde16fe19d4b781… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 26 12:06:33 2010 +0200 wined3d: Merge strect_rect_fbo() and surface_load_srgb_fbo(). --- dlls/wined3d/device.c | 132 --------------------------- dlls/wined3d/surface.c | 196 +++++++++++++++++++++++++++++++--------- dlls/wined3d/wined3d_private.h | 4 - 3 files changed, 155 insertions(+), 177 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0bf68b846adde16fe19d4…

1 0

Henri Verbeet : wined3d: Do RGB <=> sRGB transfers using FBO blits.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 943fb2fb578b9d3d2fcd9c4e72bf465fde8e245d URL: http://source.winehq.org/git/wine.git/?a=commit;h=943fb2fb578b9d3d2fcd9c4e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 26 12:06:32 2010 +0200 wined3d: Do RGB <=> sRGB transfers using FBO blits. Concept based on a patch by Stefan. --- dlls/wined3d/context.c | 104 +++++++++++++++++++++++++++------------- dlls/wined3d/device.c | 4 +- dlls/wined3d/surface.c | 47 ++++++++++++++++++ dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/utils.c | 20 ++++++++ dlls/wined3d/wined3d_private.h | 6 ++- 6 files changed, 145 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=943fb2fb578b9d3d2fcd9…

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2010