December 2006 - Wine-Commits

Vitaliy Margolen : dinput: Move transform and offsets structures into base device class.
by Alexandre Julliard Dec. 12, 2006

Dec. 12, 2006

Module: wine Branch: master Commit: cd050bf25cfe79637a89eed1dfeec1c6b8135ef8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd050bf25cfe79637a89eed1d… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue Dec 12 08:57:54 2006 -0700 dinput: Move transform and offsets structures into base device class. --- dlls/dinput/device.c | 48 ++++++++++++-------- dlls/dinput/device_private.h | 33 ++++++++----- dlls/dinput/joystick_linux.c | 34 +++++--------- dlls/dinput/joystick_linuxinput.c | 27 +++-------- dlls/dinput/mouse.c | 91 +++++++++++++++++++------------------ 5 files changed, 114 insertions(+), 119 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd050bf25cfe79637a89e…

1 0

Paul Vriens : winspool.drv/tests: No need to return anything as we are using a global variable now.
by Alexandre Julliard Dec. 12, 2006

Dec. 12, 2006

Module: wine Branch: master Commit: b73f30f8eb5c2debabd0065ee924d021ae20bd6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b73f30f8eb5c2debabd0065ee… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Dec 12 17:18:57 2006 +0100 winspool.drv/tests: No need to return anything as we are using a global variable now. --- dlls/winspool.drv/tests/info.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index dec988e..04b1968 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -70,7 +70,7 @@ static DWORD report_deactivated_spooler } -static LPSTR find_default_printer(VOID) +static void find_default_printer(VOID) { static char buffer[DEFAULT_PRINTER_SIZE]; DWORD needed; @@ -122,7 +122,6 @@ static LPSTR find_default_printer(VOID) } trace("default_printer: '%s'\n", default_printer); } - return default_printer; } @@ -1681,7 +1680,7 @@ START_TEST(info) pGetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "GetDefaultPrinterA"); pSetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "SetDefaultPrinterA"); - default_printer = find_default_printer(); + find_default_printer(); test_AddMonitor(); test_AddPort();

1 0

Jacek Caban : mshtml: Added alert implementation.
by Alexandre Julliard Dec. 12, 2006

Dec. 12, 2006

