September 2011 - Wine-commits

Piotr Caban : wininet: Make it possible to ignore CERT_TRUST_IS_PARTIAL_CHAIN error in netconn_verify_cert .
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: e80e73586d91ffeeba68c8737d82b6321b91290d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e80e73586d91ffeeba68c8737… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 13 19:27:04 2011 +0200 wininet: Make it possible to ignore CERT_TRUST_IS_PARTIAL_CHAIN error in netconn_verify_cert. --- dlls/wininet/netconnection.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 060acc6..dd887eb 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -238,6 +238,7 @@ static DWORD netconn_verify_cert(PCCERT_CONTEXT cert, HCERTSTORE store, static const DWORD supportedErrors = CERT_TRUST_IS_NOT_TIME_VALID | CERT_TRUST_IS_UNTRUSTED_ROOT | + CERT_TRUST_IS_PARTIAL_CHAIN | CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN | CERT_TRUST_IS_REVOKED | @@ -247,7 +248,7 @@ static DWORD netconn_verify_cert(PCCERT_CONTEXT cert, HCERTSTORE store, !(security_flags & SECURITY_FLAG_IGNORE_CERT_DATE_INVALID)) err = ERROR_INTERNET_SEC_CERT_DATE_INVALID; else if (chain->TrustStatus.dwErrorStatus & - CERT_TRUST_IS_UNTRUSTED_ROOT && + (CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_PARTIAL_CHAIN) && !(security_flags & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) err = ERROR_INTERNET_INVALID_CA; else if (!(security_flags & SECURITY_FLAG_IGNORE_REVOCATION) &&

1 0

Henri Verbeet : ddraw: Just use a static variable for scanline emulation.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: 60f6c41a6700133cb6b91019cc118319063af8ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=60f6c41a6700133cb6b91019c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 13 20:02:23 2011 +0200 ddraw: Just use a static variable for scanline emulation. Tracking it per ddraw object doesn't add much. --- dlls/ddraw/ddraw.c | 11 ++++++----- dlls/ddraw/ddraw_private.h | 1 - 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index faa4125..4cf7c16 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1880,29 +1880,30 @@ static HRESULT WINAPI ddraw1_WaitForVerticalBlank(IDirectDraw *iface, DWORD flag static HRESULT WINAPI ddraw7_GetScanLine(IDirectDraw7 *iface, DWORD *Scanline) { IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); + static DWORD cur_scanline; static BOOL hide = FALSE; WINED3DDISPLAYMODE Mode; TRACE("iface %p, line %p.\n", iface, Scanline); /* This function is called often, so print the fixme only once */ - EnterCriticalSection(&ddraw_cs); if(!hide) { FIXME("iface %p, line %p partial stub!\n", iface, Scanline); hide = TRUE; } + EnterCriticalSection(&ddraw_cs); wined3d_device_get_display_mode(This->wined3d_device, 0, &Mode); + LeaveCriticalSection(&ddraw_cs); /* Fake the line sweeping of the monitor */ /* FIXME: We should synchronize with a source to keep the refresh rate */ - *Scanline = This->cur_scanline++; + *Scanline = cur_scanline++; /* Assume 20 scan lines in the vertical blank */ - if (This->cur_scanline >= Mode.Height + 20) - This->cur_scanline = 0; + if (cur_scanline >= Mode.Height + 20) + cur_scanline = 0; - LeaveCriticalSection(&ddraw_cs); return DD_OK; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 09e9aed..0731eb0 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -89,7 +89,6 @@ struct IDirectDrawImpl BOOL d3d_initialized; /* Misc ddraw fields */ - DWORD cur_scanline; BOOL fake_vblank; BOOL initialized;

1 0

Henri Verbeet : ddraw: Just use a static variable for vblank emulation.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: 8173e6f539ebd4f34919a523d3148fef38cf5bcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8173e6f539ebd4f34919a523d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 13 20:02:24 2011 +0200 ddraw: Just use a static variable for vblank emulation. --- dlls/ddraw/ddraw.c | 13 ++++--------- dlls/ddraw/ddraw_private.h | 1 - 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 4cf7c16..3e3bf60 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1520,21 +1520,16 @@ static HRESULT WINAPI ddraw1_GetMonitorFrequency(IDirectDraw *iface, DWORD *freq *****************************************************************************/ static HRESULT WINAPI ddraw7_GetVerticalBlankStatus(IDirectDraw7 *iface, BOOL *status) { - IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); + static BOOL fake_vblank; TRACE("iface %p, status %p.\n", iface, status); - /* This looks sane, the MSDN suggests it too */ - EnterCriticalSection(&ddraw_cs); if(!status) - { - LeaveCriticalSection(&ddraw_cs); return DDERR_INVALIDPARAMS; - } - *status = This->fake_vblank; - This->fake_vblank = !This->fake_vblank; - LeaveCriticalSection(&ddraw_cs); + *status = fake_vblank; + fake_vblank = !fake_vblank; + return DD_OK; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 0731eb0..80dd53d 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -89,7 +89,6 @@ struct IDirectDrawImpl BOOL d3d_initialized; /* Misc ddraw fields */ - BOOL fake_vblank; BOOL initialized; /* DirectDraw things, which are not handled by WineD3D */

1 0

Henri Verbeet : ddraw: Get rid of the unused "initialized" field in IDirectDrawImpl.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: 5de020342cc039819b6fe11ee787d5a9a288f85a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5de020342cc039819b6fe11ee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 13 20:02:25 2011 +0200 ddraw: Get rid of the unused "initialized" field in IDirectDrawImpl. --- dlls/ddraw/ddraw.c | 13 ++----------- dlls/ddraw/ddraw_private.h | 3 --- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 3e3bf60..f981cf5 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1674,18 +1674,9 @@ static HRESULT WINAPI ddraw2_GetAvailableVidMem(IDirectDraw2 *iface, *****************************************************************************/ static HRESULT WINAPI ddraw7_Initialize(IDirectDraw7 *iface, GUID *Guid) { - IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); - - TRACE("iface %p, guid %s.\n", iface, debugstr_guid(Guid)); + FIXME("iface %p, guid %s stub!\n", iface, debugstr_guid(Guid)); - if(This->initialized) - { - return DDERR_ALREADYINITIALIZED; - } - else - { - return DD_OK; - } + return DDERR_ALREADYINITIALIZED; } static HRESULT WINAPI ddraw4_Initialize(IDirectDraw4 *iface, GUID *guid) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 80dd53d..e0706fc 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -88,9 +88,6 @@ struct IDirectDrawImpl struct wined3d_device *wined3d_device; BOOL d3d_initialized; - /* Misc ddraw fields */ - BOOL initialized; - /* DirectDraw things, which are not handled by WineD3D */ DWORD cooperative_level;

1 0

Henri Verbeet : wined3d: Make the device parameter to device_unit_free_for_vs() const.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: 8a12e951e63fafc52546b84e53491cbdf8c98d9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a12e951e63fafc52546b84e5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 13 20:02:26 2011 +0200 wined3d: Make the device parameter to device_unit_free_for_vs() const. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1dc6cbc..43d51e7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2954,7 +2954,7 @@ static void device_map_psamplers(struct wined3d_device *device, const struct win } } -static BOOL device_unit_free_for_vs(struct wined3d_device *device, +static BOOL device_unit_free_for_vs(const struct wined3d_device *device, const WINED3DSAMPLER_TEXTURE_TYPE *pshader_sampler_tokens, const WINED3DSAMPLER_TEXTURE_TYPE *vshader_sampler_tokens, DWORD unit) {

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_pixel_shader() const.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: 65064a09ce539f06d1642ba5a8b5b6df9d7b3ed5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65064a09ce539f06d1642ba5a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 13 20:02:27 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_pixel_shader() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 43d51e7..bb4969c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3078,7 +3078,7 @@ HRESULT CDECL wined3d_device_set_pixel_shader(struct wined3d_device *device, str return WINED3D_OK; } -struct wined3d_shader * CDECL wined3d_device_get_pixel_shader(struct wined3d_device *device) +struct wined3d_shader * CDECL wined3d_device_get_pixel_shader(const struct wined3d_device *device) { struct wined3d_shader *shader; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 26edff1..940246c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2229,7 +2229,7 @@ HRESULT __cdecl wined3d_device_get_material(const struct wined3d_device *device, float __cdecl wined3d_device_get_npatch_mode(struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_palette_entries(struct wined3d_device *device, UINT palette_idx, PALETTEENTRY *entries); -struct wined3d_shader * __cdecl wined3d_device_get_pixel_shader(struct wined3d_device *device); +struct wined3d_shader * __cdecl wined3d_device_get_pixel_shader(const struct wined3d_device *device); void __cdecl wined3d_device_get_primitive_type(struct wined3d_device *device, WINED3DPRIMITIVETYPE *primitive_topology); HRESULT __cdecl wined3d_device_get_ps_consts_b(struct wined3d_device *device, UINT start_register, BOOL *constants, UINT bool_count);

1 0

Francois Gouget : appwiz.cpl: Use a more standard syntax for multi-line RC file strings.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: 99494d5e8efbb67125d41d717154d7958b66d4f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99494d5e8efbb67125d41d717… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 14 00:19:18 2011 +0200 appwiz.cpl: Use a more standard syntax for multi-line RC file strings. --- dlls/appwiz.cpl/Fr.rc | 9 ++++----- dlls/appwiz.cpl/Ru.rc | 8 +++----- dlls/appwiz.cpl/Si.rc | 8 ++++---- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/appwiz.cpl/Fr.rc b/dlls/appwiz.cpl/Fr.rc index f9ed107..57ce9ea 100644 --- a/dlls/appwiz.cpl/Fr.rc +++ b/dlls/appwiz.cpl/Fr.rc @@ -75,11 +75,10 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Programme d'installation de Gecko pour Wine" FONT 8, "MS Shell Dlg" { - LTEXT "Wine n'a pu trouver de paquet Gecko, qui est nécessaire pour que les applications "\ - "incorporant du HTML puissent fonctionner correctement.\nWine peut automatiquement "\ - "le télécharger et l'installer pour vous.\n\n" \ - "Note : il est recommandé d'utiliser le paquet de votre distribution si disponible. " \ - "Consultez http://wiki.winehq.org/Gecko pour plus de détails.", + LTEXT "Wine n'a pu trouver de paquet Gecko, qui est nécessaire pour que les applications incorporant du HTML puissent fonctionner correctement.\n\ +Wine peut automatiquement le télécharger et l'installer pour vous.\n\ +\n\ +Note : il est recommandé d'utiliser le paquet de votre distribution si disponible. Consultez http://wiki.winehq.org/Gecko pour plus de détails.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Progression", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 65, 240, 12 DEFPUSHBUTTON "&Installer", ID_DWL_INSTALL, 200, 85, 50, 15, WS_GROUP | WS_TABSTOP diff --git a/dlls/appwiz.cpl/Ru.rc b/dlls/appwiz.cpl/Ru.rc index 1fcda4f..b87adc5 100644 --- a/dlls/appwiz.cpl/Ru.rc +++ b/dlls/appwiz.cpl/Ru.rc @@ -74,11 +74,9 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Установка Wine Gecko" FONT 8, "MS Shell Dlg" { - LTEXT "Wine не может найти пакет Gecko, который необходим для корректной работы приложений "\ - "с поддержкой HTML. " \ - "Wine может автоматически загрузить и установить его для вас.\n\n" \ - "Примечание: рекомендуется использовать пакет, предоставляемый вашим дистрибутивом. "\ - "Посетите http://wiki.winehq.org/Gecko для получения более подробной информации.", + LTEXT "Wine не может найти пакет Gecko, который необходим для корректной работы приложений с поддержкой HTML. Wine может автоматически загрузить и установить его для вас.\n\ +\n\ +Примечание: рекомендуется использовать пакет, предоставляемый вашим дистрибутивом. Посетите http://wiki.winehq.org/Gecko для получения более подробной информации.", ID_DWL_STATUS, 10, 10, 240, 70, SS_LEFT CONTROL "Прогресс", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 65, 240, 12 DEFPUSHBUTTON "&Установить", ID_DWL_INSTALL, 180, 85, 70, 15, WS_GROUP | WS_TABSTOP diff --git a/dlls/appwiz.cpl/Si.rc b/dlls/appwiz.cpl/Si.rc index 0d68fb7..bfcc62c 100644 --- a/dlls/appwiz.cpl/Si.rc +++ b/dlls/appwiz.cpl/Si.rc @@ -72,10 +72,10 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Namestitev Wine Gecko" FONT 8, "MS Shell Dlg" { - LTEXT "Wine ni našel paketa Gecko, ki ga aplikacije, ki uporabljajo HTML potrebujejo," \ - "da delujejo pravilno. Wine ga lahko avtomatsko prenese in namesti.\n\n" \ - "Opomba: priporočljivo je uporabiti Gecko paket od distribucije. Poglej\n "\ - "http://wiki.winehq.org/Gecko za podrobnost.", + LTEXT "Wine ni našel paketa Gecko, ki ga aplikacije, ki uporabljajo HTML potrebujejo, da delujejo pravilno. Wine ga lahko avtomatsko prenese in namesti.\n\ +\n\ +Opomba: priporočljivo je uporabiti Gecko paket od distribucije. Poglej\n\ +http://wiki.winehq.org/Gecko za podrobnost.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Napredek", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 60, 240, 12 DEFPUSHBUTTON "&Namesti", ID_DWL_INSTALL, 200, 80, 50, 15, WS_GROUP | WS_TABSTOP

1 0

Francois Gouget : shell32: Use a more standard syntax for multi-line RC file strings.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: dbf15a9a2991cd617ae0b37214cbd84e496cfadc URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbf15a9a2991cd617ae0b3721… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 14 00:20:59 2011 +0200 shell32: Use a more standard syntax for multi-line RC file strings. --- dlls/shell32/shell32.rc | 9 ++-- po/ar.po | 138 +++++++++++++++++++++++----------------------- po/bg.po | 138 +++++++++++++++++++++++----------------------- po/ca.po | 138 +++++++++++++++++++++++----------------------- po/cs.po | 138 +++++++++++++++++++++++----------------------- po/da.po | 138 +++++++++++++++++++++++----------------------- po/de.po | 138 +++++++++++++++++++++++----------------------- po/el.po | 138 +++++++++++++++++++++++----------------------- po/en.po | 138 +++++++++++++++++++++++----------------------- po/en_US.po | 138 +++++++++++++++++++++++----------------------- po/eo.po | 138 +++++++++++++++++++++++----------------------- po/es.po | 138 +++++++++++++++++++++++----------------------- po/fa.po | 138 +++++++++++++++++++++++----------------------- po/fi.po | 138 +++++++++++++++++++++++----------------------- po/fr.po | 138 +++++++++++++++++++++++----------------------- po/he.po | 138 +++++++++++++++++++++++----------------------- po/hi.po | 138 +++++++++++++++++++++++----------------------- po/hu.po | 138 +++++++++++++++++++++++----------------------- po/it.po | 138 +++++++++++++++++++++++----------------------- po/ja.po | 138 +++++++++++++++++++++++----------------------- po/ko.po | 138 +++++++++++++++++++++++----------------------- po/lt.po | 138 +++++++++++++++++++++++----------------------- po/ml.po | 138 +++++++++++++++++++++++----------------------- po/nb_NO.po | 138 +++++++++++++++++++++++----------------------- po/nl.po | 138 +++++++++++++++++++++++----------------------- po/or.po | 138 +++++++++++++++++++++++----------------------- po/pa.po | 138 +++++++++++++++++++++++----------------------- po/pl.po | 138 +++++++++++++++++++++++----------------------- po/pt_BR.po | 138 +++++++++++++++++++++++----------------------- po/pt_PT.po | 138 +++++++++++++++++++++++----------------------- po/rm.po | 138 +++++++++++++++++++++++----------------------- po/ro.po | 138 +++++++++++++++++++++++----------------------- po/ru.po | 138 +++++++++++++++++++++++----------------------- po/sk.po | 138 +++++++++++++++++++++++----------------------- po/sl.po | 138 +++++++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 138 +++++++++++++++++++++++----------------------- po/sr_RS(a)latin.po | 138 +++++++++++++++++++++++----------------------- po/sv.po | 138 +++++++++++++++++++++++----------------------- po/te.po | 138 +++++++++++++++++++++++----------------------- po/th.po | 138 +++++++++++++++++++++++----------------------- po/tr.po | 138 +++++++++++++++++++++++----------------------- po/uk.po | 138 +++++++++++++++++++++++----------------------- po/wa.po | 138 +++++++++++++++++++++++----------------------- po/wine.pot | 138 +++++++++++++++++++++++----------------------- po/zh_CN.po | 138 +++++++++++++++++++++++----------------------- po/zh_TW.po | 138 +++++++++++++++++++++++----------------------- 46 files changed, 3110 insertions(+), 3109 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dbf15a9a2991cd617ae0b…

1 0

Alexandre Julliard : winex11: Add a SetDeviceClipping entry point to the XRender driver.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 271530b3ddf4183265fc30a8541206d565dbea7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=271530b3ddf4183265fc30a85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 13 15:47:19 2011 +0200 winex11: Add a SetDeviceClipping entry point to the XRender driver. --- dlls/winex11.drv/graphics.c | 6 ++- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/xrender.c | 91 +++++++++++++++++++++++++++++++----------- 3 files changed, 73 insertions(+), 26 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index eb25764..7c84c8b 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -185,7 +185,10 @@ RGNDATA *X11DRV_GetRegionData( HRGN hrgn, HDC hdc_lptodp ) } -static void update_x11_clipping( X11DRV_PDEVICE *physDev, const RGNDATA *data ) +/*********************************************************************** + * update_x11_clipping + */ +void update_x11_clipping( X11DRV_PDEVICE *physDev, const RGNDATA *data ) { wine_tsx11_lock(); XSetClipRectangles( gdi_display, physDev->gc, physDev->dc_rect.left, physDev->dc_rect.top, @@ -193,6 +196,7 @@ static void update_x11_clipping( X11DRV_PDEVICE *physDev, const RGNDATA *data ) wine_tsx11_unlock(); } + /*********************************************************************** * add_extra_clipping_region * diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 02dc34b..4cc0522 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -280,6 +280,7 @@ extern X_PHYSBITMAP *X11DRV_init_phys_bitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern Pixmap X11DRV_get_pixmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern RGNDATA *X11DRV_GetRegionData( HRGN hrgn, HDC hdc_lptodp ) DECLSPEC_HIDDEN; +extern void update_x11_clipping( X11DRV_PDEVICE *physDev, const RGNDATA *data ) DECLSPEC_HIDDEN; extern RGNDATA *add_extra_clipping_region( X11DRV_PDEVICE *dev, HRGN rgn ) DECLSPEC_HIDDEN; extern void restore_clipping_region( X11DRV_PDEVICE *dev, RGNDATA *data ) DECLSPEC_HIDDEN; @@ -300,7 +301,6 @@ extern int client_side_antialias_with_render DECLSPEC_HIDDEN; extern int using_client_side_fonts DECLSPEC_HIDDEN; extern const struct gdi_dc_funcs *X11DRV_XRender_Init(void) DECLSPEC_HIDDEN; extern void X11DRV_XRender_Finalize(void) DECLSPEC_HIDDEN; -extern void X11DRV_XRender_SetDeviceClipping(X11DRV_PDEVICE *physDev, const RGNDATA *data) DECLSPEC_HIDDEN; extern void X11DRV_XRender_CopyBrush(X11DRV_PDEVICE *physDev, X_PHYSBITMAP *physBitmap, int width, int height) DECLSPEC_HIDDEN; extern BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, int bits_pixel, const DIBSECTION *dib) DECLSPEC_HIDDEN; BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst, diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index ab1cade..62fba77 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1132,21 +1132,45 @@ static HFONT xrenderdrv_SelectFont( PHYSDEV dev, HFONT hfont, HANDLE gdiFont ) return 0; } -/*********************************************************************** -* X11DRV_XRender_SetDeviceClipping -*/ -void X11DRV_XRender_SetDeviceClipping(X11DRV_PDEVICE *physDev, const RGNDATA *data) +static void update_xrender_clipping( struct xrender_physdev *dev, const RGNDATA *data ) { - if (physDev->xrender->pict) + if (dev->info.pict) { wine_tsx11_lock(); - pXRenderSetPictureClipRectangles( gdi_display, physDev->xrender->pict, - physDev->dc_rect.left, physDev->dc_rect.top, + pXRenderSetPictureClipRectangles( gdi_display, dev->info.pict, + dev->x11dev->dc_rect.left, dev->x11dev->dc_rect.top, (XRectangle *)data->Buffer, data->rdh.nCount ); wine_tsx11_unlock(); } } +static RGNDATA *add_xrender_clipping_region( struct xrender_physdev *dev, HRGN rgn ) +{ + RGNDATA *ret, *data; + HRGN clip; + + if (!(ret = X11DRV_GetRegionData( dev->x11dev->region, 0 ))) return NULL; + if (!(clip = CreateRectRgn( 0, 0, 0, 0 ))) + { + HeapFree( GetProcessHeap(), 0, ret ); + return NULL; + } + CombineRgn( clip, dev->x11dev->region, rgn, RGN_AND ); + if ((data = X11DRV_GetRegionData( clip, 0 ))) + { + update_xrender_clipping( dev, data ); + HeapFree( GetProcessHeap(), 0, data ); + } + DeleteObject( clip ); + return ret; +} + +static void restore_xrender_clipping_region( struct xrender_physdev *dev, RGNDATA *data ) +{ + if (!data) return; + update_xrender_clipping( dev, data ); + HeapFree( GetProcessHeap(), 0, data ); +} static BOOL create_xrender_dc( PHYSDEV *pdev ) { @@ -1280,6 +1304,23 @@ static DWORD xrenderdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMA return dev->funcs->pPutImage( dev, hbitmap, clip, info, bits, src, dst, rop ); } +/*********************************************************************** + * xrenderdrv_SetDeviceClipping + */ +static void xrenderdrv_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) +{ + struct xrender_physdev *physdev = get_xrender_dev( dev ); + RGNDATA *data; + + CombineRgn( physdev->x11dev->region, vis_rgn, clip_rgn, clip_rgn ? RGN_AND : RGN_COPY ); + + if (!(data = X11DRV_GetRegionData( physdev->x11dev->region, 0 ))) return; + update_x11_clipping( physdev->x11dev, data ); + update_xrender_clipping( physdev, data ); + HeapFree( GetProcessHeap(), 0, data ); +} + + BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, int bits_pixel, const DIBSECTION *dib) { const WineXRenderFormat *fmt; @@ -2004,13 +2045,6 @@ BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, goto done_unlock; } - if (flags & ETO_CLIPPED) - { - HRGN clip_region = CreateRectRgnIndirect( lprect ); - saved_region = add_extra_clipping_region( physdev->x11dev, clip_region ); - DeleteObject( clip_region ); - } - EnterCriticalSection(&xrender_cs); entry = glyphsetCache + physdev->info.cache_index; @@ -2091,6 +2125,14 @@ BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, desired.y = physdev->x11dev->dc_rect.top + y + offset.y; } } + + if (flags & ETO_CLIPPED) + { + HRGN clip_region = CreateRectRgnIndirect( lprect ); + saved_region = add_xrender_clipping_region( physdev, clip_region ); + DeleteObject( clip_region ); + } + wine_tsx11_lock(); /* Make sure we don't have any transforms set from a previous call */ set_xrender_transformation(pict, 1, 1, 0, 0); @@ -2101,8 +2143,17 @@ BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, 0, 0, 0, 0, elts, count); wine_tsx11_unlock(); HeapFree(GetProcessHeap(), 0, elts); + restore_xrender_clipping_region( physdev, saved_region ); } else { POINT offset = {0, 0}; + + if (flags & ETO_CLIPPED) + { + HRGN clip_region = CreateRectRgnIndirect( lprect ); + saved_region = add_extra_clipping_region( physdev->x11dev, clip_region ); + DeleteObject( clip_region ); + } + wine_tsx11_lock(); XSetForeground( gdi_display, physdev->x11dev->gc, textPixel ); @@ -2263,11 +2314,9 @@ BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, } no_image: wine_tsx11_unlock(); + restore_clipping_region( physdev->x11dev, saved_region ); } LeaveCriticalSection(&xrender_cs); - - restore_clipping_region( physdev->x11dev, saved_region ); - retv = TRUE; done_unlock: @@ -2640,7 +2689,7 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pSetDCPenColor */ NULL, /* pSetDIBColorTable */ NULL, /* pSetDIBitsToDevice */ - NULL, /* pSetDeviceClipping */ + xrenderdrv_SetDeviceClipping, /* pSetDeviceClipping */ NULL, /* pSetDeviceGammaRamp */ NULL, /* pSetLayout */ NULL, /* pSetMapMode */ @@ -2684,12 +2733,6 @@ void X11DRV_XRender_Finalize(void) { } -void X11DRV_XRender_SetDeviceClipping(X11DRV_PDEVICE *physDev, const RGNDATA *data) -{ - assert(0); - return; -} - void X11DRV_XRender_CopyBrush(X11DRV_PDEVICE *physDev, X_PHYSBITMAP *physBitmap, int width, int height) { wine_tsx11_lock();

1 0

Alexandre Julliard : gdi32: Move coordinate checks into the common part of GdiAlphaBlend.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 497c3982b647fa6e16b960ee59efa16e9d86f324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=497c3982b647fa6e16b960ee5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 13 17:10:37 2011 +0200 gdi32: Move coordinate checks into the common part of GdiAlphaBlend. --- dlls/gdi32/bitblt.c | 18 +++++++++++++++++- dlls/winex11.drv/xrender.c | 13 ++----------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index e8e2c88..9f37ab0 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -669,7 +669,23 @@ BOOL WINAPI GdiAlphaBlend(HDC hdcDst, int xDst, int yDst, int widthDst, int heig blendFunction.BlendOp, blendFunction.BlendFlags, blendFunction.SourceConstantAlpha, blendFunction.AlphaFormat ); - if (!ret) ret = dst_dev->funcs->pAlphaBlend( dst_dev, &dst, src_dev, &src, blendFunction ); + if (src.x < 0 || src.y < 0 || src.width < 0 || src.height < 0 || + (dcSrc->header.type == OBJ_MEMDC && + (src.width > dcSrc->vis_rect.right - dcSrc->vis_rect.left - src.x || + src.height > dcSrc->vis_rect.bottom - dcSrc->vis_rect.top - src.y))) + { + WARN( "Invalid src coords: (%d,%d), size %dx%d\n", src.x, src.y, src.width, src.height ); + SetLastError( ERROR_INVALID_PARAMETER ); + ret = FALSE; + } + else if (dst.width < 0 || dst.height < 0) + { + WARN( "Invalid dst coords: (%d,%d), size %dx%d\n", dst.x, dst.y, dst.width, dst.height ); + SetLastError( ERROR_INVALID_PARAMETER ); + ret = FALSE; + } + else if (!ret) ret = dst_dev->funcs->pAlphaBlend( dst_dev, &dst, src_dev, &src, blendFunction ); + release_dc_ptr( dcDst ); } release_dc_ptr( dcSrc ); diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 62fba77..2e7aca3 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2396,22 +2396,13 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, double xscale, yscale; BOOL use_repeat; - if (src->x < 0 || src->y < 0 || src->width < 0 || src->height < 0 || - src->width > physdev_src->x11dev->drawable_rect.right - physdev_src->x11dev->drawable_rect.left - src->x || - src->height > physdev_src->x11dev->drawable_rect.bottom - physdev_src->x11dev->drawable_rect.top - src->y) - { - WARN( "Invalid src coords: (%d,%d), size %dx%d\n", src->x, src->y, src->width, src->height ); - SetLastError( ERROR_INVALID_PARAMETER ); - return FALSE; - } - if (!X11DRV_XRender_Installed || src_dev->funcs != dst_dev->funcs) { dst_dev = GET_NEXT_PHYSDEV( dst_dev, pAlphaBlend ); return dst_dev->funcs->pAlphaBlend( dst_dev, dst, src_dev, src, blendfn ); } - if (physdev_src->x11dev != physdev_dst->x11dev) X11DRV_LockDIBSection( physdev_src->x11dev, DIB_Status_GdiMod ); + if (physdev_src != physdev_dst) X11DRV_LockDIBSection( physdev_src->x11dev, DIB_Status_GdiMod ); X11DRV_LockDIBSection( physdev_dst->x11dev, DIB_Status_GdiMod ); dst_pict = get_xrender_picture( physdev_dst->x11dev ); @@ -2460,7 +2451,7 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, wine_tsx11_unlock(); LeaveCriticalSection( &xrender_cs ); - if (physdev_src->x11dev != physdev_dst->x11dev) X11DRV_UnlockDIBSection( physdev_src->x11dev, FALSE ); + if (physdev_src != physdev_dst) X11DRV_UnlockDIBSection( physdev_src->x11dev, FALSE ); X11DRV_UnlockDIBSection( physdev_dst->x11dev, TRUE ); return TRUE; }

1 0