Module: wine Branch: master Commit: 62f1ef9d85284b9fb542d717ff62686ef73e58ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=62f1ef9d85284b9fb542d717f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 12 17:08:18 2006 +0100 mshtml: Added alert implementation. --- dlls/mshtml/htmlwindow.c | 14 ++++++++++++-- dlls/mshtml/resource.h | 2 ++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 5c1c1d1..8f0fc2b 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -193,8 +193,18 @@ static HRESULT WINAPI HTMLWindow2_clearT static HRESULT WINAPI HTMLWindow2_alert(IHTMLWindow2 *iface, BSTR message) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(message)); - return E_NOTIMPL; + WCHAR wszTitle[100]; + + TRACE("(%p)->(%s)\n", This, debugstr_w(message)); + + if(!LoadStringW(get_shdoclc(), IDS_MESSAGE_BOX_TITLE, wszTitle, + sizeof(wszTitle)/sizeof(WCHAR))) { + WARN("Could not load message box title: %d\n", GetLastError()); + return S_OK; + } + + MessageBoxW(This->doc->hwnd, message, wszTitle, MB_ICONWARNING); + return S_OK; } static HRESULT WINAPI HTMLWindow2_confirm(IHTMLWindow2 *iface, BSTR message, diff --git a/dlls/mshtml/resource.h b/dlls/mshtml/resource.h index a937faf..5dfbc42 100644 --- a/dlls/mshtml/resource.h +++ b/dlls/mshtml/resource.h @@ -26,6 +26,8 @@ #define ID_DWL_INSTALL 7602 #define ID_DWL_STATUS 7603 +#define IDS_MESSAGE_BOX_TITLE 2213 + #define IDR_BROWSE_CONTEXT_MENU 24641 #define IDM_TRACETAGS 6004

1 0

Alexandre Julliard : opengl32: Don't use ENTER_GL/ LEAVE_GL around calls to driver functions.
by Alexandre Julliard Dec. 12, 2006

Dec. 12, 2006

Module: wine Branch: master Commit: 6e01e4aa519e99ea1981b97f925e0d7a7bf7c90a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e01e4aa519e99ea1981b97f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 12 18:21:01 2006 +0100 opengl32: Don't use ENTER_GL/LEAVE_GL around calls to driver functions. This causes lock inversions when the driver accesses the DC. --- dlls/opengl32/wgl.c | 18 +---------- dlls/winex11.drv/opengl.c | 72 ++++++++++++++++++++++++++++---------------- 2 files changed, 47 insertions(+), 43 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 792707e..344af98 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -569,9 +569,7 @@ BOOL WINAPI wglUseFontOutlinesW(HDC hdc, void WINAPI wine_glEnable( GLenum cap ) { TRACE("(%d)\n", cap ); - ENTER_GL(); wine_wgl.p_wglEnable(cap); - LEAVE_GL(); } /*********************************************************************** @@ -579,12 +577,8 @@ void WINAPI wine_glEnable( GLenum cap ) */ GLboolean WINAPI wine_glIsEnabled( GLenum cap ) { - GLboolean ret_value; TRACE("(%d)\n", cap ); - ENTER_GL(); - ret_value = wine_wgl.p_wglIsEnabled(cap); - LEAVE_GL(); - return ret_value; + return wine_wgl.p_wglIsEnabled(cap); } /*********************************************************************** @@ -593,9 +587,7 @@ GLboolean WINAPI wine_glIsEnabled( GLenu void WINAPI wine_glDisable( GLenum cap ) { TRACE("(%d)\n", cap ); - ENTER_GL(); wine_wgl.p_wglDisable(cap); - LEAVE_GL(); } /*********************************************************************** @@ -604,9 +596,7 @@ void WINAPI wine_glDisable( GLenum cap ) void WINAPI wine_glScissor( GLint x, GLint y, GLsizei width, GLsizei height ) { TRACE("(%d, %d, %d, %d)\n", x, y, width, height ); - ENTER_GL(); wine_wgl.p_wglScissor(x, y, width, height); - LEAVE_GL(); } /*********************************************************************** @@ -615,9 +605,7 @@ void WINAPI wine_glScissor( GLint x, GLi void WINAPI wine_glViewport( GLint x, GLint y, GLsizei width, GLsizei height ) { TRACE("(%d, %d, %d, %d)\n", x, y, width, height ); - ENTER_GL(); wine_wgl.p_wglViewport(x, y, width, height); - LEAVE_GL(); } /*********************************************************************** @@ -678,11 +666,7 @@ const GLubyte * WINAPI wine_glGetString( */ void WINAPI wine_glGetIntegerv( GLenum pname, GLint* params ) { - ENTER_GL(); - glGetIntegerv(pname, params); - /* A few parameters like GL_DEPTH_BITS differ between WGL and GLX, the wglGetIntegerv helper function handles those */ wine_wgl.p_wglGetIntegerv(pname, params); - LEAVE_GL(); } diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 927abfc..2769580 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1463,6 +1463,8 @@ static void sync_current_drawable(void) width = ctx->physDev->dc_rect.right - ctx->physDev->dc_rect.left; height = ctx->physDev->dc_rect.bottom - ctx->physDev->dc_rect.top; + wine_tsx11_lock(); + pglViewport(ctx->physDev->dc_rect.left + ctx->viewport.left, dy + ctx->viewport.top, ctx->viewport.right ? (ctx->viewport.right - ctx->viewport.left) : width, @@ -1478,6 +1480,7 @@ static void sync_current_drawable(void) else pglScissor(ctx->physDev->dc_rect.left, dy, width, height); + wine_tsx11_unlock(); } } @@ -1796,7 +1799,9 @@ static void WINAPI X11DRV_wglDisable(GLe } else { - pglDisable(cap); + wine_tsx11_lock(); + pglDisable(cap); + wine_tsx11_unlock(); } } @@ -1809,35 +1814,49 @@ static void WINAPI X11DRV_wglEnable(GLen } else { - pglEnable(cap); + wine_tsx11_lock(); + pglEnable(cap); + wine_tsx11_unlock(); } } /* WGL helper function which handles differences in glGetIntegerv from WGL and GLX */ -static void WINAPI X11DRV_wglGetIntegerv(GLenum pname, GLint* params) { - TRACE("pname: 0x%x, params: %p\n", pname, params); - if (pname == GL_DEPTH_BITS) { - GLXContext gl_ctx = pglXGetCurrentContext(); - Wine_GLContext* ret = get_context_from_GLXContext(gl_ctx); - /*TRACE("returns Wine Ctx as %p\n", ret);*/ - /** - * if we cannot find a Wine Context - * we only have the default wine desktop context, - * so if we have only a 24 depth say we have 32 - */ - if (NULL == ret && 24 == *params) { - *params = 32; +static void WINAPI X11DRV_wglGetIntegerv(GLenum pname, GLint* params) +{ + wine_tsx11_lock(); + switch(pname) + { + case GL_DEPTH_BITS: + { + GLXContext gl_ctx = pglXGetCurrentContext(); + Wine_GLContext* ret = get_context_from_GLXContext(gl_ctx); + + pglGetIntegerv(pname, params); + /** + * if we cannot find a Wine Context + * we only have the default wine desktop context, + * so if we have only a 24 depth say we have 32 + */ + if (NULL == ret && 24 == *params) { + *params = 32; + } + TRACE("returns GL_DEPTH_BITS as '%d'\n", *params); + break; } - TRACE("returns GL_DEPTH_BITS as '%d'\n", *params); - } - if (pname == GL_ALPHA_BITS) { - GLint tmp; - GLXContext gl_ctx = pglXGetCurrentContext(); - Wine_GLContext* ret = get_context_from_GLXContext(gl_ctx); - pglXGetFBConfigAttrib(ret->display, ret->fb_conf, GLX_ALPHA_SIZE, &tmp); - TRACE("returns GL_ALPHA_BITS as '%d'\n", tmp); - *params = tmp; + case GL_ALPHA_BITS: + { + GLXContext gl_ctx = pglXGetCurrentContext(); + Wine_GLContext* ret = get_context_from_GLXContext(gl_ctx); + + pglXGetFBConfigAttrib(ret->display, ret->fb_conf, GLX_ALPHA_SIZE, params); + TRACE("returns GL_ALPHA_BITS as '%d'\n", *params); + break; + } + default: + pglGetIntegerv(pname, params); + break; } + wine_tsx11_unlock(); } static GLboolean WINAPI X11DRV_wglIsEnabled(GLenum cap) @@ -1851,9 +1870,10 @@ static GLboolean WINAPI X11DRV_wglIsEnab } else { - enabled = pglIsEnabled(cap); + wine_tsx11_lock(); + enabled = pglIsEnabled(cap); + wine_tsx11_unlock(); } - return enabled; }

1 0

Alexandre Julliard : winex11.drv: Get rid of the display pointer in the GL context.
by Alexandre Julliard Dec. 12, 2006

Dec. 12, 2006

Module: wine Branch: master Commit: fdcd9859b4ce1a1fdd65a91410b85a021f654b02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdcd9859b4ce1a1fdd65a9141… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 12 18:23:34 2006 +0100 winex11.drv: Get rid of the display pointer in the GL context. --- dlls/opengl32/wgl.c | 1 - dlls/winex11.drv/opengl.c | 34 ++++++++++++++++------------------ 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 344af98..684e935 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -86,7 +86,6 @@ static char* internal_gl_extensions = NU typedef struct wine_glcontext { HDC hdc; - Display *display; XVisualInfo *vis; GLXFBConfig fb_conf; GLXContext ctx; diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 2769580..25d9570 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -69,7 +69,6 @@ WINE_DECLARE_DEBUG_CHANNEL(fps); typedef struct wine_glcontext { HDC hdc; - Display *display; XVisualInfo *vis; GLXFBConfig fb_conf; GLXContext ctx; @@ -571,9 +570,9 @@ static int describeContext(Wine_GLContex int tmp; int ctx_vis_id; TRACE(" Context %p have (vis:%p):\n", ctx, ctx->vis); - pglXGetFBConfigAttrib(ctx->display, ctx->fb_conf, GLX_FBCONFIG_ID, &tmp); + pglXGetFBConfigAttrib(gdi_display, ctx->fb_conf, GLX_FBCONFIG_ID, &tmp); TRACE(" - FBCONFIG_ID 0x%x\n", tmp); - pglXGetFBConfigAttrib(ctx->display, ctx->fb_conf, GLX_VISUAL_ID, &tmp); + pglXGetFBConfigAttrib(gdi_display, ctx->fb_conf, GLX_VISUAL_ID, &tmp); TRACE(" - VISUAL_ID 0x%x\n", tmp); ctx_vis_id = tmp; return ctx_vis_id; @@ -591,20 +590,20 @@ static int describeDrawable(Wine_GLConte } TRACE(" Drawable %p have :\n", (void*) drawable); - pglXQueryDrawable(ctx->display, drawable, GLX_WIDTH, (unsigned int*) &tmp); + pglXQueryDrawable(gdi_display, drawable, GLX_WIDTH, (unsigned int*) &tmp); TRACE(" - WIDTH as %d\n", tmp); - pglXQueryDrawable(ctx->display, drawable, GLX_HEIGHT, (unsigned int*) &tmp); + pglXQueryDrawable(gdi_display, drawable, GLX_HEIGHT, (unsigned int*) &tmp); TRACE(" - HEIGHT as %d\n", tmp); - pglXQueryDrawable(ctx->display, drawable, GLX_FBCONFIG_ID, (unsigned int*) &tmp); + pglXQueryDrawable(gdi_display, drawable, GLX_FBCONFIG_ID, (unsigned int*) &tmp); TRACE(" - FBCONFIG_ID as 0x%x\n", tmp); attribList[1] = tmp; - fbCfgs = pglXChooseFBConfig(ctx->display, DefaultScreen(ctx->display), attribList, &nElements); + fbCfgs = pglXChooseFBConfig(gdi_display, DefaultScreen(gdi_display), attribList, &nElements); if (fbCfgs == NULL) { return -1; } - pglXGetFBConfigAttrib(ctx->display, fbCfgs[0], GLX_VISUAL_ID, &tmp); + pglXGetFBConfigAttrib(gdi_display, fbCfgs[0], GLX_VISUAL_ID, &tmp); TRACE(" - VISUAL_ID as 0x%x\n", tmp); XFree(fbCfgs); @@ -1333,7 +1332,6 @@ HGLRC X11DRV_wglCreateContext(X11DRV_PDE wine_tsx11_unlock(); ret->hdc = hdc; ret->physDev = physDev; - ret->display = gdi_display; ret->fb_conf = cur_cfg; /*ret->vis = vis;*/ ret->vis = pglXGetVisualFromFBConfig(gdi_display, cur_cfg); @@ -1364,7 +1362,7 @@ BOOL X11DRV_wglDeleteContext(HGLRC hglrc * so make sure it is valid first */ if (is_valid_context( ctx )) { - if (ctx->ctx) pglXDestroyContext(ctx->display, ctx->ctx); + if (ctx->ctx) pglXDestroyContext(gdi_display, ctx->ctx); free_context(ctx); } else @@ -1519,11 +1517,11 @@ BOOL X11DRV_wglMakeCurrent(X11DRV_PDEVIC * We are certain that the drawable and context are compatible as we only allow compatible formats. */ TRACE(" Creating GLX Context\n"); - ctx->ctx = pglXCreateContext(ctx->display, ctx->vis, NULL, type == OBJ_MEMDC ? False : True); + ctx->ctx = pglXCreateContext(gdi_display, ctx->vis, NULL, type == OBJ_MEMDC ? False : True); TRACE(" created a delayed OpenGL context (%p)\n", ctx->ctx); } - TRACE(" make current for dis %p, drawable %p, ctx %p\n", ctx->display, (void*) drawable, ctx->ctx); - ret = pglXMakeCurrent(ctx->display, drawable, ctx->ctx); + TRACE(" make current for dis %p, drawable %p, ctx %p\n", gdi_display, (void*) drawable, ctx->ctx); + ret = pglXMakeCurrent(gdi_display, drawable, ctx->ctx); NtCurrentTeb()->glContext = ctx; if(ret) { @@ -1573,10 +1571,10 @@ BOOL X11DRV_wglMakeContextCurrentARB(X11 Drawable d_read = get_glxdrawable(hReadDev); if (ctx->ctx == NULL) { - ctx->ctx = pglXCreateContext(ctx->display, ctx->vis, NULL, GetObjectType(hDrawDev->hdc) == OBJ_MEMDC ? False : True); + ctx->ctx = pglXCreateContext(gdi_display, ctx->vis, NULL, GetObjectType(hDrawDev->hdc) == OBJ_MEMDC ? False : True); TRACE(" created a delayed OpenGL context (%p)\n", ctx->ctx); } - ret = pglXMakeContextCurrent(ctx->display, d_draw, d_read, ctx->ctx); + ret = pglXMakeContextCurrent(gdi_display, d_draw, d_read, ctx->ctx); NtCurrentTeb()->glContext = ctx; } } @@ -1609,7 +1607,7 @@ BOOL X11DRV_wglShareLists(HGLRC hglrc1, if (org->ctx == NULL) { wine_tsx11_lock(); describeContext(org); - org->ctx = pglXCreateContext(org->display, org->vis, NULL, GetObjectType(org->physDev->hdc) == OBJ_MEMDC ? False : True); + org->ctx = pglXCreateContext(gdi_display, org->vis, NULL, GetObjectType(org->physDev->hdc) == OBJ_MEMDC ? False : True); wine_tsx11_unlock(); TRACE(" created a delayed OpenGL context (%p) for Wine context %p\n", org->ctx, org); } @@ -1617,7 +1615,7 @@ BOOL X11DRV_wglShareLists(HGLRC hglrc1, wine_tsx11_lock(); describeContext(dest); /* Create the destination context with display lists shared */ - dest->ctx = pglXCreateContext(org->display, dest->vis, org->ctx, GetObjectType(org->physDev->hdc) == OBJ_MEMDC ? False : True); + dest->ctx = pglXCreateContext(gdi_display, dest->vis, org->ctx, GetObjectType(org->physDev->hdc) == OBJ_MEMDC ? False : True); wine_tsx11_unlock(); TRACE(" created a delayed OpenGL context (%p) for Wine context %p sharing lists with OpenGL ctx %p\n", dest->ctx, dest, org->ctx); return TRUE; @@ -1848,7 +1846,7 @@ static void WINAPI X11DRV_wglGetIntegerv GLXContext gl_ctx = pglXGetCurrentContext(); Wine_GLContext* ret = get_context_from_GLXContext(gl_ctx); - pglXGetFBConfigAttrib(ret->display, ret->fb_conf, GLX_ALPHA_SIZE, params); + pglXGetFBConfigAttrib(gdi_display, ret->fb_conf, GLX_ALPHA_SIZE, params); TRACE("returns GL_ALPHA_BITS as '%d'\n", *params); break; }

1 0

Alexandre Julliard : opengl32: Avoid generating a wrapper for internal functions when we can call the internal one directly .
by Alexandre Julliard Dec. 12, 2006

Dec. 12, 2006

Module: wine Branch: master Commit: de154e738aeed2f20975d91ffeae40a33d65ff64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de154e738aeed2f20975d91ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 12 17:59:44 2006 +0100 opengl32: Avoid generating a wrapper for internal functions when we can call the internal one directly. --- dlls/opengl32/make_opengl | 92 ++++++++++++++++++------------------------- dlls/opengl32/opengl_ext.h | 8 ---- dlls/opengl32/opengl_norm.c | 74 ---------------------------------- dlls/opengl32/wgl.c | 91 ++++++++++++++++++++++++++++++++---------- 4 files changed, 108 insertions(+), 157 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de154e738aeed2f20975d…

1 0

Ulrich Czekalla : winex11.drv: Correctly position and clip opengl child windows.
by Alexandre Julliard Dec. 12, 2006

Dec. 12, 2006

Module: wine Branch: master Commit: 715d0e84097cb2dc07369c4e1cec8cf8a41e9035 URL: http://source.winehq.org/git/wine.git/?a=commit;h=715d0e84097cb2dc07369c4e1… Author: Ulrich Czekalla <ulrich.czekalla(a)utoronto.ca> Date: Thu Dec 7 10:45:58 2006 -0500 winex11.drv: Correctly position and clip opengl child windows. --- dlls/opengl32/make_opengl | 15 ++++ dlls/opengl32/opengl_ext.h | 5 ++ dlls/opengl32/opengl_norm.c | 10 ++-- dlls/opengl32/wgl.c | 40 ++++++++++- dlls/winex11.drv/opengl.c | 153 ++++++++++++++++++++++++++++++++++++++++-- 5 files changed, 207 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=715d0e84097cb2dc07369…

1 0

Alexandre Julliard : gdi32: Use a more appropriate size for the default clip region.
by Alexandre Julliard Dec. 12, 2006

Dec. 12, 2006

Module: wine Branch: master Commit: 826c1d8700d3236b40ba56aaf25791d27e1f6924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=826c1d8700d3236b40ba56aaf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 12 15:00:19 2006 +0100 gdi32: Use a more appropriate size for the default clip region. --- dlls/gdi32/clipping.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 40a556c..fc59c18 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -86,9 +86,22 @@ void CLIPPING_UpdateGCRegion( DC * dc ) */ static inline void create_default_clip_region( DC * dc ) { - dc->hClipRgn = CreateRectRgn(0, 0, - GetDeviceCaps( dc->hSelf, HORZRES ), - GetDeviceCaps( dc->hSelf, VERTRES )); + UINT width, height; + + if (GDIMAGIC( dc->header.wMagic ) == MEMORY_DC_MAGIC) + { + BITMAP bitmap; + + GetObjectW( dc->hBitmap, sizeof(bitmap), &bitmap ); + width = bitmap.bmWidth; + height = bitmap.bmHeight; + } + else + { + width = GetDeviceCaps( dc->hSelf, DESKTOPHORZRES ); + height = GetDeviceCaps( dc->hSelf, DESKTOPVERTRES ); + } + dc->hClipRgn = CreateRectRgn( 0, 0, width, height ); }

1 0

Alexandre Julliard : winex11.drv: Implemented DESKTOPHORZ/ VERTRES device caps.
by Alexandre Julliard Dec. 12, 2006

Dec. 12, 2006

Module: wine Branch: master Commit: 21635133fb271405fefd6bce3078cf971e84c426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21635133fb271405fefd6bce3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 12 14:59:55 2006 +0100 winex11.drv: Implemented DESKTOPHORZ/VERTRES device caps. --- dlls/gdi32/dc.c | 4 ++-- dlls/winex11.drv/init.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 644bd13..5010bdf 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -647,8 +647,8 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LP return 0; } - dc->hVisRgn = CreateRectRgn( 0, 0, GetDeviceCaps( hdc, HORZRES ), - GetDeviceCaps( hdc, VERTRES ) ); + dc->hVisRgn = CreateRectRgn( 0, 0, GetDeviceCaps( hdc, DESKTOPHORZRES ), + GetDeviceCaps( hdc, DESKTOPVERTRES ) ); DC_InitDC( dc ); GDI_ReleaseObj( hdc ); diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index c33301a..cf23866 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -194,6 +194,10 @@ INT X11DRV_GetDeviceCaps( X11DRV_PDEVICE return screen_width; case VERTRES: return screen_height; + case DESKTOPHORZRES: + return virtual_screen_rect.right - virtual_screen_rect.left; + case DESKTOPVERTRES: + return virtual_screen_rect.bottom - virtual_screen_rect.top; case BITSPIXEL: return screen_depth; case PLANES: @@ -258,8 +262,6 @@ INT X11DRV_GetDeviceCaps( X11DRV_PDEVICE case SCALINGFACTORX: case SCALINGFACTORY: case VREFRESH: - case DESKTOPVERTRES: - case DESKTOPHORZRES: case BLTALIGNMENT: return 0; default:

1 0

Alexandre Julliard : winex11.drv: Make sure the drawable rect is always updated and use it where appropriate .
by Alexandre Julliard Dec. 12, 2006

Dec. 12, 2006

Module: wine Branch: master Commit: d302db41aa4ca227bae6dc623668f040e1b02275 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d302db41aa4ca227bae6dc623… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 12 13:46:15 2006 +0100 winex11.drv: Make sure the drawable rect is always updated and use it where appropriate. --- dlls/winex11.drv/bitblt.c | 10 +++------- dlls/winex11.drv/bitmap.c | 5 +++++ dlls/winex11.drv/init.c | 5 +++++ dlls/winex11.drv/xrender.c | 10 +++------- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index b143bf4..00bf375 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1149,13 +1149,9 @@ static BOOL BITBLT_GetVisRectangles( X11 if (heightSrc < 0) SWAP_INT32( &rect.top, &rect.bottom ); /* Apparently the clipping and visible regions are only for output, so just check against dc extent here to avoid BadMatch errors */ - if (physDevSrc->bitmap) - { - BITMAP bm; - GetObjectW( physDevSrc->bitmap->hbitmap, sizeof(bm), &bm ); - SetRect( &clipRect, 0, 0, bm.bmWidth, bm.bmHeight ); - } - else clipRect = virtual_screen_rect; + clipRect = physDevSrc->drawable_rect; + OffsetRect( &clipRect, -(physDevSrc->drawable_rect.left + physDevSrc->dc_rect.left), + -(physDevSrc->drawable_rect.top + physDevSrc->dc_rect.top) ); if (!IntersectRect( visRectSrc, &rect, &clipRect )) return FALSE; diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index 726581a..75623e4 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -72,6 +72,9 @@ void X11DRV_BITMAP_Init(void) HBITMAP X11DRV_SelectBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap ) { X_PHYSBITMAP *physBitmap; + BITMAP bitmap; + + if (!GetObjectW( hbitmap, sizeof(bitmap), &bitmap )) return 0; if(physDev->xrender) X11DRV_XRender_UpdateDrawable( physDev ); @@ -81,6 +84,8 @@ HBITMAP X11DRV_SelectBitmap( X11DRV_PDEV physDev->bitmap = physBitmap; physDev->drawable = physBitmap->pixmap; + SetRect( &physDev->drawable_rect, 0, 0, bitmap.bmWidth, bitmap.bmHeight ); + physDev->dc_rect = physDev->drawable_rect; /* Change GC depth if needed */ diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 9b2b9c8..c33301a 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -135,12 +135,17 @@ BOOL X11DRV_CreateDC( HDC hdc, X11DRV_PD physDev->bitmap = &BITMAP_stock_phys_bitmap; physDev->drawable = BITMAP_stock_phys_bitmap.pixmap; physDev->depth = 1; + SetRect( &physDev->drawable_rect, 0, 0, 1, 1 ); + physDev->dc_rect = physDev->drawable_rect; } else { physDev->bitmap = NULL; physDev->drawable = root_window; physDev->depth = screen_depth; + physDev->drawable_rect = virtual_screen_rect; + SetRect( &physDev->dc_rect, 0, 0, virtual_screen_rect.right - virtual_screen_rect.left, + virtual_screen_rect.bottom - virtual_screen_rect.top ); } physDev->region = CreateRectRgn( 0, 0, 0, 0 ); diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 317a36b..9c5e274 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1327,16 +1327,12 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_P } } else { XImage *image; - unsigned int w, h, dummy_uint; - Window dummy_window; - int dummy_int; int image_x, image_y, image_off_x, image_off_y, image_w, image_h; RECT extents = {0, 0, 0, 0}; POINT cur = {0, 0}; - - - XGetGeometry(gdi_display, physDev->drawable, &dummy_window, &dummy_int, &dummy_int, - &w, &h, &dummy_uint, &dummy_uint); + int w = physDev->drawable_rect.right - physDev->drawable_rect.left; + int h = physDev->drawable_rect.bottom - physDev->drawable_rect.top; + TRACE("drawable %dx%d\n", w, h); for(idx = 0; idx < count; idx++) {

1 0